diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000000..79e2f75f39cd1
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+    "name": "WordPress Core Development",
+    "dockerComposeFile": "docker-compose.yml",
+    "service": "app",
+    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+    // Features to add to the dev container. More info: https://containers.dev/features.
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "username": "wordpress"
+        },
+        "ghcr.io/devcontainers/features/node:1": {
+            "version": "16"
+        },
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/devcontainers/features/git:1": {}
+    },
+    "onCreateCommand": "sudo chmod +x .devcontainer/install-tools.sh && .devcontainer/install-tools.sh",
+    "postCreateCommand": "sudo chmod +x .devcontainer/setup.sh && .devcontainer/setup.sh",
+    "forwardPorts": [
+        8080
+    ],
+    "remoteUser": "wordpress"
+}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
new file mode 100644
index 0000000000000..74f63135b20b2
--- /dev/null
+++ b/.devcontainer/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3.1'
+
+services:
+  app:
+    image: wordpress
+    restart: always
+    ports:
+      - 8080:80
+    environment:
+      WORDPRESS_DB_HOST: db
+      WORDPRESS_DB_USER: exampleuser
+      WORDPRESS_DB_PASSWORD: examplepass
+      WORDPRESS_DB_NAME: exampledb
+    volumes:
+      - ../..:/workspaces:cached
+
+  db:
+    image: mariadb
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: exampledb
+      MYSQL_USER: exampleuser
+      MYSQL_PASSWORD: examplepass
+      MYSQL_RANDOM_ROOT_PASSWORD: '1'
+    volumes:
+      - db:/var/lib/mysql
+
+volumes:
+  db:
diff --git a/.devcontainer/install-tools.sh b/.devcontainer/install-tools.sh
new file mode 100755
index 0000000000000..7a52fabe841c3
--- /dev/null
+++ b/.devcontainer/install-tools.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -eux
+
+echo "Installing wp-cli..."
+curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+sudo chmod +x wp-cli.phar
+sudo mv wp-cli.phar /usr/local/bin/wp
+
+echo "Installing chromium..."
+sudo apt-get update
+sudo apt-get -y install --no-install-recommends chromium
+
+# Copy the welcome message
+sudo cp .devcontainer/welcome-message.txt /usr/local/etc/vscode-dev-containers/first-run-notice.txt
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
new file mode 100755
index 0000000000000..26bdd87d04545
--- /dev/null
+++ b/.devcontainer/setup.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -eux
+
+if [ -z ${CODESPACE_NAME+x} ]; then
+	SITE_HOST="http://localhost:8080"
+else
+	SITE_HOST="https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}"
+fi
+
+# Install dependencies
+cd /workspaces/wordpress-develop
+npm install && npm run build:dev
+
+# Install WordPress and activate the plugin/theme.
+cd /var/www/html
+echo "Setting up WordPress at $SITE_HOST"
+wp core install --url="$SITE_HOST" --title="WordPress Trunk" --admin_user="admin" --admin_email="admin@example.com" --admin_password="password" --skip-email
diff --git a/.devcontainer/welcome-message.txt b/.devcontainer/welcome-message.txt
new file mode 100644
index 0000000000000..cedaa756fa991
--- /dev/null
+++ b/.devcontainer/welcome-message.txt
@@ -0,0 +1,6 @@
+👋 Welcome to "WordPress Core Development" in Codespaces!
+
+🛠️  Your environment is fully setup with all the required software.
+
+🚀 To get started, wait for the "postCreateCommand" to finish setting things up, then open the portforwarded URL and append '/wp-admin'.
+
diff --git a/.env b/.env
index 63a8169f6463f..d393c9b324216 100644
--- a/.env
+++ b/.env
@@ -59,6 +59,7 @@ LOCAL_WP_DEBUG_LOG=true
 LOCAL_WP_DEBUG_DISPLAY=true
 LOCAL_SCRIPT_DEBUG=true
 LOCAL_WP_ENVIRONMENT_TYPE=local
+LOCAL_WP_DEVELOPMENT_MODE=core
 
 # The URL to use when running e2e tests.
 WP_BASE_URL=http://localhost:${LOCAL_PORT}
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index 6a249a93b4ceb..50190ae045045 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -40,6 +40,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   # Runs PHP coding standards checks.
   #
@@ -48,35 +52,32 @@ jobs:
   # Performs the following steps:
   # - Checks out the repository.
   # - Sets up PHP.
-  # - Logs debug information.
   # - Configures caching for PHPCS scans.
-  # - Installs Composer dependencies (use cache if possible).
+  # - Installs Composer dependencies.
   # - Make Composer packages available globally.
-  # - Logs PHP_CodeSniffer debug information.
   # - Runs PHPCS on the full codebase with warnings suppressed.
+  # - Generate a report for displaying issues as pull request annotations.
   # - Runs PHPCS on the `tests` directory without warnings suppressed.
+  # - Generate a report for displaying `test` directory issues as pull request annotations.
   # - Ensures version-controlled files are not modified or deleted.
   phpcs:
     name: PHP coding standards
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2.22.0
+        uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
         with:
           php-version: '7.4'
           coverage: none
-          tools: composer, cs2pr
-
-      - name: Log debug information
-        run: |
-          php --version
-          composer --version
+          tools: cs2pr
 
       # This date is used to ensure that the PHPCS cache is cleared at least once every week.
       # http://man7.org/linux/man-pages/man1/date.1.html
@@ -85,25 +86,26 @@ jobs:
         run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
 
       - name: Cache PHPCS scan cache
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
         with:
-          path: .cache/phpcs.json
+          path: |
+            .cache/phpcs-src.json
+            .cache/phpcs-tests.json
           key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}
 
+      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
+      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
       - name: Install Composer dependencies
         uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
         with:
-          composer-options: "--no-progress --no-ansi"
+          custom-cache-suffix: ${{ steps.get-date.outputs.date }}
 
       - name: Make Composer packages available globally
         run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
 
-      - name: Log PHPCS debug information
-        run: phpcs -i
-
       - name: Run PHPCS on all Core files
         id: phpcs-core
-        run: phpcs -n --report-full --report-checkstyle=./.cache/phpcs-report.xml
+        run: phpcs -n --report-full --cache=./.cache/phpcs-src.json --report-checkstyle=./.cache/phpcs-report.xml
 
       - name: Show PHPCS results in PR
         if: ${{ always() && steps.phpcs-core.outcome == 'failure' }}
@@ -111,7 +113,7 @@ jobs:
 
       - name: Check test suite files for warnings
         id: phpcs-tests
-        run: phpcs tests --report-full --report-checkstyle=./.cache/phpcs-tests-report.xml
+        run: phpcs tests --report-full --cache=./.cache/phpcs-tests.json --report-checkstyle=./.cache/phpcs-tests-report.xml
 
       - name: Show test suite scan results in PR
         if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
@@ -126,15 +128,16 @@ jobs:
   #
   # Performs the following steps:
   # - Checks out the repository.
+  # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # - Logs updated debug information.
-  # _ Installs npm dependencies.
+  # - Installs npm dependencies.
   # - Run the WordPress JSHint checks.
   # - Ensures version-controlled files are not modified or deleted.
   jshint:
     name: JavaScript coding standards
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     env:
@@ -142,17 +145,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          git --version
-          svn --version
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version-file: '.nvmrc'
           cache: npm
@@ -161,8 +157,10 @@ jobs:
         run: |
           npm --version
           node --version
+          git --version
+          svn --version
 
-      - name: Install Dependencies
+      - name: Install npm Dependencies
         run: npm ci
 
       - name: Run JSHint
@@ -174,6 +172,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ phpcs, jshint ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -187,6 +188,8 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     needs: [ phpcs, jshint, slack-notifications ]
     if: |
       always() &&
@@ -200,7 +203,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index 1d642ff422fff..1e3e442752d58 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -26,6 +26,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 env:
   LOCAL_DIR: build
 
@@ -35,22 +39,27 @@ jobs:
   # Performs the following steps:
   # - Sets environment variables.
   # - Checks out the repository.
+  # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # _ Installs npm dependencies.
+  # - Installs npm dependencies.
   # - Builds WordPress to run from the `build` directory.
   # - Starts the WordPress Docker container.
-  # - Logs general debug information.
   # - Logs the running Docker containers.
   # - Logs Docker debug information (about both the Docker installation within the runner and the WordPress container).
   # - Install WordPress within the Docker container.
   # - Run the E2E tests.
   # - Ensures version-controlled files are not modified or deleted.
   e2e-tests:
-    name: E2E Tests
+    name: E2E Tests with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        LOCAL_SCRIPT_DEBUG: [ true, false ]
 
     steps:
       - name: Configure environment variables
@@ -59,7 +68,13 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
 
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
 
       - name: Log debug information
         run: |
@@ -68,17 +83,9 @@ jobs:
           curl --version
           git --version
           svn --version
-          php --version
-          php -i
           locale -a
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install Dependencies
+      - name: Install npm Dependencies
         run: npm ci
 
       - name: Build WordPress
@@ -88,14 +95,6 @@ jobs:
         run: |
           npm run env:start
 
-      - name: General debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
       - name: Log running Docker containers
         run: docker ps -a
 
@@ -110,31 +109,30 @@ jobs:
           docker-compose run --rm php locale -a
 
       - name: Install WordPress
+        env:
+          LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
         run: npm run env:install
 
       - name: Run E2E tests
         run: npm run test:e2e
 
+      - name: Archive debug artifacts (screenshots, HTML snapshots)
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+        if: always()
+        with:
+            name: failures-artifacts
+            path: artifacts
+            if-no-files-found: ignore
+
       - name: Ensure version-controlled files are not modified or deleted
         run: git diff --exit-code
 
-  slack-notifications:
-    name: Slack Notifications
-    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
-    needs: [ e2e-tests ]
-    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
-    with:
-      calling_status: ${{ needs.e2e-tests.result == 'success' && 'success' || needs.e2e-tests.result == 'cancelled' && 'cancelled' || 'failure' }}
-    secrets:
-      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
-      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
-      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
-      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
-
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ e2e-tests, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ e2e-tests ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -143,10 +141,9 @@ jobs:
       (
         needs.e2e-tests.result == 'cancelled' || needs.e2e-tests.result == 'failure'
       )
-
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/failed-workflow.yml b/.github/workflows/failed-workflow.yml
index 546a4f4ccb484..ebc305568ccad 100644
--- a/.github/workflows/failed-workflow.yml
+++ b/.github/workflows/failed-workflow.yml
@@ -11,6 +11,10 @@ on:
         required: true
         type: 'string'
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   # Attempts to rerun a workflow.
   #
@@ -20,11 +24,13 @@ jobs:
   failed-workflow:
     name: Rerun a workflow
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     timeout-minutes: 5
 
     steps:
       - name: Rerun a workflow
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/javascript-tests.yml b/.github/workflows/javascript-tests.yml
index 2eeeb9a805443..2677096b1b7e0 100644
--- a/.github/workflows/javascript-tests.yml
+++ b/.github/workflows/javascript-tests.yml
@@ -38,36 +38,34 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   # Runs the QUnit tests for WordPress.
   #
   # Performs the following steps:
   # - Checks out the repository.
+  # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # - Logs updated debug information.
-  # _ Installs npm dependencies.
+  # - Installs npm dependencies.
   # - Run the WordPress QUnit tests.
   # - Ensures version-controlled files are not modified or deleted.
   test-js:
     name: QUnit Tests
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-      - name: Log debug information
-        run: |
-          npm --version
-          node --version
-          git --version
-          svn --version
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version-file: '.nvmrc'
           cache: npm
@@ -76,8 +74,10 @@ jobs:
         run: |
           npm --version
           node --version
+          git --version
+          svn --version
 
-      - name: Install Dependencies
+      - name: Install npm Dependencies
         run: npm ci
 
       - name: Run QUnit tests
@@ -89,6 +89,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ test-js ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -102,7 +105,9 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ test-js, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -114,7 +119,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
new file mode 100644
index 0000000000000..53b9efb6ba462
--- /dev/null
+++ b/.github/workflows/performance.yml
@@ -0,0 +1,249 @@
+name: Performance Tests
+
+on:
+  push:
+    branches:
+      - trunk
+      - '6.[2-9]'
+      - '[7-9].[0-9]'
+    tags:
+      - '[0-9]+.[0-9]'
+      - '[0-9]+.[0-9].[0-9]+'
+      - '![45].[0-9].[0-9]+'
+      - '!6.[01].[0-9]+'
+  pull_request:
+    branches:
+      - trunk
+      - '6.[2-9]'
+      - '[7-9].[0-9]'
+  workflow_dispatch:
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name for pull requests
+  # or the commit hash for any other events.
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
+env:
+  # Performance testing should be performed in an environment reflecting a standard production environment.
+  WP_DEBUG: false
+  SCRIPT_DEBUG: false
+  SAVEQUERIES : false
+  WP_DEVELOPMENT_MODE: ''
+
+  # This workflow takes two sets of measurements — one for the current commit,
+  # and another against a consistent version that is used as a baseline measurement.
+  # This is done to isolate variance in measurements caused by the GitHub runners
+  # from differences caused by code changes between commits. The BASE_TAG value here
+  # represents the version being used for baseline measurements. It should only be
+  # changed if we want to normalize results against a different baseline.
+  BASE_TAG: '6.1.1'
+  LOCAL_DIR: build
+
+jobs:
+  # Runs the performance test suite.
+  #
+  # Performs the following steps:
+  # - Configure environment variables.
+  # - Checkout repository.
+  # - Set up Node.js.
+  # - Log debug information.
+  # - Install npm dependencies.
+  # - Build WordPress.
+  # - Start Docker environment.
+  # - Log running Docker containers.
+  # - Docker debug information.
+  # - Install WordPress.
+  # - Install WordPress Importer plugin.
+  # - Import mock data.
+  # - Update permalink structure.
+  # - Install MU plugin.
+  # - Run performance tests (current commit).
+  # - Print performance tests results.
+  # - Set the environment to the baseline version.
+  # - Run baseline performance tests.
+  # - Print base line performance tests results.
+  # - Set the base sha.
+  # - Set commit details.
+  # - Publish performance results.
+  # - Ensure version-controlled files are not modified or deleted.
+  # - Dispatch workflow run.
+  performance:
+    name: Run performance tests
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+
+    steps:
+      - name: Configure environment variables
+        run: |
+          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
+          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
+
+      - name: Checkout repository
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+
+      - name: Log debug information
+        run: |
+          npm --version
+          node --version
+          curl --version
+          git --version
+          svn --version
+          locale -a
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Build WordPress
+        run: npm run build
+
+      - name: Start Docker environment
+        run: |
+          npm run env:start
+
+      - name: Log running Docker containers
+        run: docker ps -a
+
+      - name: Docker debug information
+        run: |
+          docker -v
+          docker-compose -v
+          docker-compose run --rm mysql mysql --version
+          docker-compose run --rm php php --version
+          docker-compose run --rm php php -m
+          docker-compose run --rm php php -i
+          docker-compose run --rm php locale -a
+
+      - name: Install WordPress
+        run: npm run env:install
+
+      - name: Install WordPress Importer plugin
+        run: npm run env:cli -- plugin install wordpress-importer --activate --path=/var/www/${{ env.LOCAL_DIR }}
+
+      - name: Import mock data
+        run: |
+          curl -O https://raw.githubusercontent.com/WordPress/theme-test-data/b9752e0533a5acbb876951a8cbb5bcc69a56474c/themeunittestdata.wordpress.xml
+          npm run env:cli -- import themeunittestdata.wordpress.xml --authors=create --path=/var/www/${{ env.LOCAL_DIR }}
+          rm themeunittestdata.wordpress.xml
+
+      - name: Update permalink structure
+        run: |
+          npm run env:cli -- rewrite structure '/%year%/%monthnum%/%postname%/' --path=/var/www/${{ env.LOCAL_DIR }}
+
+      - name: Install MU plugin
+        run: |
+          mkdir ./${{ env.LOCAL_DIR }}/wp-content/mu-plugins
+          cp ./tests/performance/wp-content/mu-plugins/server-timing.php ./${{ env.LOCAL_DIR }}/wp-content/mu-plugins/server-timing.php
+
+      - name: Run performance tests (current commit)
+        run: npm run test:performance
+
+      - name: Print performance tests results
+        run: "node ./tests/performance/results.js"
+
+      - name: Set the environment to the baseline version
+        run: |
+          npm run env:cli -- core update --version=${{ env.BASE_TAG }} --force --path=/var/www/${{ env.LOCAL_DIR }}
+          npm run env:cli -- core version --path=/var/www/${{ env.LOCAL_DIR }}
+
+      - name: Run baseline performance tests
+        run: npm run test:performance -- --prefix=base
+
+      - name: Print base line performance tests results
+        run: "node ./tests/performance/results.js --prefix=base"
+
+      - name: Set the base sha
+        # Only needed when publishing results.
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        id: base-sha
+        with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            script: |
+                const baseRef = await github.rest.git.getRef({ owner: context.repo.owner, repo: context.repo.repo, ref: 'tags/${{ env.BASE_TAG }}' });
+                return baseRef.data.object.sha;
+
+      - name: Set commit details
+        # Only needed when publishing results.
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        id: commit-timestamp
+        with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
+            script: |
+                const commit_details = await github.rest.git.getCommit({ owner: context.repo.owner, repo: context.repo.repo, commit_sha: context.sha });
+                return parseInt((new Date( commit_details.data.author.date ).getTime() / 1000).toFixed(0))
+
+      - name: Publish performance results
+        # Only publish results on pushes to trunk.
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
+        env:
+            BASE_SHA: ${{ steps.base-sha.outputs.result }}
+            COMMITTED_AT: ${{ steps.commit-timestamp.outputs.result }}
+            CODEVITALS_PROJECT_TOKEN: ${{ secrets.CODEVITALS_PROJECT_TOKEN }}
+            HOST_NAME: "www.codevitals.run"
+        run: node ./tests/performance/log-results.js $CODEVITALS_PROJECT_TOKEN trunk $GITHUB_SHA $BASE_SHA $COMMITTED_AT $HOST_NAME
+
+      - name: Ensure version-controlled files are not modified or deleted
+        run: git diff --exit-code
+
+  slack-notifications:
+    name: Slack Notifications
+    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
+    needs: [ performance ]
+    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
+    with:
+      calling_status: ${{ needs.performance.result == 'success' && 'success' || needs.performance.result == 'cancelled' && 'cancelled' || 'failure' }}
+    secrets:
+      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
+      SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
+      SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }}
+      SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }}
+
+  failed-workflow:
+    name: Failed workflow tasks
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
+    if: |
+      always() &&
+      github.repository == 'WordPress/wordpress-develop' &&
+      github.event_name != 'pull_request' &&
+      github.run_attempt < 2 &&
+      (
+        needs.performance.result == 'cancelled' || needs.performance.result == 'failure'
+      )
+
+    steps:
+      - name: Dispatch workflow run
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        with:
+          retries: 2
+          retry-exempt-status-codes: 418
+          script: |
+            github.rest.actions.createWorkflowDispatch({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'failed-workflow.yml',
+              ref: 'trunk',
+              inputs: {
+                run_id: '${{ github.run_id }}'
+              }
+            });
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
index 411da95db252c..44ddf710bdc59 100644
--- a/.github/workflows/php-compatibility.yml
+++ b/.github/workflows/php-compatibility.yml
@@ -35,6 +35,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
 
   # Runs PHP compatibility testing.
@@ -46,31 +50,32 @@ jobs:
   # - Sets up PHP.
   # - Logs debug information.
   # - Configures caching for PHP compatibility scans.
-  # - Installs Composer dependencies (use cache if possible).
+  # - Installs Composer dependencies.
   # - Make Composer packages available globally.
-  # - Logs PHP_CodeSniffer debug information.
   # - Runs the PHP compatibility tests.
+  # - Generate a report for displaying issues as pull request annotations.
   # - Ensures version-controlled files are not modified or deleted.
   php-compatibility:
     name: Check PHP compatibility
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Set up PHP
-        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2.22.0
+        uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
         with:
           php-version: '7.4'
           coverage: none
-          tools: composer, cs2pr
+          tools: cs2pr
 
       - name: Log debug information
         run: |
-          php --version
           composer --version
 
       # This date is used to ensure that the PHP compatibility cache is cleared at least once every week.
@@ -80,22 +85,21 @@ jobs:
         run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
 
       - name: Cache PHP compatibility scan cache
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
+        uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
         with:
           path: .cache/phpcompat.json
           key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcompat-cache-${{ hashFiles('**/composer.json', 'phpcompat.xml.dist') }}
 
+      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
+      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
       - name: Install Composer dependencies
         uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
         with:
-          composer-options: "--no-progress --no-ansi"
+          custom-cache-suffix: ${{ steps.get-date.outputs.date }}
 
       - name: Make Composer packages available globally
         run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
 
-      - name: Log PHPCS debug information
-        run: phpcs -i
-
       - name: Run PHP compatibility tests
         id: phpcs
         run: phpcs --standard=phpcompat.xml.dist --report-full --report-checkstyle=./.cache/phpcs-compat-report.xml
@@ -110,6 +114,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ php-compatibility ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -123,7 +130,9 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ php-compatibility, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -135,7 +144,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/phpunit-tests-run.yml b/.github/workflows/phpunit-tests-run.yml
new file mode 100644
index 0000000000000..843a950481f19
--- /dev/null
+++ b/.github/workflows/phpunit-tests-run.yml
@@ -0,0 +1,184 @@
+##
+# A callable workflow that runs the PHPUnit test suite with the specified configuration.
+##
+name: Run PHPUnit tests
+
+on:
+  workflow_call:
+    inputs:
+      os:
+        description: 'Operating system to run tests on'
+        required: false
+        type: 'string'
+        default: 'ubuntu-latest'
+      php:
+        description: 'The version of PHP to use, in the format of X.Y'
+        required: true
+        type: 'string'
+      db-type:
+        description: 'Database type. Valid types are mysql and mariadb'
+        required: false
+        type: 'string'
+        default: 'mysql'
+      db-version:
+        description: 'Database version'
+        required: false
+        type: 'string'
+        default: '8.0'
+      multisite:
+        description: 'Whether to run tests as multisite'
+        required: false
+        type: 'boolean'
+        default: false
+      memcached:
+        description: 'Whether to test with memcached enabled'
+        required: false
+        type: 'boolean'
+        default: false
+      phpunit-config:
+        description: 'The PHPUnit configuration file to use'
+        required: false
+        type: 'string'
+        default: 'phpunit.xml.dist'
+      report:
+        description: 'Whether to report results to WordPress.org Hosting Tests'
+        required: false
+        type: 'boolean'
+        default: false
+env:
+  LOCAL_PHP: ${{ inputs.php }}-fpm
+  LOCAL_DB_TYPE: ${{ inputs.db-type }}
+  LOCAL_DB_VERSION: ${{ inputs.db-version }}
+  LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
+  PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
+  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
+
+jobs:
+  # Runs the PHPUnit tests for WordPress.
+  #
+  # Performs the following steps:
+  # - Sets environment variables.
+  # - Checks out the repository.
+  # - Sets up Node.js.
+  # - Sets up PHP.
+  # - Installs Composer dependencies.
+  # - Installs npm dependencies
+  # - Logs general debug information about the runner.
+  # - Logs Docker debug information (about the Docker installation within the runner).
+  # - Starts the WordPress Docker container.
+  # - Logs the running Docker containers.
+  # - Logs debug information about what's installed within the WordPress Docker containers.
+  # - Install WordPress within the Docker container.
+  # - Run the PHPUnit tests.
+  # - Ensures version-controlled files are not modified or deleted.
+  # - Checks out the WordPress Test reporter repository.
+  # - Submit the test results to the WordPress.org host test results.
+  phpunit-tests:
+    name: PHP ${{ inputs.php }} / ${{ 'mariadb' == inputs.db-type && 'MariaDB' || 'MySQL' }} ${{ inputs.db-version }}${{ inputs.multisite && ' multisite' || '' }}${{ inputs.memcached && ' with memcached' || '' }}${{ inputs.report && ' (test reporting enabled)' || '' }}
+    runs-on: ${{ inputs.os }}
+    timeout-minutes: 20
+
+    steps:
+      - name: Configure environment variables
+        run: |
+          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
+          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
+
+      - name: Checkout repository
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+
+      ##
+      # This allows Composer dependencies to be installed using a single step.
+      #
+      # Since the tests are currently run within the Docker containers where the PHP version varies,
+      # the same PHP version needs to be configured for the action runner machine so that the correct
+      # dependency versions are installed and cached.
+      ##
+      - name: Set up PHP
+        uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
+        with:
+          php-version: '${{ inputs.php }}'
+          coverage: none
+
+      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
+      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
+        with:
+          custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: General debug information
+        run: |
+          npm --version
+          node --version
+          curl --version
+          git --version
+          svn --version
+          composer --version
+          locale -a
+
+      - name: Docker debug information
+        run: |
+          docker -v
+          docker-compose -v
+
+      - name: Start Docker environment
+        run: |
+          npm run env:start
+
+      - name: Log running Docker containers
+        run: docker ps -a
+
+      - name: WordPress Docker container debug information
+        run: |
+          docker-compose run --rm mysql ${{ env.LOCAL_DB_TYPE }} --version
+          docker-compose run --rm php php --version
+          docker-compose run --rm php php -m
+          docker-compose run --rm php php -i
+          docker-compose run --rm php locale -a
+
+      - name: Install WordPress
+        run: npm run env:install
+
+      - name: Run PHPUnit tests
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
+
+      - name: Run AJAX tests
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
+
+      - name: Run ms-files tests as a multisite install
+        if: ${{ inputs.multisite }}
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files
+
+      - name: Run external HTTP tests
+        if: ${{ ! inputs.multisite }}
+        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
+
+      # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
+      - name: Run (Xdebug) tests
+        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
+
+      - name: Ensure version-controlled files are not modified or deleted
+        run: git diff --exit-code
+
+      - name: Checkout the WordPress Test Reporter
+        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        with:
+          repository: 'WordPress/phpunit-test-runner'
+          path: 'test-runner'
+
+      - name: Submit test results to the WordPress.org host test results
+        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && inputs.report }}
+        env:
+          WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
+        run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index c2276ca035729..9c399d51ed791 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -26,214 +26,117 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
-env:
-  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
-  LOCAL_PHP_MEMCACHED: ${{ false }}
-  SLOW_TESTS: 'external-http,media,restapi'
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
 
 jobs:
-  # Runs the PHPUnit tests for WordPress.
   #
-  # Performs the following steps:
-  # - Sets environment variables.
-  # - Sets up the environment variables needed for testing with memcached (if desired).
-  # - Installs Node.js.
-  # - Installs npm dependencies
-  # - Configures caching for Composer.
-  # - Installs Composer dependencies.
-  # - Logs Docker debug information (about the Docker installation within the runner).
-  # - Starts the WordPress Docker container.
-  # - Logs general debug information about the runner.
-  # - Logs the running Docker containers.
-  # - Logs debug information from inside the WordPress Docker container.
-  # - Logs debug information about what's installed within the WordPress Docker containers.
-  # - Install WordPress within the Docker container.
-  # - Run the PHPUnit tests.
-  # - Ensures version-controlled files are not modified or deleted.
-  # - Checks out the WordPress Test reporter repository.
-  # - Reconnect the directory to the Git repository.
-  # - Submit the test results to the WordPress.org host test results.
-  test-php:
-    name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 20
+  # Creates a PHPUnit test job for each PHP/MySQL combination.
+  #
+  test-with-mysql:
+    name: PHP ${{ matrix.php }}
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
+    permissions:
+      contents: read
+    secrets: inherit
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
-        php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         os: [ ubuntu-latest ]
-        memcached: [ false ]
-        split_slow: [ false ]
+        php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        db-type: [ 'mysql' ]
+        db-version: [ '5.7', '8.0' ]
         multisite: [ false, true ]
+        memcached: [ false ]
+
         include:
-          # Additional "slow" jobs for PHP 5.6.
-          - php: '5.6'
-            os: ubuntu-latest
-            memcached: false
-            multisite: false
-            split_slow: true
-          - php: '5.6'
-            os: ubuntu-latest
-            memcached: false
-            multisite: true
-            split_slow: true
           # Include jobs for PHP 7.4 with memcached.
-          - php: '7.4'
-            os: ubuntu-latest
-            memcached: true
+          - os: ubuntu-latest
+            php: '7.4'
+            db-type: 'mysql'
+            db-version: '5.7'
             multisite: false
-          - php: '7.4'
-            os: ubuntu-latest
             memcached: true
+          - os: ubuntu-latest
+            php: '7.4'
+            db-type: 'mysql'
+            db-version: '5.7'
             multisite: true
-          # Report the results of the PHP 7.4 without memcached job.
-          - php: '7.4'
-            os: ubuntu-latest
-            memcached: false
+            memcached: true
+          # Report test results to the Host Test Results.
+          - os: ubuntu-latest
+            php: '7.4'
+            db-type: 'mysql'
+            db-version: '5.7'
             multisite: false
+            memcached: false
             report: true
+    with:
+      os: ${{ matrix.os }}
+      php: ${{ matrix.php }}
+      db-type: ${{ matrix.db-type }}
+      db-version: ${{ matrix.db-version }}
+      multisite: ${{ matrix.multisite }}
+      memcached: ${{ matrix.memcached }}
+      phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
+      report: ${{ matrix.report || false }}
 
-    env:
-      LOCAL_PHP: ${{ matrix.php }}-fpm
-      LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
-      PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
-
-    steps:
-      - name: Configure environment variables
-        run: |
-          echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
-          echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
-
-      - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install Dependencies
-        run: npm ci
-
-      # This date is used to ensure that the Composer cache is refreshed at least once every week.
-      # http://man7.org/linux/man-pages/man1/date.1.html
-      - name: "Get last Monday's date"
-        id: get-date
-        run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
-        env:
-          cache-name: cache-composer-dependencies
-        with:
-          path: ${{ steps.composer-cache.outputs.composer_dir }}
-          key: ${{ runner.os }}-php-${{ matrix.php }}-date-${{ steps.get-date.outputs.date }}-composer-${{ hashFiles('**/composer.json') }}
-
-      - name: Install Composer dependencies
-        run: |
-          docker-compose run --rm php composer --version
-
-          # Install using `composer update` as there is no `composer.lock` file.
-          if [ ${{ env.LOCAL_PHP }} == '8.2-fpm' ]; then
-            docker-compose run --rm php composer update --ignore-platform-req=php+
-          else
-            docker-compose run --rm php composer update
-          fi
-
-      - name: Docker debug information
-        run: |
-          docker -v
-          docker-compose -v
-
-      - name: Start Docker environment
-        run: |
-          npm run env:start
-
-      - name: General debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
-      - name: Log running Docker containers
-        run: docker ps -a
-
-      - name: WordPress Docker container debug information
-        run: |
-          docker-compose run --rm mysql mysql --version
-          docker-compose run --rm php php --version
-          docker-compose run --rm php php -m
-          docker-compose run --rm php php -i
-          docker-compose run --rm php locale -a
-
-      - name: Install WordPress
-        run: npm run env:install
-
-      - name: Run slow PHPUnit tests
-        if: ${{ matrix.split_slow }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
-
-      - name: Run PHPUnit tests for single site excluding slow tests
-        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
-
-      - name: Run PHPUnit tests for Multisite excluding slow tests
-        if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
-
-      - name: Run PHPUnit tests
-        if: ${{ matrix.php >= '7.0' }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }}
-
-      - name: Run AJAX tests
-        if: ${{ ! matrix.split_slow }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
-
-      - name: Run ms-files tests as a multisite install
-        if: ${{ matrix.multisite && ! matrix.split_slow }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c tests/phpunit/multisite.xml --group ms-files
-
-      - name: Run external HTTP tests
-        if: ${{ ! matrix.multisite && ! matrix.split_slow }}
-        run: node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit --verbose -c phpunit.xml.dist --group external-http
-
-      # __fakegroup__ is excluded to force PHPUnit to ignore the <exclude> settings in phpunit.xml.dist.
-      # This test group is not (yet) run against PHP 8.2 as there is no stable Xdebug version available yet for PHP 8.2.
-      - name: Run (Xdebug) tests
-        if: ${{ ! matrix.split_slow && matrix.php != '8.2' }}
-        run: LOCAL_PHP_XDEBUG=true node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit -v --group xdebug --exclude-group __fakegroup__
-
-      - name: Ensure version-controlled files are not modified or deleted
-        run: git diff --exit-code
-
-      - name: Checkout the WordPress Test Reporter
-        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-        with:
-          repository: 'WordPress/phpunit-test-runner'
-          path: 'test-runner'
+  #
+  # Creates a PHPUnit test job for each PHP/MariaDB combination.
+  #
+  test-with-mariadb:
+    name: PHP ${{ matrix.php }}
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
+    permissions:
+      contents: read
+    secrets: inherit
+    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ]
+        php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        db-type: [ 'mariadb' ]
+        db-version: [ '10.4', '10.6', '10.11', '11.0' ]
+        multisite: [ false, true ]
+        memcached: [ false ]
 
-      - name: Submit test results to the WordPress.org host test results
-        if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
-        env:
-          WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
-        run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
+        include:
+        # Include jobs for PHP 7.4 with memcached.
+        - os: ubuntu-latest
+          php: '7.4'
+          db-type: 'mariadb'
+          db-version: '11.0'
+          multisite: false
+          memcached: true
+        - os: ubuntu-latest
+          php: '7.4'
+          db-type: 'mariadb'
+          db-version: '11.0'
+          multisite: true
+          memcached: true
+    with:
+      os: ${{ matrix.os }}
+      php: ${{ matrix.php }}
+      db-type: ${{ matrix.db-type }}
+      db-version: ${{ matrix.db-version }}
+      multisite: ${{ matrix.multisite }}
+      memcached: ${{ matrix.memcached }}
+      phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
+      report: ${{ matrix.report || false }}
 
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
-    needs: [ test-php ]
+    permissions:
+      actions: read
+      contents: read
+    needs: [ test-with-mysql, test-with-mariadb ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
-      calling_status: ${{ needs.test-php.result == 'success' && 'success' || needs.test-php.result == 'cancelled' && 'cancelled' || 'failure' }}
+      calling_status: ${{ needs.test-with-mysql.result == 'success' && needs.test-with-mariadb.result == 'success' && 'success' || ( needs.test-with-mysql.result == 'cancelled' || needs.test-with-mariadb.result == 'cancelled' ) && 'cancelled' || 'failure' }}
     secrets:
       SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
       SLACK_GHA_CANCELLED_WEBHOOK: ${{ secrets.SLACK_GHA_CANCELLED_WEBHOOK }}
@@ -243,19 +146,22 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ test-php, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
       github.event_name != 'pull_request' &&
       github.run_attempt < 2 &&
       (
-        needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
+        needs.test-with-mysql.result == 'cancelled' || needs.test-with-mysql.result == 'failure' ||
+        needs.test-with-mariadb.result == 'cancelled' || needs.test-with-mariadb.result == 'failure'
       )
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/slack-notifications.yml b/.github/workflows/slack-notifications.yml
index 82dd566b43dec..2d7674b3aabc8 100644
--- a/.github/workflows/slack-notifications.yml
+++ b/.github/workflows/slack-notifications.yml
@@ -26,6 +26,10 @@ on:
         description: 'The Slack webhook URL for a failed build.'
         required: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 env:
   CURRENT_BRANCH: ${{ github.ref_name }}
 
@@ -44,6 +48,9 @@ jobs:
   prepare:
     name: Prepare notifications
     runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
     timeout-minutes: 5
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event.workflow_run.event != 'pull_request' }}
     outputs:
@@ -53,7 +60,7 @@ jobs:
     steps:
       - name: Determine the status of the previous attempt
         id: previous-attempt-result
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
@@ -118,7 +125,7 @@ jobs:
 
       - name: Get the commit message
         id: current-commit-message
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
         with:
           retries: 2
diff --git a/.github/workflows/test-and-zip-default-themes.yml b/.github/workflows/test-and-zip-default-themes.yml
index 9c6cb3a6da312..9757e02af16de 100644
--- a/.github/workflows/test-and-zip-default-themes.yml
+++ b/.github/workflows/test-and-zip-default-themes.yml
@@ -44,18 +44,24 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   # Tests the build script for themes that have one.
   #
   # Performs the following steps:
   # - Checks out the repository.
-  # - Installs Node.js (only when theme has a build process)
-  # - Installs npm dependencies (only when theme has a build process)
-  # - Runs the theme build script (only when theme has a build process)
+  # - Sets up Node.js.
+  # - Installs npm dependencies.
+  # - Runs the theme build script.
   # - Ensures version-controlled files are not modified or deleted.
   test-build-scripts:
     name: Test ${{ matrix.theme }} build script
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 10
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     strategy:
@@ -73,12 +79,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version-file: '.nvmrc'
           cache: npm
@@ -101,6 +107,8 @@ jobs:
   bundle-theme:
     name: Create ${{ matrix.theme }} ZIP file
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     needs: [ test-build-scripts ]
     timeout-minutes: 10
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -125,12 +133,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}
 
       - name: Upload theme ZIP as an artifact
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
           if-no-files-found: error
           name: ${{ matrix.theme }}
@@ -139,6 +147,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ bundle-theme, test-build-scripts ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -152,7 +163,9 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ test-build-scripts, bundle-theme, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -165,7 +178,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
index f91647baa0988..dd2389486f7db 100644
--- a/.github/workflows/test-coverage.yml
+++ b/.github/workflows/test-coverage.yml
@@ -24,6 +24,10 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 env:
   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
   LOCAL_PHP: '7.4-fpm'
@@ -32,31 +36,32 @@ env:
   LOCAL_PHP_MEMCACHED: ${{ false }}
 
 jobs:
-  # Sets up WordPress for testing or development use.
+  # Runs the PHPUnit tests for WordPress.
   #
   # Performs the following steps:
   # - Sets environment variables.
   # - Checks out the repository.
-  # - Checks out the WordPress Importer plugin (needed for the Core PHPUnit tests).
-  # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # _ Installs npm dependencies.
+  # - Sets up Node.js.
+  # - Sets up PHP.
+  # - Installs Composer dependencies.
+  # - Installs npm dependencies
+  # - Logs general debug information about the runner.
   # - Logs Docker debug information (about the Docker installation within the runner).
   # - Starts the WordPress Docker container.
-  # - Logs debug general information.
   # - Logs the running Docker containers.
-  # - Logs WordPress Docker container debug information.
   # - Logs debug information about what's installed within the WordPress Docker containers.
   # - Install WordPress within the Docker container.
   # - Run the PHPUnit tests as a single site.
   # - Ensures version-controlled files are not modified or deleted.
   # - Upload the single site code coverage report to Codecov.io.
-  # - Run the PHPUnit tests as a multisite.
+  # - Run the PHPUnit tests as a multisite installation.
   # - Ensures version-controlled files are not modified or deleted.
   # - Upload the multisite code coverage report to Codecov.io.
   test-coverage-report:
     name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     timeout-minutes: 120
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     strategy:
@@ -71,7 +76,36 @@ jobs:
           echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
 
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
+
+      ##
+      # This allows Composer dependencies to be installed using a single step.
+      #
+      # Since the tests are currently run within the Docker containers where the PHP version varies,
+      # the same PHP version needs to be configured for the action runner machine so that the correct
+      # dependency versions are installed and cached.
+      ##
+      - name: Set up PHP
+        uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
+        with:
+          php-version: '7.4'
+          coverage: none
+
+      # Since Composer dependencies are installed using `composer update` and no lock file is in version control,
+      # passing a custom cache suffix ensures that the cache is flushed at least once per week.
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
+        with:
+          custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")
+
+      - name: Install npm Dependencies
+        run: npm ci
 
       - name: Log debug information
         run: |
@@ -82,44 +116,9 @@ jobs:
           curl --version
           git --version
           svn --version
-          php --version
-          php -i
+          composer --version
           locale -a
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install Dependencies
-        run: npm ci
-
-      # This date is used to ensure that the Composer cache is refreshed at least once every week.
-      # http://man7.org/linux/man-pages/man1/date.1.html
-      - name: "Get last Monday's date"
-        id: get-date
-        run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # v3.0.11
-        env:
-          cache-name: cache-composer-dependencies
-        with:
-          path: ${{ steps.composer-cache.outputs.composer_dir }}
-          key: ${{ runner.os }}-php-${{ matrix.php }}-date-${{ steps.get-date.outputs.date }}-composer-${{ hashFiles('**/composer.json') }}
-
-      - name: Install Composer dependencies
-        run: |
-          docker-compose run --rm php composer --version
-
-          # Install using `composer update` as there is no `composer.lock` file.
-          docker-compose run --rm php composer update
-
       - name: Docker debug information
         run: |
           docker -v
@@ -129,14 +128,6 @@ jobs:
         run: |
           npm run env:start
 
-      - name: General debug information
-        run: |
-          npm --version
-          node --version
-          curl --version
-          git --version
-          svn --version
-
       - name: Log running Docker containers
         run: docker ps -a
 
@@ -184,6 +175,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ test-coverage-report ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -197,7 +191,9 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ test-coverage-report, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -209,7 +205,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/test-npm.yml b/.github/workflows/test-npm.yml
index 7f38dd7794997..f73c2a01d7116 100644
--- a/.github/workflows/test-npm.yml
+++ b/.github/workflows/test-npm.yml
@@ -33,6 +33,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
   cancel-in-progress: true
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 env:
   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
 
@@ -41,9 +45,9 @@ jobs:
   #
   # Performs the following steps:
   # - Checks out the repository.
+  # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # _ Installs npm dependencies.
+  # - Installs npm dependencies.
   # - Builds WordPress to run from the `build` directory.
   # - Cleans up after building WordPress to the `build` directory.
   # - Ensures version-controlled files are not modified or deleted.
@@ -53,6 +57,8 @@ jobs:
   test-npm:
     name: Test npm on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    permissions:
+      contents: read
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
     strategy:
@@ -62,7 +68,13 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
 
       - name: Log debug information
         run: |
@@ -72,13 +84,7 @@ jobs:
           git --version
           svn --version
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install Dependencies
+      - name: Install npm Dependencies
         run: npm ci
 
       - name: Build WordPress in /src
@@ -104,11 +110,15 @@ jobs:
   # This is separate from the job above in order to use stricter conditions about when to run.
   # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
   #
+  # The `matrix` and `runner` contexts are not available for use within `if` expressions. So there is
+  # currently no way to determine the OS being used on a given job.
+  # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
+  #
   # Performs the following steps:
   # - Checks out the repository.
+  # - Sets up Node.js.
   # - Logs debug information about the GitHub Action runner.
-  # - Installs Node.js.
-  # _ Installs npm dependencies.
+  # - Installs npm dependencies.
   # - Builds WordPress to run from the `build` directory.
   # - Cleans up after building WordPress to the `build` directory.
   # - Ensures version-controlled files are not modified or deleted.
@@ -118,11 +128,19 @@ jobs:
   test-npm-macos:
     name: Test npm on MacOS
     runs-on: macos-latest
+    permissions:
+      contents: read
     timeout-minutes: 30
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
+        with:
+          node-version-file: '.nvmrc'
+          cache: npm
 
       - name: Log debug information
         run: |
@@ -132,13 +150,7 @@ jobs:
           git --version
           svn --version
 
-      - name: Install Node.js
-        uses: actions/setup-node@8c91899e586c5b171469028077307d293428b516 # v3.5.1
-        with:
-          node-version-file: '.nvmrc'
-          cache: npm
-
-      - name: Install Dependencies
+      - name: Install npm Dependencies
         run: npm ci
 
       - name: Build WordPress in /src
@@ -162,6 +174,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ test-npm, test-npm-macos ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
@@ -175,7 +190,9 @@ jobs:
   failed-workflow:
     name: Failed workflow tasks
     runs-on: ubuntu-latest
-    needs: [ test-npm, test-npm-macos, slack-notifications ]
+    permissions:
+      actions: write
+    needs: [ slack-notifications ]
     if: |
       always() &&
       github.repository == 'WordPress/wordpress-develop' &&
@@ -188,7 +205,7 @@ jobs:
 
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
         with:
           retries: 2
           retry-exempt-status-codes: 418
diff --git a/.github/workflows/test-old-branches.yml b/.github/workflows/test-old-branches.yml
index a4aa24b8ce1f9..03ccb4f97449e 100644
--- a/.github/workflows/test-old-branches.yml
+++ b/.github/workflows/test-old-branches.yml
@@ -12,10 +12,16 @@ on:
     - cron: '0 0 1 * *'
     - cron: '0 0 15 * *'
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   dispatch-workflows-for-old-branches:
     name: ${{ matrix.workflow }} for ${{ matrix.branch }}
     runs-on: ubuntu-latest
+    permissions:
+      actions: write
     timeout-minutes: 20
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     strategy:
@@ -28,13 +34,16 @@ jobs:
             'test-npm.yml'
         ]
         branch: [
-            '6.1','6.0',
+            '6.3', '6.2', '6.1','6.0',
             '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
-            '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1', '4.0',
-            '3.9', '3.8', '3.7'
+            '4.9', '4.8', '4.7', '4.6', '4.5', '4.4', '4.3', '4.2', '4.1'
         ]
         include:
           # PHP Compatibility testing was introduced in 5.5.
+          - branch: '6.3'
+            workflow: 'php-compatibility.yml'
+          - branch: '6.2'
+            workflow: 'php-compatibility.yml'
           - branch: '6.1'
             workflow: 'php-compatibility.yml'
           - branch: '6.0'
@@ -53,6 +62,10 @@ jobs:
           # End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions.
           # Starting in 5.8 with #52905, some additional tests with real assertions were introduced.
           # Branches 5.8 and newer should be tested to confirm no regressions are introduced.
+          - branch: '6.3'
+            workflow: 'end-to-end-tests.yml'
+          - branch: '6.2'
+            workflow: 'end-to-end-tests.yml'
           - branch: '6.1'
             workflow: 'end-to-end-tests.yml'
           - branch: '6.0'
@@ -61,18 +74,18 @@ jobs:
             workflow: 'end-to-end-tests.yml'
           - branch: '5.8'
             workflow: 'end-to-end-tests.yml'
-        exclude:
-          # Coding standards and JavaScript testing did not take place in 3.7.
-          - branch: '3.7'
-            workflow: 'coding-standards.yml'
-          - branch: '3.7'
-            workflow: 'javascript-tests.yml'
+
+          # Performance testing was introduced in 6.2.
+          - branch: '6.3'
+            workflow: 'performance.yml'
+          - branch: '6.2'
+            workflow: 'performance.yml'
 
     # Run all branches monthly, but only the currently supported one twice per month.
     steps:
       - name: Dispatch workflow run
-        uses: actions/github-script@100527700e8b29ca817ac0e0dfbfc5e8ff38edda # v6.3.2
-        if: ${{ github.event_name == 'push' || github.event.schedule == '0 0 15 * *' || matrix.branch == '6.1' }}
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        if: ${{ github.event_name == 'push' || github.event.schedule == '0 0 15 * *' || matrix.branch == '6.3' }}
         with:
           retries: 2
           retry-exempt-status-codes: 418
@@ -87,6 +100,9 @@ jobs:
   slack-notifications:
     name: Slack Notifications
     uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
+    permissions:
+      actions: read
+      contents: read
     needs: [ dispatch-workflows-for-old-branches ]
     if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
     with:
diff --git a/.github/workflows/welcome-new-contributors.yml b/.github/workflows/welcome-new-contributors.yml
index 191ef4b8dc535..048fb787fa50d 100644
--- a/.github/workflows/welcome-new-contributors.yml
+++ b/.github/workflows/welcome-new-contributors.yml
@@ -4,17 +4,22 @@ on:
   pull_request_target:
     types: [ opened ]
 
+# Disable permissions for all available scopes by default.
+# Any needed permissions should be configured at the job level.
+permissions: {}
+
 jobs:
   # Comments on a pull request when the author is a new contributor.
   post-welcome-message:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
     timeout-minutes: 5
     if: ${{ github.repository == 'WordPress/wordpress-develop' }}
 
     steps:
-      - uses: wow-actions/welcome@fafa00fbd13d9c5d0fbd761c249153506c62bcd8 # v1.1.0
+      - uses: wow-actions/welcome@72817eb31cda1de60f51893d80e2e82ce57f7e76 # v1.3.0
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           FIRST_PR_COMMENT: >
             Hi @{{ author }}! 👋
 
diff --git a/.gitignore b/.gitignore
index bf174880a3c32..c0d8a2d79f4bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ wp-tests-config.php
 /tests/phpunit/data/plugins/wordpress-importer
 /tests/phpunit/data/.trac-ticket-cache*
 /tests/qunit/compiled.html
+/tests/performance/**/*.test.results.json
 /src/.wp-tests-version
 /node_modules
 /npm-debug.log
@@ -38,6 +39,7 @@ wp-tests-config.php
 /src/wp-includes/blocks/**/*.js.map
 /packagehash.txt
 /artifacts
+/setup.log
 
 # Files and folders that get created in wp-content
 /src/wp-content/blogs.dir
diff --git a/.jshintrc b/.jshintrc
index 20dadcd1fa305..fb4a1cf8bacea 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -24,6 +24,10 @@
 		"wp": false,
 		"export": false,
 		"module": false,
-		"require": false
+		"require": false,
+		"WorkerGlobalScope": false,
+		"self": false,
+		"OffscreenCanvas": false,
+		"Promise": false
 	}
 }
diff --git a/.npmrc b/.npmrc
index aafab1669bf72..cd7566c820233 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1,3 @@
 save-exact = true
 engine-strict = true
+legacy-peer-deps = true
diff --git a/.nvmrc b/.nvmrc
index 8351c19397f4f..b6a7d89c68e0c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-14
+16
diff --git a/Gruntfile.js b/Gruntfile.js
index de15cdb4198fe..22fca0ca07dd2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -32,6 +32,40 @@ module.exports = function(grunt) {
 			'wp-content/plugins/akismet/**',
 			'!wp-content/themes/twenty*/node_modules/**',
 		],
+
+		// All built CSS files, in /src or /build.
+		cssFiles = [
+			'wp-admin/css/*.min.css',
+			'wp-admin/css/*-rtl*.css',
+			'wp-includes/css/*.min.css',
+			'wp-includes/css/*-rtl*.css',
+			'wp-admin/css/colors/**/*.css',
+		],
+
+		// All built js files, in /src or /build.
+		jsFiles = [
+			'wp-admin/js/',
+			'wp-includes/js/',
+			'wp-includes/blocks/**/*.js',
+			'wp-includes/blocks/**/*.js.map',
+		],
+
+		// All files built by Webpack, in /src or /build.
+		webpackFiles = [
+			'wp-includes/assets/*',
+			'wp-includes/css/dist',
+			'wp-includes/blocks/**/*.css',
+			'!wp-includes/assets/script-loader-packages.min.php',
+		],
+
+		// Prepend `dir` to `file`, and keep `!` in place.
+		setFilePath = function( dir, file ) {
+			if ( '!' === file.charAt( 0 ) ) {
+				return '!' + dir + file.substring( 1 );
+			}
+
+			return dir + file;
+		},
 		changedFiles = {
 			php: []
 		};
@@ -50,9 +84,13 @@ module.exports = function(grunt) {
 
 	// Load tasks.
 	require('matchdep').filterDev(['grunt-*', '!grunt-legacy-util']).forEach( grunt.loadNpmTasks );
+
 	// Load legacy utils.
 	grunt.util = require('grunt-legacy-util');
 
+	// Load PostCSS tasks.
+	grunt.loadNpmTasks('@lodder/grunt-postcss');
+
 	// Project configuration.
 	grunt.initConfig({
 		postcss: {
@@ -103,30 +141,36 @@ module.exports = function(grunt) {
 		clean: {
 			plugins: [BUILD_DIR + 'wp-content/plugins'],
 			themes: [BUILD_DIR + 'wp-content/themes'],
+
+			// Clean the files from /build and the JS, CSS, and Webpack files from /src.
 			files: buildFiles.concat( [
 				'!wp-config.php',
 			] ).map( function( file ) {
-				if ( '!' === file.charAt( 0 ) ) {
-					return '!' + BUILD_DIR + file.substring( 1 );
-				}
-				return BUILD_DIR + file;
+				return setFilePath( BUILD_DIR, file );
+			} ).concat(
+				cssFiles.map( function( file ) {
+					return setFilePath( SOURCE_DIR, file );
+				} )
+			).concat(
+				jsFiles.map( function( file ) {
+					return setFilePath( SOURCE_DIR, file );
+				} )
+			).concat(
+				webpackFiles.map( function( file ) {
+					return setFilePath( SOURCE_DIR, file );
+				} )
+			),
+
+			// Clean built JS, CSS, and Webpack files from either /src or /build.
+			css: cssFiles.map( function( file ) {
+				return setFilePath( WORKING_DIR, file );
+			} ),
+			js: jsFiles.map( function( file ) {
+				return setFilePath( WORKING_DIR, file );
+			} ),
+			'webpack-assets': webpackFiles.map( function( file ) {
+				return setFilePath( WORKING_DIR, file );
 			} ),
-			css: [
-				WORKING_DIR + 'wp-admin/css/*.min.css',
-				WORKING_DIR + 'wp-admin/css/*-rtl*.css',
-				WORKING_DIR + 'wp-includes/css/*.min.css',
-				WORKING_DIR + 'wp-includes/css/*-rtl*.css',
-				WORKING_DIR + 'wp-admin/css/colors/**/*.css'
-			],
-			js: [
-				WORKING_DIR + 'wp-admin/js/',
-				WORKING_DIR + 'wp-includes/js/'
-			],
-			'webpack-assets': [
-				WORKING_DIR + 'wp-includes/assets/*',
-				WORKING_DIR + 'wp-includes/css/dist/',
-				'!' + WORKING_DIR + 'wp-includes/assets/script-loader-packages.min.php'
-			],
 			dynamic: {
 				dot: true,
 				expand: true,
@@ -189,13 +233,13 @@ module.exports = function(grunt) {
 
 						// Renamed to avoid conflict with jQuery hoverIntent.min.js (after minifying).
 						[ WORKING_DIR + 'wp-includes/js/hoverintent-js.min.js' ]: [ './node_modules/hoverintent/dist/hoverintent.min.js' ],
+
 						[ WORKING_DIR + 'wp-includes/js/imagesloaded.min.js' ]: [ './node_modules/imagesloaded/imagesloaded.pkgd.min.js' ],
 						[ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.js' ],
 						[ WORKING_DIR + 'wp-includes/js/jquery/jquery.min.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
 						[ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
 						[ WORKING_DIR + 'wp-includes/js/jquery/jquery.color.min.js' ]: [ './node_modules/jquery-color/dist/jquery.color.min.js' ],
 						[ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
-						[ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/dist/twemoji.js' ],
 						[ WORKING_DIR + 'wp-includes/js/underscore.js' ]: [ './node_modules/underscore/underscore.js' ],
 					}
 				]
@@ -233,15 +277,16 @@ module.exports = function(grunt) {
 							'suggest*'
 						],
 						dest: WORKING_DIR + 'wp-includes/js/jquery/'
-					},
-					{
+					}
+				].concat(
+					// Copy tinymce.js only when building to /src.
+					WORKING_DIR === SOURCE_DIR ? {
 						expand: true,
 						cwd: SOURCE_DIR + 'js/_enqueues/vendor/tinymce/',
 						src: 'tinymce.js',
 						dest: SOURCE_DIR + 'wp-includes/js/tinymce/'
-					},
-
-				]
+					} : []
+				)
 			},
 			'admin-js': {
 				files: {
@@ -272,6 +317,7 @@ module.exports = function(grunt) {
 					[ WORKING_DIR + 'wp-admin/js/media.js' ]: [ './src/js/_enqueues/admin/media.js' ],
 					[ WORKING_DIR + 'wp-admin/js/nav-menu.js' ]: [ './src/js/_enqueues/lib/nav-menu.js' ],
 					[ WORKING_DIR + 'wp-admin/js/password-strength-meter.js' ]: [ './src/js/_enqueues/wp/password-strength-meter.js' ],
+					[ WORKING_DIR + 'wp-admin/js/password-toggle.js' ]: [ './src/js/_enqueues/admin/password-toggle.js' ],
 					[ WORKING_DIR + 'wp-admin/js/plugin-install.js' ]: [ './src/js/_enqueues/admin/plugin-install.js' ],
 					[ WORKING_DIR + 'wp-admin/js/post.js' ]: [ './src/js/_enqueues/admin/post.js' ],
 					[ WORKING_DIR + 'wp-admin/js/postbox.js' ]: [ './src/js/_enqueues/admin/postbox.js' ],
@@ -718,21 +764,8 @@ module.exports = function(grunt) {
 					'!wp-admin/js/custom-header.js', // Why? We should minify this.
 					'!wp-admin/js/farbtastic.js',
 					'!wp-includes/js/swfobject.js',
-					'!wp-includes/js/wp-embed.js' // We have extra options for this, see uglify:embed.
 				]
 			},
-			embed: {
-				options: {
-					compress: {
-						conditionals: false
-					}
-				},
-				expand: true,
-				cwd: WORKING_DIR,
-				dest: WORKING_DIR,
-				ext: '.min.js',
-				src: ['wp-includes/js/wp-embed.js']
-			},
 			'jquery-ui': {
 				options: {
 					// Preserve comments that start with a bang.
@@ -990,29 +1023,6 @@ module.exports = function(grunt) {
 				}
 			}
 		},
-		jsvalidate:{
-			options: {
-				globals: {},
-				esprimaOptions:{},
-				verbose: false
-			},
-			build: {
-				files: {
-					src: [
-						WORKING_DIR + 'wp-{admin,includes}/**/*.js',
-						WORKING_DIR + 'wp-content/themes/twenty*/**/*.js',
-						'!' + WORKING_DIR + 'wp-content/themes/twenty*/node_modules/**/*.js',
-						'!' + WORKING_DIR + 'wp-includes/blocks/**/*.js',
-						'!' + WORKING_DIR + 'wp-includes/js/dist/**/*.js',
-					]
-				}
-			},
-			dynamic: {
-				files: {
-					src: []
-				}
-			}
-		},
 		imagemin: {
 			core: {
 				expand: true,
@@ -1101,7 +1111,7 @@ module.exports = function(grunt) {
 				options: {
 					patterns: [
 						{
-							match: new RegExp( '//# sourceMappingURL=.*\\s*' ),
+							match: new RegExp( '\/\/# sourceMappingURL=.*\\s*', 'g' ),
 							replacement: ''
 						}
 					]
@@ -1114,6 +1124,14 @@ module.exports = function(grunt) {
 							BUILD_DIR + 'wp-includes/js/underscore.js'
 						],
 						dest: BUILD_DIR + 'wp-includes/js/'
+					},
+					{
+						expand: true,
+						flatten: true,
+						src: [
+							BUILD_DIR + 'wp-includes/js/dist/block-editor.js',
+						],
+						dest: BUILD_DIR + 'wp-includes/js/dist/'
 					}
 				]
 			}
@@ -1137,7 +1155,7 @@ module.exports = function(grunt) {
 			},
 			'js-enqueues': {
 				files: [SOURCE_DIR + 'js/_enqueues/**/*.js'],
-				tasks: ['clean:dynamic', 'copy:dynamic-js', 'uglify:dynamic', 'jsvalidate:dynamic'],
+				tasks: ['clean:dynamic', 'copy:dynamic-js', 'uglify:dynamic'],
 				options: {
 					dot: true,
 					spawn: false
@@ -1149,7 +1167,7 @@ module.exports = function(grunt) {
 					'!' + SOURCE_DIR + 'js/_enqueues/**/*.js',
 					'webpack-dev.config.js'
 				],
-				tasks: ['clean:dynamic', 'webpack:dev', 'uglify:dynamic', 'jsvalidate:dynamic'],
+				tasks: ['clean:dynamic', 'webpack:dev', 'uglify:dynamic'],
 				options: {
 					dot: true,
 					spawn: false
@@ -1413,7 +1431,11 @@ module.exports = function(grunt) {
 		} );
 		grunt.file.write(
 			SOURCE_DIR + 'wp-includes/blocks/blocks-json.php',
-			'<?php return ' + json2php( blocks ) + ';'
+			'<?php return ' + json2php.make( {
+				linebreak: '\n',
+				indent: '  ',
+				shortArraySyntax: false
+			} )( blocks ) + ';'
 		);
 	} );
 
@@ -1426,7 +1448,6 @@ module.exports = function(grunt) {
 
 	grunt.registerTask( 'uglify:all', [
 		'uglify:core',
-		'uglify:embed',
 		'uglify:jquery-ui',
 		'uglify:imgareaselect',
 		'uglify:jqueryform',
@@ -1446,8 +1467,7 @@ module.exports = function(grunt) {
 		'file_append',
 		'uglify:all',
 		'concat:tinymce',
-		'concat:emoji',
-		'jsvalidate:build'
+		'concat:emoji'
 	] );
 
 	grunt.registerTask( 'build:css', [
@@ -1473,38 +1493,10 @@ module.exports = function(grunt) {
 	 * Build verification tasks.
 	 */
 	grunt.registerTask( 'verify:build', [
-		'verify:wp-embed',
 		'verify:old-files',
 		'verify:source-maps',
 	] );
 
-	/**
-	 * Build assertions for wp-embed.min.js.
-	 *
-	 * @ticket 34698
-	 */
-	grunt.registerTask( 'verify:wp-embed', function() {
-		const file = `${ BUILD_DIR }/wp-includes/js/wp-embed.min.js`;
-
-		assert(
-			fs.existsSync( file ),
-			'The build/wp-includes/js/wp-embed.min.js file does not exist.'
-		);
-
-		const contents = fs.readFileSync( file, {
-			encoding: 'utf8',
-		} );
-
-		assert(
-			contents.length > 0,
-			'The build/wp-includes/js/wp-embed.min.js file must not be empty.'
-		);
-		assert(
-			false === contents.includes( '&' ),
-			'The build/wp-includes/js/wp-embed.min.js file must not contain ampersands.'
-		);
-	} );
-
 	/**
 	 * Build assertions to ensure no project files are inside `$_old_files` in the build directory.
 	 *
@@ -1784,7 +1776,7 @@ module.exports = function(grunt) {
 			if ( action !== 'deleted' ) {
 				grunt.config( [ 'copy', 'dynamic-js', 'files' ], files );
 			}
-		// For the webpack builds configure the jsvalidate task to only check those files build by webpack.
+		// For the webpack builds configure the task to only check those files built by webpack.
 		} else if ( target === 'js-webpack' ) {
 			src = [
 				'wp-includes/js/media-audiovideo.js',
@@ -1806,17 +1798,19 @@ module.exports = function(grunt) {
 			// Clean up only those files that were deleted.
 			grunt.config( [ 'clean', 'dynamic', 'src' ], src );
 		} else {
-			// Otherwise copy over only the changed file.
-			grunt.config( [ 'copy', 'dynamic', 'src' ], src );
+			if ( ! grunt.option( 'dev' ) ) {
+				// Otherwise copy over only the changed file.
+				grunt.config(['copy', 'dynamic', 'src'], src);
+			}
 
 			// For javascript also minify and validate the changed file.
 			if ( target === 'js-enqueues' ) {
 				grunt.config( [ 'uglify', 'dynamic', 'src' ], src );
-				grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return  WORKING_DIR + dir; } ) );
+				grunt.config( [ 'dynamic', 'files', 'src' ], src.map( function( dir ) { return  WORKING_DIR + dir; } ) );
 			}
 			// For webpack only validate the file, minification is handled by webpack itself.
 			if ( target === 'js-webpack' ) {
-				grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return  WORKING_DIR + dir; } ) );
+				grunt.config( [ 'dynamic', 'files', 'src' ], src.map( function( dir ) { return  WORKING_DIR + dir; } ) );
 			}
 			// For css run the rtl task on just the changed file.
 			if ( target === 'rtl' ) {
diff --git a/README.md b/README.md
index be8aa75404b4d..e49cd13af3a8b 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,22 @@ Welcome to the WordPress development repository! Please check out the [contribut
 
 ## Getting Started
 
+### Using GitHub Codespaces
+
+To get started, create a codespace for this repository by clicking this 👇 
+
+[![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new?hide_repo_select=true&ref=trunk&repo=75645659)
+
+A codespace will open in a web-based version of Visual Studio Code. The [dev container](.devcontainer/devcontainer.json) is fully configured with softwares needed for this project.
+
+**Note**: Dev containers is an open spec which is supported by [GitHub Codespaces](https://github.com/codespaces) and [other tools](https://containers.dev/supporting).
+
+In some browsers the keyboard shortcut for opening the command palette (Ctrl/Command + Shift + P) may collide with a browser shortcut. The command palette can be opened via the `F1` key or via the cog icon in the bottom left of the editor.
+
+When opening your codespace, be sure to wait for the `postCreateCommand` to finish running to ensure your WordPress install is successfully set up. This can take a few minutes.
+
+### Local development
+
 WordPress is a PHP, MySQL, and JavaScript based project, and uses Node for its JavaScript dependencies. A local development environment is available to quickly get up and running.
 
 You will need a basic understanding of how to use the command line on your computer. This will allow you to set up the local development environment, to start it and stop it when necessary, and to run the tests.
@@ -19,7 +35,7 @@ You will need Node and npm installed on your computer. Node is a JavaScript runt
 
 If you are not using a package manager, see the [Node.js download page](https://nodejs.org/en/download/) for installers and binaries.
 
-**Note:** WordPress currently only supports Node.js `14.x` and npm `6.x`.
+**Note:** WordPress currently only officially supports Node.js `16.x` and npm `8.x`.
 
 You will also need [Docker](https://www.docker.com/products/docker-desktop) installed and running on your computer. Docker is the virtualization software that powers the local development environment. Docker can be installed just like any other regular application.
 
@@ -38,7 +54,7 @@ npm run env:start
 npm run env:install
 ```
 
-Your WordPress site will accessible at http://localhost:8889. You can see or change configurations in the `.env` file located at the root of the project directory.
+Your WordPress site will be accessible at http://localhost:8889. You can see or change configurations in the `.env` file located at the root of the project directory.
 
 #### To watch for changes
 
@@ -108,6 +124,8 @@ To login to the site, navigate to http://localhost:8889/wp-admin.
 * Username: `admin`
 * Password: `password`
 
+**Note:** With Codespaces, open the portforwarded URL from the ports tab in the terminal, and append `/wp-admin` to login to the site.
+
 To generate a new password (recommended):
 
 1. Go to the Dashboard
diff --git a/SECURITY.md b/SECURITY.md
index 7fe5c619f7989..7d9e4b9368cef 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,94 +1,40 @@
 # Security Policy
 
-Full details of the WordPress Security Policy can be found on [HackerOne](https://hackerone.com/wordpress). You can also read more in a detailed white paper about [WordPress Security](https://wordpress.org/about/security/).
+WordPress is an open-source publishing platform. The WordPress Security Team believes in Responsible Disclosure by alerting the security team immediately and privately of any potential vulnerabilities.
 
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 6.1.x   | :white_check_mark: |
-| 6.0.x   | :white_check_mark: |
-| 5.9.x   | :white_check_mark: |
-| 5.8.x   | :white_check_mark: |
-| 5.7.x   | :white_check_mark: |
-| 5.6.x   | :white_check_mark: |
-| 5.5.x   | :white_check_mark: |
-| 5.4.x   | :white_check_mark: |
-| 5.3.x   | :white_check_mark: |
-| 5.2.x   | :white_check_mark: |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :white_check_mark: |
-| 4.9.x   | :white_check_mark: |
-| 4.8.x   | :white_check_mark: |
-| 4.7.x   | :white_check_mark: |
-| 4.6.x   | :white_check_mark: |
-| 4.5.x   | :white_check_mark: |
-| 4.4.x   | :white_check_mark: |
-| 4.3.x   | :white_check_mark: |
-| 4.2.x   | :white_check_mark: |
-| 4.1.x   | :white_check_mark: |
-| 4.0.x   | :white_check_mark: |
-| 3.9.x   | :white_check_mark: |
-| 3.8.x   | :white_check_mark: |
-| 3.7.x   | :white_check_mark: |
-| < 3.7.0 | :x:              |
-
-## Reporting a Vulnerability
-
-[<span>WordPress</span>](https://wordpress.org/) is an open-source publishing platform. Our HackerOne program covers the Core software, as well as a variety of related projects and infrastructure.
-
-Our most critical targets are:
-
-*   WordPress Core [<span>software</span>](https://wordpress.org/download/source/), [<span>API</span>](https://codex.wordpress.org/WordPress.org_API), and [<span>website</span>](https://wordpress.org/).
-*   Gutenberg [<span>software</span>](https://github.com/WordPress/gutenberg/) and Classic Editor [<span>software</span>](https://wordpress.org/plugins/classic-editor/).
-*   WP-CLI [<span>software</span>](https://github.com/wp-cli/) and [<span>website</span>](https://wp-cli.org/).
-*   BuddyPress [<span>software</span>](https://buddypress.org/download/) and [<span>website</span>](https://buddypress.org/).
-*   bbPress [<span>software</span>](https://bbpress.org/download/) and [<span>website</span>](https://bbpress.org/).
-*   GlotPress [<span>software</span>](https://github.com/glotpress/glotpress-wp) (but not the website).
-*   WordCamp.org [<span>website</span>](https://central.wordcamp.org).
+Our HackerOne program covers the Core software, as well as a variety of related projects and infrastructure.
 
-Source code for most websites can be found in the Meta repository (`git clone git://meta.git.wordpress.org/`). [<span>The Meta Environment</span>](https://github.com/WordPress/meta-environment) will automatically provision a local copy of some sites for you.
+Full details of the WordPress Security Policy and the list of covered projects and infrastructure can be found on [HackerOne](https://hackerone.com/wordpress). You can also read more in a detailed white paper about [WordPress Security](https://wordpress.org/about/security/).
 
-For more targets, see the `In Scope` section below.
-
-_Please note that **WordPress.com is a separate entity** from the main WordPress open source project. Please report vulnerabilities for WordPress.com or the WordPress mobile apps through [Automattic's HackerOne page](https://hackerone.com/automattic)._
-
-## Qualifying Vulnerabilities
-
-Any reproducible vulnerability that has a severe effect on the security or privacy of our users is likely to be in scope for the program. Common examples include XSS, CSRF, SSRF, RCE, SQLi, and privilege escalation.
-
-We generally **aren’t** interested in the following problems:
-
-*   Any vulnerability with a [<span>CVSS 3</span>](https://www.first.org/cvss/calculator/3.0) score lower than `4.0`, unless it can be combined with other vulnerabilities to achieve a higher score.
-*   Brute force, DoS, phishing, text injection, or social engineering attacks. Wikis, Tracs, forums, etc are intended to allow users to edit them.
-*   Security vulnerabilities in WordPress plugins not _specifically_ listed as an in-scope asset. Out of scope plugins can be [<span>reported to the Plugin Review team</span>](https://developer.wordpress.org/plugins/wordpress-org/plugin-developer-faq/#how-can-i-send-a-security-report).
-*   Reports for hacked websites. The site owner can [<span>learn more about restoring their site</span>](https://make.wordpress.org/core/handbook/testing/reporting-security-vulnerabilities/#ive-been-hacked-what-do-i-do-now).
-*   [<span>Users with administrator or editor privileges can post arbitrary JavaScript</span>](https://make.wordpress.org/core/handbook/testing/reporting-security-vulnerabilities/#why-are-some-users-allowed-to-post-unfiltered-html)
-*   [<span>Disclosure of user IDs</span>](https://make.wordpress.org/core/handbook/testing/reporting-security-vulnerabilities/#why-are-disclosures-of-usernames-or-user-ids-not-a-security-issue)
-*   Open API endpoints serving public data (Including [<span>usernames and user IDs</span>](https://make.wordpress.org/core/handbook/testing/reporting-security-vulnerabilities/#why-are-disclosures-of-usernames-or-user-ids-not-a-security-issue))
-*   [<span>Path disclosures for errors, warnings, or notices</span>](https://make.wordpress.org/core/handbook/testing/reporting-security-vulnerabilities/#why-are-there-path-disclosures-when-directly-loading-certain-files)
-*   WordPress version number disclosure
-*   Mixed content warnings for passive assets like images and videos
-*   Lack of HTTP security headers (CSP, X-XSS, etc.)
-*   Output from automated scans - please manually verify issues and include a valid proof of concept.
-*   Any non-severe vulnerability on `irclogs.wordpress.org`, `lists.wordpress.org`, or any other low impact site.
-*   Clickjacking with minimal security implications
-*   Vulnerabilities in Composer/npm `devDependencies`, unless there's a practical way to exploit it remotely.
-*   Theoretical vulnerabilities where you can't demonstrate a significant security impact with a PoC.
-
-## Guidelines
+## Supported Versions
 
-We're committed to working with security researchers to resolve the vulnerabilities they discover. You can help us by following these guidelines:
+| Version | Supported |
+| ------- | --------- |
+| 6.3.x   | Yes       |
+| 6.2.x   | Yes       |
+| 6.1.x   | Yes       |
+| 6.0.x   | Yes       |
+| 5.9.x   | Yes       |
+| 5.8.x   | Yes       |
+| 5.7.x   | Yes       |
+| 5.6.x   | Yes       |
+| 5.5.x   | Yes       |
+| 5.4.x   | Yes       |
+| 5.3.x   | Yes       |
+| 5.2.x   | Yes       |
+| 5.1.x   | Yes       |
+| 5.0.x   | Yes       |
+| 4.9.x   | Yes       |
+| 4.8.x   | Yes       |
+| 4.7.x   | Yes       |
+| 4.6.x   | Yes       |
+| 4.5.x   | Yes       |
+| 4.4.x   | Yes       |
+| 4.3.x   | Yes       |
+| 4.2.x   | Yes       |
+| 4.1.x   | Yes       |
+| < 4.1.0 | No        |
 
-*   Follow [<span>HackerOne's disclosure guidelines</span>](https://www.hackerone.com/disclosure-guidelines).
-*   Pen-testing Production:
-    *   Please **setup a local environment** instead whenever possible. Most of our code is open source (see above).
-    *   If that's not possible, **limit any data access/modification** to the bare minimum necessary to reproduce a PoC.
-    *   **_Don't_ automate form submissions!** That's very annoying for us, because it adds extra work for the volunteers who manage those systems, and reduces the signal/noise ratio in our communication channels.
-    *   If you don't follow these guidelines **we will not award a bounty for the report.**
-*   Be Patient - Give us a reasonable time to correct the issue before you disclose the vulnerability. We care deeply about security, but we're an open-source project and our team is mostly comprised of volunteers. WordPress powers over 30% of the Web, so changes must undergo multiple levels of peer-review and testing, to make sure that they don't break millions of websites when they're installed automatically.
+## Reporting a Vulnerability
 
-We also expect you to comply with all applicable laws. You're responsible to pay any taxes associated with your bounties.
+Security issues must be submitted via [HackerOne](https://hackerone.com/wordpress) and it is recommended you read the full policy document before submitting your report.
diff --git a/composer.json b/composer.json
index 8e27c8df7b5c5..46cc81b28acb2 100644
--- a/composer.json
+++ b/composer.json
@@ -10,14 +10,14 @@
 		"issues": "https://core.trac.wordpress.org/"
 	},
 	"require": {
-		"php": ">=5.6"
+		"php": ">=7.0"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"squizlabs/php_codesniffer": "3.6.0",
 		"wp-coding-standards/wpcs": "~2.3.0",
 		"phpcompatibility/phpcompatibility-wp": "~2.1.3",
-		"yoast/phpunit-polyfills": "^1.0.1"
+		"yoast/phpunit-polyfills": "^1.1.0"
 	},
 	"config": {
 		"allow-plugins": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 739c65f4a8dc5..58f4e08d9183f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,7 +25,10 @@ services:
     command: /bin/sh -c "envsubst '$$LOCAL_DIR' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'"
 
     depends_on:
-      - php
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
 
   ##
   # The PHP container.
@@ -52,9 +55,6 @@ services:
     # Copy or delete the Memcached dropin plugin file as appropriate.
     command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm"
 
-    depends_on:
-      - mysql
-
     # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
     init: true
 
@@ -83,6 +83,12 @@ services:
     # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0.
     command: --default-authentication-plugin=mysql_native_password
 
+    healthcheck:
+      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
+      timeout: 5s
+      interval: 5s
+      retries: 10
+
   ##
   # The WP CLI container.
   ##
@@ -107,6 +113,12 @@ services:
     extra_hosts:
       - localhost:host-gateway
 
+    depends_on:
+      php:
+        condition: service_started
+      mysql:
+        condition: service_healthy
+
   ##
   # The Memcached container.
   ##
@@ -119,6 +131,10 @@ services:
     ports:
       - 11211:11211
 
+    depends_on:
+      php:
+        condition: service_started
+
 volumes:
   # So that sites aren't wiped every time containers are restarted, MySQL uses a persistent volume.
   mysql: {}
diff --git a/package-lock.json b/package-lock.json
index 39fe8f31d0eb2..a11880549e539 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,207 +1,446 @@
 {
 	"name": "WordPress",
-	"version": "6.2.0",
-	"lockfileVersion": 1,
+	"version": "6.4.0",
+	"lockfileVersion": 3,
 	"requires": true,
-	"dependencies": {
-		"@ampproject/remapping": {
+	"packages": {
+		"": {
+			"name": "WordPress",
+			"version": "6.4.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@emotion/is-prop-valid": "0.8.8",
+				"@emotion/memoize": "0.7.4",
+				"@wordpress/a11y": "3.35.1",
+				"@wordpress/annotations": "2.35.7",
+				"@wordpress/api-fetch": "6.32.1",
+				"@wordpress/autop": "3.35.1",
+				"@wordpress/blob": "3.35.1",
+				"@wordpress/block-directory": "4.12.16",
+				"@wordpress/block-editor": "12.3.13",
+				"@wordpress/block-library": "8.12.16",
+				"@wordpress/block-serialization-default-parser": "4.35.1",
+				"@wordpress/blocks": "12.12.7",
+				"@wordpress/commands": "0.6.11",
+				"@wordpress/components": "25.1.10",
+				"@wordpress/compose": "6.12.2",
+				"@wordpress/core-commands": "0.4.14",
+				"@wordpress/core-data": "6.12.14",
+				"@wordpress/customize-widgets": "4.12.16",
+				"@wordpress/data": "9.5.5",
+				"@wordpress/data-controls": "3.4.5",
+				"@wordpress/date": "4.35.1",
+				"@wordpress/deprecated": "3.35.1",
+				"@wordpress/dom": "3.35.1",
+				"@wordpress/dom-ready": "3.35.1",
+				"@wordpress/edit-post": "7.12.16",
+				"@wordpress/edit-site": "5.12.16",
+				"@wordpress/edit-widgets": "5.12.16",
+				"@wordpress/editor": "13.12.14",
+				"@wordpress/element": "5.12.1",
+				"@wordpress/escape-html": "2.35.1",
+				"@wordpress/format-library": "4.12.13",
+				"@wordpress/hooks": "3.35.1",
+				"@wordpress/html-entities": "3.35.1",
+				"@wordpress/i18n": "4.35.1",
+				"@wordpress/icons": "9.26.2",
+				"@wordpress/interface": "5.12.10",
+				"@wordpress/is-shallow-equal": "4.35.1",
+				"@wordpress/keyboard-shortcuts": "4.12.5",
+				"@wordpress/keycodes": "3.35.1",
+				"@wordpress/list-reusable-blocks": "4.12.10",
+				"@wordpress/media-utils": "4.26.1",
+				"@wordpress/notices": "4.3.5",
+				"@wordpress/nux": "7.1.3",
+				"@wordpress/plugins": "6.3.10",
+				"@wordpress/preferences": "3.12.10",
+				"@wordpress/preferences-persistence": "1.27.1",
+				"@wordpress/primitives": "3.33.1",
+				"@wordpress/priority-queue": "2.35.1",
+				"@wordpress/private-apis": "0.17.2",
+				"@wordpress/redux-routine": "4.35.1",
+				"@wordpress/reusable-blocks": "4.12.14",
+				"@wordpress/rich-text": "6.12.7",
+				"@wordpress/router": "0.4.2",
+				"@wordpress/server-side-render": "4.12.12",
+				"@wordpress/shortcode": "3.35.1",
+				"@wordpress/style-engine": "1.18.1",
+				"@wordpress/token-list": "2.35.1",
+				"@wordpress/url": "3.36.1",
+				"@wordpress/viewport": "5.12.5",
+				"@wordpress/warning": "2.35.1",
+				"@wordpress/widgets": "3.12.14",
+				"@wordpress/wordcount": "3.35.1",
+				"backbone": "1.5.0",
+				"clipboard": "2.0.11",
+				"core-js-url-browser": "3.6.4",
+				"element-closest": "^3.0.2",
+				"formdata-polyfill": "4.0.10",
+				"framer-motion": "10.11.6",
+				"hoverintent": "2.2.1",
+				"imagesloaded": "5.0.0",
+				"is-plain-object": "5.0.0",
+				"jquery": "3.7.0",
+				"jquery-color": "2.2.0",
+				"jquery-form": "4.3.0",
+				"jquery-hoverintent": "1.10.2",
+				"json2php": "^0.0.7",
+				"lodash": "4.17.21",
+				"masonry-layout": "4.2.2",
+				"memize": "2.1.0",
+				"moment": "2.29.4",
+				"objectFitPolyfill": "2.3.5",
+				"path-to-regexp": "6.2.1",
+				"polyfill-library": "4.7.0",
+				"react": "18.2.0",
+				"react-dom": "18.2.0",
+				"regenerator-runtime": "0.13.11",
+				"tslib": "2.6.0",
+				"underscore": "1.13.6",
+				"whatwg-fetch": "3.6.17",
+				"wicg-inert": "3.1.2"
+			},
+			"devDependencies": {
+				"@lodder/grunt-postcss": "^3.1.1",
+				"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
+				"@wordpress/babel-preset-default": "7.19.1",
+				"@wordpress/dependency-extraction-webpack-plugin": "4.18.1",
+				"@wordpress/e2e-test-utils": "10.6.4",
+				"@wordpress/scripts": "26.6.3",
+				"autoprefixer": "10.4.14",
+				"chalk": "5.3.0",
+				"check-node-version": "4.2.1",
+				"copy-webpack-plugin": "11.0.0",
+				"cssnano": "6.0.1",
+				"dotenv": "16.3.1",
+				"dotenv-expand": "10.0.0",
+				"grunt": "~1.6.1",
+				"grunt-banner": "^0.6.0",
+				"grunt-contrib-clean": "~2.0.1",
+				"grunt-contrib-concat": "2.1.0",
+				"grunt-contrib-copy": "~1.0.0",
+				"grunt-contrib-cssmin": "~5.0.0",
+				"grunt-contrib-imagemin": "~4.0.0",
+				"grunt-contrib-jshint": "3.2.0",
+				"grunt-contrib-qunit": "~7.0.1",
+				"grunt-contrib-uglify": "~5.2.2",
+				"grunt-contrib-watch": "~1.1.0",
+				"grunt-file-append": "0.0.7",
+				"grunt-jsdoc": "2.4.1",
+				"grunt-legacy-util": "^2.0.1",
+				"grunt-patch-wordpress": "~3.0.0",
+				"grunt-replace-lts": "~1.1.0",
+				"grunt-rtlcss": "~2.0.2",
+				"grunt-sass": "~3.1.0",
+				"grunt-webpack": "6.0.0",
+				"ink-docstrap": "1.3.2",
+				"install-changed": "1.1.0",
+				"jest-image-snapshot": "^6.2.0",
+				"matchdep": "~2.0.0",
+				"postcss": "8.4.27",
+				"prettier": "npm:wp-prettier@2.6.2",
+				"qunit": "~2.19.4",
+				"react-refresh": "0.10.0",
+				"sass": "1.65.1",
+				"sinon": "15.2.0",
+				"sinon-test": "~3.1.5",
+				"source-map-loader": "4.0.1",
+				"terser-webpack-plugin": "5.3.9",
+				"uglify-js": "^3.17.4",
+				"uuid": "9.0.0",
+				"wait-on": "7.0.1",
+				"webpack": "5.88.2",
+				"webpack-livereload-plugin": "3.0.2"
+			},
+			"engines": {
+				"node": ">=16.19.1",
+				"npm": ">=8.19.3 <9"
+			}
+		},
+		"node_modules/@aashutoshrathi/word-wrap": {
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+			"integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@ampproject/remapping": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
 			"integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@jridgewell/gen-mapping": "^0.1.0",
 				"@jridgewell/trace-mapping": "^0.3.9"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/@ariakit/core": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.2.7.tgz",
+			"integrity": "sha512-Hs0N1EMYq88WW4v9xnSIHNR38TvbQuoUX6FYFmeLCZSTIXQBiET7lr1DQXwOOmdEtRtlxQ5HsxbTkxeOkPv+eg=="
+		},
+		"node_modules/@ariakit/react": {
+			"version": "0.2.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.2.12.tgz",
+			"integrity": "sha512-4rAgMyUURHW78EKgRCanhyRUtsiYCOxO65BBHF4mg3tZsDeOvu9kBG5IAXX8mUgakTcyr0EKXuOtGThaj7gobA==",
+			"dependencies": {
+				"@ariakit/react-core": "0.2.12"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/ariakit"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0"
+			}
+		},
+		"node_modules/@ariakit/react-core": {
+			"version": "0.2.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.2.12.tgz",
+			"integrity": "sha512-3KSKlX10nnhCvjsbPW0CAnqG+6grryfwnMkeJJ/h34FSV7hEfUMexmIjKBVZyfBG08Xj8NjSK8kkx9c3ChkXeA==",
+			"dependencies": {
+				"@ariakit/core": "0.2.7",
+				"@floating-ui/dom": "^1.0.0",
+				"use-sync-external-store": "^1.2.0"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0"
 			}
 		},
-		"@babel/code-frame": {
+		"node_modules/@babel/code-frame": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
 			"integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
-			"requires": {
+			"dependencies": {
 				"@babel/highlight": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/compat-data": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz",
-			"integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==",
-			"dev": true
+		"node_modules/@babel/compat-data": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+			"integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/core": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
-			"integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
+		"node_modules/@babel/core": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+			"integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
 			"dev": true,
-			"requires": {
-				"@ampproject/remapping": "^2.1.0",
+			"dependencies": {
+				"@ampproject/remapping": "^2.2.0",
 				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.6",
-				"@babel/helper-compilation-targets": "^7.19.3",
-				"@babel/helper-module-transforms": "^7.19.6",
-				"@babel/helpers": "^7.19.4",
-				"@babel/parser": "^7.19.6",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.6",
-				"@babel/types": "^7.19.4",
+				"@babel/generator": "^7.21.0",
+				"@babel/helper-compilation-targets": "^7.20.7",
+				"@babel/helper-module-transforms": "^7.21.0",
+				"@babel/helpers": "^7.21.0",
+				"@babel/parser": "^7.21.0",
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.21.0",
+				"@babel/types": "^7.21.0",
 				"convert-source-map": "^1.7.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.1",
+				"json5": "^2.2.2",
 				"semver": "^6.3.0"
 			},
-			"dependencies": {
-				"@babel/parser": {
-					"version": "7.19.6",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
-					"integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/babel"
 			}
 		},
-		"@babel/eslint-parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-			"integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
+		"node_modules/@babel/core/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/@babel/eslint-parser": {
+			"version": "7.22.9",
+			"resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz",
+			"integrity": "sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
 				"eslint-visitor-keys": "^2.1.0",
-				"semver": "^6.3.0"
+				"semver": "^6.3.1"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7.11.0",
+				"eslint": "^7.5.0 || ^8.0.0"
+			}
+		},
+		"node_modules/@babel/eslint-parser/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@babel/generator": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.6.tgz",
-			"integrity": "sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==",
+		"node_modules/@babel/generator": {
+			"version": "7.21.1",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+			"integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.19.4",
+			"dependencies": {
+				"@babel/types": "^7.21.0",
 				"@jridgewell/gen-mapping": "^0.3.2",
+				"@jridgewell/trace-mapping": "^0.3.17",
 				"jsesc": "^2.5.1"
 			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+			"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+			"dev": true,
 			"dependencies": {
-				"@jridgewell/gen-mapping": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-					"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-					"dev": true,
-					"requires": {
-						"@jridgewell/set-array": "^1.0.1",
-						"@jridgewell/sourcemap-codec": "^1.4.10",
-						"@jridgewell/trace-mapping": "^0.3.9"
-					}
-				}
+				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.9"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@babel/helper-annotate-as-pure": {
+		"node_modules/@babel/helper-annotate-as-pure": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
 			"integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-builder-binary-assignment-operator-visitor": {
+		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
 			"integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-explode-assignable-expression": "^7.18.6",
 				"@babel/types": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-compilation-targets": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
-			"integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+		"node_modules/@babel/helper-compilation-targets": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+			"integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.19.3",
+			"dependencies": {
+				"@babel/compat-data": "^7.20.5",
 				"@babel/helper-validator-option": "^7.18.6",
 				"browserslist": "^4.21.3",
+				"lru-cache": "^5.1.1",
 				"semver": "^6.3.0"
 			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+			"dev": true,
 			"dependencies": {
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+				"yallist": "^3.0.2"
+			}
+		},
+		"node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@babel/helper-create-class-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+		"node_modules/@babel/helper-compilation-targets/node_modules/yallist": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+			"dev": true
+		},
+		"node_modules/@babel/helper-create-class-features-plugin": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz",
+			"integrity": "sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
+				"@babel/helper-function-name": "^7.21.0",
+				"@babel/helper-member-expression-to-functions": "^7.21.0",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.9",
+				"@babel/helper-replace-supers": "^7.20.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
 				"@babel/helper-split-export-declaration": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+		"node_modules/@babel/helper-create-regexp-features-plugin": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz",
+			"integrity": "sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"regexpu-core": "^5.1.0"
+				"regexpu-core": "^5.3.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-define-polyfill-provider": {
+		"node_modules/@babel/helper-define-polyfill-provider": {
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
 			"integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-compilation-targets": "^7.17.7",
 				"@babel/helper-plugin-utils": "^7.16.7",
 				"debug": "^4.1.1",
@@ -209,974 +448,1464 @@
 				"resolve": "^1.14.2",
 				"semver": "^6.1.2"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"peerDependencies": {
+				"@babel/core": "^7.4.0-0"
+			}
+		},
+		"node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@babel/helper-environment-visitor": {
+		"node_modules/@babel/helper-environment-visitor": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
 			"integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-explode-assignable-expression": {
+		"node_modules/@babel/helper-explode-assignable-expression": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
 			"integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-function-name": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-			"integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+		"node_modules/@babel/helper-function-name": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+			"integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
 			"dev": true,
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/types": "^7.19.0"
+			"dependencies": {
+				"@babel/template": "^7.20.7",
+				"@babel/types": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-hoist-variables": {
+		"node_modules/@babel/helper-hoist-variables": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
 			"integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-member-expression-to-functions": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-			"integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+		"node_modules/@babel/helper-member-expression-to-functions": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
+			"integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.9"
+			"dependencies": {
+				"@babel/types": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-module-imports": {
+		"node_modules/@babel/helper-module-imports": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
 			"integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-module-transforms": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-			"integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+		"node_modules/@babel/helper-module-transforms": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz",
+			"integrity": "sha512-eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-simple-access": "^7.19.4",
+				"@babel/helper-simple-access": "^7.20.2",
 				"@babel/helper-split-export-declaration": "^7.18.6",
 				"@babel/helper-validator-identifier": "^7.19.1",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.6",
-				"@babel/types": "^7.19.4"
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.21.0",
+				"@babel/types": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-optimise-call-expression": {
+		"node_modules/@babel/helper-optimise-call-expression": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
 			"integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-plugin-utils": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-			"integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
+		"node_modules/@babel/helper-plugin-utils": {
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+			"integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-remap-async-to-generator": {
+		"node_modules/@babel/helper-remap-async-to-generator": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
 			"integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-wrap-function": "^7.18.9",
 				"@babel/types": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/helper-replace-supers": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-			"integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+		"node_modules/@babel/helper-replace-supers": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
+			"integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
+				"@babel/helper-member-expression-to-functions": "^7.20.7",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0"
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.20.7",
+				"@babel/types": "^7.20.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-simple-access": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-			"integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+		"node_modules/@babel/helper-simple-access": {
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+			"integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.19.4"
+			"dependencies": {
+				"@babel/types": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-			"integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
+		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+			"integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.9"
+			"dependencies": {
+				"@babel/types": "^7.20.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-split-export-declaration": {
+		"node_modules/@babel/helper-split-export-declaration": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
 			"integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/types": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helper-string-parser": {
+		"node_modules/@babel/helper-string-parser": {
 			"version": "7.19.4",
 			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-			"integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+			"integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-validator-identifier": {
+		"node_modules/@babel/helper-validator-identifier": {
 			"version": "7.19.1",
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+			"integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-validator-option": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-			"integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-			"dev": true
+		"node_modules/@babel/helper-validator-option": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+			"integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
 		},
-		"@babel/helper-wrap-function": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-			"integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+		"node_modules/@babel/helper-wrap-function": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
+			"integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-function-name": "^7.19.0",
 				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/traverse": "^7.20.5",
+				"@babel/types": "^7.20.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/helpers": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz",
-			"integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+		"node_modules/@babel/helpers": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+			"integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
 			"dev": true,
-			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.4",
-				"@babel/types": "^7.19.4"
+			"dependencies": {
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.21.0",
+				"@babel/types": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/highlight": {
+		"node_modules/@babel/highlight": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
 			"integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
-			"requires": {
+			"dependencies": {
 				"@babel/helper-validator-identifier": "^7.18.6",
 				"chalk": "^2.0.0",
 				"js-tokens": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/@babel/highlight/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				}
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@babel/parser": {
-			"version": "7.12.11",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz",
-			"integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==",
-			"dev": true
+		"node_modules/@babel/parser": {
+			"version": "7.22.7",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz",
+			"integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==",
+			"dev": true,
+			"bin": {
+				"parser": "bin/babel-parser.js"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
 		},
-		"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
 			"integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
+			"integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.20.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.13.0"
 			}
 		},
-		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-			"integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
+		"node_modules/@babel/plugin-proposal-async-generator-functions": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+			"integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-remap-async-to-generator": "^7.18.9",
 				"@babel/plugin-syntax-async-generators": "^7.8.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-class-properties": {
+		"node_modules/@babel/plugin-proposal-class-properties": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
 			"integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-create-class-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-class-static-block": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-			"integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+		"node_modules/@babel/plugin-proposal-class-static-block": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
+			"integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.21.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.12.0"
 			}
 		},
-		"@babel/plugin-proposal-dynamic-import": {
+		"node_modules/@babel/plugin-proposal-dynamic-import": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
 			"integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-export-namespace-from": {
+		"node_modules/@babel/plugin-proposal-export-namespace-from": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
 			"integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-json-strings": {
+		"node_modules/@babel/plugin-proposal-json-strings": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
 			"integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-json-strings": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-			"integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+		"node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
+			"integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-nullish-coalescing-operator": {
+		"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
 			"integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-numeric-separator": {
+		"node_modules/@babel/plugin-proposal-numeric-separator": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
 			"integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-			"integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
+		"node_modules/@babel/plugin-proposal-object-rest-spread": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+			"integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.19.4",
-				"@babel/helper-compilation-targets": "^7.19.3",
-				"@babel/helper-plugin-utils": "^7.19.0",
+			"dependencies": {
+				"@babel/compat-data": "^7.20.5",
+				"@babel/helper-compilation-targets": "^7.20.7",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.18.8"
+				"@babel/plugin-transform-parameters": "^7.20.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-optional-catch-binding": {
+		"node_modules/@babel/plugin-proposal-optional-catch-binding": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
 			"integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+		"node_modules/@babel/plugin-proposal-optional-chaining": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+			"integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
 				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-private-methods": {
+		"node_modules/@babel/plugin-proposal-private-methods": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
 			"integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-create-class-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-			"integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+		"node_modules/@babel/plugin-proposal-private-property-in-object": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
+			"integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/helper-create-class-features-plugin": "^7.21.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-proposal-unicode-property-regex": {
+		"node_modules/@babel/plugin-proposal-unicode-property-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
 			"integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-async-generators": {
+		"node_modules/@babel/plugin-syntax-async-generators": {
 			"version": "7.8.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
 			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-bigint": {
+		"node_modules/@babel/plugin-syntax-bigint": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
 			"integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-class-properties": {
+		"node_modules/@babel/plugin-syntax-class-properties": {
 			"version": "7.12.13",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
 			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.12.13"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-class-static-block": {
+		"node_modules/@babel/plugin-syntax-class-static-block": {
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
 			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-dynamic-import": {
+		"node_modules/@babel/plugin-syntax-dynamic-import": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
 			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-export-namespace-from": {
+		"node_modules/@babel/plugin-syntax-export-namespace-from": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
 			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-import-assertions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-			"integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+		"node_modules/@babel/plugin-syntax-import-assertions": {
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+			"integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.19.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-import-meta": {
+		"node_modules/@babel/plugin-syntax-import-meta": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
 			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-json-strings": {
+		"node_modules/@babel/plugin-syntax-json-strings": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
 			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-jsx": {
+		"node_modules/@babel/plugin-syntax-jsx": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
 			"integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
-			"requires": {
+			"dev": true,
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-logical-assignment-operators": {
+		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
 			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-nullish-coalescing-operator": {
+		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
 			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-numeric-separator": {
+		"node_modules/@babel/plugin-syntax-numeric-separator": {
 			"version": "7.10.4",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
 			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.10.4"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-object-rest-spread": {
+		"node_modules/@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
 			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-optional-catch-binding": {
+		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
 			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-optional-chaining": {
+		"node_modules/@babel/plugin-syntax-optional-chaining": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
 			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.8.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-private-property-in-object": {
+		"node_modules/@babel/plugin-syntax-private-property-in-object": {
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
 			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-top-level-await": {
+		"node_modules/@babel/plugin-syntax-top-level-await": {
 			"version": "7.14.5",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
 			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.14.5"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-syntax-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-			"integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
+		"node_modules/@babel/plugin-syntax-typescript": {
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
+			"integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
-			}
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.19.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
 		},
-		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-			"integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+		"node_modules/@babel/plugin-transform-arrow-functions": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz",
+			"integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-			"integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+		"node_modules/@babel/plugin-transform-async-to-generator": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
+			"integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-remap-async-to-generator": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-remap-async-to-generator": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-block-scoped-functions": {
+		"node_modules/@babel/plugin-transform-block-scoped-functions": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
 			"integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-block-scoping": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz",
-			"integrity": "sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==",
+		"node_modules/@babel/plugin-transform-block-scoping": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
+			"integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-classes": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-			"integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+		"node_modules/@babel/plugin-transform-classes": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
+			"integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-compilation-targets": "^7.19.0",
+				"@babel/helper-compilation-targets": "^7.20.7",
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
+				"@babel/helper-function-name": "^7.21.0",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.18.9",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-replace-supers": "^7.20.7",
 				"@babel/helper-split-export-declaration": "^7.18.6",
 				"globals": "^11.1.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-computed-properties": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-			"integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+		"node_modules/@babel/plugin-transform-computed-properties": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz",
+			"integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/template": "^7.20.7"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-destructuring": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz",
-			"integrity": "sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==",
+		"node_modules/@babel/plugin-transform-destructuring": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz",
+			"integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-dotall-regex": {
+		"node_modules/@babel/plugin-transform-dotall-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
 			"integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-duplicate-keys": {
+		"node_modules/@babel/plugin-transform-duplicate-keys": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
 			"integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-exponentiation-operator": {
+		"node_modules/@babel/plugin-transform-exponentiation-operator": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
 			"integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-for-of": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-			"integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+		"node_modules/@babel/plugin-transform-for-of": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz",
+			"integrity": "sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-function-name": {
+		"node_modules/@babel/plugin-transform-function-name": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
 			"integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-compilation-targets": "^7.18.9",
 				"@babel/helper-function-name": "^7.18.9",
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-literals": {
+		"node_modules/@babel/plugin-transform-literals": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
 			"integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-member-expression-literals": {
+		"node_modules/@babel/plugin-transform-member-expression-literals": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
 			"integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-amd": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-			"integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+		"node_modules/@babel/plugin-transform-modules-amd": {
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
+			"integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.19.6",
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-			"integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+		"node_modules/@babel/plugin-transform-modules-commonjs": {
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz",
+			"integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-module-transforms": "^7.19.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-simple-access": "^7.19.4"
+			"dependencies": {
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-simple-access": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-			"integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+		"node_modules/@babel/plugin-transform-modules-systemjs": {
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
+			"integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-module-transforms": "^7.19.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-validator-identifier": "^7.19.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-modules-umd": {
+		"node_modules/@babel/plugin-transform-modules-umd": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
 			"integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-module-transforms": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-			"integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
+			"integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0"
+			"dependencies": {
+				"@babel/helper-create-regexp-features-plugin": "^7.20.5",
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
 			}
 		},
-		"@babel/plugin-transform-new-target": {
+		"node_modules/@babel/plugin-transform-new-target": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
 			"integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-object-super": {
+		"node_modules/@babel/plugin-transform-object-super": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
 			"integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/helper-replace-supers": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-parameters": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-			"integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+		"node_modules/@babel/plugin-transform-parameters": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
+			"integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-property-literals": {
+		"node_modules/@babel/plugin-transform-property-literals": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
 			"integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.18.12",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
-			"integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
+		"node_modules/@babel/plugin-transform-react-constant-elements": {
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz",
+			"integrity": "sha512-KS/G8YI8uwMGKErLFOHS/ekhqdHhpEloxs43NecQHVgo2QuQSyJhGIY1fL8UGl9wy5ItVwwoUL4YxVqsplGq2g==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-react-display-name": {
+		"node_modules/@babel/plugin-transform-react-display-name": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
 			"integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-react-jsx": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
-			"integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
+		"node_modules/@babel/plugin-transform-react-jsx": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz",
+			"integrity": "sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-jsx": "^7.18.6",
-				"@babel/types": "^7.19.0"
+				"@babel/types": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-react-jsx-development": {
+		"node_modules/@babel/plugin-transform-react-jsx-development": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
 			"integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/plugin-transform-react-jsx": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-react-pure-annotations": {
+		"node_modules/@babel/plugin-transform-react-pure-annotations": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
 			"integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-regenerator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-			"integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+		"node_modules/@babel/plugin-transform-regenerator": {
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz",
+			"integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"regenerator-transform": "^0.15.0"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"regenerator-transform": "^0.15.1"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-reserved-words": {
+		"node_modules/@babel/plugin-transform-reserved-words": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
 			"integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-runtime": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-			"integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+		"node_modules/@babel/plugin-transform-runtime": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz",
+			"integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"babel-plugin-polyfill-corejs2": "^0.3.3",
 				"babel-plugin-polyfill-corejs3": "^0.6.0",
 				"babel-plugin-polyfill-regenerator": "^0.4.1",
 				"semver": "^6.3.0"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@babel/plugin-transform-shorthand-properties": {
+		"node_modules/@babel/plugin-transform-shorthand-properties": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
 			"integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-spread": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-			"integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+		"node_modules/@babel/plugin-transform-spread": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
+			"integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-sticky-regex": {
+		"node_modules/@babel/plugin-transform-sticky-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
 			"integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-template-literals": {
+		"node_modules/@babel/plugin-transform-template-literals": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
 			"integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-typeof-symbol": {
+		"node_modules/@babel/plugin-transform-typeof-symbol": {
 			"version": "7.18.9",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
 			"integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-typescript": {
-			"version": "7.19.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.3.tgz",
-			"integrity": "sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==",
+		"node_modules/@babel/plugin-transform-typescript": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz",
+			"integrity": "sha512-xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/plugin-syntax-typescript": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-create-class-features-plugin": "^7.21.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/plugin-syntax-typescript": "^7.20.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-unicode-escapes": {
+		"node_modules/@babel/plugin-transform-unicode-escapes": {
 			"version": "7.18.10",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
 			"integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/plugin-transform-unicode-regex": {
+		"node_modules/@babel/plugin-transform-unicode-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
 			"integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-create-regexp-features-plugin": "^7.18.6",
 				"@babel/helper-plugin-utils": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/preset-env": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-			"integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
+		"node_modules/@babel/preset-env": {
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz",
+			"integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.19.4",
-				"@babel/helper-compilation-targets": "^7.19.3",
-				"@babel/helper-plugin-utils": "^7.19.0",
+			"dependencies": {
+				"@babel/compat-data": "^7.20.1",
+				"@babel/helper-compilation-targets": "^7.20.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-validator-option": "^7.18.6",
 				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
 				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+				"@babel/plugin-proposal-async-generator-functions": "^7.20.1",
 				"@babel/plugin-proposal-class-properties": "^7.18.6",
 				"@babel/plugin-proposal-class-static-block": "^7.18.6",
 				"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1185,7 +1914,7 @@
 				"@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
 				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
 				"@babel/plugin-proposal-numeric-separator": "^7.18.6",
-				"@babel/plugin-proposal-object-rest-spread": "^7.19.4",
+				"@babel/plugin-proposal-object-rest-spread": "^7.20.2",
 				"@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
 				"@babel/plugin-proposal-optional-chaining": "^7.18.9",
 				"@babel/plugin-proposal-private-methods": "^7.18.6",
@@ -1196,7 +1925,7 @@
 				"@babel/plugin-syntax-class-static-block": "^7.14.5",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.18.6",
+				"@babel/plugin-syntax-import-assertions": "^7.20.0",
 				"@babel/plugin-syntax-json-strings": "^7.8.3",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
 				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1209,10 +1938,10 @@
 				"@babel/plugin-transform-arrow-functions": "^7.18.6",
 				"@babel/plugin-transform-async-to-generator": "^7.18.6",
 				"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-				"@babel/plugin-transform-block-scoping": "^7.19.4",
-				"@babel/plugin-transform-classes": "^7.19.0",
+				"@babel/plugin-transform-block-scoping": "^7.20.2",
+				"@babel/plugin-transform-classes": "^7.20.2",
 				"@babel/plugin-transform-computed-properties": "^7.18.9",
-				"@babel/plugin-transform-destructuring": "^7.19.4",
+				"@babel/plugin-transform-destructuring": "^7.20.2",
 				"@babel/plugin-transform-dotall-regex": "^7.18.6",
 				"@babel/plugin-transform-duplicate-keys": "^7.18.9",
 				"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -1220,14 +1949,14 @@
 				"@babel/plugin-transform-function-name": "^7.18.9",
 				"@babel/plugin-transform-literals": "^7.18.9",
 				"@babel/plugin-transform-member-expression-literals": "^7.18.6",
-				"@babel/plugin-transform-modules-amd": "^7.18.6",
-				"@babel/plugin-transform-modules-commonjs": "^7.18.6",
-				"@babel/plugin-transform-modules-systemjs": "^7.19.0",
+				"@babel/plugin-transform-modules-amd": "^7.19.6",
+				"@babel/plugin-transform-modules-commonjs": "^7.19.6",
+				"@babel/plugin-transform-modules-systemjs": "^7.19.6",
 				"@babel/plugin-transform-modules-umd": "^7.18.6",
 				"@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
 				"@babel/plugin-transform-new-target": "^7.18.6",
 				"@babel/plugin-transform-object-super": "^7.18.6",
-				"@babel/plugin-transform-parameters": "^7.18.8",
+				"@babel/plugin-transform-parameters": "^7.20.1",
 				"@babel/plugin-transform-property-literals": "^7.18.6",
 				"@babel/plugin-transform-regenerator": "^7.18.6",
 				"@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -1239,256 +1968,299 @@
 				"@babel/plugin-transform-unicode-escapes": "^7.18.10",
 				"@babel/plugin-transform-unicode-regex": "^7.18.6",
 				"@babel/preset-modules": "^0.1.5",
-				"@babel/types": "^7.19.4",
+				"@babel/types": "^7.20.2",
 				"babel-plugin-polyfill-corejs2": "^0.3.3",
 				"babel-plugin-polyfill-corejs3": "^0.6.0",
 				"babel-plugin-polyfill-regenerator": "^0.4.1",
 				"core-js-compat": "^3.25.1",
 				"semver": "^6.3.0"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/@babel/preset-env/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"@babel/preset-modules": {
+		"node_modules/@babel/preset-modules": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
 			"integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.0.0",
 				"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
 				"@babel/plugin-transform-dotall-regex": "^7.4.4",
 				"@babel/types": "^7.4.4",
 				"esutils": "^2.0.2"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/preset-react": {
+		"node_modules/@babel/preset-react": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
 			"integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/helper-plugin-utils": "^7.18.6",
 				"@babel/helper-validator-option": "^7.18.6",
 				"@babel/plugin-transform-react-display-name": "^7.18.6",
 				"@babel/plugin-transform-react-jsx": "^7.18.6",
 				"@babel/plugin-transform-react-jsx-development": "^7.18.6",
 				"@babel/plugin-transform-react-pure-annotations": "^7.18.6"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/preset-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
-			"integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
+		"node_modules/@babel/preset-typescript": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz",
+			"integrity": "sha512-myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-validator-option": "^7.18.6",
-				"@babel/plugin-transform-typescript": "^7.18.6"
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-validator-option": "^7.21.0",
+				"@babel/plugin-transform-typescript": "^7.21.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@babel/runtime": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
-			"integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
-			"requires": {
-				"regenerator-runtime": "^0.13.4"
-			}
+		"node_modules/@babel/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+			"dev": true
 		},
-		"@babel/runtime-corejs3": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.6.tgz",
-			"integrity": "sha512-oWNn1ZlGde7b4i/3tnixpH9qI0bOAACiUs+KEES4UUCnsPjVWFlWdLV/iwJuPC2qp3EowbAqsm+0XqNwnwYhxA==",
-			"dev": true,
-			"requires": {
-				"core-js-pure": "^3.25.1",
-				"regenerator-runtime": "^0.13.4"
-			},
+		"node_modules/@babel/runtime": {
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
+			"integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
 			"dependencies": {
-				"core-js-pure": {
-					"version": "3.26.0",
-					"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.26.0.tgz",
-					"integrity": "sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA==",
-					"dev": true
-				}
+				"regenerator-runtime": "^0.13.11"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/template": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-			"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+		"node_modules/@babel/template": {
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+			"integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.18.6",
-				"@babel/parser": "^7.18.10",
-				"@babel/types": "^7.18.10"
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7"
 			},
-			"dependencies": {
-				"@babel/parser": {
-					"version": "7.19.6",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
-					"integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/traverse": {
-			"version": "7.19.6",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.6.tgz",
-			"integrity": "sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==",
+		"node_modules/@babel/traverse": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.0.tgz",
+			"integrity": "sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.6",
+				"@babel/generator": "^7.21.0",
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-function-name": "^7.19.0",
+				"@babel/helper-function-name": "^7.21.0",
 				"@babel/helper-hoist-variables": "^7.18.6",
 				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/parser": "^7.19.6",
-				"@babel/types": "^7.19.4",
+				"@babel/parser": "^7.21.0",
+				"@babel/types": "^7.21.0",
 				"debug": "^4.1.0",
 				"globals": "^11.1.0"
 			},
-			"dependencies": {
-				"@babel/parser": {
-					"version": "7.19.6",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
-					"integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@babel/types": {
-			"version": "7.19.4",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz",
-			"integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
-			"requires": {
+		"node_modules/@babel/types": {
+			"version": "7.21.0",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.0.tgz",
+			"integrity": "sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==",
+			"dependencies": {
 				"@babel/helper-string-parser": "^7.19.4",
 				"@babel/helper-validator-identifier": "^7.19.1",
 				"to-fast-properties": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6.9.0"
 			}
 		},
-		"@bcoe/v8-coverage": {
+		"node_modules/@bcoe/v8-coverage": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
 			"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
 			"dev": true
 		},
-		"@choojs/findup": {
+		"node_modules/@choojs/findup": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/@choojs/findup/-/findup-0.2.1.tgz",
 			"integrity": "sha512-YstAqNb0MCN8PjdLCDfRsBcGVRN41f3vgLvaI0IrIcBp4AqILRSS0DeWNGkicC+f/zRIPJLc+9RURVSepwvfBw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"commander": "^2.15.1"
+			},
+			"bin": {
+				"findup": "bin/findup.js"
 			}
 		},
-		"@csstools/selector-specificity": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-			"integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-			"dev": true
+		"node_modules/@csstools/selector-specificity": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+			"integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+			"dev": true,
+			"engines": {
+				"node": "^14 || ^16 || >=18"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/csstools"
+			},
+			"peerDependencies": {
+				"postcss-selector-parser": "^6.0.10"
+			}
 		},
-		"@discoveryjs/json-ext": {
+		"node_modules/@discoveryjs/json-ext": {
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
 			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			}
 		},
-		"@emotion/babel-plugin": {
-			"version": "11.10.2",
-			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz",
-			"integrity": "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==",
-			"requires": {
+		"node_modules/@emotion/babel-plugin": {
+			"version": "11.10.6",
+			"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.6.tgz",
+			"integrity": "sha512-p2dAqtVrkhSa7xz1u/m9eHYdLi+en8NowrmXeF/dKtJpU8lCWli8RUAati7NcSl0afsBott48pdnANuD0wh9QQ==",
+			"dependencies": {
 				"@babel/helper-module-imports": "^7.16.7",
-				"@babel/plugin-syntax-jsx": "^7.17.12",
 				"@babel/runtime": "^7.18.3",
 				"@emotion/hash": "^0.9.0",
 				"@emotion/memoize": "^0.8.0",
-				"@emotion/serialize": "^1.1.0",
+				"@emotion/serialize": "^1.1.1",
 				"babel-plugin-macros": "^3.1.0",
 				"convert-source-map": "^1.5.0",
 				"escape-string-regexp": "^4.0.0",
 				"find-root": "^1.1.0",
 				"source-map": "^0.5.7",
-				"stylis": "4.0.13"
+				"stylis": "4.1.3"
+			}
+		},
+		"node_modules/@emotion/babel-plugin/node_modules/@emotion/memoize": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+		},
+		"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"@emotion/cache": {
-			"version": "11.10.3",
-			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz",
-			"integrity": "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==",
-			"requires": {
+		"node_modules/@emotion/cache": {
+			"version": "11.10.5",
+			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz",
+			"integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==",
+			"dependencies": {
 				"@emotion/memoize": "^0.8.0",
-				"@emotion/sheet": "^1.2.0",
+				"@emotion/sheet": "^1.2.1",
 				"@emotion/utils": "^1.2.0",
 				"@emotion/weak-memoize": "^0.3.0",
-				"stylis": "4.0.13"
-			}
-		},
-		"@emotion/css": {
-			"version": "11.10.0",
-			"resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.10.0.tgz",
-			"integrity": "sha512-dH9f+kSCucc8ilMg0MUA1AemabcyzYpe5EKX24F528PJjD7HyIY/VBNJHxfUdc8l400h2ncAjR6yEDu+DBj2cg==",
-			"requires": {
-				"@emotion/babel-plugin": "^11.10.0",
-				"@emotion/cache": "^11.10.0",
-				"@emotion/serialize": "^1.1.0",
-				"@emotion/sheet": "^1.2.0",
+				"stylis": "4.1.3"
+			}
+		},
+		"node_modules/@emotion/cache/node_modules/@emotion/memoize": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+		},
+		"node_modules/@emotion/css": {
+			"version": "11.10.6",
+			"resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.10.6.tgz",
+			"integrity": "sha512-88Sr+3heKAKpj9PCqq5A1hAmAkoSIvwEq1O2TwDij7fUtsJpdkV4jMTISSTouFeRvsGvXIpuSuDQ4C1YdfNGXw==",
+			"dependencies": {
+				"@emotion/babel-plugin": "^11.10.6",
+				"@emotion/cache": "^11.10.5",
+				"@emotion/serialize": "^1.1.1",
+				"@emotion/sheet": "^1.2.1",
 				"@emotion/utils": "^1.2.0"
 			}
 		},
-		"@emotion/hash": {
+		"node_modules/@emotion/hash": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
 			"integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
 		},
-		"@emotion/is-prop-valid": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz",
-			"integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==",
-			"requires": {
-				"@emotion/memoize": "^0.8.0"
+		"node_modules/@emotion/is-prop-valid": {
+			"version": "0.8.8",
+			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
+			"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
+			"dependencies": {
+				"@emotion/memoize": "0.7.4"
 			}
 		},
-		"@emotion/memoize": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
-			"integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
-		},
-		"@emotion/react": {
-			"version": "11.10.4",
-			"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.4.tgz",
-			"integrity": "sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==",
-			"requires": {
+		"node_modules/@emotion/memoize": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
+			"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
+		},
+		"node_modules/@emotion/react": {
+			"version": "11.10.6",
+			"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz",
+			"integrity": "sha512-6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw==",
+			"dependencies": {
 				"@babel/runtime": "^7.18.3",
-				"@emotion/babel-plugin": "^11.10.0",
-				"@emotion/cache": "^11.10.0",
-				"@emotion/serialize": "^1.1.0",
+				"@emotion/babel-plugin": "^11.10.6",
+				"@emotion/cache": "^11.10.5",
+				"@emotion/serialize": "^1.1.1",
 				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
 				"@emotion/utils": "^1.2.0",
 				"@emotion/weak-memoize": "^0.3.0",
 				"hoist-non-react-statics": "^3.3.1"
+			},
+			"peerDependencies": {
+				"react": ">=16.8.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
 			}
 		},
-		"@emotion/serialize": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz",
-			"integrity": "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==",
-			"requires": {
+		"node_modules/@emotion/serialize": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
+			"integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
+			"dependencies": {
 				"@emotion/hash": "^0.9.0",
 				"@emotion/memoize": "^0.8.0",
 				"@emotion/unitless": "^0.8.0",
@@ -1496,16209 +2268,19136 @@
 				"csstype": "^3.0.2"
 			}
 		},
-		"@emotion/sheet": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz",
-			"integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w=="
-		},
-		"@emotion/styled": {
-			"version": "11.10.4",
-			"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.4.tgz",
-			"integrity": "sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ==",
-			"requires": {
+		"node_modules/@emotion/serialize/node_modules/@emotion/memoize": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+		},
+		"node_modules/@emotion/sheet": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
+			"integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
+		},
+		"node_modules/@emotion/styled": {
+			"version": "11.10.6",
+			"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.6.tgz",
+			"integrity": "sha512-OXtBzOmDSJo5Q0AFemHCfl+bUueT8BIcPSxu0EGTpGk6DmI5dnhSzQANm1e1ze0YZL7TDyAyy6s/b/zmGOS3Og==",
+			"dependencies": {
 				"@babel/runtime": "^7.18.3",
-				"@emotion/babel-plugin": "^11.10.0",
+				"@emotion/babel-plugin": "^11.10.6",
 				"@emotion/is-prop-valid": "^1.2.0",
-				"@emotion/serialize": "^1.1.0",
+				"@emotion/serialize": "^1.1.1",
 				"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
 				"@emotion/utils": "^1.2.0"
+			},
+			"peerDependencies": {
+				"@emotion/react": "^11.0.0-rc.0",
+				"react": ">=16.8.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@emotion/styled/node_modules/@emotion/is-prop-valid": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz",
+			"integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==",
+			"dependencies": {
+				"@emotion/memoize": "^0.8.1"
 			}
 		},
-		"@emotion/unitless": {
+		"node_modules/@emotion/styled/node_modules/@emotion/memoize": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.1.tgz",
+			"integrity": "sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA=="
+		},
+		"node_modules/@emotion/unitless": {
 			"version": "0.8.0",
 			"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
 			"integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
 		},
-		"@emotion/use-insertion-effect-with-fallbacks": {
+		"node_modules/@emotion/use-insertion-effect-with-fallbacks": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
-			"integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A=="
+			"integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
+			"peerDependencies": {
+				"react": ">=16.8.0"
+			}
 		},
-		"@emotion/utils": {
+		"node_modules/@emotion/utils": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
 			"integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
 		},
-		"@emotion/weak-memoize": {
+		"node_modules/@emotion/weak-memoize": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
 			"integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
 		},
-		"@es-joy/jsdoccomment": {
-			"version": "0.20.1",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.20.1.tgz",
-			"integrity": "sha512-oeJK41dcdqkvdZy/HctKklJNkt/jh+av3PZARrZEl+fs/8HaHeeYoAvEwOV0u5I6bArTF17JEsTZMY359e/nfQ==",
+		"node_modules/@es-joy/jsdoccomment": {
+			"version": "0.36.1",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz",
+			"integrity": "sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==",
 			"dev": true,
-			"requires": {
-				"comment-parser": "1.3.0",
+			"dependencies": {
+				"comment-parser": "1.3.1",
 				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~2.2.3"
+				"jsdoc-type-pratt-parser": "~3.1.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || ^17 || ^18 || ^19"
 			}
 		},
-		"@eslint/eslintrc": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-			"integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
+		"node_modules/@eslint-community/eslint-utils": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+			"integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
 			"dev": true,
-			"requires": {
-				"ajv": "^6.12.4",
-				"debug": "^4.3.2",
-				"espree": "^9.4.0",
-				"globals": "^13.15.0",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.2.1",
-				"js-yaml": "^4.1.0",
-				"minimatch": "^3.1.2",
-				"strip-json-comments": "^3.1.1"
-			},
 			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^0.20.2"
-					}
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"minimatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+			}
+		},
+		"node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+			"integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@eslint-community/regexpp": {
+			"version": "4.5.1",
+			"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
+			"integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@eslint/eslintrc": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.0.tgz",
+			"integrity": "sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.4",
+				"debug": "^4.3.2",
+				"espree": "^9.6.0",
+				"globals": "^13.19.0",
+				"ignore": "^5.2.0",
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"minimatch": "^3.1.2",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/@eslint/eslintrc/node_modules/globals": {
+			"version": "13.20.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"@financial-times/polyfill-useragent-normaliser": {
+		"node_modules/@eslint/js": {
+			"version": "8.44.0",
+			"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.44.0.tgz",
+			"integrity": "sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			}
+		},
+		"node_modules/@financial-times/polyfill-useragent-normaliser": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-2.0.1.tgz",
 			"integrity": "sha512-I6zZJgy3cwM9ojo9NVNj5kNTkt96KIKhJQIPQ7vjROaDCpy+sTRQA2HLCjBFKgo0AzsqdMB43Tx0Szt/mf+00g==",
-			"requires": {
+			"dependencies": {
 				"@financial-times/useragent_parser": "^1.6.1",
 				"semver": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@financial-times/useragent_parser": {
+		"node_modules/@financial-times/useragent_parser": {
 			"version": "1.6.3",
 			"resolved": "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.3.tgz",
 			"integrity": "sha512-TlQiXt/vS5ZwY0V3salvlyQzIzMGZEyw9inmJA25A8heL2kBVENbToiEc64R6ETNf5YHa2lwnc2I7iNHP9SqeQ=="
 		},
-		"@floating-ui/core": {
+		"node_modules/@floating-ui/core": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.1.tgz",
 			"integrity": "sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA=="
 		},
-		"@floating-ui/dom": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.3.tgz",
-			"integrity": "sha512-6H1kwjkOZKabApNtXRiYHvMmYJToJ1DV7rQ3xc/WJpOABhQIOJJOdz2AOejj8X+gcybaFmBpisVTZxBZAM3V0w==",
-			"requires": {
+		"node_modules/@floating-ui/dom": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.1.tgz",
+			"integrity": "sha512-wBDiLUKWU8QNPNOTAFHiIAkBv1KlHauG2AhqjSeh2H+wR8PX+AArXfz8NkRexH5PgMJMmSOS70YS89AbWYh5dA==",
+			"dependencies": {
 				"@floating-ui/core": "^1.0.1"
 			}
 		},
-		"@floating-ui/react-dom": {
+		"node_modules/@floating-ui/react-dom": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-1.0.0.tgz",
 			"integrity": "sha512-uiOalFKPG937UCLm42RxjESTWUVpbbatvlphQAU6bsv+ence6IoVG8JOUZcy8eW81NkU+Idiwvx10WFLmR4MIg==",
-			"requires": {
+			"dependencies": {
 				"@floating-ui/dom": "^1.0.0"
+			},
+			"peerDependencies": {
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
 			}
 		},
-		"@hapi/hoek": {
-			"version": "9.2.1",
-			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz",
-			"integrity": "sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw==",
+		"node_modules/@hapi/hoek": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+			"integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
 			"dev": true
 		},
-		"@hapi/topo": {
+		"node_modules/@hapi/topo": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
 			"integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@hapi/hoek": "^9.0.0"
 			}
 		},
-		"@humanwhocodes/config-array": {
-			"version": "0.11.6",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
-			"integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
+		"node_modules/@humanwhocodes/config-array": {
+			"version": "0.11.10",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+			"integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"minimatch": "^3.0.5"
+			},
+			"engines": {
+				"node": ">=10.10.0"
 			}
 		},
-		"@humanwhocodes/module-importer": {
+		"node_modules/@humanwhocodes/module-importer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
 			"integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=12.22"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/nzakas"
+			}
 		},
-		"@humanwhocodes/object-schema": {
+		"node_modules/@humanwhocodes/object-schema": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
 			"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
 			"dev": true
 		},
-		"@istanbuljs/load-nyc-config": {
+		"node_modules/@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
 			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"camelcase": "^5.3.1",
 				"find-up": "^4.1.0",
 				"get-package-type": "^0.1.0",
 				"js-yaml": "^3.13.1",
 				"resolve-from": "^5.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
 			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@istanbuljs/schema": {
+		"node_modules/@istanbuljs/schema": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
 			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"@jest/console": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-			"integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+		"node_modules/@jest/console": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/console/-/console-29.6.1.tgz",
+			"integrity": "sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
+			"dependencies": {
+				"@jest/types": "^29.6.1",
 				"@types/node": "*",
 				"chalk": "^4.0.0",
-				"jest-message-util": "^27.5.1",
-				"jest-util": "^27.5.1",
+				"jest-message-util": "^29.6.1",
+				"jest-util": "^29.6.1",
 				"slash": "^3.0.0"
 			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@jest/core": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-			"integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.5.1",
-				"@jest/reporters": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.2.9",
-				"jest-changed-files": "^27.5.1",
-				"jest-config": "^27.5.1",
-				"jest-haste-map": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-regex-util": "^27.5.1",
-				"jest-resolve": "^27.5.1",
-				"jest-resolve-dependencies": "^27.5.1",
-				"jest-runner": "^27.5.1",
-				"jest-runtime": "^27.5.1",
-				"jest-snapshot": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jest-validate": "^27.5.1",
-				"jest-watcher": "^27.5.1",
-				"micromatch": "^4.0.4",
-				"rimraf": "^3.0.0",
-				"slash": "^3.0.0",
-				"strip-ansi": "^6.0.0"
+		"node_modules/@jest/console/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@jest/console/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"@jest/environment": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-			"integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+		"node_modules/@jest/console/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@jest/fake-timers": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"jest-mock": "^27.5.1"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"@jest/fake-timers": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-			"integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+		"node_modules/@jest/console/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/@jest/console/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"@sinonjs/fake-timers": "^8.0.1",
-				"@types/node": "*",
-				"jest-message-util": "^27.5.1",
-				"jest-mock": "^27.5.1",
-				"jest-util": "^27.5.1"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@jest/globals": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-			"integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+		"node_modules/@jest/console/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"expect": "^27.5.1"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@jest/reporters": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-			"integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+		"node_modules/@jest/core": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/core/-/core-29.6.1.tgz",
+			"integrity": "sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==",
 			"dev": true,
-			"requires": {
-				"@bcoe/v8-coverage": "^0.2.3",
-				"@jest/console": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
+			"dependencies": {
+				"@jest/console": "^29.6.1",
+				"@jest/reporters": "^29.6.1",
+				"@jest/test-result": "^29.6.1",
+				"@jest/transform": "^29.6.1",
+				"@jest/types": "^29.6.1",
 				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
 				"chalk": "^4.0.0",
-				"collect-v8-coverage": "^1.0.0",
+				"ci-info": "^3.2.0",
 				"exit": "^0.1.2",
-				"glob": "^7.1.2",
 				"graceful-fs": "^4.2.9",
-				"istanbul-lib-coverage": "^3.0.0",
-				"istanbul-lib-instrument": "^5.1.0",
-				"istanbul-lib-report": "^3.0.0",
-				"istanbul-lib-source-maps": "^4.0.0",
-				"istanbul-reports": "^3.1.3",
-				"jest-haste-map": "^27.5.1",
-				"jest-resolve": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jest-worker": "^27.5.1",
+				"jest-changed-files": "^29.5.0",
+				"jest-config": "^29.6.1",
+				"jest-haste-map": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-regex-util": "^29.4.3",
+				"jest-resolve": "^29.6.1",
+				"jest-resolve-dependencies": "^29.6.1",
+				"jest-runner": "^29.6.1",
+				"jest-runtime": "^29.6.1",
+				"jest-snapshot": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jest-validate": "^29.6.1",
+				"jest-watcher": "^29.6.1",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.6.1",
 				"slash": "^3.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^4.0.1",
-				"terminal-link": "^2.0.0",
-				"v8-to-istanbul": "^8.1.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"@jest/source-map": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-			"integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-			"dev": true,
-			"requires": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.2.9",
-				"source-map": "^0.6.0"
+				"strip-ansi": "^6.0.0"
 			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
 				}
 			}
 		},
-		"@jest/test-result": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-			"integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+		"node_modules/@jest/core/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
-			"requires": {
-				"@jest/console": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"collect-v8-coverage": "^1.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@jest/test-sequencer": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-			"integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+		"node_modules/@jest/core/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@jest/test-result": "^27.5.1",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^27.5.1",
-				"jest-runtime": "^27.5.1"
-			},
 			"dependencies": {
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"@jest/transform": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-			"integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+		"node_modules/@jest/core/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^27.5.1",
-				"babel-plugin-istanbul": "^6.1.1",
-				"chalk": "^4.0.0",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^27.5.1",
-				"jest-regex-util": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"micromatch": "^4.0.4",
-				"pirates": "^4.0.4",
-				"slash": "^3.0.0",
-				"source-map": "^0.6.1",
-				"write-file-atomic": "^3.0.0"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@jest/types": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-			"integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+		"node_modules/@jest/core/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^3.0.0",
-				"@types/node": "*",
-				"@types/yargs": "^16.0.0",
-				"chalk": "^4.0.0"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"@jridgewell/gen-mapping": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-			"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+		"node_modules/@jest/core/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/set-array": "^1.0.0",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"@jridgewell/resolve-uri": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-			"dev": true
-		},
-		"@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+		"node_modules/@jest/core/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"@jridgewell/source-map": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-			"integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+		"node_modules/@jest/core/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
-			},
 			"dependencies": {
-				"@jridgewell/gen-mapping": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-					"integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-					"dev": true,
-					"requires": {
-						"@jridgewell/set-array": "^1.0.1",
-						"@jridgewell/sourcemap-codec": "^1.4.10",
-						"@jridgewell/trace-mapping": "^0.3.9"
-					}
-				}
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@jridgewell/sourcemap-codec": {
-			"version": "1.4.14",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-			"dev": true
-		},
-		"@jridgewell/trace-mapping": {
-			"version": "0.3.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
-			"integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+		"node_modules/@jest/core/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-			"dev": true
-		},
-		"@motionone/animation": {
-			"version": "10.14.0",
-			"resolved": "https://registry.npmjs.org/@motionone/animation/-/animation-10.14.0.tgz",
-			"integrity": "sha512-h+1sdyBP8vbxEBW5gPFDnj+m2DCqdlAuf2g6Iafb1lcMnqjsRXWlPw1AXgvUMXmreyhqmPbJqoNfIKdytampRQ==",
-			"requires": {
-				"@motionone/easing": "^10.14.0",
-				"@motionone/types": "^10.14.0",
-				"@motionone/utils": "^10.14.0",
-				"tslib": "^2.3.1"
-			}
-		},
-		"@motionone/dom": {
-			"version": "10.12.0",
-			"resolved": "https://registry.npmjs.org/@motionone/dom/-/dom-10.12.0.tgz",
-			"integrity": "sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw==",
-			"requires": {
-				"@motionone/animation": "^10.12.0",
-				"@motionone/generators": "^10.12.0",
-				"@motionone/types": "^10.12.0",
-				"@motionone/utils": "^10.12.0",
-				"hey-listen": "^1.0.8",
-				"tslib": "^2.3.1"
-			}
-		},
-		"@motionone/easing": {
-			"version": "10.14.0",
-			"resolved": "https://registry.npmjs.org/@motionone/easing/-/easing-10.14.0.tgz",
-			"integrity": "sha512-2vUBdH9uWTlRbuErhcsMmt1jvMTTqvGmn9fHq8FleFDXBlHFs5jZzHJT9iw+4kR1h6a4SZQuCf72b9ji92qNYA==",
-			"requires": {
-				"@motionone/utils": "^10.14.0",
-				"tslib": "^2.3.1"
-			}
-		},
-		"@motionone/generators": {
-			"version": "10.14.0",
-			"resolved": "https://registry.npmjs.org/@motionone/generators/-/generators-10.14.0.tgz",
-			"integrity": "sha512-6kRHezoFfIjFN7pPpaxmkdZXD36tQNcyJe3nwVqwJ+ZfC0e3rFmszR8kp9DEVFs9QL/akWjuGPSLBI1tvz+Vjg==",
-			"requires": {
-				"@motionone/types": "^10.14.0",
-				"@motionone/utils": "^10.14.0",
-				"tslib": "^2.3.1"
-			}
-		},
-		"@motionone/types": {
-			"version": "10.14.0",
-			"resolved": "https://registry.npmjs.org/@motionone/types/-/types-10.14.0.tgz",
-			"integrity": "sha512-3bNWyYBHtVd27KncnJLhksMFQ5o2MSdk1cA/IZqsHtA9DnRM1SYgN01CTcJ8Iw8pCXF5Ocp34tyAjY7WRpOJJQ=="
-		},
-		"@motionone/utils": {
-			"version": "10.14.0",
-			"resolved": "https://registry.npmjs.org/@motionone/utils/-/utils-10.14.0.tgz",
-			"integrity": "sha512-sLWBLPzRqkxmOTRzSaD3LFQXCPHvDzyHJ1a3VP9PRzBxyVd2pv51/gMOsdAcxQ9n+MIeGJnxzXBYplUHKj4jkw==",
-			"requires": {
-				"@motionone/types": "^10.14.0",
-				"hey-listen": "^1.0.8",
-				"tslib": "^2.3.1"
-			}
-		},
-		"@mrmlnc/readdir-enhanced": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
-			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+		"node_modules/@jest/core/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"@nicolo-ribaudo/eslint-scope-5-internals": {
-			"version": "5.1.1-v1",
-			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+		"node_modules/@jest/core/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"requires": {
-				"eslint-scope": "5.1.1"
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"@nodelib/fs.scandir": {
-			"version": "2.1.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+		"node_modules/@jest/core/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "2.0.5",
-				"run-parallel": "^1.1.9"
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@nodelib/fs.stat": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-			"dev": true
-		},
-		"@nodelib/fs.walk": {
-			"version": "1.2.8",
-			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+		"node_modules/@jest/core/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@nodelib/fs.scandir": "2.1.5",
-				"fastq": "^1.6.0"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@pmmmwh/react-refresh-webpack-plugin": {
-			"version": "0.5.5",
-			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz",
-			"integrity": "sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ==",
+		"node_modules/@jest/core/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"requires": {
-				"ansi-html-community": "^0.0.8",
-				"common-path-prefix": "^3.0.0",
-				"core-js-pure": "^3.8.1",
-				"error-stack-parser": "^2.0.6",
-				"find-up": "^5.0.0",
-				"html-entities": "^2.1.0",
-				"loader-utils": "^2.0.0",
-				"schema-utils": "^3.0.0",
-				"source-map": "^0.7.3"
-			},
 			"dependencies": {
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-					"dev": true,
-					"requires": {
-						"yocto-queue": "^0.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.7.3",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-					"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-					"dev": true
-				}
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"@polka/url": {
-			"version": "1.0.0-next.21",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
-			"integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
-			"dev": true
-		},
-		"@popperjs/core": {
-			"version": "2.11.6",
-			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-			"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
-		},
-		"@react-spring/animated": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.5.5.tgz",
-			"integrity": "sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA==",
-			"requires": {
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+		"node_modules/@jest/environment": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.6.1.tgz",
+			"integrity": "sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/fake-timers": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"jest-mock": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@react-spring/core": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.5.5.tgz",
-			"integrity": "sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA==",
-			"requires": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+		"node_modules/@jest/expect": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.6.1.tgz",
+			"integrity": "sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==",
+			"dev": true,
+			"dependencies": {
+				"expect": "^29.6.1",
+				"jest-snapshot": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@react-spring/rafz": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.5.5.tgz",
-			"integrity": "sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw=="
-		},
-		"@react-spring/shared": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.5.5.tgz",
-			"integrity": "sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ==",
-			"requires": {
-				"@react-spring/rafz": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+		"node_modules/@jest/expect-utils": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.1.tgz",
+			"integrity": "sha512-o319vIf5pEMx0LmzSxxkYYxo4wrRLKHq9dP1yJU7FoPTB0LfAKSz8SWD6D/6U3v/O52t9cF5t+MeJiRsfk7zMw==",
+			"dev": true,
+			"dependencies": {
+				"jest-get-type": "^29.4.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@react-spring/types": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.5.5.tgz",
-			"integrity": "sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg=="
-		},
-		"@react-spring/web": {
-			"version": "9.5.5",
-			"resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.5.5.tgz",
-			"integrity": "sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw==",
-			"requires": {
-				"@react-spring/animated": "~9.5.5",
-				"@react-spring/core": "~9.5.5",
-				"@react-spring/shared": "~9.5.5",
-				"@react-spring/types": "~9.5.5"
+		"node_modules/@jest/fake-timers": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.6.1.tgz",
+			"integrity": "sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@sinonjs/fake-timers": "^10.0.2",
+				"@types/node": "*",
+				"jest-message-util": "^29.6.1",
+				"jest-mock": "^29.6.1",
+				"jest-util": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@sideway/formula": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
-			"integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
-			"dev": true
-		},
-		"@sideway/pinpoint": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
-			"dev": true
-		},
-		"@sindresorhus/is": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
-			"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+		"node_modules/@jest/globals": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.6.1.tgz",
+			"integrity": "sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"@jest/environment": "^29.6.1",
+				"@jest/expect": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"jest-mock": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"@sinonjs/commons": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-			"integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
+		"node_modules/@jest/reporters": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.6.1.tgz",
+			"integrity": "sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==",
 			"dev": true,
-			"requires": {
-				"type-detect": "4.0.8"
+			"dependencies": {
+				"@bcoe/v8-coverage": "^0.2.3",
+				"@jest/console": "^29.6.1",
+				"@jest/test-result": "^29.6.1",
+				"@jest/transform": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"exit": "^0.1.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"istanbul-lib-coverage": "^3.0.0",
+				"istanbul-lib-instrument": "^5.1.0",
+				"istanbul-lib-report": "^3.0.0",
+				"istanbul-lib-source-maps": "^4.0.0",
+				"istanbul-reports": "^3.1.3",
+				"jest-message-util": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jest-worker": "^29.6.1",
+				"slash": "^3.0.0",
+				"string-length": "^4.0.1",
+				"strip-ansi": "^6.0.0",
+				"v8-to-istanbul": "^9.0.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
 			}
 		},
-		"@sinonjs/fake-timers": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-			"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+		"node_modules/@jest/reporters/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
 			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.7.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@sinonjs/samsam": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
-			"integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
+		"node_modules/@jest/reporters/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.6.0",
-				"lodash.get": "^4.4.2",
-				"type-detect": "^4.0.8"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"@sinonjs/text-encoding": {
-			"version": "0.7.2",
-			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
-			"integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-add-jsx-attribute": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.0.tgz",
-			"integrity": "sha512-Cp1JR1IPrQNvPRbkfcPmax52iunBC+eQDyBce8feOIIbVH6ZpVhErYoJtPWRBj2rKi4Wi9HvCm1+L1UD6QlBmg==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-remove-jsx-attribute": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz",
-			"integrity": "sha512-8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-remove-jsx-empty-expression": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz",
-			"integrity": "sha512-NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-replace-jsx-attribute-value": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.0.tgz",
-			"integrity": "sha512-XWm64/rSPUCQ+MFyA9lhMO+w8bOZvkTvovRIU1lpIy63ysPaVAFtxjQiZj+S7QaLaLGUXkSkf8WZsaN+QPo/gA==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-svg-dynamic-title": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.0.tgz",
-			"integrity": "sha512-JIF2D2ltiWFGlTw2fJ9jJg1fNT9rWjOD2Cf0/xzeW6Z2LIRQTHcRHxpZq359+SRWtEPsCXEWV2Xmd+DMBj6dBw==",
-			"dev": true
-		},
-		"@svgr/babel-plugin-svg-em-dimensions": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.0.tgz",
-			"integrity": "sha512-uuo0FfLP4Nu2zncOcoUFDzZdXWma2bxkTGk0etRThs4/PghvPIGaW8cPhCg6yJ8zpaauWcKV0wZtzKlJRCtVzg==",
-			"dev": true
+		"node_modules/@jest/reporters/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
 		},
-		"@svgr/babel-plugin-transform-react-native-svg": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.0.tgz",
-			"integrity": "sha512-VMRWyOmrV+DaEFPgP3hZMsFgs2g87ojs3txw0Rx8iz6Nf/E3UoHUwTqpkSCWd3Hsnc9gMOY9+wl6+/Ycleh1sw==",
-			"dev": true
+		"node_modules/@jest/reporters/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"@svgr/babel-plugin-transform-svg-component": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.0.tgz",
-			"integrity": "sha512-b67Ul3SelaqvGEEG/1B3VJ03KUtGFgRQjRLCCjdttMQLcYa9l/izQFEclNFx53pNqhijUMNKHPhGMY/CWGVKig==",
+		"node_modules/@jest/reporters/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"@svgr/babel-preset": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.0.tgz",
-			"integrity": "sha512-UWM98PKVuMqw2UZo8YO3erI6nF1n7/XBYTXBqR0QhZP7HTjYK6QxFNvPfIshddy1hBdzhVpkf148Vg8xiVOtyg==",
+		"node_modules/@jest/reporters/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@svgr/babel-plugin-add-jsx-attribute": "^6.5.0",
-				"@svgr/babel-plugin-remove-jsx-attribute": "^6.5.0",
-				"@svgr/babel-plugin-remove-jsx-empty-expression": "^6.5.0",
-				"@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.0",
-				"@svgr/babel-plugin-svg-dynamic-title": "^6.5.0",
-				"@svgr/babel-plugin-svg-em-dimensions": "^6.5.0",
-				"@svgr/babel-plugin-transform-react-native-svg": "^6.5.0",
-				"@svgr/babel-plugin-transform-svg-component": "^6.5.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@svgr/core": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.5.0.tgz",
-			"integrity": "sha512-jIbu36GMjfK8HCCQitkfVVeQ2vSXGfq0ef0GO9HUxZGjal6Kvpkk4PwpkFP+OyCzF+skQFT9aWrUqekT3pKF8w==",
+		"node_modules/@jest/reporters/node_modules/jest-worker": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+			"integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.18.5",
-				"@svgr/babel-preset": "^6.5.0",
-				"@svgr/plugin-jsx": "^6.5.0",
-				"camelcase": "^6.2.0",
-				"cosmiconfig": "^7.0.1"
-			},
 			"dependencies": {
-				"camelcase": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-					"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-					"dev": true
-				}
+				"@types/node": "*",
+				"jest-util": "^29.6.1",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@svgr/hast-util-to-babel-ast": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.0.tgz",
-			"integrity": "sha512-PPy94U/EiPQ2dY0b4jEqj4QOdDRq6DG7aTHjpGaL8HlKSHkpU1DpjfywCXTJqtOdCo2FywjWvg0U2FhqMeUJaA==",
+		"node_modules/@jest/reporters/node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.18.4",
-				"entities": "^4.3.0"
-			},
 			"dependencies": {
-				"entities": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-					"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-					"dev": true
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
-		"@svgr/plugin-jsx": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.0.tgz",
-			"integrity": "sha512-1CHMqOBKoNk/ZPU+iGXKcQPC6q9zaD7UOI99J+BaGY5bdCztcf5bZyi0QZSDRJtCQpdofeVv7XfBYov2mtl0Pw==",
+		"node_modules/@jest/reporters/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.18.5",
-				"@svgr/babel-preset": "^6.5.0",
-				"@svgr/hast-util-to-babel-ast": "^6.5.0",
-				"svg-parser": "^2.0.4"
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@svgr/plugin-svgo": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.0.tgz",
-			"integrity": "sha512-8Zv1Yyv6I7HlIqrqGFM0sDKQrhjbfNZJawR8UjIaVWSb0tKZP1Ra6ymhqIFu6FT6kDRD0Ct5NlQZ10VUujSspw==",
+		"node_modules/@jest/reporters/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"cosmiconfig": "^7.0.1",
-				"deepmerge": "^4.2.2",
-				"svgo": "^2.8.0"
+			"dependencies": {
+				"has-flag": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@jest/schemas": {
+			"version": "29.6.0",
+			"resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz",
+			"integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==",
+			"dev": true,
 			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"css-tree": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-					"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.14",
-						"source-map": "^0.6.1"
-					}
-				},
-				"css-what": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-					"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-					"dev": true
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.14",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-					"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-					"dev": true
-				},
-				"nth-check": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-					"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"svgo": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-					"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-					"dev": true,
-					"requires": {
-						"@trysound/sax": "0.2.0",
-						"commander": "^7.2.0",
-						"css-select": "^4.1.3",
-						"css-tree": "^1.1.3",
-						"csso": "^4.2.0",
-						"picocolors": "^1.0.0",
-						"stable": "^0.1.8"
-					}
-				}
+				"@sinclair/typebox": "^0.27.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@svgr/webpack": {
-			"version": "6.5.0",
-			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.0.tgz",
-			"integrity": "sha512-rM/Z4pwMhqvAXEHoHIlE4SeTb0ToQNmJuBdiHwhP2ZtywyX6XqrgCv2WX7K/UCgNYJgYbekuylgyjnuLUHTcZQ==",
+		"node_modules/@jest/source-map": {
+			"version": "29.6.0",
+			"resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.0.tgz",
+			"integrity": "sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.18.5",
-				"@babel/plugin-transform-react-constant-elements": "^7.17.12",
-				"@babel/preset-env": "^7.18.2",
-				"@babel/preset-react": "^7.17.12",
-				"@babel/preset-typescript": "^7.17.12",
-				"@svgr/core": "^6.5.0",
-				"@svgr/plugin-jsx": "^6.5.0",
-				"@svgr/plugin-svgo": "^6.5.0"
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"callsites": "^3.0.0",
+				"graceful-fs": "^4.2.9"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@tannin/compile": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.1.0.tgz",
-			"integrity": "sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg==",
-			"requires": {
-				"@tannin/evaluate": "^1.2.0",
-				"@tannin/postfix": "^1.1.0"
+		"node_modules/@jest/test-result": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.6.1.tgz",
+			"integrity": "sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/console": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"collect-v8-coverage": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@tannin/evaluate": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@tannin/evaluate/-/evaluate-1.2.0.tgz",
-			"integrity": "sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg=="
+		"node_modules/@jest/test-sequencer": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz",
+			"integrity": "sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==",
+			"dev": true,
+			"dependencies": {
+				"@jest/test-result": "^29.6.1",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.6.1",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"@tannin/plural-forms": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/plural-forms/-/plural-forms-1.1.0.tgz",
-			"integrity": "sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw==",
-			"requires": {
-				"@tannin/compile": "^1.1.0"
+		"node_modules/@jest/transform": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.6.1.tgz",
+			"integrity": "sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@jest/types": "^29.6.1",
+				"@jridgewell/trace-mapping": "^0.3.18",
+				"babel-plugin-istanbul": "^6.1.1",
+				"chalk": "^4.0.0",
+				"convert-source-map": "^2.0.0",
+				"fast-json-stable-stringify": "^2.1.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.6.1",
+				"jest-regex-util": "^29.4.3",
+				"jest-util": "^29.6.1",
+				"micromatch": "^4.0.4",
+				"pirates": "^4.0.4",
+				"slash": "^3.0.0",
+				"write-file-atomic": "^4.0.2"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@tannin/postfix": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
-			"integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw=="
+		"node_modules/@jest/transform/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"@tootallnate/once": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-			"dev": true
+		"node_modules/@jest/transform/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"@trysound/sax": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-			"dev": true
+		"node_modules/@jest/transform/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
 		},
-		"@types/babel__core": {
-			"version": "7.1.19",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-			"integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+		"node_modules/@jest/transform/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"@types/babel__generator": {
-			"version": "7.6.4",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+		"node_modules/@jest/transform/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/@jest/transform/node_modules/convert-source-map": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+			"dev": true
+		},
+		"node_modules/@jest/transform/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.0.0"
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/babel__template": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+		"node_modules/@jest/transform/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/babel__traverse": {
-			"version": "7.18.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz",
-			"integrity": "sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==",
+		"node_modules/@jest/transform/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"requires": {
-				"@babel/types": "^7.3.0"
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"@types/body-parser": {
-			"version": "1.19.2",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+		"node_modules/@jest/transform/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"requires": {
-				"@types/connect": "*",
-				"@types/node": "*"
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"@types/bonjour": {
-			"version": "3.5.10",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+		"node_modules/@jest/transform/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/cheerio": {
-			"version": "0.22.31",
-			"resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.31.tgz",
-			"integrity": "sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==",
+		"node_modules/@jest/transform/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"@types/connect": {
-			"version": "3.4.35",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+		"node_modules/@jest/types": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz",
+			"integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"dependencies": {
+				"@jest/schemas": "^29.6.0",
+				"@types/istanbul-lib-coverage": "^2.0.0",
+				"@types/istanbul-reports": "^3.0.0",
+				"@types/node": "*",
+				"@types/yargs": "^17.0.8",
+				"chalk": "^4.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"@types/connect-history-api-fallback": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-			"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+		"node_modules/@jest/types/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@types/express-serve-static-core": "*",
-				"@types/node": "*"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"@types/eslint": {
-			"version": "8.4.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
-			"integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
+		"node_modules/@jest/types/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"@types/estree": "*",
-				"@types/json-schema": "*"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"@types/eslint-scope": {
-			"version": "3.7.4",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
-			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+		"node_modules/@jest/types/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@types/eslint": "*",
-				"@types/estree": "*"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"@types/estree": {
-			"version": "0.0.51",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-			"integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+		"node_modules/@jest/types/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"@types/express": {
-			"version": "4.17.14",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-			"integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+		"node_modules/@jest/types/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.18",
-				"@types/qs": "*",
-				"@types/serve-static": "*"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/express-serve-static-core": {
-			"version": "4.17.31",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-			"integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+		"node_modules/@jest/types/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/qs": "*",
-				"@types/range-parser": "*"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/glob": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-			"integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+		"node_modules/@jridgewell/gen-mapping": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+			"integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
 			"dev": true,
-			"requires": {
-				"@types/minimatch": "*",
-				"@types/node": "*"
+			"dependencies": {
+				"@jridgewell/set-array": "^1.0.0",
+				"@jridgewell/sourcemap-codec": "^1.4.10"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@types/graceful-fs": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+		"node_modules/@jridgewell/resolve-uri": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+			"integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@types/http-proxy": {
-			"version": "1.17.9",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-			"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+		"node_modules/@jridgewell/set-array": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@types/istanbul-lib-coverage": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-			"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
-			"dev": true
-		},
-		"@types/istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+		"node_modules/@jridgewell/source-map": {
+			"version": "0.3.5",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
 			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-coverage": "*"
+			"dependencies": {
+				"@jridgewell/gen-mapping": "^0.3.0",
+				"@jridgewell/trace-mapping": "^0.3.9"
 			}
 		},
-		"@types/istanbul-reports": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+		"node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
 			"dev": true,
-			"requires": {
-				"@types/istanbul-lib-report": "*"
+			"dependencies": {
+				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/sourcemap-codec": "^1.4.10",
+				"@jridgewell/trace-mapping": "^0.3.9"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"@types/json-schema": {
-			"version": "7.0.11",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-			"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+		"node_modules/@jridgewell/sourcemap-codec": {
+			"version": "1.4.14",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+			"integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
 			"dev": true
 		},
-		"@types/json5": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-			"dev": true
+		"node_modules/@jridgewell/trace-mapping": {
+			"version": "0.3.18",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+			"integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
+			"dev": true,
+			"dependencies": {
+				"@jridgewell/resolve-uri": "3.1.0",
+				"@jridgewell/sourcemap-codec": "1.4.14"
+			}
 		},
-		"@types/linkify-it": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
-			"integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+		"node_modules/@leichtgewicht/ip-codec": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
 			"dev": true
 		},
-		"@types/lodash": {
-			"version": "4.14.186",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-			"integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="
+		"node_modules/@lodder/grunt-postcss": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@lodder/grunt-postcss/-/grunt-postcss-3.1.1.tgz",
+			"integrity": "sha512-dgkDAUgjtCCCk7jsIBkDMhcL78y2reQ9YxqBpVJGa/0tX1Eus7GRWEn0QWqfFiHqqc3yrMQN+GtH8PUIZOBmDQ==",
+			"dev": true,
+			"dependencies": {
+				"diff": "^5.0.0",
+				"maxmin": "^3.0.0",
+				"picocolors": "^1.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			},
+			"peerDependencies": {
+				"grunt": ">=1.0.4",
+				"postcss": "^8.0.0"
+			}
 		},
-		"@types/markdown-it": {
-			"version": "12.2.3",
-			"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
-			"integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+		"node_modules/@lodder/grunt-postcss/node_modules/diff": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+			"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
 			"dev": true,
-			"requires": {
-				"@types/linkify-it": "*",
-				"@types/mdurl": "*"
+			"engines": {
+				"node": ">=0.3.1"
 			}
 		},
-		"@types/mdurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
-			"integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
-			"dev": true
+		"node_modules/@mrmlnc/readdir-enhanced": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
+			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
+			"dev": true,
+			"dependencies": {
+				"call-me-maybe": "^1.0.1",
+				"glob-to-regexp": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"@types/mime": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-			"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
-			"dev": true
+		"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+			"version": "5.1.1-v1",
+			"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+			"integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+			"dev": true,
+			"dependencies": {
+				"eslint-scope": "5.1.1"
+			}
 		},
-		"@types/minimatch": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-			"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
-			"dev": true
+		"node_modules/@nodelib/fs.scandir": {
+			"version": "2.1.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+			"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "2.0.5",
+				"run-parallel": "^1.1.9"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"@types/minimist": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-			"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-			"dev": true
-		},
-		"@types/mousetrap": {
-			"version": "1.6.9",
-			"resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.9.tgz",
-			"integrity": "sha512-HUAiN65VsRXyFCTicolwb5+I7FM6f72zjMWr+ajGk+YTvzBgXqa2A5U7d+rtsouAkunJ5U4Sb5lNJjo9w+nmXg=="
-		},
-		"@types/node": {
-			"version": "14.14.20",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
-			"integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
-			"dev": true
-		},
-		"@types/normalize-package-data": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-			"dev": true
-		},
-		"@types/parse-json": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-		},
-		"@types/prettier": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
-			"integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==",
-			"dev": true
-		},
-		"@types/prop-types": {
-			"version": "15.7.5",
-			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-			"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-		},
-		"@types/q": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-			"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
-			"dev": true
-		},
-		"@types/qs": {
-			"version": "6.9.7",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-			"dev": true
-		},
-		"@types/range-parser": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-			"dev": true
-		},
-		"@types/react": {
-			"version": "17.0.51",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.51.tgz",
-			"integrity": "sha512-YMddzAE+nSH04BiTJ5GydTxk0/3hckqyuOclg0s6zQYj/XzfRVNzHZAFwZb5SCSavkzTYUtcq/gwjLnvt2Y4cg==",
-			"requires": {
-				"@types/prop-types": "*",
-				"@types/scheduler": "*",
-				"csstype": "^3.0.2"
+		"node_modules/@nodelib/fs.stat": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+			"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"@types/react-dom": {
-			"version": "17.0.17",
-			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.17.tgz",
-			"integrity": "sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==",
-			"requires": {
-				"@types/react": "^17"
+		"node_modules/@nodelib/fs.walk": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+			"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.scandir": "2.1.5",
+				"fastq": "^1.6.0"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"@types/retry": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
-			"dev": true
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin": {
+			"version": "0.5.5",
+			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.5.tgz",
+			"integrity": "sha512-RbG7h6TuP6nFFYKJwbcToA1rjC1FyPg25NR2noAZ0vKI+la01KTSRPkuVPE+U88jXv7javx2JHglUcL1MHcshQ==",
+			"dev": true,
+			"dependencies": {
+				"ansi-html-community": "^0.0.8",
+				"common-path-prefix": "^3.0.0",
+				"core-js-pure": "^3.8.1",
+				"error-stack-parser": "^2.0.6",
+				"find-up": "^5.0.0",
+				"html-entities": "^2.1.0",
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0",
+				"source-map": "^0.7.3"
+			},
+			"engines": {
+				"node": ">= 10.13"
+			},
+			"peerDependencies": {
+				"@types/webpack": "4.x || 5.x",
+				"react-refresh": ">=0.10.0 <1.0.0",
+				"sockjs-client": "^1.4.0",
+				"type-fest": ">=0.17.0 <3.0.0",
+				"webpack": ">=4.43.0 <6.0.0",
+				"webpack-dev-server": "3.x || 4.x",
+				"webpack-hot-middleware": "2.x",
+				"webpack-plugin-serve": "0.x || 1.x"
+			},
+			"peerDependenciesMeta": {
+				"@types/webpack": {
+					"optional": true
+				},
+				"sockjs-client": {
+					"optional": true
+				},
+				"type-fest": {
+					"optional": true
+				},
+				"webpack-dev-server": {
+					"optional": true
+				},
+				"webpack-hot-middleware": {
+					"optional": true
+				},
+				"webpack-plugin-serve": {
+					"optional": true
+				}
+			}
 		},
-		"@types/scheduler": {
-			"version": "0.16.2",
-			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-			"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"@types/semver": {
-			"version": "7.3.12",
-			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-			"integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==",
-			"dev": true
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"@types/serve-index": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
-			"requires": {
-				"@types/express": "*"
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"@types/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
-			"requires": {
-				"@types/mime": "*",
-				"@types/node": "*"
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"@types/sockjs": {
-			"version": "0.3.33",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@types/source-list-map": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-			"dev": true
+		"node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+			"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"@types/stack-utils": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+		"node_modules/@polka/url": {
+			"version": "1.0.0-next.21",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+			"integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
 			"dev": true
 		},
-		"@types/tapable": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
-			"integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
-			"dev": true
+		"node_modules/@popperjs/core": {
+			"version": "2.11.6",
+			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+			"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/popperjs"
+			}
 		},
-		"@types/uglify-js": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
-			"integrity": "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==",
-			"dev": true,
-			"requires": {
-				"source-map": "^0.6.1"
+		"node_modules/@preact/signals": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.1.5.tgz",
+			"integrity": "sha512-OWr9TjuNh9ol/B5rNbLANEA940MvbYDMGcSAjPaKzAHBPhnTpuFCWhBB8vSm9lfy1BxKx6DKJLSs3Cz24otdkw==",
+			"dependencies": {
+				"@preact/signals-core": "^1.3.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
 			},
+			"peerDependencies": {
+				"preact": "10.x"
+			}
+		},
+		"node_modules/@preact/signals-core": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.3.1.tgz",
+			"integrity": "sha512-DL+3kDssZ3UOMz9HufwSYE/gK0+TnT1jzegfF5rstgyPrnyfjz4BHAoxmzQA6Mkp4UlKe8qjsgl3v5a/obzNig==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			}
+		},
+		"node_modules/@preact/signals-react": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/@preact/signals-react/-/signals-react-1.3.4.tgz",
+			"integrity": "sha512-+MIGr7ZXpRwGhk9VrK4sT5SGQSzzNCgNHuPRJ1so4rwj/DY0Ks1//2ie0sMyPhWjO7NDA91Mp4ph1Nzo3hDHhA==",
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+				"@preact/signals-core": "^1.3.1",
+				"use-sync-external-store": "^1.2.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			},
+			"peerDependencies": {
+				"react": "^16.14.0 || 17.x || 18.x"
 			}
 		},
-		"@types/webpack": {
-			"version": "4.41.33",
-			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
-			"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
+		"node_modules/@puppeteer/browsers": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-0.5.0.tgz",
+			"integrity": "sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/tapable": "^1",
-				"@types/uglify-js": "*",
-				"@types/webpack-sources": "*",
-				"anymatch": "^3.0.0",
-				"source-map": "^0.6.0"
-			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+				"debug": "4.3.4",
+				"extract-zip": "2.0.1",
+				"https-proxy-agent": "5.0.1",
+				"progress": "2.0.3",
+				"proxy-from-env": "1.1.0",
+				"tar-fs": "2.1.1",
+				"unbzip2-stream": "1.4.3",
+				"yargs": "17.7.1"
+			},
+			"bin": {
+				"browsers": "lib/cjs/main-cli.js"
+			},
+			"engines": {
+				"node": ">=14.1.0"
+			},
+			"peerDependencies": {
+				"typescript": ">= 4.7.4"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
 				}
 			}
 		},
-		"@types/webpack-sources": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
-			"integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
+		"node_modules/@puppeteer/browsers/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@puppeteer/browsers/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"@types/source-list-map": "*",
-				"source-map": "^0.7.3"
-			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-					"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"@types/ws": {
-			"version": "8.5.3",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-			"integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+		"node_modules/@puppeteer/browsers/node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*"
+			"dependencies": {
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"@types/yargs": {
-			"version": "16.0.4",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+		"node_modules/@puppeteer/browsers/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@types/yargs-parser": "*"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"@types/yargs-parser": {
-			"version": "21.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-			"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+		"node_modules/@puppeteer/browsers/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"@types/yauzl": {
-			"version": "2.9.1",
-			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-			"integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+		"node_modules/@puppeteer/browsers/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/@puppeteer/browsers/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"@types/node": "*"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@typescript-eslint/eslint-plugin": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.41.0.tgz",
-			"integrity": "sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==",
+		"node_modules/@puppeteer/browsers/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/scope-manager": "5.41.0",
-				"@typescript-eslint/type-utils": "5.41.0",
-				"@typescript-eslint/utils": "5.41.0",
-				"debug": "^4.3.4",
-				"ignore": "^5.2.0",
-				"regexpp": "^3.2.0",
-				"semver": "^7.3.7",
-				"tsutils": "^3.21.0"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@typescript-eslint/experimental-utils": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.41.0.tgz",
-			"integrity": "sha512-/qxT2Kd2q/A22JVIllvws4rvc00/3AT4rAo/0YgEN28y+HPhbJbk6X4+MAHEoZzpNyAOugIT7D/OLnKBW8FfhA==",
+		"node_modules/@puppeteer/browsers/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/utils": "5.41.0"
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"@typescript-eslint/parser": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.41.0.tgz",
-			"integrity": "sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==",
+		"node_modules/@puppeteer/browsers/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/scope-manager": "5.41.0",
-				"@typescript-eslint/types": "5.41.0",
-				"@typescript-eslint/typescript-estree": "5.41.0",
-				"debug": "^4.3.4"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"@typescript-eslint/scope-manager": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.41.0.tgz",
-			"integrity": "sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==",
+		"node_modules/@puppeteer/browsers/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.41.0",
-				"@typescript-eslint/visitor-keys": "5.41.0"
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"@typescript-eslint/type-utils": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.41.0.tgz",
-			"integrity": "sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==",
+		"node_modules/@puppeteer/browsers/node_modules/yargs": {
+			"version": "17.7.1",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+			"integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/typescript-estree": "5.41.0",
-				"@typescript-eslint/utils": "5.41.0",
-				"debug": "^4.3.4",
-				"tsutils": "^3.21.0"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				}
-			}
-		},
-		"@typescript-eslint/types": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.41.0.tgz",
-			"integrity": "sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==",
-			"dev": true
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
 		},
-		"@typescript-eslint/typescript-estree": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.41.0.tgz",
-			"integrity": "sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==",
+		"node_modules/@puppeteer/browsers/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.41.0",
-				"@typescript-eslint/visitor-keys": "5.41.0",
-				"debug": "^4.3.4",
-				"globby": "^11.1.0",
-				"is-glob": "^4.0.3",
-				"semver": "^7.3.7",
-				"tsutils": "^3.21.0"
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@radix-ui/primitive": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.0.tgz",
+			"integrity": "sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
+			}
+		},
+		"node_modules/@radix-ui/react-arrow": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.0.2.tgz",
+			"integrity": "sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-primitive": "1.0.2"
 			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-collection": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.0.2.tgz",
+			"integrity": "sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==",
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"is-glob": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-					"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-slot": "1.0.1"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@typescript-eslint/utils": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.41.0.tgz",
-			"integrity": "sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==",
-			"dev": true,
-			"requires": {
-				"@types/json-schema": "^7.0.9",
-				"@types/semver": "^7.3.12",
-				"@typescript-eslint/scope-manager": "5.41.0",
-				"@typescript-eslint/types": "5.41.0",
-				"@typescript-eslint/typescript-estree": "5.41.0",
-				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^3.0.0",
-				"semver": "^7.3.7"
+		"node_modules/@radix-ui/react-compose-refs": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz",
+			"integrity": "sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
 			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-context": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.0.0.tgz",
+			"integrity": "sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==",
 			"dependencies": {
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@typescript-eslint/visitor-keys": {
-			"version": "5.41.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.41.0.tgz",
-			"integrity": "sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/types": "5.41.0",
-				"eslint-visitor-keys": "^3.3.0"
+		"node_modules/@radix-ui/react-dialog": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.0.0.tgz",
+			"integrity": "sha512-Yn9YU+QlHYLWwV1XfKiqnGVpWYWk6MeBVM6x/bcoyPvxgjQGoeT35482viLPctTMWoMw0PoHgqfSox7Ig+957Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-dismissable-layer": "1.0.0",
+				"@radix-ui/react-focus-guards": "1.0.0",
+				"@radix-ui/react-focus-scope": "1.0.0",
+				"@radix-ui/react-id": "1.0.0",
+				"@radix-ui/react-portal": "1.0.0",
+				"@radix-ui/react-presence": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.0",
+				"@radix-ui/react-slot": "1.0.0",
+				"@radix-ui/react-use-controllable-state": "1.0.0",
+				"aria-hidden": "^1.1.1",
+				"react-remove-scroll": "2.5.4"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.0.tgz",
+			"integrity": "sha512-n7kDRfx+LB1zLueRDvZ1Pd0bxdJWDUZNQ/GWoxDn2prnuJKRdxsjulejX/ePkOsLi2tTm6P24mDqlMSgQpsT6g==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.0",
+				"@radix-ui/react-use-callback-ref": "1.0.0",
+				"@radix-ui/react-use-escape-keydown": "1.0.0"
 			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-focus-scope": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.0.tgz",
+			"integrity": "sha512-C4SWtsULLGf/2L4oGeIHlvWQx7Rf+7cX/vKOAD2dXW0A1b5QXwi3wWeaEgW+wn+SEVrraMUk05vLU9fZZz5HbQ==",
 			"dependencies": {
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true
-				}
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.0",
+				"@radix-ui/react-use-callback-ref": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@use-gesture/core": {
-			"version": "10.2.20",
-			"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.20.tgz",
-			"integrity": "sha512-4lFhHc8so4yIHkBEs641DnEsBxPyhJ5GEjB4PURFDH4p/FcZriH6w99knZgI63zN/MBFfylMyb8+PDuj6RIXKQ=="
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-portal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.0.tgz",
+			"integrity": "sha512-a8qyFO/Xb99d8wQdu4o7qnigNjTPG123uADNecz0eX4usnQEj7o+cG4ZX4zkqq98NYekT7UoEQIjxBNWIFuqTA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-primitive": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@use-gesture/react": {
-			"version": "10.2.20",
-			"resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.20.tgz",
-			"integrity": "sha512-KnJq9ZSqprWA6uNhWTUHZqTCh+rfa0j8ehTzqeBhktUPrmTj7yVOBvEQ/vSFU/7d72cGgWSsJ0f5T6GQCHXnvg==",
-			"requires": {
-				"@use-gesture/core": "10.2.20"
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.0.tgz",
+			"integrity": "sha512-EyXe6mnRlHZ8b6f4ilTDrXmkLShICIuOTTj0GX4w1rp+wSxf3+TD05u1UOITC8VsJ2a9nwHvdXtOXEOl0Cw/zQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-slot": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/ast": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-			"integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/helper-numbers": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.0.tgz",
+			"integrity": "sha512-3mrKauI/tWXo1Ll+gN5dHcxDPdm/Df1ufcDLCecn+pnCIVcdWE7CujXo8QaXOWRJyZyQWWbpB8eFwHzWXlv5mQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-			"integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-			"dev": true
+		"node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-escape-keydown": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.0.tgz",
+			"integrity": "sha512-JwfBCUIfhXRxKExgIqGa4CQsiMemo1Xt0W/B4ei3fpzpvPENKpMKQ8mZSB6Acj3ebrAEgi2xiQvcI1PAAodvyg==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-use-callback-ref": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@webassemblyjs/helper-api-error": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-			"integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-			"dev": true
+		"node_modules/@radix-ui/react-dialog/node_modules/react-remove-scroll": {
+			"version": "2.5.4",
+			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.4.tgz",
+			"integrity": "sha512-xGVKJJr0SJGQVirVFAUZ2k1QLyO6m+2fy0l8Qawbp5Jgrv3DeLalrfMNBFSlmz5kriGGzsVBtGVnf4pTKIhhWA==",
+			"dependencies": {
+				"react-remove-scroll-bar": "^2.3.3",
+				"react-style-singleton": "^2.2.1",
+				"tslib": "^2.1.0",
+				"use-callback-ref": "^1.3.0",
+				"use-sidecar": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
 		},
-		"@webassemblyjs/helper-buffer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-			"integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-			"dev": true
+		"node_modules/@radix-ui/react-direction": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.0.tgz",
+			"integrity": "sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@webassemblyjs/helper-numbers": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-			"integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@xtuc/long": "4.2.2"
+		"node_modules/@radix-ui/react-dismissable-layer": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.3.tgz",
+			"integrity": "sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-use-callback-ref": "1.0.0",
+				"@radix-ui/react-use-escape-keydown": "1.0.2"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-			"integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-			"dev": true
+		"node_modules/@radix-ui/react-dropdown-menu": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.0.4.tgz",
+			"integrity": "sha512-y6AT9+MydyXcByivdK1+QpjWoKaC7MLjkS/cH1Q3keEyMvDkiY85m8o2Bi6+Z1PPUlCsMULopxagQOSfN0wahg==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-id": "1.0.0",
+				"@radix-ui/react-menu": "2.0.4",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-use-controllable-state": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-			"integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1"
+		"node_modules/@radix-ui/react-focus-guards": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.0.0.tgz",
+			"integrity": "sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/ieee754": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-			"integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-			"dev": true,
-			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
+		"node_modules/@radix-ui/react-focus-scope": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.0.2.tgz",
+			"integrity": "sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-use-callback-ref": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/leb128": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-			"integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-			"dev": true,
-			"requires": {
-				"@xtuc/long": "4.2.2"
+		"node_modules/@radix-ui/react-id": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.0.tgz",
+			"integrity": "sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-use-layout-effect": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/utf8": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-			"integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-			"dev": true
+		"node_modules/@radix-ui/react-menu": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.0.4.tgz",
+			"integrity": "sha512-mzKR47tZ1t193trEqlQoJvzY4u9vYfVH16ryBrVrCAGZzkgyWnMQYEZdUkM7y8ak9mrkKtJiqB47TlEnubeOFQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-collection": "1.0.2",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-direction": "1.0.0",
+				"@radix-ui/react-dismissable-layer": "1.0.3",
+				"@radix-ui/react-focus-guards": "1.0.0",
+				"@radix-ui/react-focus-scope": "1.0.2",
+				"@radix-ui/react-id": "1.0.0",
+				"@radix-ui/react-popper": "1.1.1",
+				"@radix-ui/react-portal": "1.0.2",
+				"@radix-ui/react-presence": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-roving-focus": "1.0.3",
+				"@radix-ui/react-slot": "1.0.1",
+				"@radix-ui/react-use-callback-ref": "1.0.0",
+				"aria-hidden": "^1.1.1",
+				"react-remove-scroll": "2.5.5"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-popper": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.1.1.tgz",
+			"integrity": "sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@floating-ui/react-dom": "0.7.2",
+				"@radix-ui/react-arrow": "1.0.2",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-use-callback-ref": "1.0.0",
+				"@radix-ui/react-use-layout-effect": "1.0.0",
+				"@radix-ui/react-use-rect": "1.0.0",
+				"@radix-ui/react-use-size": "1.0.0",
+				"@radix-ui/rect": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/core": {
+			"version": "0.7.3",
+			"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-0.7.3.tgz",
+			"integrity": "sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg=="
 		},
-		"@webassemblyjs/wasm-edit": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-			"integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/helper-wasm-section": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-opt": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
-				"@webassemblyjs/wast-printer": "1.11.1"
+		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/dom": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-0.5.4.tgz",
+			"integrity": "sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==",
+			"dependencies": {
+				"@floating-ui/core": "^0.7.3"
 			}
 		},
-		"@webassemblyjs/wasm-gen": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-			"integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+		"node_modules/@radix-ui/react-popper/node_modules/@floating-ui/react-dom": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-0.7.2.tgz",
+			"integrity": "sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==",
+			"dependencies": {
+				"@floating-ui/dom": "^0.5.3",
+				"use-isomorphic-layout-effect": "^1.1.1"
+			},
+			"peerDependencies": {
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
 			}
 		},
-		"@webassemblyjs/wasm-opt": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-			"integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-buffer": "1.11.1",
-				"@webassemblyjs/wasm-gen": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1"
+		"node_modules/@radix-ui/react-portal": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.0.2.tgz",
+			"integrity": "sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-primitive": "1.0.2"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/wasm-parser": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-			"integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/helper-api-error": "1.11.1",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-				"@webassemblyjs/ieee754": "1.11.1",
-				"@webassemblyjs/leb128": "1.11.1",
-				"@webassemblyjs/utf8": "1.11.1"
+		"node_modules/@radix-ui/react-presence": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.0.0.tgz",
+			"integrity": "sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-use-layout-effect": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webassemblyjs/wast-printer": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-			"integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-			"dev": true,
-			"requires": {
-				"@webassemblyjs/ast": "1.11.1",
-				"@xtuc/long": "4.2.2"
+		"node_modules/@radix-ui/react-primitive": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-1.0.2.tgz",
+			"integrity": "sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-slot": "1.0.1"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webpack-cli/configtest": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-			"integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-			"dev": true
+		"node_modules/@radix-ui/react-roving-focus": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.3.tgz",
+			"integrity": "sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/primitive": "1.0.0",
+				"@radix-ui/react-collection": "1.0.2",
+				"@radix-ui/react-compose-refs": "1.0.0",
+				"@radix-ui/react-context": "1.0.0",
+				"@radix-ui/react-direction": "1.0.0",
+				"@radix-ui/react-id": "1.0.0",
+				"@radix-ui/react-primitive": "1.0.2",
+				"@radix-ui/react-use-callback-ref": "1.0.0",
+				"@radix-ui/react-use-controllable-state": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0",
+				"react-dom": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/react-slot": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.1.tgz",
+			"integrity": "sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-compose-refs": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@webpack-cli/info": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
-			"integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
-			"dev": true,
-			"requires": {
-				"envinfo": "^7.7.3"
+		"node_modules/@radix-ui/react-use-callback-ref": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.0.0.tgz",
+			"integrity": "sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@webpack-cli/serve": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-			"dev": true
+		"node_modules/@radix-ui/react-use-controllable-state": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.0.0.tgz",
+			"integrity": "sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-use-callback-ref": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
 		},
-		"@wojtekmaj/enzyme-adapter-react-17": {
-			"version": "0.6.7",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.7.tgz",
-			"integrity": "sha512-B+byiwi/T1bx5hcj9wc0fUL5Hlb5giSXJzcnEfJVl2j6dGV2NJfcxDBYX0WWwIxlzNiFz8kAvlkFWI2y/nscZQ==",
-			"dev": true,
-			"requires": {
-				"@wojtekmaj/enzyme-adapter-utils": "^0.1.4",
-				"enzyme-shallow-equal": "^1.0.0",
-				"has": "^1.0.0",
-				"prop-types": "^15.7.0",
-				"react-is": "^17.0.0",
-				"react-test-renderer": "^17.0.0"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
+		"node_modules/@radix-ui/react-use-escape-keydown": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.0.2.tgz",
+			"integrity": "sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-use-callback-ref": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@wojtekmaj/enzyme-adapter-utils": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.4.tgz",
-			"integrity": "sha512-ARGIQSIIv3oBia1m5Ihn1VU0FGmft6KPe39SBKTb8p7LSXO23YI4kNtc4M/cKoIY7P+IYdrZcgMObvedyjoSQA==",
-			"dev": true,
-			"requires": {
-				"function.prototype.name": "^1.1.0",
-				"has": "^1.0.0",
-				"object.fromentries": "^2.0.0",
-				"prop-types": "^15.7.0"
+		"node_modules/@radix-ui/react-use-layout-effect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.0.0.tgz",
+			"integrity": "sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@wordpress/a11y": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.17.1.tgz",
-			"integrity": "sha512-VQx191AnuZ5QlO26oCULslykGfNIF5s9N5CXAW1I6KUqBxEOO964rUhumf8tWeB+5nrVgwBES6AkApdpfV00oQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/dom-ready": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1"
+		"node_modules/@radix-ui/react-use-rect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.0.0.tgz",
+			"integrity": "sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/rect": "1.0.0"
+			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
 			}
 		},
-		"@wordpress/annotations": {
-			"version": "2.17.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.17.3.tgz",
-			"integrity": "sha512-l/nVrNi78c6w7Hf+YWfLlIfS0WMSQtQGXgj1rp3ZJZp78cW2ofN7w5axSMD8iGkz660/J2GefZlhw/fDG6awkQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/rich-text": "^5.15.3",
-				"rememo": "^4.0.0",
-				"uuid": "^8.3.0"
+		"node_modules/@radix-ui/react-use-size": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.0.0.tgz",
+			"integrity": "sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==",
+			"dependencies": {
+				"@babel/runtime": "^7.13.10",
+				"@radix-ui/react-use-layout-effect": "1.0.0"
 			},
+			"peerDependencies": {
+				"react": "^16.8 || ^17.0 || ^18.0"
+			}
+		},
+		"node_modules/@radix-ui/rect": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.0.0.tgz",
+			"integrity": "sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==",
 			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
+				"@babel/runtime": "^7.13.10"
 			}
 		},
-		"@wordpress/api-fetch": {
-			"version": "6.14.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.14.1.tgz",
-			"integrity": "sha512-geEktCZzde3yXoX+TkSJGay1Rw0lz4HlPjsHoKMRZa9luxquksPFP/ASDF9HvWThxGOyv9tzZd7oEveJeTmssg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/url": "^3.18.1"
+		"node_modules/@react-spring/animated": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/animated/-/animated-9.7.1.tgz",
+			"integrity": "sha512-EX5KAD9y7sD43TnLeTNG1MgUVpuRO1YaSJRPawHNRgUWYfILge3s85anny4S4eTJGpdp5OoFV2kx9fsfeo0qsw==",
+			"dependencies": {
+				"@react-spring/shared": "~9.7.1",
+				"@react-spring/types": "~9.7.1"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"@wordpress/autop": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.17.1.tgz",
-			"integrity": "sha512-RGduB833OnnW17Wow8irTlHZK1Pq4ja9w4KMnGwyVhNsAcvIjGf3OSVm0+dUZKJvIpacrbcyVKQ9G3llXVe/Kg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@react-spring/core": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/core/-/core-9.7.1.tgz",
+			"integrity": "sha512-8K9/FaRn5VvMa24mbwYxwkALnAAyMRdmQXrARZLcBW2vxLJ6uw9Cy3d06Z8M12kEqF2bDlccaCSDsn2bSz+Q4A==",
+			"dependencies": {
+				"@react-spring/animated": "~9.7.1",
+				"@react-spring/rafz": "~9.7.1",
+				"@react-spring/shared": "~9.7.1",
+				"@react-spring/types": "~9.7.1"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/react-spring/donate"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"@wordpress/babel-plugin-import-jsx-pragma": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-4.3.0.tgz",
-			"integrity": "sha512-7AnWnpItOqH5YEcFA3RgxeOlb96R8KDWDPAZjZ6TpsdOVjFynT8H3Buc4v127BHmxuxKGyd2vxPIQIzC9dLzOw==",
-			"dev": true
+		"node_modules/@react-spring/rafz": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.7.1.tgz",
+			"integrity": "sha512-JSsrRfbEJvuE3w/uvU3mCTuWwpQcBXkwoW14lBgzK9XJhuxmscGo59AgJUpFkGOiGAVXFBGB+nEXtSinFsopgw=="
 		},
-		"@wordpress/babel-preset-default": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.1.1.tgz",
-			"integrity": "sha512-+7lSYvodz+oJFCuEswhCui8yg4ekH0pZ5aSDerTKaRD7LKvbjeqQv/UbDFVsZI42BfNIEQ9hhDl8TMyrhjiyIA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.16.0",
-				"@babel/plugin-transform-react-jsx": "^7.16.0",
-				"@babel/plugin-transform-runtime": "^7.16.0",
-				"@babel/preset-env": "^7.16.0",
-				"@babel/preset-typescript": "^7.16.0",
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/babel-plugin-import-jsx-pragma": "^4.0.1",
-				"@wordpress/browserslist-config": "^5.0.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/warning": "^2.17.1",
-				"browserslist": "^4.17.6",
-				"core-js": "^3.19.1"
+		"node_modules/@react-spring/shared": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/shared/-/shared-9.7.1.tgz",
+			"integrity": "sha512-R2kZ+VOO6IBeIAYTIA3C1XZ0ZVg/dDP5FKtWaY8k5akMer9iqf5H9BU0jyt3Qtxn0qQY7whQdf6MTcWtKeaawg==",
+			"dependencies": {
+				"@react-spring/rafz": "~9.7.1",
+				"@react-spring/types": "~9.7.1"
 			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			}
+		},
+		"node_modules/@react-spring/types": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/types/-/types-9.7.1.tgz",
+			"integrity": "sha512-yBcyfKUeZv9wf/ZFrQszvhSPuDx6Py6yMJzpMnS+zxcZmhXPeOCKZSHwqrUz1WxvuRckUhlgb7eNI/x5e1e8CA=="
+		},
+		"node_modules/@react-spring/web": {
+			"version": "9.7.1",
+			"resolved": "https://registry.npmjs.org/@react-spring/web/-/web-9.7.1.tgz",
+			"integrity": "sha512-6uUE5MyKqdrJnIJqlDN/AXf3i8PjOQzUuT26nkpsYxUGOk7c+vZVPcfrExLSoKzTb9kF0i66DcqzO5fXz/Z1AA==",
 			"dependencies": {
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				}
+				"@react-spring/animated": "~9.7.1",
+				"@react-spring/core": "~9.7.1",
+				"@react-spring/shared": "~9.7.1",
+				"@react-spring/types": "~9.7.1"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
 			}
 		},
-		"@wordpress/base-styles": {
-			"version": "4.11.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.11.0.tgz",
-			"integrity": "sha512-KGHGtOP8q4u3DhlDsw4mMxlcnqxFPMsPa2GrbFBFgFEMeC/v9XMJAAY97V93D5Tbz1JaWBXjQHI+FwPFuyvCHQ==",
+		"node_modules/@sideway/address": {
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+			"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
+			"dev": true,
+			"dependencies": {
+				"@hapi/hoek": "^9.0.0"
+			}
+		},
+		"node_modules/@sideway/formula": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
 			"dev": true
 		},
-		"@wordpress/blob": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.17.1.tgz",
-			"integrity": "sha512-rvGG93lTeWHxbhFpKDqRtLcZCC+ZsjtpaDHdOhBdehA+eCvFTcflkU8dZOtAdZJNQZKKJZWy63caD05OUw+Y1Q==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
+		"node_modules/@sideway/pinpoint": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+			"integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+			"dev": true
 		},
-		"@wordpress/block-directory": {
-			"version": "3.15.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-3.15.10.tgz",
-			"integrity": "sha512-sqBO77tsmNau8gwabieBTj89L2/f5SqjZus3OS+FlT/YPq8tlwnYLHEguObuKAIseLR97aWLnA5aGP+TQX8wfQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/edit-post": "^6.14.10",
-				"@wordpress/editor": "^12.16.9",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/plugins": "^4.15.2",
-				"@wordpress/url": "^3.18.1",
-				"change-case": "^4.1.2",
-				"lodash": "^4.17.21"
+		"node_modules/@sinclair/typebox": {
+			"version": "0.27.8",
+			"resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+			"integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+			"dev": true
+		},
+		"node_modules/@sindresorhus/is": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
+			"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@wordpress/block-editor": {
-			"version": "10.0.9",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-10.0.9.tgz",
-			"integrity": "sha512-XlE7623gvMTulB87hcxNkVmRHcZVSMOOksDdrmZFvkBvgBrfg3cj7efXpINAkuWYSXpr2UUIeYoUFpGE5PijyA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@react-spring/web": "^9.4.5",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/blob": "^3.17.1",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/date": "^4.17.1",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/rich-text": "^5.15.3",
-				"@wordpress/shortcode": "^3.17.1",
-				"@wordpress/style-engine": "^1.0.3",
-				"@wordpress/token-list": "^2.17.1",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/warning": "^2.17.1",
-				"@wordpress/wordcount": "^3.17.1",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"diff": "^4.0.2",
-				"dom-scroll-into-view": "^1.2.1",
-				"inherits": "^2.0.3",
-				"lodash": "^4.17.21",
-				"react-autosize-textarea": "^7.1.0",
-				"react-easy-crop": "^4.5.1",
-				"rememo": "^4.0.0",
-				"remove-accents": "^0.4.2",
-				"traverse": "^0.6.6"
+		"node_modules/@sinonjs/commons": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz",
+			"integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==",
+			"dev": true,
+			"dependencies": {
+				"type-detect": "4.0.8"
 			}
 		},
-		"@wordpress/block-library": {
-			"version": "7.14.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-7.14.10.tgz",
-			"integrity": "sha512-9iSpOiLX6yHPkwueZcTqdl1YIu8pYMxbaZGAGTMkzDJc0hAFXPNxEtFBxWDuyTOe6b9cIt6QFsfKo3XyvmOJsQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/autop": "^3.17.1",
-				"@wordpress/blob": "^3.17.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/date": "^4.17.1",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/primitives": "^3.15.1",
-				"@wordpress/reusable-blocks": "^3.15.9",
-				"@wordpress/rich-text": "^5.15.3",
-				"@wordpress/server-side-render": "^3.15.6",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/viewport": "^4.15.3",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"fast-average-color": "^4.3.0",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"micromodal": "^0.4.10",
-				"remove-accents": "^0.4.2"
+		"node_modules/@sinonjs/fake-timers": {
+			"version": "10.3.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
+			"integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
+			"dev": true,
+			"dependencies": {
+				"@sinonjs/commons": "^3.0.0"
 			}
 		},
-		"@wordpress/block-serialization-default-parser": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.17.1.tgz",
-			"integrity": "sha512-BmR8HUowTMXHiyCtNIr1VZ2emzFvk8A7DtnGTuvMOy2EQ+9oHfqJbVb9Lv1vSAoaa77GtoPNoGaUqE3yfp4C4w==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@sinonjs/samsam": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.0.tgz",
+			"integrity": "sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==",
+			"dev": true,
+			"dependencies": {
+				"@sinonjs/commons": "^2.0.0",
+				"lodash.get": "^4.4.2",
+				"type-detect": "^4.0.8"
 			}
 		},
-		"@wordpress/blocks": {
-			"version": "11.16.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-11.16.4.tgz",
-			"integrity": "sha512-Pmcy8qldy1T8+QGQ8m5jRERITVVGEBpEeNycj7pJJm5+KuPKl3eqtuSCsCXdYwUdfYeOputNBYiwha/hp+Va/A==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/autop": "^3.17.1",
-				"@wordpress/blob": "^3.17.1",
-				"@wordpress/block-serialization-default-parser": "^4.17.1",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/shortcode": "^3.17.1",
-				"change-case": "^4.1.2",
-				"colord": "^2.7.0",
-				"hpq": "^1.3.0",
-				"is-plain-object": "^5.0.0",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"rememo": "^4.0.0",
-				"remove-accents": "^0.4.2",
-				"showdown": "^1.9.1",
-				"simple-html-tokenizer": "^0.5.7",
-				"uuid": "^8.3.0"
-			},
+		"node_modules/@sinonjs/samsam/node_modules/@sinonjs/commons": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+			"integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+			"dev": true,
 			"dependencies": {
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-				},
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
+				"type-detect": "4.0.8"
 			}
 		},
-		"@wordpress/browserslist-config": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.3.0.tgz",
-			"integrity": "sha512-FIhYWu36TrZ49W+knaRwhw3Q+cxaTDEzSaiE83qMDeAPJytT/UaedoJULt5MfxUtfaKLmUa8bPjSFORxoxwbvQ==",
+		"node_modules/@sinonjs/text-encoding": {
+			"version": "0.7.2",
+			"resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz",
+			"integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==",
 			"dev": true
 		},
-		"@wordpress/components": {
-			"version": "21.0.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-21.0.6.tgz",
-			"integrity": "sha512-Cjinf0kzhicmY0r9GYsRwaPqhuBuSC7nACl5y1CTaiHXAQO6EzElW5QcgFsFX4HwHd0Y13u5NVRY2PgC4uzIpw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@emotion/cache": "^11.7.1",
-				"@emotion/css": "^11.7.1",
-				"@emotion/react": "^11.7.1",
-				"@emotion/serialize": "^1.0.2",
-				"@emotion/styled": "^11.6.0",
-				"@emotion/utils": "^1.0.0",
-				"@floating-ui/react-dom": "^1.0.0",
-				"@use-gesture/react": "^10.2.6",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/date": "^4.17.1",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/escape-html": "^2.17.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/primitives": "^3.15.1",
-				"@wordpress/rich-text": "^5.15.3",
-				"@wordpress/warning": "^2.17.1",
-				"change-case": "^4.1.2",
-				"classnames": "^2.3.1",
-				"colord": "^2.7.0",
-				"date-fns": "^2.28.0",
-				"dom-scroll-into-view": "^1.2.1",
-				"downshift": "^6.0.15",
-				"framer-motion": "^6.2.8",
-				"gradient-parser": "^0.1.5",
-				"highlight-words-core": "^1.2.2",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"re-resizable": "^6.4.0",
-				"react-colorful": "^5.3.1",
-				"reakit": "^1.3.8",
-				"remove-accents": "^0.4.2",
-				"use-lilius": "^2.0.1",
-				"uuid": "^8.3.0"
+		"node_modules/@svgr/babel-plugin-add-jsx-attribute": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz",
+			"integrity": "sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/compose": {
-			"version": "5.15.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-5.15.2.tgz",
-			"integrity": "sha512-q1qcCqQHjKRrfuTta4gekZlR1DareAx0+mi82Pl1sxkccQU741GgKmC2aJeyZAHbK0Rb/LzSop2fwJaG4rqNlQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@types/lodash": "^4.14.172",
-				"@types/mousetrap": "^1.6.8",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/priority-queue": "^2.17.2",
-				"change-case": "^4.1.2",
-				"clipboard": "^2.0.8",
-				"lodash": "^4.17.21",
-				"mousetrap": "^1.6.5",
-				"use-memo-one": "^1.1.1"
+		"node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz",
+			"integrity": "sha512-8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/core-data": {
-			"version": "5.0.4",
-			"resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-5.0.4.tgz",
-			"integrity": "sha512-/exKM6CM9iIkNY8KdpBcBx+bAj5lgnCNZ4HEPvHlavtSeFbWo+6DLZdp6p2j7eGgvQKz9ok1z5Z+WJn2yV41vw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/url": "^3.18.1",
-				"change-case": "^4.1.2",
-				"equivalent-key-map": "^0.2.2",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"rememo": "^4.0.0",
-				"uuid": "^8.3.0"
+		"node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz",
+			"integrity": "sha512-NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-				}
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/customize-widgets": {
-			"version": "3.14.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-3.14.10.tgz",
-			"integrity": "sha512-/mgg7OU78A2xjojxAq38Qbv82eIk0rjp95cuz1xUBBQs49O6PLuAIH8hbNpSJ39ijK17cHhTsibBwZeSopROrw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/block-library": "^7.14.10",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/interface": "^4.16.6",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/media-utils": "^4.8.1",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/widgets": "^2.15.9",
-				"classnames": "^2.3.1",
-				"lodash": "^4.17.21"
+		"node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz",
+			"integrity": "sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/data": {
-			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/data/-/data-7.1.3.tgz",
-			"integrity": "sha512-8xD8LT65vMXbYKg+e+o1I0XTBFb+MxwlaCbgTDkLDv1P3wWq5C4sn9Lxns8DyQI3gyi1dDI9323F1sIB8eZKrg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/is-shallow-equal": "^4.17.1",
-				"@wordpress/priority-queue": "^2.17.2",
-				"@wordpress/redux-routine": "^4.17.1",
-				"equivalent-key-map": "^0.2.2",
-				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"lodash": "^4.17.21",
-				"redux": "^4.1.2",
-				"turbo-combine-reducers": "^1.0.2",
-				"use-memo-one": "^1.1.1"
+		"node_modules/@svgr/babel-plugin-svg-dynamic-title": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz",
+			"integrity": "sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-				}
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/data-controls": {
-			"version": "2.17.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-2.17.3.tgz",
-			"integrity": "sha512-AkcEsEUNrVuPWoG9d1uxiQcmKGOLyROvHeAWJoGdlgLMEZVU1u7iLeMMG6HmIa2XDNAWZlAtPOuF+MRPcEoucg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1"
+		"node_modules/@svgr/babel-plugin-svg-em-dimensions": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz",
+			"integrity": "sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/date": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.17.1.tgz",
-			"integrity": "sha512-HvQ2em66WXuawFZKHkmv1SLTOQnPfTZalpXKXkS3b9hB2i7RYKRH/QiTOMFxQ/Iv5QxTm7Cl0uNWp3JKt5Bgfw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "^3.17.1",
-				"moment": "^2.22.1",
-				"moment-timezone": "^0.5.31"
+		"node_modules/@svgr/babel-plugin-transform-react-native-svg": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz",
+			"integrity": "sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/dependency-extraction-webpack-plugin": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-4.0.2.tgz",
-			"integrity": "sha512-pbB7Za3rljnCMDnu9HYGeyX/OQfgKnCyD3bIHZAD1GgtiuJOOeW91rXDa1uA+/HWMqDzf8xGqYiS84otszsksg==",
+		"node_modules/@svgr/babel-plugin-transform-svg-component": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz",
+			"integrity": "sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==",
 			"dev": true,
-			"requires": {
-				"json2php": "^0.0.4",
-				"webpack-sources": "^3.2.2"
+			"engines": {
+				"node": ">=12"
 			},
-			"dependencies": {
-				"json2php": {
-					"version": "0.0.4",
-					"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.4.tgz",
-					"integrity": "sha512-hFzejhs28f70sGnutcsRS459MnAsjRVI85RgPAL1KQIZEpjiDitc27CZv4IgOtaR86vrqOVlu9vJNew2XyTH4g==",
-					"dev": true
-				}
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/deprecated": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.17.1.tgz",
-			"integrity": "sha512-871rBeb0yW9H7YeM18wnPIe2kJSv8ym4eaM/g0v91SAZsKO4Lskea8WMeadya38J4Nejnre0ssPEBTQuDCI4Cw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.17.1"
+		"node_modules/@svgr/babel-preset": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz",
+			"integrity": "sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==",
+			"dev": true,
+			"dependencies": {
+				"@svgr/babel-plugin-add-jsx-attribute": "^6.5.1",
+				"@svgr/babel-plugin-remove-jsx-attribute": "*",
+				"@svgr/babel-plugin-remove-jsx-empty-expression": "*",
+				"@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.1",
+				"@svgr/babel-plugin-svg-dynamic-title": "^6.5.1",
+				"@svgr/babel-plugin-svg-em-dimensions": "^6.5.1",
+				"@svgr/babel-plugin-transform-react-native-svg": "^6.5.1",
+				"@svgr/babel-plugin-transform-svg-component": "^6.5.1"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"@wordpress/dom": {
-			"version": "3.17.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.17.2.tgz",
-			"integrity": "sha512-8wsfW+QEEX/p/SwQgBmKvGJtCGexxi0mqNrriN4h6b649vzdj7U6axkMEq+ugYFvEgeH90qQ5YPvQ70vblmYnQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/deprecated": "^3.17.1"
+		"node_modules/@svgr/core": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz",
+			"integrity": "sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.19.6",
+				"@svgr/babel-preset": "^6.5.1",
+				"@svgr/plugin-jsx": "^6.5.1",
+				"camelcase": "^6.2.0",
+				"cosmiconfig": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
 			}
 		},
-		"@wordpress/dom-ready": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.17.1.tgz",
-			"integrity": "sha512-tXoLSAsaJMMWr8vvVXBHw62bvRV2+tOlqNRXWHvkyVZmSFwKn+b2o1hs+XfDjZ2R1izt3Zc972lWvVC9UbGiuw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@svgr/core/node_modules/camelcase": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"@wordpress/e2e-test-utils": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-8.1.1.tgz",
-			"integrity": "sha512-OcSoKJH9ELd1CQYoFU/Ov3MgOvsrwyHazwPI9le2W5fcVEVpkFpFwLF8DVTOnhMdre0Z4pDhCie6otxgQiEeHA==",
+		"node_modules/@svgr/hast-util-to-babel-ast": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz",
+			"integrity": "sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==",
 			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/url": "^3.18.1",
-				"change-case": "^4.1.2",
-				"form-data": "^4.0.0",
-				"node-fetch": "^2.6.0"
-			},
 			"dependencies": {
-				"form-data": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-					"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-					"dev": true,
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "^1.0.8",
-						"mime-types": "^2.1.12"
-					}
-				}
+				"@babel/types": "^7.20.0",
+				"entities": "^4.4.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
 			}
 		},
-		"@wordpress/edit-post": {
-			"version": "6.14.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-6.14.10.tgz",
-			"integrity": "sha512-NDeeaLtSzWLxyzVSEOxcdbz/tDiQVu+TbctMa36W2k7oC4nB/S5dWjAvSq/DMeJkdR8KFqX2IK164WfQq5Z8aQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/block-library": "^7.14.10",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/editor": "^12.16.9",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/interface": "^4.16.6",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/media-utils": "^4.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/plugins": "^4.15.2",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/viewport": "^4.15.3",
-				"@wordpress/warning": "^2.17.1",
-				"classnames": "^2.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"rememo": "^4.0.0"
+		"node_modules/@svgr/hast-util-to-babel-ast/node_modules/entities": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
+			"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"@wordpress/edit-site": {
-			"version": "4.14.12",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-4.14.12.tgz",
-			"integrity": "sha512-VBxf6oAjJ942l7ivEJTYFRdTzUjfY2kKYkJJRXQQtJZRsTGXXPT0bSc928ZFkubQi0sfspj6RwZPVFa4RY8QDw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/block-library": "^7.14.10",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/editor": "^12.16.9",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/interface": "^4.16.6",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/media-utils": "^4.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/plugins": "^4.15.2",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/reusable-blocks": "^3.15.9",
-				"@wordpress/style-engine": "^1.0.3",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/viewport": "^4.15.3",
-				"classnames": "^2.3.1",
-				"downloadjs": "^1.4.7",
-				"history": "^5.1.0",
-				"lodash": "^4.17.21",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.0"
+		"node_modules/@svgr/plugin-jsx": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz",
+			"integrity": "sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.19.6",
+				"@svgr/babel-preset": "^6.5.1",
+				"@svgr/hast-util-to-babel-ast": "^6.5.1",
+				"svg-parser": "^2.0.4"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@svgr/core": "^6.0.0"
 			}
 		},
-		"@wordpress/edit-widgets": {
-			"version": "4.14.10",
-			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-4.14.10.tgz",
-			"integrity": "sha512-cTbnnoffiVivg/F+esX899z2XfDynDXC7lfj8WdOfYd/W4YbBAz37mRqUM/q5Y45xsgqgaQiYqtfbqzJ7eNJ1g==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/block-library": "^7.14.10",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/dom": "^3.17.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/interface": "^4.16.6",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/media-utils": "^4.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/plugins": "^4.15.2",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/reusable-blocks": "^3.15.9",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/widgets": "^2.15.9",
-				"classnames": "^2.3.1"
+		"node_modules/@svgr/plugin-svgo": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz",
+			"integrity": "sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==",
+			"dev": true,
+			"dependencies": {
+				"cosmiconfig": "^7.0.1",
+				"deepmerge": "^4.2.2",
+				"svgo": "^2.8.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
+			},
+			"peerDependencies": {
+				"@svgr/core": "*"
 			}
 		},
-		"@wordpress/editor": {
-			"version": "12.16.9",
-			"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-12.16.9.tgz",
-			"integrity": "sha512-F/eqenJYg/vmJSpVkj+Y9DeuYVf6FPORt5vH754xMv8+Ir9FWMiCYg0o7tzFGvboFDHMqhAeFGXjX3CjjXe49w==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/blob": "^3.17.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/date": "^4.17.1",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/keyboard-shortcuts": "^3.15.3",
-				"@wordpress/keycodes": "^3.17.1",
-				"@wordpress/media-utils": "^4.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/reusable-blocks": "^3.15.9",
-				"@wordpress/rich-text": "^5.15.3",
-				"@wordpress/server-side-render": "^3.15.6",
-				"@wordpress/url": "^3.18.1",
-				"@wordpress/wordcount": "^3.17.1",
-				"classnames": "^2.3.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"react-autosize-textarea": "^7.1.0",
-				"rememo": "^4.0.0",
-				"remove-accents": "^0.4.2"
+		"node_modules/@svgr/plugin-svgo/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"@wordpress/element": {
-			"version": "4.15.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-4.15.1.tgz",
-			"integrity": "sha512-Ut6zOMIbP99lWe7YIT/+Nhhu/P17uSBqau7AFK/oarrHicjlFmew5uc4olY5abdd3OtEpenGMq14vhuru47qGA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@types/react": "^17.0.37",
-				"@types/react-dom": "^17.0.11",
-				"@wordpress/escape-html": "^2.17.1",
-				"change-case": "^4.1.2",
-				"is-plain-object": "^5.0.0",
-				"react": "^17.0.2",
-				"react-dom": "^17.0.2"
-			},
+		"node_modules/@svgr/plugin-svgo/node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+			"dev": true,
 			"dependencies": {
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-				}
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
 			}
 		},
-		"@wordpress/escape-html": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.17.1.tgz",
-			"integrity": "sha512-4Ymjqi5tdOyqoKw9rhqgHIdEd8W1hfFvk3Ws0LD40vup849iSxs59vnWGLJyH2WjF7ojGdX5H6RwGk81gFMN8w==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@svgr/plugin-svgo/node_modules/css-tree": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.14",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"@wordpress/eslint-plugin": {
-			"version": "13.4.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-13.4.0.tgz",
-			"integrity": "sha512-318QjzGildIdHJVAT26CFkYzoXW8w3RUTNzDJrJ+Hx9EHCg2TNOrUwW4rLwp9h32Gsw/QerhF9wzE/pueoYdYw==",
+		"node_modules/@svgr/plugin-svgo/node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
 			"dev": true,
-			"requires": {
-				"@babel/eslint-parser": "^7.16.0",
-				"@typescript-eslint/eslint-plugin": "^5.3.0",
-				"@typescript-eslint/parser": "^5.3.0",
-				"@wordpress/babel-preset-default": "^7.4.0",
-				"@wordpress/prettier-config": "^2.3.0",
-				"cosmiconfig": "^7.0.0",
-				"eslint-config-prettier": "^8.3.0",
-				"eslint-plugin-import": "^2.25.2",
-				"eslint-plugin-jest": "^25.2.3",
-				"eslint-plugin-jsdoc": "^37.0.3",
-				"eslint-plugin-jsx-a11y": "^6.5.1",
-				"eslint-plugin-prettier": "^3.3.0",
-				"eslint-plugin-react": "^7.27.0",
-				"eslint-plugin-react-hooks": "^4.3.0",
-				"globals": "^13.12.0",
-				"requireindex": "^1.2.0"
+			"engines": {
+				"node": ">= 6"
 			},
-			"dependencies": {
-				"@wordpress/babel-preset-default": {
-					"version": "7.4.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.4.0.tgz",
-					"integrity": "sha512-7drcVBIajDE8s3At7yUr9UdHROYkfPYgR4OaG+EugDn9MzuDIEsGalnazDYwvjerLAwsf8S/S8o34bi6IrthYQ==",
-					"dev": true,
-					"requires": {
-						"@babel/core": "^7.16.0",
-						"@babel/plugin-transform-react-jsx": "^7.16.0",
-						"@babel/plugin-transform-runtime": "^7.16.0",
-						"@babel/preset-env": "^7.16.0",
-						"@babel/preset-typescript": "^7.16.0",
-						"@babel/runtime": "^7.16.0",
-						"@wordpress/babel-plugin-import-jsx-pragma": "^4.3.0",
-						"@wordpress/browserslist-config": "^5.3.0",
-						"@wordpress/element": "^4.18.0",
-						"@wordpress/warning": "^2.20.0",
-						"browserslist": "^4.17.6",
-						"core-js": "^3.19.1"
-					}
-				},
-				"@wordpress/element": {
-					"version": "4.18.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-4.18.0.tgz",
-					"integrity": "sha512-+3gA4RTD/EDj1h2y/qikh+h0uCUxhShfM7QoDngKOBNSTZHqc0W2p6IMEe+AMdrmu8tyZboTJW/eONjUHE4n7g==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.16.0",
-						"@types/react": "^17.0.37",
-						"@types/react-dom": "^17.0.11",
-						"@wordpress/escape-html": "^2.20.0",
-						"change-case": "^4.1.2",
-						"is-plain-object": "^5.0.0",
-						"react": "^17.0.2",
-						"react-dom": "^17.0.2"
-					}
-				},
-				"@wordpress/escape-html": {
-					"version": "2.20.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.20.0.tgz",
-					"integrity": "sha512-bhHkFQrEkuJjhSB6OlQq/Kq+43k8E6JwUw/pCDAjJX2uU/DDG3tW3eftYn2ae7W23bPrNEs1/qULWzbaziPQnw==",
-					"dev": true,
-					"requires": {
-						"@babel/runtime": "^7.16.0"
-					}
-				},
-				"@wordpress/warning": {
-					"version": "2.20.0",
-					"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.20.0.tgz",
-					"integrity": "sha512-swTE3rUbk00rddyrQo2sA6yojbzNYUXTntAHbfoF68AC53i7cFunB3Bcod+paDPGR0gq1mr3rfatrWHze8qz3Q==",
-					"dev": true
-				},
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^0.20.2"
-					}
-				},
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
 			}
 		},
-		"@wordpress/format-library": {
-			"version": "3.15.9",
-			"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-3.15.9.tgz",
-			"integrity": "sha512-Jy56Lpye2c+tRxb1goQLsyJ1SPPYJPNn+6RXbcfvsyNKdAGpVijVWkSIm8R0ACChcht6Uol5SAZS9bv0BComQA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/html-entities": "^3.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/rich-text": "^5.15.3",
-				"@wordpress/url": "^3.18.1"
-			}
-		},
-		"@wordpress/hooks": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.17.1.tgz",
-			"integrity": "sha512-t079aqzZ4nJmUdnYfLpahlZsmrxd3MVV+UvQqwxppqxayqXkZP1F+e/KmehRCsD28IbP7R3LAfg+AGJ+SNhZQg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@svgr/plugin-svgo/node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
 			}
 		},
-		"@wordpress/html-entities": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.17.1.tgz",
-			"integrity": "sha512-iatXmkCs6C2N4DCFY08SCUqlGVRLxw1ejQ0CvIQ3aJV1LR5w4oYVHWm3+ac4wzUIK5bBucfCLWrTCmw/hDz3Uw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
-			}
+		"node_modules/@svgr/plugin-svgo/node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
 		},
-		"@wordpress/i18n": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.17.1.tgz",
-			"integrity": "sha512-LGtAEH0Z46eleGrj2juUTxU5nVFTkesQlJhWggcIMP8zgR9oAVwYNqxrGXCNCkw9QM9RyJdiAgRs1HJmoq/UUA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/hooks": "^3.17.1",
-				"gettext-parser": "^1.3.1",
-				"memize": "^1.1.0",
-				"sprintf-js": "^1.1.1",
-				"tannin": "^1.2.0"
+		"node_modules/@svgr/plugin-svgo/node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
 			}
 		},
-		"@wordpress/icons": {
-			"version": "9.8.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-9.8.1.tgz",
-			"integrity": "sha512-T0+i4fDqX97/V1bXzffhm3OuzzD8l+6+6/XHibSTUNB96yulKxy7WUVzPv1zsrIvEOyWGFp1jQMbx8ylNAhm1g==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/primitives": "^3.15.1"
-			}
+		"node_modules/@svgr/plugin-svgo/node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+			"dev": true
 		},
-		"@wordpress/interface": {
-			"version": "4.16.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-4.16.6.tgz",
-			"integrity": "sha512-CZx/sNE8iQE0N5eybzNRUSgEyPXyu4XF0t5BwHr4FsES1J9VDIFrA3njkIAa5qboRSijrPfUZMaxdhQ9qcoWXw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/plugins": "^4.15.2",
-				"@wordpress/preferences": "^2.9.6",
-				"@wordpress/viewport": "^4.15.3",
-				"classnames": "^2.3.1"
+		"node_modules/@svgr/plugin-svgo/node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
 			}
 		},
-		"@wordpress/is-shallow-equal": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.17.1.tgz",
-			"integrity": "sha512-KapoKQCp60Eaa/P9oaAXW9H6ml4Sys1i7ydnpSgWh1PFDXy95Omj7CoYn3ZwuujT+Vv8QzCarW+dOOjdm/oz3w==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@svgr/plugin-svgo/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"@wordpress/jest-console": {
-			"version": "6.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-6.3.0.tgz",
-			"integrity": "sha512-WnpXPqRNTo7OBnUEvC7mJufEZUNZXlScnRx3MHFOErzhCzed03t+x2hQHamhYpUrE2hZLwfKugN9WYDzh2mTtA==",
+		"node_modules/@svgr/plugin-svgo/node_modules/svgo": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
 			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"jest-matcher-utils": "^27.4.2"
+			"dependencies": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^4.1.3",
+				"css-tree": "^1.1.3",
+				"csso": "^4.2.0",
+				"picocolors": "^1.0.0",
+				"stable": "^0.1.8"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=10.13.0"
 			}
 		},
-		"@wordpress/jest-preset-default": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-9.1.0.tgz",
-			"integrity": "sha512-K8QwvAgpD8oW10ERejKyqxXCE43+QF3LmUlpDHBhRaMZsZGmcLAZBa1cOm7rcfeQ4jkg9uYv30Qp/NI30I3C5A==",
-			"dev": true,
-			"requires": {
-				"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-				"@wordpress/jest-console": "^6.1.0",
-				"babel-jest": "^27.4.5",
-				"enzyme": "^3.11.0",
-				"enzyme-to-json": "^3.4.4"
-			}
-		},
-		"@wordpress/keyboard-shortcuts": {
-			"version": "3.15.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-3.15.3.tgz",
-			"integrity": "sha512-dZ0VkwXk5BWf2J01dW+UruXiDimd8j1eR+BcApz8O9q1DVEnwdv66c9aw3RAcbeCm1vRQra6STYOPZOyYz6gLw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"rememo": "^4.0.0"
-			}
-		},
-		"@wordpress/keycodes": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.17.1.tgz",
-			"integrity": "sha512-9N/AYmqt5WWVouYAFaw8cbmxmOOTJSph/lW+8/t3PABOzbNLE5B/cXACIhrvvwMhzt3TS371/NxF8sTPWKRJqw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/i18n": "^4.17.1",
-				"change-case": "^4.1.2",
-				"lodash": "^4.17.21"
+		"node_modules/@svgr/webpack": {
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz",
+			"integrity": "sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.19.6",
+				"@babel/plugin-transform-react-constant-elements": "^7.18.12",
+				"@babel/preset-env": "^7.19.4",
+				"@babel/preset-react": "^7.18.6",
+				"@babel/preset-typescript": "^7.18.6",
+				"@svgr/core": "^6.5.1",
+				"@svgr/plugin-jsx": "^6.5.1",
+				"@svgr/plugin-svgo": "^6.5.1"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/gregberge"
 			}
 		},
-		"@wordpress/list-reusable-blocks": {
-			"version": "3.15.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-3.15.6.tgz",
-			"integrity": "sha512-Do7iQP2sUbhevxgawctvCs8Vc35QEHs9CqKrLeeMfWoZ/1F6x0vg89N2C44P7xfC/QYo7ODim3H/KOecJIrNSg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"lodash": "^4.17.21"
+		"node_modules/@tannin/compile": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@tannin/compile/-/compile-1.1.0.tgz",
+			"integrity": "sha512-n8m9eNDfoNZoxdvWiTfW/hSPhehzLJ3zW7f8E7oT6mCROoMNWCB4TYtv041+2FMAxweiE0j7i1jubQU4MEC/Gg==",
+			"dependencies": {
+				"@tannin/evaluate": "^1.2.0",
+				"@tannin/postfix": "^1.1.0"
 			}
 		},
-		"@wordpress/media-utils": {
-			"version": "4.8.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-4.8.1.tgz",
-			"integrity": "sha512-jdXASGLQoKCDBCoz8yksXcXrDnRTLD/ADKsylK+oIuz4iw/UBwh+WDAiAtUYVfE4CF4IOY0JC5E/c/7ybwD0JA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/blob": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1"
-			}
+		"node_modules/@tannin/evaluate": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@tannin/evaluate/-/evaluate-1.2.0.tgz",
+			"integrity": "sha512-3ioXvNowbO/wSrxsDG5DKIMxC81P0QrQTYai8zFNY+umuoHWRPbQ/TuuDEOju9E+jQDXmj6yI5GyejNuh8I+eg=="
 		},
-		"@wordpress/notices": {
-			"version": "3.17.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-3.17.3.tgz",
-			"integrity": "sha512-W3LS+F4XFwHUXR9TqctpW+zJYDRrpCLbVai2NI+HneAkFZEOb+khMzJcGJmCiZJGh5EhY5jfgUgWL3AcAbrtGA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/data": "^7.1.3"
+		"node_modules/@tannin/plural-forms": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@tannin/plural-forms/-/plural-forms-1.1.0.tgz",
+			"integrity": "sha512-xl9R2mDZO/qiHam1AgMnAES6IKIg7OBhcXqy6eDsRCdXuxAFPcjrej9HMjyCLE0DJ/8cHf0i5OQTstuBRhpbHw==",
+			"dependencies": {
+				"@tannin/compile": "^1.1.0"
 			}
 		},
-		"@wordpress/npm-package-json-lint-config": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.5.0.tgz",
-			"integrity": "sha512-UdPtZmvBKI6ygsLsGMxDJjt9H2S2M//rHSSHPMpy5nmLGft890c0+cQwoIPhJpGis3pC5r1Bh8zCrzVZqoBHVQ==",
-			"dev": true
-		},
-		"@wordpress/nux": {
-			"version": "5.15.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-5.15.6.tgz",
-			"integrity": "sha512-bk+s8qudRwFXkkJOzrnLDSpb8ITaU5sfp1pckukNfQbl6/KIA35VQwQgp6IFiNJ39eIqwxFovloUpNm3aTix/A==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"rememo": "^4.0.0"
-			}
-		},
-		"@wordpress/plugins": {
-			"version": "4.15.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-4.15.2.tgz",
-			"integrity": "sha512-OUtfStK+WeV14wYByJQCtVnO7Vvcf3Cym45mavCLLk47nHo/bpvoUR+S77QN6t6CZUYdNMNP+5LIi/eKFxUUqg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/hooks": "^3.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"memize": "^1.1.0"
-			}
+		"node_modules/@tannin/postfix": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@tannin/postfix/-/postfix-1.1.0.tgz",
+			"integrity": "sha512-oocsqY7g0cR+Gur5jRQLSrX2OtpMLMse1I10JQBm8CdGMrDkh1Mg2gjsiquMHRtBs4Qwu5wgEp5GgIYHk4SNPw=="
 		},
-		"@wordpress/postcss-plugins-preset": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-4.4.0.tgz",
-			"integrity": "sha512-KAy+HqPbl/yHGsvWgzfRPonQM7hJ1Zy6ABuwFAk/gqTy2v28InBhyZLSVJAjxMgh0Cxfyfgn+XYIHwlzMTvTXg==",
+		"node_modules/@tootallnate/once": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+			"integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
 			"dev": true,
-			"requires": {
-				"@wordpress/base-styles": "^4.11.0",
-				"autoprefixer": "^10.2.5"
-			},
-			"dependencies": {
-				"autoprefixer": {
-					"version": "10.4.12",
-					"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-					"integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.21.4",
-						"caniuse-lite": "^1.0.30001407",
-						"fraction.js": "^4.2.0",
-						"normalize-range": "^0.1.2",
-						"picocolors": "^1.0.0",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"@wordpress/preferences": {
-			"version": "2.9.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/preferences/-/preferences-2.9.6.tgz",
-			"integrity": "sha512-6lDMW9/F/w8IxyUhShEadcExJtjOHIDl10yfd/+kbFhfAlCkGexdg0Vn3A+/qmdk2B2IKdrB7jpubZYCkkxeTQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"classnames": "^2.3.1"
-			}
-		},
-		"@wordpress/preferences-persistence": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/preferences-persistence/-/preferences-persistence-1.9.1.tgz",
-			"integrity": "sha512-zOwT+9cOCeHt2Qa7I1yQBfV5duj1dC93BCmuuYDMGHkAqCZdy1IJaX64ZRIoEfl7cq/rtMM/UFWeXg4KIARluw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1"
+		"node_modules/@trysound/sax": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+			"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.13.0"
 			}
 		},
-		"@wordpress/prettier-config": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-2.3.0.tgz",
-			"integrity": "sha512-eqeiUvwogvtVTFZ+H0ZRY2EZNBXiyw3XbqGbi4Om15yAaMrnlm8NfUow2yHepYKkW/wWVr1tqBFQN7gZBPtYCQ==",
-			"dev": true
-		},
-		"@wordpress/primitives": {
-			"version": "3.15.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.15.1.tgz",
-			"integrity": "sha512-vt4SzpLv9u/LaOXV1j5x1KIbiOdCNB2C9ChbeyMsay89EhJ/qPVfahOwToOiVFyGPKn/uWAg05pwpsHoy8UVIQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/element": "^4.15.1",
-				"classnames": "^2.3.1"
+		"node_modules/@types/babel__core": {
+			"version": "7.20.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz",
+			"integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7",
+				"@types/babel__generator": "*",
+				"@types/babel__template": "*",
+				"@types/babel__traverse": "*"
 			}
 		},
-		"@wordpress/priority-queue": {
-			"version": "2.17.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.17.2.tgz",
-			"integrity": "sha512-MiaTOc5f74Zhrbdjs6qsxWt+ganrN1rcGQoVTfr0zDn28KBOOcF240p2P8QtpQB+h8dMbhkybJgXjoH7+5v5gg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"requestidlecallback": "^0.3.0"
+		"node_modules/@types/babel__generator": {
+			"version": "7.6.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
+			"integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.0.0"
 			}
 		},
-		"@wordpress/redux-routine": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.17.1.tgz",
-			"integrity": "sha512-wcDOtxncxZp7KzQ83Qf22bhEuS8TKgdGrKli18QXg+ekQAgWUzptUCuhBdGa70XXtDFBJ/ul+th/kR0O939O9Q==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"is-plain-object": "^5.0.0",
-				"is-promise": "^4.0.0",
-				"rungen": "^0.3.2"
-			},
+		"node_modules/@types/babel__template": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+			"integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+			"dev": true,
 			"dependencies": {
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-				}
+				"@babel/parser": "^7.1.0",
+				"@babel/types": "^7.0.0"
 			}
 		},
-		"@wordpress/reusable-blocks": {
-			"version": "3.15.9",
-			"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-3.15.9.tgz",
-			"integrity": "sha512-5YQlTQ3IaCtO39d6nqz6zTX7BXc1OS9zeejpkvIW6IIJ+9HchYWVyQ0Rm3ECRTlmxY0ctkj7SOodvtLWx1FLng==",
-			"requires": {
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"@wordpress/url": "^3.18.1"
-			}
-		},
-		"@wordpress/rich-text": {
-			"version": "5.15.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-5.15.3.tgz",
-			"integrity": "sha512-ZXXmluAPzUSPOEpK86Yovx+mp3io8U/wBVBM+zJ7pU2bg0Gr2ziag48F24yHVZ+X+eQIJnjAyDX8ybjL5391ug==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/a11y": "^3.17.1",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/escape-html": "^2.17.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/keycodes": "^3.17.1",
-				"lodash": "^4.17.21",
-				"memize": "^1.1.0",
-				"rememo": "^4.0.0"
+		"node_modules/@types/babel__traverse": {
+			"version": "7.20.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz",
+			"integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==",
+			"dev": true,
+			"dependencies": {
+				"@babel/types": "^7.20.7"
 			}
 		},
-		"@wordpress/scripts": {
-			"version": "24.1.2",
-			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-24.1.2.tgz",
-			"integrity": "sha512-+rKzwGerbZIYT1h155oRiR9RRKYFs56tQyKrQGdVhIyLO/r2OLavsbTZHeuMUviic073KJMuTGhiwUSuYzdpUg==",
+		"node_modules/@types/body-parser": {
+			"version": "1.19.2",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+			"integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.16.0",
-				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.2",
-				"@svgr/webpack": "^6.2.1",
-				"@wordpress/babel-preset-default": "^7.1.1",
-				"@wordpress/browserslist-config": "^5.0.1",
-				"@wordpress/dependency-extraction-webpack-plugin": "^4.0.2",
-				"@wordpress/eslint-plugin": "^13.1.1",
-				"@wordpress/jest-preset-default": "^9.0.1",
-				"@wordpress/npm-package-json-lint-config": "^4.2.1",
-				"@wordpress/postcss-plugins-preset": "^4.1.1",
-				"@wordpress/prettier-config": "^2.0.1",
-				"@wordpress/stylelint-config": "^21.0.1",
-				"adm-zip": "^0.5.9",
-				"babel-jest": "^27.4.5",
-				"babel-loader": "^8.2.3",
-				"browserslist": "^4.17.6",
-				"chalk": "^4.0.0",
-				"check-node-version": "^4.1.0",
-				"clean-webpack-plugin": "^3.0.0",
-				"copy-webpack-plugin": "^10.2.0",
-				"cross-spawn": "^5.1.0",
-				"css-loader": "^6.2.0",
-				"cssnano": "^5.0.7",
-				"cwd": "^0.10.0",
-				"dir-glob": "^3.0.1",
-				"eslint": "^8.3.0",
-				"expect-puppeteer": "^4.4.0",
-				"fast-glob": "^3.2.7",
-				"filenamify": "^4.2.0",
-				"jest": "^27.4.5",
-				"jest-dev-server": "^6.0.2",
-				"jest-environment-node": "^27.4.4",
-				"markdownlint-cli": "^0.31.1",
-				"merge-deep": "^3.0.3",
-				"mini-css-extract-plugin": "^2.5.1",
-				"minimist": "^1.2.0",
-				"npm-package-json-lint": "^5.0.0",
-				"npm-packlist": "^3.0.0",
-				"postcss": "^8.4.5",
-				"postcss-loader": "^6.2.1",
-				"prettier": "npm:wp-prettier@2.6.2",
-				"puppeteer-core": "^13.2.0",
-				"react-refresh": "^0.10.0",
-				"read-pkg-up": "^7.0.1",
-				"resolve-bin": "^0.4.0",
-				"sass": "^1.35.2",
-				"sass-loader": "^12.1.0",
-				"source-map-loader": "^3.0.0",
-				"stylelint": "^14.2.0",
-				"terser-webpack-plugin": "^5.1.4",
-				"url-loader": "^4.1.1",
-				"webpack": "^5.47.1",
-				"webpack-bundle-analyzer": "^4.4.2",
-				"webpack-cli": "^4.9.1",
-				"webpack-dev-server": "^4.4.0"
-			},
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"array-union": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-					"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
-					"dev": true
-				},
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"copy-webpack-plugin": {
-					"version": "10.2.4",
-					"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
-					"integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
-					"dev": true,
-					"requires": {
-						"fast-glob": "^3.2.7",
-						"glob-parent": "^6.0.1",
-						"globby": "^12.0.2",
-						"normalize-path": "^3.0.0",
-						"schema-utils": "^4.0.0",
-						"serialize-javascript": "^6.0.0"
-					}
-				},
-				"css-declaration-sorter": {
-					"version": "6.3.1",
-					"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-					"integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-					"dev": true
-				},
-				"css-select": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-					"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.0.1",
-						"domhandler": "^4.3.1",
-						"domutils": "^2.8.0",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"css-tree": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-					"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.14",
-						"source-map": "^0.6.1"
-					}
-				},
-				"css-what": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-					"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-					"dev": true
-				},
-				"cssnano": {
-					"version": "5.1.13",
-					"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
-					"integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
-					"dev": true,
-					"requires": {
-						"cssnano-preset-default": "^5.2.12",
-						"lilconfig": "^2.0.3",
-						"yaml": "^1.10.2"
-					}
-				},
-				"cssnano-preset-default": {
-					"version": "5.2.12",
-					"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz",
-					"integrity": "sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==",
-					"dev": true,
-					"requires": {
-						"css-declaration-sorter": "^6.3.0",
-						"cssnano-utils": "^3.1.0",
-						"postcss-calc": "^8.2.3",
-						"postcss-colormin": "^5.3.0",
-						"postcss-convert-values": "^5.1.2",
-						"postcss-discard-comments": "^5.1.2",
-						"postcss-discard-duplicates": "^5.1.0",
-						"postcss-discard-empty": "^5.1.1",
-						"postcss-discard-overridden": "^5.1.0",
-						"postcss-merge-longhand": "^5.1.6",
-						"postcss-merge-rules": "^5.1.2",
-						"postcss-minify-font-values": "^5.1.0",
-						"postcss-minify-gradients": "^5.1.1",
-						"postcss-minify-params": "^5.1.3",
-						"postcss-minify-selectors": "^5.2.1",
-						"postcss-normalize-charset": "^5.1.0",
-						"postcss-normalize-display-values": "^5.1.0",
-						"postcss-normalize-positions": "^5.1.1",
-						"postcss-normalize-repeat-style": "^5.1.1",
-						"postcss-normalize-string": "^5.1.0",
-						"postcss-normalize-timing-functions": "^5.1.0",
-						"postcss-normalize-unicode": "^5.1.0",
-						"postcss-normalize-url": "^5.1.0",
-						"postcss-normalize-whitespace": "^5.1.1",
-						"postcss-ordered-values": "^5.1.3",
-						"postcss-reduce-initial": "^5.1.0",
-						"postcss-reduce-transforms": "^5.1.0",
-						"postcss-svgo": "^5.1.0",
-						"postcss-unique-selectors": "^5.1.1"
-					}
-				},
-				"dom-serializer": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-					"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.2.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domutils": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-					"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.2.0",
-						"domhandler": "^4.2.0"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"filenamify": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
-					"integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
-					"dev": true,
-					"requires": {
-						"filename-reserved-regex": "^2.0.0",
-						"strip-outer": "^1.0.1",
-						"trim-repeated": "^1.0.0"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"globby": {
-					"version": "12.2.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
-					"integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
-					"dev": true,
-					"requires": {
-						"array-union": "^3.0.1",
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.2.7",
-						"ignore": "^5.1.9",
-						"merge2": "^1.4.1",
-						"slash": "^4.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-					"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.14",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-					"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				},
-				"nth-check": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-					"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "8.4.18",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-					"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-					"dev": true,
-					"requires": {
-						"nanoid": "^3.3.4",
-						"picocolors": "^1.0.0",
-						"source-map-js": "^1.0.2"
-					}
-				},
-				"postcss-calc": {
-					"version": "8.2.4",
-					"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-					"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-					"dev": true,
-					"requires": {
-						"postcss-selector-parser": "^6.0.9",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-colormin": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-					"integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"caniuse-api": "^3.0.0",
-						"colord": "^2.9.1",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-convert-values": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz",
-					"integrity": "sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.20.3",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-discard-comments": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-					"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-					"dev": true
-				},
-				"postcss-discard-duplicates": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-					"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-					"dev": true
-				},
-				"postcss-discard-empty": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-					"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-					"dev": true
-				},
-				"postcss-discard-overridden": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-					"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-					"dev": true
-				},
-				"postcss-merge-longhand": {
-					"version": "5.1.6",
-					"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz",
-					"integrity": "sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0",
-						"stylehacks": "^5.1.0"
-					}
-				},
-				"postcss-merge-rules": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz",
-					"integrity": "sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"caniuse-api": "^3.0.0",
-						"cssnano-utils": "^3.1.0",
-						"postcss-selector-parser": "^6.0.5"
-					}
-				},
-				"postcss-minify-font-values": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-					"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-minify-gradients": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-					"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-					"dev": true,
-					"requires": {
-						"colord": "^2.9.1",
-						"cssnano-utils": "^3.1.0",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-minify-params": {
-					"version": "5.1.3",
-					"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz",
-					"integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"cssnano-utils": "^3.1.0",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-minify-selectors": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
-					"integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
-					"dev": true,
-					"requires": {
-						"postcss-selector-parser": "^6.0.5"
-					}
-				},
-				"postcss-normalize-charset": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-					"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-					"dev": true
-				},
-				"postcss-normalize-display-values": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-					"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-positions": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
-					"integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-repeat-style": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
-					"integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-string": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-					"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-timing-functions": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-					"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-unicode": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-					"integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-url": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-					"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-					"dev": true,
-					"requires": {
-						"normalize-url": "^6.0.1",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-normalize-whitespace": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-					"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-ordered-values": {
-					"version": "5.1.3",
-					"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
-					"integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
-					"dev": true,
-					"requires": {
-						"cssnano-utils": "^3.1.0",
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-reduce-initial": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-					"integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"caniuse-api": "^3.0.0"
-					}
-				},
-				"postcss-reduce-transforms": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-					"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0"
-					}
-				},
-				"postcss-selector-parser": {
-					"version": "6.0.10",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-					"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-					"dev": true,
-					"requires": {
-						"cssesc": "^3.0.0",
-						"util-deprecate": "^1.0.2"
-					}
-				},
-				"postcss-svgo": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-					"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-					"dev": true,
-					"requires": {
-						"postcss-value-parser": "^4.2.0",
-						"svgo": "^2.7.0"
-					}
-				},
-				"postcss-unique-selectors": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-					"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-					"dev": true,
-					"requires": {
-						"postcss-selector-parser": "^6.0.5"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				},
-				"prettier": {
-					"version": "npm:wp-prettier@2.6.2",
-					"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.6.2.tgz",
-					"integrity": "sha512-AV33EzqiFJ3fj+mPlKABN59YFPReLkDxQnj067Z3uEOeRQf3g05WprL0RDuqM7UBhSRo9W1rMSC2KvZmjE5UOA==",
-					"dev": true
-				},
-				"read-pkg-up": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-					"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.1.0",
-						"read-pkg": "^5.2.0",
-						"type-fest": "^0.8.1"
-					}
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
-				},
-				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"source-map-loader": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
-					"integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
-					"dev": true,
-					"requires": {
-						"abab": "^2.0.5",
-						"iconv-lite": "^0.6.3",
-						"source-map-js": "^1.0.1"
-					}
-				},
-				"stylehacks": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-					"integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
-					"dev": true,
-					"requires": {
-						"browserslist": "^4.16.6",
-						"postcss-selector-parser": "^6.0.4"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"svgo": {
-					"version": "2.8.0",
-					"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-					"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-					"dev": true,
-					"requires": {
-						"@trysound/sax": "0.2.0",
-						"commander": "^7.2.0",
-						"css-select": "^4.1.3",
-						"css-tree": "^1.1.3",
-						"csso": "^4.2.0",
-						"picocolors": "^1.0.0",
-						"stable": "^0.1.8"
-					}
-				},
-				"type-fest": {
-					"version": "0.8.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-					"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-					"dev": true
-				}
+				"@types/connect": "*",
+				"@types/node": "*"
 			}
 		},
-		"@wordpress/server-side-render": {
-			"version": "3.15.6",
-			"resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-3.15.6.tgz",
-			"integrity": "sha512-5yrrcpFNFwRLt6WCkjX5NgDNEOtrHiZadyvD4P0SuxkHmvr+pmpPEbwq0yvlD444n9F5AeMAlbCe9TE5oCpZDg==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/deprecated": "^3.17.1",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/url": "^3.18.1",
-				"lodash": "^4.17.21"
+		"node_modules/@types/bonjour": {
+			"version": "3.5.10",
+			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+			"integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
 			}
 		},
-		"@wordpress/shortcode": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.17.1.tgz",
-			"integrity": "sha512-DLM35NtGcAOCltpOf5Uz7s7NRgwOkVwWPLUWDvUS1iFL2S9R3EOc7c7yYZr18yV6C2qB+QAuq+NKvESw6aoTsQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"memize": "^1.1.0"
+		"node_modules/@types/connect": {
+			"version": "3.4.35",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+			"integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
 			}
 		},
-		"@wordpress/style-engine": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/style-engine/-/style-engine-1.0.3.tgz",
-			"integrity": "sha512-///EPfjHCv5PDQ6cu6H/XtLK4vi3mZ9lWojVU2wAluS2NrrOHpmL8kkBLwcuJHuJpKjgCkRMrtQwW8uqCrXAsw==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"lodash": "^4.17.21"
+		"node_modules/@types/connect-history-api-fallback": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
+			"integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+			"dev": true,
+			"dependencies": {
+				"@types/express-serve-static-core": "*",
+				"@types/node": "*"
 			}
 		},
-		"@wordpress/stylelint-config": {
-			"version": "21.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-21.3.0.tgz",
-			"integrity": "sha512-bjb7jMafEiPdZ5deq1QdGnxvOLDiRcHqCMDPG6kRflb9TYQ1H1yDBC5r4nUm60wTN/xy/du80zCdNuDe2N2Nrg==",
+		"node_modules/@types/eslint": {
+			"version": "8.21.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz",
+			"integrity": "sha512-35EhHNOXgxnUgh4XCJsGhE7zdlDhYDN/aMG6UbkByCFFNgQ7b3U+uVoqBpicFydR8JEfgdjCF7SJ7MiJfzuiTA==",
 			"dev": true,
-			"requires": {
-				"stylelint-config-recommended": "^6.0.0",
-				"stylelint-config-recommended-scss": "^5.0.2"
+			"dependencies": {
+				"@types/estree": "*",
+				"@types/json-schema": "*"
 			}
 		},
-		"@wordpress/token-list": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-2.17.1.tgz",
-			"integrity": "sha512-7Xe2ecMZmULP/uZILUXcC+LzIdcmsEb24pU8QzegvgyMzTjs4h+DOJkQBtNP8Hyau+/9CNNG8jTGP+AT/cyRIA==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/@types/eslint-scope": {
+			"version": "3.7.4",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+			"integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
+			"dev": true,
+			"dependencies": {
+				"@types/eslint": "*",
+				"@types/estree": "*"
 			}
 		},
-		"@wordpress/url": {
-			"version": "3.18.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.18.1.tgz",
-			"integrity": "sha512-kzfoVfDQsFuswvnnYOjsYG3J9VNFH7Nx8Q+/evvsO7N+QN02v2vpHHg582VjAbHJa7VfHrIw+GjLsr8YL6sa2A==",
-			"requires": {
+		"node_modules/@types/estree": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+			"integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+			"dev": true
+		},
+		"node_modules/@types/express": {
+			"version": "4.17.17",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
+			"dev": true,
+			"dependencies": {
+				"@types/body-parser": "*",
+				"@types/express-serve-static-core": "^4.17.33",
+				"@types/qs": "*",
+				"@types/serve-static": "*"
+			}
+		},
+		"node_modules/@types/express-serve-static-core": {
+			"version": "4.17.33",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz",
+			"integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"@types/qs": "*",
+				"@types/range-parser": "*"
+			}
+		},
+		"node_modules/@types/glob": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+			"integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimatch": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/graceful-fs": {
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+			"integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/http-proxy": {
+			"version": "1.17.9",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
+			"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/istanbul-lib-coverage": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+			"integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==",
+			"dev": true
+		},
+		"node_modules/@types/istanbul-lib-report": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-coverage": "*"
+			}
+		},
+		"node_modules/@types/istanbul-reports": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+			"dev": true,
+			"dependencies": {
+				"@types/istanbul-lib-report": "*"
+			}
+		},
+		"node_modules/@types/jsdom": {
+			"version": "20.0.1",
+			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-20.0.1.tgz",
+			"integrity": "sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"@types/tough-cookie": "*",
+				"parse5": "^7.0.0"
+			}
+		},
+		"node_modules/@types/json-schema": {
+			"version": "7.0.11",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+			"integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+			"dev": true
+		},
+		"node_modules/@types/json5": {
+			"version": "0.0.29",
+			"resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+			"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+			"dev": true
+		},
+		"node_modules/@types/linkify-it": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz",
+			"integrity": "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==",
+			"dev": true
+		},
+		"node_modules/@types/markdown-it": {
+			"version": "12.2.3",
+			"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+			"integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/linkify-it": "*",
+				"@types/mdurl": "*"
+			}
+		},
+		"node_modules/@types/mdurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
+			"integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
+			"dev": true
+		},
+		"node_modules/@types/mime": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+			"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+			"dev": true
+		},
+		"node_modules/@types/minimatch": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+			"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+			"dev": true
+		},
+		"node_modules/@types/minimist": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+			"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
+			"dev": true
+		},
+		"node_modules/@types/mousetrap": {
+			"version": "1.6.11",
+			"resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.11.tgz",
+			"integrity": "sha512-F0oAily9Q9QQpv9JKxKn0zMKfOo36KHCW7myYsmUyf2t0g+sBTbG3UleTPoguHdE1z3GLFr3p7/wiOio52QFjQ=="
+		},
+		"node_modules/@types/node": {
+			"version": "14.14.20",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
+			"integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==",
+			"dev": true
+		},
+		"node_modules/@types/normalize-package-data": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+			"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
+			"dev": true
+		},
+		"node_modules/@types/parse-json": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+		},
+		"node_modules/@types/prettier": {
+			"version": "2.7.3",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+			"integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+			"dev": true
+		},
+		"node_modules/@types/prop-types": {
+			"version": "15.7.5",
+			"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
+			"integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
+		},
+		"node_modules/@types/q": {
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+			"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/@types/qs": {
+			"version": "6.9.7",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+			"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+			"dev": true
+		},
+		"node_modules/@types/range-parser": {
+			"version": "1.2.4",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+			"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+			"dev": true
+		},
+		"node_modules/@types/react": {
+			"version": "18.0.28",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz",
+			"integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==",
+			"dependencies": {
+				"@types/prop-types": "*",
+				"@types/scheduler": "*",
+				"csstype": "^3.0.2"
+			}
+		},
+		"node_modules/@types/react-dom": {
+			"version": "18.0.11",
+			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.11.tgz",
+			"integrity": "sha512-O38bPbI2CWtgw/OoQoY+BRelw7uysmXbWvw3nLWO21H1HSh+GOlqPuXshJfjmpNlKiiSDG9cc1JZAaMmVdcTlw==",
+			"dependencies": {
+				"@types/react": "*"
+			}
+		},
+		"node_modules/@types/retry": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+			"dev": true
+		},
+		"node_modules/@types/scheduler": {
+			"version": "0.16.2",
+			"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
+			"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+		},
+		"node_modules/@types/semver": {
+			"version": "7.5.0",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
+			"integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
+			"dev": true
+		},
+		"node_modules/@types/serve-index": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+			"integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+			"dev": true,
+			"dependencies": {
+				"@types/express": "*"
+			}
+		},
+		"node_modules/@types/serve-static": {
+			"version": "1.15.0",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+			"integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+			"dev": true,
+			"dependencies": {
+				"@types/mime": "*",
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/sockjs": {
+			"version": "0.3.33",
+			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+			"integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/source-list-map": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
+			"integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
+			"dev": true
+		},
+		"node_modules/@types/stack-utils": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+			"integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+			"dev": true
+		},
+		"node_modules/@types/tapable": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz",
+			"integrity": "sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==",
+			"dev": true
+		},
+		"node_modules/@types/tough-cookie": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+			"integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+			"dev": true
+		},
+		"node_modules/@types/uglify-js": {
+			"version": "3.17.1",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
+			"integrity": "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==",
+			"dev": true,
+			"dependencies": {
+				"source-map": "^0.6.1"
+			}
+		},
+		"node_modules/@types/uglify-js/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@types/webpack": {
+			"version": "4.41.33",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
+			"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"@types/tapable": "^1",
+				"@types/uglify-js": "*",
+				"@types/webpack-sources": "*",
+				"anymatch": "^3.0.0",
+				"source-map": "^0.6.0"
+			}
+		},
+		"node_modules/@types/webpack-sources": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz",
+			"integrity": "sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"@types/source-list-map": "*",
+				"source-map": "^0.7.3"
+			}
+		},
+		"node_modules/@types/webpack-sources/node_modules/source-map": {
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+			"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/@types/webpack/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@types/ws": {
+			"version": "8.5.4",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+			"integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@types/yargs": {
+			"version": "17.0.24",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz",
+			"integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==",
+			"dev": true,
+			"dependencies": {
+				"@types/yargs-parser": "*"
+			}
+		},
+		"node_modules/@types/yargs-parser": {
+			"version": "21.0.0",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
+			"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
+			"dev": true
+		},
+		"node_modules/@types/yauzl": {
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+			"integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"@types/node": "*"
+			}
+		},
+		"node_modules/@typescript-eslint/eslint-plugin": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+			"integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/regexpp": "^4.4.0",
+				"@typescript-eslint/scope-manager": "5.62.0",
+				"@typescript-eslint/type-utils": "5.62.0",
+				"@typescript-eslint/utils": "5.62.0",
+				"debug": "^4.3.4",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.2.0",
+				"natural-compare-lite": "^1.4.0",
+				"semver": "^7.3.7",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/parser": "^5.0.0",
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/parser": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+			"integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/scope-manager": "5.62.0",
+				"@typescript-eslint/types": "5.62.0",
+				"@typescript-eslint/typescript-estree": "5.62.0",
+				"debug": "^4.3.4"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/scope-manager": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+			"integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.62.0",
+				"@typescript-eslint/visitor-keys": "5.62.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/type-utils": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+			"integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/typescript-estree": "5.62.0",
+				"@typescript-eslint/utils": "5.62.0",
+				"debug": "^4.3.4",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "*"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/types": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+			"integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/typescript-estree": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+			"integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.62.0",
+				"@typescript-eslint/visitor-keys": "5.62.0",
+				"debug": "^4.3.4",
+				"globby": "^11.1.0",
+				"is-glob": "^4.0.3",
+				"semver": "^7.3.7",
+				"tsutils": "^3.21.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@typescript-eslint/utils": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+			"integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@types/json-schema": "^7.0.9",
+				"@types/semver": "^7.3.12",
+				"@typescript-eslint/scope-manager": "5.62.0",
+				"@typescript-eslint/types": "5.62.0",
+				"@typescript-eslint/typescript-estree": "5.62.0",
+				"eslint-scope": "^5.1.1",
+				"semver": "^7.3.7"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			},
+			"peerDependencies": {
+				"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys": {
+			"version": "5.62.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+			"integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/types": "5.62.0",
+				"eslint-visitor-keys": "^3.3.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/typescript-eslint"
+			}
+		},
+		"node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+			"integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/@use-gesture/core": {
+			"version": "10.2.24",
+			"resolved": "https://registry.npmjs.org/@use-gesture/core/-/core-10.2.24.tgz",
+			"integrity": "sha512-ZL7F9mgOn3Qlnp6QLI9jaOfcvqrx6JPE/BkdVSd8imveaFTm/a3udoO6f5Us/1XtqnL4347PsIiK6AtCvMHk2Q=="
+		},
+		"node_modules/@use-gesture/react": {
+			"version": "10.2.24",
+			"resolved": "https://registry.npmjs.org/@use-gesture/react/-/react-10.2.24.tgz",
+			"integrity": "sha512-rAZ8Nnpu1g4eFzqCPlaq+TppJpMy0dTpYOQx5KpfoBF4P3aWnCqwj7eKxcmdIb1NJKpIJj50DPugUH4mq5cpBg==",
+			"dependencies": {
+				"@use-gesture/core": "10.2.24"
+			},
+			"peerDependencies": {
+				"react": ">= 16.8.0"
+			}
+		},
+		"node_modules/@webassemblyjs/ast": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+			"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/helper-numbers": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/floating-point-hex-parser": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-api-error": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-buffer": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+			"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-numbers": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/helper-wasm-section": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+			"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/wasm-gen": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/ieee754": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+			"dev": true,
+			"dependencies": {
+				"@xtuc/ieee754": "^1.2.0"
+			}
+		},
+		"node_modules/@webassemblyjs/leb128": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+			"dev": true,
+			"dependencies": {
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webassemblyjs/utf8": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+			"dev": true
+		},
+		"node_modules/@webassemblyjs/wasm-edit": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+			"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/helper-wasm-section": "1.11.6",
+				"@webassemblyjs/wasm-gen": "1.11.6",
+				"@webassemblyjs/wasm-opt": "1.11.6",
+				"@webassemblyjs/wasm-parser": "1.11.6",
+				"@webassemblyjs/wast-printer": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-gen": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+			"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-opt": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+			"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/helper-buffer": "1.11.6",
+				"@webassemblyjs/wasm-gen": "1.11.6",
+				"@webassemblyjs/wasm-parser": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wasm-parser": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+			"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+				"@webassemblyjs/ieee754": "1.11.6",
+				"@webassemblyjs/leb128": "1.11.6",
+				"@webassemblyjs/utf8": "1.11.6"
+			}
+		},
+		"node_modules/@webassemblyjs/wast-printer": {
+			"version": "1.11.6",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+			"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+			"dev": true,
+			"dependencies": {
+				"@webassemblyjs/ast": "1.11.6",
+				"@xtuc/long": "4.2.2"
+			}
+		},
+		"node_modules/@webpack-cli/configtest": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+			"integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+			"dev": true,
+			"peerDependencies": {
+				"webpack": "4.x.x || 5.x.x",
+				"webpack-cli": "4.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/info": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+			"integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+			"dev": true,
+			"dependencies": {
+				"envinfo": "^7.7.3"
+			},
+			"peerDependencies": {
+				"webpack-cli": "4.x.x"
+			}
+		},
+		"node_modules/@webpack-cli/serve": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+			"dev": true,
+			"peerDependencies": {
+				"webpack-cli": "4.x.x"
+			},
+			"peerDependenciesMeta": {
+				"webpack-dev-server": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@wordpress/a11y": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/a11y/-/a11y-3.35.1.tgz",
+			"integrity": "sha512-tz0wtbBZNAMQJCJN7OmV7CD0K4B74Tl+Lmq0fEchwuwNh9/ZWG4ZOnTjvnfNEv4ynL6f23P3ECHhlcvMfvfo1A==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/dom-ready": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/annotations": {
+			"version": "2.35.7",
+			"resolved": "https://registry.npmjs.org/@wordpress/annotations/-/annotations-2.35.7.tgz",
+			"integrity": "sha512-LN/YoB7v4YwHsW/cRq9I3u6nczE1o1er0VQstwZr4ZpHqZtstL0UFNFE4HaYwmbsmyMTyFI4gDgGH83MdILmvw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/rich-text": "^6.12.7",
+				"rememo": "^4.0.2",
+				"uuid": "^8.3.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/annotations/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/@wordpress/api-fetch": {
+			"version": "6.32.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/api-fetch/-/api-fetch-6.32.1.tgz",
+			"integrity": "sha512-dl9coCJZLhhdG5fyU31jfNwQu9KugIGrnaUBYPh+Tz9WbfqHN22R490VPSXw6rfRpuq12QEj4+gv5mlpJJisdA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/url": "^3.36.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/autop": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/autop/-/autop-3.35.1.tgz",
+			"integrity": "sha512-8TrJBkgLKUL/AxNqwNIMUjwAiDuASzjabwWmtFo7JFtpyaHKSzohgztbyE2QFJcZ72AdHUEBqshIhHZ5N8F0yQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/babel-plugin-import-jsx-pragma": {
+			"version": "4.21.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-4.21.0.tgz",
+			"integrity": "sha512-mEnR5Zc8dYfNkyCb3NbVf+i6cWSrfIglRCyUzpryGUsyE/bMsrKeapZa1UbgwKpfLqgZNRbA2i7hKmurCVIPag==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.12.9"
+			}
+		},
+		"node_modules/@wordpress/babel-preset-default": {
+			"version": "7.19.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.19.1.tgz",
+			"integrity": "sha512-PsEx7B7t4AV5c6Sv7FkyksqXoZduISNUU1lTXSlGkWWzmYwZxXK0DKvY+M00cB8MotCzpN9Xu756wM4kxNSstA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.16.0",
+				"@babel/plugin-transform-react-jsx": "^7.16.0",
+				"@babel/plugin-transform-runtime": "^7.16.0",
+				"@babel/preset-env": "^7.16.0",
+				"@babel/preset-typescript": "^7.16.0",
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/babel-plugin-import-jsx-pragma": "^4.18.1",
+				"@wordpress/browserslist-config": "^5.18.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/warning": "^2.35.1",
+				"browserslist": "^4.17.6",
+				"core-js": "^3.19.1"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@wordpress/base-styles": {
+			"version": "4.29.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.29.0.tgz",
+			"integrity": "sha512-2oYk4M6F+os9Mw0mxWZaEmt9sj5mB2TeMDp99/g23JZpQVzOV5qeDOePnH77qViARBno7lFe40nuaHNf5Sd/fA==",
+			"dev": true
+		},
+		"node_modules/@wordpress/blob": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/blob/-/blob-3.35.1.tgz",
+			"integrity": "sha512-Y12zzQaSRavzxVctkVIBZoZU+Fy9PweAfxy/jhu3SRwNeKotrDjAxHb7vPAd5fyg9rBH+rC47giUjI29L0Jj0Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/block-directory": {
+			"version": "4.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-directory/-/block-directory-4.12.16.tgz",
+			"integrity": "sha512-/ouauOTSym/yhz724WHHSzGhVrNf7I0DgqUTIm/CbUkUqRVJxdr4gUHkiucNhSTimGi2M2JbR4k2Pl1BP2Lqmw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/edit-post": "^7.12.16",
+				"@wordpress/editor": "^13.12.14",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/plugins": "^6.3.10",
+				"@wordpress/url": "^3.36.1",
+				"change-case": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/block-editor": {
+			"version": "12.3.13",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-editor/-/block-editor-12.3.13.tgz",
+			"integrity": "sha512-wfDc3mbyVM84yGf+r5J3aDA//z1I9v5GZhXcFg+OLlSw5CEFVcPTPzYZ97dcOQaORunQa0ysFUP/Sb7MY7hDwQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@emotion/styled": "^11.6.0",
+				"@react-spring/web": "^9.4.5",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/blob": "^3.35.1",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/date": "^4.35.1",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/escape-html": "^2.35.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/rich-text": "^6.12.7",
+				"@wordpress/shortcode": "^3.35.1",
+				"@wordpress/style-engine": "^1.18.1",
+				"@wordpress/token-list": "^2.35.1",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/warning": "^2.35.1",
+				"@wordpress/wordcount": "^3.35.1",
+				"change-case": "^4.1.2",
+				"classnames": "^2.3.1",
+				"colord": "^2.7.0",
+				"deepmerge": "^4.3.0",
+				"diff": "^4.0.2",
+				"dom-scroll-into-view": "^1.2.1",
+				"fast-deep-equal": "^3.1.3",
+				"inherits": "^2.0.3",
+				"lodash": "^4.17.21",
+				"react-autosize-textarea": "^7.1.0",
+				"react-easy-crop": "^4.5.1",
+				"rememo": "^4.0.2",
+				"remove-accents": "^0.4.2",
+				"traverse": "^0.6.6"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/block-library": {
+			"version": "8.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-library/-/block-library-8.12.16.tgz",
+			"integrity": "sha512-ELYzjbquv6zgMJUgqC6eco5+xhnCgHnoLHbnREDTgnJ6ldwkS+2XzNexRsqOK8E+hHFgGrIkwNBO4AAaEWL+1g==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@preact/signals": "^1.1.3",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/autop": "^3.35.1",
+				"@wordpress/blob": "^3.35.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/date": "^4.35.1",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/escape-html": "^2.35.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/primitives": "^3.33.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/reusable-blocks": "^4.12.14",
+				"@wordpress/rich-text": "^6.12.7",
+				"@wordpress/server-side-render": "^4.12.12",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/viewport": "^5.12.5",
+				"@wordpress/wordcount": "^3.35.1",
+				"change-case": "^4.1.2",
+				"classnames": "^2.3.1",
+				"colord": "^2.7.0",
+				"deepsignal": "^1.3.0",
+				"escape-html": "^1.0.3",
+				"fast-average-color": "^9.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"lodash": "^4.17.21",
+				"memize": "^2.1.0",
+				"micromodal": "^0.4.10",
+				"preact": "^10.13.2",
+				"remove-accents": "^0.4.2",
+				"uuid": "^8.3.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/block-library/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/@wordpress/block-serialization-default-parser": {
+			"version": "4.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/block-serialization-default-parser/-/block-serialization-default-parser-4.35.1.tgz",
+			"integrity": "sha512-kVestCLPvZadCzvRSt6y7wyRwlvitWgvvhUZCputqsYyIhpqT3uYLqBn2BMxg1ezA0pSUjpDOV/QwjbOftbBVg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/blocks": {
+			"version": "12.12.7",
+			"resolved": "https://registry.npmjs.org/@wordpress/blocks/-/blocks-12.12.7.tgz",
+			"integrity": "sha512-IZXAs7zy0iiSp4ME+C6D3oIIUEBvA5bFH1XwKbH6/MZUo0OTdf95Ae30iHSObsE8tjmgBwvu4ttS9rII1p0QkA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/autop": "^3.35.1",
+				"@wordpress/blob": "^3.35.1",
+				"@wordpress/block-serialization-default-parser": "^4.35.1",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/shortcode": "^3.35.1",
+				"change-case": "^4.1.2",
+				"colord": "^2.7.0",
+				"deepmerge": "^4.3.0",
+				"fast-deep-equal": "^3.1.3",
+				"hpq": "^1.3.0",
+				"is-plain-object": "^5.0.0",
+				"memize": "^2.1.0",
+				"rememo": "^4.0.2",
+				"remove-accents": "^0.4.2",
+				"showdown": "^1.9.1",
+				"simple-html-tokenizer": "^0.5.7",
+				"uuid": "^8.3.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/blocks/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/@wordpress/browserslist-config": {
+			"version": "5.21.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.21.0.tgz",
+			"integrity": "sha512-it0w94H5lXEK605QWAWK+jIYwpaes1xm6dPx8/ekoWJQi/5+kEqPLmpLwRo68d41CSMbZClxgYo35f0OiZE22A==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@wordpress/commands": {
+			"version": "0.6.11",
+			"resolved": "https://registry.npmjs.org/@wordpress/commands/-/commands-0.6.11.tgz",
+			"integrity": "sha512-2kjH1AXcBt7t52KHtwNBRXLeebUY3xYbt6XmfDTBb/sqbnknnBKhdDskCgLqTiMKmaDQB9clVdyi6chwpOF9Kw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/private-apis": "^0.17.2",
+				"cmdk": "^0.2.0",
+				"rememo": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/components": {
+			"version": "25.1.10",
+			"resolved": "https://registry.npmjs.org/@wordpress/components/-/components-25.1.10.tgz",
+			"integrity": "sha512-ulEd1zBeZRURyC/BfSfjzMS1y9crLvMWBwBMJtbMjCUP51h8tFUfQuAkYBP05bjUUwdHAGhMMOXkK1fOzSFZtA==",
+			"dependencies": {
+				"@ariakit/react": "^0.2.12",
+				"@babel/runtime": "^7.16.0",
+				"@emotion/cache": "^11.7.1",
+				"@emotion/css": "^11.7.1",
+				"@emotion/react": "^11.7.1",
+				"@emotion/serialize": "^1.0.2",
+				"@emotion/styled": "^11.6.0",
+				"@emotion/utils": "^1.0.0",
+				"@floating-ui/react-dom": "1.0.0",
+				"@radix-ui/react-dropdown-menu": "2.0.4",
+				"@use-gesture/react": "^10.2.24",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/date": "^4.35.1",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/escape-html": "^2.35.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/primitives": "^3.33.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/rich-text": "^6.12.7",
+				"@wordpress/warning": "^2.35.1",
+				"change-case": "^4.1.2",
+				"classnames": "^2.3.1",
+				"colord": "^2.7.0",
+				"date-fns": "^2.28.0",
+				"deepmerge": "^4.3.0",
+				"dom-scroll-into-view": "^1.2.1",
+				"downshift": "^6.0.15",
+				"fast-deep-equal": "^3.1.3",
+				"framer-motion": "~10.11.6",
+				"gradient-parser": "^0.1.5",
+				"highlight-words-core": "^1.2.2",
+				"is-plain-object": "^5.0.0",
+				"memize": "^2.1.0",
+				"path-to-regexp": "^6.2.1",
+				"re-resizable": "^6.4.0",
+				"react-colorful": "^5.3.1",
+				"reakit": "^1.3.11",
+				"remove-accents": "^0.4.2",
+				"use-lilius": "^2.0.1",
+				"uuid": "^8.3.0",
+				"valtio": "1.7.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/components/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/@wordpress/compose": {
+			"version": "6.12.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/compose/-/compose-6.12.2.tgz",
+			"integrity": "sha512-/4qucldWi9NAqoe4im6esjJqA22AlHpZqYRqV5uZ8K8vpqiwaVXazuJrZf3etSNS8pxAnIJKQ3WqmKJXbHnoYg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@types/mousetrap": "^1.6.8",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/priority-queue": "^2.35.1",
+				"change-case": "^4.1.2",
+				"clipboard": "^2.0.8",
+				"mousetrap": "^1.6.5",
+				"use-memo-one": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/core-commands": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/core-commands/-/core-commands-0.4.14.tgz",
+			"integrity": "sha512-Ou1LSnJzyutXRGfqSZm3BgMzTCeFxStO9MAgXCpkw5klC09/MQwgPZWK+VNst7fRDw5R8uAoNAzisg7IqGEE+A==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/commands": "^0.6.11",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/router": "^0.4.2",
+				"@wordpress/url": "^3.36.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/core-data": {
+			"version": "6.12.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/core-data/-/core-data-6.12.14.tgz",
+			"integrity": "sha512-mAS9r8Ve8KBW9JX7WUC4JEJWxrJ2b2v5xRx8h/nL6tZZzCC46CN78jluLzZZaJ5Mj1qMAGj8bfET0B71dcKkDw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/url": "^3.36.1",
+				"change-case": "^4.1.2",
+				"equivalent-key-map": "^0.2.2",
+				"fast-deep-equal": "^3.1.3",
+				"memize": "^2.1.0",
+				"rememo": "^4.0.2",
+				"uuid": "^8.3.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/core-data/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
+		},
+		"node_modules/@wordpress/customize-widgets": {
+			"version": "4.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/customize-widgets/-/customize-widgets-4.12.16.tgz",
+			"integrity": "sha512-PmMgfpo/tbvWWVriYHUC128qYhofhxrHQagTsMcGVf/0CpFfTtewJr04oj2mWdbOUgUnx/y3yTeYuoBPqVOvZw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/block-library": "^8.12.16",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/interface": "^5.12.10",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/media-utils": "^4.26.1",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/widgets": "^3.12.14",
+				"classnames": "^2.3.1",
+				"fast-deep-equal": "^3.1.3"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/data": {
+			"version": "9.5.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/data/-/data-9.5.5.tgz",
+			"integrity": "sha512-rC9YhwjKth02z/umLmaTGaUOkadKguMQIZdObn65p2gOKN8HLeW3HhNQb91Q4Q2BPUZuRdJn7u8n4L9RBhiMPQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"@wordpress/priority-queue": "^2.35.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/redux-routine": "^4.35.1",
+				"deepmerge": "^4.3.0",
+				"equivalent-key-map": "^0.2.2",
+				"is-plain-object": "^5.0.0",
+				"is-promise": "^4.0.0",
+				"redux": "^4.1.2",
+				"turbo-combine-reducers": "^1.0.2",
+				"use-memo-one": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/data-controls": {
+			"version": "3.4.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/data-controls/-/data-controls-3.4.5.tgz",
+			"integrity": "sha512-IWCzAhhT3ICEeLjhGdDvZGcxc3+JOFUC2JtUk39qNKQaDQo0aE0kZ6jdM0f5VX7w0vvSpyrTmorXbhs/ZWiIhA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/date": {
+			"version": "4.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/date/-/date-4.35.1.tgz",
+			"integrity": "sha512-9XmYyL9azJSWQvplfBc29mbwG7IcqJn0NsAMC37E1t8sOQtLd8EvRu6Yuly3sbES++K3bx/BgZ+Z3Wu6ll//nw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/deprecated": "^3.35.1",
+				"moment": "^2.29.4",
+				"moment-timezone": "^0.5.40"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/dependency-extraction-webpack-plugin": {
+			"version": "4.18.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-4.18.1.tgz",
+			"integrity": "sha512-O05mhrerzdm6+HVSSebRyE5m6QlxcflE1nMw1PJKG3xe0aGR/vIkPa5dmq7sb8qKOrwd+7ml3SglQp2ONUHOIg==",
+			"dev": true,
+			"dependencies": {
+				"json2php": "^0.0.7",
+				"webpack-sources": "^3.2.2"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"webpack": "^4.8.3 || ^5.0.0"
+			}
+		},
+		"node_modules/@wordpress/deprecated": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/deprecated/-/deprecated-3.35.1.tgz",
+			"integrity": "sha512-NYIg73typPu8hJ8gj2vlNkb5EQ+Jzcb6z97qahhFK/0L/K49ZKi0Ly88FKNIg1dv0PlQat/C6UTWEpLVm/v68g==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/hooks": "^3.35.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/dom": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/dom/-/dom-3.35.1.tgz",
+			"integrity": "sha512-Lz9S1jaBMZ0oJIMmZLYA55Bg00YAkMQ4BRzXc05ys+5eEAIh8TPuuVgl3LW+1+Lvk3X47M97pU7V6dIs5LTcbw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/deprecated": "^3.35.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/dom-ready": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/dom-ready/-/dom-ready-3.35.1.tgz",
+			"integrity": "sha512-zldhZ6QsPrGGF4zmyGBJbFiX5qByWVkVz5Th79nPU7kwxV7cqconl54yMtLzDiXG90kmNbSRQxv+f0/89OmPNg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/e2e-test-utils": {
+			"version": "10.6.4",
+			"resolved": "https://registry.npmjs.org/@wordpress/e2e-test-utils/-/e2e-test-utils-10.6.4.tgz",
+			"integrity": "sha512-Ii01GdD5pB1SC5YGDksl/A0kbOM0Yb5ut+m3/pbvXri7hV284UPWn1EuL/A1HSELWgSebLMNYtwY8l0YeH5Ayw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/url": "^3.36.1",
+				"change-case": "^4.1.2",
+				"form-data": "^4.0.0",
+				"node-fetch": "^2.6.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"jest": ">=29",
+				"puppeteer-core": ">=11"
+			}
+		},
+		"node_modules/@wordpress/e2e-test-utils/node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/@wordpress/edit-post": {
+			"version": "7.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-post/-/edit-post-7.12.16.tgz",
+			"integrity": "sha512-ZKpLin+kyREWswSx3mF5b8RHeH+M2IcJgNljWtF4aRK+rI+eMT7lBBYNMHRB5a89UkAqBj6rUEN/Pb0QwXL0sg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/block-library": "^8.12.16",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/commands": "^0.6.11",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-commands": "^0.4.14",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/editor": "^13.12.14",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/interface": "^5.12.10",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/media-utils": "^4.26.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/plugins": "^6.3.10",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/viewport": "^5.12.5",
+				"@wordpress/warning": "^2.35.1",
+				"@wordpress/widgets": "^3.12.14",
+				"classnames": "^2.3.1",
+				"memize": "^2.1.0",
+				"rememo": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/edit-site": {
+			"version": "5.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-site/-/edit-site-5.12.16.tgz",
+			"integrity": "sha512-O7iZR2l41fhy88r+gkRlTjLKNQFKbm+L6k16azLLRIGTnRqdRoRqIUnSkFZBkH2yiaPs6Cx6DOJFVf3OWS0mUw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/block-library": "^8.12.16",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/commands": "^0.6.11",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-commands": "^0.4.14",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/date": "^4.35.1",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/editor": "^13.12.14",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/escape-html": "^2.35.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/interface": "^5.12.10",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/media-utils": "^4.26.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/plugins": "^6.3.10",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/primitives": "^3.33.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/reusable-blocks": "^4.12.14",
+				"@wordpress/router": "^0.4.2",
+				"@wordpress/style-engine": "^1.18.1",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/viewport": "^5.12.5",
+				"@wordpress/widgets": "^3.12.14",
+				"@wordpress/wordcount": "^3.35.1",
+				"change-case": "^4.1.2",
+				"classnames": "^2.3.1",
+				"colord": "^2.9.2",
+				"deepmerge": "^4.3.0",
+				"downloadjs": "^1.4.7",
+				"fast-deep-equal": "^3.1.3",
+				"is-plain-object": "^5.0.0",
+				"lodash": "^4.17.21",
+				"memize": "^2.1.0",
+				"react-autosize-textarea": "^7.1.0",
+				"rememo": "^4.0.2",
+				"remove-accents": "^0.4.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/edit-widgets": {
+			"version": "5.12.16",
+			"resolved": "https://registry.npmjs.org/@wordpress/edit-widgets/-/edit-widgets-5.12.16.tgz",
+			"integrity": "sha512-rT7S+Dgs50ORLIC7z75T796hOG9wcswuAKK//Ac1ZFRMoh3SUsjTAkIWY1uxtAuFTw2AimJt62fc/bI9Q95rvQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/block-library": "^8.12.16",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/interface": "^5.12.10",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/media-utils": "^4.26.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/plugins": "^6.3.10",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/reusable-blocks": "^4.12.14",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/widgets": "^3.12.14",
+				"classnames": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/editor": {
+			"version": "13.12.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/editor/-/editor-13.12.14.tgz",
+			"integrity": "sha512-J//UpwTE2hoA8zw6l4RuEaGkNQQluwrnXUOIpy606UjpAxdJxBeatzRHlzFm16Zo5YnT4fg95YWOtvjIMy/9yQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/blob": "^3.35.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/date": "^4.35.1",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/dom": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/keyboard-shortcuts": "^4.12.5",
+				"@wordpress/keycodes": "^3.35.1",
+				"@wordpress/media-utils": "^4.26.1",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/reusable-blocks": "^4.12.14",
+				"@wordpress/rich-text": "^6.12.7",
+				"@wordpress/server-side-render": "^4.12.12",
+				"@wordpress/url": "^3.36.1",
+				"@wordpress/wordcount": "^3.35.1",
+				"classnames": "^2.3.1",
+				"date-fns": "^2.28.0",
+				"memize": "^2.1.0",
+				"react-autosize-textarea": "^7.1.0",
+				"rememo": "^4.0.2",
+				"remove-accents": "^0.4.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/element": {
+			"version": "5.12.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.12.1.tgz",
+			"integrity": "sha512-sYpGd+za3zgEQ5cSN1hd+NAUAcw0qk3Fe59snJftE3I3j/nNUHcrm37eHIunxYE4YHFAy16A4JHfivPIX/ix+A==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@types/react": "^18.0.21",
+				"@types/react-dom": "^18.0.6",
+				"@wordpress/escape-html": "^2.35.1",
+				"change-case": "^4.1.2",
+				"is-plain-object": "^5.0.0",
+				"react": "^18.2.0",
+				"react-dom": "^18.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/escape-html": {
+			"version": "2.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.35.1.tgz",
+			"integrity": "sha512-TY98WpkYbBjNADC0SQDkqryB59IJYhiBTOCshHWM1p8+HiXW1DbojXsTtPac3zFccS8C3mfznJ8p1G9oc9Vkiw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin": {
+			"version": "14.11.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-14.11.0.tgz",
+			"integrity": "sha512-N4lWFR1s6gY+f+x2gzhdyNkDub4wrNy5trmxluyR2a1McloFiMNbhfAzoTLSBbUvQWWdSfYQeFThA5Q2C2m5wA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/eslint-parser": "^7.16.0",
+				"@typescript-eslint/eslint-plugin": "^5.3.0",
+				"@typescript-eslint/parser": "^5.3.0",
+				"@wordpress/babel-preset-default": "^7.22.0",
+				"@wordpress/prettier-config": "^2.21.0",
+				"cosmiconfig": "^7.0.0",
+				"eslint-config-prettier": "^8.3.0",
+				"eslint-plugin-import": "^2.25.2",
+				"eslint-plugin-jest": "^27.2.1",
+				"eslint-plugin-jsdoc": "^39.6.9",
+				"eslint-plugin-jsx-a11y": "^6.5.1",
+				"eslint-plugin-prettier": "^3.3.0",
+				"eslint-plugin-react": "^7.27.0",
+				"eslint-plugin-react-hooks": "^4.3.0",
+				"globals": "^13.12.0",
+				"requireindex": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=14",
+				"npm": ">=6.14.4"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7",
+				"eslint": ">=8",
+				"prettier": ">=2",
+				"typescript": ">=4"
+			},
+			"peerDependenciesMeta": {
+				"prettier": {
+					"optional": true
+				},
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/babel-preset-default": {
+			"version": "7.22.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.22.0.tgz",
+			"integrity": "sha512-dcLD8oCBIbRr6wAVIGAIr/CwjqVR/36yTBaPlqMebCGPk1L3ktNpdKjYaFYsdo1eP/WkPCKd1uoWUYuiRKhGuA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.16.0",
+				"@babel/plugin-transform-react-jsx": "^7.16.0",
+				"@babel/plugin-transform-runtime": "^7.16.0",
+				"@babel/preset-env": "^7.16.0",
+				"@babel/preset-typescript": "^7.16.0",
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/babel-plugin-import-jsx-pragma": "^4.21.0",
+				"@wordpress/browserslist-config": "^5.21.0",
+				"@wordpress/element": "^5.15.0",
+				"@wordpress/warning": "^2.38.0",
+				"browserslist": "^4.21.9",
+				"core-js": "^3.31.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/element": {
+			"version": "5.15.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.15.0.tgz",
+			"integrity": "sha512-wHoKFfZBaJAi1gyKOSxAFAM94XGelvQzeKANivTuEciI9uIdbBc6ShPJjwV68hzKDK7SF4em6KeiWyI7UkTdag==",
+			"dev": true,
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@types/react": "^18.0.21",
+				"@types/react-dom": "^18.0.6",
+				"@wordpress/escape-html": "^2.38.0",
+				"change-case": "^4.1.2",
+				"is-plain-object": "^5.0.0",
+				"react": "^18.2.0",
+				"react-dom": "^18.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/escape-html": {
+			"version": "2.38.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.38.0.tgz",
+			"integrity": "sha512-q7wg1JvXVPpyddMnEl6A8ALn9U3mA4LvyQpkDNLonntU+Q8JbvW1r91HdzoFh396rHoNJWGzDGORUTlDlb5jOw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin/node_modules/@wordpress/warning": {
+			"version": "2.38.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.38.0.tgz",
+			"integrity": "sha512-bN+49BIiXrhrozLvhlhJLLmpkHrfcCk917lX+ggjthoV6bIj816xBUi4n6W8gjFUVwZXG/5n/HV6c5znao0cXw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/eslint-plugin/node_modules/globals": {
+			"version": "13.20.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/format-library": {
+			"version": "4.12.13",
+			"resolved": "https://registry.npmjs.org/@wordpress/format-library/-/format-library-4.12.13.tgz",
+			"integrity": "sha512-NJ7O3YPCk+qzbiwYNMgzwNTz4yzkH7lE0eFzTec5CDP/iS6WhX1QJNrZWxvI91ArZEd9Zqaz1w7FDWwv0lsOeA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/html-entities": "^3.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/rich-text": "^6.12.7",
+				"@wordpress/url": "^3.36.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/hooks": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/hooks/-/hooks-3.35.1.tgz",
+			"integrity": "sha512-V3VNugFwvuYuPKjwd15bp/I2N703+JbdjpLoqUudCqVgD8nSxt6NW0KgdAWCjqR3R0g6jzUX9b7PGcYivSiFQQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/html-entities": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/html-entities/-/html-entities-3.35.1.tgz",
+			"integrity": "sha512-TfSWy2wzJDWZmPlbGr1kJsA9EqbVBmrG4VybYH5hjXfughSTaHEUVC/ehkzTT0Lk+BARhDs9oQeI+GKJd8u/Rg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/i18n": {
+			"version": "4.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/i18n/-/i18n-4.35.1.tgz",
+			"integrity": "sha512-w5+m1TahSUaPm9Rle5Phry2Bj/xgWh9nuOTCLdJ0Ud/NB8aIn4H1pfbL04DxV3L0hBxKPURc/qB4PIct/7AuCA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/hooks": "^3.35.1",
+				"gettext-parser": "^1.3.1",
+				"memize": "^2.1.0",
+				"sprintf-js": "^1.1.1",
+				"tannin": "^1.2.0"
+			},
+			"bin": {
+				"pot-to-php": "tools/pot-to-php.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/icons": {
+			"version": "9.26.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/icons/-/icons-9.26.2.tgz",
+			"integrity": "sha512-heNt1s3qmfGeX4Cv9HQN66kELoiHWPL/NKD9y784YIl4ntuS9QJ6Ku5tk09meZXer3QUMotAAyeaARwt6+PUqg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/primitives": "^3.33.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/interface": {
+			"version": "5.12.10",
+			"resolved": "https://registry.npmjs.org/@wordpress/interface/-/interface-5.12.10.tgz",
+			"integrity": "sha512-RCjS3W1qxcVYePccTSZG0XFVTEUMmXoA4SvIdAbzTre6nZCYHfC9G5fQNFGy3+hXmy4rBThspmN2UlXvBDXIbQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/plugins": "^6.3.10",
+				"@wordpress/preferences": "^3.12.10",
+				"@wordpress/viewport": "^5.12.5",
+				"classnames": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/is-shallow-equal": {
+			"version": "4.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/is-shallow-equal/-/is-shallow-equal-4.35.1.tgz",
+			"integrity": "sha512-CoamqNgXvmxVN2RCDGEmbYBmtfR5wYmmG6L3yocS/w7DvBURzt9j6x71/h+1dybOYp9g/BoJ7W1gKJxbDxaGsg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/jest-console": {
+			"version": "7.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-7.9.0.tgz",
+			"integrity": "sha512-gxh9jUgS79080GOBp8vzoZB7bGIKQOGFCsa4jtwPmXnDJ5gjC9b1mLynjke4nVTivxhSuUeUEJ6ZHUQ6nmVQIw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"jest-matcher-utils": "^29.5.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"jest": ">=29"
+			}
+		},
+		"node_modules/@wordpress/jest-preset-default": {
+			"version": "11.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-11.9.0.tgz",
+			"integrity": "sha512-MkOGqShiJBKaegG+OSHaegSh3SUCWFEAwFfRLk3For4SJswFCUW2F04oZAB0Kd+QohPPpM69vGKs6GL22cj/ng==",
+			"dev": true,
+			"dependencies": {
+				"@wordpress/jest-console": "^7.9.0",
+				"babel-jest": "^29.5.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"@babel/core": ">=7",
+				"jest": ">=29"
+			}
+		},
+		"node_modules/@wordpress/keyboard-shortcuts": {
+			"version": "4.12.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/keyboard-shortcuts/-/keyboard-shortcuts-4.12.5.tgz",
+			"integrity": "sha512-QVUAXpnYGGJh9CCVPwQo0WaTOm3tnlYRSDUipY1ql5Gl9kxil4rlWmJxVgo4EyeMq45wTMSIpqYE64Z3CkS72Q==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/keycodes": "^3.35.1",
+				"rememo": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/keycodes": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/keycodes/-/keycodes-3.35.1.tgz",
+			"integrity": "sha512-qp+xn7rgRRAP5A0tQTOMdhEUcVR8jUVGVpZfUBNoiyFmDmTFsHGmAYHYK4/rRCN8LlczNMxSaqcppVC/eH7tZg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/i18n": "^4.35.1",
+				"change-case": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/list-reusable-blocks": {
+			"version": "4.12.10",
+			"resolved": "https://registry.npmjs.org/@wordpress/list-reusable-blocks/-/list-reusable-blocks-4.12.10.tgz",
+			"integrity": "sha512-qtSGoQBBbZq4EigTAPrBQy4/rLuE3GnEs4N6hl00NKTn5EzVHB3DHVZg1Vl/MN0X5gFjVDcbK2paYolR+opIoA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"change-case": "^4.1.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/media-utils": {
+			"version": "4.26.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/media-utils/-/media-utils-4.26.1.tgz",
+			"integrity": "sha512-vidolGL4/btqHAvMNOw2yXbNuLRKJMBmx1HQ5o19A6H5i4Jjk0eSX/cMd+uWoThkupyjReDZkS2ZHRGnxMzVeA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/blob": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/notices": {
+			"version": "4.3.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/notices/-/notices-4.3.5.tgz",
+			"integrity": "sha512-NPyime/wJEBfEkgZP9KB4ty6IJVRADtmv0IgfEWrMsFvjUiBY2A/xwb4SrSt3P/neTuCaaxKwY1a6DPq/+qdlw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/data": "^9.5.5"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/npm-package-json-lint-config": {
+			"version": "4.23.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.23.0.tgz",
+			"integrity": "sha512-uWTwQOtEjZincms6ZFGG6E3mZUh/uA1pa3hLECtxkVIBRiK3lnYKhFvl3sxJfCmVAUFWDAM+M7Tff0oyCFhuVg==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"npm-package-json-lint": ">=3.6.0"
+			}
+		},
+		"node_modules/@wordpress/nux": {
+			"version": "7.1.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/nux/-/nux-7.1.3.tgz",
+			"integrity": "sha512-LHNmSlLdVD8CQbb3ON9+GbvN9YCg5BIbUzs3Wkrba1+0B3QFFYb0fq7QPsJp94lSFmNUTZqM1+d6vHcV8hozJQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"rememo": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/plugins": {
+			"version": "6.3.10",
+			"resolved": "https://registry.npmjs.org/@wordpress/plugins/-/plugins-6.3.10.tgz",
+			"integrity": "sha512-exTGZupGBIYjz2jeAXaohE4v2ufhSXDGy3/ElENdAGA/k2FQLqWRRCpZ7bMbn7+VfReNTrLjgVDOYDW46hk5XA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/hooks": "^3.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/is-shallow-equal": "^4.35.1",
+				"memize": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/postcss-plugins-preset": {
+			"version": "4.22.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-4.22.0.tgz",
+			"integrity": "sha512-xkDbfmLr7M8KLoOMl51pGA5xgc8hy8JsEN1u0y0G3jEkTGvUVDjjJT7EvjkM16Oh9NzfYmcBpJ5HLmZ7+ckhIA==",
+			"dev": true,
+			"dependencies": {
+				"@wordpress/base-styles": "^4.29.0",
+				"autoprefixer": "^10.2.5"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.0"
+			}
+		},
+		"node_modules/@wordpress/preferences": {
+			"version": "3.12.10",
+			"resolved": "https://registry.npmjs.org/@wordpress/preferences/-/preferences-3.12.10.tgz",
+			"integrity": "sha512-M10VwX0+GZhAfV18Jw9zyAWrW9+dd2iHyQE13uRKr0Yzbu5buDACoHit+o5JeR4963oNe0GwjMD6hVRF1CpDRw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"classnames": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/preferences-persistence": {
+			"version": "1.27.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/preferences-persistence/-/preferences-persistence-1.27.1.tgz",
+			"integrity": "sha512-XbojKIbXj69I8KDYxVqZcY/5P9MU+nTWD2KwWZo7PPMGrEiHdI+yEf4fjkP13+c6iZAnQiXOTNbcdS3mx9XsVQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/prettier-config": {
+			"version": "2.21.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-2.21.0.tgz",
+			"integrity": "sha512-Oasi7PiZSp5LtTmMkISgn6UIb0pSv9uQsW5jlnrzhBZvF/J15jQ9V6xPcir0j2GllINVUNS2LCtsxwkJriV5lg==",
+			"dev": true,
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"prettier": ">=2"
+			}
+		},
+		"node_modules/@wordpress/primitives": {
+			"version": "3.33.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/primitives/-/primitives-3.33.1.tgz",
+			"integrity": "sha512-ihxAzZwfzme+qunANrcvoyU9X1KOeAFnCSL97K7+K4Ko1CVag1YcVI1hiGJhTHyF6oDBo2J0nXIItndjo7fBAg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/element": "^5.12.1",
+				"classnames": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/priority-queue": {
+			"version": "2.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/priority-queue/-/priority-queue-2.35.1.tgz",
+			"integrity": "sha512-EFFeJwZ5+U10Y8GQvYi7udvis2ZmAjbSkfA5o7aG6nNVgAFN/jrAISkfJm6ECeiv4VS5usm1ZGCKJOKiXIPSbA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"requestidlecallback": "^0.3.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/private-apis": {
+			"version": "0.17.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/private-apis/-/private-apis-0.17.2.tgz",
+			"integrity": "sha512-Ge/fSMElNjJK49HZyH/QSSDhPed3Fmk64uL7wFdlG4/8cqCEFM8NVHCOQ/xzuGE1z5z15QItaPtbUO607XbO8A==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/redux-routine": {
+			"version": "4.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/redux-routine/-/redux-routine-4.35.1.tgz",
+			"integrity": "sha512-saRnbObOj3mnl7j8ScDXWEGp5qAI94+hnhd3/iSVkKbTVnLi+65FLiW4nEKiU/J2IPJ5g24nhunTCvgLjcmFVQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"is-plain-object": "^5.0.0",
+				"is-promise": "^4.0.0",
+				"rungen": "^0.3.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"redux": ">=4"
+			}
+		},
+		"node_modules/@wordpress/reusable-blocks": {
+			"version": "4.12.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/reusable-blocks/-/reusable-blocks-4.12.14.tgz",
+			"integrity": "sha512-ygsXONf5JPGUEG6U5LKbEXsbxXJtleCZhBvUy+hJPG5bnIDLaBVCiuTXyULB2B0SVe9yFVYBOAI7ksMhahe9Tw==",
+			"dependencies": {
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/notices": "^4.3.5",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/url": "^3.36.1"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/rich-text": {
+			"version": "6.12.7",
+			"resolved": "https://registry.npmjs.org/@wordpress/rich-text/-/rich-text-6.12.7.tgz",
+			"integrity": "sha512-wYcl3LGzCqKNj763PtAvi6FtHRZczc4OncIFACaRaa16WITDBVSv1p0C4ao61KdXnNi53jMpKR+fc3TCKIe3Hg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/a11y": "^3.35.1",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/escape-html": "^2.35.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/keycodes": "^3.35.1",
+				"memize": "^2.1.0",
+				"rememo": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/router": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/@wordpress/router/-/router-0.4.2.tgz",
+			"integrity": "sha512-3pqSoMpmLjwiUraSaSpzk8OaHbX6REqUFXQ0uxj89AKRQ1HrXBuE7mbhmWJKg/2Ik4FpTDGXt4/+aMzSWhIH9A==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/private-apis": "^0.17.2",
+				"@wordpress/url": "^3.36.1",
+				"history": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts": {
+			"version": "26.6.3",
+			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-26.6.3.tgz",
+			"integrity": "sha512-GlcZeVeTtc+EMx4jdJYYID0g/xvnlsEhdN+kmwVGgU+cF8+40iIF9gASL0PECrsPjFwCtHaB962JMIPMpWcGFQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/core": "^7.16.0",
+				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.2",
+				"@svgr/webpack": "^6.2.1",
+				"@wordpress/babel-preset-default": "^7.19.1",
+				"@wordpress/browserslist-config": "^5.18.1",
+				"@wordpress/dependency-extraction-webpack-plugin": "^4.18.1",
+				"@wordpress/eslint-plugin": "^14.8.1",
+				"@wordpress/jest-preset-default": "^11.6.1",
+				"@wordpress/npm-package-json-lint-config": "^4.20.1",
+				"@wordpress/postcss-plugins-preset": "^4.19.3",
+				"@wordpress/prettier-config": "^2.18.1",
+				"@wordpress/stylelint-config": "^21.18.1",
+				"adm-zip": "^0.5.9",
+				"babel-jest": "^29.5.0",
+				"babel-loader": "^8.2.3",
+				"browserslist": "^4.17.6",
+				"chalk": "^4.0.0",
+				"check-node-version": "^4.1.0",
+				"clean-webpack-plugin": "^3.0.0",
+				"copy-webpack-plugin": "^10.2.0",
+				"cross-spawn": "^5.1.0",
+				"css-loader": "^6.2.0",
+				"cssnano": "^5.0.7",
+				"cwd": "^0.10.0",
+				"dir-glob": "^3.0.1",
+				"eslint": "^8.3.0",
+				"expect-puppeteer": "^4.4.0",
+				"fast-glob": "^3.2.7",
+				"filenamify": "^4.2.0",
+				"jest": "^29.5.0",
+				"jest-dev-server": "^6.0.2",
+				"jest-environment-jsdom": "^29.5.0",
+				"jest-environment-node": "^29.5.0",
+				"markdownlint-cli": "^0.31.1",
+				"merge-deep": "^3.0.3",
+				"mini-css-extract-plugin": "^2.5.1",
+				"minimist": "^1.2.0",
+				"npm-package-json-lint": "^5.0.0",
+				"npm-packlist": "^3.0.0",
+				"postcss": "^8.4.5",
+				"postcss-loader": "^6.2.1",
+				"prettier": "npm:wp-prettier@2.8.5",
+				"puppeteer-core": "^13.2.0",
+				"react-refresh": "^0.10.0",
+				"read-pkg-up": "^7.0.1",
+				"resolve-bin": "^0.4.0",
+				"sass": "^1.35.2",
+				"sass-loader": "^12.1.0",
+				"source-map-loader": "^3.0.0",
+				"stylelint": "^14.2.0",
+				"terser-webpack-plugin": "^5.3.9",
+				"url-loader": "^4.1.1",
+				"webpack": "^5.47.1",
+				"webpack-bundle-analyzer": "^4.4.2",
+				"webpack-cli": "^4.9.1",
+				"webpack-dev-server": "^4.4.0"
+			},
+			"bin": {
+				"wp-scripts": "bin/wp-scripts.js"
+			},
+			"engines": {
+				"node": ">=14",
+				"npm": ">=6.14.4"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/ajv": {
+			"version": "8.12.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/array-union": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+			"integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/@wordpress/scripts/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/copy-webpack-plugin": {
+			"version": "10.2.4",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
+			"integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
+			"dev": true,
+			"dependencies": {
+				"fast-glob": "^3.2.7",
+				"glob-parent": "^6.0.1",
+				"globby": "^12.0.2",
+				"normalize-path": "^3.0.0",
+				"schema-utils": "^4.0.0",
+				"serialize-javascript": "^6.0.0"
+			},
+			"engines": {
+				"node": ">= 12.20.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/css-select": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+			"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.0.1",
+				"domhandler": "^4.3.1",
+				"domutils": "^2.8.0",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/css-tree": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+			"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.14",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/cssnano": {
+			"version": "5.1.15",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+			"integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+			"dev": true,
+			"dependencies": {
+				"cssnano-preset-default": "^5.2.14",
+				"lilconfig": "^2.0.3",
+				"yaml": "^1.10.2"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/cssnano"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/cssnano-preset-default": {
+			"version": "5.2.14",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+			"integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+			"dev": true,
+			"dependencies": {
+				"css-declaration-sorter": "^6.3.1",
+				"cssnano-utils": "^3.1.0",
+				"postcss-calc": "^8.2.3",
+				"postcss-colormin": "^5.3.1",
+				"postcss-convert-values": "^5.1.3",
+				"postcss-discard-comments": "^5.1.2",
+				"postcss-discard-duplicates": "^5.1.0",
+				"postcss-discard-empty": "^5.1.1",
+				"postcss-discard-overridden": "^5.1.0",
+				"postcss-merge-longhand": "^5.1.7",
+				"postcss-merge-rules": "^5.1.4",
+				"postcss-minify-font-values": "^5.1.0",
+				"postcss-minify-gradients": "^5.1.1",
+				"postcss-minify-params": "^5.1.4",
+				"postcss-minify-selectors": "^5.2.1",
+				"postcss-normalize-charset": "^5.1.0",
+				"postcss-normalize-display-values": "^5.1.0",
+				"postcss-normalize-positions": "^5.1.1",
+				"postcss-normalize-repeat-style": "^5.1.1",
+				"postcss-normalize-string": "^5.1.0",
+				"postcss-normalize-timing-functions": "^5.1.0",
+				"postcss-normalize-unicode": "^5.1.1",
+				"postcss-normalize-url": "^5.1.0",
+				"postcss-normalize-whitespace": "^5.1.1",
+				"postcss-ordered-values": "^5.1.3",
+				"postcss-reduce-initial": "^5.1.2",
+				"postcss-reduce-transforms": "^5.1.0",
+				"postcss-svgo": "^5.1.0",
+				"postcss-unique-selectors": "^5.1.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/cssnano-utils": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/dom-serializer": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+			"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.2.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/@wordpress/scripts/node_modules/domutils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+			"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.2.0",
+				"domhandler": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/filenamify": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz",
+			"integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==",
+			"dev": true,
+			"dependencies": {
+				"filename-reserved-regex": "^2.0.0",
+				"strip-outer": "^1.0.1",
+				"trim-repeated": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/globby": {
+			"version": "12.2.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+			"integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^3.0.1",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.2.7",
+				"ignore": "^5.1.9",
+				"merge2": "^1.4.1",
+				"slash": "^4.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/@wordpress/scripts/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+			"dev": true
+		},
+		"node_modules/@wordpress/scripts/node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-calc": {
+			"version": "8.2.4",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+			"integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.9",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.2"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-colormin": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+			"integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0",
+				"colord": "^2.9.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-convert-values": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+			"integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-discard-comments": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+			"integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-discard-duplicates": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+			"integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-discard-empty": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+			"integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-discard-overridden": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+			"integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-merge-longhand": {
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+			"integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"stylehacks": "^5.1.1"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-merge-rules": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+			"integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0",
+				"cssnano-utils": "^3.1.0",
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-minify-font-values": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+			"integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-minify-gradients": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+			"integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+			"dev": true,
+			"dependencies": {
+				"colord": "^2.9.1",
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-minify-params": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+			"integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-minify-selectors": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+			"integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-charset": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+			"integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-display-values": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+			"integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-positions": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+			"integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-repeat-style": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+			"integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-string": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+			"integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-timing-functions": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+			"integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-unicode": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+			"integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-url": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+			"integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+			"dev": true,
+			"dependencies": {
+				"normalize-url": "^6.0.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-normalize-whitespace": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+			"integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-ordered-values": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+			"integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+			"dev": true,
+			"dependencies": {
+				"cssnano-utils": "^3.1.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-reduce-initial": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+			"integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-reduce-transforms": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+			"integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-svgo": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+			"integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"svgo": "^2.7.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/postcss-unique-selectors": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+			"integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/prettier": {
+			"name": "wp-prettier",
+			"version": "2.8.5",
+			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.8.5.tgz",
+			"integrity": "sha512-gkphzYtVksWV6D7/V530bTehKkhrABUru/Gy4reOLOHJoKH4i9lcE1SxqU2VDxC3gCOx/Nk9alZmWk6xL/IBCw==",
+			"dev": true,
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/schema-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.8.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/slash": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+			"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/source-map-loader": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+			"integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.5",
+				"iconv-lite": "^0.6.3",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/stylehacks": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+			"integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/svgo": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+			"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+			"dev": true,
+			"dependencies": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^4.1.3",
+				"css-tree": "^1.1.3",
+				"csso": "^4.2.0",
+				"picocolors": "^1.0.0",
+				"stable": "^0.1.8"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/@wordpress/scripts/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/@wordpress/server-side-render": {
+			"version": "4.12.12",
+			"resolved": "https://registry.npmjs.org/@wordpress/server-side-render/-/server-side-render-4.12.12.tgz",
+			"integrity": "sha512-unfoWULUK5nvrzeMnQSnMZKnOYGB/wHianAeDSopOvTsOApN40ZhWavos2K49dYu53oQx0JbtjNkrDicFVYLlA==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/deprecated": "^3.35.1",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/url": "^3.36.1",
+				"fast-deep-equal": "^3.1.3"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/shortcode": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/shortcode/-/shortcode-3.35.1.tgz",
+			"integrity": "sha512-R7a8aSG44D8rSUatFPRKB4xlxIdZfowdVvZRUZCLg/ZqP/FFvqcWA9QsluEqgMjc7BeTLer4AtCFxdoxbGH1HQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"memize": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/style-engine": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/style-engine/-/style-engine-1.18.1.tgz",
+			"integrity": "sha512-h1lSEewLfZcPR9NzMi7rfaXh2oAO3s0vHXrVmbFR/LiAkvnxVP8UiixeKvQQ3VNxZlxOUS5sCa4/jmBYg+TrJw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"lodash": "^4.17.21"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/stylelint-config": {
+			"version": "21.21.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-21.21.0.tgz",
+			"integrity": "sha512-5AP38zP/yUUwbfi0Gx9rcrOGzgxH172Ea9McXrE1iWKj3t9pU+zzB3NeI1PLdGeOLJzGMTsVof22NyNwsMCADw==",
+			"dev": true,
+			"dependencies": {
+				"stylelint-config-recommended": "^6.0.0",
+				"stylelint-config-recommended-scss": "^5.0.2"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"stylelint": "^14.2"
+			}
+		},
+		"node_modules/@wordpress/token-list": {
+			"version": "2.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/token-list/-/token-list-2.35.1.tgz",
+			"integrity": "sha512-jBm0fb93iWTVxpzu5WZncp/dJzMxqMEMoXhM+7LpJ7dVpbidSdB7X4afxXTKY4rC3oRvTdD8lE2tFC87uW9jzw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/url": {
+			"version": "3.36.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/url/-/url-3.36.1.tgz",
+			"integrity": "sha512-1J+XyX/Zk0xav13fTF+oPnJszxdOIgOn+eHuTl9vrUWJUskVxNUSCSsYOPq3yCOuaGrz0v+YxHT/Yil2JMrnqA==",
+			"dependencies": {
 				"@babel/runtime": "^7.16.0",
 				"remove-accents": "^0.4.2"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/viewport": {
+			"version": "5.12.5",
+			"resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-5.12.5.tgz",
+			"integrity": "sha512-r4F0kRTvtiJ9L5Cb4ugfbRRoPSUkmgzdb6RuoJ+7s11ntwJKWqElJeT/qm/kuh1PSbnMMSrCS2hb5RPyq7mblQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/data": "^9.5.5"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/warning": {
+			"version": "2.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.35.1.tgz",
+			"integrity": "sha512-lk9D6AzH1OB71UNhuVSLbErUdSt3gUyv5pvaMQJIVEtoVuOlwG4y+HqoeEtkF3zrRHH4Do4mbSZ/U8w5qCMxOw==",
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@wordpress/widgets": {
+			"version": "3.12.14",
+			"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-3.12.14.tgz",
+			"integrity": "sha512-DB2Oy8XIskE2OlvmC6CNjYeh4gmthUvrJoHPFQPnG0ahOLPfAVM5vPrPvMcoyDO5/aLvDH2ghxhl3CiNw2XNwg==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0",
+				"@wordpress/api-fetch": "^6.32.1",
+				"@wordpress/block-editor": "^12.3.13",
+				"@wordpress/blocks": "^12.12.7",
+				"@wordpress/components": "^25.1.10",
+				"@wordpress/compose": "^6.12.2",
+				"@wordpress/core-data": "^6.12.14",
+				"@wordpress/data": "^9.5.5",
+				"@wordpress/element": "^5.12.1",
+				"@wordpress/i18n": "^4.35.1",
+				"@wordpress/icons": "^9.26.2",
+				"@wordpress/notices": "^4.3.5",
+				"classnames": "^2.3.1"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/@wordpress/wordcount": {
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.35.1.tgz",
+			"integrity": "sha512-LILQklD+6lyGdHi4WSXMy0WEffRZxnbxWcNXBAac+49Of8McA5UTezkX/SkEAbTNBBz8CobY7qzPfB4sAJmLiw==",
+			"dependencies": {
+				"@babel/runtime": "^7.16.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@xtuc/ieee754": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+			"dev": true
+		},
+		"node_modules/@xtuc/long": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+			"dev": true
+		},
+		"node_modules/abab": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+			"dev": true
+		},
+		"node_modules/abbrev": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"dev": true
+		},
+		"node_modules/accepts": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+			"dev": true,
+			"dependencies": {
+				"mime-types": "~2.1.34",
+				"negotiator": "0.6.3"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/accepts/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/accepts/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/acorn": {
+			"version": "8.10.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+			"dev": true,
+			"bin": {
+				"acorn": "bin/acorn"
+			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/acorn-globals": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz",
+			"integrity": "sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.1.0",
+				"acorn-walk": "^8.0.2"
+			}
+		},
+		"node_modules/acorn-import-assertions": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^8"
+			}
+		},
+		"node_modules/acorn-jsx": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+			"dev": true,
+			"peerDependencies": {
+				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/acorn-walk": {
+			"version": "8.2.0",
+			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+			"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/adm-zip": {
+			"version": "0.5.10",
+			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+			"integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
+		"node_modules/agent-base": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+			"dev": true,
+			"dependencies": {
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6.0.0"
+			}
+		},
+		"node_modules/ajv": {
+			"version": "6.12.6",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"fast-json-stable-stringify": "^2.0.0",
+				"json-schema-traverse": "^0.4.1",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-errors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+			"dev": true,
+			"peerDependencies": {
+				"ajv": ">=5.0.0"
+			}
+		},
+		"node_modules/ajv-formats": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependencies": {
+				"ajv": "^8.0.0"
+			},
+			"peerDependenciesMeta": {
+				"ajv": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/ajv-formats/node_modules/ajv": {
+			"version": "8.11.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/ajv-formats/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/ajv-keywords": {
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+			"dev": true,
+			"peerDependencies": {
+				"ajv": "^6.9.1"
+			}
+		},
+		"node_modules/ansi-escapes": {
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.21.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-escapes/node_modules/type-fest": {
+			"version": "0.21.3",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+			"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/ansi-html-community": {
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+			"dev": true,
+			"engines": [
+				"node >= 0.8.0"
+			],
+			"bin": {
+				"ansi-html": "bin/ansi-html"
+			}
+		},
+		"node_modules/ansi-regex": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/ansi-styles": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+			"dependencies": {
+				"color-convert": "^1.9.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/anymatch": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/arch": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+			"integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"optional": true
+		},
+		"node_modules/archive-type": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
+			"integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"file-type": "^4.2.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/archive-type/node_modules/file-type": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
+			"integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/argparse": {
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+			"dev": true,
+			"dependencies": {
+				"sprintf-js": "~1.0.2"
+			}
+		},
+		"node_modules/argparse/node_modules/sprintf-js": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+			"dev": true
+		},
+		"node_modules/aria-hidden": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.3.tgz",
+			"integrity": "sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==",
+			"dependencies": {
+				"tslib": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/aria-query": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+			"integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+			"dev": true,
+			"dependencies": {
+				"dequal": "^2.0.3"
+			}
+		},
+		"node_modules/arr-diff": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/arr-flatten": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/arr-union": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-buffer-byte-length": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+			"integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"is-array-buffer": "^3.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/array-each": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-find-index": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-flatten": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+			"dev": true
+		},
+		"node_modules/array-includes": {
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+			"integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"get-intrinsic": "^1.1.3",
+				"is-string": "^1.0.7"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/array-slice": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-union": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+			"dev": true,
+			"dependencies": {
+				"array-uniq": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-uniq": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array-unique": {
+			"version": "0.3.2",
+			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/array.prototype.flat": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+			"integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"es-shim-unscopables": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/array.prototype.flatmap": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+			"integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"es-shim-unscopables": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/array.prototype.tosorted": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+			"integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"es-shim-unscopables": "^1.0.0",
+				"get-intrinsic": "^1.1.3"
+			}
+		},
+		"node_modules/arraybuffer.prototype.slice": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+			"integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+			"dev": true,
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.0",
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"get-intrinsic": "^1.2.1",
+				"is-array-buffer": "^3.0.2",
+				"is-shared-array-buffer": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/arrify": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/asn1": {
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": "~2.1.0"
+			}
+		},
+		"node_modules/assert-plus": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/assign-symbols": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ast-types-flow": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+			"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+			"dev": true
+		},
+		"node_modules/astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/async": {
+			"version": "2.6.4",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"dev": true,
+			"dependencies": {
+				"lodash": "^4.17.14"
+			}
+		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+			"dev": true
+		},
+		"node_modules/atob": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+			"dev": true,
+			"bin": {
+				"atob": "bin/atob.js"
+			},
+			"engines": {
+				"node": ">= 4.5.0"
+			}
+		},
+		"node_modules/autoprefixer": {
+			"version": "10.4.14",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz",
+			"integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/autoprefixer"
+				}
+			],
+			"dependencies": {
+				"browserslist": "^4.21.5",
+				"caniuse-lite": "^1.0.30001464",
+				"fraction.js": "^4.2.0",
+				"normalize-range": "^0.1.2",
+				"picocolors": "^1.0.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"bin": {
+				"autoprefixer": "bin/autoprefixer"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
+		},
+		"node_modules/autosize": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.4.tgz",
+			"integrity": "sha512-5yxLQ22O0fCRGoxGfeLSNt3J8LB1v+umtpMnPW6XjkTWXKoN0AmXAIhelJcDtFT/Y/wYWmfE+oqU10Q0b8FhaQ=="
+		},
+		"node_modules/available-typed-arrays": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/aws-sign2": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/aws4": {
+			"version": "1.11.0",
+			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+			"dev": true
+		},
+		"node_modules/axe-core": {
+			"version": "4.7.2",
+			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz",
+			"integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/axios": {
+			"version": "0.25.0",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+			"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+			"dev": true,
+			"dependencies": {
+				"follow-redirects": "^1.14.7"
+			}
+		},
+		"node_modules/axobject-query": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+			"integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+			"dev": true,
+			"dependencies": {
+				"dequal": "^2.0.3"
+			}
+		},
+		"node_modules/babel-jest": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.1.tgz",
+			"integrity": "sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==",
+			"dev": true,
+			"dependencies": {
+				"@jest/transform": "^29.6.1",
+				"@types/babel__core": "^7.1.14",
+				"babel-plugin-istanbul": "^6.1.1",
+				"babel-preset-jest": "^29.5.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.8.0"
+			}
+		},
+		"node_modules/babel-jest/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/babel-jest/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/babel-jest/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/babel-jest/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/babel-jest/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-jest/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-loader": {
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+			"dev": true,
+			"dependencies": {
+				"find-cache-dir": "^3.3.1",
+				"loader-utils": "^2.0.0",
+				"make-dir": "^3.1.0",
+				"schema-utils": "^2.6.5"
+			},
+			"engines": {
+				"node": ">= 8.9"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0",
+				"webpack": ">=2"
+			}
+		},
+		"node_modules/babel-loader/node_modules/schema-utils": {
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.5",
+				"ajv": "^6.12.4",
+				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 8.9.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/babel-plugin-istanbul": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.0.0",
+				"@istanbuljs/load-nyc-config": "^1.0.0",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-instrument": "^5.0.4",
+				"test-exclude": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/babel-plugin-jest-hoist": {
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz",
+			"integrity": "sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==",
+			"dev": true,
+			"dependencies": {
+				"@babel/template": "^7.3.3",
+				"@babel/types": "^7.3.3",
+				"@types/babel__core": "^7.1.14",
+				"@types/babel__traverse": "^7.0.6"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/babel-plugin-macros": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+			"dependencies": {
+				"@babel/runtime": "^7.12.5",
+				"cosmiconfig": "^7.0.0",
+				"resolve": "^1.19.0"
+			},
+			"engines": {
+				"node": ">=10",
+				"npm": ">=6"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs2": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+			"dev": true,
+			"dependencies": {
+				"@babel/compat-data": "^7.17.7",
+				"@babel/helper-define-polyfill-provider": "^0.3.3",
+				"semver": "^6.1.1"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-corejs3": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+			"integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.3.3",
+				"core-js-compat": "^3.25.1"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/babel-plugin-polyfill-regenerator": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+			"dev": true,
+			"dependencies": {
+				"@babel/helper-define-polyfill-provider": "^0.3.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0-0"
+			}
+		},
+		"node_modules/babel-preset-current-node-syntax": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+			"dev": true,
+			"dependencies": {
+				"@babel/plugin-syntax-async-generators": "^7.8.4",
+				"@babel/plugin-syntax-bigint": "^7.8.3",
+				"@babel/plugin-syntax-class-properties": "^7.8.3",
+				"@babel/plugin-syntax-import-meta": "^7.8.3",
+				"@babel/plugin-syntax-json-strings": "^7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
+				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
+				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/babel-preset-jest": {
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz",
+			"integrity": "sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==",
+			"dev": true,
+			"dependencies": {
+				"babel-plugin-jest-hoist": "^29.5.0",
+				"babel-preset-current-node-syntax": "^1.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/backbone": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/backbone/-/backbone-1.5.0.tgz",
+			"integrity": "sha512-RPKlstw5NW+rD2X4PnEnvgLhslRnXOugXw2iBloHkPMgOxvakP1/A+tZIGM3qCm8uvZeEf8zMm0uvcK1JwL+IA==",
+			"dependencies": {
+				"underscore": ">=1.8.3"
+			}
+		},
+		"node_modules/balanced-match": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+			"dev": true
+		},
+		"node_modules/base": {
+			"version": "0.11.2",
+			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"dev": true,
+			"dependencies": {
+				"cache-base": "^1.0.1",
+				"class-utils": "^0.3.5",
+				"component-emitter": "^1.2.1",
+				"define-property": "^1.0.0",
+				"isobject": "^3.0.1",
+				"mixin-deep": "^1.2.0",
+				"pascalcase": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+			"dev": true,
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/is-accessor-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/is-data-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/is-descriptor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"dev": true,
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.0",
+				"is-data-descriptor": "^1.0.0",
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
+		},
+		"node_modules/batch": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
+			"dev": true
+		},
+		"node_modules/bcrypt-pbkdf": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+			"dev": true,
+			"dependencies": {
+				"tweetnacl": "^0.14.3"
+			}
+		},
+		"node_modules/big.js": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/bin-build": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
+			"integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"decompress": "^4.0.0",
+				"download": "^6.2.2",
+				"execa": "^0.7.0",
+				"p-map-series": "^1.0.0",
+				"tempfile": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-build/node_modules/execa": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+			"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"cross-spawn": "^5.0.1",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-build/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-check": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
+			"integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"execa": "^0.7.0",
+				"executable": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-check/node_modules/execa": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+			"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"cross-spawn": "^5.0.1",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-check/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-version": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
+			"integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"execa": "^1.0.0",
+				"find-versions": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-version-check": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
+			"integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"bin-version": "^3.0.0",
+				"semver": "^5.6.0",
+				"semver-truncate": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-version-check/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"optional": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/bin-wrapper": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
+			"integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"bin-check": "^4.1.0",
+				"bin-version-check": "^4.0.0",
+				"download": "^7.1.0",
+				"import-lazy": "^3.1.0",
+				"os-filter-obj": "^2.0.0",
+				"pify": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/download": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
+			"integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"archive-type": "^4.0.0",
+				"caw": "^2.0.1",
+				"content-disposition": "^0.5.2",
+				"decompress": "^4.2.0",
+				"ext-name": "^5.0.0",
+				"file-type": "^8.1.0",
+				"filenamify": "^2.0.0",
+				"get-stream": "^3.0.0",
+				"got": "^8.3.1",
+				"make-dir": "^1.2.0",
+				"p-event": "^2.1.0",
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/download/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/file-type": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
+			"integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/got": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
+			"integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"@sindresorhus/is": "^0.7.0",
+				"cacheable-request": "^2.1.1",
+				"decompress-response": "^3.3.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"into-stream": "^3.1.0",
+				"is-retry-allowed": "^1.1.0",
+				"isurl": "^1.0.0-alpha5",
+				"lowercase-keys": "^1.0.0",
+				"mimic-response": "^1.0.0",
+				"p-cancelable": "^0.4.0",
+				"p-timeout": "^2.0.1",
+				"pify": "^3.0.0",
+				"safe-buffer": "^5.1.1",
+				"timed-out": "^4.0.1",
+				"url-parse-lax": "^3.0.0",
+				"url-to-options": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/got/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/import-lazy": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
+			"integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/make-dir/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/p-cancelable": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+			"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/p-event": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
+			"integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"p-timeout": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/p-timeout": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
+			"integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"p-finally": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/prepend-http": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+			"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/bin-wrapper/node_modules/url-parse-lax": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+			"integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"prepend-http": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/binary-extensions": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
+			"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/bl": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
+			"integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+			"dev": true,
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/bluebird": {
+			"version": "3.7.2",
+			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+			"dev": true
+		},
+		"node_modules/body": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
+			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+			"dev": true,
+			"dependencies": {
+				"continuable-cache": "^0.3.1",
+				"error": "^7.0.0",
+				"raw-body": "~1.1.0",
+				"safe-json-parse": "~1.0.1"
+			}
+		},
+		"node_modules/body-parser": {
+			"version": "1.20.1",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+			"dev": true,
+			"dependencies": {
+				"bytes": "3.1.2",
+				"content-type": "~1.0.4",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"destroy": "1.2.0",
+				"http-errors": "2.0.0",
+				"iconv-lite": "0.4.24",
+				"on-finished": "2.4.1",
+				"qs": "6.11.0",
+				"raw-body": "2.5.1",
+				"type-is": "~1.6.18",
+				"unpipe": "1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
+		},
+		"node_modules/body-parser/node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/body-parser/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/body-parser/node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/body-parser/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/body-scroll-lock": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz",
+			"integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg=="
+		},
+		"node_modules/body/node_modules/bytes": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
+			"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
+			"dev": true
+		},
+		"node_modules/body/node_modules/raw-body": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
+			"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
+			"dev": true,
+			"dependencies": {
+				"bytes": "1",
+				"string_decoder": "0.10"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/body/node_modules/string_decoder": {
+			"version": "0.10.31",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+			"dev": true
+		},
+		"node_modules/bonjour-service": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz",
+			"integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==",
+			"dev": true,
+			"dependencies": {
+				"array-flatten": "^2.1.2",
+				"dns-equal": "^1.0.0",
+				"fast-deep-equal": "^3.1.3",
+				"multicast-dns": "^7.2.5"
+			}
+		},
+		"node_modules/boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+			"dev": true
+		},
+		"node_modules/brace-expansion": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+			"dev": true,
+			"dependencies": {
+				"balanced-match": "^1.0.0",
+				"concat-map": "0.0.1"
+			}
+		},
+		"node_modules/braces": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+			"dev": true,
+			"dependencies": {
+				"arr-flatten": "^1.1.0",
+				"array-unique": "^0.3.2",
+				"extend-shallow": "^2.0.1",
+				"fill-range": "^4.0.0",
+				"isobject": "^3.0.1",
+				"repeat-element": "^1.1.2",
+				"snapdragon": "^0.8.1",
+				"snapdragon-node": "^2.0.1",
+				"split-string": "^3.0.2",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/braces/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+			"dev": true,
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/browserslist": {
+			"version": "4.21.9",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
+			"integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
+				"caniuse-lite": "^1.0.30001503",
+				"electron-to-chromium": "^1.4.431",
+				"node-releases": "^2.0.12",
+				"update-browserslist-db": "^1.0.11"
+			},
+			"bin": {
+				"browserslist": "cli.js"
+			},
+			"engines": {
+				"node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+			}
+		},
+		"node_modules/bser": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+			"dev": true,
+			"dependencies": {
+				"node-int64": "^0.4.0"
+			}
+		},
+		"node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"node_modules/buffer-alloc": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"buffer-alloc-unsafe": "^1.1.0",
+				"buffer-fill": "^1.0.0"
+			}
+		},
+		"node_modules/buffer-alloc-unsafe": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/buffer-crc32": {
+			"version": "0.2.13",
+			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/buffer-fill": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/buffer-from": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+			"dev": true
+		},
+		"node_modules/bytes": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/cache-base": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+			"dev": true,
+			"dependencies": {
+				"collection-visit": "^1.0.0",
+				"component-emitter": "^1.2.1",
+				"get-value": "^2.0.6",
+				"has-value": "^1.0.0",
+				"isobject": "^3.0.1",
+				"set-value": "^2.0.0",
+				"to-object-path": "^0.3.0",
+				"union-value": "^1.0.0",
+				"unset-value": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cacheable-request": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
+			"integrity": "sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"clone-response": "1.0.2",
+				"get-stream": "3.0.0",
+				"http-cache-semantics": "3.8.1",
+				"keyv": "3.0.0",
+				"lowercase-keys": "1.0.0",
+				"normalize-url": "2.0.1",
+				"responselike": "1.0.2"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/lowercase-keys": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+			"integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/normalize-url": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+			"integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"prepend-http": "^2.0.0",
+				"query-string": "^5.0.1",
+				"sort-keys": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/prepend-http": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+			"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/query-string": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+			"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"decode-uri-component": "^0.2.0",
+				"object-assign": "^4.1.0",
+				"strict-uri-encode": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cacheable-request/node_modules/sort-keys": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+			"integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"is-plain-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"dependencies": {
+				"function-bind": "^1.1.1",
+				"get-intrinsic": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/call-me-maybe": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
+			"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
+			"dev": true
+		},
+		"node_modules/callsites": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camel-case": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+			"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+			"dependencies": {
+				"pascal-case": "^3.1.2",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/camelcase": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/camelcase-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"camelcase": "^2.0.0",
+				"map-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/camelcase-keys/node_modules/camelcase": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/caniuse-api": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.0.0",
+				"caniuse-lite": "^1.0.0",
+				"lodash.memoize": "^4.1.2",
+				"lodash.uniq": "^4.5.0"
+			}
+		},
+		"node_modules/caniuse-lite": {
+			"version": "1.0.30001517",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
+			"integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			]
+		},
+		"node_modules/capital-case": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
+			"integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
+			"dependencies": {
+				"no-case": "^3.0.4",
+				"tslib": "^2.0.3",
+				"upper-case-first": "^2.0.2"
+			}
+		},
+		"node_modules/caseless": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+			"dev": true
+		},
+		"node_modules/catharsis": {
+			"version": "0.9.0",
+			"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+			"integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+			"dev": true,
+			"dependencies": {
+				"lodash": "^4.17.15"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/caw": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
+			"integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"get-proxy": "^2.0.0",
+				"isurl": "^1.0.0-alpha5",
+				"tunnel-agent": "^0.6.0",
+				"url-to-options": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/chalk": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+			"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+			"dev": true,
+			"engines": {
+				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/change-case": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
+			"integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==",
+			"dependencies": {
+				"camel-case": "^4.1.2",
+				"capital-case": "^1.0.4",
+				"constant-case": "^3.0.4",
+				"dot-case": "^3.0.4",
+				"header-case": "^2.0.4",
+				"no-case": "^3.0.4",
+				"param-case": "^3.0.4",
+				"pascal-case": "^3.1.2",
+				"path-case": "^3.0.4",
+				"sentence-case": "^3.0.4",
+				"snake-case": "^3.0.4",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/chardet": {
+			"version": "0.4.2",
+			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+			"integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+			"dev": true
+		},
+		"node_modules/check-node-version": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.2.1.tgz",
+			"integrity": "sha512-YYmFYHV/X7kSJhuN/QYHUu998n/TRuDe8UenM3+m5NrkiH670lb9ILqHIvBencvJc4SDh+XcbXMR4b+TtubJiw==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^3.0.0",
+				"map-values": "^1.0.1",
+				"minimist": "^1.2.0",
+				"object-filter": "^1.0.2",
+				"run-parallel": "^1.1.4",
+				"semver": "^6.3.0"
+			},
+			"bin": {
+				"check-node-version": "bin.js"
+			},
+			"engines": {
+				"node": ">=8.3.0"
+			}
+		},
+		"node_modules/check-node-version/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/check-node-version/node_modules/chalk": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+			"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/check-node-version/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/check-node-version/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/check-node-version/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/check-node-version/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/check-node-version/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chokidar": {
+			"version": "3.5.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://paulmillr.com/funding/"
+				}
+			],
+			"dependencies": {
+				"anymatch": "~3.1.2",
+				"braces": "~3.0.2",
+				"glob-parent": "~5.1.2",
+				"is-binary-path": "~2.1.0",
+				"is-glob": "~4.0.1",
+				"normalize-path": "~3.0.0",
+				"readdirp": "~3.6.0"
+			},
+			"engines": {
+				"node": ">= 8.10.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "~2.3.2"
+			}
+		},
+		"node_modules/chokidar/node_modules/anymatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+			"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+			"dev": true,
+			"dependencies": {
+				"normalize-path": "^3.0.0",
+				"picomatch": "^2.0.4"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/chokidar/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chokidar/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/chokidar/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/chokidar/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+			"dev": true
+		},
+		"node_modules/chrome-trace-event": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.0"
+			}
+		},
+		"node_modules/chromium-bidi": {
+			"version": "0.4.7",
+			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.4.7.tgz",
+			"integrity": "sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ==",
+			"dev": true,
+			"dependencies": {
+				"mitt": "3.0.0"
+			},
+			"peerDependencies": {
+				"devtools-protocol": "*"
+			}
+		},
+		"node_modules/ci-info": {
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+			"integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/sibiraj-s"
+				}
+			],
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cjs-module-lexer": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
+			"integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==",
+			"dev": true
+		},
+		"node_modules/class-utils": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+			"dev": true,
+			"dependencies": {
+				"arr-union": "^3.1.0",
+				"define-property": "^0.2.5",
+				"isobject": "^3.0.0",
+				"static-extend": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/class-utils/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+			"dev": true,
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/classnames": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
+			"integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
+		},
+		"node_modules/clean-css": {
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
+			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+			"dev": true,
+			"dependencies": {
+				"source-map": "~0.6.0"
+			},
+			"engines": {
+				"node": ">= 10.0"
+			}
+		},
+		"node_modules/clean-css/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/clean-webpack-plugin": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
+			"integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
+			"dev": true,
+			"dependencies": {
+				"@types/webpack": "^4.4.31",
+				"del": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.9.0"
+			},
+			"peerDependencies": {
+				"webpack": "*"
+			}
+		},
+		"node_modules/cli": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
+			"integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
+			"dev": true,
+			"dependencies": {
+				"exit": "0.1.2",
+				"glob": "^7.1.1"
+			},
+			"engines": {
+				"node": ">=0.2.5"
+			}
+		},
+		"node_modules/cli-cursor": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+			"dev": true,
+			"dependencies": {
+				"restore-cursor": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cli-width": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
+			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
+			"dev": true
+		},
+		"node_modules/clipboard": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+			"dependencies": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
+		"node_modules/cliui": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+			"dependencies": {
+				"string-width": "^3.1.0",
+				"strip-ansi": "^5.2.0",
+				"wrap-ansi": "^5.1.0"
+			}
+		},
+		"node_modules/clone-deep": {
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+			"integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
+			"dev": true,
+			"dependencies": {
+				"for-own": "^0.1.3",
+				"is-plain-object": "^2.0.1",
+				"kind-of": "^3.0.2",
+				"lazy-cache": "^1.0.3",
+				"shallow-clone": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/clone-deep/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/clone-response": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+			"integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"mimic-response": "^1.0.0"
+			}
+		},
+		"node_modules/cmdk": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-0.2.0.tgz",
+			"integrity": "sha512-JQpKvEOb86SnvMZbYaFKYhvzFntWBeSZdyii0rZPhKJj9uwJBxu4DaVYDrRN7r3mPop56oPhRw+JYWTKs66TYw==",
+			"dependencies": {
+				"@radix-ui/react-dialog": "1.0.0",
+				"command-score": "0.1.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			}
+		},
+		"node_modules/co": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+			"dev": true,
+			"engines": {
+				"iojs": ">= 1.0.0",
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/coa": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+			"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"@types/q": "^1.5.1",
+				"chalk": "^2.4.1",
+				"q": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 4.0"
+			}
+		},
+		"node_modules/coa/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/coffee-script": {
+			"version": "1.12.7",
+			"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+			"integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+			"deprecated": "CoffeeScript on NPM has moved to \"coffeescript\" (no hyphen)",
+			"dev": true,
+			"bin": {
+				"cake": "bin/cake",
+				"coffee": "bin/coffee"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/collect-v8-coverage": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+			"integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+			"dev": true
+		},
+		"node_modules/collection-visit": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+			"dev": true,
+			"dependencies": {
+				"map-visit": "^1.0.0",
+				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/color-convert": {
+			"version": "1.9.3",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"dependencies": {
+				"color-name": "1.1.3"
+			}
+		},
+		"node_modules/color-name": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+		},
+		"node_modules/colord": {
+			"version": "2.9.3",
+			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
+		},
+		"node_modules/colorette": {
+			"version": "2.0.19",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+			"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+			"dev": true
+		},
+		"node_modules/colors": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.1.90"
+			}
+		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/command-score": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/command-score/-/command-score-0.1.2.tgz",
+			"integrity": "sha512-VtDvQpIJBvBatnONUsPzXYFVKQQAhuf3XTNOAsdBxCNO/QCtUUd8LSgjn0GVarBkCad6aJCZfXgrjYbl/KRr7w=="
+		},
+		"node_modules/commander": {
+			"version": "2.20.3",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+			"dev": true
+		},
+		"node_modules/comment-parser": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 12.0.0"
+			}
+		},
+		"node_modules/common-path-prefix": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
+			"dev": true
+		},
+		"node_modules/commondir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+			"dev": true
+		},
+		"node_modules/component-emitter": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+			"dev": true
+		},
+		"node_modules/compressible": {
+			"version": "2.0.18",
+			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": ">= 1.43.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/compression": {
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+			"dev": true,
+			"dependencies": {
+				"accepts": "~1.3.5",
+				"bytes": "3.0.0",
+				"compressible": "~2.0.16",
+				"debug": "2.6.9",
+				"on-headers": "~1.0.2",
+				"safe-buffer": "5.1.2",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/compression/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/compression/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/compression/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true
+		},
+		"node_modules/compute-scroll-into-view": {
+			"version": "1.0.20",
+			"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+			"integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+		},
+		"node_modules/computed-style": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz",
+			"integrity": "sha512-WpAmaKbMNmS3OProfHIdJiNleNJdgUrJfbKArXua28QF7+0CoZjlLn0lp6vlc+dl5r2/X9GQiQRQQU4BzSa69w=="
+		},
+		"node_modules/concat-map": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+			"dev": true
+		},
+		"node_modules/config-chain": {
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+			"integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"ini": "^1.3.4",
+				"proto-list": "~1.2.1"
+			}
+		},
+		"node_modules/connect-history-api-fallback": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/console-stream": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
+			"integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/constant-case": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz",
+			"integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==",
+			"dependencies": {
+				"no-case": "^3.0.4",
+				"tslib": "^2.0.3",
+				"upper-case": "^2.0.2"
+			}
+		},
+		"node_modules/content-disposition": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+			"integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"safe-buffer": "5.1.2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/content-disposition/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/content-type": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/continuable-cache": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
+			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
+			"dev": true
+		},
+		"node_modules/convert-source-map": {
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
+		},
+		"node_modules/cookie": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/cookie-signature": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+			"dev": true
+		},
+		"node_modules/copy-descriptor": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/copy-webpack-plugin": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
+			"integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+			"dev": true,
+			"dependencies": {
+				"fast-glob": "^3.2.11",
+				"glob-parent": "^6.0.1",
+				"globby": "^13.1.1",
+				"normalize-path": "^3.0.0",
+				"schema-utils": "^4.0.0",
+				"serialize-javascript": "^6.0.0"
+			},
+			"engines": {
+				"node": ">= 14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/ajv": {
+			"version": "8.11.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+			"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/globby": {
+			"version": "13.1.2",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
+			"integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
+			"dev": true,
+			"dependencies": {
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.2.11",
+				"ignore": "^5.2.0",
+				"merge2": "^1.4.1",
+				"slash": "^4.0.0"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/copy-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.8.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/copy-webpack-plugin/node_modules/slash": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+			"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/core-js": {
+			"version": "3.31.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.1.tgz",
+			"integrity": "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/core-js-compat": {
+			"version": "3.28.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.28.0.tgz",
+			"integrity": "sha512-myzPgE7QodMg4nnd3K1TDoES/nADRStM8Gpz0D6nhkwbmwEnE0ZGJgoWsvQ722FR8D7xS0n0LV556RcEicjTyg==",
+			"dev": true,
+			"dependencies": {
+				"browserslist": "^4.21.5"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/core-js-pure": {
+			"version": "3.21.1",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
+			"integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+			"deprecated": "core-js-pure@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js-pure.",
+			"dev": true,
+			"hasInstallScript": true,
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/core-js"
+			}
+		},
+		"node_modules/core-js-url-browser": {
+			"version": "3.6.4",
+			"resolved": "https://registry.npmjs.org/core-js-url-browser/-/core-js-url-browser-3.6.4.tgz",
+			"integrity": "sha512-VCMkPikOVp5JXftTj0E3gPZNKa0exQX837KxyPcnMAKvImWG8+RbXwEHEGMjiNz+9Vl2YgutkVYOpq7iaSOt/Q=="
+		},
+		"node_modules/core-util-is": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		},
+		"node_modules/cosmiconfig": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+			"dependencies": {
+				"@types/parse-json": "^4.0.0",
+				"import-fresh": "^3.2.1",
+				"parse-json": "^5.0.0",
+				"path-type": "^4.0.0",
+				"yaml": "^1.10.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/cross-fetch": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
+			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+			"dev": true,
+			"dependencies": {
+				"node-fetch": "2.6.7"
+			}
+		},
+		"node_modules/cross-spawn": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^4.0.1",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			}
+		},
+		"node_modules/cross-spawn/node_modules/lru-cache": {
+			"version": "4.1.5",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+			"dev": true,
+			"dependencies": {
+				"pseudomap": "^1.0.2",
+				"yallist": "^2.1.2"
+			}
+		},
+		"node_modules/cross-spawn/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/cross-spawn/node_modules/yallist": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+			"dev": true
+		},
+		"node_modules/cson-parser": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz",
+			"integrity": "sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ=",
+			"dev": true,
+			"dependencies": {
+				"coffee-script": "^1.10.0"
+			}
+		},
+		"node_modules/css-declaration-sorter": {
+			"version": "6.4.1",
+			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+			"integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >=14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.0.9"
+			}
+		},
+		"node_modules/css-functions-list": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.0.tgz",
+			"integrity": "sha512-d/jBMPyYybkkLVypgtGv12R+pIFw4/f/IHtCTxWpZc8ofTYOPigIgmA6vu5rMHartZC+WuXhBUHfnyNUIQSYrg==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.22"
+			}
+		},
+		"node_modules/css-loader": {
+			"version": "6.7.3",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
+			"integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
+			"dev": true,
+			"dependencies": {
+				"icss-utils": "^5.1.0",
+				"postcss": "^8.4.19",
+				"postcss-modules-extract-imports": "^3.0.0",
+				"postcss-modules-local-by-default": "^4.0.0",
+				"postcss-modules-scope": "^3.0.0",
+				"postcss-modules-values": "^4.0.0",
+				"postcss-value-parser": "^4.2.0",
+				"semver": "^7.3.8"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/css-select": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+			"integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^3.2.1",
+				"domutils": "^1.7.0",
+				"nth-check": "^1.0.2"
+			}
+		},
+		"node_modules/css-select-base-adapter": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+			"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/css-tree": {
+			"version": "1.0.0-alpha.37",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+			"integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"mdn-data": "2.0.4",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/css-tree/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/css-what": {
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+			"integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/cssesc": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+			"dev": true,
+			"bin": {
+				"cssesc": "bin/cssesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/cssnano": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.1.tgz",
+			"integrity": "sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==",
+			"dev": true,
+			"dependencies": {
+				"cssnano-preset-default": "^6.0.1",
+				"lilconfig": "^2.1.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/cssnano"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/cssnano-preset-default": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz",
+			"integrity": "sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==",
+			"dev": true,
+			"dependencies": {
+				"css-declaration-sorter": "^6.3.1",
+				"cssnano-utils": "^4.0.0",
+				"postcss-calc": "^9.0.0",
+				"postcss-colormin": "^6.0.0",
+				"postcss-convert-values": "^6.0.0",
+				"postcss-discard-comments": "^6.0.0",
+				"postcss-discard-duplicates": "^6.0.0",
+				"postcss-discard-empty": "^6.0.0",
+				"postcss-discard-overridden": "^6.0.0",
+				"postcss-merge-longhand": "^6.0.0",
+				"postcss-merge-rules": "^6.0.1",
+				"postcss-minify-font-values": "^6.0.0",
+				"postcss-minify-gradients": "^6.0.0",
+				"postcss-minify-params": "^6.0.0",
+				"postcss-minify-selectors": "^6.0.0",
+				"postcss-normalize-charset": "^6.0.0",
+				"postcss-normalize-display-values": "^6.0.0",
+				"postcss-normalize-positions": "^6.0.0",
+				"postcss-normalize-repeat-style": "^6.0.0",
+				"postcss-normalize-string": "^6.0.0",
+				"postcss-normalize-timing-functions": "^6.0.0",
+				"postcss-normalize-unicode": "^6.0.0",
+				"postcss-normalize-url": "^6.0.0",
+				"postcss-normalize-whitespace": "^6.0.0",
+				"postcss-ordered-values": "^6.0.0",
+				"postcss-reduce-initial": "^6.0.0",
+				"postcss-reduce-transforms": "^6.0.0",
+				"postcss-svgo": "^6.0.0",
+				"postcss-unique-selectors": "^6.0.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/cssnano-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
+			"integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
+			"dev": true,
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/csso": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+			"dev": true,
+			"dependencies": {
+				"css-tree": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/csso/node_modules/css-tree": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
+			"integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.14",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/csso/node_modules/mdn-data": {
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+			"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+			"dev": true
+		},
+		"node_modules/csso/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cssom": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+			"integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==",
+			"dev": true
+		},
+		"node_modules/cssstyle": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+			"dev": true,
+			"dependencies": {
+				"cssom": "~0.3.6"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/cssstyle/node_modules/cssom": {
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+			"dev": true
+		},
+		"node_modules/csstype": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+			"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+		},
+		"node_modules/currently-unhandled": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"array-find-index": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/cwd": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
+			"integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
+			"dev": true,
+			"dependencies": {
+				"find-pkg": "^0.1.2",
+				"fs-exists-sync": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/damerau-levenshtein": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
+			"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+			"dev": true
+		},
+		"node_modules/dashdash": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+			"dev": true,
+			"dependencies": {
+				"assert-plus": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/data-urls": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+			"integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+			"dev": true,
+			"dependencies": {
+				"abab": "^2.0.6",
+				"whatwg-mimetype": "^3.0.0",
+				"whatwg-url": "^11.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/data-urls/node_modules/tr46": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+			"integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/data-urls/node_modules/webidl-conversions": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/data-urls/node_modules/whatwg-url": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+			"integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+			"dev": true,
+			"dependencies": {
+				"tr46": "^3.0.0",
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/date-fns": {
+			"version": "2.29.3",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
+			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==",
+			"engines": {
+				"node": ">=0.11"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/date-fns"
+			}
+		},
+		"node_modules/date-now": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+			"dev": true
+		},
+		"node_modules/dateformat": {
+			"version": "4.6.3",
+			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz",
+			"integrity": "sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==",
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/debug": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.1.2"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"peerDependenciesMeta": {
+				"supports-color": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/debug/node_modules/ms": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
+		},
+		"node_modules/decamelize": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decamelize-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+			"integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
+			"dev": true,
+			"dependencies": {
+				"decamelize": "^1.1.0",
+				"map-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/decimal.js": {
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+			"dev": true
+		},
+		"node_modules/decode-uri-component": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+			"integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/decompress": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
+			"integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"decompress-tar": "^4.0.0",
+				"decompress-tarbz2": "^4.0.0",
+				"decompress-targz": "^4.0.0",
+				"decompress-unzip": "^4.0.1",
+				"graceful-fs": "^4.1.10",
+				"make-dir": "^1.0.0",
+				"pify": "^2.3.0",
+				"strip-dirs": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-response": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+			"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"mimic-response": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tar": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
+			"integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"file-type": "^5.2.0",
+				"is-stream": "^1.1.0",
+				"tar-stream": "^1.5.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tar/node_modules/bl": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
+			"integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"readable-stream": "^2.3.5",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"node_modules/decompress-tar/node_modules/file-type": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+			"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tar/node_modules/tar-stream": {
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+			"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"bl": "^1.0.0",
+				"buffer-alloc": "^1.2.0",
+				"end-of-stream": "^1.0.0",
+				"fs-constants": "^1.0.0",
+				"readable-stream": "^2.3.0",
+				"to-buffer": "^1.1.1",
+				"xtend": "^4.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/decompress-tarbz2": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
+			"integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"decompress-tar": "^4.1.0",
+				"file-type": "^6.1.0",
+				"is-stream": "^1.1.0",
+				"seek-bzip": "^1.0.5",
+				"unbzip2-stream": "^1.0.9"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-tarbz2/node_modules/file-type": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
+			"integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-targz": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
+			"integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"decompress-tar": "^4.1.1",
+				"file-type": "^5.2.0",
+				"is-stream": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-targz/node_modules/file-type": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+			"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-unzip": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
+			"integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"file-type": "^3.8.0",
+				"get-stream": "^2.2.0",
+				"pify": "^2.3.0",
+				"yauzl": "^2.4.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/file-type": {
+			"version": "3.9.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
+			"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/get-stream": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
+			"integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"object-assign": "^4.0.1",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress-unzip/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/decompress/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress/node_modules/make-dir/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/decompress/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+			"dev": true
+		},
+		"node_modules/deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/deep-for-each": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-3.0.0.tgz",
+			"integrity": "sha512-pPN+0f8jlnNP+z90qqOdxGghJU5XM6oBDhvAR+qdQzjCg5pk/7VPPvKK1GqoXEFkHza6ZS+Otzzvmr0g3VUaKw==",
+			"dev": true,
+			"dependencies": {
+				"lodash.isplainobject": "^4.0.6"
+			}
+		},
+		"node_modules/deep-is": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+			"dev": true
+		},
+		"node_modules/deepmerge": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz",
+			"integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/deepsignal": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.3.4.tgz",
+			"integrity": "sha512-yZEhFIZPnCN6uq07XykaeLRqqgBltF1sf4wvaucOhqb6w+ynoKZSpI00XKfvn6qMF8BRB9FFOttgAH1ljom3JA==",
+			"dependencies": {
+				"@preact/signals": "^1.1.4",
+				"@preact/signals-core": "^1.3.1",
+				"@preact/signals-react": "^1.3.3"
+			},
+			"peerDependencies": {
+				"preact": "10.x"
+			}
+		},
+		"node_modules/default-gateway": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+			"dev": true,
+			"dependencies": {
+				"execa": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/default-gateway/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/default-gateway/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+			"dev": true,
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
+			}
+		},
+		"node_modules/default-gateway/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/default-gateway/node_modules/is-stream": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/default-gateway/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/default-gateway/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/default-gateway/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/default-gateway/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/define-lazy-prop": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/define-properties": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+			"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+			"dev": true,
+			"dependencies": {
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/define-property": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+			"dev": true,
+			"dependencies": {
+				"is-descriptor": "^1.0.2",
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/define-property/node_modules/is-accessor-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/define-property/node_modules/is-data-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/define-property/node_modules/is-descriptor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"dev": true,
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.0",
+				"is-data-descriptor": "^1.0.0",
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/define-property/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/del": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/glob": "^7.1.1",
+				"globby": "^6.1.0",
+				"is-path-cwd": "^2.0.0",
+				"is-path-in-cwd": "^2.0.0",
+				"p-map": "^2.0.0",
+				"pify": "^4.0.1",
+				"rimraf": "^2.6.3"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/del/node_modules/globby": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+			"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^1.0.1",
+				"glob": "^7.0.3",
+				"object-assign": "^4.0.1",
+				"pify": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/del/node_modules/globby/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/delegate": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+		},
+		"node_modules/depd": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/dequal": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+			"integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/desandro-matches-selector": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz",
+			"integrity": "sha1-cXvu1NwT59jzdi9wem1YpndCGOE="
+		},
+		"node_modules/destroy": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8",
+				"npm": "1.2.8000 || >= 1.4.16"
+			}
+		},
+		"node_modules/detect-file": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/detect-newline": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/detect-node": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
+			"dev": true
+		},
+		"node_modules/detect-node-es": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+			"integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
+		},
+		"node_modules/devtools-protocol": {
+			"version": "0.0.981744",
+			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
+			"integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
+			"dev": true
+		},
+		"node_modules/diff": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+			"engines": {
+				"node": ">=0.3.1"
+			}
+		},
+		"node_modules/diff-sequences": {
+			"version": "29.4.3",
+			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz",
+			"integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/dir-glob": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"dev": true,
+			"dependencies": {
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/dns-equal": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
+			"dev": true
+		},
+		"node_modules/dns-packet": {
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
+			"integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+			"dev": true,
+			"dependencies": {
+				"@leichtgewicht/ip-codec": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/doctrine": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			}
+		},
+		"node_modules/dom-scroll-into-view": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
+			"integrity": "sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ=="
+		},
+		"node_modules/dom-serializer": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/dom-serializer/node_modules/domelementtype": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
+			"integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domelementtype": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+			"dev": true
+		},
+		"node_modules/domexception": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+			"integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+			"dev": true,
+			"dependencies": {
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/domexception/node_modules/webidl-conversions": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/domhandler": {
+			"version": "4.3.1",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.2.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/domhandler/node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/domutils": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"dom-serializer": "0",
+				"domelementtype": "1"
+			}
+		},
+		"node_modules/dot-case": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+			"integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+			"dependencies": {
+				"no-case": "^3.0.4",
+				"tslib": "^2.0.3"
+			}
+		},
+		"node_modules/dotenv": {
+			"version": "16.3.1",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+			"integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/motdotla/dotenv?sponsor=1"
+			}
+		},
+		"node_modules/dotenv-expand": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
+			"integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/download": {
+			"version": "6.2.5",
+			"resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
+			"integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"caw": "^2.0.0",
+				"content-disposition": "^0.5.2",
+				"decompress": "^4.0.0",
+				"ext-name": "^5.0.0",
+				"file-type": "5.2.0",
+				"filenamify": "^2.0.0",
+				"get-stream": "^3.0.0",
+				"got": "^7.0.0",
+				"make-dir": "^1.0.0",
+				"p-event": "^1.0.0",
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/download/node_modules/file-type": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
+			"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/download/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/download/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/download/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/downloadjs": {
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",
+			"integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
+		},
+		"node_modules/downshift": {
+			"version": "6.1.12",
+			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.12.tgz",
+			"integrity": "sha512-7XB/iaSJVS4T8wGFT3WRXmSF1UlBHAA40DshZtkrIscIN+VC+Lh363skLxFTvJwtNgHxAMDGEHT4xsyQFWL+UA==",
+			"dependencies": {
+				"@babel/runtime": "^7.14.8",
+				"compute-scroll-into-view": "^1.0.17",
+				"prop-types": "^15.7.2",
+				"react-is": "^17.0.2",
+				"tslib": "^2.3.0"
+			},
+			"peerDependencies": {
+				"react": ">=16.12.0"
+			}
+		},
+		"node_modules/downshift/node_modules/react-is": {
+			"version": "17.0.2",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+		},
+		"node_modules/duplexer": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+			"dev": true
+		},
+		"node_modules/duplexer3": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+			"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/ecc-jsbn": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+			"dev": true,
+			"dependencies": {
+				"jsbn": "~0.1.0",
+				"safer-buffer": "^2.1.0"
+			}
+		},
+		"node_modules/ee-first": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+			"dev": true
+		},
+		"node_modules/electron-to-chromium": {
+			"version": "1.4.467",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.467.tgz",
+			"integrity": "sha512-2qI70O+rR4poYeF2grcuS/bCps5KJh6y1jtZMDDEteyKJQrzLOEhFyXCLcHW6DTBjKjWkk26JhWoAi+Ux9A0fg==",
+			"dev": true
+		},
+		"node_modules/element-closest": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/element-closest/-/element-closest-3.0.2.tgz",
+			"integrity": "sha512-JxKQiJKX0Zr5Q2/bCaTx8P+UbfyMET1OQd61qu5xQFeWr1km3fGaxelSJtnfT27XQ5Uoztn2yIyeamAc/VX13g==",
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/emittery": {
+			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+			"integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/emittery?sponsor=1"
+			}
+		},
+		"node_modules/emoji-regex": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+		},
+		"node_modules/emojis-list": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
+		},
+		"node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/encoding": {
+			"version": "0.1.13",
+			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+			"dependencies": {
+				"iconv-lite": "^0.6.2"
+			}
+		},
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dev": true,
+			"dependencies": {
+				"once": "^1.4.0"
+			}
+		},
+		"node_modules/enhanced-resolve": {
+			"version": "5.15.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.2.4",
+				"tapable": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/entities": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+			"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/envinfo": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+			"dev": true,
+			"bin": {
+				"envinfo": "dist/cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/equivalent-key-map": {
+			"version": "0.2.2",
+			"resolved": "https://registry.npmjs.org/equivalent-key-map/-/equivalent-key-map-0.2.2.tgz",
+			"integrity": "sha512-xvHeyCDbZzkpN4VHQj/n+j2lOwL0VWszG30X4cOrc9Y7Tuo2qCdZK/0AMod23Z5dCtNUbaju6p0rwOhHUk05ew=="
+		},
+		"node_modules/error": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+			"integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
+			"dev": true,
+			"dependencies": {
+				"string-template": "~0.2.1"
+			}
+		},
+		"node_modules/error-ex": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+			"dependencies": {
+				"is-arrayish": "^0.2.1"
+			}
+		},
+		"node_modules/error-stack-parser": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz",
+			"integrity": "sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==",
+			"dev": true,
+			"dependencies": {
+				"stackframe": "^1.1.1"
+			}
+		},
+		"node_modules/es-abstract": {
+			"version": "1.22.1",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+			"integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+			"dev": true,
+			"dependencies": {
+				"array-buffer-byte-length": "^1.0.0",
+				"arraybuffer.prototype.slice": "^1.0.1",
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.2",
+				"es-set-tostringtag": "^2.0.1",
+				"es-to-primitive": "^1.2.1",
+				"function.prototype.name": "^1.1.5",
+				"get-intrinsic": "^1.2.1",
+				"get-symbol-description": "^1.0.0",
+				"globalthis": "^1.0.3",
+				"gopd": "^1.0.1",
+				"has": "^1.0.3",
+				"has-property-descriptors": "^1.0.0",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"internal-slot": "^1.0.5",
+				"is-array-buffer": "^3.0.2",
+				"is-callable": "^1.2.7",
+				"is-negative-zero": "^2.0.2",
+				"is-regex": "^1.1.4",
+				"is-shared-array-buffer": "^1.0.2",
+				"is-string": "^1.0.7",
+				"is-typed-array": "^1.1.10",
+				"is-weakref": "^1.0.2",
+				"object-inspect": "^1.12.3",
+				"object-keys": "^1.1.1",
+				"object.assign": "^4.1.4",
+				"regexp.prototype.flags": "^1.5.0",
+				"safe-array-concat": "^1.0.0",
+				"safe-regex-test": "^1.0.0",
+				"string.prototype.trim": "^1.2.7",
+				"string.prototype.trimend": "^1.0.6",
+				"string.prototype.trimstart": "^1.0.6",
+				"typed-array-buffer": "^1.0.0",
+				"typed-array-byte-length": "^1.0.0",
+				"typed-array-byte-offset": "^1.0.0",
+				"typed-array-length": "^1.0.4",
+				"unbox-primitive": "^1.0.2",
+				"which-typed-array": "^1.1.10"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/es-module-lexer": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+			"integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+			"dev": true
+		},
+		"node_modules/es-set-tostringtag": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+			"integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+			"dev": true,
+			"dependencies": {
+				"get-intrinsic": "^1.1.3",
+				"has": "^1.0.3",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-shim-unscopables": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+			"dev": true,
+			"dependencies": {
+				"has": "^1.0.3"
+			}
+		},
+		"node_modules/es-to-primitive": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+			"dev": true,
+			"dependencies": {
+				"is-callable": "^1.1.4",
+				"is-date-object": "^1.0.1",
+				"is-symbol": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+		},
+		"node_modules/escape-string-regexp": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/escodegen": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+			"integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+			"dev": true,
+			"dependencies": {
+				"esprima": "^4.0.1",
+				"estraverse": "^5.2.0",
+				"esutils": "^2.0.2"
+			},
+			"bin": {
+				"escodegen": "bin/escodegen.js",
+				"esgenerate": "bin/esgenerate.js"
+			},
+			"engines": {
+				"node": ">=6.0"
+			},
+			"optionalDependencies": {
+				"source-map": "~0.6.1"
+			}
+		},
+		"node_modules/escodegen/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/escodegen/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eslint": {
+			"version": "8.45.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
+			"integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
+			"dev": true,
+			"dependencies": {
+				"@eslint-community/eslint-utils": "^4.2.0",
+				"@eslint-community/regexpp": "^4.4.0",
+				"@eslint/eslintrc": "^2.1.0",
+				"@eslint/js": "8.44.0",
+				"@humanwhocodes/config-array": "^0.11.10",
+				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
+				"ajv": "^6.10.0",
+				"chalk": "^4.0.0",
+				"cross-spawn": "^7.0.2",
+				"debug": "^4.3.2",
+				"doctrine": "^3.0.0",
+				"escape-string-regexp": "^4.0.0",
+				"eslint-scope": "^7.2.0",
+				"eslint-visitor-keys": "^3.4.1",
+				"espree": "^9.6.0",
+				"esquery": "^1.4.2",
+				"esutils": "^2.0.2",
+				"fast-deep-equal": "^3.1.3",
+				"file-entry-cache": "^6.0.1",
+				"find-up": "^5.0.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
+				"graphemer": "^1.4.0",
+				"ignore": "^5.2.0",
+				"imurmurhash": "^0.1.4",
+				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
+				"js-yaml": "^4.1.0",
+				"json-stable-stringify-without-jsonify": "^1.0.1",
+				"levn": "^0.4.1",
+				"lodash.merge": "^4.6.2",
+				"minimatch": "^3.1.2",
+				"natural-compare": "^1.4.0",
+				"optionator": "^0.9.3",
+				"strip-ansi": "^6.0.1",
+				"text-table": "^0.2.0"
+			},
+			"bin": {
+				"eslint": "bin/eslint.js"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint-config-prettier": {
+			"version": "8.8.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",
+			"integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==",
+			"dev": true,
+			"bin": {
+				"eslint-config-prettier": "bin/cli.js"
+			},
+			"peerDependencies": {
+				"eslint": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint-import-resolver-node": {
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+			"integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^3.2.7",
+				"is-core-module": "^2.11.0",
+				"resolve": "^1.22.1"
+			}
+		},
+		"node_modules/eslint-import-resolver-node/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/eslint-module-utils": {
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+			"integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
+			"dev": true,
+			"dependencies": {
+				"debug": "^3.2.7"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependenciesMeta": {
+				"eslint": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-module-utils/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/eslint-plugin-import": {
+			"version": "2.27.5",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+			"integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
+			"dev": true,
+			"dependencies": {
+				"array-includes": "^3.1.6",
+				"array.prototype.flat": "^1.3.1",
+				"array.prototype.flatmap": "^1.3.1",
+				"debug": "^3.2.7",
+				"doctrine": "^2.1.0",
+				"eslint-import-resolver-node": "^0.3.7",
+				"eslint-module-utils": "^2.7.4",
+				"has": "^1.0.3",
+				"is-core-module": "^2.11.0",
+				"is-glob": "^4.0.3",
+				"minimatch": "^3.1.2",
+				"object.values": "^1.1.6",
+				"resolve": "^1.22.1",
+				"semver": "^6.3.0",
+				"tsconfig-paths": "^3.14.1"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
+			"dependencies": {
+				"ms": "^2.1.1"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/doctrine": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eslint-plugin-import/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/eslint-plugin-jest": {
+			"version": "27.2.3",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.2.3.tgz",
+			"integrity": "sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ==",
+			"dev": true,
+			"dependencies": {
+				"@typescript-eslint/utils": "^5.10.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@typescript-eslint/eslint-plugin": "^5.0.0 || ^6.0.0",
+				"eslint": "^7.0.0 || ^8.0.0",
+				"jest": "*"
+			},
+			"peerDependenciesMeta": {
+				"@typescript-eslint/eslint-plugin": {
+					"optional": true
+				},
+				"jest": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-plugin-jsdoc": {
+			"version": "39.9.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.9.1.tgz",
+			"integrity": "sha512-Rq2QY6BZP2meNIs48aZ3GlIlJgBqFCmR55+UBvaDkA3ZNQ0SvQXOs2QKkubakEijV8UbIVbVZKsOVN8G3MuqZw==",
+			"dev": true,
+			"dependencies": {
+				"@es-joy/jsdoccomment": "~0.36.1",
+				"comment-parser": "1.3.1",
+				"debug": "^4.3.4",
+				"escape-string-regexp": "^4.0.0",
+				"esquery": "^1.4.0",
+				"semver": "^7.3.8",
+				"spdx-expression-parse": "^3.0.1"
+			},
+			"engines": {
+				"node": "^14 || ^16 || ^17 || ^18 || ^19"
+			},
+			"peerDependencies": {
+				"eslint": "^7.0.0 || ^8.0.0"
+			}
+		},
+		"node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint-plugin-jsx-a11y": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
+			"integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
+			"dev": true,
+			"dependencies": {
+				"@babel/runtime": "^7.20.7",
+				"aria-query": "^5.1.3",
+				"array-includes": "^3.1.6",
+				"array.prototype.flatmap": "^1.3.1",
+				"ast-types-flow": "^0.0.7",
+				"axe-core": "^4.6.2",
+				"axobject-query": "^3.1.1",
+				"damerau-levenshtein": "^1.0.8",
+				"emoji-regex": "^9.2.2",
+				"has": "^1.0.3",
+				"jsx-ast-utils": "^3.3.3",
+				"language-tags": "=1.0.5",
+				"minimatch": "^3.1.2",
+				"object.entries": "^1.1.6",
+				"object.fromentries": "^2.0.6",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			},
+			"peerDependencies": {
+				"eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+			}
+		},
+		"node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
+			"version": "9.2.2",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+			"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+			"dev": true
+		},
+		"node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/eslint-plugin-prettier": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
+			"integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
+			"dev": true,
+			"dependencies": {
+				"prettier-linter-helpers": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			},
+			"peerDependencies": {
+				"eslint": ">=5.0.0",
+				"prettier": ">=1.13.0"
+			},
+			"peerDependenciesMeta": {
+				"eslint-config-prettier": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/eslint-plugin-react": {
+			"version": "7.33.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.0.tgz",
+			"integrity": "sha512-qewL/8P34WkY8jAqdQxsiL82pDUeT7nhs8IsuXgfgnsEloKCT4miAV9N9kGtx7/KM9NH/NCGUE7Edt9iGxLXFw==",
+			"dev": true,
+			"dependencies": {
+				"array-includes": "^3.1.6",
+				"array.prototype.flatmap": "^1.3.1",
+				"array.prototype.tosorted": "^1.1.1",
+				"doctrine": "^2.1.0",
+				"estraverse": "^5.3.0",
+				"jsx-ast-utils": "^2.4.1 || ^3.0.0",
+				"minimatch": "^3.1.2",
+				"object.entries": "^1.1.6",
+				"object.fromentries": "^2.0.6",
+				"object.hasown": "^1.1.2",
+				"object.values": "^1.1.6",
+				"prop-types": "^15.8.1",
+				"resolve": "^2.0.0-next.4",
+				"semver": "^6.3.1",
+				"string.prototype.matchall": "^4.0.8"
+			},
+			"engines": {
+				"node": ">=4"
+			},
+			"peerDependencies": {
+				"eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+			}
+		},
+		"node_modules/eslint-plugin-react-hooks": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
+			"integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+			}
+		},
+		"node_modules/eslint-plugin-react/node_modules/doctrine": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+			"dev": true,
+			"dependencies": {
+				"esutils": "^2.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/eslint-plugin-react/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/eslint-plugin-react/node_modules/resolve": {
+			"version": "2.0.0-next.4",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
+			"integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
+			"dev": true,
+			"dependencies": {
+				"is-core-module": "^2.9.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/eslint-plugin-react/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
+		},
+		"node_modules/eslint-scope": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^4.1.1"
+			},
+			"engines": {
+				"node": ">=8.0.0"
+			}
+		},
+		"node_modules/eslint-visitor-keys": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/eslint/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/eslint/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/eslint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/eslint/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/eslint/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/eslint/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/eslint/node_modules/escape-string-regexp": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-scope": {
+			"version": "7.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.1.tgz",
+			"integrity": "sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==",
+			"dev": true,
+			"dependencies": {
+				"esrecurse": "^4.3.0",
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint/node_modules/eslint-visitor-keys": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+			"integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/eslint/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/eslint/node_modules/find-up": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^6.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/glob-parent": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+			"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.3"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/eslint/node_modules/globals": {
+			"version": "13.20.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+			"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+			"dev": true,
+			"dependencies": {
+				"type-fest": "^0.20.2"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/eslint/node_modules/locate-path": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/p-locate": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/eslint/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/eslint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/espree": {
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+			"integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+			"dev": true,
+			"dependencies": {
+				"acorn": "^8.9.0",
+				"acorn-jsx": "^5.3.2",
+				"eslint-visitor-keys": "^3.4.1"
+			},
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/espree/node_modules/eslint-visitor-keys": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+			"integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+			"dev": true,
+			"engines": {
+				"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://opencollective.com/eslint"
+			}
+		},
+		"node_modules/esprima": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+			"dev": true,
+			"bin": {
+				"esparse": "bin/esparse.js",
+				"esvalidate": "bin/esvalidate.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/esquery": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+			"integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/esquery/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+			"dev": true,
+			"dependencies": {
+				"estraverse": "^5.2.0"
+			},
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esrecurse/node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/etag": {
+			"version": "1.8.1",
+			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/ev-emitter": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
+			"integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="
+		},
+		"node_modules/eventemitter2": {
+			"version": "0.4.14",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
+			"integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
+			"dev": true
+		},
+		"node_modules/eventemitter3": {
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+			"dev": true
+		},
+		"node_modules/events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.x"
+			}
+		},
+		"node_modules/exec-buffer": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
+			"integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"execa": "^0.7.0",
+				"p-finally": "^1.0.0",
+				"pify": "^3.0.0",
+				"rimraf": "^2.5.4",
+				"tempfile": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@wordpress/viewport": {
-			"version": "4.15.3",
-			"resolved": "https://registry.npmjs.org/@wordpress/viewport/-/viewport-4.15.3.tgz",
-			"integrity": "sha512-7+V5kiuZ7SmkT7RcGgxZEigN4HIEvQ7lnPYPonGrwurOaXL7NPGCIrYiS5QLgFwqm/uao9RGXhTE3fyZKEDV1A==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/data": "^7.1.3",
-				"lodash": "^4.17.21"
+		"node_modules/exec-buffer/node_modules/execa": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+			"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"cross-spawn": "^5.0.1",
+				"get-stream": "^3.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@wordpress/warning": {
-			"version": "2.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.17.1.tgz",
-			"integrity": "sha512-Ursa3UgwUoatO5XNkPw3a+JM5t/7r0x+fMAYCC4IlBjnC4iWK4H3pPqC0NwkScUOtRKI9K6FBuEB86rlCid4yw=="
+		"node_modules/exec-buffer/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"@wordpress/widgets": {
-			"version": "2.15.9",
-			"resolved": "https://registry.npmjs.org/@wordpress/widgets/-/widgets-2.15.9.tgz",
-			"integrity": "sha512-pKEG8maGGk1p1LqjiFxG9+eD97PHpEJiiLgyH+hQ2jREgi8Jw9x8FPl/fdV8KIqOR/ZR06C46azHWIO2BTK10g==",
-			"requires": {
-				"@babel/runtime": "^7.16.0",
-				"@wordpress/api-fetch": "^6.14.1",
-				"@wordpress/block-editor": "^10.0.9",
-				"@wordpress/blocks": "^11.16.4",
-				"@wordpress/components": "^21.0.6",
-				"@wordpress/compose": "^5.15.2",
-				"@wordpress/core-data": "^5.0.4",
-				"@wordpress/data": "^7.1.3",
-				"@wordpress/element": "^4.15.1",
-				"@wordpress/i18n": "^4.17.1",
-				"@wordpress/icons": "^9.8.1",
-				"@wordpress/notices": "^3.17.3",
-				"classnames": "^2.3.1",
-				"lodash": "^4.17.21"
+		"node_modules/exec-buffer/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"@wordpress/wordcount": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/@wordpress/wordcount/-/wordcount-3.17.1.tgz",
-			"integrity": "sha512-gbXwOWkaqb2trkmAgqMpPLqDwP4BVVvjlLFC05+zTSM0EiLEEZDvbxhHFOxeQd98May2KO26iRr/xDbqXa2QxQ==",
-			"requires": {
-				"@babel/runtime": "^7.16.0"
+		"node_modules/execa": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"cross-spawn": "^6.0.0",
+				"get-stream": "^4.0.0",
+				"is-stream": "^1.1.0",
+				"npm-run-path": "^2.0.0",
+				"p-finally": "^1.0.0",
+				"signal-exit": "^3.0.0",
+				"strip-eof": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"@xtuc/ieee754": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-			"integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-			"dev": true
+		"node_modules/execa/node_modules/cross-spawn": {
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"nice-try": "^1.0.4",
+				"path-key": "^2.0.1",
+				"semver": "^5.5.0",
+				"shebang-command": "^1.2.0",
+				"which": "^1.2.9"
+			},
+			"engines": {
+				"node": ">=4.8"
+			}
 		},
-		"@xtuc/long": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+		"node_modules/execa/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"optional": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/execa/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/executable": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+			"integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"pify": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/executable/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/exit": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/expand-brackets": {
+			"version": "2.1.4",
+			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+			"dev": true,
+			"dependencies": {
+				"debug": "^2.3.3",
+				"define-property": "^0.2.5",
+				"extend-shallow": "^2.0.1",
+				"posix-character-classes": "^0.1.0",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+			"dev": true,
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+			"dev": true,
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expand-brackets/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
 			"dev": true
 		},
-		"abab": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-			"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+		"node_modules/expand-tilde": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+			"integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
+			"dev": true,
+			"dependencies": {
+				"os-homedir": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/expect": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/expect/-/expect-29.6.1.tgz",
+			"integrity": "sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==",
+			"dev": true,
+			"dependencies": {
+				"@jest/expect-utils": "^29.6.1",
+				"@types/node": "*",
+				"jest-get-type": "^29.4.3",
+				"jest-matcher-utils": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-util": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/expect-puppeteer": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
+			"integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
 			"dev": true
 		},
-		"abbrev": {
+		"node_modules/express": {
+			"version": "4.18.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+			"dev": true,
+			"dependencies": {
+				"accepts": "~1.3.8",
+				"array-flatten": "1.1.1",
+				"body-parser": "1.20.1",
+				"content-disposition": "0.5.4",
+				"content-type": "~1.0.4",
+				"cookie": "0.5.0",
+				"cookie-signature": "1.0.6",
+				"debug": "2.6.9",
+				"depd": "2.0.0",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"etag": "~1.8.1",
+				"finalhandler": "1.2.0",
+				"fresh": "0.5.2",
+				"http-errors": "2.0.0",
+				"merge-descriptors": "1.0.1",
+				"methods": "~1.1.2",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"path-to-regexp": "0.1.7",
+				"proxy-addr": "~2.0.7",
+				"qs": "6.11.0",
+				"range-parser": "~1.2.1",
+				"safe-buffer": "5.2.1",
+				"send": "0.18.0",
+				"serve-static": "1.15.0",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"type-is": "~1.6.18",
+				"utils-merge": "1.0.1",
+				"vary": "~1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/express/node_modules/array-flatten": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
 			"dev": true
 		},
-		"accepts": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-			"integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+		"node_modules/express/node_modules/content-disposition": {
+			"version": "0.5.4",
+			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+			"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+			"dev": true,
+			"dependencies": {
+				"safe-buffer": "5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/express/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/express/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/express/node_modules/path-to-regexp": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+			"dev": true
+		},
+		"node_modules/ext-list": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+			"integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"mime-db": "^1.28.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/ext-name": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+			"integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"ext-list": "^2.0.0",
+				"sort-keys-length": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+			"dev": true
+		},
+		"node_modules/extend-shallow": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+			"dev": true,
+			"dependencies": {
+				"assign-symbols": "^1.0.0",
+				"is-extendable": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extend-shallow/node_modules/is-extendable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"dev": true,
+			"dependencies": {
+				"is-plain-object": "^2.0.4"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/extend-shallow/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/external-editor": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+			"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
 			"dev": true,
-			"requires": {
-				"mime-types": "~2.1.34",
-				"negotiator": "0.6.3"
-			},
 			"dependencies": {
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"dev": true,
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				}
+				"chardet": "^0.4.0",
+				"iconv-lite": "^0.4.17",
+				"tmp": "^0.0.33"
+			},
+			"engines": {
+				"node": ">=0.12"
 			}
 		},
-		"acorn": {
-			"version": "8.7.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
-			"integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==",
-			"dev": true
-		},
-		"acorn-globals": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+		"node_modules/external-editor/node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"dev": true,
-			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-walk": "^7.1.1"
-			},
 			"dependencies": {
-				"acorn": {
-					"version": "7.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-					"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-					"dev": true
-				}
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"acorn-import-assertions": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-			"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-			"dev": true
-		},
-		"acorn-jsx": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-			"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-			"dev": true
-		},
-		"acorn-walk": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
-		},
-		"adm-zip": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
-			"integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+		"node_modules/extglob": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
 			"dev": true,
-			"requires": {
-				"debug": "4"
+			"dependencies": {
+				"array-unique": "^0.3.2",
+				"define-property": "^1.0.0",
+				"expand-brackets": "^2.1.4",
+				"extend-shallow": "^2.0.1",
+				"fragment-cache": "^0.2.1",
+				"regex-not": "^1.0.0",
+				"snapdragon": "^0.8.1",
+				"to-regex": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"ajv": {
-			"version": "6.12.6",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-			"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+		"node_modules/extglob/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 			"dev": true,
-			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+			"dependencies": {
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"ajv-errors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-			"integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-			"dev": true
-		},
-		"ajv-formats": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-			"integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+		"node_modules/extglob/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 			"dev": true,
-			"requires": {
-				"ajv": "^8.0.0"
-			},
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				}
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"ajv-keywords": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-			"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-			"dev": true
-		},
-		"alphanum-sort": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-			"integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-			"dev": true
-		},
-		"ansi-escapes": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-			"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+		"node_modules/extglob/node_modules/is-accessor-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 			"dev": true,
-			"requires": {
-				"type-fest": "^0.21.3"
-			},
 			"dependencies": {
-				"type-fest": {
-					"version": "0.21.3",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-					"dev": true
-				}
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"ansi-html-community": {
-			"version": "0.0.8",
-			"resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-			"integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-			"dev": true
-		},
-		"ansi-regex": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-			"integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
-		},
-		"ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"requires": {
-				"color-convert": "^1.9.0"
+		"node_modules/extglob/node_modules/is-data-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"anymatch": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-			"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+		"node_modules/extglob/node_modules/is-descriptor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 			"dev": true,
-			"requires": {
-				"normalize-path": "^3.0.0",
-				"picomatch": "^2.0.4"
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.0",
+				"is-data-descriptor": "^1.0.0",
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"arch": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-			"integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+		"node_modules/extglob/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"archive-type": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz",
-			"integrity": "sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=",
+		"node_modules/extract-zip": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+			"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-type": "^4.2.0"
-			},
 			"dependencies": {
-				"file-type": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
-					"integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=",
-					"dev": true,
-					"optional": true
-				}
+				"debug": "^4.1.1",
+				"get-stream": "^5.1.0",
+				"yauzl": "^2.10.0"
+			},
+			"bin": {
+				"extract-zip": "cli.js"
+			},
+			"engines": {
+				"node": ">= 10.17.0"
+			},
+			"optionalDependencies": {
+				"@types/yauzl": "^2.9.1"
 			}
 		},
-		"argparse": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+		"node_modules/extract-zip/node_modules/get-stream": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
 			"dev": true,
-			"requires": {
-				"sprintf-js": "~1.0.2"
-			},
 			"dependencies": {
-				"sprintf-js": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-					"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-					"dev": true
-				}
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"aria-query": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-			"integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+		"node_modules/extsprintf": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
 			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.10.2",
-				"@babel/runtime-corejs3": "^7.10.2"
+			"engines": [
+				"node >=0.6.0"
+			]
+		},
+		"node_modules/fast-average-color": {
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/fast-average-color/-/fast-average-color-9.3.0.tgz",
+			"integrity": "sha512-FlPROSqDMOnoBgkFhWMHJODPvpS0Od0WDpedcKq4U/t0JVapGAkblNwxOr75qT+ZNd0dQM4qlgqrtnXbCJ8cNg==",
+			"engines": {
+				"node": ">= 12"
 			}
 		},
-		"arr-diff": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-			"integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-			"dev": true
+		"node_modules/fast-deep-equal": {
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
 		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+		"node_modules/fast-diff": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+			"integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
 			"dev": true
 		},
-		"arr-union": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-			"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-			"dev": true
+		"node_modules/fast-glob": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz",
+			"integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==",
+			"dev": true,
+			"dependencies": {
+				"@nodelib/fs.stat": "^2.0.2",
+				"@nodelib/fs.walk": "^1.2.3",
+				"glob-parent": "^5.1.2",
+				"merge2": "^1.3.0",
+				"micromatch": "^4.0.4"
+			},
+			"engines": {
+				"node": ">=8.6.0"
+			}
 		},
-		"array-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-			"dev": true
+		"node_modules/fast-glob/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"array-find-index": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-			"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+		"node_modules/fast-glob/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-			"dev": true
+		"node_modules/fast-glob/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"array-includes": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-			"integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+		"node_modules/fast-glob/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5",
-				"get-intrinsic": "^1.1.1",
-				"is-string": "^1.0.7"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-					"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-					"dev": true,
-					"requires": {
-						"has-property-descriptors": "^1.0.0",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					}
-				},
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				}
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"array-slice": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-			"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-			"dev": true
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+		"node_modules/fast-glob/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"requires": {
-				"array-uniq": "^1.0.1"
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+		"node_modules/fast-json-stable-stringify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
 			"dev": true
 		},
-		"array-unique": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+		"node_modules/fast-levenshtein": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
 			"dev": true
 		},
-		"array.prototype.filter": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.1.tgz",
-			"integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
+		"node_modules/fast-xml-parser": {
+			"version": "4.2.7",
+			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.7.tgz",
+			"integrity": "sha512-J8r6BriSLO1uj2miOk1NW0YVm8AGOOu3Si2HQp/cSmo6EA4m3fcwu2WKjJ4RK9wMLBtg69y1kS8baDiQBR41Ig==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"es-array-method-boxes-properly": "^1.0.0",
-				"is-string": "^1.0.7"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
+			"funding": [
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/naturalintelligence"
 				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/NaturalIntelligence"
 				}
+			],
+			"optional": true,
+			"dependencies": {
+				"strnum": "^1.0.5"
+			},
+			"bin": {
+				"fxparser": "src/cli/cli.js"
 			}
 		},
-		"array.prototype.flat": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-			"integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+		"node_modules/fastest-levenshtein": {
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
+			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.9.1"
+			}
+		},
+		"node_modules/fastq": {
+			"version": "1.13.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
-				"es-shim-unscopables": "^1.0.0"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+				"reusify": "^1.0.4"
 			}
 		},
-		"array.prototype.flatmap": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-			"integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
+		"node_modules/faye-websocket": {
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+			"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
-				"es-shim-unscopables": "^1.0.0"
+			"dependencies": {
+				"websocket-driver": ">=0.5.1"
 			},
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
+		"node_modules/fb-watchman": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+			"dev": true,
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
+				"bser": "2.1.1"
+			}
+		},
+		"node_modules/fd-slicer": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"dev": true,
+			"dependencies": {
+				"pend": "~1.2.0"
+			}
+		},
+		"node_modules/fetch-blob": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz",
+			"integrity": "sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
 				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/jimmywarting"
 				}
+			],
+			"dependencies": {
+				"node-domexception": "^1.0.0",
+				"web-streams-polyfill": "^3.0.3"
+			},
+			"engines": {
+				"node": "^12.20 || >= 14.13"
 			}
 		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true
-		},
-		"asn1": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+		"node_modules/figures": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
 			"dev": true,
-			"requires": {
-				"safer-buffer": "~2.1.0"
+			"optional": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5",
+				"object-assign": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"assert-plus": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
+		"node_modules/file-entry-cache": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+			"dev": true,
+			"dependencies": {
+				"flat-cache": "^3.0.4"
+			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
 		},
-		"assign-symbols": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-			"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+		"node_modules/file-sync-cmp": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
+			"integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
 			"dev": true
 		},
-		"ast-types-flow": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-			"integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
-			"dev": true
+		"node_modules/file-type": {
+			"version": "10.11.0",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
+			"integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"astral-regex": {
+		"node_modules/filename-reserved-regex": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-			"dev": true
-		},
-		"async": {
-			"version": "2.6.4",
-			"resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-			"integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+			"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
+			"integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
 			"dev": true,
-			"requires": {
-				"lodash": "^4.17.14"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
+		"node_modules/filenamify": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
+			"integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"filename-reserved-regex": "^2.0.0",
+				"strip-outer": "^1.0.0",
+				"trim-repeated": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"atob": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-			"integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-			"dev": true
+		"node_modules/fill-range": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+			"dev": true,
+			"dependencies": {
+				"extend-shallow": "^2.0.1",
+				"is-number": "^3.0.0",
+				"repeat-string": "^1.6.1",
+				"to-regex-range": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"autoprefixer": {
-			"version": "9.8.8",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
-			"integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
+		"node_modules/fill-range/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.12.0",
-				"caniuse-lite": "^1.0.30001109",
-				"normalize-range": "^0.1.2",
-				"num2fraction": "^1.2.2",
-				"picocolors": "^0.2.1",
-				"postcss": "^7.0.32",
-				"postcss-value-parser": "^4.1.0"
+			"dependencies": {
+				"is-extendable": "^0.1.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/finalhandler": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"dev": true,
 			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
-				},
-				"postcss-value-parser": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-					"integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-					"dev": true
-				}
+				"debug": "2.6.9",
+				"encodeurl": "~1.0.2",
+				"escape-html": "~1.0.3",
+				"on-finished": "2.4.1",
+				"parseurl": "~1.3.3",
+				"statuses": "2.0.1",
+				"unpipe": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"autosize": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.4.tgz",
-			"integrity": "sha512-5yxLQ22O0fCRGoxGfeLSNt3J8LB1v+umtpMnPW6XjkTWXKoN0AmXAIhelJcDtFT/Y/wYWmfE+oqU10Q0b8FhaQ=="
+		"node_modules/finalhandler/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
 		},
-		"aws-sign2": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+		"node_modules/finalhandler/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 			"dev": true
 		},
-		"aws4": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"dev": true
+		"node_modules/find-cache-dir": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+			"dev": true,
+			"dependencies": {
+				"commondir": "^1.0.1",
+				"make-dir": "^3.0.2",
+				"pkg-dir": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+			}
 		},
-		"axe-core": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.0.tgz",
-			"integrity": "sha512-4+rr8eQ7+XXS5nZrKcMO/AikHL0hVqy+lHWAnE3xdHl+aguag8SOQ6eEqLexwLNWgXIMfunGuD3ON1/6Kyet0A==",
-			"dev": true
+		"node_modules/find-file-up": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
+			"integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
+			"dev": true,
+			"dependencies": {
+				"fs-exists-sync": "^0.1.0",
+				"resolve-dir": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"axobject-query": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-			"integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
+		"node_modules/find-parent-dir": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
+			"integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
 			"dev": true
 		},
-		"babel-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-			"integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+		"node_modules/find-pkg": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
+			"integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
 			"dev": true,
-			"requires": {
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/babel__core": "^7.1.14",
-				"babel-plugin-istanbul": "^6.1.1",
-				"babel-preset-jest": "^27.5.1",
+			"dependencies": {
+				"find-file-up": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/find-process": {
+			"version": "1.4.7",
+			"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
+			"integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
+			"dev": true,
+			"dependencies": {
 				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"slash": "^3.0.0"
+				"commander": "^5.1.0",
+				"debug": "^4.1.1"
 			},
+			"bin": {
+				"find-process": "bin/find-process.js"
+			}
+		},
+		"node_modules/find-process/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/find-process/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"babel-loader": {
-			"version": "8.2.5",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-			"integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+		"node_modules/find-process/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
-				"make-dir": "^3.1.0",
-				"schema-utils": "^2.6.5"
-			},
 			"dependencies": {
-				"schema-utils": {
-					"version": "2.7.1",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-					"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.5",
-						"ajv": "^6.12.4",
-						"ajv-keywords": "^3.5.2"
-					}
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"babel-plugin-istanbul": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-			"integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@istanbuljs/load-nyc-config": "^1.0.0",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-instrument": "^5.0.4",
-				"test-exclude": "^6.0.0"
-			}
+		"node_modules/find-process/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
 		},
-		"babel-plugin-jest-hoist": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-			"integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+		"node_modules/find-process/node_modules/commander": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+			"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
 			"dev": true,
-			"requires": {
-				"@babel/template": "^7.3.3",
-				"@babel/types": "^7.3.3",
-				"@types/babel__core": "^7.0.0",
-				"@types/babel__traverse": "^7.0.6"
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"babel-plugin-macros": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-			"integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"cosmiconfig": "^7.0.0",
-				"resolve": "^1.19.0"
+		"node_modules/find-process/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"babel-plugin-polyfill-corejs2": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-			"integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+		"node_modules/find-process/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.17.7",
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"semver": "^6.1.1"
+			"dependencies": {
+				"has-flag": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/find-root": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+		},
+		"node_modules/find-up": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
 			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+				"locate-path": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"babel-plugin-polyfill-corejs3": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-			"integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+		"node_modules/find-versions": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
+			"integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3",
-				"core-js-compat": "^3.25.1"
+			"optional": true,
+			"dependencies": {
+				"semver-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"babel-plugin-polyfill-regenerator": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-			"integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+		"node_modules/findup-sync": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz",
+			"integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==",
 			"dev": true,
-			"requires": {
-				"@babel/helper-define-polyfill-provider": "^0.3.3"
+			"dependencies": {
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.4",
+				"resolve-dir": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
 			}
 		},
-		"babel-preset-current-node-syntax": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-			"integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+		"node_modules/findup-sync/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 			"dev": true,
-			"requires": {
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-bigint": "^7.8.3",
-				"@babel/plugin-syntax-class-properties": "^7.8.3",
-				"@babel/plugin-syntax-import-meta": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.8.3",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-top-level-await": "^7.8.3"
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"babel-preset-jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-			"integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+		"node_modules/findup-sync/node_modules/expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
 			"dev": true,
-			"requires": {
-				"babel-plugin-jest-hoist": "^27.5.1",
-				"babel-preset-current-node-syntax": "^1.0.0"
+			"dependencies": {
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"backbone": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz",
-			"integrity": "sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==",
-			"requires": {
-				"underscore": ">=1.8.3"
+		"node_modules/findup-sync/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"balanced-match": {
+		"node_modules/findup-sync/node_modules/global-modules": {
 			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-			"dev": true
-		},
-		"base": {
-			"version": "0.11.2",
-			"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
 			"dev": true,
-			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
-			},
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"base64-js": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-			"dev": true
-		},
-		"batch": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
-			"dev": true
-		},
-		"bcrypt-pbkdf": {
+		"node_modules/findup-sync/node_modules/global-prefix": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+			"integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
 			"dev": true,
-			"requires": {
-				"tweetnacl": "^0.14.3"
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"big.js": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true
+		"node_modules/findup-sync/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"bin-build": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bin-build/-/bin-build-3.0.0.tgz",
-			"integrity": "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==",
+		"node_modules/findup-sync/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress": "^4.0.0",
-				"download": "^6.2.2",
-				"execa": "^0.7.0",
-				"p-map-series": "^1.0.0",
-				"tempfile": "^2.0.0"
-			},
 			"dependencies": {
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				}
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"bin-check": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/bin-check/-/bin-check-4.1.0.tgz",
-			"integrity": "sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==",
+		"node_modules/findup-sync/node_modules/resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"execa": "^0.7.0",
-				"executable": "^4.1.0"
+			"dependencies": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/findup-sync/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
 			"dependencies": {
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				}
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"bin-version": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/bin-version/-/bin-version-3.1.0.tgz",
-			"integrity": "sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==",
+		"node_modules/findup-sync/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"execa": "^1.0.0",
-				"find-versions": "^3.0.0"
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
 			}
 		},
-		"bin-version-check": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-4.0.0.tgz",
-			"integrity": "sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==",
+		"node_modules/fined": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"bin-version": "^3.0.0",
-				"semver": "^5.6.0",
-				"semver-truncate": "^1.1.2"
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"is-plain-object": "^2.0.3",
+				"object.defaults": "^1.1.0",
+				"object.pick": "^1.2.0",
+				"parse-filepath": "^1.0.1"
 			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/fined/node_modules/expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"dev": true,
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"optional": true
-				}
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"bin-wrapper": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-4.1.0.tgz",
-			"integrity": "sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==",
+		"node_modules/fined/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"bin-check": "^4.1.0",
-				"bin-version-check": "^4.0.0",
-				"download": "^7.1.0",
-				"import-lazy": "^3.1.0",
-				"os-filter-obj": "^2.0.0",
-				"pify": "^4.0.1"
+			"dependencies": {
+				"isobject": "^3.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/fizzy-ui-utils": {
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz",
+			"integrity": "sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==",
 			"dependencies": {
-				"download": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/download/-/download-7.1.0.tgz",
-					"integrity": "sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"archive-type": "^4.0.0",
-						"caw": "^2.0.1",
-						"content-disposition": "^0.5.2",
-						"decompress": "^4.2.0",
-						"ext-name": "^5.0.0",
-						"file-type": "^8.1.0",
-						"filenamify": "^2.0.0",
-						"get-stream": "^3.0.0",
-						"got": "^8.3.1",
-						"make-dir": "^1.2.0",
-						"p-event": "^2.1.0",
-						"pify": "^3.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"file-type": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz",
-					"integrity": "sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==",
-					"dev": true,
-					"optional": true
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				},
-				"got": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/got/-/got-8.3.2.tgz",
-					"integrity": "sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"@sindresorhus/is": "^0.7.0",
-						"cacheable-request": "^2.1.1",
-						"decompress-response": "^3.3.0",
-						"duplexer3": "^0.1.4",
-						"get-stream": "^3.0.0",
-						"into-stream": "^3.1.0",
-						"is-retry-allowed": "^1.1.0",
-						"isurl": "^1.0.0-alpha5",
-						"lowercase-keys": "^1.0.0",
-						"mimic-response": "^1.0.0",
-						"p-cancelable": "^0.4.0",
-						"p-timeout": "^2.0.1",
-						"pify": "^3.0.0",
-						"safe-buffer": "^5.1.1",
-						"timed-out": "^4.0.1",
-						"url-parse-lax": "^3.0.0",
-						"url-to-options": "^1.0.1"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"import-lazy": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-3.1.0.tgz",
-					"integrity": "sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==",
-					"dev": true,
-					"optional": true
-				},
-				"make-dir": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-					"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"pify": "^3.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"p-cancelable": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
-					"integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
-					"dev": true,
-					"optional": true
-				},
-				"p-event": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz",
-					"integrity": "sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"p-timeout": "^2.0.1"
-					}
-				},
-				"p-timeout": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz",
-					"integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"p-finally": "^1.0.0"
-					}
-				},
-				"prepend-http": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-					"dev": true,
-					"optional": true
-				},
-				"url-parse-lax": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-					"integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"prepend-http": "^2.0.0"
-					}
-				}
+				"desandro-matches-selector": "^2.0.0"
+			}
+		},
+		"node_modules/flagged-respawn": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"binary-extensions": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-			"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-			"dev": true
-		},
-		"bl": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-			"integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+		"node_modules/flat-cache": {
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
 			"dev": true,
-			"requires": {
-				"buffer": "^5.5.0",
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.4.0"
+			"dependencies": {
+				"flatted": "^3.1.0",
+				"rimraf": "^3.0.2"
 			},
+			"engines": {
+				"node": "^10.12.0 || >=12.0.0"
+			}
+		},
+		"node_modules/flat-cache/node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"bluebird": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-			"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+		"node_modules/flatted": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+			"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
 			"dev": true
 		},
-		"body": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/body/-/body-5.1.0.tgz",
-			"integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=",
+		"node_modules/follow-redirects": {
+			"version": "1.15.2",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
 			"dev": true,
-			"requires": {
-				"continuable-cache": "^0.3.1",
-				"error": "^7.0.0",
-				"raw-body": "~1.1.0",
-				"safe-json-parse": "~1.0.1"
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/RubenVerborgh"
+				}
+			],
+			"engines": {
+				"node": ">=4.0"
 			},
-			"dependencies": {
-				"bytes": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz",
-					"integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=",
-					"dev": true
-				},
-				"raw-body": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz",
-					"integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=",
-					"dev": true,
-					"requires": {
-						"bytes": "1",
-						"string_decoder": "0.10"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
+			"peerDependenciesMeta": {
+				"debug": {
+					"optional": true
 				}
 			}
 		},
-		"body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+		"node_modules/for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
 			"dev": true,
-			"requires": {
-				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"destroy": "1.2.0",
-				"http-errors": "2.0.0",
-				"iconv-lite": "0.4.24",
-				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
-				"type-is": "~1.6.18",
-				"unpipe": "1.0.0"
-			},
 			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.11.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-					"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-					"dev": true,
-					"requires": {
-						"side-channel": "^1.0.4"
-					}
-				}
+				"is-callable": "^1.1.3"
 			}
 		},
-		"body-scroll-lock": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz",
-			"integrity": "sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg=="
-		},
-		"bonjour-service": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-			"integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+		"node_modules/for-in": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
 			"dev": true,
-			"requires": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
-				"fast-deep-equal": "^3.1.3",
-				"multicast-dns": "^7.2.5"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
+		"node_modules/for-own": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+			"integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
+			"dev": true,
+			"dependencies": {
+				"for-in": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"brace-expansion": {
-			"version": "1.1.11",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+		"node_modules/forever-agent": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
 			"dev": true,
-			"requires": {
-				"balanced-match": "^1.0.0",
-				"concat-map": "0.0.1"
+			"engines": {
+				"node": "*"
 			}
 		},
-		"braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+		"node_modules/form-data": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
 			"dev": true,
-			"requires": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.6",
+				"mime-types": "^2.1.12"
 			},
+			"engines": {
+				"node": ">= 0.12"
+			}
+		},
+		"node_modules/formdata-polyfill": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"fetch-blob": "^3.1.2"
+			},
+			"engines": {
+				"node": ">=12.20.0"
 			}
 		},
-		"browser-process-hrtime": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
+		"node_modules/forwarded": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"browserslist": {
-			"version": "4.16.6",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-			"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+		"node_modules/fraction.js": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
 			"dev": true,
-			"requires": {
-				"caniuse-lite": "^1.0.30001219",
-				"colorette": "^1.2.2",
-				"electron-to-chromium": "^1.3.723",
-				"escalade": "^3.1.1",
-				"node-releases": "^1.1.71"
+			"engines": {
+				"node": "*"
 			},
-			"dependencies": {
-				"colorette": {
-					"version": "1.2.2",
-					"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-					"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-					"dev": true
-				}
+			"funding": {
+				"type": "patreon",
+				"url": "https://www.patreon.com/infusion"
 			}
 		},
-		"bser": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+		"node_modules/fragment-cache": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
 			"dev": true,
-			"requires": {
-				"node-int64": "^0.4.0"
+			"dependencies": {
+				"map-cache": "^0.2.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"buffer": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-			"dev": true,
-			"requires": {
-				"base64-js": "^1.3.1",
-				"ieee754": "^1.1.13"
+		"node_modules/framer-motion": {
+			"version": "10.11.6",
+			"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-10.11.6.tgz",
+			"integrity": "sha512-QXfnUzPQqbJEnWpmtPaRB4OCuyH44uCys5Agg44LEQvItKTg0bou57WuhsNVuEyVCnMoAhrtRYiKeG/vAz6bFw==",
+			"dependencies": {
+				"tslib": "^2.4.0"
+			},
+			"optionalDependencies": {
+				"@emotion/is-prop-valid": "^0.8.2"
+			},
+			"peerDependencies": {
+				"react": "^18.0.0",
+				"react-dom": "^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"react": {
+					"optional": true
+				},
+				"react-dom": {
+					"optional": true
+				}
 			}
 		},
-		"buffer-alloc": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+		"node_modules/fresh": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"buffer-alloc-unsafe": "^1.1.0",
-				"buffer-fill": "^1.0.0"
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"buffer-alloc-unsafe": {
+		"node_modules/from2": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+			"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"readable-stream": "^2.0.0"
+			}
+		},
+		"node_modules/from2-string": {
 			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-			"dev": true,
-			"optional": true
+			"resolved": "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz",
+			"integrity": "sha512-m8vCh+KnXXXBtfF2VUbiYlQ+nczLcntB0BrtNgpmLkHylhObe9WF1b2LZjBBzrZzA6P4mkEla6ZYQoOUTG8cYA==",
+			"dependencies": {
+				"from2": "^2.0.3"
+			}
 		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
 			"dev": true
 		},
-		"buffer-fill": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+		"node_modules/fs-exists-sync": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+			"integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"buffer-from": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-			"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+		"node_modules/fs-monkey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+			"integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
 			"dev": true
 		},
-		"bytes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+		"node_modules/fs.realpath": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 			"dev": true
 		},
-		"cache-base": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+		"node_modules/fsevents": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
 			"dev": true,
-			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
+			"hasInstallScript": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+			}
+		},
+		"node_modules/function-bind": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		},
+		"node_modules/function.prototype.name": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3",
+				"es-abstract": "^1.19.0",
+				"functions-have-names": "^1.2.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"cacheable-request": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
-			"integrity": "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=",
+		"node_modules/gaze": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"clone-response": "1.0.2",
-				"get-stream": "3.0.0",
-				"http-cache-semantics": "3.8.1",
-				"keyv": "3.0.0",
-				"lowercase-keys": "1.0.0",
-				"normalize-url": "2.0.1",
-				"responselike": "1.0.2"
-			},
 			"dependencies": {
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				},
-				"lowercase-keys": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-					"integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-					"dev": true,
-					"optional": true
-				},
-				"normalize-url": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
-					"integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"prepend-http": "^2.0.0",
-						"query-string": "^5.0.1",
-						"sort-keys": "^2.0.0"
-					}
-				},
-				"prepend-http": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
-					"dev": true,
-					"optional": true
-				},
-				"query-string": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
-					"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"decode-uri-component": "^0.2.0",
-						"object-assign": "^4.1.0",
-						"strict-uri-encode": "^1.0.0"
-					}
-				},
-				"sort-keys": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
-					"integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-plain-obj": "^1.0.0"
-					}
-				}
+				"globule": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
 			}
 		},
-		"call-bind": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz",
-			"integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==",
+		"node_modules/gensync": {
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+			"dev": true,
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/get-caller-file": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+			"engines": {
+				"node": "6.* || 8.* || >= 10.*"
+			}
+		},
+		"node_modules/get-intrinsic": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+			"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.0"
+				"has": "^1.0.3",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"call-me-maybe": {
+		"node_modules/get-nonce": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-			"integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+			"integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"caller-callsite": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-			"integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+		"node_modules/get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
 			"dev": true,
-			"requires": {
-				"callsites": "^2.0.0"
-			},
-			"dependencies": {
-				"callsites": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-					"integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"caller-path": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-			"integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+		"node_modules/get-proxy": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
+			"integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
 			"dev": true,
-			"requires": {
-				"caller-callsite": "^2.0.0"
+			"optional": true,
+			"dependencies": {
+				"npm-conf": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"callsites": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-			"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
+		"node_modules/get-size": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.3.tgz",
+			"integrity": "sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q=="
 		},
-		"camel-case": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-			"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-			"requires": {
-				"pascal-case": "^3.1.2",
-				"tslib": "^2.0.3"
+		"node_modules/get-stdin": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
+			"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"camelcase": {
-			"version": "5.3.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-		},
-		"camelcase-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+		"node_modules/get-stream": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 			"dev": true,
 			"optional": true,
-			"requires": {
-				"camelcase": "^2.0.0",
-				"map-obj": "^1.0.0"
-			},
 			"dependencies": {
-				"camelcase": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-					"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-					"dev": true,
-					"optional": true
-				}
+				"pump": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"caniuse-api": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+		"node_modules/get-symbol-description": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"caniuse-lite": {
-			"version": "1.0.30001407",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001407.tgz",
-			"integrity": "sha512-4ydV+t4P7X3zH83fQWNDX/mQEzYomossfpViCOx9zHBSMV+rIe3LFqglHHtVyvNl1FhTNxPxs3jei82iqOW04w==",
-			"dev": true
-		},
-		"capital-case": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz",
-			"integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3",
-				"upper-case-first": "^2.0.2"
+		"node_modules/get-value": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"caseless": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+		"node_modules/getobject": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
+			"integrity": "sha512-tbUz6AKKKr2YiMB+fLWIgq5ZeBOobop9YMMAU9dC54/ot2ksMXt3DOFyBuhZw6ptcVszEykgByK20j7W9jHFag==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"catharsis": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
-			"integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+		"node_modules/getpass": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
 			"dev": true,
-			"requires": {
-				"lodash": "^4.17.15"
+			"dependencies": {
+				"assert-plus": "^1.0.0"
 			}
 		},
-		"caw": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/caw/-/caw-2.0.1.tgz",
-			"integrity": "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==",
+		"node_modules/gettext-parser": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
+			"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
+			"dependencies": {
+				"encoding": "^0.1.12",
+				"safe-buffer": "^5.1.1"
+			}
+		},
+		"node_modules/gifsicle": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz",
+			"integrity": "sha512-A/kiCLfDdV+ERV/UB+2O41mifd+RxH8jlRG8DMxZO84Bma/Fw0htqZ+hY2iaalLRNyUu7tYZQslqUBJxBggxbg==",
 			"dev": true,
+			"hasInstallScript": true,
 			"optional": true,
-			"requires": {
-				"get-proxy": "^2.0.0",
-				"isurl": "^1.0.0-alpha5",
-				"tunnel-agent": "^0.6.0",
-				"url-to-options": "^1.0.1"
+			"dependencies": {
+				"bin-build": "^3.0.0",
+				"bin-wrapper": "^4.0.0",
+				"execa": "^1.0.0",
+				"logalot": "^2.0.0"
+			},
+			"bin": {
+				"gifsicle": "cli.js"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"chalk": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz",
-			"integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==",
-			"dev": true
-		},
-		"change-case": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz",
-			"integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==",
-			"requires": {
-				"camel-case": "^4.1.2",
-				"capital-case": "^1.0.4",
-				"constant-case": "^3.0.4",
-				"dot-case": "^3.0.4",
-				"header-case": "^2.0.4",
-				"no-case": "^3.0.4",
-				"param-case": "^3.0.4",
-				"pascal-case": "^3.1.2",
-				"path-case": "^3.0.4",
-				"sentence-case": "^3.0.4",
-				"snake-case": "^3.0.4",
-				"tslib": "^2.0.3"
+		"node_modules/glob": {
+			"version": "7.1.6",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+			"dev": true,
+			"dependencies": {
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.0.4",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
-		"char-regex": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-			"dev": true
+		"node_modules/glob-parent": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+			"dev": true,
+			"dependencies": {
+				"is-glob": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"chardet": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-			"integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+		"node_modules/glob-to-regexp": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
+			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
 			"dev": true
 		},
-		"check-node-version": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.2.1.tgz",
-			"integrity": "sha512-YYmFYHV/X7kSJhuN/QYHUu998n/TRuDe8UenM3+m5NrkiH670lb9ILqHIvBencvJc4SDh+XcbXMR4b+TtubJiw==",
+		"node_modules/global-modules": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+			"integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
 			"dev": true,
-			"requires": {
-				"chalk": "^3.0.0",
-				"map-values": "^1.0.1",
-				"minimist": "^1.2.0",
-				"object-filter": "^1.0.2",
-				"run-parallel": "^1.1.4",
-				"semver": "^6.3.0"
+			"dependencies": {
+				"global-prefix": "^0.1.4",
+				"is-windows": "^0.2.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/global-modules/node_modules/is-windows": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+			"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/global-prefix": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+			"integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"homedir-polyfill": "^1.0.0",
+				"ini": "^1.3.4",
+				"is-windows": "^0.2.0",
+				"which": "^1.2.12"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"cheerio": {
-			"version": "1.0.0-rc.12",
-			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-			"integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
+		"node_modules/global-prefix/node_modules/is-windows": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+			"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
 			"dev": true,
-			"requires": {
-				"cheerio-select": "^2.1.0",
-				"dom-serializer": "^2.0.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1",
-				"htmlparser2": "^8.0.1",
-				"parse5": "^7.0.0",
-				"parse5-htmlparser2-tree-adapter": "^7.0.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				},
-				"entities": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-					"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/global-prefix/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
 			}
 		},
-		"cheerio-select": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-			"integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+		"node_modules/globals": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-select": "^5.1.0",
-				"css-what": "^6.1.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1"
-			},
-			"dependencies": {
-				"css-select": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-					"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.1.0",
-						"domhandler": "^5.0.2",
-						"domutils": "^3.0.1",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"css-what": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-					"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-					"dev": true
-				},
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				},
-				"entities": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-					"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-					"dev": true
-				},
-				"nth-check": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-					"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+		"node_modules/globalthis": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+			"integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
 			"dev": true,
-			"requires": {
-				"anymatch": "~3.1.2",
-				"braces": "~3.0.2",
-				"fsevents": "~2.3.2",
-				"glob-parent": "~5.1.2",
-				"is-binary-path": "~2.1.0",
-				"is-glob": "~4.0.1",
-				"normalize-path": "~3.0.0",
-				"readdirp": "~3.6.0"
-			},
 			"dependencies": {
-				"anymatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-					"integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-					"dev": true,
-					"requires": {
-						"normalize-path": "^3.0.0",
-						"picomatch": "^2.0.4"
-					}
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"define-properties": "^1.1.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"chownr": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+		"node_modules/globalyzer": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
+			"integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
 			"dev": true
 		},
-		"chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-			"dev": true
+		"node_modules/globby": {
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+			"dev": true,
+			"dependencies": {
+				"array-union": "^2.1.0",
+				"dir-glob": "^3.0.1",
+				"fast-glob": "^3.2.9",
+				"ignore": "^5.2.0",
+				"merge2": "^1.4.1",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"ci-info": {
-			"version": "3.5.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz",
-			"integrity": "sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==",
+		"node_modules/globby/node_modules/array-union": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/globjoin": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
 			"dev": true
 		},
-		"cjs-module-lexer": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-			"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==",
+		"node_modules/globrex": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
+			"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
 			"dev": true
 		},
-		"class-utils": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+		"node_modules/globule": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
+			"integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
 			"dev": true,
-			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
-			},
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
+				"glob": "~7.1.1",
+				"lodash": "~4.17.10",
+				"minimatch": "~3.0.2"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"classnames": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-			"integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
-		},
-		"clean-css": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.1.tgz",
-			"integrity": "sha512-GQ6HdEyJN0543mRTA/TkZ7RPoMXGWKq1shs9H86F2kLuixR0RI+xd4JfhJxWUW08FGKQXTKAKpVjKQXu5zkFNA==",
+		"node_modules/globule/node_modules/minimatch": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
 			"dev": true,
-			"requires": {
-				"source-map": "~0.6.0"
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
 			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/glur": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/glur/-/glur-1.1.2.tgz",
+			"integrity": "sha1-8g6jbbEDv8KSNDkh8fkeg8NGdok=",
+			"dev": true
+		},
+		"node_modules/good-listener": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+			"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+				"delegate": "^3.1.2"
 			}
 		},
-		"clean-webpack-plugin": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz",
-			"integrity": "sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A==",
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
 			"dev": true,
-			"requires": {
-				"@types/webpack": "^4.4.31",
-				"del": "^4.1.1"
+			"dependencies": {
+				"get-intrinsic": "^1.1.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"cli": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
-			"integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=",
+		"node_modules/got": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
+			"integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
 			"dev": true,
-			"requires": {
-				"exit": "0.1.2",
-				"glob": "^7.1.1"
+			"optional": true,
+			"dependencies": {
+				"decompress-response": "^3.2.0",
+				"duplexer3": "^0.1.4",
+				"get-stream": "^3.0.0",
+				"is-plain-obj": "^1.1.0",
+				"is-retry-allowed": "^1.0.0",
+				"is-stream": "^1.0.0",
+				"isurl": "^1.0.0-alpha5",
+				"lowercase-keys": "^1.0.0",
+				"p-cancelable": "^0.3.0",
+				"p-timeout": "^1.1.1",
+				"safe-buffer": "^5.0.1",
+				"timed-out": "^4.0.0",
+				"url-parse-lax": "^1.0.0",
+				"url-to-options": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"cli-cursor": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+		"node_modules/got/node_modules/get-stream": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
 			"dev": true,
-			"requires": {
-				"restore-cursor": "^2.0.0"
+			"optional": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"cli-width": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-			"dev": true
+		"node_modules/graceful-fs": {
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+			"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
 		},
-		"clipboard": {
-			"version": "2.0.11",
-			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-			"requires": {
-				"good-listener": "^1.2.2",
-				"select": "^1.1.2",
-				"tiny-emitter": "^2.0.0"
+		"node_modules/gradient-parser": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-0.1.5.tgz",
+			"integrity": "sha512-+uPlcVbjrKOnTzvz0MjTj7BfACj8OmxIa1moIjJV7btvhUMSJk0D47RfDCgDrZE3dYMz9Cf5xKJwnrKLjUq0KQ==",
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"cliui": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-			"requires": {
-				"string-width": "^3.1.0",
-				"strip-ansi": "^5.2.0",
-				"wrap-ansi": "^5.1.0"
+		"node_modules/graphemer": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+			"integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+			"dev": true
+		},
+		"node_modules/grunt": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.6.1.tgz",
+			"integrity": "sha512-/ABUy3gYWu5iBmrUSRBP97JLpQUm0GgVveDCp6t3yRNIoltIYw7rEj3g5y1o2PGPR2vfTRGa7WC/LZHLTXnEzA==",
+			"dev": true,
+			"dependencies": {
+				"dateformat": "~4.6.2",
+				"eventemitter2": "~0.4.13",
+				"exit": "~0.1.2",
+				"findup-sync": "~5.0.0",
+				"glob": "~7.1.6",
+				"grunt-cli": "~1.4.3",
+				"grunt-known-options": "~2.0.0",
+				"grunt-legacy-log": "~3.0.0",
+				"grunt-legacy-util": "~2.0.1",
+				"iconv-lite": "~0.6.3",
+				"js-yaml": "~3.14.0",
+				"minimatch": "~3.0.4",
+				"nopt": "~3.0.6"
+			},
+			"bin": {
+				"grunt": "bin/grunt"
+			},
+			"engines": {
+				"node": ">=16"
 			}
 		},
-		"clone-deep": {
-			"version": "0.2.4",
-			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
-			"integrity": "sha512-we+NuQo2DHhSl+DP6jlUiAhyAjBQrYnpOk15rN6c6JSPScjiCLh8IbSU+VTcph6YS3o7mASE8a0+gbZ7ChLpgg==",
+		"node_modules/grunt-banner": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/grunt-banner/-/grunt-banner-0.6.0.tgz",
+			"integrity": "sha1-P4eQIdEj+linuloLb7a+QStYhaw=",
 			"dev": true,
-			"requires": {
-				"for-own": "^0.1.3",
-				"is-plain-object": "^2.0.1",
-				"kind-of": "^3.0.2",
-				"lazy-cache": "^1.0.3",
-				"shallow-clone": "^0.1.2"
+			"dependencies": {
+				"chalk": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			},
+			"peerDependencies": {
+				"grunt": ">=0.4.0"
 			}
 		},
-		"clone-response": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-			"integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+		"node_modules/grunt-banner/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"mimic-response": "^1.0.0"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-			"dev": true
+		"node_modules/grunt-banner/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"coa": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-			"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+		"node_modules/grunt-banner/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 			"dev": true,
-			"requires": {
-				"@types/q": "^1.5.1",
-				"chalk": "^2.4.1",
-				"q": "^1.1.2"
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/grunt-banner/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"dev": true,
 			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				}
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"coffee-script": {
-			"version": "1.12.7",
-			"resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
-			"integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
-			"dev": true
+		"node_modules/grunt-banner/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
 		},
-		"collect-v8-coverage": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-			"integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+		"node_modules/grunt-contrib-clean": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz",
+			"integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==",
+			"dev": true,
+			"dependencies": {
+				"async": "^3.2.3",
+				"rimraf": "^2.6.2"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"peerDependencies": {
+				"grunt": ">=0.4.5"
+			}
+		},
+		"node_modules/grunt-contrib-clean/node_modules/async": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
 			"dev": true
 		},
-		"collection-visit": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+		"node_modules/grunt-contrib-concat": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz",
+			"integrity": "sha512-Vnl95JIOxfhEN7bnYIlCgQz41kkbi7tsZ/9a4usZmxNxi1S2YAIOy8ysFmO8u4MN26Apal1O106BwARdaNxXQw==",
 			"dev": true,
-			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
+			"dependencies": {
+				"chalk": "^4.1.2",
+				"source-map": "^0.5.3"
+			},
+			"engines": {
+				"node": ">=0.12.0"
+			},
+			"peerDependencies": {
+				"grunt": ">=1.4.1"
 			}
 		},
-		"color": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-			"integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
+		"node_modules/grunt-contrib-concat/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"color-convert": "^1.9.1",
-				"color-string": "^1.5.4"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"requires": {
-				"color-name": "1.1.3"
+		"node_modules/grunt-contrib-concat/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-		},
-		"color-string": {
-			"version": "1.5.5",
-			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-			"integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
+		"node_modules/grunt-contrib-concat/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"colord": {
-			"version": "2.9.3",
-			"resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-			"integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-		},
-		"colorette": {
-			"version": "2.0.19",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-			"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
-			"dev": true
-		},
-		"colors": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
-			"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+		"node_modules/grunt-contrib-concat/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"combined-stream": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+		"node_modules/grunt-contrib-concat/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"delayed-stream": "~1.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"dev": true
-		},
-		"comment-parser": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
-			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
-			"dev": true
-		},
-		"common-path-prefix": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-			"integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-			"dev": true
-		},
-		"commondir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-			"integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
-			"dev": true
-		},
-		"component-emitter": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-			"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-			"dev": true
-		},
-		"compressible": {
-			"version": "2.0.18",
-			"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+		"node_modules/grunt-contrib-concat/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+		"node_modules/grunt-contrib-copy": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
+			"integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
 			"dev": true,
-			"requires": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
-				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				}
+				"chalk": "^1.1.1",
+				"file-sync-cmp": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"compute-scroll-into-view": {
-			"version": "1.0.17",
-			"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
-			"integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg=="
+		"node_modules/grunt-contrib-copy/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"computed-style": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/computed-style/-/computed-style-0.1.4.tgz",
-			"integrity": "sha512-WpAmaKbMNmS3OProfHIdJiNleNJdgUrJfbKArXua28QF7+0CoZjlLn0lp6vlc+dl5r2/X9GQiQRQQU4BzSa69w=="
+		"node_modules/grunt-contrib-copy/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-			"dev": true
+		"node_modules/grunt-contrib-copy/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"config-chain": {
-			"version": "1.1.12",
-			"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
-			"integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+		"node_modules/grunt-contrib-copy/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"ini": "^1.3.4",
-				"proto-list": "~1.2.1"
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"connect-history-api-fallback": {
+		"node_modules/grunt-contrib-copy/node_modules/supports-color": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-			"integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-			"dev": true
-		},
-		"console-stream": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz",
-			"integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
 			"dev": true,
-			"optional": true
-		},
-		"constant-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz",
-			"integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3",
-				"upper-case": "^2.0.2"
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"content-disposition": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-			"integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+		"node_modules/grunt-contrib-cssmin": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-5.0.0.tgz",
+			"integrity": "sha512-SNp4H4+85mm2xaHYi83FBHuOXylpi5vcwgtNoYCZBbkgeXQXoeTAKa59VODRb0woTDBvxouP91Ff5PzCkikg6g==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"safe-buffer": "5.1.2"
-			},
 			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true,
-					"optional": true
-				}
+				"chalk": "^4.1.2",
+				"clean-css": "^5.3.2",
+				"maxmin": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=14.0"
 			}
 		},
-		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-			"dev": true
-		},
-		"continuable-cache": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/continuable-cache/-/continuable-cache-0.3.1.tgz",
-			"integrity": "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=",
-			"dev": true
-		},
-		"convert-source-map": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-		},
-		"cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-			"dev": true
-		},
-		"cookie-signature": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-			"dev": true
-		},
-		"copy-descriptor": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-			"dev": true
-		},
-		"copy-webpack-plugin": {
-			"version": "11.0.0",
-			"resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-			"integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+		"node_modules/grunt-contrib-cssmin/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"fast-glob": "^3.2.11",
-				"glob-parent": "^6.0.1",
-				"globby": "^13.1.1",
-				"normalize-path": "^3.0.0",
-				"schema-utils": "^4.0.0",
-				"serialize-javascript": "^6.0.0"
-			},
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					}
-				},
-				"globby": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
-					"integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
-					"dev": true,
-					"requires": {
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.2.11",
-						"ignore": "^5.2.0",
-						"merge2": "^1.4.1",
-						"slash": "^4.0.0"
-					}
-				},
-				"is-glob": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-					"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
-				},
-				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"core-js": {
-			"version": "3.26.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
-			"integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
-			"dev": true
-		},
-		"core-js-compat": {
-			"version": "3.26.0",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-			"integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+		"node_modules/grunt-contrib-cssmin/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.21.4"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/grunt-contrib-cssmin/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
 			"dependencies": {
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
-				"electron-to-chromium": {
-					"version": "1.4.284",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-					"integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
-					"dev": true
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"core-js-pure": {
-			"version": "3.21.1",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz",
-			"integrity": "sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==",
+		"node_modules/grunt-contrib-cssmin/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"core-js-url-browser": {
-			"version": "3.6.4",
-			"resolved": "https://registry.npmjs.org/core-js-url-browser/-/core-js-url-browser-3.6.4.tgz",
-			"integrity": "sha512-VCMkPikOVp5JXftTj0E3gPZNKa0exQX837KxyPcnMAKvImWG8+RbXwEHEGMjiNz+9Vl2YgutkVYOpq7iaSOt/Q=="
-		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+		"node_modules/grunt-contrib-cssmin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-			"requires": {
-				"@types/parse-json": "^4.0.0",
-				"import-fresh": "^3.2.1",
-				"parse-json": "^5.0.0",
-				"path-type": "^4.0.0",
-				"yaml": "^1.10.0"
+		"node_modules/grunt-contrib-cssmin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"cross-fetch": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
-			"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
+		"node_modules/grunt-contrib-imagemin": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-imagemin/-/grunt-contrib-imagemin-4.0.0.tgz",
+			"integrity": "sha512-2GYQBQFfJLjeTThJ8E7+vLgvgfOh78u0bgieIK85c2Rv9V6ssd2AvBvuF7T26mK261EN/SlNefpW5+zGWzfrVw==",
 			"dev": true,
-			"requires": {
-				"node-fetch": "2.6.7"
+			"dependencies": {
+				"chalk": "^2.4.1",
+				"imagemin": "^6.0.0",
+				"p-map": "^1.2.0",
+				"plur": "^3.0.1",
+				"pretty-bytes": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"optionalDependencies": {
+				"imagemin-gifsicle": "^6.0.1",
+				"imagemin-jpegtran": "^6.0.0",
+				"imagemin-optipng": "^6.0.0",
+				"imagemin-svgo": "^7.0.0"
 			}
 		},
-		"cross-spawn": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+		"node_modules/grunt-contrib-imagemin/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"dev": true,
-			"requires": {
-				"lru-cache": "^4.0.1",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
-			},
 			"dependencies": {
-				"lru-cache": {
-					"version": "4.1.5",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-					"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-					"dev": true,
-					"requires": {
-						"pseudomap": "^1.0.2",
-						"yallist": "^2.1.2"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"yallist": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-					"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-					"dev": true
-				}
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"cson-parser": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz",
-			"integrity": "sha1-fsZ14DkUVTO/KmqFYHPxWZ2cLSQ=",
+		"node_modules/grunt-contrib-imagemin/node_modules/irregular-plurals": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
+			"integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
 			"dev": true,
-			"requires": {
-				"coffee-script": "^1.10.0"
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"css-color-names": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-			"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-			"dev": true
-		},
-		"css-declaration-sorter": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-			"integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+		"node_modules/grunt-contrib-imagemin/node_modules/p-map": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.1",
-				"timsort": "^0.3.0"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"css-functions-list": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.1.0.tgz",
-			"integrity": "sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==",
-			"dev": true
-		},
-		"css-loader": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-			"integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
+		"node_modules/grunt-contrib-imagemin/node_modules/plur": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
+			"integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
 			"dev": true,
-			"requires": {
-				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.7",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.0",
-				"postcss-modules-scope": "^3.0.0",
-				"postcss-modules-values": "^4.0.0",
-				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.5"
-			},
 			"dependencies": {
-				"postcss": {
-					"version": "8.4.18",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-					"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-					"dev": true,
-					"requires": {
-						"nanoid": "^3.3.4",
-						"picocolors": "^1.0.0",
-						"source-map-js": "^1.0.2"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+				"irregular-plurals": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"css-select": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-			"integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+		"node_modules/grunt-contrib-jshint": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz",
+			"integrity": "sha512-pcXWCSZWfoMSvcV4BwH21TUtLtcX0Ms8IGuOPIcLeXK3fud9KclY7iqMKY94jFx8TxZzh028YYtpR+io8DiEaQ==",
 			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^3.2.1",
-				"domutils": "^1.7.0",
-				"nth-check": "^1.0.2"
+			"dependencies": {
+				"chalk": "~4.1.2",
+				"hooker": "^0.2.3",
+				"jshint": "~2.13.4"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"css-select-base-adapter": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-			"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-			"dev": true
-		},
-		"css-tree": {
-			"version": "1.0.0-alpha.37",
-			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-			"integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+		"node_modules/grunt-contrib-jshint/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"mdn-data": "2.0.4",
-				"source-map": "^0.6.1"
-			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"css-what": {
-			"version": "3.4.2",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-			"integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-			"dev": true
-		},
-		"cssesc": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-			"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-			"dev": true
+		"node_modules/grunt-contrib-jshint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
 		},
-		"cssnano": {
-			"version": "4.1.11",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
-			"integrity": "sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g==",
-			"dev": true,
-			"requires": {
-				"cosmiconfig": "^5.0.0",
-				"cssnano-preset-default": "^4.0.8",
-				"is-resolvable": "^1.0.0",
-				"postcss": "^7.0.0"
-			},
-			"dependencies": {
-				"cosmiconfig": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-					"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-					"dev": true,
-					"requires": {
-						"import-fresh": "^2.0.0",
-						"is-directory": "^0.3.1",
-						"js-yaml": "^3.13.1",
-						"parse-json": "^4.0.0"
-					}
-				},
-				"import-fresh": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-					"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-					"dev": true,
-					"requires": {
-						"caller-path": "^2.0.0",
-						"resolve-from": "^3.0.0"
-					}
-				},
-				"parse-json": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-					"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-					"dev": true,
-					"requires": {
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1"
-					}
-				},
-				"resolve-from": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-					"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-					"dev": true
-				}
+		"node_modules/grunt-contrib-jshint/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"cssnano-preset-default": {
-			"version": "4.0.8",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz",
-			"integrity": "sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ==",
-			"dev": true,
-			"requires": {
-				"css-declaration-sorter": "^4.0.1",
-				"cssnano-util-raw-cache": "^4.0.1",
-				"postcss": "^7.0.0",
-				"postcss-calc": "^7.0.1",
-				"postcss-colormin": "^4.0.3",
-				"postcss-convert-values": "^4.0.1",
-				"postcss-discard-comments": "^4.0.2",
-				"postcss-discard-duplicates": "^4.0.2",
-				"postcss-discard-empty": "^4.0.1",
-				"postcss-discard-overridden": "^4.0.1",
-				"postcss-merge-longhand": "^4.0.11",
-				"postcss-merge-rules": "^4.0.3",
-				"postcss-minify-font-values": "^4.0.2",
-				"postcss-minify-gradients": "^4.0.2",
-				"postcss-minify-params": "^4.0.2",
-				"postcss-minify-selectors": "^4.0.2",
-				"postcss-normalize-charset": "^4.0.1",
-				"postcss-normalize-display-values": "^4.0.2",
-				"postcss-normalize-positions": "^4.0.2",
-				"postcss-normalize-repeat-style": "^4.0.2",
-				"postcss-normalize-string": "^4.0.2",
-				"postcss-normalize-timing-functions": "^4.0.2",
-				"postcss-normalize-unicode": "^4.0.1",
-				"postcss-normalize-url": "^4.0.1",
-				"postcss-normalize-whitespace": "^4.0.2",
-				"postcss-ordered-values": "^4.1.2",
-				"postcss-reduce-initial": "^4.0.3",
-				"postcss-reduce-transforms": "^4.0.2",
-				"postcss-svgo": "^4.0.3",
-				"postcss-unique-selectors": "^4.0.1"
-			}
-		},
-		"cssnano-util-get-arguments": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-			"integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+		"node_modules/grunt-contrib-jshint/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"cssnano-util-get-match": {
+		"node_modules/grunt-contrib-jshint/node_modules/has-flag": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-			"integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-			"dev": true
-		},
-		"cssnano-util-raw-cache": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-			"integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"cssnano-util-same-parent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-			"integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-			"dev": true
-		},
-		"cssnano-utils": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-			"integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-			"dev": true
-		},
-		"csso": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+		"node_modules/grunt-contrib-jshint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"css-tree": "^1.1.2"
+			"dependencies": {
+				"has-flag": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/grunt-contrib-qunit": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-7.0.1.tgz",
+			"integrity": "sha512-+5eL4qv2H8q6he+2HGDkqbKwAulRUrtMaX5NoY2AwwvbA4d4OqsI1YGiUZ0L/O9oL7nUQ1cxGKeOp+TcE/AYUg==",
+			"dev": true,
 			"dependencies": {
-				"css-tree": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
-					"integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
-					"dev": true,
-					"requires": {
-						"mdn-data": "2.0.14",
-						"source-map": "^0.6.1"
-					}
-				},
-				"mdn-data": {
-					"version": "2.0.14",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-					"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+				"eventemitter2": "^6.4.9",
+				"p-each-series": "^2.2.0",
+				"puppeteer": "^19.7.0"
+			},
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"cssom": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+		"node_modules/grunt-contrib-qunit/node_modules/eventemitter2": {
+			"version": "6.4.9",
+			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz",
+			"integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==",
 			"dev": true
 		},
-		"cssstyle": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+		"node_modules/grunt-contrib-uglify": {
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz",
+			"integrity": "sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q==",
 			"dev": true,
-			"requires": {
-				"cssom": "~0.3.6"
-			},
 			"dependencies": {
-				"cssom": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-					"dev": true
-				}
+				"chalk": "^4.1.2",
+				"maxmin": "^3.0.0",
+				"uglify-js": "^3.16.1",
+				"uri-path": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"csstype": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-			"integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
+		"node_modules/grunt-contrib-uglify/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"currently-unhandled": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+		"node_modules/grunt-contrib-uglify/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"array-find-index": "^1.0.1"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"cwd": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
-			"integrity": "sha512-YGZxdTTL9lmLkCUTpg4j0zQ7IhRB5ZmqNBbGCl3Tg6MP/d5/6sY7L5mmTjzbc6JKgVZYiqTQTNhPFsbXNGlRaA==",
+		"node_modules/grunt-contrib-uglify/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"find-pkg": "^0.1.2",
-				"fs-exists-sync": "^0.1.0"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"damerau-levenshtein": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-			"integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
+		"node_modules/grunt-contrib-uglify/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+		"node_modules/grunt-contrib-uglify/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"data-urls": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
-			"requires": {
-				"abab": "^2.0.3",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.0.0"
-			},
-			"dependencies": {
-				"tr46": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-					"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.1.1"
-					}
-				},
-				"webidl-conversions": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-					"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-					"dev": true
-				},
-				"whatwg-url": {
-					"version": "8.7.0",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-					"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-					"dev": true,
-					"requires": {
-						"lodash": "^4.7.0",
-						"tr46": "^2.1.0",
-						"webidl-conversions": "^6.1.0"
-					}
-				}
+		"node_modules/grunt-contrib-uglify/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"date-fns": {
-			"version": "2.29.3",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz",
-			"integrity": "sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="
-		},
-		"date-now": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-			"dev": true
-		},
-		"dateformat": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-			"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-			"dev": true
-		},
-		"debug": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-			"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+		"node_modules/grunt-contrib-watch": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz",
+			"integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==",
 			"dev": true,
-			"requires": {
-				"ms": "^2.1.1"
+			"dependencies": {
+				"async": "^2.6.0",
+				"gaze": "^1.1.0",
+				"lodash": "^4.17.10",
+				"tiny-lr": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+		"node_modules/grunt-file-append": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/grunt-file-append/-/grunt-file-append-0.0.7.tgz",
+			"integrity": "sha1-P376M2lvoFdwsoCU9EUIyvxdLto=",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			},
+			"peerDependencies": {
+				"grunt": ">0.4.1"
+			}
 		},
-		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
+		"node_modules/grunt-jsdoc": {
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/grunt-jsdoc/-/grunt-jsdoc-2.4.1.tgz",
+			"integrity": "sha512-S0zxU0wDewRu7z+vijEItOWe/UttxWVmvz0qz2ZVcAYR2GpXjsiski2CAVN0b18t2qeVLdmxZkJaEWCOsKzcAw==",
 			"dev": true,
-			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
+			"dependencies": {
+				"cross-spawn": "^7.0.1",
+				"jsdoc": "^3.6.3"
+			},
+			"bin": {
+				"grunt-jsdoc": "bin/grunt-jsdoc"
+			},
+			"engines": {
+				"node": ">= 8.12.0"
 			}
 		},
-		"decimal.js": {
-			"version": "10.4.2",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-			"integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==",
-			"dev": true
+		"node_modules/grunt-jsdoc/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"decode-uri-component": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-			"dev": true
+		"node_modules/grunt-jsdoc/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"decompress": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz",
-			"integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==",
+		"node_modules/grunt-jsdoc/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress-tar": "^4.0.0",
-				"decompress-tarbz2": "^4.0.0",
-				"decompress-targz": "^4.0.0",
-				"decompress-unzip": "^4.0.1",
-				"graceful-fs": "^4.1.10",
-				"make-dir": "^1.0.0",
-				"pify": "^2.3.0",
-				"strip-dirs": "^2.0.0"
-			},
 			"dependencies": {
-				"make-dir": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-					"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"pify": "^3.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true,
-					"optional": true
-				}
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/grunt-jsdoc/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"decompress-response": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-			"integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+		"node_modules/grunt-known-options": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"mimic-response": "^1.0.0"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"decompress-tar": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-4.1.1.tgz",
-			"integrity": "sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==",
+		"node_modules/grunt-legacy-log": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
+			"integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-type": "^5.2.0",
-				"is-stream": "^1.1.0",
-				"tar-stream": "^1.5.2"
-			},
 			"dependencies": {
-				"bl": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
-					"integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"readable-stream": "^2.3.5",
-						"safe-buffer": "^5.1.1"
-					}
-				},
-				"file-type": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-					"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-					"dev": true,
-					"optional": true
-				},
-				"tar-stream": {
-					"version": "1.6.2",
-					"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-					"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"bl": "^1.0.0",
-						"buffer-alloc": "^1.2.0",
-						"end-of-stream": "^1.0.0",
-						"fs-constants": "^1.0.0",
-						"readable-stream": "^2.3.0",
-						"to-buffer": "^1.1.1",
-						"xtend": "^4.0.0"
-					}
-				}
+				"colors": "~1.1.2",
+				"grunt-legacy-log-utils": "~2.1.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.19"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
 			}
 		},
-		"decompress-tarbz2": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz",
-			"integrity": "sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==",
+		"node_modules/grunt-legacy-log-utils": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
+			"integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress-tar": "^4.1.0",
-				"file-type": "^6.1.0",
-				"is-stream": "^1.1.0",
-				"seek-bzip": "^1.0.5",
-				"unbzip2-stream": "^1.0.9"
-			},
 			"dependencies": {
-				"file-type": {
-					"version": "6.2.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-6.2.0.tgz",
-					"integrity": "sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==",
-					"dev": true,
-					"optional": true
-				}
+				"chalk": "~4.1.0",
+				"lodash": "~4.17.19"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"decompress-targz": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-4.1.1.tgz",
-			"integrity": "sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==",
+		"node_modules/grunt-legacy-log-utils/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"decompress-tar": "^4.1.1",
-				"file-type": "^5.2.0",
-				"is-stream": "^1.1.0"
-			},
 			"dependencies": {
-				"file-type": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-					"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-					"dev": true,
-					"optional": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"decompress-unzip": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-4.0.1.tgz",
-			"integrity": "sha1-3qrM39FK6vhVePczroIQ+bSEj2k=",
+		"node_modules/grunt-legacy-log-utils/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-type": "^3.8.0",
-				"get-stream": "^2.2.0",
-				"pify": "^2.3.0",
-				"yauzl": "^2.4.2"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
 			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/grunt-legacy-log-utils/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
 			"dependencies": {
-				"file-type": {
-					"version": "3.9.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz",
-					"integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=",
-					"dev": true,
-					"optional": true
-				},
-				"get-stream": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz",
-					"integrity": "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"object-assign": "^4.0.1",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true,
-					"optional": true
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"dedent": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-			"integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+		"node_modules/grunt-legacy-log-utils/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"deep-extend": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-			"dev": true
+		"node_modules/grunt-legacy-log-utils/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"deep-for-each": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/deep-for-each/-/deep-for-each-3.0.0.tgz",
-			"integrity": "sha512-pPN+0f8jlnNP+z90qqOdxGghJU5XM6oBDhvAR+qdQzjCg5pk/7VPPvKK1GqoXEFkHza6ZS+Otzzvmr0g3VUaKw==",
+		"node_modules/grunt-legacy-log-utils/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"lodash.isplainobject": "^4.0.6"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"deep-is": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-			"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-			"dev": true
+		"node_modules/grunt-legacy-util": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
+			"integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
+			"dev": true,
+			"dependencies": {
+				"async": "~3.2.0",
+				"exit": "~0.1.2",
+				"getobject": "~1.0.0",
+				"hooker": "~0.2.3",
+				"lodash": "~4.17.21",
+				"underscore.string": "~3.3.5",
+				"which": "~2.0.2"
+			},
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+		"node_modules/grunt-legacy-util/node_modules/async": {
+			"version": "3.2.3",
+			"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+			"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
 			"dev": true
 		},
-		"default-gateway": {
-			"version": "6.0.3",
-			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-			"integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+		"node_modules/grunt-patch-wordpress": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/grunt-patch-wordpress/-/grunt-patch-wordpress-3.0.1.tgz",
+			"integrity": "sha512-jdeqk/r0hSPez2Afgj+Zz8R6tFYDyhNKTNZvJIE5lAqmkms2ox4a+UfbZWhf9ObFb+Q4JYKIXqJruGzujzmYgA==",
 			"dev": true,
-			"requires": {
-				"execa": "^5.0.0"
+			"dependencies": {
+				"grunt": "^1.0.3",
+				"inquirer": "^5.1.0",
+				"request": "^2.83.0",
+				"xmlrpc": "^1.3.1"
 			},
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/grunt-replace-lts": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-replace-lts/-/grunt-replace-lts-1.1.0.tgz",
+			"integrity": "sha512-YCLFHDM7/mEb+7tzdstb756ZYEUTSiyiEj5XhfLIxmVrDKShXQ8STD9f0s7HZXwwHwxFgPr4zELSP7J3kYra7w==",
+			"dev": true,
 			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				}
+				"chalk": "^1.1.0",
+				"file-sync-cmp": "^0.1.0",
+				"lodash": "^4.17.15",
+				"next-applause": "^2.2.4"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"define-lazy-prop": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-			"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-			"dev": true
+		"node_modules/grunt-replace-lts/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"define-properties": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+		"node_modules/grunt-replace-lts/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
 			"dev": true,
-			"requires": {
-				"object-keys": "^1.0.12"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"define-property": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+		"node_modules/grunt-replace-lts/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 			"dev": true,
-			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
-			},
 			"dependencies": {
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"del": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+		"node_modules/grunt-replace-lts/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"dev": true,
-			"requires": {
-				"@types/glob": "^7.1.1",
-				"globby": "^6.1.0",
-				"is-path-cwd": "^2.0.0",
-				"is-path-in-cwd": "^2.0.0",
-				"p-map": "^2.0.0",
-				"pify": "^4.0.1",
-				"rimraf": "^2.6.3"
-			},
 			"dependencies": {
-				"globby": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-					"integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"glob": "^7.0.3",
-						"object-assign": "^4.0.1",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "2.3.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-							"integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-							"dev": true
-						}
-					}
-				}
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
-		"delegate": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
-		},
-		"depd": {
+		"node_modules/grunt-replace-lts/node_modules/supports-color": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-			"dev": true
-		},
-		"desandro-matches-selector": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz",
-			"integrity": "sha1-cXvu1NwT59jzdi9wem1YpndCGOE="
-		},
-		"destroy": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-			"integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-			"dev": true
-		},
-		"detect-file": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-			"dev": true
-		},
-		"detect-newline": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-			"integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-			"dev": true
-		},
-		"detect-node": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-			"integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-			"dev": true
-		},
-		"devtools-protocol": {
-			"version": "0.0.981744",
-			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.981744.tgz",
-			"integrity": "sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg==",
-			"dev": true
-		},
-		"diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
-		},
-		"diff-sequences": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-			"integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-			"dev": true
-		},
-		"dir-glob": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
 			"dev": true,
-			"requires": {
-				"path-type": "^4.0.0"
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"discontinuous-range": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-			"integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
-			"dev": true
-		},
-		"dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-			"dev": true
-		},
-		"dns-packet": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-			"integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+		"node_modules/grunt-rtlcss": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/grunt-rtlcss/-/grunt-rtlcss-2.0.2.tgz",
+			"integrity": "sha512-WbI2thnwlF04N+xvJu+NxqEaCyPuLyar196SYhEQFZ2EJHkOS8YYE+Zkh+X9cWhwAtKp7ZEpR/IKXcyQggOIsQ==",
 			"dev": true,
-			"requires": {
-				"@leichtgewicht/ip-codec": "^2.0.1"
+			"dependencies": {
+				"chalk": "^1.0.0",
+				"rtlcss": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"doctrine": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-			"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+		"node_modules/grunt-rtlcss/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 			"dev": true,
-			"requires": {
-				"esutils": "^2.0.2"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"dom-scroll-into-view": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
-			"integrity": "sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ=="
+		"node_modules/grunt-rtlcss/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"dom-serializer": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+		"node_modules/grunt-rtlcss/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 			"dev": true,
-			"requires": {
-				"domelementtype": "^2.0.1",
-				"entities": "^2.0.0"
-			},
 			"dependencies": {
-				"domelementtype": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
-					"integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
-					"dev": true
-				}
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"domelementtype": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-			"dev": true
-		},
-		"domexception": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+		"node_modules/grunt-rtlcss/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"dev": true,
-			"requires": {
-				"webidl-conversions": "^5.0.0"
-			},
 			"dependencies": {
-				"webidl-conversions": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
-				}
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"domhandler": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-			"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+		"node_modules/grunt-rtlcss/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
 			"dev": true,
-			"requires": {
-				"domelementtype": "^2.2.0"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"domutils": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+		"node_modules/grunt-sass": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz",
+			"integrity": "sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==",
 			"dev": true,
-			"requires": {
-				"dom-serializer": "0",
-				"domelementtype": "1"
+			"engines": {
+				"node": ">=8"
+			},
+			"peerDependencies": {
+				"grunt": ">=1"
 			}
 		},
-		"dot-case": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-			"integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-			"requires": {
-				"no-case": "^3.0.4",
-				"tslib": "^2.0.3"
+		"node_modules/grunt-webpack": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/grunt-webpack/-/grunt-webpack-6.0.0.tgz",
+			"integrity": "sha512-FtRVTGJGuV9Ic/OrCR80p5u601e0ekvTyHo7vnwVo3XlvRh5wR1ATAVT9FnnobHqZnQ/DeF84W97si5+roUWEA==",
+			"dev": true,
+			"dependencies": {
+				"deep-for-each": "^3.0.0",
+				"lodash": "^4.17.21"
+			},
+			"engines": {
+				"node": ">=16.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
 			}
 		},
-		"dot-prop": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
+		"node_modules/grunt/node_modules/grunt-cli": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
+			"integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
 			"dev": true,
-			"requires": {
-				"is-obj": "^2.0.0"
+			"dependencies": {
+				"grunt-known-options": "~2.0.0",
+				"interpret": "~1.1.0",
+				"liftup": "~3.0.1",
+				"nopt": "~4.0.1",
+				"v8flags": "~3.2.0"
+			},
+			"bin": {
+				"grunt": "bin/grunt"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"dotenv": {
-			"version": "16.0.3",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
-			"integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
-			"dev": true
+		"node_modules/grunt/node_modules/grunt-cli/node_modules/nopt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+			"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+			"dev": true,
+			"dependencies": {
+				"abbrev": "1",
+				"osenv": "^0.1.4"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			}
 		},
-		"dotenv-expand": {
-			"version": "9.0.0",
-			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-9.0.0.tgz",
-			"integrity": "sha512-uW8Hrhp5ammm9x7kBLR6jDfujgaDarNA02tprvZdyrJ7MpdzD1KyrIHG4l+YoC2fJ2UcdFdNWNWIjt+sexBHJw==",
+		"node_modules/grunt/node_modules/interpret": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+			"integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
 			"dev": true
 		},
-		"download": {
-			"version": "6.2.5",
-			"resolved": "https://registry.npmjs.org/download/-/download-6.2.5.tgz",
-			"integrity": "sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==",
+		"node_modules/grunt/node_modules/minimatch": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"caw": "^2.0.0",
-				"content-disposition": "^0.5.2",
-				"decompress": "^4.0.0",
-				"ext-name": "^5.0.0",
-				"file-type": "5.2.0",
-				"filenamify": "^2.0.0",
-				"get-stream": "^3.0.0",
-				"got": "^7.0.0",
-				"make-dir": "^1.0.0",
-				"p-event": "^1.0.0",
-				"pify": "^3.0.0"
-			},
 			"dependencies": {
-				"file-type": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/file-type/-/file-type-5.2.0.tgz",
-					"integrity": "sha1-LdvqfHP/42No365J3DOMBYwritY=",
-					"dev": true,
-					"optional": true
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				},
-				"make-dir": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-					"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"pify": "^3.0.0"
-					}
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-					"dev": true,
-					"optional": true
-				}
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"downloadjs": {
-			"version": "1.4.7",
-			"resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",
-			"integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q=="
-		},
-		"downshift": {
-			"version": "6.1.12",
-			"resolved": "https://registry.npmjs.org/downshift/-/downshift-6.1.12.tgz",
-			"integrity": "sha512-7XB/iaSJVS4T8wGFT3WRXmSF1UlBHAA40DshZtkrIscIN+VC+Lh363skLxFTvJwtNgHxAMDGEHT4xsyQFWL+UA==",
-			"requires": {
-				"@babel/runtime": "^7.14.8",
-				"compute-scroll-into-view": "^1.0.17",
-				"prop-types": "^15.7.2",
-				"react-is": "^17.0.2",
-				"tslib": "^2.3.0"
-			},
+		"node_modules/gzip-size": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+			"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+			"dev": true,
 			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-				}
+				"duplexer": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"duplexer": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-			"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+		"node_modules/handle-thing": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
 			"dev": true
 		},
-		"duplexer3": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-			"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
+		"node_modules/har-schema": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"ecc-jsbn": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+		"node_modules/har-validator": {
+			"version": "5.1.5",
+			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+			"deprecated": "this library is no longer supported",
 			"dev": true,
-			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
+			"dependencies": {
+				"ajv": "^6.12.3",
+				"har-schema": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"ee-first": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-			"dev": true
+		"node_modules/hard-rejection": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"electron-to-chromium": {
-			"version": "1.3.740",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.740.tgz",
-			"integrity": "sha512-Mi2m55JrX2BFbNZGKYR+2ItcGnR4O5HhrvgoRRyZQlaMGQULqDhoGkLWHzJoshSzi7k1PUofxcDbNhlFrDZNhg==",
-			"dev": true
+		"node_modules/has": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"dependencies": {
+				"function-bind": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4.0"
+			}
 		},
-		"element-closest": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz",
-			"integrity": "sha1-cqdAoQdFM4LijfnOXbtajfD5Zuw="
+		"node_modules/has-ansi": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"emittery": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-			"integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-			"dev": true
+		"node_modules/has-ansi/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"emoji-regex": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-			"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
+		"node_modules/has-bigints": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"emojis-list": {
+		"node_modules/has-flag": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-			"dev": true
+		"node_modules/has-property-descriptors": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+			"dev": true,
+			"dependencies": {
+				"get-intrinsic": "^1.1.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"encoding": {
-			"version": "0.1.13",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-			"integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-			"requires": {
-				"iconv-lite": "^0.6.2"
+		"node_modules/has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"end-of-stream": {
-			"version": "1.4.4",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+		"node_modules/has-symbol-support-x": {
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
+			"integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
 			"dev": true,
-			"requires": {
-				"once": "^1.4.0"
+			"optional": true,
+			"engines": {
+				"node": "*"
 			}
 		},
-		"enhanced-resolve": {
-			"version": "5.10.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-			"integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+		"node_modules/has-symbols": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
 			"dev": true,
-			"requires": {
-				"graceful-fs": "^4.2.4",
-				"tapable": "^2.2.0"
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"entities": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-			"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-			"dev": true
+		"node_modules/has-to-string-tag-x": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
+			"integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"has-symbol-support-x": "^1.4.1"
+			},
+			"engines": {
+				"node": "*"
+			}
 		},
-		"envinfo": {
-			"version": "7.8.1",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-			"dev": true
+		"node_modules/has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"dev": true,
+			"dependencies": {
+				"has-symbols": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-value": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+			"dev": true,
+			"dependencies": {
+				"get-value": "^2.0.6",
+				"has-values": "^1.0.0",
+				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"enzyme": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
-			"integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
-			"dev": true,
-			"requires": {
-				"array.prototype.flat": "^1.2.3",
-				"cheerio": "^1.0.0-rc.3",
-				"enzyme-shallow-equal": "^1.0.1",
-				"function.prototype.name": "^1.1.2",
-				"has": "^1.0.3",
-				"html-element-map": "^1.2.0",
-				"is-boolean-object": "^1.0.1",
-				"is-callable": "^1.1.5",
-				"is-number-object": "^1.0.4",
-				"is-regex": "^1.0.5",
-				"is-string": "^1.0.5",
-				"is-subset": "^0.1.1",
-				"lodash.escape": "^4.0.1",
-				"lodash.isequal": "^4.5.0",
-				"object-inspect": "^1.7.0",
-				"object-is": "^1.0.2",
-				"object.assign": "^4.1.0",
-				"object.entries": "^1.1.1",
-				"object.values": "^1.1.1",
-				"raf": "^3.4.1",
-				"rst-selector-parser": "^2.2.3",
-				"string.prototype.trim": "^1.2.1"
-			}
-		},
-		"enzyme-shallow-equal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
-			"integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
+		"node_modules/has-values": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
 			"dev": true,
-			"requires": {
-				"has": "^1.0.3",
-				"object-is": "^1.1.2"
+			"dependencies": {
+				"is-number": "^3.0.0",
+				"kind-of": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"enzyme-to-json": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.6.2.tgz",
-			"integrity": "sha512-Ynm6Z6R6iwQ0g2g1YToz6DWhxVnt8Dy1ijR2zynRKxTyBGA8rCDXU3rs2Qc4OKvUvc2Qoe1bcFK6bnPs20TrTg==",
+		"node_modules/has-values/node_modules/kind-of": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+			"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 			"dev": true,
-			"requires": {
-				"@types/cheerio": "^0.22.22",
-				"lodash": "^4.17.21",
-				"react-is": "^16.12.0"
+			"dependencies": {
+				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"equivalent-key-map": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/equivalent-key-map/-/equivalent-key-map-0.2.2.tgz",
-			"integrity": "sha512-xvHeyCDbZzkpN4VHQj/n+j2lOwL0VWszG30X4cOrc9Y7Tuo2qCdZK/0AMod23Z5dCtNUbaju6p0rwOhHUk05ew=="
+		"node_modules/header-case": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz",
+			"integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==",
+			"dependencies": {
+				"capital-case": "^1.0.4",
+				"tslib": "^2.0.3"
+			}
 		},
-		"error": {
-			"version": "7.2.1",
-			"resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
-			"integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
-			"dev": true,
-			"requires": {
-				"string-template": "~0.2.1"
+		"node_modules/highlight-words-core": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz",
+			"integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
+		},
+		"node_modules/history": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
+			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
+			"dependencies": {
+				"@babel/runtime": "^7.7.6"
 			}
 		},
-		"error-ex": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"requires": {
-				"is-arrayish": "^0.2.1"
+		"node_modules/hoist-non-react-statics": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+			"dependencies": {
+				"react-is": "^16.7.0"
 			}
 		},
-		"error-stack-parser": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz",
-			"integrity": "sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==",
+		"node_modules/homedir-polyfill": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
 			"dev": true,
-			"requires": {
-				"stackframe": "^1.1.1"
+			"dependencies": {
+				"parse-passwd": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"es-abstract": {
-			"version": "1.17.7",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-			"integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
+		"node_modules/hooker": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
+			"integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
 			"dev": true,
-			"requires": {
-				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1",
-				"is-callable": "^1.2.2",
-				"is-regex": "^1.1.1",
-				"object-inspect": "^1.8.0",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.1",
-				"string.prototype.trimend": "^1.0.1",
-				"string.prototype.trimstart": "^1.0.1"
+			"engines": {
+				"node": "*"
 			}
 		},
-		"es-array-method-boxes-properly": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-			"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+		"node_modules/hosted-git-info": {
+			"version": "2.8.9",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
 			"dev": true
 		},
-		"es-module-lexer": {
-			"version": "0.9.3",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-			"dev": true
+		"node_modules/hoverintent": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/hoverintent/-/hoverintent-2.2.1.tgz",
+			"integrity": "sha512-VyU54L1xW5rSqpsv/LJ6ecymGXsXXeGs9iVEKot4kKBCq5UodSAuy3DqX686LZxEpaMEfeCHPu4LndsMX5Q9eQ=="
 		},
-		"es-shim-unscopables": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-			"integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+		"node_modules/hpack.js": {
+			"version": "2.1.6",
+			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
 			"dev": true,
-			"requires": {
-				"has": "^1.0.3"
+			"dependencies": {
+				"inherits": "^2.0.1",
+				"obuf": "^1.0.0",
+				"readable-stream": "^2.0.1",
+				"wbuf": "^1.1.0"
 			}
 		},
-		"es-to-primitive": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+		"node_modules/hpq": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/hpq/-/hpq-1.3.0.tgz",
+			"integrity": "sha512-fvYTvdCFOWQupGxqkahrkA+ERBuMdzkxwtUdKrxR6rmMd4Pfl+iZ1QiQYoaZ0B/v0y59MOMnz3XFUWbT50/NWA=="
+		},
+		"node_modules/html-encoding-sniffer": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+			"integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
 			"dev": true,
-			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
+			"dependencies": {
+				"whatwg-encoding": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+		"node_modules/html-entities": {
+			"version": "2.3.3",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
+			"integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
 			"dev": true
 		},
-		"escape-html": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+		"node_modules/html-escaper": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true
 		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-		},
-		"escodegen": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+		"node_modules/html-tags": {
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
+			"integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
 			"dev": true,
-			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^5.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
+			"engines": {
+				"node": ">=8"
 			},
-			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"levn": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-					"integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2"
-					}
-				},
-				"optionator": {
-					"version": "0.8.3",
-					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-					"dev": true,
-					"requires": {
-						"deep-is": "~0.1.3",
-						"fast-levenshtein": "~2.0.6",
-						"levn": "~0.3.0",
-						"prelude-ls": "~1.1.2",
-						"type-check": "~0.3.2",
-						"word-wrap": "~1.2.3"
-					}
-				},
-				"prelude-ls": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-					"integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true,
-					"optional": true
-				},
-				"type-check": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-					"integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-					"dev": true,
-					"requires": {
-						"prelude-ls": "~1.1.2"
-					}
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"eslint": {
-			"version": "8.26.0",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-			"integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
+		"node_modules/http-cache-semantics": {
+			"version": "3.8.1",
+			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+			"integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
 			"dev": true,
-			"requires": {
-				"@eslint/eslintrc": "^1.3.3",
-				"@humanwhocodes/config-array": "^0.11.6",
-				"@humanwhocodes/module-importer": "^1.0.1",
-				"@nodelib/fs.walk": "^1.2.8",
-				"ajv": "^6.10.0",
-				"chalk": "^4.0.0",
-				"cross-spawn": "^7.0.2",
-				"debug": "^4.3.2",
-				"doctrine": "^3.0.0",
-				"escape-string-regexp": "^4.0.0",
-				"eslint-scope": "^7.1.1",
-				"eslint-utils": "^3.0.0",
-				"eslint-visitor-keys": "^3.3.0",
-				"espree": "^9.4.0",
-				"esquery": "^1.4.0",
-				"esutils": "^2.0.2",
-				"fast-deep-equal": "^3.1.3",
-				"file-entry-cache": "^6.0.1",
-				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.2",
-				"globals": "^13.15.0",
-				"grapheme-splitter": "^1.0.4",
-				"ignore": "^5.2.0",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"is-glob": "^4.0.0",
-				"is-path-inside": "^3.0.3",
-				"js-sdsl": "^4.1.4",
-				"js-yaml": "^4.1.0",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.4.1",
-				"lodash.merge": "^4.6.2",
-				"minimatch": "^3.1.2",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.9.1",
-				"regexpp": "^3.2.0",
-				"strip-ansi": "^6.0.1",
-				"strip-json-comments": "^3.1.0",
-				"text-table": "^0.2.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"doctrine": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-					"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-					"dev": true,
-					"requires": {
-						"esutils": "^2.0.2"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"eslint-scope": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-					"integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-					"dev": true,
-					"requires": {
-						"esrecurse": "^4.3.0",
-						"estraverse": "^5.2.0"
-					}
-				},
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"find-up": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-					"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^6.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"glob-parent": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-					"integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.3"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-							"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.1"
-							}
-						}
-					}
-				},
-				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-					"dev": true,
-					"requires": {
-						"type-fest": "^0.20.2"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-path-inside": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-					"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-					"dev": true
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"locate-path": {
-					"version": "6.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-					"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^5.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"p-limit": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-					"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-					"dev": true,
-					"requires": {
-						"yocto-queue": "^0.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-					"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^3.0.2"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
+			"optional": true
 		},
-		"eslint-config-prettier": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-			"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+		"node_modules/http-deceiver": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
 			"dev": true
 		},
-		"eslint-import-resolver-node": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-			"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+		"node_modules/http-errors": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
 			"dev": true,
-			"requires": {
-				"debug": "^3.2.7",
-				"resolve": "^1.20.0"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"is-core-module": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-					"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-					"dev": true,
-					"requires": {
-						"has": "^1.0.3"
-					}
-				},
-				"resolve": {
-					"version": "1.22.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-					"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.9.0",
-						"path-parse": "^1.0.7",
-						"supports-preserve-symlinks-flag": "^1.0.0"
-					}
-				}
-			}
-		},
-		"eslint-module-utils": {
-			"version": "2.7.4",
-			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-			"integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-			"dev": true,
-			"requires": {
-				"debug": "^3.2.7"
+				"depd": "2.0.0",
+				"inherits": "2.0.4",
+				"setprototypeof": "1.2.0",
+				"statuses": "2.0.1",
+				"toidentifier": "1.0.1"
 			},
-			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"eslint-plugin-import": {
-			"version": "2.26.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-			"integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flat": "^1.2.5",
-				"debug": "^2.6.9",
-				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.6",
-				"eslint-module-utils": "^2.7.3",
-				"has": "^1.0.3",
-				"is-core-module": "^2.8.1",
-				"is-glob": "^4.0.3",
-				"minimatch": "^3.1.2",
-				"object.values": "^1.1.5",
-				"resolve": "^1.22.0",
-				"tsconfig-paths": "^3.14.1"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-core-module": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-					"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-					"dev": true,
-					"requires": {
-						"has": "^1.0.3"
-					}
-				},
-				"is-glob": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-					"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.1"
-					}
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"object.values": {
-					"version": "1.1.5",
-					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-					"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.3",
-						"es-abstract": "^1.19.1"
-					}
-				},
-				"resolve": {
-					"version": "1.22.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-					"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.9.0",
-						"path-parse": "^1.0.7",
-						"supports-preserve-symlinks-flag": "^1.0.0"
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
-			}
+		"node_modules/http-parser-js": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
+			"integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
+			"dev": true
 		},
-		"eslint-plugin-jest": {
-			"version": "25.7.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-			"integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
+		"node_modules/http-proxy": {
+			"version": "1.18.1",
+			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
 			"dev": true,
-			"requires": {
-				"@typescript-eslint/experimental-utils": "^5.0.0"
+			"dependencies": {
+				"eventemitter3": "^4.0.0",
+				"follow-redirects": "^1.0.0",
+				"requires-port": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"eslint-plugin-jsdoc": {
-			"version": "37.9.7",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.9.7.tgz",
-			"integrity": "sha512-8alON8yYcStY94o0HycU2zkLKQdcS+qhhOUNQpfONHHwvI99afbmfpYuPqf6PbLz5pLZldG3Te5I0RbAiTN42g==",
+		"node_modules/http-proxy-agent": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+			"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
 			"dev": true,
-			"requires": {
-				"@es-joy/jsdoccomment": "~0.20.1",
-				"comment-parser": "1.3.0",
-				"debug": "^4.3.3",
-				"escape-string-regexp": "^4.0.0",
-				"esquery": "^1.4.0",
-				"regextras": "^0.8.0",
-				"semver": "^7.3.5",
-				"spdx-expression-parse": "^3.0.1"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"escape-string-regexp": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+				"@tootallnate/once": "2",
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"eslint-plugin-jsx-a11y": {
-			"version": "6.6.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
-			"integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
+		"node_modules/http-proxy-middleware": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
 			"dev": true,
-			"requires": {
-				"@babel/runtime": "^7.18.9",
-				"aria-query": "^4.2.2",
-				"array-includes": "^3.1.5",
-				"ast-types-flow": "^0.0.7",
-				"axe-core": "^4.4.3",
-				"axobject-query": "^2.2.0",
-				"damerau-levenshtein": "^1.0.8",
-				"emoji-regex": "^9.2.2",
-				"has": "^1.0.3",
-				"jsx-ast-utils": "^3.3.2",
-				"language-tags": "^1.0.5",
-				"minimatch": "^3.1.2",
-				"semver": "^6.3.0"
-			},
 			"dependencies": {
-				"emoji-regex": {
-					"version": "9.2.2",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-					"integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
+				"@types/http-proxy": "^1.17.8",
+				"http-proxy": "^1.18.1",
+				"is-glob": "^4.0.1",
+				"is-plain-obj": "^3.0.0",
+				"micromatch": "^4.0.2"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			},
+			"peerDependencies": {
+				"@types/express": "^4.17.13"
+			},
+			"peerDependenciesMeta": {
+				"@types/express": {
+					"optional": true
 				}
 			}
 		},
-		"eslint-plugin-prettier": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz",
-			"integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==",
+		"node_modules/http-proxy-middleware/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 			"dev": true,
-			"requires": {
-				"prettier-linter-helpers": "^1.0.0"
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"eslint-plugin-react": {
-			"version": "7.31.10",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz",
-			"integrity": "sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==",
+		"node_modules/http-proxy-middleware/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.5",
-				"array.prototype.flatmap": "^1.3.0",
-				"doctrine": "^2.1.0",
-				"estraverse": "^5.3.0",
-				"jsx-ast-utils": "^2.4.1 || ^3.0.0",
-				"minimatch": "^3.1.2",
-				"object.entries": "^1.1.5",
-				"object.fromentries": "^2.0.5",
-				"object.hasown": "^1.1.1",
-				"object.values": "^1.1.5",
-				"prop-types": "^15.8.1",
-				"resolve": "^2.0.0-next.3",
-				"semver": "^6.3.0",
-				"string.prototype.matchall": "^4.0.7"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-core-module": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-					"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-					"dev": true,
-					"requires": {
-						"has": "^1.0.3"
-					}
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"object.values": {
-					"version": "1.1.5",
-					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-					"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.3",
-						"es-abstract": "^1.19.1"
-					}
-				},
-				"resolve": {
-					"version": "2.0.0-next.4",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-					"integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.9.0",
-						"path-parse": "^1.0.7",
-						"supports-preserve-symlinks-flag": "^1.0.0"
-					}
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"eslint-plugin-react-hooks": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-			"integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-			"dev": true
-		},
-		"eslint-scope": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+		"node_modules/http-proxy-middleware/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"requires": {
-				"esrecurse": "^4.3.0",
-				"estraverse": "^4.1.1"
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"eslint-utils": {
+		"node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-			"integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+			"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
 			"dev": true,
-			"requires": {
-				"eslint-visitor-keys": "^2.0.0"
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"eslint-visitor-keys": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-			"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-			"dev": true
-		},
-		"espree": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-			"integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+		"node_modules/http-proxy-middleware/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"requires": {
-				"acorn": "^8.8.0",
-				"acorn-jsx": "^5.3.2",
-				"eslint-visitor-keys": "^3.3.0"
-			},
 			"dependencies": {
-				"acorn": {
-					"version": "8.8.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-					"integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-					"dev": true
-				},
-				"eslint-visitor-keys": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-					"integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-					"dev": true
-				}
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"esprima": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true
-		},
-		"esquery": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+		"node_modules/http-proxy-middleware/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"requires": {
-				"estraverse": "^5.1.0"
-			},
 			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"esrecurse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+		"node_modules/http-signature": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
 			"dev": true,
-			"requires": {
-				"estraverse": "^5.2.0"
-			},
 			"dependencies": {
-				"estraverse": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-					"dev": true
-				}
+				"assert-plus": "^1.0.0",
+				"jsprim": "^1.2.2",
+				"sshpk": "^1.7.0"
+			},
+			"engines": {
+				"node": ">=0.8",
+				"npm": ">=1.3.7"
 			}
 		},
-		"estraverse": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-			"integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-			"dev": true
-		},
-		"esutils": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
-		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-			"dev": true
-		},
-		"ev-emitter": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
-			"integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="
-		},
-		"eventemitter2": {
-			"version": "0.4.14",
-			"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz",
-			"integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
-			"dev": true
+		"node_modules/https-proxy-agent": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+			"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+			"dev": true,
+			"dependencies": {
+				"agent-base": "6",
+				"debug": "4"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"eventemitter3": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-			"dev": true
+		"node_modules/human-signals": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.17.0"
+			}
 		},
-		"events": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-			"dev": true
+		"node_modules/iconv-lite": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+			"dependencies": {
+				"safer-buffer": ">= 2.1.2 < 3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"exec-buffer": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz",
-			"integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==",
+		"node_modules/icss-utils": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"execa": "^0.7.0",
-				"p-finally": "^1.0.0",
-				"pify": "^3.0.0",
-				"rimraf": "^2.5.4",
-				"tempfile": "^2.0.0"
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
 			},
-			"dependencies": {
-				"execa": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-					"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"cross-spawn": "^5.0.1",
-						"get-stream": "^3.0.0",
-						"is-stream": "^1.1.0",
-						"npm-run-path": "^2.0.0",
-						"p-finally": "^1.0.0",
-						"signal-exit": "^3.0.0",
-						"strip-eof": "^1.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				},
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-					"dev": true,
-					"optional": true
-				}
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"execa": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+		"node_modules/ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
-					}
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
 				},
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"optional": true
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
 				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
 				}
+			]
+		},
+		"node_modules/ignore": {
+			"version": "5.2.4",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"executable": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-			"integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+		"node_modules/ignore-walk": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
+			"integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"pify": "^2.2.0"
-			},
 			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true,
-					"optional": true
-				}
+				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"exit": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-			"integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-			"dev": true
-		},
-		"expand-brackets": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+		"node_modules/imagemin": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/imagemin/-/imagemin-6.1.0.tgz",
+			"integrity": "sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==",
 			"dev": true,
-			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
+				"file-type": "^10.7.0",
+				"globby": "^8.0.1",
+				"make-dir": "^1.0.0",
+				"p-pipe": "^1.1.0",
+				"pify": "^4.0.1",
+				"replace-ext": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"expand-tilde": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-			"integrity": "sha512-rtmc+cjLZqnu9dSYosX9EWmSJhTwpACgJQTfj4hgg2JjOD/6SIQalZrt4a3aQeh++oNxkazcaxrhPUj6+g5G/Q==",
+		"node_modules/imagemin-gifsicle": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-6.0.1.tgz",
+			"integrity": "sha512-kuu47c6iKDQ6R9J10xCwL0lgs0+sMz3LRHqRcJ2CRBWdcNmo3T5hUaM8hSZfksptZXJLGKk8heSAvwtSdB1Fng==",
 			"dev": true,
-			"requires": {
-				"os-homedir": "^1.0.1"
+			"optional": true,
+			"dependencies": {
+				"exec-buffer": "^3.0.0",
+				"gifsicle": "^4.0.0",
+				"is-gif": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"expect": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-			"integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+		"node_modules/imagemin-jpegtran": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-6.0.0.tgz",
+			"integrity": "sha512-Ih+NgThzqYfEWv9t58EItncaaXIHR0u9RuhKa8CtVBlMBvY0dCIxgQJQCfwImA4AV1PMfmUKlkyIHJjb7V4z1g==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"jest-matcher-utils": "^27.5.1",
-				"jest-message-util": "^27.5.1"
+			"optional": true,
+			"dependencies": {
+				"exec-buffer": "^3.0.0",
+				"is-jpg": "^2.0.0",
+				"jpegtran-bin": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"expect-puppeteer": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
-			"integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
-			"dev": true
-		},
-		"express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+		"node_modules/imagemin-optipng": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-6.0.0.tgz",
+			"integrity": "sha512-FoD2sMXvmoNm/zKPOWdhKpWdFdF9qiJmKC17MxZJPH42VMAp17/QENI/lIuP7LCUnLVAloO3AUoTSNzfhpyd8A==",
 			"dev": true,
-			"requires": {
-				"accepts": "~1.3.8",
-				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
-				"content-disposition": "0.5.4",
-				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
-				"cookie-signature": "1.0.6",
-				"debug": "2.6.9",
-				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
-				"fresh": "0.5.2",
-				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
-				"range-parser": "~1.2.1",
-				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"type-is": "~1.6.18",
-				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
-			},
+			"optional": true,
 			"dependencies": {
-				"array-flatten": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-					"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-					"dev": true
-				},
-				"content-disposition": {
-					"version": "0.5.4",
-					"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-					"integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.2.1"
-					}
-				},
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"qs": {
-					"version": "6.11.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-					"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-					"dev": true,
-					"requires": {
-						"side-channel": "^1.0.4"
-					}
-				}
+				"exec-buffer": "^3.0.0",
+				"is-png": "^1.0.0",
+				"optipng-bin": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"ext-list": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
-			"integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+		"node_modules/imagemin-svgo": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz",
+			"integrity": "sha512-0JlIZNWP0Luasn1HT82uB9nU9aa+vUj6kpT+MjPW11LbprXC+iC4HDwn1r4Q2/91qj4iy9tRZNsFySMlEpLdpg==",
 			"dev": true,
 			"optional": true,
-			"requires": {
-				"mime-db": "^1.28.0"
+			"dependencies": {
+				"is-svg": "^4.2.1",
+				"svgo": "^1.3.2"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/imagemin-svgo?sponsor=1"
 			}
 		},
-		"ext-name": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
-			"integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+		"node_modules/imagemin/node_modules/@nodelib/fs.stat": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
+			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"ext-list": "^2.0.0",
-				"sort-keys-length": "^1.0.0"
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"extend": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
-		},
-		"extend-shallow": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+		"node_modules/imagemin/node_modules/dir-glob": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
+			"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
 			"dev": true,
-			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
-			},
 			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
+				"arrify": "^1.0.1",
+				"path-type": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"external-editor": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-			"integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+		"node_modules/imagemin/node_modules/fast-glob": {
+			"version": "2.2.7",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
+			"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
 			"dev": true,
-			"requires": {
-				"chardet": "^0.4.0",
-				"iconv-lite": "^0.4.17",
-				"tmp": "^0.0.33"
-			},
 			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
+				"@mrmlnc/readdir-enhanced": "^2.2.1",
+				"@nodelib/fs.stat": "^1.1.2",
+				"glob-parent": "^3.1.0",
+				"is-glob": "^4.0.0",
+				"merge2": "^1.2.3",
+				"micromatch": "^3.1.10"
+			},
+			"engines": {
+				"node": ">=4.0.0"
 			}
 		},
-		"extglob": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+		"node_modules/imagemin/node_modules/glob-parent": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+			"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
 			"dev": true,
-			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
-			},
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+				"is-glob": "^3.1.0",
+				"path-dirname": "^1.0.0"
 			}
 		},
-		"extract-zip": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-			"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+		"node_modules/imagemin/node_modules/glob-parent/node_modules/is-glob": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 			"dev": true,
-			"requires": {
-				"@types/yauzl": "^2.9.1",
-				"debug": "^4.1.1",
-				"get-stream": "^5.1.0",
-				"yauzl": "^2.10.0"
-			},
 			"dependencies": {
-				"get-stream": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				}
+				"is-extglob": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
-		"fast-average-color": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/fast-average-color/-/fast-average-color-4.3.0.tgz",
-			"integrity": "sha512-k8FXd6+JeXoItmdNqB3hMwFgArryjdYBLuzEM8fRY/oztd/051yhSHU6GUrMOfIQU9dDHyFDcIAkGrQKlYtpDA=="
-		},
-		"fast-deep-equal": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-			"dev": true
-		},
-		"fast-diff": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-			"integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-			"dev": true
-		},
-		"fast-glob": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-			"integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+		"node_modules/imagemin/node_modules/globby": {
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+			"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
 			"dev": true,
-			"requires": {
-				"@nodelib/fs.stat": "^2.0.2",
-				"@nodelib/fs.walk": "^1.2.3",
-				"glob-parent": "^5.1.2",
-				"merge2": "^1.3.0",
-				"micromatch": "^4.0.4"
-			},
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"array-union": "^1.0.1",
+				"dir-glob": "2.0.0",
+				"fast-glob": "^2.0.2",
+				"glob": "^7.1.2",
+				"ignore": "^3.3.5",
+				"pify": "^3.0.0",
+				"slash": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fast-json-stable-stringify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
-		},
-		"fast-levenshtein": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-			"dev": true
-		},
-		"fast-xml-parser": {
-			"version": "3.21.1",
-			"resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz",
-			"integrity": "sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==",
+		"node_modules/imagemin/node_modules/globby/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"strnum": "^1.0.4"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fastest-levenshtein": {
-			"version": "1.0.16",
-			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-			"integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
+		"node_modules/imagemin/node_modules/ignore": {
+			"version": "3.3.10",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+			"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
 			"dev": true
 		},
-		"fastq": {
-			"version": "1.13.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-			"integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+		"node_modules/imagemin/node_modules/make-dir": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
 			"dev": true,
-			"requires": {
-				"reusify": "^1.0.4"
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"faye-websocket": {
-			"version": "0.10.0",
-			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-			"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+		"node_modules/imagemin/node_modules/make-dir/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
 			"dev": true,
-			"requires": {
-				"websocket-driver": ">=0.5.1"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fb-watchman": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-			"integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+		"node_modules/imagemin/node_modules/path-type": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+			"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
 			"dev": true,
-			"requires": {
-				"bser": "2.1.1"
+			"dependencies": {
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fd-slicer": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+		"node_modules/imagemin/node_modules/path-type/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
 			"dev": true,
-			"requires": {
-				"pend": "~1.2.0"
-			}
-		},
-		"fetch-blob": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz",
-			"integrity": "sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg==",
-			"requires": {
-				"node-domexception": "^1.0.0",
-				"web-streams-polyfill": "^3.0.3"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"figures": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-			"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+		"node_modules/imagemin/node_modules/slash": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+			"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"escape-string-regexp": "^1.0.5",
-				"object-assign": "^4.1.0"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"file-entry-cache": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-			"integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-			"dev": true,
-			"requires": {
-				"flat-cache": "^3.0.4"
+		"node_modules/imagesloaded": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-5.0.0.tgz",
+			"integrity": "sha512-/0JGSubc1MTCoDKVmonLHgbifBWHdyLkun+R/151E1c5n79hiSxcd7cB7mPXFgojYu8xnRZv7GYxzKoxW8BetQ==",
+			"dependencies": {
+				"ev-emitter": "^2.1.2"
 			}
 		},
-		"file-sync-cmp": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
-			"integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
-			"dev": true
+		"node_modules/imagesloaded/node_modules/ev-emitter": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-2.1.2.tgz",
+			"integrity": "sha512-jQ5Ql18hdCQ4qS+RCrbLfz1n+Pags27q5TwMKvZyhp5hh2UULUYZUy1keqj6k6SYsdqIYjnmz7xyyEY0V67B8Q=="
 		},
-		"file-type": {
-			"version": "10.11.0",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-10.11.0.tgz",
-			"integrity": "sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==",
+		"node_modules/immutable": {
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.2.tgz",
+			"integrity": "sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==",
 			"dev": true
 		},
-		"filename-reserved-regex": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
-			"integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=",
-			"dev": true
+		"node_modules/import-fresh": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+			"dependencies": {
+				"parent-module": "^1.0.0",
+				"resolve-from": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"filenamify": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/filenamify/-/filenamify-2.1.0.tgz",
-			"integrity": "sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==",
+		"node_modules/import-lazy": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"filename-reserved-regex": "^2.0.0",
-				"strip-outer": "^1.0.0",
-				"trim-repeated": "^1.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+		"node_modules/import-local": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
 			"dev": true,
-			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"pkg-dir": "^4.2.0",
+				"resolve-cwd": "^3.0.0"
+			},
+			"bin": {
+				"import-local-fixture": "fixtures/cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+		"node_modules/imurmurhash": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
 			"dev": true,
-			"requires": {
-				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "2.4.1",
-				"parseurl": "~1.3.3",
-				"statuses": "2.0.1",
-				"unpipe": "~1.0.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.8.19"
 			}
 		},
-		"find-cache-dir": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-			"integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+		"node_modules/indent-string": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
 			"dev": true,
-			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^3.0.2",
-				"pkg-dir": "^4.1.0"
+			"optional": true,
+			"dependencies": {
+				"repeating": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"find-file-up": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
-			"integrity": "sha512-mBxmNbVyjg1LQIIpgO8hN+ybWBgDQK8qjht+EbrTCGmmPV/sc7RF1i9stPTD6bpvXZywBdrwRYxhSdJv867L6A==",
+		"node_modules/inflight": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"dev": true,
-			"requires": {
-				"fs-exists-sync": "^0.1.0",
-				"resolve-dir": "^0.1.0"
+			"dependencies": {
+				"once": "^1.3.0",
+				"wrappy": "1"
 			}
 		},
-		"find-parent-dir": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
-			"integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
+		"node_modules/inherits": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+		},
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true
 		},
-		"find-pkg": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
-			"integrity": "sha512-0rnQWcFwZr7eO0513HahrWafsc3CTFioEB7DRiEYCUM/70QXSY8f3mCST17HXLcPvEhzH/Ty/Bxd72ZZsr/yvw==",
+		"node_modules/ink-docstrap": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz",
+			"integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==",
 			"dev": true,
-			"requires": {
-				"find-file-up": "^0.1.2"
+			"dependencies": {
+				"moment": "^2.14.1",
+				"sanitize-html": "^1.13.0"
 			}
 		},
-		"find-process": {
-			"version": "1.4.7",
-			"resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.7.tgz",
-			"integrity": "sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg==",
+		"node_modules/inquirer": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+			"integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"commander": "^5.1.0",
-				"debug": "^4.1.1"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"commander": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-					"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
-		},
-		"find-root": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-			"integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-		},
-		"find-up": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-			"requires": {
-				"locate-path": "^3.0.0"
+				"ansi-escapes": "^3.0.0",
+				"chalk": "^2.0.0",
+				"cli-cursor": "^2.1.0",
+				"cli-width": "^2.0.0",
+				"external-editor": "^2.1.0",
+				"figures": "^2.0.0",
+				"lodash": "^4.3.0",
+				"mute-stream": "0.0.7",
+				"run-async": "^2.2.0",
+				"rxjs": "^5.5.2",
+				"string-width": "^2.1.0",
+				"strip-ansi": "^4.0.0",
+				"through": "^2.3.6"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"find-versions": {
+		"node_modules/inquirer/node_modules/ansi-escapes": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
-			"integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
+			"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+			"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"semver-regex": "^2.0.0"
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"findup-sync": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-			"integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-			"dev": true,
-			"requires": {
-				"glob": "~5.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "2 || 3",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					}
-				}
+		"node_modules/inquirer/node_modules/ansi-regex": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+			"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fined": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-			"integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+		"node_modules/inquirer/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.2",
-				"is-plain-object": "^2.0.3",
-				"object.defaults": "^1.1.0",
-				"object.pick": "^1.2.0",
-				"parse-filepath": "^1.0.1"
-			},
 			"dependencies": {
-				"expand-tilde": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-					"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "^1.0.1"
-					}
-				}
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"fizzy-ui-utils": {
-			"version": "2.0.7",
-			"resolved": "https://registry.npmjs.org/fizzy-ui-utils/-/fizzy-ui-utils-2.0.7.tgz",
-			"integrity": "sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==",
-			"requires": {
-				"desandro-matches-selector": "^2.0.0"
+		"node_modules/inquirer/node_modules/figures": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+			"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"flagged-respawn": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-			"integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-			"dev": true
-		},
-		"flat-cache": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-			"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+		"node_modules/inquirer/node_modules/string-width": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 			"dev": true,
-			"requires": {
-				"flatted": "^3.1.0",
-				"rimraf": "^3.0.2"
-			},
 			"dependencies": {
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
+				"is-fullwidth-code-point": "^2.0.0",
+				"strip-ansi": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"flatted": {
-			"version": "3.2.7",
-			"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-			"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-			"dev": true
-		},
-		"follow-redirects": {
-			"version": "1.15.2",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-			"dev": true
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha512-SKmowqGTJoPzLO1T0BBJpkfp3EMacCMOuH40hOUbrbzElVktk4DioXVM99QkLCyKoiuOmyjgcWMpVz2xjE7LZw==",
+		"node_modules/inquirer/node_modules/strip-ansi": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+			"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 			"dev": true,
-			"requires": {
-				"for-in": "^1.0.1"
+			"dependencies": {
+				"ansi-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+		"node_modules/install-changed": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/install-changed/-/install-changed-1.1.0.tgz",
+			"integrity": "sha512-APUWMdQnwGcyv9bmuvgxCcrR6qtD996+hofEEAPGSjsvGIZuBpBF0yrYAKOl9tmhm2AzxJC4EXUbxZ/SId4NIA==",
 			"dev": true,
-			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
+			"bin": {
+				"install-changed": "bin/install-changed.js"
 			}
 		},
-		"formdata-polyfill": {
-			"version": "4.0.10",
-			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
-			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
-			"requires": {
-				"fetch-blob": "^3.1.2"
+		"node_modules/internal-slot": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+			"integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
+			"dev": true,
+			"dependencies": {
+				"get-intrinsic": "^1.2.0",
+				"has": "^1.0.3",
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"forwarded": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-			"integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-			"dev": true
-		},
-		"fraction.js": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-			"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-			"dev": true
+		"node_modules/interpret": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+			"integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
 		},
-		"fragment-cache": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+		"node_modules/into-stream": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
+			"integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
 			"dev": true,
-			"requires": {
-				"map-cache": "^0.2.2"
+			"optional": true,
+			"dependencies": {
+				"from2": "^2.1.1",
+				"p-is-promise": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"framer-motion": {
-			"version": "6.5.1",
-			"resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-6.5.1.tgz",
-			"integrity": "sha512-o1BGqqposwi7cgDrtg0dNONhkmPsUFDaLcKXigzuTFC5x58mE8iyTazxSudFzmT6MEyJKfjjU8ItoMe3W+3fiw==",
-			"requires": {
-				"@emotion/is-prop-valid": "^0.8.2",
-				"@motionone/dom": "10.12.0",
-				"framesync": "6.0.1",
-				"hey-listen": "^1.0.8",
-				"popmotion": "11.0.3",
-				"style-value-types": "5.0.0",
-				"tslib": "^2.1.0"
-			},
+		"node_modules/invariant": {
+			"version": "2.2.4",
+			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
 			"dependencies": {
-				"@emotion/is-prop-valid": {
-					"version": "0.8.8",
-					"resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz",
-					"integrity": "sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==",
-					"optional": true,
-					"requires": {
-						"@emotion/memoize": "0.7.4"
-					}
-				},
-				"@emotion/memoize": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz",
-					"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==",
-					"optional": true
-				}
+				"loose-envify": "^1.0.0"
 			}
 		},
-		"framesync": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/framesync/-/framesync-6.0.1.tgz",
-			"integrity": "sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA==",
-			"requires": {
-				"tslib": "^2.1.0"
+		"node_modules/ipaddr.js": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
+			"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"fresh": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-			"integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-			"dev": true
+		"node_modules/irregular-plurals": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+			"integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"from2": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-			"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0"
+		"node_modules/is-absolute": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+			"dev": true,
+			"dependencies": {
+				"is-relative": "^1.0.0",
+				"is-windows": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"from2-string": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz",
-			"integrity": "sha1-GCgrJ9CKJnyzAwzSuLSw8hKvdSo=",
-			"requires": {
-				"from2": "^2.0.3"
+		"node_modules/is-accessor-descriptor": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"fs-constants": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-			"dev": true
+		"node_modules/is-array-buffer": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+			"integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.2.0",
+				"is-typed-array": "^1.1.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"fs-exists-sync": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-			"integrity": "sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==",
-			"dev": true
+		"node_modules/is-arrayish": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
 		},
-		"fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-			"requires": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			},
-			"dependencies": {
-				"jsonfile": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-					"requires": {
-						"graceful-fs": "^4.1.6"
-					}
-				}
+		"node_modules/is-bigint": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+			"dev": true,
+			"dependencies": {
+				"has-bigints": "^1.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"fs-monkey": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-			"integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-			"dev": true
+		"node_modules/is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"dependencies": {
+				"binary-extensions": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+		"node_modules/is-boolean-object": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-buffer": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
 			"dev": true
 		},
-		"fsevents": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-			"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+		"node_modules/is-callable": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+		"node_modules/is-core-module": {
+			"version": "2.12.1",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz",
+			"integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+			"dependencies": {
+				"has": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"function.prototype.name": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-			"integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+		"node_modules/is-data-descriptor": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"functions-have-names": "^1.2.2"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"functions-have-names": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-			"dev": true
+		"node_modules/is-date-object": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
+			"integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"gaze": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+		"node_modules/is-descriptor": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
 			"dev": true,
-			"requires": {
-				"globule": "^1.0.0"
+			"dependencies": {
+				"is-accessor-descriptor": "^0.1.6",
+				"is-data-descriptor": "^0.1.4",
+				"kind-of": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"gensync": {
-			"version": "1.0.0-beta.2",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-			"dev": true
+		"node_modules/is-descriptor/node_modules/kind-of": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+			"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"get-caller-file": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+		"node_modules/is-docker": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+			"dev": true,
+			"bin": {
+				"is-docker": "cli.js"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"get-intrinsic": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz",
-			"integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==",
+		"node_modules/is-extendable": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
 			"dev": true,
-			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"get-package-type": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-			"dev": true
+		"node_modules/is-extglob": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"get-proxy": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz",
-			"integrity": "sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==",
+		"node_modules/is-finite": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
 			"dev": true,
 			"optional": true,
-			"requires": {
-				"npm-conf": "^1.1.0"
+			"engines": {
+				"node": ">=0.10.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"get-size": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/get-size/-/get-size-2.0.3.tgz",
-			"integrity": "sha512-lXNzT/h/dTjTxRbm9BXb+SGxxzkm97h/PCIKtlN/CBCxxmkkIVV21udumMS93MuVTDX583gqc94v3RjuHmI+2Q=="
+		"node_modules/is-fullwidth-code-point": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"get-stdin": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz",
-			"integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=",
-			"dev": true
+		"node_modules/is-generator-fn": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"get-stream": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+		"node_modules/is-gif": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
+			"integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
 			"dev": true,
 			"optional": true,
-			"requires": {
-				"pump": "^3.0.0"
+			"dependencies": {
+				"file-type": "^10.4.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"get-symbol-description": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-			"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+		"node_modules/is-glob": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+			"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"get-intrinsic": "^1.1.1"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				}
+				"is-extglob": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"get-value": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-			"integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-			"dev": true
+		"node_modules/is-jpg": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz",
+			"integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"getobject": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
-			"integrity": "sha512-tbUz6AKKKr2YiMB+fLWIgq5ZeBOobop9YMMAU9dC54/ot2ksMXt3DOFyBuhZw6ptcVszEykgByK20j7W9jHFag==",
-			"dev": true
+		"node_modules/is-natural-number": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
+			"integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+			"dev": true,
+			"optional": true
 		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+		"node_modules/is-negative-zero": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+			"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0"
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"gettext-parser": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.4.0.tgz",
-			"integrity": "sha512-sedZYLHlHeBop/gZ1jdg59hlUEcpcZJofLq2JFwJT1zTqAU3l2wFv6IsuwFHGqbiT9DWzMUW4/em2+hspnmMMA==",
-			"requires": {
-				"encoding": "^0.1.12",
-				"safe-buffer": "^5.1.1"
+		"node_modules/is-number": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"gifsicle": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-4.0.1.tgz",
-			"integrity": "sha512-A/kiCLfDdV+ERV/UB+2O41mifd+RxH8jlRG8DMxZO84Bma/Fw0htqZ+hY2iaalLRNyUu7tYZQslqUBJxBggxbg==",
+		"node_modules/is-number-object": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"bin-build": "^3.0.0",
-				"bin-wrapper": "^4.0.0",
-				"execa": "^1.0.0",
-				"logalot": "^2.0.0"
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"glob": {
-			"version": "7.1.6",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+		"node_modules/is-object": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
+			"integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
 			"dev": true,
-			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+			"optional": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"glob-parent": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-			"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+		"node_modules/is-path-cwd": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
 			"dev": true,
-			"requires": {
-				"is-glob": "^4.0.1"
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"glob-to-regexp": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz",
-			"integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=",
-			"dev": true
-		},
-		"global-modules": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-			"integrity": "sha512-JeXuCbvYzYXcwE6acL9V2bAOeSIGl4dD+iwLY9iUx2VBJJ80R18HCn+JCwHM9Oegdfya3lEkGCdaRkSyc10hDA==",
+		"node_modules/is-path-in-cwd": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
 			"dev": true,
-			"requires": {
-				"global-prefix": "^0.1.4",
-				"is-windows": "^0.2.0"
-			},
 			"dependencies": {
-				"is-windows": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-					"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-					"dev": true
-				}
+				"is-path-inside": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"global-prefix": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-			"integrity": "sha512-gOPiyxcD9dJGCEArAhF4Hd0BAqvAe/JzERP7tYumE4yIkmIedPUVXcJFWbV3/p/ovIIvKjkrTk+f1UVkq7vvbw==",
+		"node_modules/is-path-inside": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
 			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.0",
-				"ini": "^1.3.4",
-				"is-windows": "^0.2.0",
-				"which": "^1.2.12"
-			},
 			"dependencies": {
-				"is-windows": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-					"integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==",
-					"dev": true
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
+				"path-is-inside": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"globals": {
-			"version": "11.12.0",
-			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-			"dev": true
+		"node_modules/is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"globalyzer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz",
-			"integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==",
-			"dev": true
+		"node_modules/is-plain-object": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+			"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"globby": {
-			"version": "11.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+		"node_modules/is-png": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz",
+			"integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=",
 			"dev": true,
-			"requires": {
-				"array-union": "^2.1.0",
-				"dir-glob": "^3.0.1",
-				"fast-glob": "^3.2.9",
-				"ignore": "^5.2.0",
-				"merge2": "^1.4.1",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"array-union": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-					"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-					"dev": true
-				}
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"globjoin": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
+		"node_modules/is-potential-custom-element-name": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
 			"dev": true
 		},
-		"globrex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz",
-			"integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==",
-			"dev": true
+		"node_modules/is-promise": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
+			"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
 		},
-		"globule": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz",
-			"integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
+		"node_modules/is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
 			"dev": true,
-			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"glur": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/glur/-/glur-1.1.2.tgz",
-			"integrity": "sha1-8g6jbbEDv8KSNDkh8fkeg8NGdok=",
-			"dev": true
-		},
-		"good-listener": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-			"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
-			"requires": {
-				"delegate": "^3.1.2"
+		"node_modules/is-relative": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+			"dev": true,
+			"dependencies": {
+				"is-unc-path": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"got": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/got/-/got-7.1.0.tgz",
-			"integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==",
+		"node_modules/is-retry-allowed": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+			"integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
 			"dev": true,
 			"optional": true,
-			"requires": {
-				"decompress-response": "^3.2.0",
-				"duplexer3": "^0.1.4",
-				"get-stream": "^3.0.0",
-				"is-plain-obj": "^1.1.0",
-				"is-retry-allowed": "^1.0.0",
-				"is-stream": "^1.0.0",
-				"isurl": "^1.0.0-alpha5",
-				"lowercase-keys": "^1.0.0",
-				"p-cancelable": "^0.3.0",
-				"p-timeout": "^1.1.1",
-				"safe-buffer": "^5.0.1",
-				"timed-out": "^4.0.0",
-				"url-parse-lax": "^1.0.0",
-				"url-to-options": "^1.0.1"
-			},
-			"dependencies": {
-				"get-stream": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-					"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-					"dev": true,
-					"optional": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"graceful-fs": {
-			"version": "4.2.4",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-			"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-		},
-		"gradient-parser": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/gradient-parser/-/gradient-parser-0.1.5.tgz",
-			"integrity": "sha512-+uPlcVbjrKOnTzvz0MjTj7BfACj8OmxIa1moIjJV7btvhUMSJk0D47RfDCgDrZE3dYMz9Cf5xKJwnrKLjUq0KQ=="
-		},
-		"grapheme-splitter": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-			"integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-			"dev": true
-		},
-		"grunt": {
-			"version": "1.5.3",
-			"resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
-			"integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
+		"node_modules/is-shared-array-buffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
 			"dev": true,
-			"requires": {
-				"dateformat": "~3.0.3",
-				"eventemitter2": "~0.4.13",
-				"exit": "~0.1.2",
-				"findup-sync": "~0.3.0",
-				"glob": "~7.1.6",
-				"grunt-cli": "~1.4.3",
-				"grunt-known-options": "~2.0.0",
-				"grunt-legacy-log": "~3.0.0",
-				"grunt-legacy-util": "~2.0.1",
-				"iconv-lite": "~0.4.13",
-				"js-yaml": "~3.14.0",
-				"minimatch": "~3.0.4",
-				"mkdirp": "~1.0.4",
-				"nopt": "~3.0.6",
-				"rimraf": "~3.0.2"
-			},
-			"dependencies": {
-				"grunt-cli": {
-					"version": "1.4.3",
-					"resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
-					"integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
-					"dev": true,
-					"requires": {
-						"grunt-known-options": "~2.0.0",
-						"interpret": "~1.1.0",
-						"liftup": "~3.0.1",
-						"nopt": "~4.0.1",
-						"v8flags": "~3.2.0"
-					},
-					"dependencies": {
-						"nopt": {
-							"version": "4.0.3",
-							"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
-							"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
-							"dev": true,
-							"requires": {
-								"abbrev": "1",
-								"osenv": "^0.1.4"
-							}
-						}
-					}
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				},
-				"interpret": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
-					"integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
+			"dependencies": {
+				"call-bind": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"grunt-banner": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/grunt-banner/-/grunt-banner-0.6.0.tgz",
-			"integrity": "sha1-P4eQIdEj+linuloLb7a+QStYhaw=",
+		"node_modules/is-stream": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"grunt-contrib-clean": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-clean/-/grunt-contrib-clean-2.0.1.tgz",
-			"integrity": "sha512-uRvnXfhiZt8akb/ZRDHJpQQtkkVkqc/opWO4Po/9ehC2hPxgptB9S6JHDC/Nxswo4CJSM0iFPT/Iym3cEMWzKA==",
+		"node_modules/is-string": {
+			"version": "1.0.7",
+			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
 			"dev": true,
-			"requires": {
-				"async": "^3.2.3",
-				"rimraf": "^2.6.2"
-			},
 			"dependencies": {
-				"async": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-					"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-					"dev": true
-				}
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"grunt-contrib-concat": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-2.1.0.tgz",
-			"integrity": "sha512-Vnl95JIOxfhEN7bnYIlCgQz41kkbi7tsZ/9a4usZmxNxi1S2YAIOy8ysFmO8u4MN26Apal1O106BwARdaNxXQw==",
+		"node_modules/is-svg": {
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.4.0.tgz",
+			"integrity": "sha512-v+AgVwiK5DsGtT9ng+m4mClp6zDAmwrW8nZi6Gg15qzvBnRWWdfWA1TGaXyCDnWq5g5asofIgMVl3PjKxvk1ug==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.1.2",
-				"source-map": "^0.5.3"
-			},
+			"optional": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"fast-xml-parser": "^4.1.3"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/is-symbol": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+			"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+			"dev": true,
+			"dependencies": {
+				"has-symbols": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"grunt-contrib-copy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz",
-			"integrity": "sha1-cGDGWB6QS4qw0A8HbgqPbj58NXM=",
+		"node_modules/is-typed-array": {
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+			"integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.1",
-				"file-sync-cmp": "^0.1.0"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
+				"which-typed-array": "^1.1.11"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"grunt-contrib-cssmin": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-4.0.0.tgz",
-			"integrity": "sha512-jXU+Zlk8Q8XztOGNGpjYlD/BDQ0n95IHKrQKtFR7Gd8hZrzgqiG1Ra7cGYc8h2DD9vkSFGNlweb9Q00rBxOK2w==",
+		"node_modules/is-typedarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+			"dev": true
+		},
+		"node_modules/is-unc-path": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.1.0",
-				"clean-css": "^5.0.1",
-				"maxmin": "^3.0.0"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"gzip-size": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-					"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-					"dev": true,
-					"requires": {
-						"duplexer": "^0.1.1",
-						"pify": "^4.0.1"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"maxmin": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
-					"integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
-					"dev": true,
-					"requires": {
-						"chalk": "^4.1.0",
-						"figures": "^3.2.0",
-						"gzip-size": "^5.1.1",
-						"pretty-bytes": "^5.3.0"
-					}
-				},
-				"pretty-bytes": {
-					"version": "5.6.0",
-					"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-					"integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"unc-path-regex": "^0.1.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"grunt-contrib-imagemin": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-imagemin/-/grunt-contrib-imagemin-4.0.0.tgz",
-			"integrity": "sha512-2GYQBQFfJLjeTThJ8E7+vLgvgfOh78u0bgieIK85c2Rv9V6ssd2AvBvuF7T26mK261EN/SlNefpW5+zGWzfrVw==",
+		"node_modules/is-unicode-supported": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true,
-			"requires": {
-				"chalk": "^2.4.1",
-				"imagemin": "^6.0.0",
-				"imagemin-gifsicle": "^6.0.1",
-				"imagemin-jpegtran": "^6.0.0",
-				"imagemin-optipng": "^6.0.0",
-				"imagemin-svgo": "^7.0.0",
-				"p-map": "^1.2.0",
-				"plur": "^3.0.1",
-				"pretty-bytes": "^5.1.0"
+			"engines": {
+				"node": ">=10"
 			},
-			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"irregular-plurals": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-2.0.0.tgz",
-					"integrity": "sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==",
-					"dev": true
-				},
-				"p-map": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-					"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-					"dev": true
-				},
-				"plur": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/plur/-/plur-3.1.1.tgz",
-					"integrity": "sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==",
-					"dev": true,
-					"requires": {
-						"irregular-plurals": "^2.0.0"
-					}
-				},
-				"pretty-bytes": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz",
-					"integrity": "sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==",
-					"dev": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"grunt-contrib-jshint": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-3.2.0.tgz",
-			"integrity": "sha512-pcXWCSZWfoMSvcV4BwH21TUtLtcX0Ms8IGuOPIcLeXK3fud9KclY7iqMKY94jFx8TxZzh028YYtpR+io8DiEaQ==",
+		"node_modules/is-utf8": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/is-weakref": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "~4.1.2",
-				"hooker": "^0.2.3",
-				"jshint": "~2.13.4"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"call-bind": "^1.0.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"grunt-contrib-qunit": {
-			"version": "6.2.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-6.2.0.tgz",
-			"integrity": "sha512-M48jMvwutP2yv+xxxsuSsKOmyy1mXvakswCUJqyPe6OYa4mKvGKjY4c3Ujw+1HnhXnmJQIqIWiQ8U5yLW+sfiA==",
+		"node_modules/is-windows": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
 			"dev": true,
-			"requires": {
-				"eventemitter2": "^6.4.2",
-				"p-each-series": "^2.1.0",
-				"puppeteer": "^9.0.0"
-			},
-			"dependencies": {
-				"eventemitter2": {
-					"version": "6.4.5",
-					"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz",
-					"integrity": "sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"grunt-contrib-uglify": {
-			"version": "5.2.2",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-5.2.2.tgz",
-			"integrity": "sha512-ITxiWxrjjP+RZu/aJ5GLvdele+sxlznh+6fK9Qckio5ma8f7Iv8woZjRkGfafvpuygxNefOJNc+hfjjBayRn2Q==",
+		"node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.1.2",
-				"maxmin": "^3.0.0",
-				"uglify-js": "^3.16.1",
-				"uri-path": "^1.0.0"
-			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"grunt-contrib-watch": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz",
-			"integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==",
+		"node_modules/isarray": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+		},
+		"node_modules/isexe": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+			"dev": true
+		},
+		"node_modules/isobject": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true,
-			"requires": {
-				"async": "^2.6.0",
-				"gaze": "^1.1.0",
-				"lodash": "^4.17.10",
-				"tiny-lr": "^1.1.1"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"grunt-file-append": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/grunt-file-append/-/grunt-file-append-0.0.7.tgz",
-			"integrity": "sha1-P376M2lvoFdwsoCU9EUIyvxdLto=",
+		"node_modules/isstream": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
 			"dev": true
 		},
-		"grunt-jsdoc": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/grunt-jsdoc/-/grunt-jsdoc-2.4.1.tgz",
-			"integrity": "sha512-S0zxU0wDewRu7z+vijEItOWe/UttxWVmvz0qz2ZVcAYR2GpXjsiski2CAVN0b18t2qeVLdmxZkJaEWCOsKzcAw==",
+		"node_modules/istanbul-lib-coverage": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
 			"dev": true,
-			"requires": {
-				"cross-spawn": "^7.0.1",
-				"jsdoc": "^3.6.3"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"grunt-jsvalidate": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/grunt-jsvalidate/-/grunt-jsvalidate-0.2.2.tgz",
-			"integrity": "sha1-/QlEJYiNbmPfqgbPsJ7gUrjrvo8=",
+		"node_modules/istanbul-lib-instrument": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
 			"dev": true,
-			"requires": {
-				"esprima": "~1.0.0"
-			},
 			"dependencies": {
-				"esprima": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
-					"integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
-					"dev": true
-				}
+				"@babel/core": "^7.12.3",
+				"@babel/parser": "^7.14.7",
+				"@istanbuljs/schema": "^0.1.2",
+				"istanbul-lib-coverage": "^3.2.0",
+				"semver": "^6.3.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"grunt-known-options": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
-			"integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
-			"dev": true
+		"node_modules/istanbul-lib-instrument/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
+			}
 		},
-		"grunt-legacy-log": {
+		"node_modules/istanbul-lib-report": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-3.0.0.tgz",
-			"integrity": "sha512-GHZQzZmhyq0u3hr7aHW4qUH0xDzwp2YXldLPZTCjlOeGscAOWWPftZG3XioW8MasGp+OBRIu39LFx14SLjXRcA==",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
 			"dev": true,
-			"requires": {
-				"colors": "~1.1.2",
-				"grunt-legacy-log-utils": "~2.1.0",
-				"hooker": "~0.2.3",
-				"lodash": "~4.17.19"
+			"dependencies": {
+				"istanbul-lib-coverage": "^3.0.0",
+				"make-dir": "^3.0.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"grunt-legacy-log-utils": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.1.0.tgz",
-			"integrity": "sha512-lwquaPXJtKQk0rUM1IQAop5noEpwFqOXasVoedLeNzaibf/OPWjKYvvdqnEHNmU+0T0CaReAXIbGo747ZD+Aaw==",
+		"node_modules/istanbul-lib-report/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "~4.1.0",
-				"lodash": "~4.17.19"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"grunt-legacy-util": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-2.0.1.tgz",
-			"integrity": "sha512-2bQiD4fzXqX8rhNdXkAywCadeqiPiay0oQny77wA2F3WF4grPJXCvAcyoWUJV+po/b15glGkxuSiQCK299UC2w==",
+		"node_modules/istanbul-lib-report/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"async": "~3.2.0",
-				"exit": "~0.1.2",
-				"getobject": "~1.0.0",
-				"hooker": "~0.2.3",
-				"lodash": "~4.17.21",
-				"underscore.string": "~3.3.5",
-				"which": "~2.0.2"
+			"dependencies": {
+				"has-flag": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/istanbul-lib-source-maps": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+			"dev": true,
 			"dependencies": {
-				"async": {
-					"version": "3.2.3",
-					"resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-					"integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
-					"dev": true
-				}
+				"debug": "^4.1.1",
+				"istanbul-lib-coverage": "^3.0.0",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"grunt-patch-wordpress": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/grunt-patch-wordpress/-/grunt-patch-wordpress-3.0.1.tgz",
-			"integrity": "sha512-jdeqk/r0hSPez2Afgj+Zz8R6tFYDyhNKTNZvJIE5lAqmkms2ox4a+UfbZWhf9ObFb+Q4JYKIXqJruGzujzmYgA==",
+		"node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
-			"requires": {
-				"grunt": "^1.0.3",
-				"inquirer": "^5.1.0",
-				"request": "^2.83.0",
-				"xmlrpc": "^1.3.1"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"grunt-postcss": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.9.0.tgz",
-			"integrity": "sha512-lglLcVaoOIqH0sFv7RqwUKkEFGQwnlqyAKbatxZderwZGV1nDyKHN7gZS9LUiTx1t5GOvRBx0BEalHMyVwFAIA==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.1.0",
-				"diff": "^3.0.0",
-				"postcss": "^6.0.11"
-			},
-			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"diff": {
-					"version": "3.5.0",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-					"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+		"node_modules/istanbul-reports": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+			"integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+			"dev": true,
+			"dependencies": {
+				"html-escaper": "^2.0.0",
+				"istanbul-lib-report": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/isurl": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
+			"integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"has-to-string-tag-x": "^1.2.0",
+				"is-object": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
-		"grunt-replace-lts": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-replace-lts/-/grunt-replace-lts-1.1.0.tgz",
-			"integrity": "sha512-YCLFHDM7/mEb+7tzdstb756ZYEUTSiyiEj5XhfLIxmVrDKShXQ8STD9f0s7HZXwwHwxFgPr4zELSP7J3kYra7w==",
+		"node_modules/jest": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest/-/jest-29.6.1.tgz",
+			"integrity": "sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.0",
-				"file-sync-cmp": "^0.1.0",
-				"lodash": "^4.17.15",
-				"next-applause": "^2.2.4"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
+				"@jest/core": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"import-local": "^3.0.2",
+				"jest-cli": "^29.6.1"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
 				}
 			}
 		},
-		"grunt-rtlcss": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/grunt-rtlcss/-/grunt-rtlcss-2.0.2.tgz",
-			"integrity": "sha512-WbI2thnwlF04N+xvJu+NxqEaCyPuLyar196SYhEQFZ2EJHkOS8YYE+Zkh+X9cWhwAtKp7ZEpR/IKXcyQggOIsQ==",
+		"node_modules/jest-changed-files": {
+			"version": "29.5.0",
+			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.5.0.tgz",
+			"integrity": "sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.0.0",
-				"rtlcss": "^2.0.0"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
+				"execa": "^5.0.0",
+				"p-limit": "^3.1.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"grunt-sass": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-3.1.0.tgz",
-			"integrity": "sha512-90s27H7FoCDcA8C8+R0GwC+ntYD3lG6S/jqcavWm3bn9RiJTmSfOvfbFa1PXx4NbBWuiGQMLfQTj/JvvqT5w6A==",
-			"dev": true
+		"node_modules/jest-changed-files/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"grunt-webpack": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/grunt-webpack/-/grunt-webpack-5.0.0.tgz",
-			"integrity": "sha512-C7emzVIGJhZ5V5ZYjylr9sDD9PE9Dh/55NaSzP2P2dhif+m/1gHbjDZQ7PDzguyuzwBz4Qc8voQHR06FSp4CKg==",
+		"node_modules/jest-changed-files/node_modules/execa": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+			"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
 			"dev": true,
-			"requires": {
-				"deep-for-each": "^3.0.0",
-				"lodash": "^4.17.19"
+			"dependencies": {
+				"cross-spawn": "^7.0.3",
+				"get-stream": "^6.0.0",
+				"human-signals": "^2.1.0",
+				"is-stream": "^2.0.0",
+				"merge-stream": "^2.0.0",
+				"npm-run-path": "^4.0.1",
+				"onetime": "^5.1.2",
+				"signal-exit": "^3.0.3",
+				"strip-final-newline": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/execa?sponsor=1"
 			}
 		},
-		"gzip-size": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-			"integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
+		"node_modules/jest-changed-files/node_modules/get-stream": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+			"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
 			"dev": true,
-			"requires": {
-				"duplexer": "^0.1.2"
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"handle-thing": {
+		"node_modules/jest-changed-files/node_modules/is-stream": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-			"integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-			"dev": true
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
+			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+			"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"har-validator": {
-			"version": "5.1.5",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+		"node_modules/jest-changed-files/node_modules/npm-run-path": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+			"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 			"dev": true,
-			"requires": {
-				"ajv": "^6.12.3",
-				"har-schema": "^2.0.0"
+			"dependencies": {
+				"path-key": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"hard-rejection": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-			"integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-			"dev": true
+		"node_modules/jest-changed-files/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+			"dev": true,
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"requires": {
-				"function-bind": "^1.1.1"
+		"node_modules/jest-changed-files/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"has-ansi": {
+		"node_modules/jest-changed-files/node_modules/shebang-command": {
 			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"requires": {
-				"ansi-regex": "^2.0.0"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				}
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"has-bigints": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-			"integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-			"dev": true
-		},
-		"has-flag": {
+		"node_modules/jest-changed-files/node_modules/shebang-regex": {
 			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"has-property-descriptors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-			"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+		"node_modules/jest-circus": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.6.1.tgz",
+			"integrity": "sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==",
 			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.1.1"
-			},
 			"dependencies": {
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				}
+				"@jest/environment": "^29.6.1",
+				"@jest/expect": "^29.6.1",
+				"@jest/test-result": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"co": "^4.6.0",
+				"dedent": "^0.7.0",
+				"is-generator-fn": "^2.0.0",
+				"jest-each": "^29.6.1",
+				"jest-matcher-utils": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-runtime": "^29.6.1",
+				"jest-snapshot": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"p-limit": "^3.1.0",
+				"pretty-format": "^29.6.1",
+				"pure-rand": "^6.0.0",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"has-symbol-support-x": {
-			"version": "1.4.2",
-			"resolved": "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz",
-			"integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==",
+		"node_modules/jest-circus/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"optional": true
-		},
-		"has-symbols": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-			"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-			"dev": true
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"has-to-string-tag-x": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz",
-			"integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==",
+		"node_modules/jest-circus/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"has-symbol-support-x": "^1.4.1"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"has-tostringtag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+		"node_modules/jest-circus/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"has-symbols": "^1.0.2"
-			},
 			"dependencies": {
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"has-value": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+		"node_modules/jest-circus/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/jest-circus/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"has-values": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+		"node_modules/jest-circus/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
-			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
-			},
 			"dependencies": {
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.1.5"
-					}
-				}
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"header-case": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz",
-			"integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==",
-			"requires": {
-				"capital-case": "^1.0.4",
-				"tslib": "^2.0.3"
+		"node_modules/jest-circus/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"hex-color-regex": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-			"integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-			"dev": true
-		},
-		"hey-listen": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/hey-listen/-/hey-listen-1.0.8.tgz",
-			"integrity": "sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q=="
-		},
-		"highlight-words-core": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/highlight-words-core/-/highlight-words-core-1.2.2.tgz",
-			"integrity": "sha512-BXUKIkUuh6cmmxzi5OIbUJxrG8OAk2MqoL1DtO3Wo9D2faJg2ph5ntyuQeLqaHJmzER6H5tllCDA9ZnNe9BVGg=="
-		},
-		"history": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
-			"integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
-			"requires": {
-				"@babel/runtime": "^7.7.6"
+		"node_modules/jest-cli": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.6.1.tgz",
+			"integrity": "sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==",
+			"dev": true,
+			"dependencies": {
+				"@jest/core": "^29.6.1",
+				"@jest/test-result": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"chalk": "^4.0.0",
+				"exit": "^0.1.2",
+				"graceful-fs": "^4.2.9",
+				"import-local": "^3.0.2",
+				"jest-config": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jest-validate": "^29.6.1",
+				"prompts": "^2.0.1",
+				"yargs": "^17.3.1"
+			},
+			"bin": {
+				"jest": "bin/jest.js"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+			},
+			"peerDependenciesMeta": {
+				"node-notifier": {
+					"optional": true
+				}
 			}
 		},
-		"hoist-non-react-statics": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-			"requires": {
-				"react-is": "^16.7.0"
+		"node_modules/jest-cli/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"homedir-polyfill": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-			"integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+		"node_modules/jest-cli/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"parse-passwd": "^1.0.0"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"hooker": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz",
-			"integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
-			"dev": true
-		},
-		"hosted-git-info": {
-			"version": "2.8.9",
-			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-			"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-			"dev": true
-		},
-		"hoverintent": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/hoverintent/-/hoverintent-2.2.1.tgz",
-			"integrity": "sha512-VyU54L1xW5rSqpsv/LJ6ecymGXsXXeGs9iVEKot4kKBCq5UodSAuy3DqX686LZxEpaMEfeCHPu4LndsMX5Q9eQ=="
-		},
-		"hpack.js": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-			"integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+		"node_modules/jest-cli/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"hpq": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/hpq/-/hpq-1.3.0.tgz",
-			"integrity": "sha512-fvYTvdCFOWQupGxqkahrkA+ERBuMdzkxwtUdKrxR6rmMd4Pfl+iZ1QiQYoaZ0B/v0y59MOMnz3XFUWbT50/NWA=="
-		},
-		"hsl-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-			"integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-			"dev": true
-		},
-		"hsla-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-			"integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-			"dev": true
-		},
-		"html-element-map": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
-			"integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
+		"node_modules/jest-cli/node_modules/cliui": {
+			"version": "8.0.1",
+			"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+			"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 			"dev": true,
-			"requires": {
-				"array.prototype.filter": "^1.0.0",
-				"call-bind": "^1.0.2"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				}
+				"string-width": "^4.2.0",
+				"strip-ansi": "^6.0.1",
+				"wrap-ansi": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"html-encoding-sniffer": {
+		"node_modules/jest-cli/node_modules/color-convert": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"whatwg-encoding": "^1.0.5"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"html-entities": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-			"integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
-			"dev": true
-		},
-		"html-escaper": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+		"node_modules/jest-cli/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"html-tags": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+		"node_modules/jest-cli/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 			"dev": true
 		},
-		"htmlparser2": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-			"integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
+		"node_modules/jest-cli/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"entities": "^4.3.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				},
-				"entities": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-					"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"http-cache-semantics": {
-			"version": "3.8.1",
-			"resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-			"integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+		"node_modules/jest-cli/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"http-deceiver": {
-			"version": "1.2.7",
-			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-			"integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
-			"dev": true
+		"node_modules/jest-cli/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"http-errors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-			"integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+		"node_modules/jest-cli/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
 			"dev": true,
-			"requires": {
-				"depd": "2.0.0",
-				"inherits": "2.0.4",
-				"setprototypeof": "1.2.0",
-				"statuses": "2.0.1",
-				"toidentifier": "1.0.1"
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"http-parser-js": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-			"integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
-			"dev": true
+		"node_modules/jest-cli/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"http-proxy": {
-			"version": "1.18.1",
-			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+		"node_modules/jest-cli/node_modules/wrap-ansi": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+			"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
 			"dev": true,
-			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
+			"dependencies": {
+				"ansi-styles": "^4.0.0",
+				"string-width": "^4.1.0",
+				"strip-ansi": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/wrap-ansi?sponsor=1"
 			}
 		},
-		"http-proxy-agent": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+		"node_modules/jest-cli/node_modules/y18n": {
+			"version": "5.0.8",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+			"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
 			"dev": true,
-			"requires": {
-				"@tootallnate/once": "1",
-				"agent-base": "6",
-				"debug": "4"
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+		"node_modules/jest-cli/node_modules/yargs": {
+			"version": "17.7.2",
+			"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+			"integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
 			"dev": true,
-			"requires": {
-				"@types/http-proxy": "^1.17.8",
-				"http-proxy": "^1.18.1",
-				"is-glob": "^4.0.1",
-				"is-plain-obj": "^3.0.0",
-				"micromatch": "^4.0.2"
+			"dependencies": {
+				"cliui": "^8.0.1",
+				"escalade": "^3.1.1",
+				"get-caller-file": "^2.0.5",
+				"require-directory": "^2.1.1",
+				"string-width": "^4.2.3",
+				"y18n": "^5.0.5",
+				"yargs-parser": "^21.1.1"
 			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-cli/node_modules/yargs-parser": {
+			"version": "21.1.1",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+			"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jest-config": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.6.1.tgz",
+			"integrity": "sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==",
+			"dev": true,
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"is-plain-obj": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
+				"@babel/core": "^7.11.6",
+				"@jest/test-sequencer": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"babel-jest": "^29.6.1",
+				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
+				"deepmerge": "^4.2.2",
+				"glob": "^7.1.3",
+				"graceful-fs": "^4.2.9",
+				"jest-circus": "^29.6.1",
+				"jest-environment-node": "^29.6.1",
+				"jest-get-type": "^29.4.3",
+				"jest-regex-util": "^29.4.3",
+				"jest-resolve": "^29.6.1",
+				"jest-runner": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jest-validate": "^29.6.1",
+				"micromatch": "^4.0.4",
+				"parse-json": "^5.2.0",
+				"pretty-format": "^29.6.1",
+				"slash": "^3.0.0",
+				"strip-json-comments": "^3.1.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"@types/node": "*",
+				"ts-node": ">=9.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
 				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
+				"ts-node": {
+					"optional": true
 				}
 			}
 		},
-		"http-signature": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+		"node_modules/jest-config/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"https-proxy-agent": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+		"node_modules/jest-config/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 			"dev": true,
-			"requires": {
-				"agent-base": "6",
-				"debug": "4"
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"human-signals": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-			"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-			"dev": true
-		},
-		"iconv-lite": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-			"integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3.0.0"
+		"node_modules/jest-config/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"icss-utils": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-			"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-			"dev": true
-		},
-		"ieee754": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-			"dev": true
+		"node_modules/jest-config/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"ignore": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-			"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+		"node_modules/jest-config/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"ignore-walk": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
-			"integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
+		"node_modules/jest-config/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"requires": {
-				"minimatch": "^3.0.4"
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"imagemin": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/imagemin/-/imagemin-6.1.0.tgz",
-			"integrity": "sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==",
+		"node_modules/jest-config/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"file-type": "^10.7.0",
-				"globby": "^8.0.1",
-				"make-dir": "^1.0.0",
-				"p-pipe": "^1.1.0",
-				"pify": "^4.0.1",
-				"replace-ext": "^1.0.0"
-			},
-			"dependencies": {
-				"@nodelib/fs.stat": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-					"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-					"dev": true
-				},
-				"dir-glob": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
-					"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
-					"dev": true,
-					"requires": {
-						"arrify": "^1.0.1",
-						"path-type": "^3.0.0"
-					}
-				},
-				"fast-glob": {
-					"version": "2.2.7",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-					"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-					"dev": true,
-					"requires": {
-						"@mrmlnc/readdir-enhanced": "^2.2.1",
-						"@nodelib/fs.stat": "^1.1.2",
-						"glob-parent": "^3.1.0",
-						"is-glob": "^4.0.0",
-						"merge2": "^1.2.3",
-						"micromatch": "^3.1.10"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "^3.1.0",
-						"path-dirname": "^1.0.0"
-					},
-					"dependencies": {
-						"is-glob": {
-							"version": "3.1.0",
-							"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-							"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-							"dev": true,
-							"requires": {
-								"is-extglob": "^2.1.0"
-							}
-						}
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true
-						}
-					}
-				},
-				"ignore": {
-					"version": "3.3.10",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-					"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-					"dev": true
-				},
-				"make-dir": {
-					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-					"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-					"dev": true,
-					"requires": {
-						"pify": "^3.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true
-						}
-					}
-				},
-				"path-type": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-					"dev": true,
-					"requires": {
-						"pify": "^3.0.0"
-					},
-					"dependencies": {
-						"pify": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-							"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-							"dev": true
-						}
-					}
-				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"imagemin-gifsicle": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-6.0.1.tgz",
-			"integrity": "sha512-kuu47c6iKDQ6R9J10xCwL0lgs0+sMz3LRHqRcJ2CRBWdcNmo3T5hUaM8hSZfksptZXJLGKk8heSAvwtSdB1Fng==",
+		"node_modules/jest-config/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"exec-buffer": "^3.0.0",
-				"gifsicle": "^4.0.0",
-				"is-gif": "^3.0.0"
+			"engines": {
+				"node": ">=0.12.0"
 			}
 		},
-		"imagemin-jpegtran": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/imagemin-jpegtran/-/imagemin-jpegtran-6.0.0.tgz",
-			"integrity": "sha512-Ih+NgThzqYfEWv9t58EItncaaXIHR0u9RuhKa8CtVBlMBvY0dCIxgQJQCfwImA4AV1PMfmUKlkyIHJjb7V4z1g==",
+		"node_modules/jest-config/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"exec-buffer": "^3.0.0",
-				"is-jpg": "^2.0.0",
-				"jpegtran-bin": "^4.0.0"
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"imagemin-optipng": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-6.0.0.tgz",
-			"integrity": "sha512-FoD2sMXvmoNm/zKPOWdhKpWdFdF9qiJmKC17MxZJPH42VMAp17/QENI/lIuP7LCUnLVAloO3AUoTSNzfhpyd8A==",
+		"node_modules/jest-config/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"exec-buffer": "^3.0.0",
-				"is-png": "^1.0.0",
-				"optipng-bin": "^5.0.0"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"imagemin-svgo": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-7.1.0.tgz",
-			"integrity": "sha512-0JlIZNWP0Luasn1HT82uB9nU9aa+vUj6kpT+MjPW11LbprXC+iC4HDwn1r4Q2/91qj4iy9tRZNsFySMlEpLdpg==",
+		"node_modules/jest-config/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"is-svg": "^4.2.1",
-				"svgo": "^1.3.2"
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
 			}
 		},
-		"imagesloaded": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz",
-			"integrity": "sha512-ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA==",
-			"requires": {
-				"ev-emitter": "^1.0.0"
+		"node_modules/jest-dev-server": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.2.0.tgz",
+			"integrity": "sha512-ZWh8CuvxwjhYfvw4tGeftziqIvw/26R6AG3OTgNTQeXul8aZz48RQjDpnlDwnWX53jxJJl9fcigqIdSU5lYZuw==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^4.1.2",
+				"cwd": "^0.10.0",
+				"find-process": "^1.4.7",
+				"prompts": "^2.4.2",
+				"spawnd": "^6.2.0",
+				"tree-kill": "^1.2.2",
+				"wait-on": "^6.0.1"
 			}
 		},
-		"immutable": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-			"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-			"dev": true
-		},
-		"import-fresh": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-			"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-			"requires": {
-				"parent-module": "^1.0.0",
-				"resolve-from": "^4.0.0"
+		"node_modules/jest-dev-server/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"import-lazy": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-			"integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-			"dev": true
-		},
-		"import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+		"node_modules/jest-dev-server/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"pkg-dir": "^4.2.0",
-				"resolve-cwd": "^3.0.0"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-			"dev": true
-		},
-		"indent-string": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-			"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+		"node_modules/jest-dev-server/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"repeating": "^2.0.0"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"indexes-of": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-			"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+		"node_modules/jest-dev-server/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+		"node_modules/jest-dev-server/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-		},
-		"ini": {
-			"version": "1.3.8",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-			"dev": true
-		},
-		"ink-docstrap": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/ink-docstrap/-/ink-docstrap-1.3.2.tgz",
-			"integrity": "sha512-STx5orGQU1gfrkoI/fMU7lX6CSP7LBGO10gXNgOZhwKhUqbtNjCkYSewJtNnLmWP1tAGN6oyEpG1HFPw5vpa5Q==",
+		"node_modules/jest-dev-server/node_modules/rxjs": {
+			"version": "7.8.0",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+			"integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
 			"dev": true,
-			"requires": {
-				"moment": "^2.14.1",
-				"sanitize-html": "^1.13.0"
+			"dependencies": {
+				"tslib": "^2.1.0"
 			}
 		},
-		"inquirer": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
-			"integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+		"node_modules/jest-dev-server/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"ansi-escapes": "^3.0.0",
-				"chalk": "^2.0.0",
-				"cli-cursor": "^2.1.0",
-				"cli-width": "^2.0.0",
-				"external-editor": "^2.1.0",
-				"figures": "^2.0.0",
-				"lodash": "^4.3.0",
-				"mute-stream": "0.0.7",
-				"run-async": "^2.2.0",
-				"rxjs": "^5.5.2",
-				"string-width": "^2.1.0",
-				"strip-ansi": "^4.0.0",
-				"through": "^2.3.6"
-			},
 			"dependencies": {
-				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
-					"integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"figures": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"install-changed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/install-changed/-/install-changed-1.1.0.tgz",
-			"integrity": "sha512-APUWMdQnwGcyv9bmuvgxCcrR6qtD996+hofEEAPGSjsvGIZuBpBF0yrYAKOl9tmhm2AzxJC4EXUbxZ/SId4NIA==",
-			"dev": true
-		},
-		"internal-slot": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+		"node_modules/jest-dev-server/node_modules/wait-on": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
+			"integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
 			"dev": true,
-			"requires": {
-				"get-intrinsic": "^1.1.0",
-				"has": "^1.0.3",
-				"side-channel": "^1.0.4"
+			"dependencies": {
+				"axios": "^0.25.0",
+				"joi": "^17.6.0",
+				"lodash": "^4.17.21",
+				"minimist": "^1.2.5",
+				"rxjs": "^7.5.4"
+			},
+			"bin": {
+				"wait-on": "bin/wait-on"
 			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/jest-diff": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.1.tgz",
+			"integrity": "sha512-FsNCvinvl8oVxpNLttNQX7FAq7vR+gMDGj90tiP7siWw1UdakWUGqrylpsYrpvj908IYckm5Y0Q7azNAozU1Kg==",
+			"dev": true,
 			"dependencies": {
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				}
+				"chalk": "^4.0.0",
+				"diff-sequences": "^29.4.3",
+				"jest-get-type": "^29.4.3",
+				"pretty-format": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"interpret": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-			"integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-			"dev": true
+		"node_modules/jest-diff/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"into-stream": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz",
-			"integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=",
+		"node_modules/jest-diff/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"from2": "^2.1.1",
-				"p-is-promise": "^1.1.0"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"ipaddr.js": {
+		"node_modules/jest-diff/node_modules/color-convert": {
 			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-			"integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-			"dev": true
-		},
-		"irregular-plurals": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
-			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
-			"dev": true
-		},
-		"is-absolute": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-			"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"is-relative": "^1.0.0",
-				"is-windows": "^1.0.1"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"is-absolute-url": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-			"integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
+		"node_modules/jest-diff/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"is-accessor-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+		"node_modules/jest-diff/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-arrayish": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+		"node_modules/jest-diff/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-bigint": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+		"node_modules/jest-docblock": {
+			"version": "29.4.3",
+			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.4.3.tgz",
+			"integrity": "sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==",
 			"dev": true,
-			"requires": {
-				"has-bigints": "^1.0.1"
+			"dependencies": {
+				"detect-newline": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"is-binary-path": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+		"node_modules/jest-each": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.6.1.tgz",
+			"integrity": "sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==",
 			"dev": true,
-			"requires": {
-				"binary-extensions": "^2.0.0"
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"chalk": "^4.0.0",
+				"jest-get-type": "^29.4.3",
+				"jest-util": "^29.6.1",
+				"pretty-format": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"is-boolean-object": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+		"node_modules/jest-each/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"has-tostringtag": "^1.0.0"
+			"dependencies": {
+				"color-convert": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-each/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
+		"node_modules/jest-each/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"is-callable": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
-			"integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
+		"node_modules/jest-each/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"is-color-stop": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-			"integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+		"node_modules/jest-each/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"css-color-names": "^0.0.4",
-				"hex-color-regex": "^1.1.0",
-				"hsl-regex": "^1.0.0",
-				"hsla-regex": "^1.0.0",
-				"rgb-regex": "^1.0.1",
-				"rgba-regex": "^1.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-core-module": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-			"integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
-			"requires": {
-				"has": "^1.0.3"
+		"node_modules/jest-each/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-data-descriptor": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+		"node_modules/jest-environment-jsdom": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.6.1.tgz",
+			"integrity": "sha512-PoY+yLaHzVRhVEjcVKSfJ7wXmJW4UqPYNhR05h7u/TK0ouf6DmRNZFBL/Z00zgQMyWGMBXn69/FmOvhEJu8cIw==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
+			"dependencies": {
+				"@jest/environment": "^29.6.1",
+				"@jest/fake-timers": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/jsdom": "^20.0.0",
+				"@types/node": "*",
+				"jest-mock": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jsdom": "^20.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"canvas": "^2.5.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
 			}
 		},
-		"is-date-object": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-			"integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-			"dev": true
-		},
-		"is-descriptor": {
-			"version": "0.1.6",
-			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+		"node_modules/jest-environment-node": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.6.1.tgz",
+			"integrity": "sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==",
 			"dev": true,
-			"requires": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
-			},
 			"dependencies": {
-				"kind-of": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-					"integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-					"dev": true
-				}
+				"@jest/environment": "^29.6.1",
+				"@jest/fake-timers": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"jest-mock": "^29.6.1",
+				"jest-util": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"is-directory": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-			"integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-			"dev": true
+		"node_modules/jest-get-type": {
+			"version": "29.4.3",
+			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz",
+			"integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"dev": true
+		"node_modules/jest-haste-map": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.6.1.tgz",
+			"integrity": "sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@types/graceful-fs": "^4.1.3",
+				"@types/node": "*",
+				"anymatch": "^3.0.3",
+				"fb-watchman": "^2.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-regex-util": "^29.4.3",
+				"jest-util": "^29.6.1",
+				"jest-worker": "^29.6.1",
+				"micromatch": "^4.0.4",
+				"walker": "^1.0.8"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"optionalDependencies": {
+				"fsevents": "^2.3.2"
+			}
 		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
+		"node_modules/jest-haste-map/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
+			"dependencies": {
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-extglob": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-			"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-			"dev": true
+		"node_modules/jest-haste-map/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-finite": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
-			"integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+		"node_modules/jest-haste-map/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-fullwidth-code-point": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+		"node_modules/jest-haste-map/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"is-generator-fn": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-			"integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-			"dev": true
+		"node_modules/jest-haste-map/node_modules/jest-worker": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+			"integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
+			"dev": true,
+			"dependencies": {
+				"@types/node": "*",
+				"jest-util": "^29.6.1",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"is-gif": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-gif/-/is-gif-3.0.0.tgz",
-			"integrity": "sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==",
+		"node_modules/jest-haste-map/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-type": "^10.4.0"
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"is-glob": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+		"node_modules/jest-haste-map/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
-			"requires": {
-				"is-extglob": "^2.1.1"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
-		"is-jpg": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz",
-			"integrity": "sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=",
+		"node_modules/jest-haste-map/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
 		},
-		"is-natural-number": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-4.0.1.tgz",
-			"integrity": "sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=",
+		"node_modules/jest-image-snapshot": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/jest-image-snapshot/-/jest-image-snapshot-6.2.0.tgz",
+			"integrity": "sha512-9mTHBKiiSIZ26csbLmjKyN+SrVypM93S5y+jULCvn6YItgepvcrJIKGNeSyt9d2EZiutOroLs/UjtrWiBzpHbA==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"get-stdin": "^5.0.1",
+				"glur": "^1.1.2",
+				"lodash": "^4.17.4",
+				"pixelmatch": "^5.1.0",
+				"pngjs": "^3.4.0",
+				"rimraf": "^2.6.2",
+				"ssim.js": "^3.1.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			},
+			"peerDependencies": {
+				"jest": ">=20 <=29"
+			},
+			"peerDependenciesMeta": {
+				"jest": {
+					"optional": true
+				}
+			}
 		},
-		"is-negative-zero": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-			"dev": true
+		"node_modules/jest-image-snapshot/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"is-number": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+		"node_modules/jest-image-snapshot/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^3.0.2"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"is-number-object": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-			"integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+		"node_modules/jest-image-snapshot/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"is-obj": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-			"integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+		"node_modules/jest-image-snapshot/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"is-object": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-			"integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
+		"node_modules/jest-image-snapshot/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"optional": true
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-path-cwd": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-			"dev": true
+		"node_modules/jest-image-snapshot/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-path-in-cwd": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+		"node_modules/jest-leak-detector": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz",
+			"integrity": "sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==",
 			"dev": true,
-			"requires": {
-				"is-path-inside": "^2.1.0"
+			"dependencies": {
+				"jest-get-type": "^29.4.3",
+				"pretty-format": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"is-path-inside": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+		"node_modules/jest-matcher-utils": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.1.tgz",
+			"integrity": "sha512-SLaztw9d2mfQQKHmJXKM0HCbl2PPVld/t9Xa6P9sgiExijviSp7TnZZpw2Fpt+OI3nwUO/slJbOfzfUMKKC5QA==",
 			"dev": true,
-			"requires": {
-				"path-is-inside": "^1.0.2"
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"jest-diff": "^29.6.1",
+				"jest-get-type": "^29.4.3",
+				"pretty-format": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"is-plain-obj": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true
+		"node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+		"node_modules/jest-matcher-utils/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"isobject": "^3.0.1"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"is-png": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz",
-			"integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=",
+		"node_modules/jest-matcher-utils/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"is-potential-custom-element-name": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+		"node_modules/jest-matcher-utils/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"is-promise": {
+		"node_modules/jest-matcher-utils/node_modules/has-flag": {
 			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz",
-			"integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="
-		},
-		"is-regex": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz",
-			"integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"has-symbols": "^1.0.1"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-relative": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-			"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+		"node_modules/jest-matcher-utils/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"is-unc-path": "^1.0.0"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-resolvable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-			"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-			"dev": true
-		},
-		"is-retry-allowed": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
-			"integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
+		"node_modules/jest-message-util": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.1.tgz",
+			"integrity": "sha512-KoAW2zAmNSd3Gk88uJ56qXUWbFk787QKmjjJVOjtGFmmGSZgDBrlIL4AfQw1xyMYPNVD7dNInfIbur9B2rd/wQ==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"@babel/code-frame": "^7.12.13",
+				"@jest/types": "^29.6.1",
+				"@types/stack-utils": "^2.0.0",
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"micromatch": "^4.0.4",
+				"pretty-format": "^29.6.1",
+				"slash": "^3.0.0",
+				"stack-utils": "^2.0.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"is-shared-array-buffer": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-			"integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+		"node_modules/jest-message-util/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2"
+			"dependencies": {
+				"color-convert": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-message-util/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				}
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+		"node_modules/jest-message-util/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
 		},
-		"is-string": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+		"node_modules/jest-message-util/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"has-tostringtag": "^1.0.0"
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"is-subset": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-			"integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==",
+		"node_modules/jest-message-util/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"is-svg": {
-			"version": "4.3.1",
-			"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.3.1.tgz",
-			"integrity": "sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA==",
+		"node_modules/jest-message-util/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"fast-xml-parser": "^3.19.0"
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-symbol": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-			"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+		"node_modules/jest-message-util/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"has-symbols": "^1.0.1"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
+		"node_modules/jest-message-util/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"is-unc-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-			"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+		"node_modules/jest-message-util/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 			"dev": true,
-			"requires": {
-				"unc-path-regex": "^0.1.2"
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
 			}
 		},
-		"is-unicode-supported": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-			"dev": true
+		"node_modules/jest-message-util/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+		"node_modules/jest-message-util/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 			"dev": true,
-			"optional": true
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/jest-mock": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.6.1.tgz",
+			"integrity": "sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"jest-util": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"is-weakref": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-			"integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+		"node_modules/jest-pnp-resolver": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2"
+			"engines": {
+				"node": ">=6"
 			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
+			"peerDependencies": {
+				"jest-resolve": "*"
+			},
+			"peerDependenciesMeta": {
+				"jest-resolve": {
+					"optional": true
 				}
 			}
 		},
-		"is-windows": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-			"dev": true
+		"node_modules/jest-regex-util": {
+			"version": "29.4.3",
+			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.4.3.tgz",
+			"integrity": "sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==",
+			"dev": true,
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+		"node_modules/jest-resolve": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.6.1.tgz",
+			"integrity": "sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==",
 			"dev": true,
-			"requires": {
-				"is-docker": "^2.0.0"
+			"dependencies": {
+				"chalk": "^4.0.0",
+				"graceful-fs": "^4.2.9",
+				"jest-haste-map": "^29.6.1",
+				"jest-pnp-resolver": "^1.2.2",
+				"jest-util": "^29.6.1",
+				"jest-validate": "^29.6.1",
+				"resolve": "^1.20.0",
+				"resolve.exports": "^2.0.0",
+				"slash": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+		"node_modules/jest-resolve-dependencies": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz",
+			"integrity": "sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==",
+			"dev": true,
+			"dependencies": {
+				"jest-regex-util": "^29.4.3",
+				"jest-snapshot": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
 		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
+		"node_modules/jest-resolve/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
 		},
-		"isobject": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-			"dev": true
+		"node_modules/jest-resolve/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
 		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+		"node_modules/jest-resolve/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"istanbul-lib-coverage": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-			"integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+		"node_modules/jest-resolve/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"istanbul-lib-instrument": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+		"node_modules/jest-resolve/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.12.3",
-				"@babel/parser": "^7.14.7",
-				"@istanbuljs/schema": "^0.1.2",
-				"istanbul-lib-coverage": "^3.2.0",
-				"semver": "^6.3.0"
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-resolve/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-runner": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.6.1.tgz",
+			"integrity": "sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==",
+			"dev": true,
 			"dependencies": {
-				"@babel/parser": {
-					"version": "7.19.6",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.6.tgz",
-					"integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==",
-					"dev": true
-				},
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+				"@jest/console": "^29.6.1",
+				"@jest/environment": "^29.6.1",
+				"@jest/test-result": "^29.6.1",
+				"@jest/transform": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
+				"chalk": "^4.0.0",
+				"emittery": "^0.13.1",
+				"graceful-fs": "^4.2.9",
+				"jest-docblock": "^29.4.3",
+				"jest-environment-node": "^29.6.1",
+				"jest-haste-map": "^29.6.1",
+				"jest-leak-detector": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-resolve": "^29.6.1",
+				"jest-runtime": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"jest-watcher": "^29.6.1",
+				"jest-worker": "^29.6.1",
+				"p-limit": "^3.1.0",
+				"source-map-support": "0.5.13"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-runner/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"istanbul-lib-report": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-			"integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+		"node_modules/jest-runner/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"istanbul-lib-coverage": "^3.0.0",
-				"make-dir": "^3.0.0",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
 			},
-			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"istanbul-lib-source-maps": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-			"integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+		"node_modules/jest-runner/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^3.0.0",
-				"source-map": "^0.6.1"
-			},
 			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"istanbul-reports": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-			"integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
+		"node_modules/jest-runner/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/jest-runner/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"html-escaper": "^2.0.0",
-				"istanbul-lib-report": "^3.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"isurl": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz",
-			"integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==",
+		"node_modules/jest-runner/node_modules/jest-worker": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.6.1.tgz",
+			"integrity": "sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"has-to-string-tag-x": "^1.2.0",
-				"is-object": "^1.0.1"
+			"dependencies": {
+				"@types/node": "*",
+				"jest-util": "^29.6.1",
+				"merge-stream": "^2.0.0",
+				"supports-color": "^8.0.0"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"jest": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-			"integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
+		"node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
-			"requires": {
-				"@jest/core": "^27.5.1",
-				"import-local": "^3.0.2",
-				"jest-cli": "^27.5.1"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-					"dev": true,
-					"requires": {
-						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
-						"wrap-ansi": "^7.0.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"jest-cli": {
-					"version": "27.5.1",
-					"resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-					"integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-					"dev": true,
-					"requires": {
-						"@jest/core": "^27.5.1",
-						"@jest/test-result": "^27.5.1",
-						"@jest/types": "^27.5.1",
-						"chalk": "^4.0.0",
-						"exit": "^0.1.2",
-						"graceful-fs": "^4.2.9",
-						"import-local": "^3.0.2",
-						"jest-config": "^27.5.1",
-						"jest-util": "^27.5.1",
-						"jest-validate": "^27.5.1",
-						"prompts": "^2.0.1",
-						"yargs": "^16.2.0"
-					}
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
-				"yargs": {
-					"version": "16.2.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-					"integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^7.0.2",
-						"escalade": "^3.1.1",
-						"get-caller-file": "^2.0.5",
-						"require-directory": "^2.1.1",
-						"string-width": "^4.2.0",
-						"y18n": "^5.0.5",
-						"yargs-parser": "^20.2.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "20.2.9",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-					"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-					"dev": true
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
 			}
 		},
-		"jest-changed-files": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-			"integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+		"node_modules/jest-runner/node_modules/p-limit": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"execa": "^5.0.0",
-				"throat": "^6.0.1"
-			},
-			"dependencies": {
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				}
+			"dependencies": {
+				"yocto-queue": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"jest-circus": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-			"integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+		"node_modules/jest-runner/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"dedent": "^0.7.0",
-				"expect": "^27.5.1",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.5.1",
-				"jest-matcher-utils": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-runtime": "^27.5.1",
-				"jest-snapshot": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"pretty-format": "^27.5.1",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3",
-				"throat": "^6.0.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-config": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-			"integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-			"dev": true,
-			"requires": {
-				"@babel/core": "^7.8.0",
-				"@jest/test-sequencer": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"babel-jest": "^27.5.1",
+		"node_modules/jest-runtime": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.6.1.tgz",
+			"integrity": "sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==",
+			"dev": true,
+			"dependencies": {
+				"@jest/environment": "^29.6.1",
+				"@jest/fake-timers": "^29.6.1",
+				"@jest/globals": "^29.6.1",
+				"@jest/source-map": "^29.6.0",
+				"@jest/test-result": "^29.6.1",
+				"@jest/transform": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
 				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"deepmerge": "^4.2.2",
-				"glob": "^7.1.1",
+				"cjs-module-lexer": "^1.0.0",
+				"collect-v8-coverage": "^1.0.0",
+				"glob": "^7.1.3",
 				"graceful-fs": "^4.2.9",
-				"jest-circus": "^27.5.1",
-				"jest-environment-jsdom": "^27.5.1",
-				"jest-environment-node": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"jest-jasmine2": "^27.5.1",
-				"jest-regex-util": "^27.5.1",
-				"jest-resolve": "^27.5.1",
-				"jest-runner": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jest-validate": "^27.5.1",
-				"micromatch": "^4.0.4",
-				"parse-json": "^5.2.0",
-				"pretty-format": "^27.5.1",
+				"jest-haste-map": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-mock": "^29.6.1",
+				"jest-regex-util": "^29.4.3",
+				"jest-resolve": "^29.6.1",
+				"jest-snapshot": "^29.6.1",
+				"jest-util": "^29.6.1",
 				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
+				"strip-bom": "^4.0.0"
 			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"jest-dev-server": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-			"integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
+		"node_modules/jest-runtime/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.1.2",
-				"cwd": "^0.10.0",
-				"find-process": "^1.4.7",
-				"prompts": "^2.4.2",
-				"spawnd": "^6.0.2",
-				"tree-kill": "^1.2.2",
-				"wait-on": "^6.0.1"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-runtime/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"jest-diff": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-			"integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+		"node_modules/jest-runtime/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"diff-sequences": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"pretty-format": "^27.5.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"jest-docblock": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-			"integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+		"node_modules/jest-runtime/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/jest-runtime/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"detect-newline": "^3.0.0"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-each": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-			"integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+		"node_modules/jest-runtime/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"pretty-format": "^27.5.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-environment-jsdom": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-			"integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+		"node_modules/jest-snapshot": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.6.1.tgz",
+			"integrity": "sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==",
 			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/fake-timers": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"jest-mock": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jsdom": "^16.6.0"
+			"dependencies": {
+				"@babel/core": "^7.11.6",
+				"@babel/generator": "^7.7.2",
+				"@babel/plugin-syntax-jsx": "^7.7.2",
+				"@babel/plugin-syntax-typescript": "^7.7.2",
+				"@babel/types": "^7.3.3",
+				"@jest/expect-utils": "^29.6.1",
+				"@jest/transform": "^29.6.1",
+				"@jest/types": "^29.6.1",
+				"@types/prettier": "^2.1.5",
+				"babel-preset-current-node-syntax": "^1.0.0",
+				"chalk": "^4.0.0",
+				"expect": "^29.6.1",
+				"graceful-fs": "^4.2.9",
+				"jest-diff": "^29.6.1",
+				"jest-get-type": "^29.4.3",
+				"jest-matcher-utils": "^29.6.1",
+				"jest-message-util": "^29.6.1",
+				"jest-util": "^29.6.1",
+				"natural-compare": "^1.4.0",
+				"pretty-format": "^29.6.1",
+				"semver": "^7.5.3"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"jest-environment-node": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-			"integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+		"node_modules/jest-snapshot/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/fake-timers": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"jest-mock": "^27.5.1",
-				"jest-util": "^27.5.1"
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"jest-get-type": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-			"integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-			"dev": true
-		},
-		"jest-haste-map": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-			"integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+		"node_modules/jest-snapshot/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"@types/graceful-fs": "^4.1.2",
-				"@types/node": "*",
-				"anymatch": "^3.0.3",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^2.3.2",
-				"graceful-fs": "^4.2.9",
-				"jest-regex-util": "^27.5.1",
-				"jest-serializer": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jest-worker": "^27.5.1",
-				"micromatch": "^4.0.4",
-				"walker": "^1.0.7"
-			},
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"jest-image-snapshot": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/jest-image-snapshot/-/jest-image-snapshot-3.0.1.tgz",
-			"integrity": "sha512-bW8eYxgAVyO8cNLlTt15wd5YiWvRfzQyNQ4K8FKHUEPasQADEZ5NzaWmnOpSdh3/NLYoH++TMp6o/rRVLpOIkQ==",
+		"node_modules/jest-snapshot/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"chalk": "^1.1.3",
-				"get-stdin": "^5.0.1",
-				"glur": "^1.1.2",
-				"lodash": "^4.17.4",
-				"mkdirp": "^0.5.1",
-				"pixelmatch": "^5.1.0",
-				"pngjs": "^3.4.0",
-				"rimraf": "^2.6.2"
-			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true
-				}
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
 			}
 		},
-		"jest-jasmine2": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-			"integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/source-map": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"chalk": "^4.0.0",
-				"co": "^4.6.0",
-				"expect": "^27.5.1",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^27.5.1",
-				"jest-matcher-utils": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-runtime": "^27.5.1",
-				"jest-snapshot": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"pretty-format": "^27.5.1",
-				"throat": "^6.0.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
-			}
+		"node_modules/jest-snapshot/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
 		},
-		"jest-leak-detector": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-			"integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+		"node_modules/jest-snapshot/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"jest-get-type": "^27.5.1",
-				"pretty-format": "^27.5.1"
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-matcher-utils": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-			"integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+		"node_modules/jest-snapshot/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"chalk": "^4.0.0",
-				"jest-diff": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"pretty-format": "^27.5.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-message-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-			"integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+		"node_modules/jest-util": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.1.tgz",
+			"integrity": "sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==",
 			"dev": true,
-			"requires": {
-				"@babel/code-frame": "^7.12.13",
-				"@jest/types": "^27.5.1",
-				"@types/stack-utils": "^2.0.0",
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"@types/node": "*",
 				"chalk": "^4.0.0",
+				"ci-info": "^3.2.0",
 				"graceful-fs": "^4.2.9",
-				"micromatch": "^4.0.4",
-				"pretty-format": "^27.5.1",
-				"slash": "^3.0.0",
-				"stack-utils": "^2.0.3"
+				"picomatch": "^2.2.3"
 			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+			}
+		},
+		"node_modules/jest-util/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"jest-mock": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-			"integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+		"node_modules/jest-util/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"@types/node": "*"
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-			"dev": true
+		"node_modules/jest-util/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
 		},
-		"jest-regex-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-			"integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+		"node_modules/jest-util/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"jest-resolve": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-			"integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+		"node_modules/jest-util/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"chalk": "^4.0.0",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^27.5.1",
-				"jest-pnp-resolver": "^1.2.2",
-				"jest-util": "^27.5.1",
-				"jest-validate": "^27.5.1",
-				"resolve": "^1.20.0",
-				"resolve.exports": "^1.1.0",
-				"slash": "^3.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-core-module": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-					"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-					"dev": true,
-					"requires": {
-						"has": "^1.0.3"
-					}
-				},
-				"resolve": {
-					"version": "1.22.1",
-					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-					"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-					"dev": true,
-					"requires": {
-						"is-core-module": "^2.9.0",
-						"path-parse": "^1.0.7",
-						"supports-preserve-symlinks-flag": "^1.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-resolve-dependencies": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-			"integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+		"node_modules/jest-util/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"jest-regex-util": "^27.5.1",
-				"jest-snapshot": "^27.5.1"
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-runner": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-			"integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-			"dev": true,
-			"requires": {
-				"@jest/console": "^27.5.1",
-				"@jest/environment": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
+		"node_modules/jest-validate": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.6.1.tgz",
+			"integrity": "sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==",
+			"dev": true,
+			"dependencies": {
+				"@jest/types": "^29.6.1",
+				"camelcase": "^6.2.0",
 				"chalk": "^4.0.0",
-				"emittery": "^0.8.1",
-				"graceful-fs": "^4.2.9",
-				"jest-docblock": "^27.5.1",
-				"jest-environment-jsdom": "^27.5.1",
-				"jest-environment-node": "^27.5.1",
-				"jest-haste-map": "^27.5.1",
-				"jest-leak-detector": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-resolve": "^27.5.1",
-				"jest-runtime": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"jest-worker": "^27.5.1",
-				"source-map-support": "^0.5.6",
-				"throat": "^6.0.1"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"jest-get-type": "^29.4.3",
+				"leven": "^3.1.0",
+				"pretty-format": "^29.6.1"
+			},
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"jest-runtime": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-			"integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-			"dev": true,
-			"requires": {
-				"@jest/environment": "^27.5.1",
-				"@jest/fake-timers": "^27.5.1",
-				"@jest/globals": "^27.5.1",
-				"@jest/source-map": "^27.5.1",
-				"@jest/test-result": "^27.5.1",
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"chalk": "^4.0.0",
-				"cjs-module-lexer": "^1.0.0",
-				"collect-v8-coverage": "^1.0.0",
-				"execa": "^5.0.0",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.2.9",
-				"jest-haste-map": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-mock": "^27.5.1",
-				"jest-regex-util": "^27.5.1",
-				"jest-resolve": "^27.5.1",
-				"jest-snapshot": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"slash": "^3.0.0",
-				"strip-bom": "^4.0.0"
-			},
+		"node_modules/jest-validate/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
-				},
-				"execa": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-					"integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.3",
-						"get-stream": "^6.0.0",
-						"human-signals": "^2.1.0",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.1",
-						"onetime": "^5.1.2",
-						"signal-exit": "^3.0.3",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-					"integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-stream": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-					"integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-					"dev": true
-				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
-				},
-				"strip-bom": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-					"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
 			}
 		},
-		"jest-serializer": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-			"integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+		"node_modules/jest-validate/node_modules/camelcase": {
+			"version": "6.3.0",
+			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
-			"requires": {
-				"@types/node": "*",
-				"graceful-fs": "^4.2.9"
+			"engines": {
+				"node": ">=10"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/jest-validate/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"dependencies": {
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"jest-snapshot": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-			"integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+		"node_modules/jest-validate/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@babel/core": "^7.7.2",
-				"@babel/generator": "^7.7.2",
-				"@babel/plugin-syntax-typescript": "^7.7.2",
-				"@babel/traverse": "^7.7.2",
-				"@babel/types": "^7.0.0",
-				"@jest/transform": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/babel__traverse": "^7.0.4",
-				"@types/prettier": "^2.1.5",
-				"babel-preset-current-node-syntax": "^1.0.0",
-				"chalk": "^4.0.0",
-				"expect": "^27.5.1",
-				"graceful-fs": "^4.2.9",
-				"jest-diff": "^27.5.1",
-				"jest-get-type": "^27.5.1",
-				"jest-haste-map": "^27.5.1",
-				"jest-matcher-utils": "^27.5.1",
-				"jest-message-util": "^27.5.1",
-				"jest-util": "^27.5.1",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^27.5.1",
-				"semver": "^7.3.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/jest-validate/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/jest-validate/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-util": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-			"integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+		"node_modules/jest-validate/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-watcher": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.6.1.tgz",
+			"integrity": "sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
+			"dependencies": {
+				"@jest/test-result": "^29.6.1",
+				"@jest/types": "^29.6.1",
 				"@types/node": "*",
+				"ansi-escapes": "^4.2.1",
 				"chalk": "^4.0.0",
-				"ci-info": "^3.2.0",
-				"graceful-fs": "^4.2.9",
-				"picomatch": "^2.2.3"
+				"emittery": "^0.13.1",
+				"jest-util": "^29.6.1",
+				"string-length": "^4.0.1"
 			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"jest-validate": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-			"integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+		"node_modules/jest-watcher/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
-			"requires": {
-				"@jest/types": "^27.5.1",
-				"camelcase": "^6.2.0",
-				"chalk": "^4.0.0",
-				"jest-get-type": "^27.5.1",
-				"leven": "^3.1.0",
-				"pretty-format": "^27.5.1"
+			"dependencies": {
+				"color-convert": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"camelcase": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-					"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-					"dev": true
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
-		"jest-watcher": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-			"integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+		"node_modules/jest-watcher/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
-			"requires": {
-				"@jest/test-result": "^27.5.1",
-				"@jest/types": "^27.5.1",
-				"@types/node": "*",
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.0.0",
-				"jest-util": "^27.5.1",
-				"string-length": "^4.0.1"
+			"dependencies": {
+				"color-name": "~1.1.4"
 			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/jest-watcher/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-watcher/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"jest-worker": {
+		"node_modules/jest-worker": {
 			"version": "27.5.1",
 			"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
 			"integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/node": "*",
 				"merge-stream": "^2.0.0",
 				"supports-color": "^8.0.0"
 			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/jest-worker/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jest-worker/node_modules/supports-color": {
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/supports-color?sponsor=1"
+			}
+		},
+		"node_modules/joi": {
+			"version": "17.7.0",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz",
+			"integrity": "sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==",
+			"dev": true,
 			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "8.1.1",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-					"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"@hapi/hoek": "^9.0.0",
+				"@hapi/topo": "^5.0.0",
+				"@sideway/address": "^4.1.3",
+				"@sideway/formula": "^3.0.0",
+				"@sideway/pinpoint": "^2.0.0"
 			}
 		},
-		"jpegtran-bin": {
+		"node_modules/jpegtran-bin": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/jpegtran-bin/-/jpegtran-bin-4.0.0.tgz",
 			"integrity": "sha512-2cRl1ism+wJUoYAYFt6O/rLBfpXNWG2dUWbgcEkTt5WGMnqI46eEro8T4C5zGROxKRqyKpCBSdHPvt5UYCtxaQ==",
 			"dev": true,
+			"hasInstallScript": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"bin-build": "^3.0.0",
 				"bin-wrapper": "^4.0.0",
 				"logalot": "^2.0.0"
+			},
+			"bin": {
+				"jpegtran": "cli.js"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"jquery": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz",
-			"integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw=="
+		"node_modules/jquery": {
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
+			"integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
 		},
-		"jquery-color": {
+		"node_modules/jquery-color": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/jquery-color/-/jquery-color-2.2.0.tgz",
-			"integrity": "sha512-4VoxsLMw860EQGNT/TmP3Lbr7/1OCQlBPS4ILj7bxRApJrPQfpqzdIOTY8Ll9nGY7UHtWqDuzR7cUcS1lcWjVw=="
+			"integrity": "sha512-4VoxsLMw860EQGNT/TmP3Lbr7/1OCQlBPS4ILj7bxRApJrPQfpqzdIOTY8Ll9nGY7UHtWqDuzR7cUcS1lcWjVw==",
+			"peerDependencies": {
+				"jquery": ">=1.11.0"
+			}
 		},
-		"jquery-form": {
+		"node_modules/jquery-form": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/jquery-form/-/jquery-form-4.3.0.tgz",
 			"integrity": "sha512-q3uaVCEWdLOYUCI6dpNdwf/7cJFOsUgdpq6r0taxtGQ5NJSkOzofyWm4jpOuJ5YxdmL1FI5QR+q+HB63HHLGnQ==",
-			"requires": {
+			"dependencies": {
 				"jquery": ">=1.7.2"
 			}
 		},
-		"jquery-hoverintent": {
+		"node_modules/jquery-hoverintent": {
 			"version": "1.10.2",
 			"resolved": "https://registry.npmjs.org/jquery-hoverintent/-/jquery-hoverintent-1.10.2.tgz",
 			"integrity": "sha512-YU4xvTywSu+/aZvbtSV8Svgcv7F3iMsXXO8Fm1Scvt9wvKDP7C1F6w1j3Pjn0lQqICxc5s7MnsL3Nbh8DEeOcg==",
-			"requires": {
+			"dependencies": {
+				"jquery": ">=1.7.0"
+			},
+			"peerDependencies": {
 				"jquery": ">=1.7.0"
 			}
 		},
-		"js-sdsl": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-			"integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==",
-			"dev": true
-		},
-		"js-tokens": {
+		"node_modules/js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
 			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
-		"js-yaml": {
+		"node_modules/js-yaml": {
 			"version": "3.14.1",
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
 			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"argparse": "^1.0.7",
 				"esprima": "^4.0.0"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"jsbn": {
+		"node_modules/jsbn": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
 			"dev": true
 		},
-		"jsdoc": {
-			"version": "3.6.10",
-			"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz",
-			"integrity": "sha512-IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg==",
+		"node_modules/jsdoc": {
+			"version": "3.6.11",
+			"resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
+			"integrity": "sha512-8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/parser": "^7.9.4",
 				"@types/markdown-it": "^12.2.3",
 				"bluebird": "^3.7.2",
 				"catharsis": "^0.9.0",
 				"escape-string-regexp": "^2.0.0",
 				"js2xmlparser": "^4.0.2",
-				"klaw": "^4.0.1",
+				"klaw": "^3.0.0",
 				"markdown-it": "^12.3.2",
 				"markdown-it-anchor": "^8.4.1",
 				"marked": "^4.0.10",
@@ -17708,180 +21407,212 @@
 				"taffydb": "2.6.2",
 				"underscore": "~1.13.2"
 			},
+			"bin": {
+				"jsdoc": "jsdoc.js"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/jsdoc-type-pratt-parser": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
+			"integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/jsdoc/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/jsdoc/node_modules/js2xmlparser": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+			"integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+			"dev": true,
 			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
-				},
-				"js2xmlparser": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
-					"integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
-					"dev": true,
-					"requires": {
-						"xmlcreate": "^2.0.4"
-					}
-				},
-				"klaw": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/klaw/-/klaw-4.0.1.tgz",
-					"integrity": "sha512-pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw==",
-					"dev": true
-				},
-				"linkify-it": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-					"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-					"dev": true,
-					"requires": {
-						"uc.micro": "^1.0.1"
-					}
-				},
-				"markdown-it": {
-					"version": "12.3.2",
-					"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-					"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1",
-						"entities": "~2.1.0",
-						"linkify-it": "^3.0.1",
-						"mdurl": "^1.0.1",
-						"uc.micro": "^1.0.5"
-					}
-				},
-				"markdown-it-anchor": {
-					"version": "8.6.2",
-					"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.2.tgz",
-					"integrity": "sha512-JNaekTlIwwyYGBN3zifZDxgz4bSL8sbEj58fdTZGmPSMMGXBZapFjcZk2I33Jy79c1fvCKHpF7MA/67FOTjvzA==",
-					"dev": true
-				},
-				"marked": {
-					"version": "4.0.14",
-					"resolved": "https://registry.npmjs.org/marked/-/marked-4.0.14.tgz",
-					"integrity": "sha512-HL5sSPE/LP6U9qKgngIIPTthuxC0jrfxpYMZ3LdGDD3vTnLs59m2Z7r6+LNDR3ToqEQdkKd6YaaEfJhodJmijQ==",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-					"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-					"dev": true
-				},
-				"xmlcreate": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
-					"integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
-					"dev": true
-				}
+				"xmlcreate": "^2.0.4"
 			}
 		},
-		"jsdoc-type-pratt-parser": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz",
-			"integrity": "sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw==",
+		"node_modules/jsdoc/node_modules/markdown-it-anchor": {
+			"version": "8.6.2",
+			"resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.2.tgz",
+			"integrity": "sha512-JNaekTlIwwyYGBN3zifZDxgz4bSL8sbEj58fdTZGmPSMMGXBZapFjcZk2I33Jy79c1fvCKHpF7MA/67FOTjvzA==",
+			"dev": true,
+			"peerDependencies": {
+				"@types/markdown-it": "*",
+				"markdown-it": "*"
+			}
+		},
+		"node_modules/jsdoc/node_modules/marked": {
+			"version": "4.0.14",
+			"resolved": "https://registry.npmjs.org/marked/-/marked-4.0.14.tgz",
+			"integrity": "sha512-HL5sSPE/LP6U9qKgngIIPTthuxC0jrfxpYMZ3LdGDD3vTnLs59m2Z7r6+LNDR3ToqEQdkKd6YaaEfJhodJmijQ==",
+			"dev": true,
+			"bin": {
+				"marked": "bin/marked.js"
+			},
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/jsdoc/node_modules/mkdirp": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+			"integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+			"dev": true,
+			"bin": {
+				"mkdirp": "bin/cmd.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/jsdoc/node_modules/xmlcreate": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+			"integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
 			"dev": true
 		},
-		"jsdom": {
-			"version": "16.7.0",
-			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-			"integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+		"node_modules/jsdom": {
+			"version": "20.0.3",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+			"integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
 			"dev": true,
-			"requires": {
-				"abab": "^2.0.5",
-				"acorn": "^8.2.4",
-				"acorn-globals": "^6.0.0",
-				"cssom": "^0.4.4",
+			"dependencies": {
+				"abab": "^2.0.6",
+				"acorn": "^8.8.1",
+				"acorn-globals": "^7.0.0",
+				"cssom": "^0.5.0",
 				"cssstyle": "^2.3.0",
-				"data-urls": "^2.0.0",
-				"decimal.js": "^10.2.1",
-				"domexception": "^2.0.1",
+				"data-urls": "^3.0.2",
+				"decimal.js": "^10.4.2",
+				"domexception": "^4.0.0",
 				"escodegen": "^2.0.0",
-				"form-data": "^3.0.0",
-				"html-encoding-sniffer": "^2.0.1",
-				"http-proxy-agent": "^4.0.1",
-				"https-proxy-agent": "^5.0.0",
+				"form-data": "^4.0.0",
+				"html-encoding-sniffer": "^3.0.0",
+				"http-proxy-agent": "^5.0.0",
+				"https-proxy-agent": "^5.0.1",
 				"is-potential-custom-element-name": "^1.0.1",
-				"nwsapi": "^2.2.0",
-				"parse5": "6.0.1",
-				"saxes": "^5.0.1",
+				"nwsapi": "^2.2.2",
+				"parse5": "^7.1.1",
+				"saxes": "^6.0.0",
 				"symbol-tree": "^3.2.4",
-				"tough-cookie": "^4.0.0",
-				"w3c-hr-time": "^1.0.2",
-				"w3c-xmlserializer": "^2.0.0",
-				"webidl-conversions": "^6.1.0",
-				"whatwg-encoding": "^1.0.5",
-				"whatwg-mimetype": "^2.3.0",
-				"whatwg-url": "^8.5.0",
-				"ws": "^7.4.6",
-				"xml-name-validator": "^3.0.0"
-			},
-			"dependencies": {
-				"form-data": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-					"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-					"dev": true,
-					"requires": {
-						"asynckit": "^0.4.0",
-						"combined-stream": "^1.0.8",
-						"mime-types": "^2.1.12"
-					}
-				},
-				"parse5": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-					"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-					"dev": true
-				},
-				"tr46": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-					"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.1.1"
-					}
-				},
-				"webidl-conversions": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-					"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-					"dev": true
+				"tough-cookie": "^4.1.2",
+				"w3c-xmlserializer": "^4.0.0",
+				"webidl-conversions": "^7.0.0",
+				"whatwg-encoding": "^2.0.0",
+				"whatwg-mimetype": "^3.0.0",
+				"whatwg-url": "^11.0.0",
+				"ws": "^8.11.0",
+				"xml-name-validator": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"peerDependencies": {
+				"canvas": "^2.5.0"
+			},
+			"peerDependenciesMeta": {
+				"canvas": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/jsdom/node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/jsdom/node_modules/tr46": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+			"integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+			"dev": true,
+			"dependencies": {
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jsdom/node_modules/webidl-conversions": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+			"integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jsdom/node_modules/whatwg-url": {
+			"version": "11.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+			"integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+			"dev": true,
+			"dependencies": {
+				"tr46": "^3.0.0",
+				"webidl-conversions": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/jsdom/node_modules/ws": {
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
 				},
-				"whatwg-url": {
-					"version": "8.7.0",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-					"integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-					"dev": true,
-					"requires": {
-						"lodash": "^4.7.0",
-						"tr46": "^2.1.0",
-						"webidl-conversions": "^6.1.0"
-					}
+				"utf-8-validate": {
+					"optional": true
 				}
 			}
 		},
-		"jsesc": {
+		"node_modules/jsesc": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
 			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-			"dev": true
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"jshint": {
+		"node_modules/jshint": {
 			"version": "2.13.4",
 			"resolved": "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz",
 			"integrity": "sha512-HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"cli": "~1.0.0",
 				"console-browserify": "1.1.x",
 				"exit": "0.1.x",
@@ -17890,304 +21621,307 @@
 				"minimatch": "~3.0.2",
 				"strip-json-comments": "1.0.x"
 			},
+			"bin": {
+				"jshint": "bin/jshint"
+			}
+		},
+		"node_modules/jshint/node_modules/console-browserify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+			"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+			"dev": true,
 			"dependencies": {
-				"console-browserify": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-					"dev": true,
-					"requires": {
-						"date-now": "^0.1.4"
-					}
-				},
-				"domhandler": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
-					"integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-					"dev": true,
-					"requires": {
-						"domelementtype": "1"
-					}
-				},
-				"domutils": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-					"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "0",
-						"domelementtype": "1"
-					}
-				},
-				"entities": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-					"integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-					"dev": true
-				},
-				"htmlparser2": {
-					"version": "3.8.3",
-					"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
-					"integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-					"dev": true,
-					"requires": {
-						"domelementtype": "1",
-						"domhandler": "2.3",
-						"domutils": "1.5",
-						"entities": "1.0",
-						"readable-stream": "1.1"
-					}
-				},
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.1.14",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-					"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.1",
-						"isarray": "0.0.1",
-						"string_decoder": "~0.10.x"
-					}
-				},
-				"string_decoder": {
-					"version": "0.10.31",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-					"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
-					"integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
-					"dev": true
-				}
+				"date-now": "^0.1.4"
+			}
+		},
+		"node_modules/jshint/node_modules/domhandler": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
+			"integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "1"
+			}
+		},
+		"node_modules/jshint/node_modules/domutils": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+			"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "0",
+				"domelementtype": "1"
+			}
+		},
+		"node_modules/jshint/node_modules/entities": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
+			"integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
+			"dev": true
+		},
+		"node_modules/jshint/node_modules/htmlparser2": {
+			"version": "3.8.3",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+			"integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "1",
+				"domhandler": "2.3",
+				"domutils": "1.5",
+				"entities": "1.0",
+				"readable-stream": "1.1"
+			}
+		},
+		"node_modules/jshint/node_modules/isarray": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+			"dev": true
+		},
+		"node_modules/jshint/node_modules/minimatch": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/jshint/node_modules/readable-stream": {
+			"version": "1.1.14",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+			"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+			"dev": true,
+			"dependencies": {
+				"core-util-is": "~1.0.0",
+				"inherits": "~2.0.1",
+				"isarray": "0.0.1",
+				"string_decoder": "~0.10.x"
+			}
+		},
+		"node_modules/jshint/node_modules/string_decoder": {
+			"version": "0.10.31",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+			"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+			"dev": true
+		},
+		"node_modules/jshint/node_modules/strip-json-comments": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
+			"integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
+			"dev": true,
+			"bin": {
+				"strip-json-comments": "cli.js"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"json-buffer": {
+		"node_modules/json-buffer": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
 			"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
 			"dev": true,
 			"optional": true
 		},
-		"json-parse-better-errors": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-			"integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-			"dev": true
-		},
-		"json-parse-even-better-errors": {
+		"node_modules/json-parse-even-better-errors": {
 			"version": "2.3.1",
 			"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
 			"integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
 		},
-		"json-schema-traverse": {
+		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true
 		},
-		"json-stable-stringify-without-jsonify": {
+		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true
 		},
-		"json-stringify-safe": {
+		"node_modules/json-stringify-safe": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
 			"dev": true
 		},
-		"json2php": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.5.tgz",
-			"integrity": "sha512-jWpsGAYlQDKOjJcyq3rYaxcZ+5YMhZIKHKTjdIKJPI9zLSX+yRWHSSwtV8hvIg7YMhbKkgPO669Ve2ZgFK5C7w=="
+		"node_modules/json2php": {
+			"version": "0.0.7",
+			"resolved": "https://registry.npmjs.org/json2php/-/json2php-0.0.7.tgz",
+			"integrity": "sha512-dnSoUiLAoVaMXxFsVi4CrPVYMKOuDBXTghXSmMINX44RZ8WM9cXlY7UqrQnlAcODCVO7FV3+8t/5nDKAjimLfg=="
 		},
-		"json5": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-			"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-			"dev": true
+		"node_modules/json5": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+			"dev": true,
+			"bin": {
+				"json5": "lib/cli.js"
+			},
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"jsonc-parser": {
+		"node_modules/jsonc-parser": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
 			"integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==",
 			"dev": true
 		},
-		"jsonfile": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz",
-			"integrity": "sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==",
-			"requires": {
-				"graceful-fs": "^4.1.6",
-				"universalify": "^0.1.2"
-			}
-		},
-		"jsprim": {
+		"node_modules/jsprim": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
 			"integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
 				"json-schema": "0.4.0",
 				"verror": "1.10.0"
 			},
-			"dependencies": {
-				"json-schema": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-					"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"jsx-ast-utils": {
-			"version": "3.3.3",
-			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-			"integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
+		"node_modules/jsprim/node_modules/json-schema": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+			"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+			"dev": true
+		},
+		"node_modules/jsx-ast-utils": {
+			"version": "3.3.4",
+			"resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.4.tgz",
+			"integrity": "sha512-fX2TVdCViod6HwKEtSWGHs57oFhVfCMwieb9PuRDgjDPh5XeqJiHFFFJCHxU5cnTc3Bu/GRL+kPiFmw8XWOfKw==",
 			"dev": true,
-			"requires": {
-				"array-includes": "^3.1.5",
-				"object.assign": "^4.1.3"
-			},
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-					"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-					"dev": true,
-					"requires": {
-						"has-property-descriptors": "^1.0.0",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					}
-				}
+				"array-includes": "^3.1.6",
+				"array.prototype.flat": "^1.3.1",
+				"object.assign": "^4.1.4",
+				"object.values": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=4.0"
 			}
 		},
-		"just-extend": {
+		"node_modules/just-extend": {
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
 			"integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
 			"dev": true
 		},
-		"keyv": {
+		"node_modules/keyv": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz",
 			"integrity": "sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"json-buffer": "3.0.0"
 			}
 		},
-		"kind-of": {
+		"node_modules/kind-of": {
 			"version": "3.2.2",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
 			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"is-buffer": "^1.1.5"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/klaw": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+			"integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+			"dev": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.9"
 			}
 		},
-		"kleur": {
+		"node_modules/kleur": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
 			"integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"klona": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-			"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-			"dev": true
+		"node_modules/klona": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+			"integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"known-css-properties": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
-			"integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
+		"node_modules/known-css-properties": {
+			"version": "0.26.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+			"integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
 			"dev": true
 		},
-		"language-subtag-registry": {
+		"node_modules/language-subtag-registry": {
 			"version": "0.3.22",
 			"resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
 			"integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==",
 			"dev": true
 		},
-		"language-tags": {
+		"node_modules/language-tags": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
 			"integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"language-subtag-registry": "~0.3.2"
 			}
 		},
-		"lazy-cache": {
+		"node_modules/lazy-cache": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
 			"integrity": "sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"leven": {
+		"node_modules/leven": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
 			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"levn": {
+		"node_modules/levn": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
 			"integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"prelude-ls": "^1.2.1",
 				"type-check": "~0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"liftup": {
+		"node_modules/liftup": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
 			"integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"extend": "^3.0.2",
 				"findup-sync": "^4.0.0",
 				"fined": "^1.2.0",
@@ -18197,539 +21931,660 @@
 				"rechoir": "^0.7.0",
 				"resolve": "^1.19.0"
 			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/liftup/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
 			"dependencies": {
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"expand-tilde": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-					"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "^1.0.1"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"findup-sync": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
-					"integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
-					"dev": true,
-					"requires": {
-						"detect-file": "^1.0.0",
-						"is-glob": "^4.0.0",
-						"micromatch": "^4.0.2",
-						"resolve-dir": "^1.0.1"
-					}
-				},
-				"global-modules": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-					"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^1.0.1",
-						"is-windows": "^1.0.1",
-						"resolve-dir": "^1.0.0"
-					}
-				},
-				"global-prefix": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-					"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-					"dev": true,
-					"requires": {
-						"expand-tilde": "^2.0.2",
-						"homedir-polyfill": "^1.0.1",
-						"ini": "^1.3.4",
-						"is-windows": "^1.0.1",
-						"which": "^1.2.14"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"resolve-dir": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-					"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-					"dev": true,
-					"requires": {
-						"expand-tilde": "^2.0.0",
-						"global-modules": "^1.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"lilconfig": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-			"integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
-			"dev": true
+		"node_modules/liftup/node_modules/expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"dev": true,
+			"dependencies": {
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/liftup/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/liftup/node_modules/findup-sync": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+			"integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
+			"dev": true,
+			"dependencies": {
+				"detect-file": "^1.0.0",
+				"is-glob": "^4.0.0",
+				"micromatch": "^4.0.2",
+				"resolve-dir": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/liftup/node_modules/global-modules": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+			"dev": true,
+			"dependencies": {
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/liftup/node_modules/global-prefix": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/liftup/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/liftup/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/liftup/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/liftup/node_modules/resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/liftup/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/liftup/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/lilconfig": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+			"integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"line-height": {
+		"node_modules/line-height": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz",
 			"integrity": "sha512-YExecgqPwnp5gplD2+Y8e8A5+jKpr25+DzMbFdI1/1UAr0FJrTFv4VkHLf8/6B590i1wUPJWMKKldkd/bdQ//w==",
-			"requires": {
+			"dependencies": {
 				"computed-style": "~0.1.3"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
 			}
 		},
-		"lines-and-columns": {
+		"node_modules/lines-and-columns": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
 			"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
 		},
-		"linkify-it": {
+		"node_modules/linkify-it": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
 			"integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"uc.micro": "^1.0.1"
 			}
 		},
-		"livereload-js": {
+		"node_modules/livereload-js": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.4.0.tgz",
 			"integrity": "sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==",
 			"dev": true
 		},
-		"load-json-file": {
+		"node_modules/load-json-file": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
 			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"graceful-fs": "^4.1.2",
 				"parse-json": "^2.2.0",
 				"pify": "^2.0.0",
 				"pinkie-promise": "^2.0.0",
 				"strip-bom": "^2.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/load-json-file/node_modules/parse-json": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+			"dev": true,
+			"optional": true,
 			"dependencies": {
-				"parse-json": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"error-ex": "^1.2.0"
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true,
-					"optional": true
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"is-utf8": "^0.2.0"
-					}
-				}
+				"error-ex": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/load-json-file/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/load-json-file/node_modules/strip-bom": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"is-utf8": "^0.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"loader-runner": {
+		"node_modules/loader-runner": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
 			"integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6.11.5"
+			}
 		},
-		"loader-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-			"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+		"node_modules/loader-utils": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"big.js": "^5.2.2",
 				"emojis-list": "^3.0.0",
 				"json5": "^2.1.2"
+			},
+			"engines": {
+				"node": ">=8.9.0"
 			}
 		},
-		"locate-path": {
+		"node_modules/locate-path": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
 			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-			"requires": {
+			"dependencies": {
 				"p-locate": "^3.0.0",
 				"path-exists": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"lodash": {
+		"node_modules/lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
 			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
-		"lodash.debounce": {
+		"node_modules/lodash.debounce": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
 			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
 			"dev": true
 		},
-		"lodash.escape": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-			"integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==",
-			"dev": true
-		},
-		"lodash.flattendeep": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-			"integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
-			"dev": true
-		},
-		"lodash.get": {
+		"node_modules/lodash.get": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+			"integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
 			"dev": true
 		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-			"dev": true
-		},
-		"lodash.isplainobject": {
+		"node_modules/lodash.isplainobject": {
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
 			"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
 			"dev": true
 		},
-		"lodash.memoize": {
+		"node_modules/lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-			"integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+			"integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
 			"dev": true
 		},
-		"lodash.merge": {
+		"node_modules/lodash.merge": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
 			"integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
 			"dev": true
 		},
-		"lodash.truncate": {
+		"node_modules/lodash.truncate": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
 			"integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
 			"dev": true
 		},
-		"lodash.uniq": {
+		"node_modules/lodash.uniq": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-			"integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+			"integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
 			"dev": true
 		},
-		"log-symbols": {
+		"node_modules/log-symbols": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
 			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"chalk": "^4.1.0",
 				"is-unicode-supported": "^0.1.0"
 			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/log-symbols/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/log-symbols/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/log-symbols/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/log-symbols/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"logalot": {
+		"node_modules/logalot": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz",
 			"integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"figures": "^1.3.5",
 				"squeak": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"longest": {
+		"node_modules/longest": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
 			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"loose-envify": {
+		"node_modules/loose-envify": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
 			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"requires": {
+			"dependencies": {
 				"js-tokens": "^3.0.0 || ^4.0.0"
+			},
+			"bin": {
+				"loose-envify": "cli.js"
 			}
 		},
-		"loud-rejection": {
+		"node_modules/loud-rejection": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
 			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"currently-unhandled": "^0.4.1",
 				"signal-exit": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"lower-case": {
+		"node_modules/lower-case": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
 			"integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-			"requires": {
+			"dependencies": {
 				"tslib": "^2.0.3"
 			}
 		},
-		"lowercase-keys": {
+		"node_modules/lowercase-keys": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
 			"integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"lpad-align": {
+		"node_modules/lpad-align": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz",
 			"integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"get-stdin": "^4.0.1",
 				"indent-string": "^2.1.0",
 				"longest": "^1.0.0",
 				"meow": "^3.3.0"
 			},
-			"dependencies": {
-				"get-stdin": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-					"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-					"dev": true,
-					"optional": true
-				}
+			"bin": {
+				"lpad-align": "cli.js"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/lpad-align/node_modules/get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"lru-cache": {
+		"node_modules/lru-cache": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
 			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"requires": {
+			"dependencies": {
 				"yallist": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"make-dir": {
+		"node_modules/make-dir": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
 			"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"semver": "^6.0.0"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "6.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/make-dir/node_modules/semver": {
+			"version": "6.3.1",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+			"integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver.js"
 			}
 		},
-		"make-iterator": {
+		"node_modules/make-iterator": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
 			"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
 			"dev": true,
-			"requires": {
-				"kind-of": "^6.0.2"
-			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/make-iterator/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"makeerror": {
+		"node_modules/makeerror": {
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
 			"integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"tmpl": "1.0.5"
 			}
 		},
-		"map-cache": {
+		"node_modules/map-cache": {
 			"version": "0.2.2",
 			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
 			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"map-obj": {
+		"node_modules/map-obj": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
 			"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"map-values": {
+		"node_modules/map-values": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz",
 			"integrity": "sha1-douOecAJvytk/ugG4ip7HEGQyZA=",
 			"dev": true
 		},
-		"map-visit": {
+		"node_modules/map-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
 			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"object-visit": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"markdown-it": {
+		"node_modules/markdown-it": {
 			"version": "12.3.2",
 			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
 			"integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"argparse": "^2.0.1",
 				"entities": "~2.1.0",
 				"linkify-it": "^3.0.1",
 				"mdurl": "^1.0.1",
 				"uc.micro": "^1.0.5"
 			},
-			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				}
+			"bin": {
+				"markdown-it": "bin/markdown-it.js"
 			}
 		},
-		"markdownlint": {
+		"node_modules/markdown-it/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/markdownlint": {
 			"version": "0.25.1",
 			"resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.25.1.tgz",
 			"integrity": "sha512-AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"markdown-it": "12.3.2"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"markdownlint-cli": {
+		"node_modules/markdownlint-cli": {
 			"version": "0.31.1",
 			"resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz",
 			"integrity": "sha512-keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"commander": "~9.0.0",
 				"get-stdin": "~9.0.0",
 				"glob": "~7.2.0",
@@ -18741,299 +22596,392 @@
 				"minimatch": "~3.0.5",
 				"run-con": "~1.2.10"
 			},
+			"bin": {
+				"markdownlint": "markdownlint.js"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/markdownlint-cli/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/markdownlint-cli/node_modules/commander": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz",
+			"integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==",
+			"dev": true,
+			"engines": {
+				"node": "^12.20.0 || >=14"
+			}
+		},
+		"node_modules/markdownlint-cli/node_modules/get-stdin": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+			"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/markdownlint-cli/node_modules/glob": {
+			"version": "7.2.3",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"dev": true,
 			"dependencies": {
-				"argparse": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-					"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-					"dev": true
-				},
-				"commander": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz",
-					"integrity": "sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==",
-					"dev": true
-				},
-				"get-stdin": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-					"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
-					"dev": true
-				},
-				"glob": {
-					"version": "7.2.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-					"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "^1.0.0",
-						"inflight": "^1.0.4",
-						"inherits": "2",
-						"minimatch": "^3.1.1",
-						"once": "^1.3.0",
-						"path-is-absolute": "^1.0.0"
-					},
-					"dependencies": {
-						"minimatch": {
-							"version": "3.1.2",
-							"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-							"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-							"dev": true,
-							"requires": {
-								"brace-expansion": "^1.1.7"
-							}
-						}
-					}
-				},
-				"js-yaml": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-					"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-					"dev": true,
-					"requires": {
-						"argparse": "^2.0.1"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.8",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
-					"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "^1.1.7"
-					}
-				}
+				"fs.realpath": "^1.0.0",
+				"inflight": "^1.0.4",
+				"inherits": "2",
+				"minimatch": "^3.1.1",
+				"once": "^1.3.0",
+				"path-is-absolute": "^1.0.0"
+			},
+			"engines": {
+				"node": "*"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/markdownlint-cli/node_modules/glob/node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/markdownlint-cli/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
 			}
 		},
-		"markdownlint-rule-helpers": {
+		"node_modules/markdownlint-cli/node_modules/minimatch": {
+			"version": "3.0.8",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+			"integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+			"dev": true,
+			"dependencies": {
+				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
+		"node_modules/markdownlint-rule-helpers": {
 			"version": "0.16.0",
 			"resolved": "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.16.0.tgz",
 			"integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
 			"dev": true
 		},
-		"masonry-layout": {
+		"node_modules/masonry-layout": {
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/masonry-layout/-/masonry-layout-4.2.2.tgz",
 			"integrity": "sha512-iGtAlrpHNyxaR19CvKC3npnEcAwszXoyJiI8ARV2ePi7fmYhIud25MHK8Zx4P0LCC4d3TNO9+rFa1KoK1OEOaA==",
-			"requires": {
+			"dependencies": {
 				"get-size": "^2.0.2",
 				"outlayer": "^2.1.0"
 			}
 		},
-		"matchdep": {
+		"node_modules/matchdep": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
 			"integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"findup-sync": "^2.0.0",
 				"micromatch": "^3.0.4",
 				"resolve": "^1.4.0",
 				"stack-trace": "0.0.10"
 			},
+			"engines": {
+				"node": ">= 0.10.0"
+			}
+		},
+		"node_modules/matchdep/node_modules/expand-tilde": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+			"dev": true,
 			"dependencies": {
-				"expand-tilde": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-					"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "^1.0.1"
-					}
-				},
-				"findup-sync": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-					"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-					"dev": true,
-					"requires": {
-						"detect-file": "^1.0.0",
-						"is-glob": "^3.1.0",
-						"micromatch": "^3.0.4",
-						"resolve-dir": "^1.0.1"
-					}
-				},
-				"global-modules": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-					"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^1.0.1",
-						"is-windows": "^1.0.1",
-						"resolve-dir": "^1.0.0"
-					}
-				},
-				"global-prefix": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-					"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-					"dev": true,
-					"requires": {
-						"expand-tilde": "^2.0.2",
-						"homedir-polyfill": "^1.0.1",
-						"ini": "^1.3.4",
-						"is-windows": "^1.0.1",
-						"which": "^1.2.14"
-					}
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "^2.1.0"
-					}
-				},
-				"resolve-dir": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-					"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-					"dev": true,
-					"requires": {
-						"expand-tilde": "^2.0.0",
-						"global-modules": "^1.0.0"
-					}
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				}
+				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/matchdep/node_modules/findup-sync": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+			"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+			"dev": true,
+			"dependencies": {
+				"detect-file": "^1.0.0",
+				"is-glob": "^3.1.0",
+				"micromatch": "^3.0.4",
+				"resolve-dir": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/matchdep/node_modules/global-modules": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+			"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+			"dev": true,
+			"dependencies": {
+				"global-prefix": "^1.0.1",
+				"is-windows": "^1.0.1",
+				"resolve-dir": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/matchdep/node_modules/global-prefix": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.2",
+				"homedir-polyfill": "^1.0.1",
+				"ini": "^1.3.4",
+				"is-windows": "^1.0.1",
+				"which": "^1.2.14"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/matchdep/node_modules/is-glob": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+			"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+			"dev": true,
+			"dependencies": {
+				"is-extglob": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"mathml-tag-names": {
+		"node_modules/matchdep/node_modules/resolve-dir": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+			"dev": true,
+			"dependencies": {
+				"expand-tilde": "^2.0.0",
+				"global-modules": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/matchdep/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/mathml-tag-names": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
 			"integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-			"dev": true
+			"dev": true,
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/wooorm"
+			}
 		},
-		"maxmin": {
+		"node_modules/maxmin": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-3.0.0.tgz",
 			"integrity": "sha512-wcahMInmGtg/7c6a75fr21Ch/Ks1Tb+Jtoan5Ft4bAI0ZvJqyOw8kkM7e7p8hDSzY805vmxwHT50KcjGwKyJ0g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"chalk": "^4.1.0",
 				"figures": "^3.2.0",
 				"gzip-size": "^5.1.1",
 				"pretty-bytes": "^5.3.0"
 			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/maxmin/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
-				"gzip-size": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-					"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-					"dev": true,
-					"requires": {
-						"duplexer": "^0.1.1",
-						"pify": "^4.0.1"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/maxmin/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/maxmin/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/maxmin/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/maxmin/node_modules/figures": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+			"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+			"dev": true,
+			"dependencies": {
+				"escape-string-regexp": "^1.0.5"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/maxmin/node_modules/gzip-size": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+			"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+			"dev": true,
+			"dependencies": {
+				"duplexer": "^0.1.1",
+				"pify": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"mdn-data": {
+		"node_modules/maxmin/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/maxmin/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/mdn-data": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
 			"integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
-		"mdurl": {
+		"node_modules/mdurl": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
 			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
 			"dev": true
 		},
-		"media-typer": {
+		"node_modules/media-typer": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
 			"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"memfs": {
-			"version": "3.4.7",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-			"integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
+		"node_modules/memfs": {
+			"version": "3.4.13",
+			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz",
+			"integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"fs-monkey": "^1.0.3"
+			},
+			"engines": {
+				"node": ">= 4.0.0"
 			}
 		},
-		"memize": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/memize/-/memize-1.1.0.tgz",
-			"integrity": "sha512-K4FcPETOMTwe7KL2LK0orMhpOmWD2wRGwWWpbZy0fyArwsyIKR8YJVz8+efBAh3BO4zPqlSICu4vsLTRRqtFAg=="
+		"node_modules/memize": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/memize/-/memize-2.1.0.tgz",
+			"integrity": "sha512-yywVJy8ctVlN5lNPxsep5urnZ6TTclwPEyigM9M3Bi8vseJBOfqNrGWN/r8NzuIt3PovM323W04blJfGQfQSVg=="
 		},
-		"meow": {
+		"node_modules/meow": {
 			"version": "3.7.0",
 			"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
 			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"camelcase-keys": "^2.0.0",
 				"decamelize": "^1.1.2",
 				"loud-rejection": "^1.0.0",
@@ -19044,48 +22992,60 @@
 				"read-pkg-up": "^1.0.1",
 				"redent": "^1.0.0",
 				"trim-newlines": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"merge-deep": {
+		"node_modules/merge-deep": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
 			"integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"arr-union": "^3.1.0",
 				"clone-deep": "^0.2.4",
 				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"merge-descriptors": {
+		"node_modules/merge-descriptors": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
 			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
 			"dev": true
 		},
-		"merge-stream": {
+		"node_modules/merge-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
 			"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
 			"dev": true
 		},
-		"merge2": {
+		"node_modules/merge2": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"methods": {
+		"node_modules/methods": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
 			"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"micromatch": {
+		"node_modules/micromatch": {
 			"version": "3.1.10",
 			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
 			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"arr-diff": "^4.0.0",
 				"array-unique": "^0.3.2",
 				"braces": "^2.3.1",
@@ -19100,276 +23060,380 @@
 				"snapdragon": "^0.8.1",
 				"to-regex": "^3.0.2"
 			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/micromatch/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"micromodal": {
+		"node_modules/micromodal": {
 			"version": "0.4.10",
 			"resolved": "https://registry.npmjs.org/micromodal/-/micromodal-0.4.10.tgz",
-			"integrity": "sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ=="
+			"integrity": "sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ==",
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"mime": {
+		"node_modules/mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
 			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"dev": true
+			"dev": true,
+			"bin": {
+				"mime": "cli.js"
+			},
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"mime-db": {
+		"node_modules/mime-db": {
 			"version": "1.45.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
 			"integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"mime-types": {
+		"node_modules/mime-types": {
 			"version": "2.1.28",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
 			"integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"mime-db": "1.45.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"mimic-fn": {
+		"node_modules/mimic-fn": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"mimic-response": {
+		"node_modules/mimic-response": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
 			"integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"min-indent": {
+		"node_modules/min-indent": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
 			"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"mini-css-extract-plugin": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-			"integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+		"node_modules/mini-css-extract-plugin": {
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
+			"integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"schema-utils": "^4.0.0"
 			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.0.0"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv": {
+			"version": "8.12.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"dev": true,
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
-				}
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.8.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"minimalistic-assert": {
+		"node_modules/minimalistic-assert": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
 			"dev": true
 		},
-		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+		"node_modules/minimatch": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"brace-expansion": "^1.1.7"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"minimist": {
+		"node_modules/minimist": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
 			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
 			"dev": true
 		},
-		"minimist-options": {
+		"node_modules/minimist-options": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
 			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"arrify": "^1.0.1",
 				"is-plain-obj": "^1.1.0",
 				"kind-of": "^6.0.3"
 			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/minimist-options/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"mixin-deep": {
+		"node_modules/mitt": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.0.tgz",
+			"integrity": "sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ==",
+			"dev": true
+		},
+		"node_modules/mixin-deep": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
 			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"for-in": "^1.0.2",
 				"is-extendable": "^1.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mixin-deep/node_modules/is-extendable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+			"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+			"dev": true,
 			"dependencies": {
-				"is-extendable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4"
-					}
-				}
+				"is-plain-object": "^2.0.4"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mixin-deep/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"mixin-object": {
+		"node_modules/mixin-object": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
 			"integrity": "sha512-ALGF1Jt9ouehcaXaHhn6t1yGWRqGaHkPFndtFVHfZXOvkIZ/yoGaSi0AHVTafb3ZBGg4dr/bDwnaEKqCXzchMA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"for-in": "^0.1.3",
 				"is-extendable": "^0.1.1"
 			},
-			"dependencies": {
-				"for-in": {
-					"version": "0.1.8",
-					"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
-					"integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/mixin-object/node_modules/for-in": {
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+			"integrity": "sha512-F0to7vbBSHP8E3l6dCjxNOLuSFAACIxFy3UehTUlG7svlXi37HHsDkyVcHo0Pq8QwrE+pXvWSVX3ZT1T9wAZ9g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"mkdirp": {
+		"node_modules/mkdirp": {
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"minimist": "^1.2.5"
+			},
+			"bin": {
+				"mkdirp": "bin/cmd.js"
 			}
 		},
-		"mkdirp-classic": {
+		"node_modules/mkdirp-classic": {
 			"version": "0.5.3",
 			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
 			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
 			"dev": true
 		},
-		"mnemonist": {
-			"version": "0.39.3",
-			"resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.39.3.tgz",
-			"integrity": "sha512-CQ9Nq2TjXH+bybu89QHHrJnv3FnGtozaQPna3gvGpgHSJhyfHR2khMN6EOL/Z1b6ikmbZgCUD2eOBtTS9FOdFw==",
-			"requires": {
+		"node_modules/mnemonist": {
+			"version": "0.39.5",
+			"resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.39.5.tgz",
+			"integrity": "sha512-FPUtkhtJ0efmEFGpU14x7jGbTB+s18LrzRL2KgoWz9YvcY3cPomz8tih01GbHwnGk/OmkOKfqd/RAQoc8Lm7DQ==",
+			"dependencies": {
 				"obliterator": "^2.0.1"
 			}
 		},
-		"moment": {
+		"node_modules/moment": {
 			"version": "2.29.4",
 			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+			"engines": {
+				"node": "*"
+			}
 		},
-		"moment-timezone": {
-			"version": "0.5.38",
-			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz",
-			"integrity": "sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q==",
-			"requires": {
+		"node_modules/moment-timezone": {
+			"version": "0.5.40",
+			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.40.tgz",
+			"integrity": "sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg==",
+			"dependencies": {
 				"moment": ">= 2.9.0"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"moo": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
-			"integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==",
-			"dev": true
-		},
-		"mousetrap": {
+		"node_modules/mousetrap": {
 			"version": "1.6.5",
 			"resolved": "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz",
 			"integrity": "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA=="
 		},
-		"mrmime": {
+		"node_modules/mrmime": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
 			"integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"ms": {
+		"node_modules/ms": {
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
 			"dev": true
 		},
-		"multicast-dns": {
+		"node_modules/multicast-dns": {
 			"version": "7.2.5",
 			"resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
 			"integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"dns-packet": "^5.2.2",
 				"thunky": "^1.0.2"
+			},
+			"bin": {
+				"multicast-dns": "cli.js"
 			}
 		},
-		"mute-stream": {
+		"node_modules/mute-stream": {
 			"version": "0.0.7",
 			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
 			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
 			"dev": true
 		},
-		"nanoid": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-			"dev": true
+		"node_modules/nanoid": {
+			"version": "3.3.6",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"bin": {
+				"nanoid": "bin/nanoid.cjs"
+			},
+			"engines": {
+				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+			}
 		},
-		"nanomatch": {
+		"node_modules/nanomatch": {
 			"version": "1.2.13",
 			"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
 			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"arr-diff": "^4.0.0",
 				"array-unique": "^0.3.2",
 				"define-property": "^2.0.2",
@@ -19382,1780 +23446,1591 @@
 				"snapdragon": "^0.8.1",
 				"to-regex": "^3.0.1"
 			},
-			"dependencies": {
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/nanomatch/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"natural-compare": {
+		"node_modules/natural-compare": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
 			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
 			"dev": true
 		},
-		"nearley": {
-			"version": "2.20.1",
-			"resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
-			"integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
-			"dev": true,
-			"requires": {
-				"commander": "^2.19.0",
-				"moo": "^0.5.0",
-				"railroad-diagrams": "^1.0.0",
-				"randexp": "0.4.6"
-			}
+		"node_modules/natural-compare-lite": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+			"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+			"dev": true
 		},
-		"negotiator": {
+		"node_modules/negotiator": {
 			"version": "0.6.3",
 			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
 			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"neo-async": {
+		"node_modules/neo-async": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
 			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
 			"dev": true
 		},
-		"next-applause": {
+		"node_modules/next-applause": {
 			"version": "2.2.4",
 			"resolved": "https://registry.npmjs.org/next-applause/-/next-applause-2.2.4.tgz",
 			"integrity": "sha512-ktqjWT512q6vzAYnmRfJcqqVCA7ft8VcqkfBzgWuqI9SDSHM//B+hvjrGlkNzOzDMzljc3flok01t79OGkRVXQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"cson-parser": "^1.2.0",
 				"js-yaml": "^3.3.0",
 				"lodash": "^4.17.11"
+			},
+			"engines": {
+				"node": ">= 0.10.0"
 			}
 		},
-		"nice-try": {
+		"node_modules/nice-try": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
 			"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
 			"dev": true,
 			"optional": true
 		},
-		"nise": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
-			"integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
+		"node_modules/nise": {
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/nise/-/nise-5.1.4.tgz",
+			"integrity": "sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==",
 			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.8.3",
-				"@sinonjs/fake-timers": ">=5",
+			"dependencies": {
+				"@sinonjs/commons": "^2.0.0",
+				"@sinonjs/fake-timers": "^10.0.2",
 				"@sinonjs/text-encoding": "^0.7.1",
 				"just-extend": "^4.0.2",
 				"path-to-regexp": "^1.7.0"
-			},
+			}
+		},
+		"node_modules/nise/node_modules/@sinonjs/commons": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
+			"integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
+			"dev": true,
 			"dependencies": {
-				"@sinonjs/commons": {
-					"version": "1.8.3",
-					"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-					"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-					"dev": true,
-					"requires": {
-						"type-detect": "4.0.8"
-					}
-				},
-				"isarray": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-					"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-					"dev": true
-				},
-				"path-to-regexp": {
-					"version": "1.8.0",
-					"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-					"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-					"dev": true,
-					"requires": {
-						"isarray": "0.0.1"
-					}
-				}
+				"type-detect": "4.0.8"
+			}
+		},
+		"node_modules/nise/node_modules/isarray": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+			"integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
+			"dev": true
+		},
+		"node_modules/nise/node_modules/path-to-regexp": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+			"integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+			"dev": true,
+			"dependencies": {
+				"isarray": "0.0.1"
 			}
 		},
-		"no-case": {
+		"node_modules/no-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
 			"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-			"requires": {
+			"dependencies": {
 				"lower-case": "^2.0.2",
 				"tslib": "^2.0.3"
 			}
 		},
-		"node-domexception": {
+		"node_modules/node-domexception": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
-			"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="
+			"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "github",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"engines": {
+				"node": ">=10.5.0"
+			}
 		},
-		"node-fetch": {
+		"node_modules/node-fetch": {
 			"version": "2.6.7",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
 			"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"whatwg-url": "^5.0.0"
+			},
+			"engines": {
+				"node": "4.x || >=6.0.0"
+			},
+			"peerDependencies": {
+				"encoding": "^0.1.0"
+			},
+			"peerDependenciesMeta": {
+				"encoding": {
+					"optional": true
+				}
 			}
 		},
-		"node-forge": {
+		"node_modules/node-forge": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
 			"integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 6.13.0"
+			}
 		},
-		"node-int64": {
+		"node_modules/node-int64": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
 			"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
 			"dev": true
 		},
-		"node-releases": {
-			"version": "1.1.72",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
-			"integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+		"node_modules/node-releases": {
+			"version": "2.0.13",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
 			"dev": true
 		},
-		"node-watch": {
+		"node_modules/node-watch": {
 			"version": "0.7.3",
 			"resolved": "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz",
 			"integrity": "sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/nopt": {
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+			"dev": true,
+			"dependencies": {
+				"abbrev": "1"
+			},
+			"bin": {
+				"nopt": "bin/nopt.js"
+			}
+		},
+		"node_modules/normalize-package-data": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^2.1.4",
+				"resolve": "^1.10.0",
+				"semver": "2 || 3 || 4 || 5",
+				"validate-npm-package-license": "^3.0.1"
+			}
+		},
+		"node_modules/normalize-package-data/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/normalize-path": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-range": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/normalize-url": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/normalize-wheel": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+			"integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
+		},
+		"node_modules/npm-bundled": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+			"dev": true,
+			"dependencies": {
+				"npm-normalize-package-bin": "^1.0.1"
+			}
+		},
+		"node_modules/npm-conf": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+			"integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"config-chain": "^1.1.11",
+				"pify": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-conf/node_modules/pify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/npm-normalize-package-bin": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+			"dev": true
+		},
+		"node_modules/npm-package-json-lint": {
+			"version": "5.4.2",
+			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.4.2.tgz",
+			"integrity": "sha512-DH1MSvYvm+cuQFXcPehIIu/WiYzMYs7BOxlhOOFHaH2SNrA+P2uDtTEe5LOG90Ci7PTwgF/dCmSKM2HWTgWXNA==",
+			"dev": true,
+			"dependencies": {
+				"ajv": "^6.12.6",
+				"ajv-errors": "^1.0.1",
+				"chalk": "^4.1.2",
+				"cosmiconfig": "^7.0.1",
+				"debug": "^4.3.2",
+				"globby": "^11.0.4",
+				"ignore": "^5.1.9",
+				"is-plain-obj": "^3.0.0",
+				"jsonc-parser": "^3.0.0",
+				"log-symbols": "^4.1.0",
+				"meow": "^6.1.1",
+				"plur": "^4.0.0",
+				"semver": "^7.3.5",
+				"slash": "^3.0.0",
+				"strip-json-comments": "^3.1.1"
+			},
+			"bin": {
+				"npmPkgJsonLint": "src/cli.js"
+			},
+			"engines": {
+				"node": ">=10.0.0",
+				"npm": ">=6.0.0"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 			"dev": true
 		},
-		"nopt": {
-			"version": "3.0.6",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+		"node_modules/npm-package-json-lint/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/is-plain-obj": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+			"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
-			"requires": {
-				"abbrev": "1"
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"normalize-package-data": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+		"node_modules/npm-package-json-lint/node_modules/map-obj": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+			"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
 			"dev": true,
-			"requires": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
+			"engines": {
+				"node": ">=8"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/meow": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz",
+			"integrity": "sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==",
+			"dev": true,
 			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true
-				}
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "^4.0.2",
+				"normalize-package-data": "^2.5.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.13.1",
+				"yargs-parser": "^18.1.3"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"normalize-path": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-			"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-			"dev": true
+		"node_modules/npm-package-json-lint/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"normalize-range": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
-			"dev": true
+		"node_modules/npm-package-json-lint/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"normalize-url": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-			"integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-			"dev": true
+		"node_modules/npm-package-json-lint/node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"normalize-wheel": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-			"integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
+		"node_modules/npm-package-json-lint/node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"npm-bundled": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
-			"integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
+		"node_modules/npm-package-json-lint/node_modules/redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
 			"dev": true,
-			"requires": {
-				"npm-normalize-package-bin": "^1.0.1"
+			"dependencies": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"npm-conf": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-			"integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+		"node_modules/npm-package-json-lint/node_modules/strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
 			"dev": true,
-			"optional": true,
-			"requires": {
-				"config-chain": "^1.1.11",
-				"pify": "^3.0.0"
+			"dependencies": {
+				"min-indent": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
 			"dependencies": {
-				"pify": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-					"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-					"dev": true,
-					"optional": true
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"npm-normalize-package-bin": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-			"integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-			"dev": true
+		"node_modules/npm-package-json-lint/node_modules/trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"npm-package-json-lint": {
-			"version": "5.4.2",
-			"resolved": "https://registry.npmjs.org/npm-package-json-lint/-/npm-package-json-lint-5.4.2.tgz",
-			"integrity": "sha512-DH1MSvYvm+cuQFXcPehIIu/WiYzMYs7BOxlhOOFHaH2SNrA+P2uDtTEe5LOG90Ci7PTwgF/dCmSKM2HWTgWXNA==",
+		"node_modules/npm-package-json-lint/node_modules/type-fest": {
+			"version": "0.13.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+			"integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
 			"dev": true,
-			"requires": {
-				"ajv": "^6.12.6",
-				"ajv-errors": "^1.0.1",
-				"chalk": "^4.1.2",
-				"cosmiconfig": "^7.0.1",
-				"debug": "^4.3.2",
-				"globby": "^11.0.4",
-				"ignore": "^5.1.9",
-				"is-plain-obj": "^3.0.0",
-				"jsonc-parser": "^3.0.0",
-				"log-symbols": "^4.1.0",
-				"meow": "^6.1.1",
-				"plur": "^4.0.0",
-				"semver": "^7.3.5",
-				"slash": "^3.0.0",
-				"strip-json-comments": "^3.1.1"
+			"engines": {
+				"node": ">=10"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/npm-package-json-lint/node_modules/yargs-parser": {
+			"version": "18.1.3",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+			"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"camelcase-keys": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-					"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.3.1",
-						"map-obj": "^4.0.0",
-						"quick-lru": "^4.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"indent-string": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-					"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-					"dev": true
-				},
-				"is-plain-obj": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-					"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"map-obj": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-					"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-					"dev": true
-				},
-				"meow": {
-					"version": "6.1.1",
-					"resolved": "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz",
-					"integrity": "sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==",
-					"dev": true,
-					"requires": {
-						"@types/minimist": "^1.2.0",
-						"camelcase-keys": "^6.2.2",
-						"decamelize-keys": "^1.1.0",
-						"hard-rejection": "^2.1.0",
-						"minimist-options": "^4.0.2",
-						"normalize-package-data": "^2.5.0",
-						"read-pkg-up": "^7.0.1",
-						"redent": "^3.0.0",
-						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.13.1",
-						"yargs-parser": "^18.1.3"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"read-pkg-up": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-					"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.1.0",
-						"read-pkg": "^5.2.0",
-						"type-fest": "^0.8.1"
-					},
-					"dependencies": {
-						"type-fest": {
-							"version": "0.8.1",
-							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-							"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-							"dev": true
-						}
-					}
-				},
-				"redent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-					"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-					"dev": true,
-					"requires": {
-						"indent-string": "^4.0.0",
-						"strip-indent": "^3.0.0"
-					}
-				},
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"strip-indent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-					"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-					"dev": true,
-					"requires": {
-						"min-indent": "^1.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				},
-				"trim-newlines": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-					"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-					"integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-					"dev": true
-				},
-				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
-				}
+				"camelcase": "^5.0.0",
+				"decamelize": "^1.2.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"npm-packlist": {
+		"node_modules/npm-packlist": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz",
 			"integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"glob": "^7.1.6",
 				"ignore-walk": "^4.0.1",
 				"npm-bundled": "^1.1.1",
 				"npm-normalize-package-bin": "^1.0.1"
+			},
+			"bin": {
+				"npm-packlist": "bin/index.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"npm-run-path": {
+		"node_modules/npm-run-path": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
 			"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"path-key": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"nth-check": {
+		"node_modules/nth-check": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
 			"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
 			"dev": true,
-			"requires": {
+			"optional": true,
+			"dependencies": {
 				"boolbase": "~1.0.0"
 			}
 		},
-		"num2fraction": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-			"integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-			"dev": true
-		},
-		"nwsapi": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-			"integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==",
+		"node_modules/nwsapi": {
+			"version": "2.2.7",
+			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+			"integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
 			"dev": true
 		},
-		"oauth-sign": {
+		"node_modules/oauth-sign": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
 			"integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
 		},
-		"object-assign": {
+		"node_modules/object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"object-copy": {
+		"node_modules/object-copy": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
 			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"copy-descriptor": "^0.1.0",
 				"define-property": "^0.2.5",
 				"kind-of": "^3.0.3"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object-copy/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+			"dev": true,
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"object-filter": {
+		"node_modules/object-filter": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz",
 			"integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g=",
 			"dev": true
 		},
-		"object-inspect": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-			"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
-			"dev": true
-		},
-		"object-is": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+		"node_modules/object-inspect": {
+			"version": "1.12.3",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object-keys": {
+		"node_modules/object-keys": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
 			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
-		"object-visit": {
+		"node_modules/object-visit": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
 			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"isobject": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"object.assign": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
-			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+		"node_modules/object.assign": {
+			"version": "4.1.4",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3",
-				"has-symbols": "^1.0.1",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"has-symbols": "^1.0.3",
 				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object.defaults": {
+		"node_modules/object.defaults": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
 			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"array-each": "^1.0.1",
 				"array-slice": "^1.0.0",
 				"for-own": "^1.0.0",
 				"isobject": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.defaults/node_modules/for-own": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+			"dev": true,
 			"dependencies": {
-				"for-own": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-					"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
+				"for-in": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"object.entries": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-			"integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+		"node_modules/object.entries": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+			"integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
-		"object.fromentries": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-			"integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+		"node_modules/object.fromentries": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+			"integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object.getownpropertydescriptors": {
+		"node_modules/object.getownpropertydescriptors": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz",
 			"integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==",
 			"dev": true,
-			"requires": {
+			"optional": true,
+			"dependencies": {
 				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
 				"es-abstract": "^1.18.0-next.1"
 			},
-			"dependencies": {
-				"es-abstract": {
-					"version": "1.18.0-next.1",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-					"integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-					"dev": true,
-					"requires": {
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.1",
-						"is-callable": "^1.2.2",
-						"is-negative-zero": "^2.0.0",
-						"is-regex": "^1.1.1",
-						"object-inspect": "^1.8.0",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.1",
-						"string.prototype.trimend": "^1.0.1",
-						"string.prototype.trimstart": "^1.0.1"
-					}
-				}
+			"engines": {
+				"node": ">= 0.8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object.hasown": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-			"integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
+		"node_modules/object.hasown": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+			"integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-					"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-					"dev": true,
-					"requires": {
-						"has-property-descriptors": "^1.0.0",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					}
-				},
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				}
+				"es-abstract": "^1.20.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"object.map": {
+		"node_modules/object.map": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
 			"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
 			"dev": true,
-			"requires": {
-				"for-own": "^1.0.0",
-				"make-iterator": "^1.0.0"
-			},
 			"dependencies": {
-				"for-own": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-					"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-					"dev": true,
-					"requires": {
-						"for-in": "^1.0.1"
-					}
-				}
+				"for-own": "^1.0.0",
+				"make-iterator": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/object.map/node_modules/for-own": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+			"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+			"dev": true,
+			"dependencies": {
+				"for-in": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"object.pick": {
+		"node_modules/object.pick": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
 			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"object.values": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
-			"integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
+		"node_modules/object.values": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+			"integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.18.0-next.1",
-				"has": "^1.0.3"
-			},
 			"dependencies": {
-				"es-abstract": {
-					"version": "1.18.0-next.1",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
-					"integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
-					"dev": true,
-					"requires": {
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.1",
-						"is-callable": "^1.2.2",
-						"is-negative-zero": "^2.0.0",
-						"is-regex": "^1.1.1",
-						"object-inspect": "^1.8.0",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.1",
-						"string.prototype.trimend": "^1.0.1",
-						"string.prototype.trimstart": "^1.0.1"
-					}
-				}
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"objectFitPolyfill": {
+		"node_modules/objectFitPolyfill": {
 			"version": "2.3.5",
 			"resolved": "https://registry.npmjs.org/objectFitPolyfill/-/objectFitPolyfill-2.3.5.tgz",
 			"integrity": "sha512-8Quz071ZmGi0QWEG4xB3Bv5Lpw6K0Uca87FLoLMKMWjB6qIq9IyBegP3b/VLNxv2WYvIMGoeUQ+c6ibUkNa8TA=="
 		},
-		"obliterator": {
+		"node_modules/obliterator": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.4.tgz",
 			"integrity": "sha512-lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ=="
 		},
-		"obuf": {
+		"node_modules/obuf": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
 			"integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
 			"dev": true
 		},
-		"on-finished": {
+		"node_modules/on-finished": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
 			"integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"ee-first": "1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.8"
 			}
 		},
-		"on-headers": {
+		"node_modules/on-headers": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
 			"integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"once": {
+		"node_modules/once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"wrappy": "1"
 			}
 		},
-		"onetime": {
+		"node_modules/onetime": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
 			"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"mimic-fn": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"open": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-			"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+		"node_modules/open": {
+			"version": "8.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+			"integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"define-lazy-prop": "^2.0.0",
 				"is-docker": "^2.1.1",
 				"is-wsl": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"opener": {
+		"node_modules/opener": {
 			"version": "1.5.2",
 			"resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
 			"integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
-			"dev": true
+			"dev": true,
+			"bin": {
+				"opener": "bin/opener-bin.js"
+			}
 		},
-		"optionator": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-			"integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+		"node_modules/optionator": {
+			"version": "0.9.3",
+			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+			"integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
+				"@aashutoshrathi/word-wrap": "^1.2.3",
 				"deep-is": "^0.1.3",
 				"fast-levenshtein": "^2.0.6",
 				"levn": "^0.4.1",
 				"prelude-ls": "^1.2.1",
-				"type-check": "^0.4.0",
-				"word-wrap": "^1.2.3"
+				"type-check": "^0.4.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"optipng-bin": {
+		"node_modules/optipng-bin": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-5.1.0.tgz",
 			"integrity": "sha512-9baoqZTNNmXQjq/PQTWEXbVV3AMO2sI/GaaqZJZ8SExfAzjijeAP7FEeT+TtyumSw7gr0PZtSUYB/Ke7iHQVKA==",
 			"dev": true,
+			"hasInstallScript": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"bin-build": "^3.0.0",
 				"bin-wrapper": "^4.0.0",
 				"logalot": "^2.0.0"
+			},
+			"bin": {
+				"optipng": "cli.js"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"os-filter-obj": {
+		"node_modules/os-filter-obj": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-2.0.0.tgz",
 			"integrity": "sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"arch": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"os-homedir": {
+		"node_modules/os-homedir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"os-tmpdir": {
+		"node_modules/os-tmpdir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
 			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"osenv": {
+		"node_modules/osenv": {
 			"version": "0.1.5",
 			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
 			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"os-homedir": "^1.0.0",
 				"os-tmpdir": "^1.0.0"
 			}
 		},
-		"outlayer": {
+		"node_modules/outlayer": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/outlayer/-/outlayer-2.1.1.tgz",
 			"integrity": "sha1-KYY7beEOpdrf/8rfoNcokHOH6aI=",
-			"requires": {
+			"dependencies": {
 				"ev-emitter": "^1.0.0",
 				"fizzy-ui-utils": "^2.0.0",
 				"get-size": "^2.0.2"
 			}
 		},
-		"p-cancelable": {
+		"node_modules/p-cancelable": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.3.0.tgz",
 			"integrity": "sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-each-series": {
+		"node_modules/p-each-series": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
 			"integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"p-event": {
+		"node_modules/p-event": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/p-event/-/p-event-1.3.0.tgz",
 			"integrity": "sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"p-timeout": "^1.1.1"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"p-finally": {
+		"node_modules/p-finally": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
 			"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-is-promise": {
+		"node_modules/p-is-promise": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
 			"integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-limit": {
+		"node_modules/p-limit": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-			"requires": {
+			"dependencies": {
 				"p-try": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"p-locate": {
+		"node_modules/p-locate": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
 			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-			"requires": {
+			"dependencies": {
 				"p-limit": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"p-map": {
+		"node_modules/p-map": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
 			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"p-map-series": {
+		"node_modules/p-map-series": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-map-series/-/p-map-series-1.0.0.tgz",
 			"integrity": "sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"p-reduce": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"p-pipe": {
+		"node_modules/p-pipe": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz",
 			"integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-reduce": {
+		"node_modules/p-reduce": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
 			"integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"p-retry": {
+		"node_modules/p-retry": {
 			"version": "4.6.2",
 			"resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
 			"integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/retry": "0.12.0",
 				"retry": "^0.13.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"p-timeout": {
+		"node_modules/p-timeout": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-1.2.1.tgz",
 			"integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"p-finally": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"p-try": {
+		"node_modules/p-try": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"param-case": {
+		"node_modules/param-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
 			"integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-			"requires": {
+			"dependencies": {
 				"dot-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"parent-module": {
+		"node_modules/parent-module": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-			"requires": {
+			"dependencies": {
 				"callsites": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"parse-filepath": {
+		"node_modules/parse-filepath": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
 			"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"is-absolute": "^1.0.0",
 				"map-cache": "^0.2.0",
 				"path-root": "^0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
 			}
 		},
-		"parse-json": {
+		"node_modules/parse-json": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
 			"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-			"requires": {
+			"dependencies": {
 				"@babel/code-frame": "^7.0.0",
 				"error-ex": "^1.3.1",
 				"json-parse-even-better-errors": "^2.3.0",
 				"lines-and-columns": "^1.1.6"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"parse-passwd": {
+		"node_modules/parse-passwd": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
 			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"parse-srcset": {
+		"node_modules/parse-srcset": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
 			"integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE=",
 			"dev": true
 		},
-		"parse5": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.1.tgz",
-			"integrity": "sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==",
+		"node_modules/parse5": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+			"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"entities": "^4.4.0"
 			},
-			"dependencies": {
-				"entities": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz",
-					"integrity": "sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==",
-					"dev": true
-				}
+			"funding": {
+				"url": "https://github.com/inikulin/parse5?sponsor=1"
 			}
 		},
-		"parse5-htmlparser2-tree-adapter": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-			"integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+		"node_modules/parse5/node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
 			"dev": true,
-			"requires": {
-				"domhandler": "^5.0.2",
-				"parse5": "^7.0.0"
+			"engines": {
+				"node": ">=0.12"
 			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-					"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				}
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
 			}
 		},
-		"parseurl": {
+		"node_modules/parseurl": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
 			"integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"pascal-case": {
+		"node_modules/pascal-case": {
 			"version": "3.1.2",
 			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
 			"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-			"requires": {
+			"dependencies": {
 				"no-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"pascalcase": {
+		"node_modules/pascalcase": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
 			"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"path-case": {
+		"node_modules/path-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz",
 			"integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==",
-			"requires": {
+			"dependencies": {
 				"dot-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"path-dirname": {
+		"node_modules/path-dirname": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
 			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
 			"dev": true
 		},
-		"path-exists": {
+		"node_modules/path-exists": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
+			"integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"path-is-absolute": {
+		"node_modules/path-is-absolute": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"path-is-inside": {
+		"node_modules/path-is-inside": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
 			"integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==",
 			"dev": true
 		},
-		"path-key": {
+		"node_modules/path-key": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
 			"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"path-parse": {
+		"node_modules/path-parse": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
-		"path-root": {
+		"node_modules/path-root": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
 			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"path-root-regex": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"path-root-regex": {
+		"node_modules/path-root-regex": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
 			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-			"dev": true
+		"node_modules/path-to-regexp": {
+			"version": "6.2.1",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
+			"integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
 		},
-		"path-type": {
+		"node_modules/path-type": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"pend": {
+		"node_modules/pend": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
 			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
 			"dev": true
 		},
-		"performance-now": {
+		"node_modules/performance-now": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
 			"dev": true
 		},
-		"picocolors": {
+		"node_modules/picocolors": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
 			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
 			"dev": true
 		},
-		"picomatch": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-			"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-			"dev": true
+		"node_modules/picomatch": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+			"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/jonschlinkert"
+			}
 		},
-		"pify": {
+		"node_modules/pify": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
 			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"pinkie": {
+		"node_modules/pinkie": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
 			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"pinkie-promise": {
+		"node_modules/pinkie-promise": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
 			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"pinkie": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"pirates": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-			"integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-			"dev": true
+		"node_modules/pirates": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+			"integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"pixelmatch": {
+		"node_modules/pixelmatch": {
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-5.2.1.tgz",
 			"integrity": "sha512-WjcAdYSnKrrdDdqTcVEY7aB7UhhwjYQKYhHiBXdJef0MOaQeYpUdQ+iVyBLa5YBKS8MPVPPMX7rpOByISLpeEQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"pngjs": "^4.0.1"
 			},
-			"dependencies": {
-				"pngjs": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-4.0.1.tgz",
-					"integrity": "sha512-rf5+2/ioHeQxR6IxuYNYGFytUyG3lma/WW1nsmjeHlWwtb2aByla6dkVc8pmJ9nplzkTA0q2xx7mMWrOTqT4Gg==",
-					"dev": true
-				}
+			"bin": {
+				"pixelmatch": "bin/pixelmatch"
+			}
+		},
+		"node_modules/pixelmatch/node_modules/pngjs": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-4.0.1.tgz",
+			"integrity": "sha512-rf5+2/ioHeQxR6IxuYNYGFytUyG3lma/WW1nsmjeHlWwtb2aByla6dkVc8pmJ9nplzkTA0q2xx7mMWrOTqT4Gg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8.0.0"
 			}
 		},
-		"pkg-dir": {
+		"node_modules/pkg-dir": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
 			"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"find-up": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
 			"dependencies": {
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				}
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"plur": {
+		"node_modules/pkg-dir/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/pkg-dir/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/plur": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
 			"integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"irregular-plurals": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"pngjs": {
+		"node_modules/pngjs": {
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
 			"integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4.0.0"
+			}
 		},
-		"polyfill-library": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/polyfill-library/-/polyfill-library-4.4.0.tgz",
-			"integrity": "sha512-PPEBdgjDBGcHkRoPK/lnrpTY1X5DX2JxlB3hsvs5VGP+5b6MB+s17ld4veCSGYHNF7fm5ngcy+JSO/hIqL1qTw==",
-			"requires": {
+		"node_modules/polyfill-library": {
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/polyfill-library/-/polyfill-library-4.7.0.tgz",
+			"integrity": "sha512-9gftEm1xj8nDQsmBtY+9A7TBuG/HSzUxuPge9/41L77HP/EGV6V4JB+Y5oO3Fz0MfLtswrUtcIIz6qzT1uM+MA==",
+			"dependencies": {
 				"@financial-times/polyfill-useragent-normaliser": "^2.0.1",
 				"from2-string": "^1.1.0",
 				"graceful-fs": "^4.2.10",
@@ -21165,729 +25040,1044 @@
 				"stream-to-string": "^1.1.0",
 				"toposort": "^2.0.2"
 			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
-				}
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"popmotion": {
-			"version": "11.0.3",
-			"resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz",
-			"integrity": "sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA==",
-			"requires": {
-				"framesync": "6.0.1",
-				"hey-listen": "^1.0.8",
-				"style-value-types": "5.0.0",
-				"tslib": "^2.1.0"
-			}
-		},
-		"portfinder": {
+		"node_modules/portfinder": {
 			"version": "1.0.28",
 			"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
 			"integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"async": "^2.6.2",
 				"debug": "^3.1.1",
 				"mkdirp": "^0.5.5"
 			},
+			"engines": {
+				"node": ">= 0.12.0"
+			}
+		},
+		"node_modules/portfinder/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
 			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
+				"ms": "^2.1.1"
 			}
 		},
-		"posix-character-classes": {
+		"node_modules/posix-character-classes": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
 			"integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"postcss": {
-			"version": "7.0.39",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+		"node_modules/postcss": {
+			"version": "8.4.27",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
+			"integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
 			"dev": true,
-			"requires": {
-				"picocolors": "^0.2.1",
-				"source-map": "^0.6.1"
-			},
-			"dependencies": {
-				"picocolors": {
-					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-					"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
-					"dev": true
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss"
 				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
 				}
+			],
+			"dependencies": {
+				"nanoid": "^3.3.6",
+				"picocolors": "^1.0.0",
+				"source-map-js": "^1.0.2"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >=14"
 			}
 		},
-		"postcss-calc": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-			"integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+		"node_modules/postcss-calc": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-9.0.1.tgz",
+			"integrity": "sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.27",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.0.2"
-			},
 			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-					"integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-					"dev": true
-				}
+				"postcss-selector-parser": "^6.0.11",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.2"
 			}
 		},
-		"postcss-colormin": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-			"integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+		"node_modules/postcss-colormin": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
+			"integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"color": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0",
+				"colord": "^2.9.1",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-convert-values": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-			"integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+		"node_modules/postcss-convert-values": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
+			"integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-discard-comments": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-			"integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+		"node_modules/postcss-discard-comments": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
+			"integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-discard-duplicates": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-			"integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+		"node_modules/postcss-discard-duplicates": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
+			"integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-discard-empty": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-			"integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+		"node_modules/postcss-discard-empty": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
+			"integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-discard-overridden": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-			"integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+		"node_modules/postcss-discard-overridden": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
+			"integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-loader": {
+		"node_modules/postcss-loader": {
 			"version": "6.2.1",
 			"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
 			"integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"cosmiconfig": "^7.0.0",
 				"klona": "^2.0.5",
 				"semver": "^7.3.5"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "7.3.8",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				}
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"postcss": "^7.0.0 || ^8.0.1",
+				"webpack": "^5.0.0"
 			}
 		},
-		"postcss-media-query-parser": {
+		"node_modules/postcss-media-query-parser": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
 			"integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
 			"dev": true
 		},
-		"postcss-merge-longhand": {
-			"version": "4.0.11",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-			"integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+		"node_modules/postcss-merge-longhand": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
+			"integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
 			"dev": true,
-			"requires": {
-				"css-color-names": "0.0.4",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"stylehacks": "^4.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"stylehacks": "^6.0.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-merge-rules": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-			"integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+		"node_modules/postcss-merge-rules": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz",
+			"integrity": "sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
+			"dependencies": {
+				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
-				"cssnano-util-same-parent": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0",
-				"vendors": "^1.0.0"
-			},
-			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+				"cssnano-utils": "^4.0.0",
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-font-values": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-			"integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+		"node_modules/postcss-minify-font-values": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
+			"integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-gradients": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-			"integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+		"node_modules/postcss-minify-gradients": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
+			"integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"is-color-stop": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"colord": "^2.9.1",
+				"cssnano-utils": "^4.0.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-params": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-			"integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+		"node_modules/postcss-minify-params": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
+			"integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
 			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"browserslist": "^4.0.0",
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"uniqs": "^2.0.0"
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"cssnano-utils": "^4.0.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-minify-selectors": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-			"integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
-			},
-			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+		"node_modules/postcss-minify-selectors": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
+			"integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-modules-extract-imports": {
+		"node_modules/postcss-modules-extract-imports": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
 			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
+			}
 		},
-		"postcss-modules-local-by-default": {
+		"node_modules/postcss-modules-local-by-default": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
 			"integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"icss-utils": "^5.0.0",
 				"postcss-selector-parser": "^6.0.2",
 				"postcss-value-parser": "^4.1.0"
 			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-scope": {
+		"node_modules/postcss-modules-scope": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
 			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-modules-values": {
+		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
 			"integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"icss-utils": "^5.0.0"
+			},
+			"engines": {
+				"node": "^10 || ^12 || >= 14"
+			},
+			"peerDependencies": {
+				"postcss": "^8.1.0"
 			}
 		},
-		"postcss-normalize-charset": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-			"integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+		"node_modules/postcss-normalize-charset": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
+			"integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0"
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-display-values": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-			"integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+		"node_modules/postcss-normalize-display-values": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
+			"integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-positions": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-			"integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+		"node_modules/postcss-normalize-positions": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
+			"integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-repeat-style": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-			"integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+		"node_modules/postcss-normalize-repeat-style": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
+			"integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-string": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-			"integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+		"node_modules/postcss-normalize-string": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
+			"integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
 			"dev": true,
-			"requires": {
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-timing-functions": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-			"integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+		"node_modules/postcss-normalize-timing-functions": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
+			"integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-unicode": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-			"integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+		"node_modules/postcss-normalize-unicode": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
+			"integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-url": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-			"integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+		"node_modules/postcss-normalize-url": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
+			"integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
 			"dev": true,
-			"requires": {
-				"is-absolute-url": "^2.0.0",
-				"normalize-url": "^3.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
-			},
 			"dependencies": {
-				"normalize-url": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-					"integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-					"dev": true
-				}
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-normalize-whitespace": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-			"integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+		"node_modules/postcss-normalize-whitespace": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
+			"integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-ordered-values": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-			"integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+		"node_modules/postcss-ordered-values": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
+			"integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"cssnano-utils": "^4.0.0",
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-reduce-initial": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-			"integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+		"node_modules/postcss-reduce-initial": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
+			"integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-api": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0"
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"caniuse-api": "^3.0.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-reduce-transforms": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-			"integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+		"node_modules/postcss-reduce-transforms": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
+			"integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
 			"dev": true,
-			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-resolve-nested-selector": {
+		"node_modules/postcss-resolve-nested-selector": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
 			"integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
 			"dev": true
 		},
-		"postcss-safe-parser": {
+		"node_modules/postcss-safe-parser": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
 			"integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=12.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
+			},
+			"peerDependencies": {
+				"postcss": "^8.3.3"
+			}
 		},
-		"postcss-scss": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.5.tgz",
-			"integrity": "sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==",
-			"dev": true
+		"node_modules/postcss-scss": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
+			"integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/postcss/"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/postcss-scss"
+				}
+			],
+			"engines": {
+				"node": ">=12.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.4.19"
+			}
 		},
-		"postcss-selector-parser": {
-			"version": "6.0.4",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-			"integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+		"node_modules/postcss-selector-parser": {
+			"version": "6.0.11",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+			"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"cssesc": "^3.0.0",
-				"indexes-of": "^1.0.1",
-				"uniq": "^1.0.1",
 				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"postcss-svgo": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz",
-			"integrity": "sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw==",
+		"node_modules/postcss-svgo": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
+			"integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
 			"dev": true,
-			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"svgo": "^1.0.0"
+			"dependencies": {
+				"postcss-value-parser": "^4.2.0",
+				"svgo": "^3.0.2"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >= 18"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"postcss-unique-selectors": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-			"integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+		"node_modules/postcss-svgo/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
 			"dev": true,
-			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"postcss": "^7.0.0",
-				"uniqs": "^2.0.0"
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"postcss-value-parser": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+		"node_modules/postcss-svgo/node_modules/css-select": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+			"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0",
+				"css-what": "^6.1.0",
+				"domhandler": "^5.0.2",
+				"domutils": "^3.0.1",
+				"nth-check": "^2.0.1"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/css-tree": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
+			"integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.30",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/css-what": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+			"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/fb55"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/csso": {
+			"version": "5.0.5",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+			"integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+			"dev": true,
+			"dependencies": {
+				"css-tree": "~2.2.0"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+				"npm": ">=7.0.0"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/csso/node_modules/css-tree": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+			"integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+			"dev": true,
+			"dependencies": {
+				"mdn-data": "2.0.28",
+				"source-map-js": "^1.0.1"
+			},
+			"engines": {
+				"node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+				"npm": ">=7.0.0"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/csso/node_modules/mdn-data": {
+			"version": "2.0.28",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+			"integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+			"dev": true
+		},
+		"node_modules/postcss-svgo/node_modules/dom-serializer": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+			"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.2",
+				"entities": "^4.2.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/domelementtype": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+			"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
+				}
+			]
+		},
+		"node_modules/postcss-svgo/node_modules/domhandler": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+			"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.3.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/domutils": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+			"integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^2.0.0",
+				"domelementtype": "^2.3.0",
+				"domhandler": "^5.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/entities": {
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+			"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/entities?sponsor=1"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/mdn-data": {
+			"version": "2.0.30",
+			"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
+			"integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+			"dev": true
+		},
+		"node_modules/postcss-svgo/node_modules/nth-check": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+			"integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+			"dev": true,
+			"dependencies": {
+				"boolbase": "^1.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/nth-check?sponsor=1"
+			}
+		},
+		"node_modules/postcss-svgo/node_modules/svgo": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",
+			"integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
+			"dev": true,
+			"dependencies": {
+				"@trysound/sax": "0.2.0",
+				"commander": "^7.2.0",
+				"css-select": "^5.1.0",
+				"css-tree": "^2.2.1",
+				"csso": "^5.0.5",
+				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/svgo"
+			}
+		},
+		"node_modules/postcss-unique-selectors": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
+			"integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
+			"dev": true,
+			"dependencies": {
+				"postcss-selector-parser": "^6.0.5"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
+			}
+		},
+		"node_modules/postcss-value-parser": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 			"dev": true
 		},
-		"prelude-ls": {
+		"node_modules/preact": {
+			"version": "10.16.0",
+			"resolved": "https://registry.npmjs.org/preact/-/preact-10.16.0.tgz",
+			"integrity": "sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			}
+		},
+		"node_modules/prelude-ls": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8.0"
+			}
 		},
-		"prepend-http": {
+		"node_modules/prepend-http": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
 			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"prettier": {
-			"version": "npm:wp-prettier@2.0.5",
-			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.0.5.tgz",
-			"integrity": "sha512-5GCgdeevIXwR3cW4Qj5XWC5MO1iSCz8+IPn0mMw6awAt/PBiey8yyO7MhePRsaMqghJAhg6Q3QLYWSnUHWkG6A==",
+		"node_modules/prettier": {
+			"name": "wp-prettier",
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.6.2.tgz",
+			"integrity": "sha512-AV33EzqiFJ3fj+mPlKABN59YFPReLkDxQnj067Z3uEOeRQf3g05WprL0RDuqM7UBhSRo9W1rMSC2KvZmjE5UOA==",
 			"dev": true
 		},
-		"prettier-linter-helpers": {
+		"node_modules/prettier-linter-helpers": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
 			"integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"fast-diff": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"pretty-bytes": {
+		"node_modules/pretty-bytes": {
 			"version": "5.6.0",
 			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
 			"integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"pretty-format": {
-			"version": "27.5.1",
-			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-			"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+		"node_modules/pretty-format": {
+			"version": "29.6.1",
+			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.1.tgz",
+			"integrity": "sha512-7jRj+yXO0W7e4/tSJKoR7HRIHLPPjtNaUGG2xxKQnGvPNRkgWcQ0AZX6P4KBRJN4FcTBWb3sa7DVUJmocYuoog==",
 			"dev": true,
-			"requires": {
-				"ansi-regex": "^5.0.1",
+			"dependencies": {
+				"@jest/schemas": "^29.6.0",
 				"ansi-styles": "^5.0.0",
-				"react-is": "^17.0.1"
+				"react-is": "^18.0.0"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-					"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-					"dev": true
-				},
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
+			"engines": {
+				"node": "^14.15.0 || ^16.10.0 || >=18.0.0"
 			}
 		},
-		"process-nextick-args": {
+		"node_modules/pretty-format/node_modules/ansi-styles": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+			"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/pretty-format/node_modules/react-is": {
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+			"integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+			"dev": true
+		},
+		"node_modules/process-nextick-args": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
 			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
 		},
-		"progress": {
+		"node_modules/progress": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
 			"integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
 		},
-		"promise-polyfill": {
+		"node_modules/promise-polyfill": {
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz",
-			"integrity": "sha1-zQTv9G9clcOn0EVZHXm14+AfEtc="
+			"integrity": "sha512-7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg=="
 		},
-		"prompts": {
+		"node_modules/prompts": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
 			"integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"kleur": "^3.0.3",
 				"sisteransi": "^1.0.5"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"prop-types": {
+		"node_modules/prop-types": {
 			"version": "15.8.1",
 			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
 			"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-			"requires": {
+			"dependencies": {
 				"loose-envify": "^1.4.0",
 				"object-assign": "^4.1.1",
 				"react-is": "^16.13.1"
 			}
 		},
-		"proto-list": {
+		"node_modules/proto-list": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
 			"integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
 			"dev": true,
 			"optional": true
 		},
-		"proxy-addr": {
+		"node_modules/proxy-addr": {
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
 			"integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"forwarded": "0.2.0",
 				"ipaddr.js": "1.9.1"
 			},
-			"dependencies": {
-				"ipaddr.js": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-					"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"proxy-from-env": {
+		"node_modules/proxy-addr/node_modules/ipaddr.js": {
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+			"integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
+		},
+		"node_modules/proxy-compare": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/proxy-compare/-/proxy-compare-2.3.0.tgz",
+			"integrity": "sha512-c3L2CcAi7f7pvlD0D7xsF+2CQIW8C3HaYx2Pfgq8eA4HAl3GAH6/dVYsyBbYF/0XJs2ziGLrzmz5fmzPm6A0pQ=="
+		},
+		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
 			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
 			"dev": true
 		},
-		"pseudomap": {
+		"node_modules/pseudomap": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
 			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
 			"dev": true
 		},
-		"psl": {
+		"node_modules/psl": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
 			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
 			"dev": true
 		},
-		"pump": {
+		"node_modules/pump": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
 			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"end-of-stream": "^1.1.0",
 				"once": "^1.3.1"
 			}
 		},
-		"punycode": {
+		"node_modules/punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"puppeteer": {
-			"version": "9.1.1",
-			"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
-			"integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+		"node_modules/puppeteer": {
+			"version": "19.11.1",
+			"resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz",
+			"integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==",
 			"dev": true,
-			"requires": {
-				"debug": "^4.1.0",
-				"devtools-protocol": "0.0.869402",
-				"extract-zip": "^2.0.0",
-				"https-proxy-agent": "^5.0.0",
-				"node-fetch": "^2.6.1",
-				"pkg-dir": "^4.2.0",
-				"progress": "^2.0.1",
-				"proxy-from-env": "^1.1.0",
-				"rimraf": "^3.0.2",
-				"tar-fs": "^2.0.0",
-				"unbzip2-stream": "^1.3.3",
-				"ws": "^7.2.3"
-			},
+			"hasInstallScript": true,
 			"dependencies": {
-				"devtools-protocol": {
-					"version": "0.0.869402",
-					"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
-					"integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				}
+				"@puppeteer/browsers": "0.5.0",
+				"cosmiconfig": "8.1.3",
+				"https-proxy-agent": "5.0.1",
+				"progress": "2.0.3",
+				"proxy-from-env": "1.1.0",
+				"puppeteer-core": "19.11.1"
 			}
 		},
-		"puppeteer-core": {
+		"node_modules/puppeteer-core": {
 			"version": "13.7.0",
 			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-13.7.0.tgz",
 			"integrity": "sha512-rXja4vcnAzFAP1OVLq/5dWNfwBGuzcOARJ6qGV7oAZhnLmVRU8G5MsdeQEAOy332ZhkIOnn9jp15R89LKHyp2Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"cross-fetch": "3.1.5",
 				"debug": "4.3.4",
 				"devtools-protocol": "0.0.981744",
@@ -21901,347 +26091,540 @@
 				"unbzip2-stream": "1.4.3",
 				"ws": "8.5.0"
 			},
+			"engines": {
+				"node": ">=10.18.1"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
 			"dependencies": {
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"https-proxy-agent": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-					"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-					"dev": true,
-					"requires": {
-						"agent-base": "6",
-						"debug": "4"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/puppeteer-core/node_modules/ws": {
+			"version": "8.5.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+			"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
 				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/puppeteer/node_modules/argparse": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+			"dev": true
+		},
+		"node_modules/puppeteer/node_modules/cosmiconfig": {
+			"version": "8.1.3",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz",
+			"integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==",
+			"dev": true,
+			"dependencies": {
+				"import-fresh": "^3.2.1",
+				"js-yaml": "^4.1.0",
+				"parse-json": "^5.0.0",
+				"path-type": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/d-fischer"
+			}
+		},
+		"node_modules/puppeteer/node_modules/devtools-protocol": {
+			"version": "0.0.1107588",
+			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz",
+			"integrity": "sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg==",
+			"dev": true
+		},
+		"node_modules/puppeteer/node_modules/js-yaml": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+			"dev": true,
+			"dependencies": {
+				"argparse": "^2.0.1"
+			},
+			"bin": {
+				"js-yaml": "bin/js-yaml.js"
+			}
+		},
+		"node_modules/puppeteer/node_modules/puppeteer-core": {
+			"version": "19.11.1",
+			"resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.11.1.tgz",
+			"integrity": "sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA==",
+			"dev": true,
+			"dependencies": {
+				"@puppeteer/browsers": "0.5.0",
+				"chromium-bidi": "0.4.7",
+				"cross-fetch": "3.1.5",
+				"debug": "4.3.4",
+				"devtools-protocol": "0.0.1107588",
+				"extract-zip": "2.0.1",
+				"https-proxy-agent": "5.0.1",
+				"proxy-from-env": "1.1.0",
+				"tar-fs": "2.1.1",
+				"unbzip2-stream": "1.4.3",
+				"ws": "8.13.0"
+			},
+			"engines": {
+				"node": ">=14.14.0"
+			},
+			"peerDependencies": {
+				"typescript": ">= 4.7.4"
+			},
+			"peerDependenciesMeta": {
+				"typescript": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/puppeteer/node_modules/ws": {
+			"version": "8.13.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+			"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
 				},
-				"ws": {
-					"version": "8.5.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
-					"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-					"dev": true
+				"utf-8-validate": {
+					"optional": true
 				}
 			}
 		},
-		"q": {
+		"node_modules/pure-rand": {
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.2.tgz",
+			"integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://github.com/sponsors/dubzzz"
+				},
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/fast-check"
+				}
+			]
+		},
+		"node_modules/q": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
 			"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-			"dev": true
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.6.0",
+				"teleport": ">=0.2.0"
+			}
 		},
-		"qs": {
-			"version": "6.9.4",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
-			"integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
-			"dev": true
+		"node_modules/qs": {
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"dev": true,
+			"dependencies": {
+				"side-channel": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=0.6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"querystringify": {
+		"node_modules/querystringify": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
 			"integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
 			"dev": true
 		},
-		"quick-lru": {
+		"node_modules/quick-lru": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
 			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"qunit": {
-			"version": "2.19.1",
-			"resolved": "https://registry.npmjs.org/qunit/-/qunit-2.19.1.tgz",
-			"integrity": "sha512-gSGuw0vErE/rNjnlBW/JmE7NNubBlGrDPQvsug32ejYhcVFuZec9yoU0+C30+UgeCGwq6Ap89K65dMGo+kDGZQ==",
+		"node_modules/qunit": {
+			"version": "2.19.4",
+			"resolved": "https://registry.npmjs.org/qunit/-/qunit-2.19.4.tgz",
+			"integrity": "sha512-aqUzzUeCqlleWYKlpgfdHHw9C6KxkB9H3wNfiBg5yHqQMzy0xw/pbCRHYFkjl8MsP/t8qkTQE+JTYL71azgiew==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"commander": "7.2.0",
 				"node-watch": "0.7.3",
 				"tiny-glob": "0.2.9"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				}
-			}
-		},
-		"raf": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-			"dev": true,
-			"requires": {
-				"performance-now": "^2.1.0"
+			"bin": {
+				"qunit": "bin/qunit.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"railroad-diagrams": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-			"integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
-			"dev": true
-		},
-		"randexp": {
-			"version": "0.4.6",
-			"resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
-			"integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+		"node_modules/qunit/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
 			"dev": true,
-			"requires": {
-				"discontinuous-range": "1.0.0",
-				"ret": "~0.1.10"
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"randombytes": {
+		"node_modules/randombytes": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
 		},
-		"range-parser": {
+		"node_modules/range-parser": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
 			"integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
 		},
-		"raw-body": {
+		"node_modules/raw-body": {
 			"version": "2.5.1",
 			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
 			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"unpipe": "1.0.0"
 			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/raw-body/node_modules/bytes": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
+		"node_modules/raw-body/node_modules/iconv-lite": {
+			"version": "0.4.24",
+			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+			"dev": true,
 			"dependencies": {
-				"bytes": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-					"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-					"dev": true
-				},
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
+				"safer-buffer": ">= 2.1.2 < 3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"re-resizable": {
+		"node_modules/re-resizable": {
 			"version": "6.9.9",
 			"resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.9.tgz",
-			"integrity": "sha512-l+MBlKZffv/SicxDySKEEh42hR6m5bAHfNu3Tvxks2c4Ah+ldnWjfnVRwxo/nxF27SsUsxDS0raAzFuJNKABXA=="
+			"integrity": "sha512-l+MBlKZffv/SicxDySKEEh42hR6m5bAHfNu3Tvxks2c4Ah+ldnWjfnVRwxo/nxF27SsUsxDS0raAzFuJNKABXA==",
+			"peerDependencies": {
+				"react": "^16.13.1 || ^17.0.0 || ^18.0.0",
+				"react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
+			}
 		},
-		"react": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-			"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
-			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+		"node_modules/react": {
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
+			"dependencies": {
+				"loose-envify": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"react-autosize-textarea": {
+		"node_modules/react-autosize-textarea": {
 			"version": "7.1.0",
 			"resolved": "https://registry.npmjs.org/react-autosize-textarea/-/react-autosize-textarea-7.1.0.tgz",
 			"integrity": "sha512-BHpjCDkuOlllZn3nLazY2F8oYO1tS2jHnWhcjTWQdcKiiMU6gHLNt/fzmqMSyerR0eTdKtfSIqtSeTtghNwS+g==",
-			"requires": {
+			"dependencies": {
 				"autosize": "^4.0.2",
 				"line-height": "^0.3.1",
 				"prop-types": "^15.5.6"
+			},
+			"peerDependencies": {
+				"react": "^0.14.0 || ^15.0.0 || ^16.0.0",
+				"react-dom": "^0.14.0 || ^15.0.0 || ^16.0.0"
 			}
 		},
-		"react-colorful": {
+		"node_modules/react-colorful": {
 			"version": "5.6.1",
 			"resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz",
-			"integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw=="
+			"integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==",
+			"peerDependencies": {
+				"react": ">=16.8.0",
+				"react-dom": ">=16.8.0"
+			}
 		},
-		"react-dom": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-			"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
-			"requires": {
+		"node_modules/react-dom": {
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
+			"dependencies": {
 				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"scheduler": "^0.20.2"
+				"scheduler": "^0.23.0"
+			},
+			"peerDependencies": {
+				"react": "^18.2.0"
 			}
 		},
-		"react-easy-crop": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-4.6.1.tgz",
-			"integrity": "sha512-/3Y7fScuNosFyKGVEotI6Jef1s4nSZLeeeMM38ubexWHRhyvZJAsmqoXoEj5WPvmM6/Ugy32SymJQwVa4t3S9w==",
-			"requires": {
+		"node_modules/react-easy-crop": {
+			"version": "4.7.4",
+			"resolved": "https://registry.npmjs.org/react-easy-crop/-/react-easy-crop-4.7.4.tgz",
+			"integrity": "sha512-oDi1375Jo/zuPUvo3oauxnNbfy8L4wsbmHD1KB2vT55fdgu+q8/K0w/rDWzy9jz4jfQ94Q9+3Yu366sDDFVmiA==",
+			"dependencies": {
 				"normalize-wheel": "^1.0.1",
 				"tslib": "2.0.1"
 			},
-			"dependencies": {
-				"tslib": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-					"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
-				}
+			"peerDependencies": {
+				"react": ">=16.4.0",
+				"react-dom": ">=16.4.0"
 			}
 		},
-		"react-is": {
+		"node_modules/react-easy-crop/node_modules/tslib": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+			"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+		},
+		"node_modules/react-is": {
 			"version": "16.13.1",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
 			"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
 		},
-		"react-refresh": {
+		"node_modules/react-refresh": {
 			"version": "0.10.0",
 			"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.10.0.tgz",
 			"integrity": "sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==",
-			"dev": true
-		},
-		"react-shallow-renderer": {
-			"version": "16.15.0",
-			"resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
-			"integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==",
 			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"react-is": "^16.12.0 || ^17.0.0 || ^18.0.0"
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"react-test-renderer": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
-			"integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
-			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"react-is": "^17.0.2",
-				"react-shallow-renderer": "^16.13.1",
-				"scheduler": "^0.20.2"
+		"node_modules/react-remove-scroll": {
+			"version": "2.5.5",
+			"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",
+			"integrity": "sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==",
+			"dependencies": {
+				"react-remove-scroll-bar": "^2.3.3",
+				"react-style-singleton": "^2.2.1",
+				"tslib": "^2.1.0",
+				"use-callback-ref": "^1.3.0",
+				"use-sidecar": "^1.1.2"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/react-remove-scroll-bar": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz",
+			"integrity": "sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==",
+			"dependencies": {
+				"react-style-singleton": "^2.2.1",
+				"tslib": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
 			},
+			"peerDependencies": {
+				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/react-style-singleton": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.1.tgz",
+			"integrity": "sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==",
 			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
+				"get-nonce": "^1.0.0",
+				"invariant": "^2.2.4",
+				"tslib": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
 				}
 			}
 		},
-		"read-pkg": {
+		"node_modules/read-pkg": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
 			"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/normalize-package-data": "^2.4.0",
 				"normalize-package-data": "^2.5.0",
 				"parse-json": "^5.0.0",
 				"type-fest": "^0.6.0"
 			},
-			"dependencies": {
-				"type-fest": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-					"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"read-pkg-up": {
+		"node_modules/read-pkg-up": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
 			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"find-up": "^1.0.0",
 				"read-pkg": "^1.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/find-up": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+			"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"path-exists": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/path-exists": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+			"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+			"dev": true,
+			"optional": true,
 			"dependencies": {
-				"find-up": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"path-exists": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"path-type": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-					"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"pify": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
-					}
-				},
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true,
-					"optional": true
-				},
-				"read-pkg": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
-					}
-				}
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/path-type": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"graceful-fs": "^4.1.2",
+				"pify": "^2.0.0",
+				"pinkie-promise": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/pify": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg-up/node_modules/read-pkg": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+			"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"load-json-file": "^1.0.0",
+				"normalize-package-data": "^2.3.2",
+				"path-type": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/read-pkg/node_modules/type-fest": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+			"integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"readable-stream": {
+		"node_modules/readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
 			"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-			"requires": {
+			"dependencies": {
 				"core-util-is": "~1.0.0",
 				"inherits": "~2.0.3",
 				"isarray": "~1.0.0",
@@ -22249,240 +26632,268 @@
 				"safe-buffer": "~5.1.1",
 				"string_decoder": "~1.1.1",
 				"util-deprecate": "~1.0.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
 			}
 		},
-		"readdirp": {
+		"node_modules/readable-stream/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/readdirp": {
 			"version": "3.6.0",
 			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
 			"integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"picomatch": "^2.2.1"
+			},
+			"engines": {
+				"node": ">=8.10.0"
 			}
 		},
-		"reakit": {
+		"node_modules/reakit": {
 			"version": "1.3.11",
 			"resolved": "https://registry.npmjs.org/reakit/-/reakit-1.3.11.tgz",
 			"integrity": "sha512-mYxw2z0fsJNOQKAEn5FJCPTU3rcrY33YZ/HzoWqZX0G7FwySp1wkCYW79WhuYMNIUFQ8s3Baob1RtsEywmZSig==",
-			"requires": {
+			"dependencies": {
 				"@popperjs/core": "^2.5.4",
 				"body-scroll-lock": "^3.1.5",
 				"reakit-system": "^0.15.2",
 				"reakit-utils": "^0.15.2",
 				"reakit-warning": "^0.6.2"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/ariakit"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0"
 			}
 		},
-		"reakit-system": {
+		"node_modules/reakit-system": {
 			"version": "0.15.2",
 			"resolved": "https://registry.npmjs.org/reakit-system/-/reakit-system-0.15.2.tgz",
 			"integrity": "sha512-TvRthEz0DmD0rcJkGamMYx+bATwnGNWJpe/lc8UV2Js8nnPvkaxrHk5fX9cVASFrWbaIyegZHCWUBfxr30bmmA==",
-			"requires": {
+			"dependencies": {
 				"reakit-utils": "^0.15.2"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0"
 			}
 		},
-		"reakit-utils": {
+		"node_modules/reakit-utils": {
 			"version": "0.15.2",
 			"resolved": "https://registry.npmjs.org/reakit-utils/-/reakit-utils-0.15.2.tgz",
-			"integrity": "sha512-i/RYkq+W6hvfFmXw5QW7zvfJJT/K8a4qZ0hjA79T61JAFPGt23DsfxwyBbyK91GZrJ9HMrXFVXWMovsKBc1qEQ=="
+			"integrity": "sha512-i/RYkq+W6hvfFmXw5QW7zvfJJT/K8a4qZ0hjA79T61JAFPGt23DsfxwyBbyK91GZrJ9HMrXFVXWMovsKBc1qEQ==",
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0",
+				"react-dom": "^16.8.0 || ^17.0.0"
+			}
 		},
-		"reakit-warning": {
+		"node_modules/reakit-warning": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/reakit-warning/-/reakit-warning-0.6.2.tgz",
 			"integrity": "sha512-z/3fvuc46DJyD3nJAUOto6inz2EbSQTjvI/KBQDqxwB0y02HDyeP8IWOJxvkuAUGkWpeSx+H3QWQFSNiPcHtmw==",
-			"requires": {
+			"dependencies": {
 				"reakit-utils": "^0.15.2"
+			},
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0"
 			}
 		},
-		"rechoir": {
+		"node_modules/rechoir": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
 			"integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"resolve": "^1.9.0"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"redent": {
+		"node_modules/redent": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
 			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"indent-string": "^2.1.0",
 				"strip-indent": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"redux": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
-			"integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==",
-			"requires": {
+		"node_modules/redux": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
+			"integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
+			"dependencies": {
 				"@babel/runtime": "^7.9.2"
 			}
 		},
-		"regenerate": {
+		"node_modules/regenerate": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
 			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
 			"dev": true
 		},
-		"regenerate-unicode-properties": {
+		"node_modules/regenerate-unicode-properties": {
 			"version": "10.1.0",
 			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
 			"integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"regenerate": "^1.4.2"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+		"node_modules/regenerator-runtime": {
+			"version": "0.13.11",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
 		},
-		"regenerator-transform": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-			"integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+		"node_modules/regenerator-transform": {
+			"version": "0.15.1",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+			"integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@babel/runtime": "^7.8.4"
 			}
 		},
-		"regex-not": {
+		"node_modules/regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
 			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"extend-shallow": "^3.0.2",
 				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"regexp.prototype.flags": {
-			"version": "1.4.3",
-			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-			"integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+		"node_modules/regexp.prototype.flags": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+			"integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"functions-have-names": "^1.2.2"
+				"define-properties": "^1.2.0",
+				"functions-have-names": "^1.2.3"
 			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				}
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"regexpp": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-			"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-			"dev": true
-		},
-		"regexpu-core": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-			"integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+		"node_modules/regexpu-core": {
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz",
+			"integrity": "sha512-nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
+				"@babel/regjsgen": "^0.8.0",
 				"regenerate": "^1.4.2",
 				"regenerate-unicode-properties": "^10.1.0",
-				"regjsgen": "^0.7.1",
 				"regjsparser": "^0.9.1",
 				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.0.0"
+				"unicode-match-property-value-ecmascript": "^2.1.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"regextras": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
-			"dev": true
-		},
-		"regjsgen": {
-			"version": "0.7.1",
-			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-			"integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==",
-			"dev": true
-		},
-		"regjsparser": {
+		"node_modules/regjsparser": {
 			"version": "0.9.1",
 			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
 			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"jsesc": "~0.5.0"
 			},
-			"dependencies": {
-				"jsesc": {
-					"version": "0.5.0",
-					"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-					"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-					"dev": true
-				}
+			"bin": {
+				"regjsparser": "bin/parser"
+			}
+		},
+		"node_modules/regjsparser/node_modules/jsesc": {
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"dev": true,
+			"bin": {
+				"jsesc": "bin/jsesc"
 			}
 		},
-		"rememo": {
+		"node_modules/rememo": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/rememo/-/rememo-4.0.2.tgz",
 			"integrity": "sha512-NVfSP9NstE3QPNs/TnegQY0vnJnstKQSpcrsI2kBTB3dB2PkdfKdTa+abbjMIDqpc63fE5LfjLgfMst0ULMFxQ=="
 		},
-		"remove-accents": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.3.tgz",
-			"integrity": "sha512-bwzzFccF6RgWWt+KrcEpCDMw9uCwz5GCdyo+r4p2hu6PhqtlEMOXEO0uPAw6XmVYAnODxHaqLanhUY1lqmsNFw=="
+		"node_modules/remove-accents": {
+			"version": "0.4.4",
+			"resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.4.tgz",
+			"integrity": "sha512-EpFcOa/ISetVHEXqu+VwI96KZBmq+a8LJnGkaeFw45epGlxIZz5dhEEnNZMsQXgORu3qaMoLX4qJCzOik6ytAg=="
 		},
-		"repeat-element": {
+		"node_modules/repeat-element": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
 			"integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"repeat-string": {
+		"node_modules/repeat-string": {
 			"version": "1.6.1",
 			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
 			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10"
+			}
 		},
-		"repeating": {
+		"node_modules/repeating": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
 			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"is-finite": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"replace-ext": {
+		"node_modules/replace-ext": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
 			"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
 		},
-		"request": {
+		"node_modules/request": {
 			"version": "2.88.2",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+			"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
 				"caseless": "~0.12.0",
@@ -22504,610 +26915,808 @@
 				"tunnel-agent": "^0.6.0",
 				"uuid": "^3.3.2"
 			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/request/node_modules/qs": {
+			"version": "6.5.3",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+			"integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.6"
+			}
+		},
+		"node_modules/request/node_modules/tough-cookie": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+			"dev": true,
 			"dependencies": {
-				"qs": {
-					"version": "6.5.2",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-					"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-					"dev": true
-				},
-				"tough-cookie": {
-					"version": "2.5.0",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
-					"requires": {
-						"psl": "^1.1.28",
-						"punycode": "^2.1.1"
-					}
-				},
-				"uuid": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-					"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-					"dev": true
-				}
+				"psl": "^1.1.28",
+				"punycode": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
+		"node_modules/request/node_modules/uuid": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+			"dev": true,
+			"bin": {
+				"uuid": "bin/uuid"
 			}
 		},
-		"requestidlecallback": {
+		"node_modules/requestidlecallback": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/requestidlecallback/-/requestidlecallback-0.3.0.tgz",
 			"integrity": "sha512-TWHFkT7S9p7IxLC5A1hYmAYQx2Eb9w1skrXmQ+dS1URyvR8tenMLl4lHbqEOUnpEYxNKpkVMXUgknVpBZWXXfQ=="
 		},
-		"require-directory": {
+		"node_modules/require-directory": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+			"integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"require-from-string": {
+		"node_modules/require-from-string": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
 			"integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"require-main-filename": {
+		"node_modules/require-main-filename": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
 			"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
 		},
-		"requireindex": {
+		"node_modules/requireindex": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
 			"integrity": "sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.5"
+			}
 		},
-		"requires-port": {
+		"node_modules/requires-port": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
 			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
 			"dev": true
 		},
-		"requizzle": {
+		"node_modules/requizzle": {
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.3.tgz",
 			"integrity": "sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"lodash": "^4.17.14"
 			}
 		},
-		"resolve": {
-			"version": "1.19.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-			"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-			"requires": {
-				"is-core-module": "^2.1.0",
-				"path-parse": "^1.0.6"
+		"node_modules/resolve": {
+			"version": "1.22.2",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
+			"integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
+			"dependencies": {
+				"is-core-module": "^2.11.0",
+				"path-parse": "^1.0.7",
+				"supports-preserve-symlinks-flag": "^1.0.0"
+			},
+			"bin": {
+				"resolve": "bin/resolve"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"resolve-bin": {
+		"node_modules/resolve-bin": {
 			"version": "0.4.3",
 			"resolved": "https://registry.npmjs.org/resolve-bin/-/resolve-bin-0.4.3.tgz",
 			"integrity": "sha512-9u8TMpc+SEHXxQXblXHz5yRvRZERkCZimFN9oz85QI3uhkh7nqfjm6OGTLg+8vucpXGcY4jLK6WkylPmt7GSvw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"find-parent-dir": "~0.3.0"
 			}
 		},
-		"resolve-cwd": {
+		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
 			"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"resolve-from": "^5.0.0"
 			},
-			"dependencies": {
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/resolve-cwd/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"resolve-dir": {
+		"node_modules/resolve-dir": {
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
 			"integrity": "sha512-QxMPqI6le2u0dCLyiGzgy92kjkkL6zO0XyvHzjdTNH3zM6e5Hz3BwG6+aEyNgiQ5Xz6PwTwgQEj3U50dByPKIA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"expand-tilde": "^1.2.2",
 				"global-modules": "^0.2.3"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"resolve-from": {
+		"node_modules/resolve-from": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
+			"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"resolve-url": {
+		"node_modules/resolve-url": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
 			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+			"deprecated": "https://github.com/lydell/resolve-url#deprecated",
 			"dev": true
 		},
-		"resolve.exports": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-			"dev": true
+		"node_modules/resolve.exports": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+			"integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			}
 		},
-		"responselike": {
+		"node_modules/responselike": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
 			"integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"lowercase-keys": "^1.0.0"
 			}
 		},
-		"restore-cursor": {
+		"node_modules/restore-cursor": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
 			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"onetime": "^2.0.0",
 				"signal-exit": "^3.0.2"
 			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/restore-cursor/node_modules/mimic-fn": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+			"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/restore-cursor/node_modules/onetime": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+			"dev": true,
 			"dependencies": {
-				"mimic-fn": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-					"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-					"dev": true
-				},
-				"onetime": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-					"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
-				}
+				"mimic-fn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"ret": {
+		"node_modules/ret": {
 			"version": "0.1.15",
 			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
 			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.12"
+			}
 		},
-		"retry": {
+		"node_modules/retry": {
 			"version": "0.13.1",
 			"resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
 			"integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 4"
+			}
 		},
-		"reusify": {
+		"node_modules/reusify": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
 			"integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-			"dev": true
-		},
-		"rgb-regex": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-			"integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-			"dev": true
-		},
-		"rgba-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-			"integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"iojs": ">=1.0.0",
+				"node": ">=0.10.0"
+			}
 		},
-		"rimraf": {
+		"node_modules/rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
 			}
 		},
-		"rst-selector-parser": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
-			"integrity": "sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==",
-			"dev": true,
-			"requires": {
-				"lodash.flattendeep": "^4.4.0",
-				"nearley": "^2.7.10"
-			}
-		},
-		"rtlcss": {
+		"node_modules/rtlcss": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.6.2.tgz",
 			"integrity": "sha512-06LFAr+GAPo+BvaynsXRfoYTJvSaWRyOhURCQ7aeI1MKph9meM222F+Zkt3bDamyHHJuGi3VPtiRkpyswmQbGA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@choojs/findup": "^0.2.1",
 				"chalk": "^2.4.2",
 				"mkdirp": "^0.5.1",
 				"postcss": "^6.0.23",
 				"strip-json-comments": "^2.0.0"
 			},
+			"bin": {
+				"rtlcss": "bin/rtlcss.js"
+			}
+		},
+		"node_modules/rtlcss/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
 			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
-				"postcss": {
-					"version": "6.0.23",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-					"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.1",
-						"source-map": "^0.6.1",
-						"supports-color": "^5.4.0"
-					}
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-					"dev": true
-				}
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/rtlcss/node_modules/postcss": {
+			"version": "6.0.23",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+			"integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+			"dev": true,
+			"dependencies": {
+				"chalk": "^2.4.1",
+				"source-map": "^0.6.1",
+				"supports-color": "^5.4.0"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/rtlcss/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/rtlcss/node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"run-async": {
+		"node_modules/run-async": {
 			"version": "2.4.1",
 			"resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
 			"integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
 		},
-		"run-con": {
+		"node_modules/run-con": {
 			"version": "1.2.11",
 			"resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz",
 			"integrity": "sha512-NEMGsUT+cglWkzEr4IFK21P4Jca45HqiAbIIZIBdX5+UZTB24Mb/21iNGgz9xZa8tL6vbW7CXmq7MFN42+VjNQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"deep-extend": "^0.6.0",
 				"ini": "~3.0.0",
 				"minimist": "^1.2.6",
 				"strip-json-comments": "~3.1.1"
 			},
-			"dependencies": {
-				"ini": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
-					"integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
-					"dev": true
-				}
+			"bin": {
+				"run-con": "cli.js"
 			}
 		},
-		"run-parallel": {
+		"node_modules/run-con/node_modules/ini": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz",
+			"integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==",
+			"dev": true,
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+			}
+		},
+		"node_modules/run-parallel": {
 			"version": "1.1.10",
 			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
 			"integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
-			"dev": true
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
 		},
-		"rungen": {
+		"node_modules/rungen": {
 			"version": "0.3.2",
 			"resolved": "https://registry.npmjs.org/rungen/-/rungen-0.3.2.tgz",
 			"integrity": "sha512-zWl10xu2D7zoR8zSC2U6bg5bYF6T/Wk7rxwp8IPaJH7f0Ge21G03kNHVgHR7tyVkSSfAOG0Rqf/Cl38JftSmtw=="
 		},
-		"rxjs": {
+		"node_modules/rxjs": {
 			"version": "5.5.12",
 			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
 			"integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"symbol-observable": "1.0.1"
 			},
+			"engines": {
+				"npm": ">=2.0.0"
+			}
+		},
+		"node_modules/rxjs/node_modules/symbol-observable": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+			"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/safe-array-concat": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+			"integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+			"dev": true,
 			"dependencies": {
-				"symbol-observable": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-					"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-					"dev": true
-				}
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.2.0",
+				"has-symbols": "^1.0.3",
+				"isarray": "^2.0.5"
+			},
+			"engines": {
+				"node": ">=0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"safe-buffer": {
+		"node_modules/safe-array-concat/node_modules/isarray": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+			"dev": true
+		},
+		"node_modules/safe-buffer": {
 			"version": "5.2.1",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			]
 		},
-		"safe-json-parse": {
+		"node_modules/safe-json-parse": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/safe-json-parse/-/safe-json-parse-1.0.1.tgz",
 			"integrity": "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=",
 			"dev": true
 		},
-		"safe-regex": {
+		"node_modules/safe-regex": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
 			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"ret": "~0.1.10"
 			}
 		},
-		"safe-regex-test": {
+		"node_modules/safe-regex-test": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
 			"integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
 				"get-intrinsic": "^1.1.3",
 				"is-regex": "^1.1.4"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/safer-buffer": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+		},
+		"node_modules/sanitize-html": {
+			"version": "1.27.5",
+			"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz",
+			"integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==",
+			"dev": true,
+			"dependencies": {
+				"htmlparser2": "^4.1.0",
+				"lodash": "^4.17.15",
+				"parse-srcset": "^1.0.2",
+				"postcss": "^7.0.27"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/dom-serializer": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
+			"integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0",
+				"entities": "^2.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/dom-serializer/node_modules/domhandler": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
+			"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
+			"dev": true,
 			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
+				"domelementtype": "^2.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/domelementtype": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
+			"integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
+			"dev": true,
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/fb55"
 				}
+			]
+		},
+		"node_modules/sanitize-html/node_modules/domhandler": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
+			"integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/domutils": {
+			"version": "2.4.4",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz",
+			"integrity": "sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==",
+			"dev": true,
+			"dependencies": {
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.0.1",
+				"domhandler": "^4.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domutils?sponsor=1"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/domutils/node_modules/domhandler": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
+			"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.1.0"
+			},
+			"engines": {
+				"node": ">= 4"
+			},
+			"funding": {
+				"url": "https://github.com/fb55/domhandler?sponsor=1"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/htmlparser2": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
+			"integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
+			"dev": true,
+			"dependencies": {
+				"domelementtype": "^2.0.1",
+				"domhandler": "^3.0.0",
+				"domutils": "^2.0.0",
+				"entities": "^2.0.0"
+			}
+		},
+		"node_modules/sanitize-html/node_modules/picocolors": {
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+			"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+			"dev": true
+		},
+		"node_modules/sanitize-html/node_modules/postcss": {
+			"version": "7.0.39",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+			"integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+			"dev": true,
+			"dependencies": {
+				"picocolors": "^0.2.1",
+				"source-map": "^0.6.1"
+			},
+			"engines": {
+				"node": ">=6.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/postcss/"
 			}
 		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-		},
-		"sanitize-html": {
-			"version": "1.27.5",
-			"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz",
-			"integrity": "sha512-M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A==",
+		"node_modules/sanitize-html/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
 			"dev": true,
-			"requires": {
-				"htmlparser2": "^4.1.0",
-				"lodash": "^4.17.15",
-				"parse-srcset": "^1.0.2",
-				"postcss": "^7.0.27"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
-					"integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.0.0",
-						"entities": "^2.0.0"
-					},
-					"dependencies": {
-						"domhandler": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
-							"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
-							"dev": true,
-							"requires": {
-								"domelementtype": "^2.1.0"
-							}
-						}
-					}
-				},
-				"domelementtype": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
-					"integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
-					"integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1"
-					}
-				},
-				"domutils": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz",
-					"integrity": "sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.0.1",
-						"domhandler": "^4.0.0"
-					},
-					"dependencies": {
-						"domhandler": {
-							"version": "4.0.0",
-							"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
-							"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
-							"dev": true,
-							"requires": {
-								"domelementtype": "^2.1.0"
-							}
-						}
-					}
-				},
-				"htmlparser2": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
-					"integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^3.0.0",
-						"domutils": "^2.0.0",
-						"entities": "^2.0.0"
-					}
-				}
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"sass": {
-			"version": "1.55.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz",
-			"integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==",
+		"node_modules/sass": {
+			"version": "1.65.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.65.1.tgz",
+			"integrity": "sha512-9DINwtHmA41SEd36eVPQ9BJKpn7eKDQmUHmpI0y5Zv2Rcorrh0zS+cFrt050hdNbmmCNKTW3hV5mWfuegNRsEA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"chokidar": ">=3.0.0 <4.0.0",
 				"immutable": "^4.0.0",
 				"source-map-js": ">=0.6.2 <2.0.0"
+			},
+			"bin": {
+				"sass": "sass.js"
+			},
+			"engines": {
+				"node": ">=14.0.0"
 			}
 		},
-		"sass-loader": {
+		"node_modules/sass-loader": {
 			"version": "12.6.0",
 			"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
 			"integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"klona": "^2.0.4",
 				"neo-async": "^2.6.2"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"fibers": ">= 3.1.0",
+				"node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
+				"sass": "^1.3.0",
+				"sass-embedded": "*",
+				"webpack": "^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"fibers": {
+					"optional": true
+				},
+				"node-sass": {
+					"optional": true
+				},
+				"sass": {
+					"optional": true
+				},
+				"sass-embedded": {
+					"optional": true
+				}
 			}
 		},
-		"sax": {
+		"node_modules/sax": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
 			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 			"dev": true
 		},
-		"saxes": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+		"node_modules/saxes": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+			"integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"xmlchars": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=v12.22.7"
 			}
 		},
-		"scheduler": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-			"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
-			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+		"node_modules/scheduler": {
+			"version": "0.23.0",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
+			"dependencies": {
+				"loose-envify": "^1.1.0"
 			}
 		},
-		"schema-utils": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-			"integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+		"node_modules/schema-utils": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/json-schema": "^7.0.8",
 				"ajv": "^6.12.5",
 				"ajv-keywords": "^3.5.2"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"seek-bzip": {
+		"node_modules/seek-bzip": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.6.tgz",
 			"integrity": "sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"commander": "^2.8.1"
+			},
+			"bin": {
+				"seek-bunzip": "bin/seek-bunzip",
+				"seek-table": "bin/seek-bzip-table"
 			}
 		},
-		"select": {
+		"node_modules/select": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
 			"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
 		},
-		"select-hose": {
+		"node_modules/select-hose": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
 			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
 			"dev": true
 		},
-		"selfsigned": {
+		"node_modules/selfsigned": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
 			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"node-forge": "^1"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"semver": {
-			"version": "7.3.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-			"integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-			"requires": {
+		"node_modules/semver": {
+			"version": "7.5.4",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+			"dependencies": {
 				"lru-cache": "^6.0.0"
+			},
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"semver-regex": {
+		"node_modules/semver-regex": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
 			"integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"semver-truncate": {
+		"node_modules/semver-truncate": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz",
 			"integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"semver": "^5.3.0"
 			},
-			"dependencies": {
-				"semver": {
-					"version": "5.7.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-					"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-					"dev": true,
-					"optional": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"send": {
+		"node_modules/semver-truncate/node_modules/semver": {
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+			"dev": true,
+			"optional": true,
+			"bin": {
+				"semver": "bin/semver"
+			}
+		},
+		"node_modules/send": {
 			"version": "0.18.0",
 			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
 			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
@@ -23122,51 +27731,50 @@
 				"range-parser": "~1.2.1",
 				"statuses": "2.0.1"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/send/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					},
-					"dependencies": {
-						"ms": {
-							"version": "2.0.0",
-							"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-							"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-							"dev": true
-						}
-					}
-				}
+				"ms": "2.0.0"
 			}
 		},
-		"sentence-case": {
+		"node_modules/send/node_modules/debug/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/sentence-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz",
 			"integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==",
-			"requires": {
+			"dependencies": {
 				"no-case": "^3.0.4",
 				"tslib": "^2.0.3",
 				"upper-case-first": "^2.0.2"
 			}
 		},
-		"serialize-javascript": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+		"node_modules/serialize-javascript": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
 		},
-		"serve-index": {
+		"node_modules/serve-index": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
 			"integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"accepts": "~1.3.4",
 				"batch": "0.6.1",
 				"debug": "2.6.9",
@@ -23175,339 +27783,388 @@
 				"mime-types": "~2.1.17",
 				"parseurl": "~1.3.2"
 			},
+			"engines": {
+				"node": ">= 0.8.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
 			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"depd": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-					"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-					"dev": true
-				},
-				"http-errors": {
-					"version": "1.6.3",
-					"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-					"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-					"dev": true,
-					"requires": {
-						"depd": "~1.1.2",
-						"inherits": "2.0.3",
-						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
-					"dev": true
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
-				},
-				"setprototypeof": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-					"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-					"dev": true
-				},
-				"statuses": {
-					"version": "1.5.0",
-					"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-					"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-					"dev": true
-				}
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/serve-index/node_modules/depd": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+			"integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/http-errors": {
+			"version": "1.6.3",
+			"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+			"integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+			"dev": true,
+			"dependencies": {
+				"depd": "~1.1.2",
+				"inherits": "2.0.3",
+				"setprototypeof": "1.1.0",
+				"statuses": ">= 1.4.0 < 2"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/serve-index/node_modules/inherits": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/setprototypeof": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+			"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+			"dev": true
+		},
+		"node_modules/serve-index/node_modules/statuses": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+			"integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"serve-static": {
+		"node_modules/serve-static": {
 			"version": "1.15.0",
 			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
 			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"encodeurl": "~1.0.2",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
 				"send": "0.18.0"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"set-blocking": {
+		"node_modules/set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 		},
-		"set-value": {
+		"node_modules/set-value": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
 			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"extend-shallow": "^2.0.1",
 				"is-extendable": "^0.1.1",
 				"is-plain-object": "^2.0.3",
 				"split-string": "^3.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+			"dev": true,
 			"dependencies": {
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				}
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/set-value/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"setprototypeof": {
+		"node_modules/setprototypeof": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
 			"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
 			"dev": true
 		},
-		"shallow-clone": {
+		"node_modules/shallow-clone": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
 			"integrity": "sha512-J1zdXCky5GmNnuauESROVu31MQSnLoYvlyEn6j2Ztk6Q5EHFIhxkMhYcv6vuDzl2XEzoRr856QwzMgWM/TmZgw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"is-extendable": "^0.1.1",
 				"kind-of": "^2.0.1",
 				"lazy-cache": "^0.2.3",
 				"mixin-object": "^2.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shallow-clone/node_modules/kind-of": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+			"integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
+			"dev": true,
 			"dependencies": {
-				"kind-of": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-					"integrity": "sha512-0u8i1NZ/mg0b+W3MGGw5I7+6Eib2nx72S/QvXa0hYjEkjTknYmEYQJwGu3mLC0BrhtJjtQafTkyRUQ75Kx0LVg==",
-					"dev": true,
-					"requires": {
-						"is-buffer": "^1.0.2"
-					}
-				},
-				"lazy-cache": {
-					"version": "0.2.7",
-					"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-					"integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
-					"dev": true
-				}
+				"is-buffer": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shallow-clone/node_modules/lazy-cache": {
+			"version": "0.2.7",
+			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+			"integrity": "sha512-gkX52wvU/R8DVMMt78ATVPFMJqfW8FPz1GZ1sVHBVQHmu/WvhIWE4cE1GBzhJNFicDeYhnwp6Rl35BcAIM3YOQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"shebang-command": {
+		"node_modules/shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
 			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"shebang-regex": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"shebang-regex": {
+		"node_modules/shebang-regex": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
 			"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"showdown": {
+		"node_modules/showdown": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/showdown/-/showdown-1.9.1.tgz",
 			"integrity": "sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==",
-			"requires": {
+			"dependencies": {
 				"yargs": "^14.2"
+			},
+			"bin": {
+				"showdown": "bin/showdown.js"
 			}
 		},
-		"side-channel": {
+		"node_modules/side-channel": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
 			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.0",
 				"get-intrinsic": "^1.0.2",
 				"object-inspect": "^1.9.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"signal-exit": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-			"integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+		"node_modules/signal-exit": {
+			"version": "3.0.7",
+			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+			"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
 			"dev": true
 		},
-		"simple-html-tokenizer": {
+		"node_modules/simple-html-tokenizer": {
 			"version": "0.5.11",
 			"resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz",
 			"integrity": "sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og=="
 		},
-		"simple-swizzle": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-			"integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+		"node_modules/sinon": {
+			"version": "15.2.0",
+			"resolved": "https://registry.npmjs.org/sinon/-/sinon-15.2.0.tgz",
+			"integrity": "sha512-nPS85arNqwBXaIsFCkolHjGIkFo+Oxu9vbgmBJizLAhqe6P2o3Qmj3KCUoRkfhHtvgDhZdWD3risLHAUJ8npjw==",
 			"dev": true,
-			"requires": {
-				"is-arrayish": "^0.3.1"
-			},
 			"dependencies": {
-				"is-arrayish": {
-					"version": "0.3.2",
-					"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-					"integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-					"dev": true
-				}
+				"@sinonjs/commons": "^3.0.0",
+				"@sinonjs/fake-timers": "^10.3.0",
+				"@sinonjs/samsam": "^8.0.0",
+				"diff": "^5.1.0",
+				"nise": "^5.1.4",
+				"supports-color": "^7.2.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/sinon"
 			}
 		},
-		"sinon": {
-			"version": "14.0.1",
-			"resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.1.tgz",
-			"integrity": "sha512-JhJ0jCiyBWVAHDS+YSjgEbDn7Wgz9iIjA1/RK+eseJN0vAAWIWiXBdrnb92ELPyjsfreCYntD1ORtLSfIrlvSQ==",
+		"node_modules/sinon-test": {
+			"version": "3.1.5",
+			"resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.1.5.tgz",
+			"integrity": "sha512-uKwKebXEX1yMQ9vz25Q/uDAFwoTsO/AQc+2b+6ndOUoxj7MZWoptz38lFw9QEgfxDPkN6NN0m+Kbah60tn0ZZA==",
 			"dev": true,
-			"requires": {
-				"@sinonjs/commons": "^1.8.3",
-				"@sinonjs/fake-timers": "^9.1.2",
-				"@sinonjs/samsam": "^6.1.1",
-				"diff": "^5.0.0",
-				"nise": "^5.1.1",
-				"supports-color": "^7.2.0"
-			},
-			"dependencies": {
-				"@sinonjs/commons": {
-					"version": "1.8.3",
-					"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-					"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-					"dev": true,
-					"requires": {
-						"type-detect": "4.0.8"
-					}
-				},
-				"@sinonjs/fake-timers": {
-					"version": "9.1.2",
-					"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-					"integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-					"dev": true,
-					"requires": {
-						"@sinonjs/commons": "^1.7.0"
-					}
-				},
-				"diff": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
-					"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+			"peerDependencies": {
+				"sinon": ">= 2.x"
 			}
 		},
-		"sinon-test": {
-			"version": "3.1.4",
-			"resolved": "https://registry.npmjs.org/sinon-test/-/sinon-test-3.1.4.tgz",
-			"integrity": "sha512-QxTwXu0RFv7aVNr90+Ht8Lnw0dtoyGJh75FWAT1fH3WJG+lbVZkm8M3Md8IKzOBLtQwawb9GJOTfFibJkauP5Q==",
-			"dev": true
+		"node_modules/sinon/node_modules/diff": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz",
+			"integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.3.1"
+			}
 		},
-		"sirv": {
+		"node_modules/sinon/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/sinon/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/sirv": {
 			"version": "1.0.19",
 			"resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
 			"integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@polka/url": "^1.0.0-next.20",
 				"mrmime": "^1.0.0",
 				"totalist": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 10"
 			}
 		},
-		"sisteransi": {
+		"node_modules/sisteransi": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
 			"integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
 			"dev": true
 		},
-		"slash": {
+		"node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
 			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"slice-ansi": {
+		"node_modules/slice-ansi": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
 			"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"ansi-styles": "^4.0.0",
 				"astral-regex": "^2.0.0",
 				"is-fullwidth-code-point": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/slice-ansi?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				}
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/slice-ansi/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"snake-case": {
+		"node_modules/snake-case": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz",
 			"integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==",
-			"requires": {
+			"dependencies": {
 				"dot-case": "^3.0.4",
 				"tslib": "^2.0.3"
 			}
 		},
-		"snapdragon": {
+		"node_modules/snapdragon": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
 			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"base": "^0.11.1",
 				"debug": "^2.2.0",
 				"define-property": "^0.2.5",
@@ -23517,192 +28174,237 @@
 				"source-map-resolve": "^0.5.0",
 				"use": "^3.1.0"
 			},
-			"dependencies": {
-				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				},
-				"extend-shallow": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-					"dev": true,
-					"requires": {
-						"is-extendable": "^0.1.0"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"snapdragon-node": {
+		"node_modules/snapdragon-node": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
 			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"define-property": "^1.0.0",
 				"isobject": "^3.0.0",
 				"snapdragon-util": "^3.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/define-property": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+			"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+			"dev": true,
 			"dependencies": {
-				"define-property": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^1.0.0"
-					}
-				},
-				"is-accessor-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-data-descriptor": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.0"
-					}
-				},
-				"is-descriptor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-					"dev": true,
-					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				}
+				"is-descriptor": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+			"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+			"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/is-descriptor": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+			"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+			"dev": true,
+			"dependencies": {
+				"is-accessor-descriptor": "^1.0.0",
+				"is-data-descriptor": "^1.0.0",
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon-node/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"snapdragon-util": {
+		"node_modules/snapdragon-util": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
 			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"kind-of": "^3.2.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/debug": {
+			"version": "2.6.9",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+			"dev": true,
+			"dependencies": {
+				"ms": "2.0.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+			"dev": true,
+			"dependencies": {
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/snapdragon/node_modules/extend-shallow": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+			"dev": true,
+			"dependencies": {
+				"is-extendable": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"sockjs": {
+		"node_modules/snapdragon/node_modules/ms": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+			"dev": true
+		},
+		"node_modules/sockjs": {
 			"version": "0.3.24",
 			"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
 			"integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"faye-websocket": "^0.11.3",
 				"uuid": "^8.3.2",
 				"websocket-driver": "^0.7.4"
-			},
+			}
+		},
+		"node_modules/sockjs/node_modules/faye-websocket": {
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+			"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+			"dev": true,
 			"dependencies": {
-				"faye-websocket": {
-					"version": "0.11.4",
-					"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-					"integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-					"dev": true,
-					"requires": {
-						"websocket-driver": ">=0.5.1"
-					}
-				},
-				"uuid": {
-					"version": "8.3.2",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-					"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-					"dev": true
-				}
+				"websocket-driver": ">=0.5.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
+		},
+		"node_modules/sockjs/node_modules/uuid": {
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+			"dev": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
 			}
 		},
-		"sort-keys": {
+		"node_modules/sort-keys": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
 			"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"is-plain-obj": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"sort-keys-length": {
+		"node_modules/sort-keys-length": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
 			"integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"sort-keys": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"source-map": {
+		"node_modules/source-map": {
 			"version": "0.5.7",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+			"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"source-map-js": {
+		"node_modules/source-map-js": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
 			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"source-map-loader": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.0.tgz",
-			"integrity": "sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw==",
+		"node_modules/source-map-loader": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz",
+			"integrity": "sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"abab": "^2.0.6",
 				"iconv-lite": "^0.6.3",
 				"source-map-js": "^1.0.2"
 			},
-			"dependencies": {
-				"abab": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-					"integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 14.15.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.72.1"
 			}
 		},
-		"source-map-resolve": {
+		"node_modules/source-map-resolve": {
 			"version": "0.5.3",
 			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
 			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+			"deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"atob": "^2.1.2",
 				"decode-uri-component": "^0.2.0",
 				"resolve-url": "^0.2.1",
@@ -23710,200 +28412,217 @@
 				"urix": "^0.1.0"
 			}
 		},
-		"source-map-support": {
-			"version": "0.5.21",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+		"node_modules/source-map-support": {
+			"version": "0.5.13",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+			"integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"buffer-from": "^1.0.0",
 				"source-map": "^0.6.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
 			}
 		},
-		"source-map-url": {
+		"node_modules/source-map-support/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/source-map-url": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
 			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+			"deprecated": "See https://github.com/lydell/source-map-url#deprecated",
 			"dev": true
 		},
-		"spawnd": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-			"integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
+		"node_modules/spawnd": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.2.0.tgz",
+			"integrity": "sha512-qX/I4lQy4KgVEcNle0kuc4FxFWHISzBhZW1YemPfwmrmQjyZmfTK/OhBKkhrD2ooAaFZEm1maEBLE6/6enwt+g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"exit": "^0.1.2",
-				"signal-exit": "^3.0.6",
+				"signal-exit": "^3.0.7",
 				"tree-kill": "^1.2.2"
-			},
-			"dependencies": {
-				"signal-exit": {
-					"version": "3.0.7",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-					"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-					"dev": true
-				}
 			}
 		},
-		"spdx-correct": {
+		"node_modules/spdx-correct": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
 			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"spdx-expression-parse": "^3.0.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-exceptions": {
+		"node_modules/spdx-exceptions": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
 			"integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
 			"dev": true
 		},
-		"spdx-expression-parse": {
+		"node_modules/spdx-expression-parse": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
 			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
 			}
 		},
-		"spdx-license-ids": {
+		"node_modules/spdx-license-ids": {
 			"version": "3.0.7",
 			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
 			"integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
 			"dev": true
 		},
-		"spdy": {
+		"node_modules/spdy": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
 			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"handle-thing": "^2.0.0",
 				"http-deceiver": "^1.2.7",
 				"select-hose": "^2.0.0",
 				"spdy-transport": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6.0.0"
 			}
 		},
-		"spdy-transport": {
+		"node_modules/spdy-transport": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
 			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"debug": "^4.1.0",
 				"detect-node": "^2.0.4",
 				"hpack.js": "^2.1.6",
 				"obuf": "^1.1.2",
 				"readable-stream": "^3.0.6",
 				"wbuf": "^1.7.3"
-			},
+			}
+		},
+		"node_modules/spdy-transport/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"split-string": {
+		"node_modules/split-string": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
 			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"extend-shallow": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"sprintf-js": {
+		"node_modules/sprintf-js": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
 			"integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
 		},
-		"squeak": {
+		"node_modules/squeak": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz",
 			"integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"chalk": "^1.0.0",
 				"console-stream": "^0.1.1",
 				"lpad-align": "^1.0.1"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/squeak/node_modules/ansi-regex": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/squeak/node_modules/ansi-styles": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/squeak/node_modules/chalk": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+			"dev": true,
+			"optional": true,
+			"dependencies": {
+				"ansi-styles": "^2.2.1",
+				"escape-string-regexp": "^1.0.2",
+				"has-ansi": "^2.0.0",
+				"strip-ansi": "^3.0.0",
+				"supports-color": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/squeak/node_modules/strip-ansi": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+			"dev": true,
+			"optional": true,
 			"dependencies": {
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true,
-					"optional": true
-				},
-				"ansi-styles": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-					"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-					"dev": true,
-					"optional": true
-				},
-				"chalk": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ansi-regex": "^2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-					"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-					"dev": true,
-					"optional": true
-				}
+				"ansi-regex": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/squeak/node_modules/supports-color": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"sshpk": {
+		"node_modules/sshpk": {
 			"version": "1.16.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
 				"bcrypt-pbkdf": "^1.0.0",
@@ -23913,616 +28632,393 @@
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.0.2",
 				"tweetnacl": "~0.14.0"
+			},
+			"bin": {
+				"sshpk-conv": "bin/sshpk-conv",
+				"sshpk-sign": "bin/sshpk-sign",
+				"sshpk-verify": "bin/sshpk-verify"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"stable": {
+		"node_modules/ssim.js": {
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/ssim.js/-/ssim.js-3.5.0.tgz",
+			"integrity": "sha512-Aj6Jl2z6oDmgYFFbQqK7fght19bXdOxY7Tj03nF+03M9gCBAjeIiO8/PlEGMfKDwYpw4q6iBqVq2YuREorGg/g==",
+			"dev": true
+		},
+		"node_modules/stable": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
 			"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+			"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
 			"dev": true
 		},
-		"stack-trace": {
+		"node_modules/stack-trace": {
 			"version": "0.0.10",
 			"resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
 			"integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": "*"
+			}
 		},
-		"stack-utils": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+		"node_modules/stack-utils": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"escape-string-regexp": "^2.0.0"
 			},
-			"dependencies": {
-				"escape-string-regexp": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stack-utils/node_modules/escape-string-regexp": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+			"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"stackframe": {
+		"node_modules/stackframe": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz",
 			"integrity": "sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==",
 			"dev": true
 		},
-		"static-extend": {
+		"node_modules/static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
 			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"define-property": "^0.2.5",
 				"object-copy": "^0.1.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/static-extend/node_modules/define-property": {
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+			"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+			"dev": true,
 			"dependencies": {
-				"define-property": {
-					"version": "0.2.5",
-					"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-					"dev": true,
-					"requires": {
-						"is-descriptor": "^0.1.0"
-					}
-				}
+				"is-descriptor": "^0.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"statuses": {
+		"node_modules/statuses": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"stream-from-promise": {
+		"node_modules/stream-from-promise": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/stream-from-promise/-/stream-from-promise-1.0.0.tgz",
-			"integrity": "sha1-djaH9913fkyJT2QIMz/Gs/yKYbs="
+			"integrity": "sha512-j84KLkudt+gr8KJ21RB02btPLx61uGbrLnewsWz6QKmsz8/c4ZFqXw6mJh5+G4oRN7DgDxdbjPxnpySpg1mUig==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"stream-to-string": {
+		"node_modules/stream-to-string": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/stream-to-string/-/stream-to-string-1.2.0.tgz",
 			"integrity": "sha512-8drZlFIKBHSMdX9GCWv8V9AAWnQcTqw0iAI6/GC7UJ0H0SwKeFKjOoZfGY1tOU00GGU7FYZQoJ/ZCUEoXhD7yQ==",
-			"requires": {
+			"dependencies": {
 				"promise-polyfill": "^1.1.6"
 			}
 		},
-		"strict-uri-encode": {
+		"node_modules/strict-uri-encode": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
 			"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/string_decoder": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+			"dependencies": {
+				"safe-buffer": "~5.1.0"
+			}
 		},
-		"string-length": {
+		"node_modules/string_decoder/node_modules/safe-buffer": {
+			"version": "5.1.2",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+		},
+		"node_modules/string-length": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
 			"integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"char-regex": "^1.0.2",
 				"strip-ansi": "^6.0.0"
 			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/string-length/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/string-length/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
 			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				}
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"string-template": {
+		"node_modules/string-template": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
 			"integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=",
 			"dev": true
 		},
-		"string-width": {
+		"node_modules/string-width": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
 			"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-			"requires": {
+			"dependencies": {
 				"emoji-regex": "^7.0.1",
 				"is-fullwidth-code-point": "^2.0.0",
 				"strip-ansi": "^5.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"string.prototype.matchall": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-			"integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
+		"node_modules/string.prototype.matchall": {
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+			"integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1",
-				"get-intrinsic": "^1.1.1",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"get-intrinsic": "^1.1.3",
 				"has-symbols": "^1.0.3",
 				"internal-slot": "^1.0.3",
-				"regexp.prototype.flags": "^1.4.1",
+				"regexp.prototype.flags": "^1.4.3",
 				"side-channel": "^1.0.4"
 			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					}
-				},
-				"get-intrinsic": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-					"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"has": "^1.0.3",
-						"has-symbols": "^1.0.3"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					},
-					"dependencies": {
-						"define-properties": {
-							"version": "1.1.4",
-							"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-							"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-							"dev": true,
-							"requires": {
-								"has-property-descriptors": "^1.0.0",
-								"object-keys": "^1.1.1"
-							}
-						}
-					}
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"string.prototype.trim": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.6.tgz",
-			"integrity": "sha512-8lMR2m+U0VJTPp6JjvJTtGyc4FIGq9CdRt7O9p6T0e6K4vjU+OP+SQJpbe/SBmRcCUIvNUnjsbmY6lnMp8MhsQ==",
+		"node_modules/string.prototype.trim": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+			"integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
-			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"define-properties": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-					"integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-					"dev": true,
-					"requires": {
-						"has-property-descriptors": "^1.0.0",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"es-abstract": {
-					"version": "1.20.4",
-					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-					"integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"es-to-primitive": "^1.2.1",
-						"function-bind": "^1.1.1",
-						"function.prototype.name": "^1.1.5",
-						"get-intrinsic": "^1.1.3",
-						"get-symbol-description": "^1.0.0",
-						"has": "^1.0.3",
-						"has-property-descriptors": "^1.0.0",
-						"has-symbols": "^1.0.3",
-						"internal-slot": "^1.0.3",
-						"is-callable": "^1.2.7",
-						"is-negative-zero": "^2.0.2",
-						"is-regex": "^1.1.4",
-						"is-shared-array-buffer": "^1.0.2",
-						"is-string": "^1.0.7",
-						"is-weakref": "^1.0.2",
-						"object-inspect": "^1.12.2",
-						"object-keys": "^1.1.1",
-						"object.assign": "^4.1.4",
-						"regexp.prototype.flags": "^1.4.3",
-						"safe-regex-test": "^1.0.0",
-						"string.prototype.trimend": "^1.0.5",
-						"string.prototype.trimstart": "^1.0.5",
-						"unbox-primitive": "^1.0.2"
-					},
-					"dependencies": {
-						"get-intrinsic": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-							"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
-							"dev": true,
-							"requires": {
-								"function-bind": "^1.1.1",
-								"has": "^1.0.3",
-								"has-symbols": "^1.0.3"
-							}
-						}
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				},
-				"is-callable": {
-					"version": "1.2.7",
-					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-					"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-					"dev": true
-				},
-				"is-negative-zero": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-					"integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-					"dev": true
-				},
-				"is-regex": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-					"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"has-tostringtag": "^1.0.0"
-					}
-				},
-				"object-inspect": {
-					"version": "1.12.2",
-					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-					"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-					"dev": true
-				},
-				"object.assign": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-					"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"has-symbols": "^1.0.3",
-						"object-keys": "^1.1.1"
-					}
-				},
-				"string.prototype.trimend": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-					"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				},
-				"string.prototype.trimstart": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-					"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-					"dev": true,
-					"requires": {
-						"call-bind": "^1.0.2",
-						"define-properties": "^1.1.4",
-						"es-abstract": "^1.19.5"
-					}
-				}
+				"es-abstract": "^1.20.4"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"string.prototype.trimend": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz",
-			"integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==",
+		"node_modules/string.prototype.trimend": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+			"integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3"
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"string.prototype.trimstart": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz",
-			"integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==",
+		"node_modules/string.prototype.trimstart": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+			"integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
 			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.0",
-				"define-properties": "^1.1.3"
-			}
-		},
-		"string_decoder": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-			"requires": {
-				"safe-buffer": "~5.1.0"
-			},
 			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"strip-ansi": {
+		"node_modules/strip-ansi": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
 			"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-			"requires": {
+			"dependencies": {
 				"ansi-regex": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"strip-bom": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-			"dev": true
+		"node_modules/strip-bom": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+			"integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
 		},
-		"strip-dirs": {
+		"node_modules/strip-dirs": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-2.1.0.tgz",
 			"integrity": "sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"is-natural-number": "^4.0.1"
 			}
 		},
-		"strip-eof": {
+		"node_modules/strip-eof": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
 			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"strip-final-newline": {
+		"node_modules/strip-final-newline": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
 			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"strip-indent": {
+		"node_modules/strip-indent": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
 			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"get-stdin": "^4.0.1"
 			},
-			"dependencies": {
-				"get-stdin": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-					"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-					"dev": true,
-					"optional": true
-				}
+			"bin": {
+				"strip-indent": "cli.js"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/strip-indent/node_modules/get-stdin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+			"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+			"dev": true,
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"strip-json-comments": {
+		"node_modules/strip-json-comments": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"strip-outer": {
+		"node_modules/strip-outer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz",
 			"integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"escape-string-regexp": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"strnum": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.4.tgz",
-			"integrity": "sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw==",
+		"node_modules/strnum": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+			"integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
 			"dev": true,
 			"optional": true
 		},
-		"style-search": {
+		"node_modules/style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
 			"integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
 			"dev": true
 		},
-		"style-value-types": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/style-value-types/-/style-value-types-5.0.0.tgz",
-			"integrity": "sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA==",
-			"requires": {
-				"hey-listen": "^1.0.8",
-				"tslib": "^2.1.0"
-			}
-		},
-		"stylehacks": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-			"integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
+		"node_modules/stylehacks": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",
+			"integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
 			"dev": true,
-			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
-			},
-			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-					"dev": true,
-					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
-					}
-				}
+			"dependencies": {
+				"browserslist": "^4.21.4",
+				"postcss-selector-parser": "^6.0.4"
+			},
+			"engines": {
+				"node": "^14 || ^16 || >=18.0"
+			},
+			"peerDependencies": {
+				"postcss": "^8.2.15"
 			}
 		},
-		"stylelint": {
-			"version": "14.14.0",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.14.0.tgz",
-			"integrity": "sha512-yUI+4xXfPHVnueYddSQ/e1GuEA/2wVhWQbGj16AmWLtQJtn28lVxfS4b0CsWyVRPgd3Auzi0NXOthIEUhtQmmA==",
+		"node_modules/stylelint": {
+			"version": "14.16.1",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+			"integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@csstools/selector-specificity": "^2.0.2",
 				"balanced-match": "^2.0.0",
 				"colord": "^2.9.3",
-				"cosmiconfig": "^7.0.1",
+				"cosmiconfig": "^7.1.0",
 				"css-functions-list": "^3.1.0",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.2.12",
@@ -24532,21 +29028,21 @@
 				"globby": "^11.1.0",
 				"globjoin": "^0.1.4",
 				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
+				"ignore": "^5.2.1",
 				"import-lazy": "^4.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.25.0",
+				"known-css-properties": "^0.26.0",
 				"mathml-tag-names": "^2.1.3",
 				"meow": "^9.0.0",
 				"micromatch": "^4.0.5",
 				"normalize-path": "^3.0.0",
 				"picocolors": "^1.0.0",
-				"postcss": "^8.4.17",
+				"postcss": "^8.4.19",
 				"postcss-media-query-parser": "^0.2.3",
 				"postcss-resolve-nested-selector": "^0.1.1",
 				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
+				"postcss-selector-parser": "^6.0.11",
 				"postcss-value-parser": "^4.2.0",
 				"resolve-from": "^5.0.0",
 				"string-width": "^4.2.3",
@@ -24554,499 +29050,528 @@
 				"style-search": "^0.1.0",
 				"supports-hyperlinks": "^2.3.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
+				"table": "^6.8.1",
 				"v8-compile-cache": "^2.3.0",
 				"write-file-atomic": "^4.0.2"
 			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"balanced-match": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-					"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-					"dev": true
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"camelcase-keys": {
-					"version": "6.2.2",
-					"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-					"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.3.1",
-						"map-obj": "^4.0.0",
-						"quick-lru": "^4.0.1"
-					}
-				},
-				"debug": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-					"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-					"dev": true,
-					"requires": {
-						"ms": "2.1.2"
-					}
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"fast-glob": {
-					"version": "3.2.12",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-					"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-					"dev": true,
-					"requires": {
-						"@nodelib/fs.stat": "^2.0.2",
-						"@nodelib/fs.walk": "^1.2.3",
-						"glob-parent": "^5.1.2",
-						"merge2": "^1.3.0",
-						"micromatch": "^4.0.4"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"find-up": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-					"dev": true,
-					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"global-modules": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-					"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^3.0.0"
-					}
-				},
-				"global-prefix": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-					"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-					"dev": true,
-					"requires": {
-						"ini": "^1.3.5",
-						"kind-of": "^6.0.2",
-						"which": "^1.3.1"
-					}
-				},
-				"hosted-git-info": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-					"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-					"dev": true,
-					"requires": {
-						"lru-cache": "^6.0.0"
-					}
-				},
-				"indent-string": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-					"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-					"dev": true
-				},
-				"is-core-module": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-					"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-					"dev": true,
-					"requires": {
-						"has": "^1.0.3"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"is-plain-object": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-					"integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-					"dev": true
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				},
-				"locate-path": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^4.1.0"
-					}
-				},
-				"map-obj": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-					"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-					"dev": true
-				},
-				"meow": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-					"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-					"dev": true,
-					"requires": {
-						"@types/minimist": "^1.2.0",
-						"camelcase-keys": "^6.2.2",
-						"decamelize": "^1.2.0",
-						"decamelize-keys": "^1.1.0",
-						"hard-rejection": "^2.1.0",
-						"minimist-options": "4.1.0",
-						"normalize-package-data": "^3.0.0",
-						"read-pkg-up": "^7.0.1",
-						"redent": "^3.0.0",
-						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.18.0",
-						"yargs-parser": "^20.2.3"
-					}
-				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-					"dev": true
-				},
-				"normalize-package-data": {
-					"version": "3.0.3",
-					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-					"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-					"dev": true,
-					"requires": {
-						"hosted-git-info": "^4.0.1",
-						"is-core-module": "^2.5.0",
-						"semver": "^7.3.4",
-						"validate-npm-package-license": "^3.0.1"
-					}
-				},
-				"p-locate": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.2.0"
-					}
-				},
-				"path-exists": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-					"dev": true
-				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
-				"postcss": {
-					"version": "8.4.18",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-					"integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-					"dev": true,
-					"requires": {
-						"nanoid": "^3.3.4",
-						"picocolors": "^1.0.0",
-						"source-map-js": "^1.0.2"
-					}
-				},
-				"postcss-selector-parser": {
-					"version": "6.0.10",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-					"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-					"dev": true,
-					"requires": {
-						"cssesc": "^3.0.0",
-						"util-deprecate": "^1.0.2"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				},
-				"read-pkg-up": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-					"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-					"dev": true,
-					"requires": {
-						"find-up": "^4.1.0",
-						"read-pkg": "^5.2.0",
-						"type-fest": "^0.8.1"
-					},
-					"dependencies": {
-						"type-fest": {
-							"version": "0.8.1",
-							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-							"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-							"dev": true
-						}
-					}
-				},
-				"redent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-					"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-					"dev": true,
-					"requires": {
-						"indent-string": "^4.0.0",
-						"strip-indent": "^3.0.0"
-					}
-				},
-				"resolve-from": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-					"dev": true
-				},
-				"signal-exit": {
-					"version": "3.0.7",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-					"integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				},
-				"strip-indent": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-					"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-					"dev": true,
-					"requires": {
-						"min-indent": "^1.0.0"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				},
-				"trim-newlines": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-					"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-					"dev": true
-				},
-				"type-fest": {
-					"version": "0.18.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-					"dev": true
-				},
-				"which": {
-					"version": "1.3.1",
-					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
-				},
-				"write-file-atomic": {
-					"version": "4.0.2",
-					"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
-					"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-					"dev": true,
-					"requires": {
-						"imurmurhash": "^0.1.4",
-						"signal-exit": "^3.0.7"
-					}
-				},
-				"yargs-parser": {
-					"version": "20.2.9",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-					"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-					"dev": true
-				}
+			"bin": {
+				"stylelint": "bin/stylelint.js"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/stylelint"
 			}
 		},
-		"stylelint-config-recommended": {
+		"node_modules/stylelint-config-recommended": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
 			"integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
-			"dev": true
+			"dev": true,
+			"peerDependencies": {
+				"stylelint": "^14.0.0"
+			}
 		},
-		"stylelint-config-recommended-scss": {
+		"node_modules/stylelint-config-recommended-scss": {
 			"version": "5.0.2",
 			"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
 			"integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"postcss-scss": "^4.0.2",
 				"stylelint-config-recommended": "^6.0.0",
 				"stylelint-scss": "^4.0.0"
+			},
+			"peerDependencies": {
+				"stylelint": "^14.0.0"
 			}
 		},
-		"stylelint-scss": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.3.0.tgz",
-			"integrity": "sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==",
+		"node_modules/stylelint-scss": {
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
+			"integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
 			"dev": true,
-			"requires": {
-				"lodash": "^4.17.21",
+			"dependencies": {
 				"postcss-media-query-parser": "^0.2.3",
 				"postcss-resolve-nested-selector": "^0.1.1",
-				"postcss-selector-parser": "^6.0.6",
-				"postcss-value-parser": "^4.1.0"
+				"postcss-selector-parser": "^6.0.11",
+				"postcss-value-parser": "^4.2.0"
 			},
+			"peerDependencies": {
+				"stylelint": "^14.5.1 || ^15.0.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/balanced-match": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+			"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+			"dev": true
+		},
+		"node_modules/stylelint/node_modules/braces": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"dev": true,
 			"dependencies": {
-				"postcss-selector-parser": {
-					"version": "6.0.10",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-					"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-					"dev": true,
-					"requires": {
-						"cssesc": "^3.0.0",
-						"util-deprecate": "^1.0.2"
-					}
-				},
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
+				"fill-range": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/camelcase-keys": {
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+			"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+			"dev": true,
+			"dependencies": {
+				"camelcase": "^5.3.1",
+				"map-obj": "^4.0.0",
+				"quick-lru": "^4.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stylelint/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/stylelint/node_modules/fill-range": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"dev": true,
+			"dependencies": {
+				"to-regex-range": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/find-up": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+			"dev": true,
+			"dependencies": {
+				"locate-path": "^5.0.0",
+				"path-exists": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/global-modules": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+			"dev": true,
+			"dependencies": {
+				"global-prefix": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/stylelint/node_modules/global-prefix": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+			"dev": true,
+			"dependencies": {
+				"ini": "^1.3.5",
+				"kind-of": "^6.0.2",
+				"which": "^1.3.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/stylelint/node_modules/hosted-git-info": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+			"integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+			"dev": true,
+			"dependencies": {
+				"lru-cache": "^6.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stylelint/node_modules/indent-string": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+			"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/is-number": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.12.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/locate-path": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+			"dev": true,
+			"dependencies": {
+				"p-locate": "^4.1.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/map-obj": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+			"integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stylelint/node_modules/meow": {
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+			"integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+			"dev": true,
+			"dependencies": {
+				"@types/minimist": "^1.2.0",
+				"camelcase-keys": "^6.2.2",
+				"decamelize": "^1.2.0",
+				"decamelize-keys": "^1.1.0",
+				"hard-rejection": "^2.1.0",
+				"minimist-options": "4.1.0",
+				"normalize-package-data": "^3.0.0",
+				"read-pkg-up": "^7.0.1",
+				"redent": "^3.0.0",
+				"trim-newlines": "^3.0.0",
+				"type-fest": "^0.18.0",
+				"yargs-parser": "^20.2.3"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stylelint/node_modules/micromatch": {
+			"version": "4.0.5",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"dev": true,
+			"dependencies": {
+				"braces": "^3.0.2",
+				"picomatch": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=8.6"
+			}
+		},
+		"node_modules/stylelint/node_modules/normalize-package-data": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+			"integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+			"dev": true,
+			"dependencies": {
+				"hosted-git-info": "^4.0.1",
+				"is-core-module": "^2.5.0",
+				"semver": "^7.3.4",
+				"validate-npm-package-license": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/stylelint/node_modules/p-locate": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+			"dev": true,
+			"dependencies": {
+				"p-limit": "^2.2.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/path-exists": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/read-pkg-up": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+			"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+			"dev": true,
+			"dependencies": {
+				"find-up": "^4.1.0",
+				"read-pkg": "^5.2.0",
+				"type-fest": "^0.8.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stylelint/node_modules/read-pkg-up/node_modules/type-fest": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+			"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/redent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+			"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+			"dev": true,
+			"dependencies": {
+				"indent-string": "^4.0.0",
+				"strip-indent": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/strip-indent": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+			"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+			"dev": true,
+			"dependencies": {
+				"min-indent": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/to-regex-range": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+			"dev": true,
+			"dependencies": {
+				"is-number": "^7.0.0"
+			},
+			"engines": {
+				"node": ">=8.0"
+			}
+		},
+		"node_modules/stylelint/node_modules/trim-newlines": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+			"integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/stylelint/node_modules/type-fest": {
+			"version": "0.18.1",
+			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+			"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/stylelint/node_modules/which": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"which": "bin/which"
+			}
+		},
+		"node_modules/stylelint/node_modules/yargs-parser": {
+			"version": "20.2.9",
+			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+			"integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"stylis": {
-			"version": "4.0.13",
-			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz",
-			"integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="
+		"node_modules/stylis": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
+			"integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
 		},
-		"supports-color": {
+		"node_modules/supports-color": {
 			"version": "5.5.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"requires": {
+			"dependencies": {
 				"has-flag": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"supports-hyperlinks": {
+		"node_modules/supports-hyperlinks": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
 			"integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"has-flag": "^4.0.0",
 				"supports-color": "^7.0.0"
 			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-hyperlinks/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/supports-hyperlinks/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
 			"dependencies": {
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"supports-preserve-symlinks-flag": {
+		"node_modules/supports-preserve-symlinks-flag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
 			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-			"dev": true
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"svg-parser": {
+		"node_modules/svg-parser": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
 			"integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==",
 			"dev": true
 		},
-		"svg-tags": {
+		"node_modules/svg-tags": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
 			"integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
 			"dev": true
 		},
-		"svgo": {
+		"node_modules/svgo": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
 			"integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+			"deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
 			"dev": true,
-			"requires": {
+			"optional": true,
+			"dependencies": {
 				"chalk": "^2.4.1",
 				"coa": "^2.0.2",
 				"css-select": "^2.0.0",
@@ -25061,1079 +29586,1427 @@
 				"unquote": "~1.1.1",
 				"util.promisify": "~1.0.0"
 			},
+			"bin": {
+				"svgo": "bin/svgo"
+			},
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
+		"node_modules/svgo/node_modules/chalk": {
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"dev": true,
+			"optional": true,
 			"dependencies": {
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				}
+				"ansi-styles": "^3.2.1",
+				"escape-string-regexp": "^1.0.5",
+				"supports-color": "^5.3.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"symbol-tree": {
+		"node_modules/symbol-tree": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
 			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
 			"dev": true
 		},
-		"table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+		"node_modules/table": {
+			"version": "6.8.1",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+			"integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"ajv": "^8.0.1",
 				"lodash.truncate": "^4.4.2",
 				"slice-ansi": "^4.0.0",
 				"string-width": "^4.2.3",
 				"strip-ansi": "^6.0.1"
 			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/table/node_modules/ajv": {
+			"version": "8.12.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"dev": true,
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ansi-regex": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-					"dev": true
-				},
-				"emoji-regex": {
-					"version": "8.0.0",
-					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-					"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.1"
-					}
-				},
-				"strip-ansi": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-					"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^5.0.1"
-					}
-				}
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/table/node_modules/ansi-regex": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+			"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/table/node_modules/emoji-regex": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+			"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+			"dev": true
+		},
+		"node_modules/table/node_modules/is-fullwidth-code-point": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+			"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/table/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/table/node_modules/string-width": {
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+			"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+			"dev": true,
+			"dependencies": {
+				"emoji-regex": "^8.0.0",
+				"is-fullwidth-code-point": "^3.0.0",
+				"strip-ansi": "^6.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/table/node_modules/strip-ansi": {
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+			"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+			"dev": true,
+			"dependencies": {
+				"ansi-regex": "^5.0.1"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"taffydb": {
+		"node_modules/taffydb": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
-			"integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+			"integrity": "sha512-y3JaeRSplks6NYQuCOj3ZFMO3j60rTwbuKCvZxsAraGYH2epusatvZ0baZYA01WsGqJBq/Dl6vOrMUJqyMj8kA==",
 			"dev": true
 		},
-		"tannin": {
+		"node_modules/tannin": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/tannin/-/tannin-1.2.0.tgz",
 			"integrity": "sha512-U7GgX/RcSeUETbV7gYgoz8PD7Ni4y95pgIP/Z6ayI3CfhSujwKEBlGFTCRN+Aqnuyf4AN2yHL+L8x+TCGjb9uA==",
-			"requires": {
+			"dependencies": {
 				"@tannin/plural-forms": "^1.1.0"
 			}
 		},
-		"tapable": {
+		"node_modules/tapable": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
 			"integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"tar-fs": {
+		"node_modules/tar-fs": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
 			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"chownr": "^1.1.1",
 				"mkdirp-classic": "^0.5.2",
 				"pump": "^3.0.0",
 				"tar-stream": "^2.1.4"
 			}
 		},
-		"tar-stream": {
+		"node_modules/tar-stream": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
 			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"bl": "^4.0.3",
 				"end-of-stream": "^1.4.1",
 				"fs-constants": "^1.0.0",
 				"inherits": "^2.0.3",
 				"readable-stream": "^3.1.1"
 			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream/node_modules/readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"dev": true,
 			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
-		"temp-dir": {
+		"node_modules/temp-dir": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
 			"integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"tempfile": {
+		"node_modules/tempfile": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz",
 			"integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"temp-dir": "^1.0.0",
 				"uuid": "^3.0.1"
 			},
-			"dependencies": {
-				"uuid": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-					"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-					"dev": true,
-					"optional": true
-				}
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"terminal-link": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-			"integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+		"node_modules/tempfile/node_modules/uuid": {
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+			"integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+			"deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
 			"dev": true,
-			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"supports-hyperlinks": "^2.0.0"
+			"optional": true,
+			"bin": {
+				"uuid": "bin/uuid"
 			}
 		},
-		"terser": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-			"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
+		"node_modules/terser": {
+			"version": "5.19.2",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+			"integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/source-map": "^0.3.2",
-				"acorn": "^8.5.0",
+			"dependencies": {
+				"@jridgewell/source-map": "^0.3.3",
+				"acorn": "^8.8.2",
 				"commander": "^2.20.0",
 				"source-map-support": "~0.5.20"
+			},
+			"bin": {
+				"terser": "bin/terser"
+			},
+			"engines": {
+				"node": ">=10"
 			}
 		},
-		"terser-webpack-plugin": {
-			"version": "5.3.6",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-			"integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+		"node_modules/terser-webpack-plugin": {
+			"version": "5.3.9",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
 			"dev": true,
-			"requires": {
-				"@jridgewell/trace-mapping": "^0.3.14",
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.17",
 				"jest-worker": "^27.4.5",
 				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.0",
-				"terser": "^5.14.1"
+				"serialize-javascript": "^6.0.1",
+				"terser": "^5.16.8"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^5.1.0"
+			},
+			"peerDependenciesMeta": {
+				"@swc/core": {
+					"optional": true
+				},
+				"esbuild": {
+					"optional": true
+				},
+				"uglify-js": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/terser/node_modules/source-map": {
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/terser/node_modules/source-map-support": {
+			"version": "0.5.21",
+			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+			"integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+			"dev": true,
+			"dependencies": {
+				"buffer-from": "^1.0.0",
+				"source-map": "^0.6.0"
 			}
 		},
-		"test-exclude": {
+		"node_modules/test-exclude": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
 			"integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@istanbuljs/schema": "^0.1.2",
 				"glob": "^7.1.4",
 				"minimatch": "^3.0.4"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"text-table": {
+		"node_modules/text-table": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
 			"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
 			"dev": true
 		},
-		"throat": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
-			"dev": true
-		},
-		"through": {
+		"node_modules/through": {
 			"version": "2.3.8",
 			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
 			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
 			"dev": true
 		},
-		"thunky": {
+		"node_modules/thunky": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
 			"integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
 			"dev": true
 		},
-		"timed-out": {
+		"node_modules/timed-out": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
 			"integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
 			"dev": true,
-			"optional": true
-		},
-		"timsort": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-			"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-			"dev": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"tiny-emitter": {
+		"node_modules/tiny-emitter": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
 			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
 		},
-		"tiny-glob": {
+		"node_modules/tiny-glob": {
 			"version": "0.2.9",
 			"resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
 			"integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"globalyzer": "0.1.0",
 				"globrex": "^0.1.2"
 			}
 		},
-		"tiny-lr": {
+		"node_modules/tiny-lr": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz",
 			"integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"body": "^5.1.0",
 				"debug": "^3.1.0",
 				"faye-websocket": "~0.10.0",
 				"livereload-js": "^2.3.0",
 				"object-assign": "^4.1.0",
 				"qs": "^6.4.0"
-			},
+			}
+		},
+		"node_modules/tiny-lr/node_modules/debug": {
+			"version": "3.2.7",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+			"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+			"dev": true,
 			"dependencies": {
-				"debug": {
-					"version": "3.2.7",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-					"dev": true,
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				}
+				"ms": "^2.1.1"
 			}
 		},
-		"tmp": {
+		"node_modules/tmp": {
 			"version": "0.0.33",
 			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
 			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"os-tmpdir": "~1.0.2"
+			},
+			"engines": {
+				"node": ">=0.6.0"
 			}
 		},
-		"tmpl": {
+		"node_modules/tmpl": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
 			"integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
 			"dev": true
 		},
-		"to-buffer": {
+		"node_modules/to-buffer": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
 			"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==",
 			"dev": true,
 			"optional": true
 		},
-		"to-fast-properties": {
+		"node_modules/to-fast-properties": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"to-object-path": {
+		"node_modules/to-object-path": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
 			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"kind-of": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"to-regex": {
+		"node_modules/to-regex": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
 			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"define-property": "^2.0.2",
 				"extend-shallow": "^3.0.2",
 				"regex-not": "^1.0.2",
 				"safe-regex": "^1.1.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"to-regex-range": {
+		"node_modules/to-regex-range": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
 			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"is-number": "^3.0.0",
 				"repeat-string": "^1.6.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"toidentifier": {
+		"node_modules/toidentifier": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
 			"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.6"
+			}
 		},
-		"toposort": {
+		"node_modules/toposort": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
-			"integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA="
+			"integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
 		},
-		"totalist": {
+		"node_modules/totalist": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
 			"integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=6"
+			}
 		},
-		"tough-cookie": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-			"integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+		"node_modules/tough-cookie": {
+			"version": "4.1.3",
+			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+			"integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"psl": "^1.1.33",
 				"punycode": "^2.1.1",
 				"universalify": "^0.2.0",
 				"url-parse": "^1.5.3"
 			},
-			"dependencies": {
-				"universalify": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-					"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"tr46": {
+		"node_modules/tr46": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
 			"integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
 			"dev": true
 		},
-		"traverse": {
+		"node_modules/traverse": {
 			"version": "0.6.7",
 			"resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.7.tgz",
-			"integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg=="
+			"integrity": "sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
-		"tree-kill": {
+		"node_modules/tree-kill": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
 			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
-			"dev": true
+			"dev": true,
+			"bin": {
+				"tree-kill": "cli.js"
+			}
 		},
-		"trim-newlines": {
+		"node_modules/trim-newlines": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+			"integrity": "sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"trim-repeated": {
+		"node_modules/trim-repeated": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
 			"integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"escape-string-regexp": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"tsconfig-paths": {
-			"version": "3.14.1",
-			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-			"integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+		"node_modules/tsconfig-paths": {
+			"version": "3.14.2",
+			"resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+			"integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/json5": "^0.0.29",
-				"json5": "^1.0.1",
+				"json5": "^1.0.2",
 				"minimist": "^1.2.6",
 				"strip-bom": "^3.0.0"
-			},
+			}
+		},
+		"node_modules/tsconfig-paths/node_modules/json5": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+			"dev": true,
 			"dependencies": {
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				}
+				"minimist": "^1.2.0"
+			},
+			"bin": {
+				"json5": "lib/cli.js"
 			}
 		},
-		"tslib": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+		"node_modules/tsconfig-paths/node_modules/strip-bom": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+			"integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"tsutils": {
+		"node_modules/tslib": {
+			"version": "2.6.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
+			"integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+		},
+		"node_modules/tsutils": {
 			"version": "3.21.0",
 			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
 			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"tslib": "^1.8.1"
 			},
-			"dependencies": {
-				"tslib": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-					"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">= 6"
+			},
+			"peerDependencies": {
+				"typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
 			}
 		},
-		"tunnel-agent": {
+		"node_modules/tsutils/node_modules/tslib": {
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+			"dev": true
+		},
+		"node_modules/tunnel-agent": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"turbo-combine-reducers": {
+		"node_modules/turbo-combine-reducers": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/turbo-combine-reducers/-/turbo-combine-reducers-1.0.2.tgz",
 			"integrity": "sha512-gHbdMZlA6Ym6Ur5pSH/UWrNQMIM9IqTH6SoL1DbHpqEdQ8i+cFunSmSlFykPt0eGQwZ4d/XTHOl74H0/kFBVWw=="
 		},
-		"tweetnacl": {
+		"node_modules/tweetnacl": {
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
 			"dev": true
 		},
-		"twemoji": {
-			"version": "14.0.2",
-			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-14.0.2.tgz",
-			"integrity": "sha512-BzOoXIe1QVdmsUmZ54xbEH+8AgtOKUiG53zO5vVP2iUu6h5u9lN15NcuS6te4OY96qx0H7JK9vjjl9WQbkTRuA==",
-			"requires": {
-				"fs-extra": "^8.0.1",
-				"jsonfile": "^5.0.0",
-				"twemoji-parser": "14.0.0",
-				"universalify": "^0.1.2"
-			}
-		},
-		"twemoji-parser": {
-			"version": "14.0.0",
-			"resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-14.0.0.tgz",
-			"integrity": "sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA=="
-		},
-		"type-check": {
+		"node_modules/type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
 			"integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"prelude-ls": "^1.2.1"
+			},
+			"engines": {
+				"node": ">= 0.8.0"
 			}
 		},
-		"type-detect": {
+		"node_modules/type-detect": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
 			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"type-fest": {
+		"node_modules/type-fest": {
 			"version": "0.20.2",
 			"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
 			"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
-		"type-is": {
+		"node_modules/type-is": {
 			"version": "1.6.18",
 			"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
 			"integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"media-typer": "0.3.0",
 				"mime-types": "~2.1.24"
+			},
+			"engines": {
+				"node": ">= 0.6"
 			}
 		},
-		"typedarray-to-buffer": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-			"integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+		"node_modules/typed-array-buffer": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+			"integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.2.1",
+				"is-typed-array": "^1.1.10"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/typed-array-byte-length": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+			"integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"has-proto": "^1.0.1",
+				"is-typed-array": "^1.1.10"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-byte-offset": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+			"integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+			"dev": true,
+			"dependencies": {
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"has-proto": "^1.0.1",
+				"is-typed-array": "^1.1.10"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/typed-array-length": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+			"integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
 			"dev": true,
-			"requires": {
-				"is-typedarray": "^1.0.0"
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"is-typed-array": "^1.1.9"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"uc.micro": {
+		"node_modules/uc.micro": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
 			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
 			"dev": true
 		},
-		"uglify-js": {
-			"version": "3.17.3",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
-			"integrity": "sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==",
-			"dev": true
+		"node_modules/uglify-js": {
+			"version": "3.17.4",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+			"integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+			"dev": true,
+			"bin": {
+				"uglifyjs": "bin/uglifyjs"
+			},
+			"engines": {
+				"node": ">=0.8.0"
+			}
 		},
-		"unbox-primitive": {
+		"node_modules/unbox-primitive": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
 			"integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"call-bind": "^1.0.2",
 				"has-bigints": "^1.0.2",
 				"has-symbols": "^1.0.3",
 				"which-boxed-primitive": "^1.0.2"
 			},
-			"dependencies": {
-				"call-bind": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-					"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-					"dev": true,
-					"requires": {
-						"function-bind": "^1.1.1",
-						"get-intrinsic": "^1.0.2"
-					}
-				},
-				"has-symbols": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-					"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-					"dev": true
-				}
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"unbzip2-stream": {
+		"node_modules/unbzip2-stream": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
 			"integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"buffer": "^5.2.1",
 				"through": "^2.3.8"
 			}
 		},
-		"unc-path-regex": {
+		"node_modules/unc-path-regex": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
 			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
 		},
-		"underscore": {
+		"node_modules/underscore": {
 			"version": "1.13.6",
 			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
 			"integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
 		},
-		"underscore.string": {
+		"node_modules/underscore.string": {
 			"version": "3.3.5",
 			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
 			"integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"sprintf-js": "^1.0.3",
 				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": "*"
 			}
 		},
-		"unicode-canonical-property-names-ecmascript": {
+		"node_modules/unicode-canonical-property-names-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
 			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-match-property-ecmascript": {
+		"node_modules/unicode-match-property-ecmascript": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
 			"integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"unicode-canonical-property-names-ecmascript": "^2.0.0",
 				"unicode-property-aliases-ecmascript": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=4"
 			}
 		},
-		"unicode-match-property-value-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-			"dev": true
+		"node_modules/unicode-match-property-value-ecmascript": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"unicode-property-aliases-ecmascript": {
+		"node_modules/unicode-property-aliases-ecmascript": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
 			"integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4"
+			}
 		},
-		"union-value": {
+		"node_modules/union-value": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
 			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"arr-union": "^3.1.0",
 				"get-value": "^2.0.6",
 				"is-extendable": "^0.1.1",
 				"set-value": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"uniq": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-			"integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-			"dev": true
-		},
-		"uniqs": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-			"integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-			"dev": true
-		},
-		"universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+		"node_modules/universalify": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+			"integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
 		},
-		"unpipe": {
+		"node_modules/unpipe": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
 			"integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"unquote": {
+		"node_modules/unquote": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
 			"integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-			"dev": true
+			"dev": true,
+			"optional": true
 		},
-		"unset-value": {
+		"node_modules/unset-value": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
 			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"has-value": "^0.3.1",
 				"isobject": "^3.0.0"
 			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-value": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+			"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+			"dev": true,
 			"dependencies": {
-				"has-value": {
-					"version": "0.3.1",
-					"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-					"dev": true,
-					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
-					},
-					"dependencies": {
-						"isobject": {
-							"version": "2.1.0",
-							"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-							"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-							"dev": true,
-							"requires": {
-								"isarray": "1.0.0"
-							}
-						}
-					}
-				},
-				"has-values": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-					"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-					"dev": true
-				}
+				"get-value": "^2.0.3",
+				"has-values": "^0.1.4",
+				"isobject": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"update-browserslist-db": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-			"integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+		"node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+			"dev": true,
+			"dependencies": {
+				"isarray": "1.0.0"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/unset-value/node_modules/has-values": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+			"integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/update-browserslist-db": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
 			"dev": true,
-			"requires": {
+			"funding": [
+				{
+					"type": "opencollective",
+					"url": "https://opencollective.com/browserslist"
+				},
+				{
+					"type": "tidelift",
+					"url": "https://tidelift.com/funding/github/npm/browserslist"
+				},
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/ai"
+				}
+			],
+			"dependencies": {
 				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0"
+			},
+			"bin": {
+				"update-browserslist-db": "cli.js"
+			},
+			"peerDependencies": {
+				"browserslist": ">= 4.21.0"
 			}
 		},
-		"upper-case": {
+		"node_modules/upper-case": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz",
 			"integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==",
-			"requires": {
+			"dependencies": {
 				"tslib": "^2.0.3"
 			}
 		},
-		"upper-case-first": {
+		"node_modules/upper-case-first": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz",
 			"integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==",
-			"requires": {
+			"dependencies": {
 				"tslib": "^2.0.3"
 			}
 		},
-		"uri-js": {
+		"node_modules/uri-js": {
 			"version": "4.4.0",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
 			"integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"punycode": "^2.1.0"
 			}
 		},
-		"uri-path": {
+		"node_modules/uri-path": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz",
 			"integrity": "sha1-l0fwGDWJM8Md4PzP2C0TjmcmLjI=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.10"
+			}
 		},
-		"urix": {
+		"node_modules/urix": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
 			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+			"deprecated": "Please see https://github.com/lydell/urix#deprecated",
 			"dev": true
 		},
-		"url-loader": {
+		"node_modules/url-loader": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
 			"integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"loader-utils": "^2.0.0",
 				"mime-types": "^2.1.27",
 				"schema-utils": "^3.0.0"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"file-loader": "*",
+				"webpack": "^4.0.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"file-loader": {
+					"optional": true
+				}
 			}
 		},
-		"url-parse": {
+		"node_modules/url-parse": {
 			"version": "1.5.10",
 			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
 			"integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
 			}
 		},
-		"url-parse-lax": {
+		"node_modules/url-parse-lax": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
 			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
 			"dev": true,
 			"optional": true,
-			"requires": {
+			"dependencies": {
 				"prepend-http": "^1.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
 			}
 		},
-		"url-to-options": {
+		"node_modules/url-to-options": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz",
 			"integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">= 4"
+			}
 		},
-		"use": {
+		"node_modules/use": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
 			"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/use-callback-ref": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.0.tgz",
+			"integrity": "sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==",
+			"dependencies": {
+				"tslib": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/use-isomorphic-layout-effect": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+			"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
 		},
-		"use-lilius": {
+		"node_modules/use-lilius": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/use-lilius/-/use-lilius-2.0.3.tgz",
 			"integrity": "sha512-+Q7nspdv+QGnyHGVMd6yAdLrqv5EGB4n3ix4GJH0JEE27weKCLCLmZSuAr5Nw+yPBCZn/iZ+KjL5+UykLCWXrw==",
-			"requires": {
+			"dependencies": {
 				"date-fns": "^2.29.2"
+			},
+			"peerDependencies": {
+				"react": "*",
+				"react-dom": "*"
 			}
 		},
-		"use-memo-one": {
+		"node_modules/use-memo-one": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz",
-			"integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ=="
+			"integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==",
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			}
 		},
-		"util-deprecate": {
+		"node_modules/use-sidecar": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",
+			"integrity": "sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==",
+			"dependencies": {
+				"detect-node-es": "^1.1.0",
+				"tslib": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"peerDependencies": {
+				"@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			},
+			"peerDependenciesMeta": {
+				"@types/react": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/use-sync-external-store": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
+			"integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
+			"peerDependencies": {
+				"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+			}
+		},
+		"node_modules/util-deprecate": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 		},
-		"util.promisify": {
+		"node_modules/util.promisify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
 			"integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
 			"dev": true,
-			"requires": {
+			"optional": true,
+			"dependencies": {
 				"define-properties": "^1.1.3",
 				"es-abstract": "^1.17.2",
 				"has-symbols": "^1.0.1",
 				"object.getownpropertydescriptors": "^2.1.0"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"utils-merge": {
+		"node_modules/utils-merge": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
 			"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.4.0"
+			}
 		},
-		"uuid": {
+		"node_modules/uuid": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
 			"integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
-			"dev": true
+			"dev": true,
+			"bin": {
+				"uuid": "dist/bin/uuid"
+			}
 		},
-		"v8-compile-cache": {
+		"node_modules/v8-compile-cache": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
 			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
 			"dev": true
 		},
-		"v8-to-istanbul": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-			"integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+		"node_modules/v8-to-istanbul": {
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
+			"integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
+				"@jridgewell/trace-mapping": "^0.3.12",
 				"@types/istanbul-lib-coverage": "^2.0.1",
-				"convert-source-map": "^1.6.0",
-				"source-map": "^0.7.3"
+				"convert-source-map": "^1.6.0"
 			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.7.4",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-					"integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=10.12.0"
 			}
 		},
-		"v8flags": {
+		"node_modules/v8flags": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
 			"integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"homedir-polyfill": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
-		"validate-npm-package-license": {
+		"node_modules/validate-npm-package-license": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"spdx-correct": "^3.0.0",
 				"spdx-expression-parse": "^3.0.0"
 			}
 		},
-		"vary": {
+		"node_modules/valtio": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/valtio/-/valtio-1.7.0.tgz",
+			"integrity": "sha512-3Tnix66EERwMcrl1rfB3ylcewOcL5L/GiPmC3FlVNreQzqf2jufEeqlNmgnLgSGchkEmH3WYVtS+x6Qw4r+yzQ==",
+			"dependencies": {
+				"proxy-compare": "2.3.0",
+				"use-sync-external-store": "1.2.0"
+			},
+			"engines": {
+				"node": ">=12.7.0"
+			},
+			"peerDependencies": {
+				"@babel/helper-module-imports": ">=7.12",
+				"@babel/types": ">=7.13",
+				"aslemammad-vite-plugin-macro": ">=1.0.0-alpha.1",
+				"babel-plugin-macros": ">=3.0",
+				"react": ">=16.8",
+				"vite": ">=2.8.6"
+			},
+			"peerDependenciesMeta": {
+				"@babel/helper-module-imports": {
+					"optional": true
+				},
+				"@babel/types": {
+					"optional": true
+				},
+				"aslemammad-vite-plugin-macro": {
+					"optional": true
+				},
+				"babel-plugin-macros": {
+					"optional": true
+				},
+				"react": {
+					"optional": true
+				},
+				"vite": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/vary": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
 			"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-			"dev": true
-		},
-		"vendors": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-			"integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
-		"verror": {
+		"node_modules/verror": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 			"dev": true,
-			"requires": {
+			"engines": [
+				"node >=0.6.0"
+			],
+			"dependencies": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",
 				"extsprintf": "^1.2.0"
 			}
 		},
-		"w3c-hr-time": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+		"node_modules/w3c-xmlserializer": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+			"integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
 			"dev": true,
-			"requires": {
-				"browser-process-hrtime": "^1.0.0"
+			"dependencies": {
+				"xml-name-validator": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
 			}
 		},
-		"w3c-xmlserializer": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+		"node_modules/wait-on": {
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.0.1.tgz",
+			"integrity": "sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==",
+			"dev": true,
+			"dependencies": {
+				"axios": "^0.27.2",
+				"joi": "^17.7.0",
+				"lodash": "^4.17.21",
+				"minimist": "^1.2.7",
+				"rxjs": "^7.8.0"
+			},
+			"bin": {
+				"wait-on": "bin/wait-on"
+			},
+			"engines": {
+				"node": ">=12.0.0"
+			}
+		},
+		"node_modules/wait-on/node_modules/axios": {
+			"version": "0.27.2",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+			"integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
 			"dev": true,
-			"requires": {
-				"xml-name-validator": "^3.0.0"
+			"dependencies": {
+				"follow-redirects": "^1.14.9",
+				"form-data": "^4.0.0"
 			}
 		},
-		"wait-on": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
-			"integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
+		"node_modules/wait-on/node_modules/form-data": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+			"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
 			"dev": true,
-			"requires": {
-				"axios": "^0.25.0",
-				"joi": "^17.6.0",
-				"lodash": "^4.17.21",
-				"minimist": "^1.2.5",
-				"rxjs": "^7.5.4"
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
 			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/wait-on/node_modules/minimist": {
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+			"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/wait-on/node_modules/rxjs": {
+			"version": "7.8.0",
+			"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
+			"integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+			"dev": true,
 			"dependencies": {
-				"@sideway/address": {
-					"version": "4.1.4",
-					"resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-					"integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
-					"dev": true,
-					"requires": {
-						"@hapi/hoek": "^9.0.0"
-					}
-				},
-				"axios": {
-					"version": "0.25.0",
-					"resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
-					"integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
-					"dev": true,
-					"requires": {
-						"follow-redirects": "^1.14.7"
-					}
-				},
-				"follow-redirects": {
-					"version": "1.14.9",
-					"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz",
-					"integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==",
-					"dev": true
-				},
-				"joi": {
-					"version": "17.6.0",
-					"resolved": "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz",
-					"integrity": "sha512-OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw==",
-					"dev": true,
-					"requires": {
-						"@hapi/hoek": "^9.0.0",
-						"@hapi/topo": "^5.0.0",
-						"@sideway/address": "^4.1.3",
-						"@sideway/formula": "^3.0.0",
-						"@sideway/pinpoint": "^2.0.0"
-					}
-				},
-				"rxjs": {
-					"version": "7.5.5",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-					"integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-					"dev": true,
-					"requires": {
-						"tslib": "^2.1.0"
-					}
-				}
+				"tslib": "^2.1.0"
 			}
 		},
-		"walker": {
+		"node_modules/walker": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
 			"integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"makeerror": "1.0.12"
 			}
 		},
-		"watchpack": {
+		"node_modules/watchpack": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
 			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
 			},
-			"dependencies": {
-				"glob-to-regexp": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-					"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-					"dev": true
-				}
+			"engines": {
+				"node": ">=10.13.0"
 			}
 		},
-		"wbuf": {
+		"node_modules/watchpack/node_modules/glob-to-regexp": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+			"dev": true
+		},
+		"node_modules/wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
 			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"minimalistic-assert": "^1.0.0"
 			}
 		},
-		"web-streams-polyfill": {
+		"node_modules/web-streams-polyfill": {
 			"version": "3.2.1",
 			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
-			"integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="
+			"integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+			"engines": {
+				"node": ">= 8"
+			}
 		},
-		"webidl-conversions": {
+		"node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
 			"integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
 			"dev": true
 		},
-		"webpack": {
-			"version": "5.74.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-			"integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+		"node_modules/webpack": {
+			"version": "5.88.2",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
+			"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^0.0.51",
-				"@webassemblyjs/ast": "1.11.1",
-				"@webassemblyjs/wasm-edit": "1.11.1",
-				"@webassemblyjs/wasm-parser": "1.11.1",
+				"@types/estree": "^1.0.0",
+				"@webassemblyjs/ast": "^1.11.5",
+				"@webassemblyjs/wasm-edit": "^1.11.5",
+				"@webassemblyjs/wasm-parser": "^1.11.5",
 				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.7.6",
+				"acorn-import-assertions": "^1.9.0",
 				"browserslist": "^4.14.5",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.10.0",
-				"es-module-lexer": "^0.9.0",
+				"enhanced-resolve": "^5.15.0",
+				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
@@ -26142,119 +31015,137 @@
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
-				"schema-utils": "^3.1.0",
+				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.1.3",
+				"terser-webpack-plugin": "^5.3.7",
 				"watchpack": "^2.4.0",
 				"webpack-sources": "^3.2.3"
 			},
-			"dependencies": {
-				"acorn": {
-					"version": "8.8.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-					"integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-					"dev": true
-				},
-				"glob-to-regexp": {
-					"version": "0.4.1",
-					"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-					"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-					"dev": true
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
+			"bin": {
+				"webpack": "bin/webpack.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-bundle-analyzer": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz",
-			"integrity": "sha512-oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw==",
+		"node_modules/webpack-bundle-analyzer": {
+			"version": "4.8.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz",
+			"integrity": "sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==",
+			"dev": true,
+			"dependencies": {
+				"@discoveryjs/json-ext": "0.5.7",
+				"acorn": "^8.0.4",
+				"acorn-walk": "^8.0.0",
+				"chalk": "^4.1.0",
+				"commander": "^7.2.0",
+				"gzip-size": "^6.0.0",
+				"lodash": "^4.17.20",
+				"opener": "^1.5.2",
+				"sirv": "^1.0.7",
+				"ws": "^7.3.1"
+			},
+			"bin": {
+				"webpack-bundle-analyzer": "lib/bin/analyzer.js"
+			},
+			"engines": {
+				"node": ">= 10.13.0"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
+			"dependencies": {
+				"color-convert": "^2.0.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/ansi-styles?sponsor=1"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/chalk": {
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
+			"dependencies": {
+				"color-name": "~1.1.4"
+			},
+			"engines": {
+				"node": ">=7.0.0"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/color-name": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
-			"requires": {
-				"acorn": "^8.0.4",
-				"acorn-walk": "^8.0.0",
-				"chalk": "^4.1.0",
-				"commander": "^7.2.0",
-				"gzip-size": "^6.0.0",
-				"lodash": "^4.17.20",
-				"opener": "^1.5.2",
-				"sirv": "^1.0.7",
-				"ws": "^7.3.1"
-			},
 			"dependencies": {
-				"acorn-walk": {
-					"version": "8.2.0",
-					"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-					"integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-					"dev": true
-				},
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
-				"chalk": {
-					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
-					}
-				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^4.0.0"
-					}
-				}
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"webpack-cli": {
+		"node_modules/webpack-cli": {
 			"version": "4.10.0",
 			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
 			"integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@discoveryjs/json-ext": "^0.5.0",
 				"@webpack-cli/configtest": "^1.2.0",
 				"@webpack-cli/info": "^1.5.0",
@@ -26268,122 +31159,190 @@
 				"rechoir": "^0.7.0",
 				"webpack-merge": "^5.7.3"
 			},
-			"dependencies": {
-				"commander": {
-					"version": "7.2.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-					"dev": true
-				},
-				"cross-spawn": {
-					"version": "7.0.3",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
+			"bin": {
+				"webpack-cli": "bin/cli.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "4.x.x || 5.x.x"
+			},
+			"peerDependenciesMeta": {
+				"@webpack-cli/generators": {
+					"optional": true
 				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
+				"@webpack-cli/migrate": {
+					"optional": true
 				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
+				"webpack-bundle-analyzer": {
+					"optional": true
 				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-					"dev": true
+				"webpack-dev-server": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-dev-middleware": {
+		"node_modules/webpack-cli/node_modules/commander": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+			"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10"
+			}
+		},
+		"node_modules/webpack-cli/node_modules/cross-spawn": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"dev": true,
+			"dependencies": {
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/webpack-cli/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-cli/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+			"dev": true,
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-cli/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/webpack-dev-middleware": {
 			"version": "5.3.3",
 			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
 			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"colorette": "^2.0.10",
 				"memfs": "^3.4.3",
 				"mime-types": "^2.1.31",
 				"range-parser": "^1.2.1",
 				"schema-utils": "^4.0.0"
 			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv": {
+			"version": "8.12.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"dev": true,
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"mime-db": {
-					"version": "1.52.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-					"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.35",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-					"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-					"dev": true,
-					"requires": {
-						"mime-db": "1.52.0"
-					}
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
-				}
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-middleware/node_modules/mime-db": {
+			"version": "1.52.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+			"integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/mime-types": {
+			"version": "2.1.35",
+			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+			"integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+			"dev": true,
+			"dependencies": {
+				"mime-db": "1.52.0"
+			},
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
+		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.8.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"webpack-dev-server": {
+		"node_modules/webpack-dev-server": {
 			"version": "4.11.1",
 			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
 			"integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"@types/bonjour": "^3.5.9",
 				"@types/connect-history-api-fallback": "^1.3.5",
 				"@types/express": "^4.17.13",
@@ -26414,311 +31373,456 @@
 				"webpack-dev-middleware": "^5.3.1",
 				"ws": "^8.4.2"
 			},
+			"bin": {
+				"webpack-dev-server": "bin/webpack-dev-server.js"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			},
+			"peerDependencies": {
+				"webpack": "^4.37.0 || ^5.0.0"
+			},
+			"peerDependenciesMeta": {
+				"webpack-cli": {
+					"optional": true
+				}
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ajv": {
+			"version": "8.12.0",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"dev": true,
 			"dependencies": {
-				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"json-schema-traverse": "^1.0.0",
-						"require-from-string": "^2.0.2",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"ajv-keywords": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-					"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.3"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.2.10",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-					"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-					"dev": true
-				},
-				"json-schema-traverse": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-					"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-					"dev": true
-				},
-				"rimraf": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-					"dev": true,
-					"requires": {
-						"glob": "^7.1.3"
-					}
-				},
-				"schema-utils": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-					"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-					"dev": true,
-					"requires": {
-						"@types/json-schema": "^7.0.9",
-						"ajv": "^8.8.0",
-						"ajv-formats": "^2.1.1",
-						"ajv-keywords": "^5.0.0"
-					}
+				"fast-deep-equal": "^3.1.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2",
+				"uri-js": "^4.2.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dev": true,
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+			"dev": true
+		},
+		"node_modules/webpack-dev-server/node_modules/rimraf": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"dev": true,
+			"dependencies": {
+				"glob": "^7.1.3"
+			},
+			"bin": {
+				"rimraf": "bin.js"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/isaacs"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/schema-utils": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+			"integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+			"dev": true,
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.8.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.0.0"
+			},
+			"engines": {
+				"node": ">= 12.13.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/webpack"
+			}
+		},
+		"node_modules/webpack-dev-server/node_modules/ws": {
+			"version": "8.12.1",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz",
+			"integrity": "sha512-1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": ">=5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
 				},
-				"ws": {
-					"version": "8.10.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.10.0.tgz",
-					"integrity": "sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==",
-					"dev": true
+				"utf-8-validate": {
+					"optional": true
 				}
 			}
 		},
-		"webpack-livereload-plugin": {
+		"node_modules/webpack-livereload-plugin": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/webpack-livereload-plugin/-/webpack-livereload-plugin-3.0.2.tgz",
 			"integrity": "sha512-5JeZ2dgsvSNG+clrkD/u2sEiPcNk4qwCVZZmW8KpqKcNlkGv7IJjdVrq13+etAmMZYaCF1EGXdHkVFuLgP4zfw==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"anymatch": "^3.1.1",
 				"portfinder": "^1.0.17",
 				"schema-utils": ">1.0.0",
 				"tiny-lr": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 10.18.0"
+			},
+			"peerDependencies": {
+				"webpack": "^4.0.0 || ^5.0.0"
 			}
 		},
-		"webpack-merge": {
+		"node_modules/webpack-merge": {
 			"version": "5.8.0",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
 			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"clone-deep": "^4.0.1",
 				"wildcard": "^2.0.0"
 			},
+			"engines": {
+				"node": ">=10.0.0"
+			}
+		},
+		"node_modules/webpack-merge/node_modules/clone-deep": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+			"dev": true,
 			"dependencies": {
-				"clone-deep": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-					"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-					"dev": true,
-					"requires": {
-						"is-plain-object": "^2.0.4",
-						"kind-of": "^6.0.2",
-						"shallow-clone": "^3.0.0"
-					}
-				},
-				"kind-of": {
-					"version": "6.0.3",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-					"dev": true
-				},
-				"shallow-clone": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-					"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-					"dev": true,
-					"requires": {
-						"kind-of": "^6.0.2"
-					}
-				}
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/webpack-merge/node_modules/is-plain-object": {
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+			"dev": true,
+			"dependencies": {
+				"isobject": "^3.0.1"
+			},
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/webpack-merge/node_modules/kind-of": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/webpack-merge/node_modules/shallow-clone": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+			"dev": true,
+			"dependencies": {
+				"kind-of": "^6.0.2"
+			},
+			"engines": {
+				"node": ">=8"
 			}
 		},
-		"webpack-sources": {
+		"node_modules/webpack-sources": {
 			"version": "3.2.3",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
 			"integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+			"dev": true,
+			"engines": {
+				"node": ">=10.13.0"
+			}
+		},
+		"node_modules/webpack/node_modules/glob-to-regexp": {
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+			"integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
 			"dev": true
 		},
-		"websocket-driver": {
+		"node_modules/websocket-driver": {
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
 			"integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"http-parser-js": ">=0.5.1",
 				"safe-buffer": ">=5.1.0",
 				"websocket-extensions": ">=0.1.1"
+			},
+			"engines": {
+				"node": ">=0.8.0"
 			}
 		},
-		"websocket-extensions": {
+		"node_modules/websocket-extensions": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
 			"integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=0.8.0"
+			}
 		},
-		"whatwg-encoding": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+		"node_modules/whatwg-encoding": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+			"integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
 			"dev": true,
-			"requires": {
-				"iconv-lite": "0.4.24"
-			},
 			"dependencies": {
-				"iconv-lite": {
-					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-					"dev": true,
-					"requires": {
-						"safer-buffer": ">= 2.1.2 < 3"
-					}
-				}
+				"iconv-lite": "0.6.3"
+			},
+			"engines": {
+				"node": ">=12"
 			}
 		},
-		"whatwg-fetch": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-			"integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
+		"node_modules/whatwg-fetch": {
+			"version": "3.6.17",
+			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.17.tgz",
+			"integrity": "sha512-c4ghIvG6th0eudYwKZY5keb81wtFz9/WeAHAoy8+r18kcWlitUIrmGFQ2rWEl4UCKUilD3zCLHOIPheHx5ypRQ=="
 		},
-		"whatwg-mimetype": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
+		"node_modules/whatwg-mimetype": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+			"integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
 		},
-		"whatwg-url": {
+		"node_modules/whatwg-url": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
 			"integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"tr46": "~0.0.3",
 				"webidl-conversions": "^3.0.0"
 			}
 		},
-		"which": {
+		"node_modules/which": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
 			}
 		},
-		"which-boxed-primitive": {
+		"node_modules/which-boxed-primitive": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
 				"is-number-object": "^1.0.4",
 				"is-string": "^1.0.5",
 				"is-symbol": "^1.0.3"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"which-module": {
+		"node_modules/which-module": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
 			"integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
 		},
-		"wildcard": {
+		"node_modules/which-typed-array": {
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+			"integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+			"dev": true,
+			"dependencies": {
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/wicg-inert": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.2.tgz",
+			"integrity": "sha512-Ba9tGNYxXwaqKEi9sJJvPMKuo063umUPsHN0JJsjrs2j8KDSzkWLMZGZ+MH1Jf1Fq4OWZ5HsESJID6nRza2ang=="
+		},
+		"node_modules/wildcard": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
 			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
 			"dev": true
 		},
-		"word-wrap": {
-			"version": "1.2.3",
-			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true
-		},
-		"wrap-ansi": {
+		"node_modules/wrap-ansi": {
 			"version": "5.1.0",
 			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
 			"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-			"requires": {
+			"dependencies": {
 				"ansi-styles": "^3.2.0",
 				"string-width": "^3.0.0",
 				"strip-ansi": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
-		"wrappy": {
+		"node_modules/wrappy": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 			"dev": true
 		},
-		"write-file-atomic": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-			"integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+		"node_modules/write-file-atomic": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
+			"integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"imurmurhash": "^0.1.4",
-				"is-typedarray": "^1.0.0",
-				"signal-exit": "^3.0.2",
-				"typedarray-to-buffer": "^3.1.5"
+				"signal-exit": "^3.0.7"
+			},
+			"engines": {
+				"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
 			}
 		},
-		"ws": {
+		"node_modules/ws": {
 			"version": "7.4.6",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
 			"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=8.3.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
 		},
-		"xml-name-validator": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
+		"node_modules/xml-name-validator": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+			"integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
+			"dev": true,
+			"engines": {
+				"node": ">=12"
+			}
 		},
-		"xmlbuilder": {
+		"node_modules/xmlbuilder": {
 			"version": "8.2.2",
 			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
 			"integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=4.0"
+			}
 		},
-		"xmlchars": {
+		"node_modules/xmlchars": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
 			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
 			"dev": true
 		},
-		"xmlrpc": {
+		"node_modules/xmlrpc": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/xmlrpc/-/xmlrpc-1.3.2.tgz",
 			"integrity": "sha1-JrLqNHhI0Ciqx+dRS1NRl23j6D0=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"sax": "1.2.x",
 				"xmlbuilder": "8.2.x"
+			},
+			"engines": {
+				"node": ">=0.8",
+				"npm": ">=1.0.0"
 			}
 		},
-		"xtend": {
+		"node_modules/xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
 			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
 			"dev": true,
-			"optional": true
+			"optional": true,
+			"engines": {
+				"node": ">=0.4"
+			}
 		},
-		"y18n": {
+		"node_modules/y18n": {
 			"version": "4.0.3",
 			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
 			"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
 		},
-		"yallist": {
+		"node_modules/yallist": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
 			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
 		},
-		"yaml": {
+		"node_modules/yaml": {
 			"version": "1.10.2",
 			"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+			"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+			"engines": {
+				"node": ">= 6"
+			}
 		},
-		"yargs": {
+		"node_modules/yargs": {
 			"version": "14.2.3",
 			"resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
 			"integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
-			"requires": {
+			"dependencies": {
 				"cliui": "^5.0.0",
 				"decamelize": "^1.2.0",
 				"find-up": "^3.0.0",
@@ -26732,30 +31836,36 @@
 				"yargs-parser": "^15.0.1"
 			}
 		},
-		"yargs-parser": {
+		"node_modules/yargs-parser": {
 			"version": "15.0.3",
 			"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz",
 			"integrity": "sha512-/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==",
-			"requires": {
+			"dependencies": {
 				"camelcase": "^5.0.0",
 				"decamelize": "^1.2.0"
 			}
 		},
-		"yauzl": {
+		"node_modules/yauzl": {
 			"version": "2.10.0",
 			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
 			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
 			"dev": true,
-			"requires": {
+			"dependencies": {
 				"buffer-crc32": "~0.2.3",
 				"fd-slicer": "~1.1.0"
 			}
 		},
-		"yocto-queue": {
+		"node_modules/yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-			"dev": true
+			"dev": true,
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		}
 	}
 }
diff --git a/package.json b/package.json
index 49f37be39eef9..1112560e7ffe9 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "WordPress",
-	"version": "6.2.0",
+	"version": "6.4.0",
 	"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
 	"repository": {
 		"type": "svn",
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"engines": {
-		"node": ">=14.15.0",
-		"npm": ">=6.14.8 <7"
+		"node": ">=16.19.1",
+		"npm": ">=8.19.3 <9"
 	},
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -24,137 +24,148 @@
 		"last 2 Opera versions"
 	],
 	"devDependencies": {
+		"@lodder/grunt-postcss": "^3.1.1",
 		"@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
-		"@wordpress/babel-preset-default": "7.1.1",
-		"@wordpress/dependency-extraction-webpack-plugin": "4.0.2",
-		"@wordpress/e2e-test-utils": "8.1.1",
-		"@wordpress/scripts": "24.1.2",
-		"autoprefixer": "^9.8.8",
-		"chalk": "5.1.0",
+		"@wordpress/babel-preset-default": "7.19.1",
+		"@wordpress/dependency-extraction-webpack-plugin": "4.18.1",
+		"@wordpress/e2e-test-utils": "10.6.4",
+		"@wordpress/scripts": "26.6.3",
+		"autoprefixer": "10.4.14",
+		"chalk": "5.3.0",
 		"check-node-version": "4.2.1",
 		"copy-webpack-plugin": "11.0.0",
-		"cssnano": "4.1.11",
-		"dotenv": "16.0.3",
-		"dotenv-expand": "9.0.0",
-		"grunt": "~1.5.3",
+		"cssnano": "6.0.1",
+		"dotenv": "16.3.1",
+		"dotenv-expand": "10.0.0",
+		"grunt": "~1.6.1",
 		"grunt-banner": "^0.6.0",
 		"grunt-contrib-clean": "~2.0.1",
 		"grunt-contrib-concat": "2.1.0",
 		"grunt-contrib-copy": "~1.0.0",
-		"grunt-contrib-cssmin": "~4.0.0",
+		"grunt-contrib-cssmin": "~5.0.0",
 		"grunt-contrib-imagemin": "~4.0.0",
 		"grunt-contrib-jshint": "3.2.0",
-		"grunt-contrib-qunit": "~6.2.0",
+		"grunt-contrib-qunit": "~7.0.1",
 		"grunt-contrib-uglify": "~5.2.2",
 		"grunt-contrib-watch": "~1.1.0",
 		"grunt-file-append": "0.0.7",
 		"grunt-jsdoc": "2.4.1",
-		"grunt-jsvalidate": "~0.2.2",
 		"grunt-legacy-util": "^2.0.1",
 		"grunt-patch-wordpress": "~3.0.0",
-		"grunt-postcss": "~0.9.0",
 		"grunt-replace-lts": "~1.1.0",
 		"grunt-rtlcss": "~2.0.2",
 		"grunt-sass": "~3.1.0",
-		"grunt-webpack": "5.0.0",
+		"grunt-webpack": "6.0.0",
 		"ink-docstrap": "1.3.2",
 		"install-changed": "1.1.0",
-		"jest-image-snapshot": "3.0.1",
+		"jest-image-snapshot": "^6.2.0",
 		"matchdep": "~2.0.0",
-		"prettier": "npm:wp-prettier@2.0.5",
-		"qunit": "~2.19.1",
+		"postcss": "8.4.27",
+		"prettier": "npm:wp-prettier@2.6.2",
+		"qunit": "~2.19.4",
 		"react-refresh": "0.10.0",
-		"sass": "^1.55.0",
-		"sinon": "~14.0.1",
-		"sinon-test": "~3.1.4",
-		"source-map-loader": "4.0.0",
-		"terser-webpack-plugin": "5.3.6",
-		"uglify-js": "^3.17.3",
+		"sass": "1.65.1",
+		"sinon": "15.2.0",
+		"sinon-test": "~3.1.5",
+		"source-map-loader": "4.0.1",
+		"terser-webpack-plugin": "5.3.9",
+		"uglify-js": "^3.17.4",
 		"uuid": "9.0.0",
-		"wait-on": "6.0.1",
-		"webpack": "5.74.0",
+		"wait-on": "7.0.1",
+		"webpack": "5.88.2",
 		"webpack-livereload-plugin": "3.0.2"
 	},
 	"dependencies": {
-		"@wordpress/a11y": "3.17.1",
-		"@wordpress/annotations": "2.17.3",
-		"@wordpress/api-fetch": "6.14.1",
-		"@wordpress/autop": "3.17.1",
-		"@wordpress/blob": "3.17.1",
-		"@wordpress/block-directory": "3.15.10",
-		"@wordpress/block-editor": "10.0.9",
-		"@wordpress/block-library": "7.14.10",
-		"@wordpress/block-serialization-default-parser": "4.17.1",
-		"@wordpress/blocks": "11.16.4",
-		"@wordpress/components": "21.0.6",
-		"@wordpress/compose": "5.15.2",
-		"@wordpress/core-data": "5.0.4",
-		"@wordpress/customize-widgets": "3.14.10",
-		"@wordpress/data": "7.1.3",
-		"@wordpress/data-controls": "2.17.3",
-		"@wordpress/date": "4.17.1",
-		"@wordpress/deprecated": "3.17.1",
-		"@wordpress/dom": "3.17.2",
-		"@wordpress/dom-ready": "3.17.1",
-		"@wordpress/edit-post": "6.14.10",
-		"@wordpress/edit-site": "4.14.12",
-		"@wordpress/edit-widgets": "4.14.10",
-		"@wordpress/editor": "12.16.9",
-		"@wordpress/element": "4.15.1",
-		"@wordpress/escape-html": "2.17.1",
-		"@wordpress/format-library": "3.15.9",
-		"@wordpress/hooks": "3.17.1",
-		"@wordpress/html-entities": "3.17.1",
-		"@wordpress/i18n": "4.17.1",
-		"@wordpress/icons": "9.8.1",
-		"@wordpress/interface": "4.16.6",
-		"@wordpress/is-shallow-equal": "4.17.1",
-		"@wordpress/keyboard-shortcuts": "3.15.3",
-		"@wordpress/keycodes": "3.17.1",
-		"@wordpress/list-reusable-blocks": "3.15.6",
-		"@wordpress/media-utils": "4.8.1",
-		"@wordpress/notices": "3.17.3",
-		"@wordpress/nux": "5.15.6",
-		"@wordpress/plugins": "4.15.2",
-		"@wordpress/preferences": "2.9.6",
-		"@wordpress/preferences-persistence": "1.9.1",
-		"@wordpress/primitives": "3.15.1",
-		"@wordpress/priority-queue": "2.17.2",
-		"@wordpress/redux-routine": "4.17.1",
-		"@wordpress/reusable-blocks": "3.15.9",
-		"@wordpress/rich-text": "5.15.3",
-		"@wordpress/server-side-render": "3.15.6",
-		"@wordpress/shortcode": "3.17.1",
-		"@wordpress/style-engine": "1.0.3",
-		"@wordpress/token-list": "2.17.1",
-		"@wordpress/url": "3.18.1",
-		"@wordpress/viewport": "4.15.3",
-		"@wordpress/warning": "2.17.1",
-		"@wordpress/widgets": "2.15.9",
-		"@wordpress/wordcount": "3.17.1",
-		"backbone": "1.4.1",
+		"@emotion/is-prop-valid": "0.8.8",
+		"@emotion/memoize": "0.7.4",
+		"@wordpress/a11y": "3.35.1",
+		"@wordpress/annotations": "2.35.7",
+		"@wordpress/api-fetch": "6.32.1",
+		"@wordpress/autop": "3.35.1",
+		"@wordpress/blob": "3.35.1",
+		"@wordpress/block-directory": "4.12.16",
+		"@wordpress/block-editor": "12.3.13",
+		"@wordpress/block-library": "8.12.16",
+		"@wordpress/block-serialization-default-parser": "4.35.1",
+		"@wordpress/blocks": "12.12.7",
+		"@wordpress/commands": "0.6.11",
+		"@wordpress/components": "25.1.10",
+		"@wordpress/compose": "6.12.2",
+		"@wordpress/core-commands": "0.4.14",
+		"@wordpress/core-data": "6.12.14",
+		"@wordpress/customize-widgets": "4.12.16",
+		"@wordpress/data": "9.5.5",
+		"@wordpress/data-controls": "3.4.5",
+		"@wordpress/date": "4.35.1",
+		"@wordpress/deprecated": "3.35.1",
+		"@wordpress/dom": "3.35.1",
+		"@wordpress/dom-ready": "3.35.1",
+		"@wordpress/edit-post": "7.12.16",
+		"@wordpress/edit-site": "5.12.16",
+		"@wordpress/edit-widgets": "5.12.16",
+		"@wordpress/editor": "13.12.14",
+		"@wordpress/element": "5.12.1",
+		"@wordpress/escape-html": "2.35.1",
+		"@wordpress/format-library": "4.12.13",
+		"@wordpress/hooks": "3.35.1",
+		"@wordpress/html-entities": "3.35.1",
+		"@wordpress/i18n": "4.35.1",
+		"@wordpress/icons": "9.26.2",
+		"@wordpress/interface": "5.12.10",
+		"@wordpress/is-shallow-equal": "4.35.1",
+		"@wordpress/keyboard-shortcuts": "4.12.5",
+		"@wordpress/keycodes": "3.35.1",
+		"@wordpress/list-reusable-blocks": "4.12.10",
+		"@wordpress/media-utils": "4.26.1",
+		"@wordpress/notices": "4.3.5",
+		"@wordpress/nux": "7.1.3",
+		"@wordpress/plugins": "6.3.10",
+		"@wordpress/preferences": "3.12.10",
+		"@wordpress/preferences-persistence": "1.27.1",
+		"@wordpress/primitives": "3.33.1",
+		"@wordpress/priority-queue": "2.35.1",
+		"@wordpress/private-apis": "0.17.2",
+		"@wordpress/redux-routine": "4.35.1",
+		"@wordpress/reusable-blocks": "4.12.14",
+		"@wordpress/rich-text": "6.12.7",
+		"@wordpress/router": "0.4.2",
+		"@wordpress/server-side-render": "4.12.12",
+		"@wordpress/shortcode": "3.35.1",
+		"@wordpress/style-engine": "1.18.1",
+		"@wordpress/token-list": "2.35.1",
+		"@wordpress/url": "3.36.1",
+		"@wordpress/viewport": "5.12.5",
+		"@wordpress/warning": "2.35.1",
+		"@wordpress/widgets": "3.12.14",
+		"@wordpress/wordcount": "3.35.1",
+		"backbone": "1.5.0",
 		"clipboard": "2.0.11",
 		"core-js-url-browser": "3.6.4",
-		"element-closest": "^2.0.2",
+		"element-closest": "^3.0.2",
 		"formdata-polyfill": "4.0.10",
+		"framer-motion": "10.11.6",
 		"hoverintent": "2.2.1",
-		"imagesloaded": "4.1.4",
-		"jquery": "3.6.1",
+		"imagesloaded": "5.0.0",
+		"is-plain-object": "5.0.0",
+		"jquery": "3.7.0",
 		"jquery-color": "2.2.0",
 		"jquery-form": "4.3.0",
 		"jquery-hoverintent": "1.10.2",
-		"json2php": "^0.0.5",
+		"json2php": "^0.0.7",
 		"lodash": "4.17.21",
 		"masonry-layout": "4.2.2",
+		"memize": "2.1.0",
 		"moment": "2.29.4",
 		"objectFitPolyfill": "2.3.5",
-		"polyfill-library": "4.4.0",
-		"react": "17.0.2",
-		"react-dom": "17.0.2",
-		"regenerator-runtime": "0.13.9",
-		"twemoji": "14.0.2",
+		"path-to-regexp": "6.2.1",
+		"polyfill-library": "4.7.0",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
+		"regenerator-runtime": "0.13.11",
+		"tslib": "2.6.0",
 		"underscore": "1.13.6",
-		"whatwg-fetch": "3.6.2"
+		"whatwg-fetch": "3.6.17",
+		"wicg-inert": "3.1.2"
 	},
 	"scripts": {
 		"build": "grunt build",
@@ -174,6 +185,7 @@
 		"env:cli": "node ./tools/local-env/scripts/docker.js run cli",
 		"env:logs": "node ./tools/local-env/scripts/docker.js logs",
 		"env:pull": "node ./tools/local-env/scripts/docker.js pull",
+		"test:performance": "node ./tests/performance/run-tests.js",
 		"test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run php ./vendor/bin/phpunit",
 		"test:e2e": "node ./tests/e2e/run-tests.js",
 		"test:visual": "node ./tests/visual-regression/run-tests.js",
diff --git a/phpcompat.xml.dist b/phpcompat.xml.dist
index d58fee2ef2286..4a60e03161055 100644
--- a/phpcompat.xml.dist
+++ b/phpcompat.xml.dist
@@ -4,8 +4,8 @@
 
 	<rule ref="PHPCompatibilityWP"/>
 
-	<!-- WordPress Core currently supports PHP 5.6+. -->
-	<config name="testVersion" value="5.6-"/>
+	<!-- WordPress Core currently supports PHP 7.0+. -->
+	<config name="testVersion" value="7.0-"/>
 
 	<!-- Only scan PHP files. -->
 	<arg name="extensions" value="php"/>
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 453ef5c794745..4e48c8c1c749c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -68,7 +68,9 @@
 
 				<!-- From DOMDocument. -->
 				<element value="childNodes"/>
+				<element value="firstChild"/>
 				<element value="formatOutput"/>
+				<element value="lastChild"/>
 				<element value="nodeName"/>
 				<element value="nodeType"/>
 				<element value="parentNode"/>
@@ -116,14 +118,14 @@
 	<exclude-pattern>/src/wp-includes/class-requests\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/class-simplepie\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/class-snoopy\.php</exclude-pattern>
-	<exclude-pattern>/src/wp-includes/class-wp-block-parser\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/deprecated\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/ms-deprecated\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/pluggable-deprecated\.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/rss\.php</exclude-pattern>
 
 	<exclude-pattern>/src/wp-includes/assets/*</exclude-pattern>
-	<exclude-pattern>/src/wp-includes/blocks/*</exclude-pattern>
+	<exclude-pattern>/src/wp-includes/blocks/*/*.asset.php</exclude-pattern>
+	<exclude-pattern>/src/wp-includes/blocks/blocks-json.php</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/ID3/*</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/IXR/*</exclude-pattern>
 	<exclude-pattern>/src/wp-includes/js/*</exclude-pattern>
@@ -185,6 +187,18 @@
 		<exclude-pattern>/tests/phpunit/tests/multisite/site\.php</exclude-pattern>
 	</rule>
 
+	<!-- Allow non-snake-case vars & properties for block-related classes. -->
+	<rule ref="WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase">
+		<exclude-pattern>/src/wp-includes/class-wp-block-parser\.php</exclude-pattern>
+		<exclude-pattern>/src/wp-includes/class-wp-block-parser-block\.php</exclude-pattern>
+	</rule>
+	<rule ref="WordPress.NamingConventions.ValidVariableName.PropertyNotSnakeCase">
+		<exclude-pattern>/src/wp-includes/class-wp-block-parser-block\.php</exclude-pattern>
+	</rule>
+	<rule ref="WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase">
+		<exclude-pattern>/src/wp-includes/class-wp-block-parser-block\.php</exclude-pattern>
+	</rule>
+
 	<!-- Allow the I18n functions file for issues identified by the I18n sniff
 		 (such as calling the low-level translate() function). -->
 	<rule ref="WordPress.WP.I18n">
diff --git a/src/index.php b/src/index.php
index 9762828dd417c..91c0517857339 100644
--- a/src/index.php
+++ b/src/index.php
@@ -21,16 +21,19 @@
 }
 
 define( 'WPINC', 'wp-includes' );
+require_once ABSPATH . WPINC . '/version.php';
+require_once ABSPATH . WPINC . '/compat.php';
 require_once ABSPATH . WPINC . '/load.php';
 
+// Check for the required PHP version and for the MySQL extension or a database drop-in.
+wp_check_php_mysql_versions();
+
 // Standardize $_SERVER variables across setups.
 wp_fix_server_vars();
 
-require_once ABSPATH . WPINC . '/functions.php';
 define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
-require_once ABSPATH . WPINC . '/version.php';
+require_once ABSPATH . WPINC . '/functions.php';
 
-wp_check_php_mysql_versions();
 wp_load_translations_early();
 
 // Die with an error message.
diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js
index 41a53eb9a2869..f85a9378caf06 100644
--- a/src/js/_enqueues/admin/common.js
+++ b/src/js/_enqueues/admin/common.js
@@ -1407,8 +1407,8 @@ $( function() {
 	 * @return {void}
  	 */
 	$('#contextual-help-link, #show-settings-link').on( 'focus.scroll-into-view', function(e){
-		if ( e.target.scrollIntoView )
-			e.target.scrollIntoView(false);
+		if ( e.target.scrollIntoViewIfNeeded )
+			e.target.scrollIntoViewIfNeeded(false);
 	});
 
 	/**
@@ -1702,6 +1702,25 @@ $( function() {
 				}
 			} );
 
+			// Close sidebar when focus moves outside of toggle and sidebar.
+			$( '#wp-admin-bar-menu-toggle, #adminmenumain' ).on( 'focusout', function() {
+				var focusIsInToggle, focusIsInSidebar;
+
+				if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) || ! document.hasFocus() ) {
+					return;
+				}
+				// A brief delay is required to allow focus to switch to another element.
+				setTimeout( function() {
+					focusIsInToggle  = $.contains( $( '#wp-admin-bar-menu-toggle' )[0], $( ':focus' )[0] );
+					focusIsInSidebar = $.contains( $( '#adminmenumain' )[0], $( ':focus' )[0] );
+
+					if ( ! focusIsInToggle && ! focusIsInSidebar ) {
+						$( '#wp-admin-bar-menu-toggle' ).trigger( 'click.wp-responsive' );
+					}
+				}, 10 );
+			} );
+
+
 			// Add menu events.
 			$adminmenu.on( 'click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
 				if ( ! $adminmenu.data('wp-responsive') ) {
@@ -1709,6 +1728,7 @@ $( function() {
 				}
 
 				$( this ).parent( 'li' ).toggleClass( 'selected' );
+				$( this ).trigger( 'focus' );
 				event.preventDefault();
 			});
 
diff --git a/src/js/_enqueues/admin/inline-edit-post.js b/src/js/_enqueues/admin/inline-edit-post.js
index 640d747b41c0a..db06072c4a836 100644
--- a/src/js/_enqueues/admin/inline-edit-post.js
+++ b/src/js/_enqueues/admin/inline-edit-post.js
@@ -305,7 +305,7 @@ window.wp = window.wp || {};
 		if ( !$(':input[name="post_author"] option[value="' + $('.post_author', rowData).text() + '"]', editRow).val() ) {
 
 			// The post author no longer has edit capabilities, so we need to add them to the list of authors.
-			$(':input[name="post_author"]', editRow).prepend('<option value="' + $('.post_author', rowData).text() + '">' + $('#' + t.type + '-' + id + ' .author').text() + '</option>');
+			$(':input[name="post_author"]', editRow).prepend('<option value="' + $('.post_author', rowData).text() + '">' + $('#post-' + id + ' .author').text() + '</option>');
 		}
 		if ( $( ':input[name="post_author"] option', editRow ).length === 1 ) {
 			$('label.inline-edit-author', editRow).hide();
@@ -376,9 +376,14 @@ window.wp = window.wp || {};
 		});
 
 		// Handle the post status.
+		var post_date_string = $(':input[name="aa"]').val() + '-' + $(':input[name="mm"]').val() + '-' + $(':input[name="jj"]').val();
+		post_date_string += ' ' + $(':input[name="hh"]').val() + ':' + $(':input[name="mn"]').val() + ':' + $(':input[name="ss"]').val();
+		var post_date = new Date( post_date_string );
 		status = $('._status', rowData).text();
-		if ( 'future' !== status ) {
+		if ( 'future' !== status && Date.now() > post_date ) {
 			$('select[name="_status"] option[value="future"]', editRow).remove();
+		} else {
+			$('select[name="_status"] option[value="publish"]', editRow).remove();
 		}
 
 		pw = $( '.inline-edit-password-input' ).prop( 'disabled', false );
@@ -444,6 +449,13 @@ window.wp = window.wp || {};
 		};
 
 		fields = $('#edit-'+id).find(':input').serialize();
+
+		var status = $(':input[name="_status"]').val();
+
+		if ( [ 'draft', 'pending', 'auto-draft' ].includes( status ) ) {
+			params.edit_date = 'false';
+		}
+
 		params = fields + '&' + $.param(params);
 
 		// Make Ajax request.
diff --git a/src/js/_enqueues/admin/password-toggle.js b/src/js/_enqueues/admin/password-toggle.js
new file mode 100644
index 0000000000000..5bfaa3b122c01
--- /dev/null
+++ b/src/js/_enqueues/admin/password-toggle.js
@@ -0,0 +1,40 @@
+/**
+ * Adds functionality for password visibility buttons to toggle between text and password input types.
+ *
+ * @since 6.3.0
+ * @output wp-admin/js/password-toggle.js
+ */
+
+( function () {
+	var toggleElements, status, input, icon, label, __ = wp.i18n.__;
+
+	toggleElements = document.querySelectorAll( '.pwd-toggle' );
+
+	toggleElements.forEach( function (toggle) {
+		toggle.classList.remove( 'hide-if-no-js' );
+		toggle.addEventListener( 'click', togglePassword );
+	} );
+
+	function togglePassword() {
+		status = this.getAttribute( 'data-toggle' );
+		input = this.parentElement.children.namedItem( 'pwd' );
+		icon = this.getElementsByClassName( 'dashicons' )[ 0 ];
+		label = this.getElementsByClassName( 'text' )[ 0 ];
+
+		if ( 0 === parseInt( status, 10 ) ) {
+			this.setAttribute( 'data-toggle', 1 );
+			this.setAttribute( 'aria-label', __( 'Hide password' ) );
+			input.setAttribute( 'type', 'text' );
+			label.innerHTML = __( 'Hide' );
+			icon.classList.remove( 'dashicons-visibility' );
+			icon.classList.add( 'dashicons-hidden' );
+		} else {
+			this.setAttribute( 'data-toggle', 0 );
+			this.setAttribute( 'aria-label', __( 'Show password' ) );
+			input.setAttribute( 'type', 'password' );
+			label.innerHTML = __( 'Show' );
+			icon.classList.remove( 'dashicons-hidden' );
+			icon.classList.add( 'dashicons-visibility' );
+		}
+	}
+} )();
diff --git a/src/js/_enqueues/admin/post.js b/src/js/_enqueues/admin/post.js
index c9b002a65aa17..6b96ad25f2af1 100644
--- a/src/js/_enqueues/admin/post.js
+++ b/src/js/_enqueues/admin/post.js
@@ -789,7 +789,7 @@ jQuery( function($) {
 			}
 
 			// Determine what the publish should be depending on the date and post status.
-			if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
+			if ( attemptedDate > currentDate ) {
 				publishOn = __( 'Schedule for:' );
 				$('#publish').val( _x( 'Schedule', 'post action/button label' ) );
 			} else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
diff --git a/src/js/_enqueues/admin/postbox.js b/src/js/_enqueues/admin/postbox.js
index 4f521acd93ba3..c80866f3a23bc 100644
--- a/src/js/_enqueues/admin/postbox.js
+++ b/src/js/_enqueues/admin/postbox.js
@@ -14,7 +14,7 @@
 		__ = wp.i18n.__;
 
 	/**
-	 * This object contains all function to handle the behaviour of the post boxes. The post boxes are the boxes you see
+	 * This object contains all function to handle the behavior of the post boxes. The post boxes are the boxes you see
 	 * around the content on the edit page.
 	 *
 	 * @since 2.7.0
@@ -347,7 +347,7 @@
 		},
 
 		/**
-		 * Initializes all the postboxes, mainly their sortable behaviour.
+		 * Initializes all the postboxes, mainly their sortable behavior.
 		 *
 		 * @since 2.7.0
 		 *
diff --git a/src/js/_enqueues/admin/user-profile.js b/src/js/_enqueues/admin/user-profile.js
index f83c7b89080f1..466d115fc2129 100644
--- a/src/js/_enqueues/admin/user-profile.js
+++ b/src/js/_enqueues/admin/user-profile.js
@@ -52,7 +52,9 @@
 		$( '#pw-weak-text-label' ).text( __( 'Confirm use of weak password' ) );
 
 		// Focus the password field.
-		$( $pass1 ).trigger( 'focus' );
+		if ( 'mailserver_pass' !== $pass1.prop('id' ) ) {
+			$( $pass1 ).trigger( 'focus' );
+		}
 	}
 
 	function bindPass1() {
@@ -171,7 +173,7 @@
 		var $generateButton,
 			$cancelButton;
 
-		$pass1Row = $( '.user-pass1-wrap, .user-pass-wrap, .reset-pass-submit' );
+		$pass1Row = $( '.user-pass1-wrap, .user-pass-wrap, .mailserver-pass-wrap, .reset-pass-submit' );
 
 		// Hide the confirm password field when JavaScript support is enabled.
 		$('.user-pass2-wrap').hide();
@@ -188,7 +190,7 @@
 			$submitButtons.prop( 'disabled', ! $weakCheckbox.prop( 'checked' ) );
 		} );
 
-		$pass1 = $('#pass1');
+		$pass1 = $('#pass1, #mailserver_pass');
 		if ( $pass1.length ) {
 			bindPass1();
 		} else {
@@ -314,23 +316,27 @@
 	}
 
 	function showOrHideWeakPasswordCheckbox() {
-		var passStrength = $('#pass-strength-result')[0];
+		var passStrengthResult = $('#pass-strength-result');
 
-		if ( passStrength.className ) {
-			$pass1.addClass( passStrength.className );
-			if ( $( passStrength ).is( '.short, .bad' ) ) {
-				if ( ! $weakCheckbox.prop( 'checked' ) ) {
-					$submitButtons.prop( 'disabled', true );
-				}
-				$weakRow.show();
-			} else {
-				if ( $( passStrength ).is( '.empty' ) ) {
-					$submitButtons.prop( 'disabled', true );
-					$weakCheckbox.prop( 'checked', false );
+		if ( passStrengthResult.length ) {
+			var passStrength = passStrengthResult[0];
+
+			if ( passStrength.className ) {
+				$pass1.addClass( passStrength.className );
+				if ( $( passStrength ).is( '.short, .bad' ) ) {
+					if ( ! $weakCheckbox.prop( 'checked' ) ) {
+						$submitButtons.prop( 'disabled', true );
+					}
+					$weakRow.show();
 				} else {
-					$submitButtons.prop( 'disabled', false );
+					if ( $( passStrength ).is( '.empty' ) ) {
+						$submitButtons.prop( 'disabled', true );
+						$weakCheckbox.prop( 'checked', false );
+					} else {
+						$submitButtons.prop( 'disabled', false );
+					}
+					$weakRow.hide();
 				}
-				$weakRow.hide();
 			}
 		}
 	}
diff --git a/src/js/_enqueues/lib/comment-reply.js b/src/js/_enqueues/lib/comment-reply.js
index 5d20672058a03..59cf5a1aa0551 100644
--- a/src/js/_enqueues/lib/comment-reply.js
+++ b/src/js/_enqueues/lib/comment-reply.js
@@ -59,7 +59,7 @@ window.addComment = ( function( window ) {
 	 * @since 5.1.1
 	 */
 	function ready() {
-		// Initialise the events.
+		// Initialize the events.
 		init();
 
 		// Set up a MutationObserver to check for comments loaded late.
diff --git a/src/js/_enqueues/lib/dialog.js b/src/js/_enqueues/lib/dialog.js
index 327d8768b8739..0da56f53ac18e 100644
--- a/src/js/_enqueues/lib/dialog.js
+++ b/src/js/_enqueues/lib/dialog.js
@@ -17,7 +17,7 @@
 			this._super();
 
 			// WebKit leaves focus in the TinyMCE editor unless we shift focus.
-			this.element.focus();
+			this.element.trigger('focus');
 			this._trigger('refresh');
 		}
 	});
diff --git a/src/js/_enqueues/lib/emoji-loader.js b/src/js/_enqueues/lib/emoji-loader.js
index 0b5f3c7749552..3d2a161f1a25c 100644
--- a/src/js/_enqueues/lib/emoji-loader.js
+++ b/src/js/_enqueues/lib/emoji-loader.js
@@ -2,82 +2,195 @@
  * @output wp-includes/js/wp-emoji-loader.js
  */
 
-( function( window, document, settings ) {
-	var src, ready, ii, tests;
+/**
+ * Emoji Settings as exported in PHP via _print_emoji_detection_script().
+ * @typedef WPEmojiSettings
+ * @type {object}
+ * @property {?object} source
+ * @property {?string} source.concatemoji
+ * @property {?string} source.twemoji
+ * @property {?string} source.wpemoji
+ * @property {?boolean} DOMReady
+ * @property {?Function} readyCallback
+ */
+
+/**
+ * Support tests.
+ * @typedef SupportTests
+ * @type {object}
+ * @property {?boolean} flag
+ * @property {?boolean} emoji
+ */
+
+/**
+ * IIFE to detect emoji support and load Twemoji if needed.
+ *
+ * @param {Window} window
+ * @param {Document} document
+ * @param {WPEmojiSettings} settings
+ */
+( function wpEmojiLoader( window, document, settings ) {
+	if ( typeof Promise === 'undefined' ) {
+		return;
+	}
+
+	var sessionStorageKey = 'wpEmojiSettingsSupports';
+	var tests = [ 'flag', 'emoji' ];
+
+	/**
+	 * Checks whether the browser supports offloading to a Worker.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @private
+	 *
+	 * @returns {boolean}
+	 */
+	function supportsWorkerOffloading() {
+		return (
+			typeof Worker !== 'undefined' &&
+			typeof OffscreenCanvas !== 'undefined' &&
+			typeof URL !== 'undefined' &&
+			URL.createObjectURL &&
+			typeof Blob !== 'undefined'
+		);
+	}
+
+	/**
+	 * @typedef SessionSupportTests
+	 * @type {object}
+	 * @property {number} timestamp
+	 * @property {SupportTests} supportTests
+	 */
+
+	/**
+	 * Get support tests from session.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @private
+	 *
+	 * @returns {?SupportTests} Support tests, or null if not set or older than 1 week.
+	 */
+	function getSessionSupportTests() {
+		try {
+			/** @type {SessionSupportTests} */
+			var item = JSON.parse(
+				sessionStorage.getItem( sessionStorageKey )
+			);
+			if (
+				typeof item === 'object' &&
+				typeof item.timestamp === 'number' &&
+				new Date().valueOf() < item.timestamp + 604800 && // Note: Number is a week in seconds.
+				typeof item.supportTests === 'object'
+			) {
+				return item.supportTests;
+			}
+		} catch ( e ) {}
+		return null;
+	}
+
+	/**
+	 * Persist the supports in session storage.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @private
+	 *
+	 * @param {SupportTests} supportTests Support tests.
+	 */
+	function setSessionSupportTests( supportTests ) {
+		try {
+			/** @type {SessionSupportTests} */
+			var item = {
+				supportTests: supportTests,
+				timestamp: new Date().valueOf()
+			};
 
-	// Create a canvas element for testing native browser support of emoji.
-	var canvas = document.createElement( 'canvas' );
-	var context = canvas.getContext && canvas.getContext( '2d' );
+			sessionStorage.setItem(
+				sessionStorageKey,
+				JSON.stringify( item )
+			);
+		} catch ( e ) {}
+	}
 
 	/**
 	 * Checks if two sets of Emoji characters render the same visually.
 	 *
+	 * This function may be serialized to run in a Worker. Therefore, it cannot refer to variables from the containing
+	 * scope. Everything must be passed by parameters.
+	 *
 	 * @since 4.9.0
 	 *
 	 * @private
 	 *
-	 * @param {number[]} set1 Set of Emoji character codes.
-	 * @param {number[]} set2 Set of Emoji character codes.
+	 * @param {CanvasRenderingContext2D} context 2D Context.
+	 * @param {string} set1 Set of Emoji to test.
+	 * @param {string} set2 Set of Emoji to test.
 	 *
 	 * @return {boolean} True if the two sets render the same.
 	 */
-	function emojiSetsRenderIdentically( set1, set2 ) {
-		var stringFromCharCode = String.fromCharCode;
-
+	function emojiSetsRenderIdentically( context, set1, set2 ) {
 		// Cleanup from previous test.
-		context.clearRect( 0, 0, canvas.width, canvas.height );
-		context.fillText( stringFromCharCode.apply( this, set1 ), 0, 0 );
-		var rendered1 = canvas.toDataURL();
+		context.clearRect( 0, 0, context.canvas.width, context.canvas.height );
+		context.fillText( set1, 0, 0 );
+		var rendered1 = new Uint32Array(
+			context.getImageData(
+				0,
+				0,
+				context.canvas.width,
+				context.canvas.height
+			).data
+		);
 
 		// Cleanup from previous test.
-		context.clearRect( 0, 0, canvas.width, canvas.height );
-		context.fillText( stringFromCharCode.apply( this, set2 ), 0, 0 );
-		var rendered2 = canvas.toDataURL();
+		context.clearRect( 0, 0, context.canvas.width, context.canvas.height );
+		context.fillText( set2, 0, 0 );
+		var rendered2 = new Uint32Array(
+			context.getImageData(
+				0,
+				0,
+				context.canvas.width,
+				context.canvas.height
+			).data
+		);
 
-		return rendered1 === rendered2;
+		return rendered1.every( function ( rendered2Data, index ) {
+			return rendered2Data === rendered2[ index ];
+		} );
 	}
 
 	/**
-	 * Detects if the browser supports rendering emoji or flag emoji.
+	 * Determines if the browser properly renders Emoji that Twemoji can supplement.
 	 *
-	 * Flag emoji are a single glyph made of two characters, so some browsers
-	 * (notably, Firefox OS X) don't support them.
+	 * This function may be serialized to run in a Worker. Therefore, it cannot refer to variables from the containing
+	 * scope. Everything must be passed by parameters.
 	 *
 	 * @since 4.2.0
 	 *
 	 * @private
 	 *
+	 * @param {CanvasRenderingContext2D} context 2D Context.
 	 * @param {string} type Whether to test for support of "flag" or "emoji".
+	 * @param {Function} emojiSetsRenderIdentically Reference to emojiSetsRenderIdentically function, needed due to minification.
 	 *
 	 * @return {boolean} True if the browser can render emoji, false if it cannot.
 	 */
-	function browserSupportsEmoji( type ) {
+	function browserSupportsEmoji( context, type, emojiSetsRenderIdentically ) {
 		var isIdentical;
 
-		if ( ! context || ! context.fillText ) {
-			return false;
-		}
-
-		/*
-		 * Chrome on OS X added native emoji rendering in M41. Unfortunately,
-		 * it doesn't work when the font is bolder than 500 weight. So, we
-		 * check for bold rendering support to avoid invisible emoji in Chrome.
-		 */
-		context.textBaseline = 'top';
-		context.font = '600 32px Arial';
-
 		switch ( type ) {
 			case 'flag':
 				/*
-				 * Test for Transgender flag compatibility. This flag is shortlisted for the Emoji 13 spec,
-				 * but has landed in Twemoji early, so we can add support for it, too.
+				 * Test for Transgender flag compatibility. Added in Unicode 13.
 				 *
 				 * To test for support, we try to render it, and compare the rendering to how it would look if
 				 * the browser doesn't render it correctly (white flag emoji + transgender symbol).
 				 */
 				isIdentical = emojiSetsRenderIdentically(
-					[ 0x1F3F3, 0xFE0F, 0x200D, 0x26A7, 0xFE0F ],
-					[ 0x1F3F3, 0xFE0F, 0x200B, 0x26A7, 0xFE0F ]
+					context,
+					'\uD83C\uDFF3\uFE0F\u200D\u26A7\uFE0F', // as a zero-width joiner sequence
+					'\uD83C\uDFF3\uFE0F\u200B\u26A7\uFE0F' // separated by a zero-width space
 				);
 
 				if ( isIdentical ) {
@@ -92,8 +205,9 @@
 				 * the browser doesn't render it correctly ([U] + [N]).
 				 */
 				isIdentical = emojiSetsRenderIdentically(
-					[ 0xD83C, 0xDDFA, 0xD83C, 0xDDF3 ],
-					[ 0xD83C, 0xDDFA, 0x200B, 0xD83C, 0xDDF3 ]
+					context,
+					'\uD83C\uDDFA\uD83C\uDDF3', // as the sequence of two code points
+					'\uD83C\uDDFA\u200B\uD83C\uDDF3' // as the two code points separated by a zero-width space
 				);
 
 				if ( isIdentical ) {
@@ -102,14 +216,17 @@
 
 				/*
 				 * Test for English flag compatibility. England is a country in the United Kingdom, it
-				 * does not have a two letter locale code but rather an five letter sub-division code.
+				 * does not have a two letter locale code but rather a five letter sub-division code.
 				 *
 				 * To test for support, we try to render it, and compare the rendering to how it would look if
 				 * the browser doesn't render it correctly (black flag emoji + [G] + [B] + [E] + [N] + [G]).
 				 */
 				isIdentical = emojiSetsRenderIdentically(
-					[ 0xD83C, 0xDFF4, 0xDB40, 0xDC67, 0xDB40, 0xDC62, 0xDB40, 0xDC65, 0xDB40, 0xDC6E, 0xDB40, 0xDC67, 0xDB40, 0xDC7F ],
-					[ 0xD83C, 0xDFF4, 0x200B, 0xDB40, 0xDC67, 0x200B, 0xDB40, 0xDC62, 0x200B, 0xDB40, 0xDC65, 0x200B, 0xDB40, 0xDC6E, 0x200B, 0xDB40, 0xDC67, 0x200B, 0xDB40, 0xDC7F ]
+					context,
+					// as the flag sequence
+					'\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67\uDB40\uDC7F',
+					// with each code point separated by a zero-width space
+					'\uD83C\uDFF4\u200B\uDB40\uDC67\u200B\uDB40\uDC62\u200B\uDB40\uDC65\u200B\uDB40\uDC6E\u200B\uDB40\uDC67\u200B\uDB40\uDC7F'
 				);
 
 				return ! isIdentical;
@@ -133,8 +250,9 @@
 				 * sequence come from older emoji standards.
 				 */
 				isIdentical = emojiSetsRenderIdentically(
-					[0x1FAF1, 0x1F3FB, 0x200D, 0x1FAF2, 0x1F3FF],
-					[0x1FAF1, 0x1F3FB, 0x200B, 0x1FAF2, 0x1F3FF]
+					context,
+					'\uD83E\uDEF1\uD83C\uDFFB\u200D\uD83E\uDEF2\uD83C\uDFFF', // as the zero-width joiner sequence
+					'\uD83E\uDEF1\uD83C\uDFFB\u200B\uD83E\uDEF2\uD83C\uDFFF' // separated by a zero-width space
 				);
 
 				return ! isIdentical;
@@ -143,6 +261,50 @@
 		return false;
 	}
 
+	/**
+	 * Checks emoji support tests.
+	 *
+	 * This function may be serialized to run in a Worker. Therefore, it cannot refer to variables from the containing
+	 * scope. Everything must be passed by parameters.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @private
+	 *
+	 * @param {string[]} tests Tests.
+	 * @param {Function} browserSupportsEmoji Reference to browserSupportsEmoji function, needed due to minification.
+	 * @param {Function} emojiSetsRenderIdentically Reference to emojiSetsRenderIdentically function, needed due to minification.
+	 *
+	 * @return {SupportTests} Support tests.
+	 */
+	function testEmojiSupports( tests, browserSupportsEmoji, emojiSetsRenderIdentically ) {
+		var canvas;
+		if (
+			typeof WorkerGlobalScope !== 'undefined' &&
+			self instanceof WorkerGlobalScope
+		) {
+			canvas = new OffscreenCanvas( 300, 150 ); // Dimensions are default for HTMLCanvasElement.
+		} else {
+			canvas = document.createElement( 'canvas' );
+		}
+
+		var context = canvas.getContext( '2d', { willReadFrequently: true } );
+
+		/*
+		 * Chrome on OS X added native emoji rendering in M41. Unfortunately,
+		 * it doesn't work when the font is bolder than 500 weight. So, we
+		 * check for bold rendering support to avoid invisible emoji in Chrome.
+		 */
+		context.textBaseline = 'top';
+		context.font = '600 32px Arial';
+
+		var supports = {};
+		tests.forEach( function ( test ) {
+			supports[ test ] = browserSupportsEmoji( context, test, emojiSetsRenderIdentically );
+		} );
+		return supports;
+	}
+
 	/**
 	 * Adds a script to the head of the document.
 	 *
@@ -150,75 +312,113 @@
 	 *
 	 * @since 4.2.0
 	 *
-	 * @param {Object} src The url where the script is located.
+	 * @param {string} src The url where the script is located.
+	 *
 	 * @return {void}
 	 */
 	function addScript( src ) {
 		var script = document.createElement( 'script' );
-
 		script.src = src;
-		script.defer = script.type = 'text/javascript';
-		document.getElementsByTagName( 'head' )[0].appendChild( script );
+		script.defer = true;
+		document.head.appendChild( script );
 	}
 
-	tests = Array( 'flag', 'emoji' );
-
 	settings.supports = {
 		everything: true,
 		everythingExceptFlag: true
 	};
 
-	/*
-	 * Tests the browser support for flag emojis and other emojis, and adjusts the
-	 * support settings accordingly.
-	 */
-	for( ii = 0; ii < tests.length; ii++ ) {
-		settings.supports[ tests[ ii ] ] = browserSupportsEmoji( tests[ ii ] );
+	// Create a promise for DOMContentLoaded since the worker logic may finish after the event has fired.
+	var domReadyPromise = new Promise( function ( resolve ) {
+		document.addEventListener( 'DOMContentLoaded', resolve, {
+			once: true
+		} );
+	} );
 
-		settings.supports.everything = settings.supports.everything && settings.supports[ tests[ ii ] ];
-
-		if ( 'flag' !== tests[ ii ] ) {
-			settings.supports.everythingExceptFlag = settings.supports.everythingExceptFlag && settings.supports[ tests[ ii ] ];
+	// Obtain the emoji support from the browser, asynchronously when possible.
+	new Promise( function ( resolve ) {
+		var supportTests = getSessionSupportTests();
+		if ( supportTests ) {
+			resolve( supportTests );
+			return;
 		}
-	}
 
-	settings.supports.everythingExceptFlag = settings.supports.everythingExceptFlag && ! settings.supports.flag;
+		if ( supportsWorkerOffloading() ) {
+			try {
+				// Note that the functions are being passed as arguments due to minification.
+				var workerScript =
+					'postMessage(' +
+					testEmojiSupports.toString() +
+					'(' +
+					[
+						JSON.stringify( tests ),
+						browserSupportsEmoji.toString(),
+						emojiSetsRenderIdentically.toString()
+					].join( ',' ) +
+					'));';
+				var blob = new Blob( [ workerScript ], {
+					type: 'text/javascript'
+				} );
+				var worker = new Worker( URL.createObjectURL( blob ), { name: 'wpTestEmojiSupports' } );
+				worker.onmessage = function ( event ) {
+					supportTests = event.data;
+					setSessionSupportTests( supportTests );
+					worker.terminate();
+					resolve( supportTests );
+				};
+				return;
+			} catch ( e ) {}
+		}
 
-	// Sets DOMReady to false and assigns a ready function to settings.
-	settings.DOMReady = false;
-	settings.readyCallback = function() {
-		settings.DOMReady = true;
-	};
+		supportTests = testEmojiSupports( tests, browserSupportsEmoji, emojiSetsRenderIdentically );
+		setSessionSupportTests( supportTests );
+		resolve( supportTests );
+	} )
+		// Once the browser emoji support has been obtained from the session, finalize the settings.
+		.then( function ( supportTests ) {
+			/*
+			 * Tests the browser support for flag emojis and other emojis, and adjusts the
+			 * support settings accordingly.
+			 */
+			for ( var test in supportTests ) {
+				settings.supports[ test ] = supportTests[ test ];
 
-	// When the browser can not render everything we need to load a polyfill.
-	if ( ! settings.supports.everything ) {
-		ready = function() {
-			settings.readyCallback();
-		};
+				settings.supports.everything =
+					settings.supports.everything && settings.supports[ test ];
 
-		/*
-		 * Cross-browser version of adding a dom ready event.
-		 */
-		if ( document.addEventListener ) {
-			document.addEventListener( 'DOMContentLoaded', ready, false );
-			window.addEventListener( 'load', ready, false );
-		} else {
-			window.attachEvent( 'onload', ready );
-			document.attachEvent( 'onreadystatechange', function() {
-				if ( 'complete' === document.readyState ) {
-					settings.readyCallback();
+				if ( 'flag' !== test ) {
+					settings.supports.everythingExceptFlag =
+						settings.supports.everythingExceptFlag &&
+						settings.supports[ test ];
 				}
-			} );
-		}
+			}
 
-		src = settings.source || {};
+			settings.supports.everythingExceptFlag =
+				settings.supports.everythingExceptFlag &&
+				! settings.supports.flag;
 
-		if ( src.concatemoji ) {
-			addScript( src.concatemoji );
-		} else if ( src.wpemoji && src.twemoji ) {
-			addScript( src.twemoji );
-			addScript( src.wpemoji );
-		}
-	}
+			// Sets DOMReady to false and assigns a ready function to settings.
+			settings.DOMReady = false;
+			settings.readyCallback = function () {
+				settings.DOMReady = true;
+			};
+		} )
+		.then( function () {
+			return domReadyPromise;
+		} )
+		.then( function () {
+			// When the browser can not render everything we need to load a polyfill.
+			if ( ! settings.supports.everything ) {
+				settings.readyCallback();
 
+				var src = settings.source || {};
+
+				if ( src.concatemoji ) {
+					addScript( src.concatemoji );
+				} else if ( src.wpemoji && src.twemoji ) {
+					addScript( src.twemoji );
+					addScript( src.wpemoji );
+				}
+			}
+		} );
 } )( window, document, window._wpemojiSettings );
diff --git a/src/js/_enqueues/lib/image-edit.js b/src/js/_enqueues/lib/image-edit.js
index 18d3099f62cf5..8f44e930be40e 100644
--- a/src/js/_enqueues/lib/image-edit.js
+++ b/src/js/_enqueues/lib/image-edit.js
@@ -11,7 +11,7 @@
 	var __ = wp.i18n.__;
 
 	/**
-	 * Contains all the methods to initialise and control the image editor.
+	 * Contains all the methods to initialize and control the image editor.
 	 *
 	 * @namespace imageEdit
 	 */
@@ -22,25 +22,61 @@
 	_view : false,
 
 	/**
-	 * Handle crop tool clicks.
+	 * Enable crop tool.
 	 */
-	handleCropToolClick: function( postid, nonce, cropButton ) {
+	toggleCropTool: function( postid, nonce, cropButton ) {
 		var img = $( '#image-preview-' + postid ),
 			selection = this.iasapi.getSelection();
 
-		// Ensure selection is available, otherwise reset to full image.
-		if ( isNaN( selection.x1 ) ) {
-			this.setCropSelection( postid, { 'x1': 0, 'y1': 0, 'x2': img.innerWidth(), 'y2': img.innerHeight(), 'width': img.innerWidth(), 'height': img.innerHeight() } );
-			selection = this.iasapi.getSelection();
+		imageEdit.toggleControls( cropButton );
+		var $el = $( cropButton );
+		var state = ( $el.attr( 'aria-expanded' ) === 'true' ) ? 'true' : 'false';
+		// Crop tools have been closed.
+		if ( 'false' === state ) {
+			// Cancel selection, but do not unset inputs.
+			this.iasapi.cancelSelection();
+			imageEdit.setDisabled($('.imgedit-crop-clear'), 0);
+		} else {
+			imageEdit.setDisabled($('.imgedit-crop-clear'), 1);
+			// Get values from inputs to restore previous selection.
+			var startX = ( $( '#imgedit-start-x-' + postid ).val() ) ? $('#imgedit-start-x-' + postid).val() : 0;
+			var startY = ( $( '#imgedit-start-y-' + postid ).val() ) ? $('#imgedit-start-y-' + postid).val() : 0;
+			var width = ( $( '#imgedit-sel-width-' + postid ).val() ) ? $('#imgedit-sel-width-' + postid).val() : img.innerWidth();
+			var height = ( $( '#imgedit-sel-height-' + postid ).val() ) ? $('#imgedit-sel-height-' + postid).val() : img.innerHeight();
+			// Ensure selection is available, otherwise reset to full image.
+			if ( isNaN( selection.x1 ) ) {
+				this.setCropSelection( postid, { 'x1': startX, 'y1': startY, 'x2': width, 'y2': height, 'width': width, 'height': height } );
+				selection = this.iasapi.getSelection();
+			}
+
+			// If we don't already have a selection, select the entire image.
+			if ( 0 === selection.x1 && 0 === selection.y1 && 0 === selection.x2 && 0 === selection.y2 ) {
+				this.iasapi.setSelection( 0, 0, img.innerWidth(), img.innerHeight(), true );
+				this.iasapi.setOptions( { show: true } );
+				this.iasapi.update();
+			} else {
+				this.iasapi.setSelection( startX, startY, width, height, true );
+				this.iasapi.setOptions( { show: true } );
+				this.iasapi.update();
+			}
 		}
+	},
 
-		// If we don't already have a selection, select the entire image.
-		if ( 0 === selection.x1 && 0 === selection.y1 && 0 === selection.x2 && 0 === selection.y2 ) {
-			this.iasapi.setSelection( 0, 0, img.innerWidth(), img.innerHeight(), true );
-			this.iasapi.setOptions( { show: true } );
-			this.iasapi.update();
-		} else {
+	/**
+	 * Handle crop tool clicks.
+	 */
+	handleCropToolClick: function( postid, nonce, cropButton ) {
+
+		if ( cropButton.classList.contains( 'imgedit-crop-clear' ) ) {
+			this.iasapi.cancelSelection();
+			imageEdit.setDisabled($('.imgedit-crop-apply'), 0);
 
+			$('#imgedit-sel-width-' + postid).val('');
+			$('#imgedit-sel-height-' + postid).val('');
+			$('#imgedit-start-x-' + postid).val('0');
+			$('#imgedit-start-y-' + postid).val('0');
+			$('#imgedit-selection-' + postid).val('');
+		} else {
 			// Otherwise, perform the crop.
 			imageEdit.crop( postid, nonce , cropButton );
 		}
@@ -122,6 +158,17 @@
 		t.postid = postid;
 		$('#imgedit-response-' + postid).empty();
 
+		$('#imgedit-panel-' + postid).on( 'keypress', function(e) {
+			var nonce = $( '#imgedit-nonce-' + postid ).val();
+			if ( e.which === 26 && e.ctrlKey ) {
+				imageEdit.undo( postid, nonce );
+			}
+
+			if ( e.which === 25 && e.ctrlKey ) {
+				imageEdit.redo( postid, nonce );
+			}
+		});
+
 		$('#imgedit-panel-' + postid).on( 'keypress', 'input[type="text"]', function(e) {
 			var k = e.keyCode;
 
@@ -169,6 +216,93 @@
 		}
 	},
 
+	/**
+	 * Shows or hides image menu popup.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @memberof imageEdit
+	 *
+	 * @param {HTMLElement} el The activated control element.
+	 *
+	 * @return {boolean} Always returns false.
+	 */
+	togglePopup : function(el) {
+		var $el = $( el );
+		var $targetEl = $( el ).attr( 'aria-controls' );
+		var $target = $( '#' + $targetEl );
+		$el
+			.attr( 'aria-expanded', 'false' === $el.attr( 'aria-expanded' ) ? 'true' : 'false' );
+		// Open menu and set z-index to appear above image crop area if it is enabled.
+		$target
+			.toggleClass( 'imgedit-popup-menu-open' ).slideToggle( 'fast' ).css( { 'z-index' : 200000 } );
+		// Move focus to first item in menu.
+		$target.find( 'button' ).first().trigger( 'focus' );
+
+		return false;
+	},
+
+	/**
+	 * Navigate popup menu by arrow keys.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @memberof imageEdit
+	 *
+	 * @param {HTMLElement} el The current element.
+	 *
+	 * @return {boolean} Always returns false.
+	 */
+	browsePopup : function(el) {
+		var $el = $( el );
+		var $collection = $( el ).parent( '.imgedit-popup-menu' ).find( 'button' );
+		var $index = $collection.index( $el );
+		var $prev = $index - 1;
+		var $next = $index + 1;
+		var $last = $collection.length;
+		if ( $prev < 0 ) {
+			$prev = $last - 1;
+		}
+		if ( $next === $last ) {
+			$next = 0;
+		}
+		var $target = false;
+		if ( event.keyCode === 40 ) {
+			$target = $collection.get( $next );
+		} else if ( event.keyCode === 38 ) {
+			$target = $collection.get( $prev );
+		}
+		if ( $target ) {
+			$target.focus();
+			event.preventDefault();
+		}
+
+		return false;
+	},
+
+	/**
+	 * Close popup menu and reset focus on feature activation.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @memberof imageEdit
+	 *
+	 * @param {HTMLElement} el The current element.
+	 *
+	 * @return {boolean} Always returns false.
+	 */
+	closePopup : function(el) {
+		var $parent = $(el).parent( '.imgedit-popup-menu' );
+		var $controlledID = $parent.attr( 'id' );
+		var $target = $( 'button[aria-controls="' + $controlledID + '"]' );
+		$target
+			.attr( 'aria-expanded', 'false' ).trigger( 'focus' );
+		$parent
+			.toggleClass( 'imgedit-popup-menu-open' ).slideToggle( 'fast' );
+
+		return false;
+	},
+
 	/**
 	 * Shows or hides the image edit help box.
 	 *
@@ -189,6 +323,28 @@
 		return false;
 	},
 
+	/**
+	 * Shows or hides image edit input fields when enabled.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @memberof imageEdit
+	 *
+	 * @param {HTMLElement} el The element to trigger the edit panel.
+	 *
+	 * @return {boolean} Always returns false.
+	 */
+	toggleControls : function(el) {
+		var $el = $( el );
+		var $target = $( '#' + $el.attr( 'aria-controls' ) );
+		$el
+			.attr( 'aria-expanded', 'false' === $el.attr( 'aria-expanded' ) ? 'true' : 'false' );
+		$target
+			.parent( '.imgedit-group' ).toggleClass( 'imgedit-panel-active' );
+
+		return false;
+	},
+
 	/**
 	 * Gets the value from the image edit target.
 	 *
@@ -202,10 +358,16 @@
 	 * @param {number} postid The post ID.
 	 *
 	 * @return {string} The value from the imagedit-save-target input field when available,
-	 *                  or 'full' when not available.
+	 *                  'full' when not selected, or 'all' if it doesn't exist.
 	 */
-	getTarget : function(postid) {
-		return $('input[name="imgedit-target-' + postid + '"]:checked', '#imgedit-save-target-' + postid).val() || 'full';
+	getTarget : function( postid ) {
+		var element = $( '#imgedit-save-target-' + postid );
+
+		if ( element.length ) {
+			return element.find( 'input[name="imgedit-target-' + postid + '"]:checked' ).val() || 'full';
+		}
+
+		return 'all';
 	},
 
 	/**
@@ -226,7 +388,8 @@
 	 */
 	scaleChanged : function( postid, x, el ) {
 		var w = $('#imgedit-scale-width-' + postid), h = $('#imgedit-scale-height-' + postid),
-		warn = $('#imgedit-scale-warn-' + postid), w1 = '', h1 = '';
+		warn = $('#imgedit-scale-warn-' + postid), w1 = '', h1 = '',
+		scaleBtn = $('#imgedit-scale-button');
 
 		if ( false === this.validateNumeric( el ) ) {
 			return;
@@ -242,8 +405,10 @@
 
 		if ( ( h1 && h1 > this.hold.oh ) || ( w1 && w1 > this.hold.ow ) ) {
 			warn.css('visibility', 'visible');
+			scaleBtn.prop('disabled', true);
 		} else {
 			warn.css('visibility', 'hidden');
+			scaleBtn.prop('disabled', false);
 		}
 	},
 
@@ -402,12 +567,14 @@
 				}
 
 				if ( $('#imgedit-history-' + postid).val() && $('#imgedit-undone-' + postid).val() === '0' ) {
-					$('input.imgedit-submit-btn', '#imgedit-panel-' + postid).prop('disabled', false);
+					$('button.imgedit-submit-btn', '#imgedit-panel-' + postid).prop('disabled', false);
 				} else {
-					$('input.imgedit-submit-btn', '#imgedit-panel-' + postid).prop('disabled', true);
+					$('button.imgedit-submit-btn', '#imgedit-panel-' + postid).prop('disabled', true);
 				}
+				var successMessage = __( 'Image updated.' );
 
 				t.toggleEditor(postid, 0);
+				wp.a11y.speak( successMessage, 'assertive' );
 			})
 			.on( 'error', function() {
 				var errorMessage = __( 'Could not load the preview image. Please reload the page and try again.' );
@@ -435,7 +602,7 @@
 	 *
 	 * @return {boolean|void} Executes a post request that refreshes the page
 	 *                        when the action is performed.
-	 *                        Returns false if a invalid action is given,
+	 *                        Returns false if an invalid action is given,
 	 *                        or when the action cannot be performed.
 	 */
 	action : function(postid, nonce, action) {
@@ -636,7 +803,7 @@
 				btn.removeClass( 'button-activated' );
 				spin.removeClass( 'is-active' );
 			} );
-			// Initialise the Image Editor now that everything is ready.
+			// Initialize the Image Editor now that everything is ready.
 			imageEdit.init( postid );
 		} );
 
@@ -710,6 +877,8 @@
 		var t = this,
 			selW = $('#imgedit-sel-width-' + postid),
 			selH = $('#imgedit-sel-height-' + postid),
+			selX = $('#imgedit-start-x-' + postid),
+			selY = $('#imgedit-start-y-' + postid),
 			$image = $( image ),
 			$img;
 
@@ -768,6 +937,8 @@
 			 */
 			onSelectStart: function() {
 				imageEdit.setDisabled($('#imgedit-crop-sel-' + postid), 1);
+				imageEdit.setDisabled($('.imgedit-crop-clear'), 1);
+				imageEdit.setDisabled($('.imgedit-crop-apply'), 1);
 			},
 			/**
 			 * Event triggered when the selection is ended.
@@ -781,6 +952,9 @@
 			 */
 			onSelectEnd: function(img, c) {
 				imageEdit.setCropSelection(postid, c);
+				if ( ! $('#imgedit-crop > *').is(':visible') ) {
+					imageEdit.toggleControls($('.imgedit-crop.button'));
+				}
 			},
 
 			/**
@@ -797,6 +971,8 @@
 				var sizer = imageEdit.hold.sizer;
 				selW.val( imageEdit.round(c.width / sizer) );
 				selH.val( imageEdit.round(c.height / sizer) );
+				selX.val( imageEdit.round(c.x1 / sizer) );
+				selY.val( imageEdit.round(c.y1 / sizer) );
 			}
 		});
 	},
@@ -823,6 +999,8 @@
 			this.setDisabled( $( '#imgedit-crop-sel-' + postid ), 1 );
 			$('#imgedit-sel-width-' + postid).val('');
 			$('#imgedit-sel-height-' + postid).val('');
+			$('#imgedit-start-x-' + postid).val('0');
+			$('#imgedit-start-y-' + postid).val('0');
 			$('#imgedit-selection-' + postid).val('');
 			return false;
 		}
@@ -953,7 +1131,7 @@
 		if ( $(t).hasClass('disabled') ) {
 			return false;
 		}
-
+		this.closePopup(t);
 		this.addStep({ 'r': { 'r': angle, 'fw': this.hold.h, 'fh': this.hold.w }}, postid, nonce);
 	},
 
@@ -975,7 +1153,7 @@
 		if ( $(t).hasClass('disabled') ) {
 			return false;
 		}
-
+		this.closePopup(t);
 		this.addStep({ 'f': { 'f': axis, 'fw': this.hold.w, 'fh': this.hold.h }}, postid, nonce);
 	},
 
@@ -1011,6 +1189,8 @@
 		// Clear the selection fields after cropping.
 		$('#imgedit-sel-width-' + postid).val('');
 		$('#imgedit-sel-height-' + postid).val('');
+		$('#imgedit-start-x-' + postid).val('0');
+		$('#imgedit-start-y-' + postid).val('0');
 	},
 
 	/**
@@ -1094,6 +1274,8 @@
 	 */
 	setNumSelection : function( postid, el ) {
 		var sel, elX = $('#imgedit-sel-width-' + postid), elY = $('#imgedit-sel-height-' + postid),
+			elX1 = $('#imgedit-start-x-' + postid), elY1 = $('#imgedit-start-y-' + postid),
+			xS = this.intval( elX1.val() ), yS = this.intval( elY1.val() ),
 			x = this.intval( elX.val() ), y = this.intval( elY.val() ),
 			img = $('#image-preview-' + postid), imgh = img.height(), imgw = img.width(),
 			sizer = this.hold.sizer, x1, y1, x2, y2, ias = this.iasapi;
@@ -1112,11 +1294,11 @@
 			return false;
 		}
 
-		if ( x && y && ( sel = ias.getSelection() ) ) {
+		if ( ( ( x && y ) || ( xS && yS ) ) && ( sel = ias.getSelection() ) ) {
 			x2 = sel.x1 + Math.round( x * sizer );
 			y2 = sel.y1 + Math.round( y * sizer );
-			x1 = sel.x1;
-			y1 = sel.y1;
+			x1 = ( xS === sel.x1 ) ? sel.x1 : Math.round( xS * sizer );
+			y1 = ( yS === sel.y1 ) ? sel.y1 : Math.round( yS * sizer );
 
 			if ( x2 > imgw ) {
 				x1 = 0;
@@ -1202,10 +1384,21 @@
 
 				if ( r > h ) {
 					r = h;
+					var errorMessage = __( 'Selected crop ratio exceeds the boundaries of the image. Try a different ratio.' );
+
+					$( '#imgedit-crop-' + postid )
+						.prepend( '<div class="notice notice-error" tabindex="-1" role="alert"><p>' + errorMessage + '</p></div>' );
+
+					wp.a11y.speak( errorMessage, 'assertive' );
 					if ( n ) {
-						$('#imgedit-crop-height-' + postid).val('');
+						$('#imgedit-crop-height-' + postid).val( '' );
 					} else {
-						$('#imgedit-crop-width-' + postid).val('');
+						$('#imgedit-crop-width-' + postid).val( '');
+					}
+				} else {
+					var error = $( '#imgedit-crop-' + postid ).find( '.notice-error' );
+					if ( 'undefined' !== typeof( error ) ) {
+						error.remove();
 					}
 				}
 
@@ -1228,7 +1421,7 @@
 	 *                        void when it is.
 	 */
 	validateNumeric: function( el ) {
-		if ( ! this.intval( $( el ).val() ) ) {
+		if ( false === this.intval( $( el ).val() ) ) {
 			$( el ).val( '' );
 			return false;
 		}
diff --git a/src/js/_enqueues/lib/lists.js b/src/js/_enqueues/lib/lists.js
index 70e054fda8208..d7e888c85b9ab 100644
--- a/src/js/_enqueues/lib/lists.js
+++ b/src/js/_enqueues/lib/lists.js
@@ -747,7 +747,7 @@ wpList = {
 			return list.wpList.add( this );
 		} );
 
-		$element.on( 'click', 'a[data-wp-lists^="add:' + list.id + ':"], input[data-wp-lists^="add:' + list.id + ':"]', function() {
+		$element.on( 'click', '[data-wp-lists^="add:' + list.id + ':"], input[data-wp-lists^="add:' + list.id + ':"]', function() {
 			return list.wpList.add( this );
 		} );
 
diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js
index 10b1330a8d4a3..9877f7821770c 100644
--- a/src/js/_enqueues/lib/nav-menu.js
+++ b/src/js/_enqueues/lib/nav-menu.js
@@ -1557,14 +1557,14 @@
 		});
 	});
 
-	// Show bulk action
+	// Show bulk action.
 	$( document ).on( 'menu-item-added', function() {
 		if ( ! $( '.bulk-actions' ).is( ':visible' ) ) {
 			$( '.bulk-actions' ).show();
 		}
 	} );
 
-	// Hide bulk action
+	// Hide bulk action.
 	$( document ).on( 'menu-removing-item', function( e, el ) {
 		var menuElement = $( el ).parents( '#menu-to-edit' );
 		if ( menuElement.find( 'li' ).length === 1 && $( '.bulk-actions' ).is( ':visible' ) ) {
diff --git a/src/js/_enqueues/vendor/README.md b/src/js/_enqueues/vendor/README.md
index 41503296ab0a5..4764f0b808e94 100644
--- a/src/js/_enqueues/vendor/README.md
+++ b/src/js/_enqueues/vendor/README.md
@@ -11,7 +11,7 @@ In this directory you'll find vendor JavaScript packages that cannot be installe
 - mediaelement: https://github.com/mediaelement/mediaelement
 - plupload: https://github.com/moxiecode/plupload
 - swfupload: https://github.com/WordPress/secure-swfupload
-- thickbox: http://codylindley.com/thickbox/
+- thickbox: https://codylindley.com/thickbox/
 - tinymce: https://www.tiny.cloud/get-tiny/self-hosted/
   - Download "TinyMCE Dev Package". This package is needed because it includes
     the `compat3x` plugin.
diff --git a/src/js/_enqueues/vendor/farbtastic.js b/src/js/_enqueues/vendor/farbtastic.js
index 5404fb6e3dcaf..b445081a20624 100644
--- a/src/js/_enqueues/vendor/farbtastic.js
+++ b/src/js/_enqueues/vendor/farbtastic.js
@@ -1,9 +1,15 @@
 /*!
  * Farbtastic: jQuery color picker plug-in v1.3u
+ * https://github.com/mattfarina/farbtastic
  *
  * Licensed under the GPL license:
  *   http://www.gnu.org/licenses/gpl.html
  */
+/**
+ * Modified for WordPress: replaced deprecated jQuery methods.
+ * See https://core.trac.wordpress.org/ticket/57946.
+ */
+
 (function($) {
 
 $.fn.farbtastic = function (options) {
@@ -49,7 +55,7 @@ $._farbtastic = function (container, callback) {
   fb.linkTo = function (callback) {
     // Unbind previous nodes
     if (typeof fb.callback == 'object') {
-      $(fb.callback).unbind('keyup', fb.updateValue);
+      $(fb.callback).off('keyup', fb.updateValue);
     }
 
     // Reset color
@@ -61,7 +67,7 @@ $._farbtastic = function (container, callback) {
     }
     else if (typeof callback == 'object' || typeof callback == 'string') {
       fb.callback = $(callback);
-      fb.callback.bind('keyup', fb.updateValue);
+      fb.callback.on('keyup', fb.updateValue);
       if (fb.callback.get(0).value) {
         fb.setColor(fb.callback.get(0).value);
       }
@@ -116,7 +122,7 @@ $._farbtastic = function (container, callback) {
   fb.mousedown = function (event) {
     // Capture mouse
     if (!document.dragging) {
-      $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
+      $(document).on('mousemove', fb.mousemove).on('mouseup', fb.mouseup);
       document.dragging = true;
     }
 
@@ -155,8 +161,8 @@ $._farbtastic = function (container, callback) {
    */
   fb.mouseup = function () {
     // Uncapture mouse
-    $(document).unbind('mousemove', fb.mousemove);
-    $(document).unbind('mouseup', fb.mouseup);
+    $(document).off('mousemove', fb.mousemove);
+    $(document).off('mouseup', fb.mouseup);
     document.dragging = false;
   };
 
@@ -262,7 +268,7 @@ $._farbtastic = function (container, callback) {
   };
 
   // Install mousedown handler (the others are set on the document on-demand)
-  $('*', e).mousedown(fb.mousedown);
+  $('*', e).on('mousedown', fb.mousedown);
 
     // Init color
   fb.setColor('#000000');
diff --git a/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.js b/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.js
index c0b573934f8f9..c905b011d2552 100644
--- a/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.js
+++ b/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.js
@@ -1,6 +1,6 @@
 /*
  * imgAreaSelect jQuery plugin
- * version 0.9.10-wp
+ * version 0.9.10-wp-6.2
  *
  * Copyright (c) 2008-2013 Michal Wojciechowski (odyniec.net)
  *
@@ -20,7 +20,7 @@
 var abs = Math.abs,
     max = Math.max,
     min = Math.min,
-    round = Math.round;
+    floor = Math.floor;
 
 /**
  * Create a new HTML div element
@@ -230,12 +230,12 @@ $.imgAreaSelect = function (img, options) {
     function getSelection(noScale) {
         var sx = noScale || scaleX, sy = noScale || scaleY;
 
-        return { x1: round(selection.x1 * sx),
-            y1: round(selection.y1 * sy),
-            x2: round(selection.x2 * sx),
-            y2: round(selection.y2 * sy),
-            width: round(selection.x2 * sx) - round(selection.x1 * sx),
-            height: round(selection.y2 * sy) - round(selection.y1 * sy) };
+        return { x1: floor(selection.x1 * sx),
+            y1: floor(selection.y1 * sy),
+            x2: floor(selection.x2 * sx),
+            y2: floor(selection.y2 * sy),
+            width: floor(selection.x2 * sx) - floor(selection.x1 * sx),
+            height: floor(selection.y2 * sy) - floor(selection.y1 * sy) };
     }
 
     /**
@@ -257,10 +257,10 @@ $.imgAreaSelect = function (img, options) {
         var sx = noScale || scaleX, sy = noScale || scaleY;
 
         selection = {
-            x1: round(x1 / sx || 0),
-            y1: round(y1 / sy || 0),
-            x2: round(x2 / sx || 0),
-            y2: round(y2 / sy || 0)
+            x1: floor(x1 / sx || 0),
+            y1: floor(y1 / sy || 0),
+            x2: floor(x2 / sx || 0),
+            y2: floor(y2 / sy || 0)
         };
 
         selection.width = selection.x2 - selection.x1;
@@ -283,7 +283,7 @@ $.imgAreaSelect = function (img, options) {
          * Get image offset. The .offset() method returns float values, so they
          * need to be rounded.
          */
-        imgOfs = { left: round($img.offset().left), top: round($img.offset().top) };
+        imgOfs = { left: floor($img.offset().left), top: floor($img.offset().top) };
 
         /* Get image dimensions */
         imgWidth = $img.innerWidth();
@@ -293,10 +293,10 @@ $.imgAreaSelect = function (img, options) {
         imgOfs.left += ($img.outerWidth() - imgWidth) >> 1;
 
         /* Set minimum and maximum selection area dimensions */
-        minWidth = round(options.minWidth / scaleX) || 0;
-        minHeight = round(options.minHeight / scaleY) || 0;
-        maxWidth = round(min(options.maxWidth / scaleX || 1<<24, imgWidth));
-        maxHeight = round(min(options.maxHeight / scaleY || 1<<24, imgHeight));
+        minWidth = floor(options.minWidth / scaleX) || 0;
+        minHeight = floor(options.minHeight / scaleY) || 0;
+        maxWidth = floor(min(options.maxWidth / scaleX || 1<<24, imgWidth));
+        maxHeight = floor(min(options.maxHeight / scaleY || 1<<24, imgHeight));
 
         /*
          * Workaround for jQuery 1.3.2 incorrect offset calculation, originally
@@ -311,8 +311,8 @@ $.imgAreaSelect = function (img, options) {
 
         /* Determine parent element offset */
         parOfs = /absolute|relative/.test($parent.css('position')) ?
-            { left: round($parent.offset().left) - $parent.scrollLeft(),
-                top: round($parent.offset().top) - $parent.scrollTop() } :
+            { left: floor($parent.offset().left) - $parent.scrollLeft(),
+                top: floor($parent.offset().top) - $parent.scrollTop() } :
             position == 'fixed' ?
                 { left: $(document).scrollLeft(), top: $(document).scrollTop() } :
                 { left: 0, top: 0 };
@@ -430,6 +430,13 @@ $.imgAreaSelect = function (img, options) {
     function doUpdate(resetKeyPress) {
         adjust();
         update(resetKeyPress);
+        updateSelectionRelativeToParentElement();
+    }
+
+    /**
+     * Set the correct values of x1, y1, x2, and y2.
+     */
+    function updateSelectionRelativeToParentElement() {
         x1 = viewX(selection.x1); y1 = viewY(selection.y1);
         x2 = viewX(selection.x2); y2 = viewY(selection.y2);
     }
@@ -571,16 +578,16 @@ $.imgAreaSelect = function (img, options) {
             if (xFirst) {
                 x2 = max(left, min(left + imgWidth,
                     x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1)));
-                y2 = round(max(top, min(top + imgHeight,
+                y2 = floor(max(top, min(top + imgHeight,
                     y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1))));
-                x2 = round(x2);
+                x2 = floor(x2);
             }
             else {
                 y2 = max(top, min(top + imgHeight,
                     y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1)));
-                x2 = round(max(left, min(left + imgWidth,
+                x2 = floor(max(left, min(left + imgWidth,
                     x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1))));
-                y2 = round(y2);
+                y2 = floor(y2);
             }
     }
 
@@ -589,6 +596,14 @@ $.imgAreaSelect = function (img, options) {
      * aspect ratio
      */
     function doResize() {
+        /*
+         * Make sure x1, x2, y1, y2 are initialized to avoid the following calculation
+         * getting incorrect results.
+         */
+        if ( x1 == null || x2 == null || y1 == null || y2 == null ) {
+            updateSelectionRelativeToParentElement();
+        }
+
         /*
          * Make sure the top left corner of the selection area stays within
          * image boundaries (it might not if the image source was dynamically
@@ -941,7 +956,7 @@ $.imgAreaSelect = function (img, options) {
              * default 5px
              */
             if (!parseInt($handles.css('width')) >= 0)
-                $handles.width(5).height(5);
+                $handles.width(10).height(10);
 
             /*
              * If the borderWidth option is in use, add a solid border to
diff --git a/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.min.js b/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.min.js
index f2b1c8b4a6969..22cb54f75ee95 100644
--- a/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.min.js
+++ b/src/js/_enqueues/vendor/imgareaselect/jquery.imgareaselect.min.js
@@ -1 +1 @@
-!function(xe){var we=Math.abs,Se=Math.max,ze=Math.min,ke=Math.round;function Ce(){return xe("<div/>")}xe.imgAreaSelect=function(o,n){var t,i,r,c,d,a,s,u,l,h,f,m,e,p,y,g,v,b,x,w,S,z,k,C,A,W,I,K=xe(o),P=Ce(),N=Ce(),H=Ce().add(Ce()).add(Ce()).add(Ce()),M=Ce().add(Ce()).add(Ce()).add(Ce()),E=xe([]),O={left:0,top:0},T={left:0,top:0},L=0,j="absolute",D={x1:0,y1:0,x2:0,y2:0,width:0,height:0},R=document.documentElement,X=navigator.userAgent;function Y(e){return e+O.left-T.left}function $(e){return e+O.top-T.top}function q(e){return e-O.left+T.left}function B(e){return e-O.top+T.top}function Q(e){return Se(e.pageX||0,G(e).x)-T.left}function F(e){return Se(e.pageY||0,G(e).y)-T.top}function G(e){e=e.originalEvent||{};return e.touches&&e.touches.length?{x:e.touches[0].pageX,y:e.touches[0].pageY}:{x:0,y:0}}function J(e){var t=e||h,e=e||f;return{x1:ke(D.x1*t),y1:ke(D.y1*e),x2:ke(D.x2*t),y2:ke(D.y2*e),width:ke(D.x2*t)-ke(D.x1*t),height:ke(D.y2*e)-ke(D.y1*e)}}function U(e,t,o,i,s){var n=s||h,s=s||f;(D={x1:ke(e/n||0),y1:ke(t/s||0),x2:ke(o/n||0),y2:ke(i/s||0)}).width=D.x2-D.x1,D.height=D.y2-D.y1}function V(){t&&K.width()&&(O={left:ke(K.offset().left),top:ke(K.offset().top)},d=K.innerWidth(),a=K.innerHeight(),O.top+=K.outerHeight()-a>>1,O.left+=K.outerWidth()-d>>1,e=ke(n.minWidth/h)||0,p=ke(n.minHeight/f)||0,y=ke(ze(n.maxWidth/h||1<<24,d)),g=ke(ze(n.maxHeight/f||1<<24,a)),"1.3.2"!=xe().jquery||"fixed"!=j||R.getBoundingClientRect||(O.top+=Se(document.body.scrollTop,R.scrollTop),O.left+=Se(document.body.scrollLeft,R.scrollLeft)),T=/absolute|relative/.test(s.css("position"))?{left:ke(s.offset().left)-s.scrollLeft(),top:ke(s.offset().top)-s.scrollTop()}:"fixed"==j?{left:xe(document).scrollLeft(),top:xe(document).scrollTop()}:{left:0,top:0},r=Y(0),c=$(0),(D.x2>d||D.y2>a)&&ne())}function Z(e){if(b){switch(P.css({left:Y(D.x1),top:$(D.y1)}).add(N).width(A=D.width).height(W=D.height),N.add(H).add(E).css({left:0,top:0}),H.width(Se(A-H.outerWidth()+H.innerWidth(),0)).height(Se(W-H.outerHeight()+H.innerHeight(),0)),xe(M[0]).css({left:r,top:c,width:D.x1,height:a}),xe(M[1]).css({left:r+D.x1,top:c,width:A,height:D.y1}),xe(M[2]).css({left:r+D.x2,top:c,width:d-D.x2,height:a}),xe(M[3]).css({left:r+D.x1,top:c+D.y2,width:A,height:a-D.y2}),A-=E.outerWidth(),W-=E.outerHeight(),E.length){case 8:xe(E[4]).css({left:A>>1}),xe(E[5]).css({left:A,top:W>>1}),xe(E[6]).css({left:A>>1,top:W}),xe(E[7]).css({top:W>>1});case 4:E.slice(1,3).css({left:A}),E.slice(2,4).css({top:W})}!1!==e&&(xe.imgAreaSelect.onKeyPress!=me&&xe(document).off(xe.imgAreaSelect.keyPress,xe.imgAreaSelect.onKeyPress),n.keys&&xe(document).on(xe.imgAreaSelect.keyPress,function(){xe.imgAreaSelect.onKeyPress=me})),ge&&H.outerWidth()-H.innerWidth()==2&&(H.css("margin",0),setTimeout(function(){H.css("margin","auto")},0))}}function _(e){V(),Z(e),x=Y(D.x1),w=$(D.y1),S=Y(D.x2),z=$(D.y2)}function ee(e,t){n.fadeSpeed?e.fadeOut(n.fadeSpeed,t):e.hide()}function te(e){var t=q(Q(e))-D.x1,e=B(F(e))-D.y1;I||(V(),I=!0,P.one("mouseout",function(){I=!1})),m="",n.resizable&&(e<=n.resizeMargin?m="n":e>=D.height-n.resizeMargin&&(m="s"),t<=n.resizeMargin?m+="w":t>=D.width-n.resizeMargin&&(m+="e")),P.css("cursor",m?m+"-resize":n.movable?"move":""),i&&i.toggle()}function oe(e){xe("body").css("cursor",""),!n.autoHide&&D.width*D.height!=0||ee(P.add(M),function(){xe(this).hide()}),xe(document).off("mousemove touchmove",re),P.on("mousemove touchmove",te),n.onSelectEnd(o,J())}function ie(e){return"mousedown"==e.type&&1!=e.which||(te(e),V(),m?(xe("body").css("cursor",m+"-resize"),x=Y(D[/w/.test(m)?"x2":"x1"]),w=$(D[/n/.test(m)?"y2":"y1"]),xe(document).on("mousemove touchmove",re).one("mouseup touchend",oe),P.off("mousemove touchmove",te)):n.movable?(u=r+D.x1-Q(e),l=c+D.y1-F(e),P.off("mousemove touchmove",te),xe(document).on("mousemove touchmove",de).one("mouseup touchend",function(){n.onSelectEnd(o,J()),xe(document).off("mousemove touchmove",de),P.on("mousemove touchmove",te)})):K.mousedown(e)),!1}function se(e){v&&(e?(S=Se(r,ze(r+d,x+we(z-w)*v*(x<S||-1))),z=ke(Se(c,ze(c+a,w+we(S-x)/v*(w<z||-1)))),S=ke(S)):(z=Se(c,ze(c+a,w+we(S-x)/v*(w<z||-1))),S=ke(Se(r,ze(r+d,x+we(z-w)*v*(x<S||-1)))),z=ke(z)))}function ne(){x=ze(x,r+d),w=ze(w,c+a),we(S-x)<e&&((S=x-e*(S<x||-1))<r?x=r+e:r+d<S&&(x=r+d-e)),we(z-w)<p&&((z=w-p*(z<w||-1))<c?w=c+p:c+a<z&&(w=c+a-p)),S=Se(r,ze(S,r+d)),z=Se(c,ze(z,c+a)),se(we(S-x)<we(z-w)*v),we(S-x)>y&&(S=x-y*(S<x||-1),se()),we(z-w)>g&&(z=w-g*(z<w||-1),se(!0)),D={x1:q(ze(x,S)),x2:q(Se(x,S)),y1:B(ze(w,z)),y2:B(Se(w,z)),width:we(S-x),height:we(z-w)},Z(),n.onSelectChange(o,J())}function re(e){return S=/w|e|^$/.test(m)||v?Q(e):Y(D.x2),z=/n|s|^$/.test(m)||v?F(e):$(D.y2),ne(),!1}function ce(e,t){S=(x=e)+D.width,z=(w=t)+D.height,xe.extend(D,{x1:q(x),y1:B(w),x2:q(S),y2:B(z)}),Z(),n.onSelectChange(o,J())}function de(e){return x=Se(r,ze(u+Q(e),r+d-D.width)),w=Se(c,ze(l+F(e),c+a-D.height)),ce(x,w),e.preventDefault(),!1}function ae(){xe(document).off("mousemove touchmove",ae),V(),S=x,z=w,ne(),m="",M.is(":visible")||P.add(M).hide().fadeIn(n.fadeSpeed||0),b=!0,xe(document).off("mouseup touchend",ue).on("mousemove touchmove",re).one("mouseup touchend",oe),P.off("mousemove touchmove",te),n.onSelectStart(o,J())}function ue(){xe(document).off("mousemove touchmove",ae).off("mouseup touchend",ue),ee(P.add(M)),U(q(x),B(w),q(x),B(w)),this instanceof xe.imgAreaSelect||(n.onSelectChange(o,J()),n.onSelectEnd(o,J()))}function le(e){return 1<e.which||M.is(":animated")||(V(),u=x=Q(e),l=w=F(e),xe(document).on({"mousemove touchmove":ae,"mouseup touchend":ue})),!1}function he(){_(!1)}function fe(){t=!0,ye(n=xe.extend({classPrefix:"imgareaselect",movable:!0,parent:"body",resizable:!0,resizeMargin:10,onInit:function(){},onSelectStart:function(){},onSelectChange:function(){},onSelectEnd:function(){}},n)),P.add(M).css({visibility:""}),n.show&&(b=!0,V(),Z(),P.add(M).hide().fadeIn(n.fadeSpeed||0)),setTimeout(function(){n.onInit(o,J())},0)}var me=function(e){var t,o=n.keys,i=e.keyCode,s=isNaN(o.alt)||!e.altKey&&!e.originalEvent.altKey?!isNaN(o.ctrl)&&e.ctrlKey?o.ctrl:!isNaN(o.shift)&&e.shiftKey?o.shift:isNaN(o.arrows)?10:o.arrows:o.alt;if("resize"==o.arrows||"resize"==o.shift&&e.shiftKey||"resize"==o.ctrl&&e.ctrlKey||"resize"==o.alt&&(e.altKey||e.originalEvent.altKey)){switch(i){case 37:s=-s;case 39:t=Se(x,S),x=ze(x,S),S=Se(t+s,x),se();break;case 38:s=-s;case 40:t=Se(w,z),w=ze(w,z),z=Se(t+s,w),se(!0);break;default:return}ne()}else switch(x=ze(x,S),w=ze(w,z),i){case 37:ce(Se(x-s,r),w);break;case 38:ce(x,Se(w-s,c));break;case 39:ce(x+ze(s,d-q(S)),w);break;case 40:ce(x,w+ze(s,a-B(z)));break;default:return}return!1};function pe(e,t){for(var o in t)void 0!==n[o]&&e.css(t[o],n[o])}function ye(e){if(e.parent&&(s=xe(e.parent)).append(P.add(M)),xe.extend(n,e),V(),null!=e.handles){for(E.remove(),E=xe([]),k=e.handles?"corners"==e.handles?4:8:0;k--;)E=E.add(Ce());E.addClass(n.classPrefix+"-handle").css({position:"absolute",fontSize:"0",zIndex:L+1||1}),0<=!parseInt(E.css("width"))&&E.width(5).height(5),(C=n.borderWidth)&&E.css({borderWidth:C,borderStyle:"solid"}),pe(E,{borderColor1:"border-color",borderColor2:"background-color",borderOpacity:"opacity"})}for(h=n.imageWidth/d||1,f=n.imageHeight/a||1,null!=e.x1&&(U(e.x1,e.y1,e.x2,e.y2),e.show=!e.hide),e.keys&&(n.keys=xe.extend({shift:1,ctrl:"resize"},e.keys)),M.addClass(n.classPrefix+"-outer"),N.addClass(n.classPrefix+"-selection"),k=0;k++<4;)xe(H[k-1]).addClass(n.classPrefix+"-border"+k);pe(N,{selectionColor:"background-color",selectionOpacity:"opacity"}),pe(H,{borderOpacity:"opacity",borderWidth:"border-width"}),pe(M,{outerColor:"background-color",outerOpacity:"opacity"}),(C=n.borderColor1)&&xe(H[0]).css({borderStyle:"solid",borderColor:C}),(C=n.borderColor2)&&xe(H[1]).css({borderStyle:"dashed",borderColor:C}),P.append(N.add(H).add(i)).append(E),ge&&((C=(M.css("filter")||"").match(/opacity=(\d+)/))&&M.css("opacity",C[1]/100),(C=(H.css("filter")||"").match(/opacity=(\d+)/))&&H.css("opacity",C[1]/100)),e.hide?ee(P.add(M)):e.show&&t&&(b=!0,P.add(M).fadeIn(n.fadeSpeed||0),_()),v=(C=(n.aspectRatio||"").split(/:/))[0]/C[1],K.add(M).off("mousedown",le),n.disable||!1===n.enable?(P.off({"mousemove touchmove":te,"mousedown touchstart":ie}),xe(window).off("resize",he)):(!n.enable&&!1!==n.disable||((n.resizable||n.movable)&&P.on({"mousemove touchmove":te,"mousedown touchstart":ie}),xe(window).on("resize",he)),n.persistent||K.add(M).on("mousedown touchstart",le)),n.enable=n.disable=void 0}this.remove=function(){ye({disable:!0}),P.add(M).remove()},this.getOptions=function(){return n},this.setOptions=ye,this.getSelection=J,this.setSelection=U,this.cancelSelection=ue,this.update=_;for(var ge=(/msie ([\w.]+)/i.exec(X)||[])[1],ve=/opera/i.test(X),X=/webkit/i.test(X)&&!/chrome/i.test(X),be=K;be.length;)L=Se(L,isNaN(be.css("z-index"))?L:be.css("z-index")),"fixed"==be.css("position")&&(j="fixed"),be=be.parent(":not(body)");L=n.zIndex||L,ge&&K.attr("unselectable","on"),xe.imgAreaSelect.keyPress=ge||X?"keydown":"keypress",ve&&(i=Ce().css({width:"100%",height:"100%",position:"absolute",zIndex:L+2||2})),P.add(M).css({visibility:"hidden",position:j,overflow:"hidden",zIndex:L||"0"}),P.css({zIndex:L+2||2}),N.add(H).css({position:"absolute",fontSize:"0"}),o.complete||"complete"==o.readyState||!K.is("img")?fe():K.one("load",fe),!t&&ge&&7<=ge&&(o.src=o.src)},xe.fn.imgAreaSelect=function(e){return e=e||{},this.each(function(){xe(this).data("imgAreaSelect")?e.remove?(xe(this).data("imgAreaSelect").remove(),xe(this).removeData("imgAreaSelect")):xe(this).data("imgAreaSelect").setOptions(e):e.remove||(void 0===e.enable&&void 0===e.disable&&(e.enable=!0),xe(this).data("imgAreaSelect",new xe.imgAreaSelect(this,e)))}),e.instance?xe(this).data("imgAreaSelect"):this}}(jQuery);
\ No newline at end of file
+!function(Se){var ze=Math.abs,ke=Math.max,Ce=Math.min,Ae=Math.floor;function We(){return Se("<div/>")}Se.imgAreaSelect=function(o,s){var T,L,r,c,d,a,t,j,D,R,X,i,Y,$,q,B,n,Q,u,l,h,f,F,m,p,y,g,G,v=Se(o),b=We(),x=We(),w=We().add(We()).add(We()).add(We()),S=We().add(We()).add(We()).add(We()),z=Se([]),k={left:0,top:0},C={left:0,top:0},A=0,J="absolute",W={x1:0,y1:0,x2:0,y2:0,width:0,height:0},U=document.documentElement,V=navigator.userAgent;function I(e){return e+k.left-C.left}function K(e){return e+k.top-C.top}function P(e){return e-k.left+C.left}function N(e){return e-k.top+C.top}function Z(e){return ke(e.pageX||0,ee(e).x)-C.left}function _(e){return ke(e.pageY||0,ee(e).y)-C.top}function ee(e){e=e.originalEvent||{};return e.touches&&e.touches.length?{x:e.touches[0].pageX,y:e.touches[0].pageY}:{x:0,y:0}}function H(e){var t=e||R,e=e||X;return{x1:Ae(W.x1*t),y1:Ae(W.y1*e),x2:Ae(W.x2*t),y2:Ae(W.y2*e),width:Ae(W.x2*t)-Ae(W.x1*t),height:Ae(W.y2*e)-Ae(W.y1*e)}}function te(e,t,o,i,n){var s=n||R,n=n||X;(W={x1:Ae(e/s||0),y1:Ae(t/n||0),x2:Ae(o/s||0),y2:Ae(i/n||0)}).width=W.x2-W.x1,W.height=W.y2-W.y1}function M(){T&&v.width()&&(k={left:Ae(v.offset().left),top:Ae(v.offset().top)},d=v.innerWidth(),a=v.innerHeight(),k.top+=v.outerHeight()-a>>1,k.left+=v.outerWidth()-d>>1,Y=Ae(s.minWidth/R)||0,$=Ae(s.minHeight/X)||0,q=Ae(Ce(s.maxWidth/R||1<<24,d)),B=Ae(Ce(s.maxHeight/X||1<<24,a)),"1.3.2"!=Se().jquery||"fixed"!=J||U.getBoundingClientRect||(k.top+=ke(document.body.scrollTop,U.scrollTop),k.left+=ke(document.body.scrollLeft,U.scrollLeft)),C=/absolute|relative/.test(t.css("position"))?{left:Ae(t.offset().left)-t.scrollLeft(),top:Ae(t.offset().top)-t.scrollTop()}:"fixed"==J?{left:Se(document).scrollLeft(),top:Se(document).scrollTop()}:{left:0,top:0},r=I(0),c=K(0),(W.x2>d||W.y2>a)&&ae())}function oe(e){if(Q){switch(b.css({left:I(W.x1),top:K(W.y1)}).add(x).width(y=W.width).height(g=W.height),x.add(w).add(z).css({left:0,top:0}),w.width(ke(y-w.outerWidth()+w.innerWidth(),0)).height(ke(g-w.outerHeight()+w.innerHeight(),0)),Se(S[0]).css({left:r,top:c,width:W.x1,height:a}),Se(S[1]).css({left:r+W.x1,top:c,width:y,height:W.y1}),Se(S[2]).css({left:r+W.x2,top:c,width:d-W.x2,height:a}),Se(S[3]).css({left:r+W.x1,top:c+W.y2,width:y,height:a-W.y2}),y-=z.outerWidth(),g-=z.outerHeight(),z.length){case 8:Se(z[4]).css({left:y>>1}),Se(z[5]).css({left:y,top:g>>1}),Se(z[6]).css({left:y>>1,top:g}),Se(z[7]).css({top:g>>1});case 4:z.slice(1,3).css({left:y}),z.slice(2,4).css({top:g})}!1!==e&&(Se.imgAreaSelect.onKeyPress!=ve&&Se(document).off(Se.imgAreaSelect.keyPress,Se.imgAreaSelect.onKeyPress),s.keys&&Se(document).on(Se.imgAreaSelect.keyPress,function(){Se.imgAreaSelect.onKeyPress=ve})),O&&w.outerWidth()-w.innerWidth()==2&&(w.css("margin",0),setTimeout(function(){w.css("margin","auto")},0))}}function ie(e){M(),oe(e),ne()}function ne(){u=I(W.x1),l=K(W.y1),h=I(W.x2),f=K(W.y2)}function se(e,t){s.fadeSpeed?e.fadeOut(s.fadeSpeed,t):e.hide()}function E(e){var t=P(Z(e))-W.x1,e=N(_(e))-W.y1;G||(M(),G=!0,b.one("mouseout",function(){G=!1})),i="",s.resizable&&(e<=s.resizeMargin?i="n":e>=W.height-s.resizeMargin&&(i="s"),t<=s.resizeMargin?i+="w":t>=W.width-s.resizeMargin&&(i+="e")),b.css("cursor",i?i+"-resize":s.movable?"move":""),L&&L.toggle()}function re(e){Se("body").css("cursor",""),!s.autoHide&&W.width*W.height!=0||se(b.add(S),function(){Se(this).hide()}),Se(document).off("mousemove touchmove",ue),b.on("mousemove touchmove",E),s.onSelectEnd(o,H())}function ce(e){return"mousedown"==e.type&&1!=e.which||(E(e),M(),i?(Se("body").css("cursor",i+"-resize"),u=I(W[/w/.test(i)?"x2":"x1"]),l=K(W[/n/.test(i)?"y2":"y1"]),Se(document).on("mousemove touchmove",ue).one("mouseup touchend",re),b.off("mousemove touchmove",E)):s.movable?(j=r+W.x1-Z(e),D=c+W.y1-_(e),b.off("mousemove touchmove",E),Se(document).on("mousemove touchmove",he).one("mouseup touchend",function(){s.onSelectEnd(o,H()),Se(document).off("mousemove touchmove",he),b.on("mousemove touchmove",E)})):v.mousedown(e)),!1}function de(e){n&&(e?(h=ke(r,Ce(r+d,u+ze(f-l)*n*(u<h||-1))),f=Ae(ke(c,Ce(c+a,l+ze(h-u)/n*(l<f||-1)))),h=Ae(h)):(f=ke(c,Ce(c+a,l+ze(h-u)/n*(l<f||-1))),h=Ae(ke(r,Ce(r+d,u+ze(f-l)*n*(u<h||-1)))),f=Ae(f)))}function ae(){null!=u&&null!=h&&null!=l&&null!=f||ne(),u=Ce(u,r+d),l=Ce(l,c+a),ze(h-u)<Y&&((h=u-Y*(h<u||-1))<r?u=r+Y:r+d<h&&(u=r+d-Y)),ze(f-l)<$&&((f=l-$*(f<l||-1))<c?l=c+$:c+a<f&&(l=c+a-$)),h=ke(r,Ce(h,r+d)),f=ke(c,Ce(f,c+a)),de(ze(h-u)<ze(f-l)*n),ze(h-u)>q&&(h=u-q*(h<u||-1),de()),ze(f-l)>B&&(f=l-B*(f<l||-1),de(!0)),W={x1:P(Ce(u,h)),x2:P(ke(u,h)),y1:N(Ce(l,f)),y2:N(ke(l,f)),width:ze(h-u),height:ze(f-l)},oe(),s.onSelectChange(o,H())}function ue(e){return h=/w|e|^$/.test(i)||n?Z(e):I(W.x2),f=/n|s|^$/.test(i)||n?_(e):K(W.y2),ae(),!1}function le(e,t){h=(u=e)+W.width,f=(l=t)+W.height,Se.extend(W,{x1:P(u),y1:N(l),x2:P(h),y2:N(f)}),oe(),s.onSelectChange(o,H())}function he(e){return u=ke(r,Ce(j+Z(e),r+d-W.width)),l=ke(c,Ce(D+_(e),c+a-W.height)),le(u,l),e.preventDefault(),!1}function fe(){Se(document).off("mousemove touchmove",fe),M(),h=u,f=l,ae(),i="",S.is(":visible")||b.add(S).hide().fadeIn(s.fadeSpeed||0),Q=!0,Se(document).off("mouseup touchend",me).on("mousemove touchmove",ue).one("mouseup touchend",re),b.off("mousemove touchmove",E),s.onSelectStart(o,H())}function me(){Se(document).off("mousemove touchmove",fe).off("mouseup touchend",me),se(b.add(S)),te(P(u),N(l),P(u),N(l)),this instanceof Se.imgAreaSelect||(s.onSelectChange(o,H()),s.onSelectEnd(o,H()))}function pe(e){return 1<e.which||S.is(":animated")||(M(),j=u=Z(e),D=l=_(e),Se(document).on({"mousemove touchmove":fe,"mouseup touchend":me})),!1}function ye(){ie(!1)}function ge(){T=!0,xe(s=Se.extend({classPrefix:"imgareaselect",movable:!0,parent:"body",resizable:!0,resizeMargin:10,onInit:function(){},onSelectStart:function(){},onSelectChange:function(){},onSelectEnd:function(){}},s)),b.add(S).css({visibility:""}),s.show&&(Q=!0,M(),oe(),b.add(S).hide().fadeIn(s.fadeSpeed||0)),setTimeout(function(){s.onInit(o,H())},0)}var ve=function(e){var t,o=s.keys,i=e.keyCode,n=isNaN(o.alt)||!e.altKey&&!e.originalEvent.altKey?!isNaN(o.ctrl)&&e.ctrlKey?o.ctrl:!isNaN(o.shift)&&e.shiftKey?o.shift:isNaN(o.arrows)?10:o.arrows:o.alt;if("resize"==o.arrows||"resize"==o.shift&&e.shiftKey||"resize"==o.ctrl&&e.ctrlKey||"resize"==o.alt&&(e.altKey||e.originalEvent.altKey)){switch(i){case 37:n=-n;case 39:t=ke(u,h),u=Ce(u,h),h=ke(t+n,u),de();break;case 38:n=-n;case 40:t=ke(l,f),l=Ce(l,f),f=ke(t+n,l),de(!0);break;default:return}ae()}else switch(u=Ce(u,h),l=Ce(l,f),i){case 37:le(ke(u-n,r),l);break;case 38:le(u,ke(l-n,c));break;case 39:le(u+Ce(n,d-P(h)),l);break;case 40:le(u,l+Ce(n,a-N(f)));break;default:return}return!1};function be(e,t){for(var o in t)void 0!==s[o]&&e.css(t[o],s[o])}function xe(e){if(e.parent&&(t=Se(e.parent)).append(b.add(S)),Se.extend(s,e),M(),null!=e.handles){for(z.remove(),z=Se([]),m=e.handles?"corners"==e.handles?4:8:0;m--;)z=z.add(We());z.addClass(s.classPrefix+"-handle").css({position:"absolute",fontSize:"0",zIndex:A+1||1}),0<=!parseInt(z.css("width"))&&z.width(5).height(5),(p=s.borderWidth)&&z.css({borderWidth:p,borderStyle:"solid"}),be(z,{borderColor1:"border-color",borderColor2:"background-color",borderOpacity:"opacity"})}for(R=s.imageWidth/d||1,X=s.imageHeight/a||1,null!=e.x1&&(te(e.x1,e.y1,e.x2,e.y2),e.show=!e.hide),e.keys&&(s.keys=Se.extend({shift:1,ctrl:"resize"},e.keys)),S.addClass(s.classPrefix+"-outer"),x.addClass(s.classPrefix+"-selection"),m=0;m++<4;)Se(w[m-1]).addClass(s.classPrefix+"-border"+m);be(x,{selectionColor:"background-color",selectionOpacity:"opacity"}),be(w,{borderOpacity:"opacity",borderWidth:"border-width"}),be(S,{outerColor:"background-color",outerOpacity:"opacity"}),(p=s.borderColor1)&&Se(w[0]).css({borderStyle:"solid",borderColor:p}),(p=s.borderColor2)&&Se(w[1]).css({borderStyle:"dashed",borderColor:p}),b.append(x.add(w).add(L)).append(z),O&&((p=(S.css("filter")||"").match(/opacity=(\d+)/))&&S.css("opacity",p[1]/100),(p=(w.css("filter")||"").match(/opacity=(\d+)/))&&w.css("opacity",p[1]/100)),e.hide?se(b.add(S)):e.show&&T&&(Q=!0,b.add(S).fadeIn(s.fadeSpeed||0),ie()),n=(F=(s.aspectRatio||"").split(/:/))[0]/F[1],v.add(S).off("mousedown",pe),s.disable||!1===s.enable?(b.off({"mousemove touchmove":E,"mousedown touchstart":ce}),Se(window).off("resize",ye)):(!s.enable&&!1!==s.disable||((s.resizable||s.movable)&&b.on({"mousemove touchmove":E,"mousedown touchstart":ce}),Se(window).on("resize",ye)),s.persistent||v.add(S).on("mousedown touchstart",pe)),s.enable=s.disable=void 0}this.remove=function(){xe({disable:!0}),b.add(S).remove()},this.getOptions=function(){return s},this.setOptions=xe,this.getSelection=H,this.setSelection=te,this.cancelSelection=me,this.update=ie;for(var O=(/msie ([\w.]+)/i.exec(V)||[])[1],we=/opera/i.test(V),V=/webkit/i.test(V)&&!/chrome/i.test(V),e=v;e.length;)A=ke(A,isNaN(e.css("z-index"))?A:e.css("z-index")),"fixed"==e.css("position")&&(J="fixed"),e=e.parent(":not(body)");A=s.zIndex||A,O&&v.attr("unselectable","on"),Se.imgAreaSelect.keyPress=O||V?"keydown":"keypress",we&&(L=We().css({width:"100%",height:"100%",position:"absolute",zIndex:A+2||2})),b.add(S).css({visibility:"hidden",position:J,overflow:"hidden",zIndex:A||"0"}),b.css({zIndex:A+2||2}),x.add(w).css({position:"absolute",fontSize:"0"}),o.complete||"complete"==o.readyState||!v.is("img")?ge():v.one("load",ge),!T&&O&&7<=O&&(o.src=o.src)},Se.fn.imgAreaSelect=function(e){return e=e||{},this.each(function(){Se(this).data("imgAreaSelect")?e.remove?(Se(this).data("imgAreaSelect").remove(),Se(this).removeData("imgAreaSelect")):Se(this).data("imgAreaSelect").setOptions(e):e.remove||(void 0===e.enable&&void 0===e.disable&&(e.enable=!0),Se(this).data("imgAreaSelect",new Se.imgAreaSelect(this,e)))}),e.instance?Se(this).data("imgAreaSelect"):this}}(jQuery);
diff --git a/src/js/_enqueues/vendor/jquery/jquery-migrate.js b/src/js/_enqueues/vendor/jquery/jquery-migrate.js
index c3356df88600d..5ef505ed920f9 100644
--- a/src/js/_enqueues/vendor/jquery/jquery-migrate.js
+++ b/src/js/_enqueues/vendor/jquery/jquery-migrate.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Migrate - v3.3.2 - 2020-11-18T08:29Z
+ * jQuery Migrate - v3.4.1 - 2023-02-23T15:31Z
  * Copyright OpenJS Foundation and other contributors
  */
 ( function( factory ) {
@@ -24,7 +24,7 @@
 } )( function( jQuery, window ) {
 "use strict";
 
-jQuery.migrateVersion = "3.3.2";
+jQuery.migrateVersion = "3.4.1";
 
 // Returns 0 if v1 == v2, -1 if v1 < v2, 1 if v1 > v2
 function compareVersions( v1, v2 ) {
@@ -48,6 +48,40 @@ function jQueryVersionSince( version ) {
 	return compareVersions( jQuery.fn.jquery, version ) >= 0;
 }
 
+// A map from disabled patch codes to `true`. This should really
+// be a `Set` but those are unsupported in IE.
+var disabledPatches = Object.create( null );
+
+// Don't apply patches for specified codes. Helpful for code bases
+// where some Migrate warnings have been addressed and it's desirable
+// to avoid needless patches or false positives.
+jQuery.migrateDisablePatches = function() {
+	var i;
+	for ( i = 0; i < arguments.length; i++ ) {
+		disabledPatches[ arguments[ i ] ] = true;
+	}
+};
+
+// Allow enabling patches disabled via `jQuery.migrateDisablePatches`.
+// Helpful if you want to disable a patch only for some code that won't
+// be updated soon to be able to focus on other warnings - and enable it
+// immediately after such a call:
+// ```js
+// jQuery.migrateDisablePatches( "workaroundA" );
+// elem.pluginViolatingWarningA( "pluginMethod" );
+// jQuery.migrateEnablePatches( "workaroundA" );
+// ```
+jQuery.migrateEnablePatches = function() {
+	var i;
+	for ( i = 0; i < arguments.length; i++ ) {
+		delete disabledPatches[ arguments[ i ] ];
+	}
+};
+
+jQuery.migrateIsPatchEnabled = function( patchCode ) {
+	return !disabledPatches[ patchCode ];
+};
+
 ( function() {
 
 	// Support: IE9 only
@@ -57,9 +91,10 @@ function jQueryVersionSince( version ) {
 		return;
 	}
 
-	// Need jQuery 3.0.0+ and no older Migrate loaded
-	if ( !jQuery || !jQueryVersionSince( "3.0.0" ) ) {
-		window.console.log( "JQMIGRATE: jQuery 3.0.0+ REQUIRED" );
+	// Need jQuery 3.x-4.x and no older Migrate loaded
+	if ( !jQuery || !jQueryVersionSince( "3.0.0" ) ||
+			jQueryVersionSince( "5.0.0" ) ) {
+		window.console.log( "JQMIGRATE: jQuery 3.x-4.x REQUIRED" );
 	}
 	if ( jQuery.migrateWarnings ) {
 		window.console.log( "JQMIGRATE: Migrate plugin loaded multiple times" );
@@ -91,11 +126,12 @@ jQuery.migrateReset = function() {
 	jQuery.migrateWarnings.length = 0;
 };
 
-function migrateWarn( msg ) {
+function migrateWarn( code, msg ) {
 	var console = window.console;
-	if ( !jQuery.migrateDeduplicateWarnings || !warnedAbout[ msg ] ) {
+	if ( jQuery.migrateIsPatchEnabled( code ) &&
+		( !jQuery.migrateDeduplicateWarnings || !warnedAbout[ msg ] ) ) {
 		warnedAbout[ msg ] = true;
-		jQuery.migrateWarnings.push( msg );
+		jQuery.migrateWarnings.push( msg + " [" + code + "]" );
 		if ( console && console.warn && !jQuery.migrateMute ) {
 			console.warn( "JQMIGRATE: " + msg );
 			if ( jQuery.migrateTrace && console.trace ) {
@@ -105,32 +141,62 @@ function migrateWarn( msg ) {
 	}
 }
 
-function migrateWarnProp( obj, prop, value, msg ) {
+function migrateWarnProp( obj, prop, value, code, msg ) {
 	Object.defineProperty( obj, prop, {
 		configurable: true,
 		enumerable: true,
 		get: function() {
-			migrateWarn( msg );
+			migrateWarn( code, msg );
 			return value;
 		},
 		set: function( newValue ) {
-			migrateWarn( msg );
+			migrateWarn( code, msg );
 			value = newValue;
 		}
 	} );
 }
 
-function migrateWarnFunc( obj, prop, newFunc, msg ) {
+function migrateWarnFuncInternal( obj, prop, newFunc, code, msg ) {
+	var finalFunc,
+		origFunc = obj[ prop ];
+
 	obj[ prop ] = function() {
-		migrateWarn( msg );
-		return newFunc.apply( this, arguments );
+
+		// If `msg` not provided, do not warn; more sophisticated warnings
+		// logic is most likely embedded in `newFunc`, in that case here
+		// we just care about the logic choosing the proper implementation
+		// based on whether the patch is disabled or not.
+		if ( msg ) {
+			migrateWarn( code, msg );
+		}
+
+		// Since patches can be disabled & enabled dynamically, we
+		// need to decide which implementation to run on each invocation.
+		finalFunc = jQuery.migrateIsPatchEnabled( code ) ?
+			newFunc :
+
+			// The function may not have existed originally so we need a fallback.
+			( origFunc || jQuery.noop );
+
+		return finalFunc.apply( this, arguments );
 	};
 }
 
+function migratePatchAndWarnFunc( obj, prop, newFunc, code, msg ) {
+	if ( !msg ) {
+		throw new Error( "No warning message provided" );
+	}
+	return migrateWarnFuncInternal( obj, prop, newFunc, code, msg );
+}
+
+function migratePatchFunc( obj, prop, newFunc, code ) {
+	return migrateWarnFuncInternal( obj, prop, newFunc, code );
+}
+
 if ( window.document.compatMode === "BackCompat" ) {
 
-	// JQuery has never supported or tested Quirks Mode
-	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+	// jQuery has never supported or tested Quirks Mode
+	migrateWarn( "quirks", "jQuery is not compatible with Quirks Mode" );
 }
 
 var findProp,
@@ -141,25 +207,31 @@ var findProp,
 	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
 	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
 
-	// Support: Android <=4.0 only
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+	// Require that the "whitespace run" starts from a non-whitespace
+	// to avoid O(N^2) behavior when the engine would try matching "\s+$" at each space position.
+	rtrim = /^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;
 
-jQuery.fn.init = function( arg1 ) {
+migratePatchFunc( jQuery.fn, "init", function( arg1 ) {
 	var args = Array.prototype.slice.call( arguments );
 
-	if ( typeof arg1 === "string" && arg1 === "#" ) {
+	if ( jQuery.migrateIsPatchEnabled( "selector-empty-id" ) &&
+		typeof arg1 === "string" && arg1 === "#" ) {
 
-		// JQuery( "#" ) is a bogus ID selector, but it returned an empty set before jQuery 3.0
-		migrateWarn( "jQuery( '#' ) is not a valid selector" );
+		// JQuery( "#" ) is a bogus ID selector, but it returned an empty set
+		// before jQuery 3.0
+		migrateWarn( "selector-empty-id", "jQuery( '#' ) is not a valid selector" );
 		args[ 0 ] = [];
 	}
 
 	return oldInit.apply( this, args );
-};
+}, "selector-empty-id" );
+
+// This is already done in Core but the above patch will lose this assignment
+// so we need to redo it. It doesn't matter whether the patch is enabled or not
+// as the method is always going to be a Migrate-created wrapper.
 jQuery.fn.init.prototype = jQuery.fn;
 
-jQuery.find = function( selector ) {
+migratePatchFunc( jQuery, "find", function( selector ) {
 	var args = Array.prototype.slice.call( arguments );
 
 	// Support: PhantomJS 1.x
@@ -181,16 +253,18 @@ jQuery.find = function( selector ) {
 			// Note that there may be false alarms if selector uses jQuery extensions
 			try {
 				window.document.querySelector( selector );
-				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+				migrateWarn( "selector-hash",
+					"Attribute selector with '#' must be quoted: " + args[ 0 ] );
 				args[ 0 ] = selector;
 			} catch ( err2 ) {
-				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+				migrateWarn( "selector-hash",
+					"Attribute selector with '#' was not fixed: " + args[ 0 ] );
 			}
 		}
 	}
 
 	return oldFind.apply( this, args );
-};
+}, "selector-hash" );
 
 // Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
 for ( findProp in oldFind ) {
@@ -200,53 +274,53 @@ for ( findProp in oldFind ) {
 }
 
 // The number of elements contained in the matched element set
-migrateWarnFunc( jQuery.fn, "size", function() {
+migratePatchAndWarnFunc( jQuery.fn, "size", function() {
 	return this.length;
-},
+}, "size",
 "jQuery.fn.size() is deprecated and removed; use the .length property" );
 
-migrateWarnFunc( jQuery, "parseJSON", function() {
+migratePatchAndWarnFunc( jQuery, "parseJSON", function() {
 	return JSON.parse.apply( null, arguments );
-},
+}, "parseJSON",
 "jQuery.parseJSON is deprecated; use JSON.parse" );
 
-migrateWarnFunc( jQuery, "holdReady", jQuery.holdReady,
-	"jQuery.holdReady is deprecated" );
+migratePatchAndWarnFunc( jQuery, "holdReady", jQuery.holdReady,
+	"holdReady", "jQuery.holdReady is deprecated" );
 
-migrateWarnFunc( jQuery, "unique", jQuery.uniqueSort,
-	"jQuery.unique is deprecated; use jQuery.uniqueSort" );
+migratePatchAndWarnFunc( jQuery, "unique", jQuery.uniqueSort,
+	"unique", "jQuery.unique is deprecated; use jQuery.uniqueSort" );
 
 // Now jQuery.expr.pseudos is the standard incantation
-migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos,
+migrateWarnProp( jQuery.expr, "filters", jQuery.expr.pseudos, "expr-pre-pseudos",
 	"jQuery.expr.filters is deprecated; use jQuery.expr.pseudos" );
-migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos,
+migrateWarnProp( jQuery.expr, ":", jQuery.expr.pseudos, "expr-pre-pseudos",
 	"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos" );
 
 // Prior to jQuery 3.1.1 there were internal refs so we don't warn there
 if ( jQueryVersionSince( "3.1.1" ) ) {
-	migrateWarnFunc( jQuery, "trim", function( text ) {
+	migratePatchAndWarnFunc( jQuery, "trim", function( text ) {
 		return text == null ?
 			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
+			( text + "" ).replace( rtrim, "$1" );
+	}, "trim",
 	"jQuery.trim is deprecated; use String.prototype.trim" );
 }
 
 // Prior to jQuery 3.2 there were internal refs so we don't warn there
 if ( jQueryVersionSince( "3.2.0" ) ) {
-	migrateWarnFunc( jQuery, "nodeName", function( elem, name ) {
+	migratePatchAndWarnFunc( jQuery, "nodeName", function( elem, name ) {
 		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
+	}, "nodeName",
 	"jQuery.nodeName is deprecated" );
 
-	migrateWarnFunc( jQuery, "isArray", Array.isArray,
+	migratePatchAndWarnFunc( jQuery, "isArray", Array.isArray, "isArray",
 		"jQuery.isArray is deprecated; use Array.isArray"
 	);
 }
 
 if ( jQueryVersionSince( "3.3.0" ) ) {
 
-	migrateWarnFunc( jQuery, "isNumeric", function( obj ) {
+	migratePatchAndWarnFunc( jQuery, "isNumeric", function( obj ) {
 
 			// As of jQuery 3.0, isNumeric is limited to
 			// strings and numbers (primitives or objects)
@@ -258,7 +332,7 @@ if ( jQueryVersionSince( "3.3.0" ) ) {
 				// ...but misinterprets leading-number strings, e.g. hex literals ("0x...")
 				// subtraction forces infinities to NaN
 				!isNaN( obj - parseFloat( obj ) );
-		},
+		}, "isNumeric",
 		"jQuery.isNumeric() is deprecated"
 	);
 
@@ -269,7 +343,7 @@ if ( jQueryVersionSince( "3.3.0" ) ) {
 		class2type[ "[object " + name + "]" ] = name.toLowerCase();
 	} );
 
-	migrateWarnFunc( jQuery, "type", function( obj ) {
+	migratePatchAndWarnFunc( jQuery, "type", function( obj ) {
 		if ( obj == null ) {
 			return obj + "";
 		}
@@ -278,19 +352,19 @@ if ( jQueryVersionSince( "3.3.0" ) ) {
 		return typeof obj === "object" || typeof obj === "function" ?
 			class2type[ Object.prototype.toString.call( obj ) ] || "object" :
 			typeof obj;
-	},
+	}, "type",
 	"jQuery.type is deprecated" );
 
-	migrateWarnFunc( jQuery, "isFunction",
+	migratePatchAndWarnFunc( jQuery, "isFunction",
 		function( obj ) {
 			return typeof obj === "function";
-		},
+		}, "isFunction",
 		"jQuery.isFunction() is deprecated" );
 
-	migrateWarnFunc( jQuery, "isWindow",
+	migratePatchAndWarnFunc( jQuery, "isWindow",
 		function( obj ) {
 			return obj != null && obj === obj.window;
-		},
+		}, "isWindow",
 		"jQuery.isWindow() is deprecated"
 	);
 }
@@ -301,21 +375,21 @@ if ( jQuery.ajax ) {
 var oldAjax = jQuery.ajax,
 	rjsonp = /(=)\?(?=&|$)|\?\?/;
 
-jQuery.ajax = function( ) {
+migratePatchFunc( jQuery, "ajax", function() {
 	var jQXHR = oldAjax.apply( this, arguments );
 
 	// Be sure we got a jQXHR (e.g., not sync)
 	if ( jQXHR.promise ) {
-		migrateWarnFunc( jQXHR, "success", jQXHR.done,
+		migratePatchAndWarnFunc( jQXHR, "success", jQXHR.done, "jqXHR-methods",
 			"jQXHR.success is deprecated and removed" );
-		migrateWarnFunc( jQXHR, "error", jQXHR.fail,
+		migratePatchAndWarnFunc( jQXHR, "error", jQXHR.fail, "jqXHR-methods",
 			"jQXHR.error is deprecated and removed" );
-		migrateWarnFunc( jQXHR, "complete", jQXHR.always,
+		migratePatchAndWarnFunc( jQXHR, "complete", jQXHR.always, "jqXHR-methods",
 			"jQXHR.complete is deprecated and removed" );
 	}
 
 	return jQXHR;
-};
+}, "jqXHR-methods" );
 
 // Only trigger the logic in jQuery <4 as the JSON-to-JSONP auto-promotion
 // behavior is gone in jQuery 4.0 and as it has security implications, we don't
@@ -334,7 +408,7 @@ if ( !jQueryVersionSince( "4.0.0" ) ) {
 					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
 				rjsonp.test( s.data )
 		) ) {
-			migrateWarn( "JSON-to-JSONP auto-promotion is deprecated" );
+			migrateWarn( "jsonp-promotion", "JSON-to-JSONP auto-promotion is deprecated" );
 		}
 	} );
 }
@@ -345,27 +419,43 @@ var oldRemoveAttr = jQuery.fn.removeAttr,
 	oldToggleClass = jQuery.fn.toggleClass,
 	rmatchNonSpace = /\S+/g;
 
-jQuery.fn.removeAttr = function( name ) {
-	var self = this;
+migratePatchFunc( jQuery.fn, "removeAttr", function( name ) {
+	var self = this,
+		patchNeeded = false;
 
 	jQuery.each( name.match( rmatchNonSpace ), function( _i, attr ) {
 		if ( jQuery.expr.match.bool.test( attr ) ) {
-			migrateWarn( "jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
+
+			// Only warn if at least a single node had the property set to
+			// something else than `false`. Otherwise, this Migrate patch
+			// doesn't influence the behavior and there's no need to set or warn.
+			self.each( function() {
+				if ( jQuery( this ).prop( attr ) !== false ) {
+					patchNeeded = true;
+					return false;
+				}
+			} );
+		}
+
+		if ( patchNeeded ) {
+			migrateWarn( "removeAttr-bool",
+				"jQuery.fn.removeAttr no longer sets boolean properties: " + attr );
 			self.prop( attr, false );
 		}
 	} );
 
 	return oldRemoveAttr.apply( this, arguments );
-};
+}, "removeAttr-bool" );
 
-jQuery.fn.toggleClass = function( state ) {
+migratePatchFunc( jQuery.fn, "toggleClass", function( state ) {
 
 	// Only deprecating no-args or single boolean arg
 	if ( state !== undefined && typeof state !== "boolean" ) {
+
 		return oldToggleClass.apply( this, arguments );
 	}
 
-	migrateWarn( "jQuery.fn.toggleClass( boolean ) is deprecated" );
+	migrateWarn( "toggleClass-bool", "jQuery.fn.toggleClass( boolean ) is deprecated" );
 
 	// Toggle entire class name of each element
 	return this.each( function() {
@@ -387,7 +477,7 @@ jQuery.fn.toggleClass = function( state ) {
 			);
 		}
 	} );
-};
+}, "toggleClass-bool" );
 
 function camelCase( string ) {
 	return string.replace( /-([a-z])/g, function( _, letter ) {
@@ -395,7 +485,7 @@ function camelCase( string ) {
 	} );
 }
 
-var oldFnCss,
+var origFnCss, internalCssNumber,
 	internalSwapCall = false,
 	ralphaStart = /^[a-z]/,
 
@@ -440,12 +530,12 @@ if ( jQuery.swap ) {
 	} );
 }
 
-jQuery.swap = function( elem, options, callback, args ) {
+migratePatchFunc( jQuery, "swap", function( elem, options, callback, args ) {
 	var ret, name,
 		old = {};
 
 	if ( !internalSwapCall ) {
-		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+		migrateWarn( "swap", "jQuery.swap() is undocumented and deprecated" );
 	}
 
 	// Remember the old values, and insert the new ones
@@ -462,22 +552,71 @@ jQuery.swap = function( elem, options, callback, args ) {
 	}
 
 	return ret;
-};
+}, "swap" );
 
 if ( jQueryVersionSince( "3.4.0" ) && typeof Proxy !== "undefined" ) {
-
 	jQuery.cssProps = new Proxy( jQuery.cssProps || {}, {
 		set: function() {
-			migrateWarn( "JQMIGRATE: jQuery.cssProps is deprecated" );
+			migrateWarn( "cssProps", "jQuery.cssProps is deprecated" );
 			return Reflect.set.apply( this, arguments );
 		}
 	} );
 }
 
-// Create a dummy jQuery.cssNumber if missing. It won't be used by jQuery but
-// it will prevent code adding new keys to it unconditionally from crashing.
-if ( !jQuery.cssNumber ) {
-	jQuery.cssNumber = {};
+// In jQuery >=4 where jQuery.cssNumber is missing fill it with the latest 3.x version:
+// https://github.com/jquery/jquery/blob/3.6.0/src/css.js#L212-L233
+// This way, number values for the CSS properties below won't start triggering
+// Migrate warnings when jQuery gets updated to >=4.0.0 (gh-438).
+if ( jQueryVersionSince( "4.0.0" ) ) {
+
+	// We need to keep this as a local variable as we need it internally
+	// in a `jQuery.fn.css` patch and this usage shouldn't warn.
+	internalCssNumber = {
+		animationIterationCount: true,
+		columnCount: true,
+		fillOpacity: true,
+		flexGrow: true,
+		flexShrink: true,
+		fontWeight: true,
+		gridArea: true,
+		gridColumn: true,
+		gridColumnEnd: true,
+		gridColumnStart: true,
+		gridRow: true,
+		gridRowEnd: true,
+		gridRowStart: true,
+		lineHeight: true,
+		opacity: true,
+		order: true,
+		orphans: true,
+		widows: true,
+		zIndex: true,
+		zoom: true
+	};
+
+	if ( typeof Proxy !== "undefined" ) {
+		jQuery.cssNumber = new Proxy( internalCssNumber, {
+			get: function() {
+				migrateWarn( "css-number", "jQuery.cssNumber is deprecated" );
+				return Reflect.get.apply( this, arguments );
+			},
+			set: function() {
+				migrateWarn( "css-number", "jQuery.cssNumber is deprecated" );
+				return Reflect.set.apply( this, arguments );
+			}
+		} );
+	} else {
+
+		// Support: IE 9-11+
+		// IE doesn't support proxies, but we still want to restore the legacy
+		// jQuery.cssNumber there.
+		jQuery.cssNumber = internalCssNumber;
+	}
+} else {
+
+	// Make `internalCssNumber` defined for jQuery <4 as well as it's needed
+	// in the `jQuery.fn.css` patch below.
+	internalCssNumber = jQuery.cssNumber;
 }
 
 function isAutoPx( prop ) {
@@ -489,56 +628,66 @@ function isAutoPx( prop ) {
 		rautoPx.test( prop[ 0 ].toUpperCase() + prop.slice( 1 ) );
 }
 
-oldFnCss = jQuery.fn.css;
+origFnCss = jQuery.fn.css;
 
-jQuery.fn.css = function( name, value ) {
+migratePatchFunc( jQuery.fn, "css", function( name, value ) {
 	var camelName,
 		origThis = this;
+
 	if ( name && typeof name === "object" && !Array.isArray( name ) ) {
 		jQuery.each( name, function( n, v ) {
 			jQuery.fn.css.call( origThis, n, v );
 		} );
 		return this;
 	}
+
 	if ( typeof value === "number" ) {
 		camelName = camelCase( name );
-		if ( !isAutoPx( camelName ) && !jQuery.cssNumber[ camelName ] ) {
-			migrateWarn( "Number-typed values are deprecated for jQuery.fn.css( \"" +
+
+		// Use `internalCssNumber` to avoid triggering our warnings in this
+		// internal check.
+		if ( !isAutoPx( camelName ) && !internalCssNumber[ camelName ] ) {
+			migrateWarn( "css-number",
+				"Number-typed values are deprecated for jQuery.fn.css( \"" +
 				name + "\", value )" );
 		}
 	}
 
-	return oldFnCss.apply( this, arguments );
-};
+	return origFnCss.apply( this, arguments );
+}, "css-number" );
 
-var oldData = jQuery.data;
+var origData = jQuery.data;
 
-jQuery.data = function( elem, name, value ) {
+migratePatchFunc( jQuery, "data", function( elem, name, value ) {
 	var curData, sameKeys, key;
 
 	// Name can be an object, and each entry in the object is meant to be set as data
 	if ( name && typeof name === "object" && arguments.length === 2 ) {
-		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
+
+		curData = jQuery.hasData( elem ) && origData.call( this, elem );
 		sameKeys = {};
 		for ( key in name ) {
 			if ( key !== camelCase( key ) ) {
-				migrateWarn( "jQuery.data() always sets/gets camelCased names: " + key );
+				migrateWarn( "data-camelCase",
+					"jQuery.data() always sets/gets camelCased names: " + key );
 				curData[ key ] = name[ key ];
 			} else {
 				sameKeys[ key ] = name[ key ];
 			}
 		}
 
-		oldData.call( this, elem, sameKeys );
+		origData.call( this, elem, sameKeys );
 
 		return name;
 	}
 
 	// If the name is transformed, look for the un-transformed name in the data object
 	if ( name && typeof name === "string" && name !== camelCase( name ) ) {
-		curData = jQuery.hasData( elem ) && oldData.call( this, elem );
+
+		curData = jQuery.hasData( elem ) && origData.call( this, elem );
 		if ( curData && name in curData ) {
-			migrateWarn( "jQuery.data() always sets/gets camelCased names: " + name );
+			migrateWarn( "data-camelCase",
+				"jQuery.data() always sets/gets camelCased names: " + name );
 			if ( arguments.length > 2 ) {
 				curData[ name ] = value;
 			}
@@ -546,8 +695,8 @@ jQuery.data = function( elem, name, value ) {
 		}
 	}
 
-	return oldData.apply( this, arguments );
-};
+	return origData.apply( this, arguments );
+}, "data-camelCase" );
 
 // Support jQuery slim which excludes the effects module
 if ( jQuery.fx ) {
@@ -558,9 +707,10 @@ var intervalValue, intervalMsg,
 		return pct;
 	};
 
-jQuery.Tween.prototype.run = function( ) {
+migratePatchFunc( jQuery.Tween.prototype, "run", function( ) {
 	if ( jQuery.easing[ this.easing ].length > 1 ) {
 		migrateWarn(
+			"easing-one-arg",
 			"'jQuery.easing." + this.easing.toString() + "' should use only one argument"
 		);
 
@@ -568,9 +718,9 @@ jQuery.Tween.prototype.run = function( ) {
 	}
 
 	oldTweenRun.apply( this, arguments );
-};
+}, "easing-one-arg" );
 
-intervalValue = jQuery.fx.interval || 13;
+intervalValue = jQuery.fx.interval;
 intervalMsg = "jQuery.fx.interval is deprecated";
 
 // Support: IE9, Android <=4.4
@@ -582,12 +732,17 @@ if ( window.requestAnimationFrame ) {
 		enumerable: true,
 		get: function() {
 			if ( !window.document.hidden ) {
-				migrateWarn( intervalMsg );
+				migrateWarn( "fx-interval", intervalMsg );
+			}
+
+			// Only fallback to the default if patch is enabled
+			if ( !jQuery.migrateIsPatchEnabled( "fx-interval" ) ) {
+				return intervalValue;
 			}
-			return intervalValue;
+			return intervalValue === undefined ? 13 : intervalValue;
 		},
 		set: function( newValue ) {
-			migrateWarn( intervalMsg );
+			migrateWarn( "fx-interval", intervalMsg );
 			intervalValue = newValue;
 		}
 	} );
@@ -603,16 +758,18 @@ jQuery.event.props = [];
 jQuery.event.fixHooks = {};
 
 migrateWarnProp( jQuery.event.props, "concat", jQuery.event.props.concat,
+	"event-old-patch",
 	"jQuery.event.props.concat() is deprecated and removed" );
 
-jQuery.event.fix = function( originalEvent ) {
+migratePatchFunc( jQuery.event, "fix", function( originalEvent ) {
 	var event,
 		type = originalEvent.type,
 		fixHook = this.fixHooks[ type ],
 		props = jQuery.event.props;
 
 	if ( props.length ) {
-		migrateWarn( "jQuery.event.props are deprecated and removed: " + props.join() );
+		migrateWarn( "event-old-patch",
+			"jQuery.event.props are deprecated and removed: " + props.join() );
 		while ( props.length ) {
 			jQuery.event.addProp( props.pop() );
 		}
@@ -620,7 +777,8 @@ jQuery.event.fix = function( originalEvent ) {
 
 	if ( fixHook && !fixHook._migrated_ ) {
 		fixHook._migrated_ = true;
-		migrateWarn( "jQuery.event.fixHooks are deprecated and removed: " + type );
+		migrateWarn( "event-old-patch",
+			"jQuery.event.fixHooks are deprecated and removed: " + type );
 		if ( ( props = fixHook.props ) && props.length ) {
 			while ( props.length ) {
 				jQuery.event.addProp( props.pop() );
@@ -630,21 +788,24 @@ jQuery.event.fix = function( originalEvent ) {
 
 	event = originalFix.call( this, originalEvent );
 
-	return fixHook && fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-};
+	return fixHook && fixHook.filter ?
+		fixHook.filter( event, originalEvent ) :
+		event;
+}, "event-old-patch" );
 
-jQuery.event.add = function( elem, types ) {
+migratePatchFunc( jQuery.event, "add", function( elem, types ) {
 
 	// This misses the multiple-types case but that seems awfully rare
 	if ( elem === window && types === "load" && window.document.readyState === "complete" ) {
-		migrateWarn( "jQuery(window).on('load'...) called after load event occurred" );
+		migrateWarn( "load-after-event",
+			"jQuery(window).on('load'...) called after load event occurred" );
 	}
 	return oldEventAdd.apply( this, arguments );
-};
+}, "load-after-event" );
 
 jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
 
-	jQuery.fn[ name ] = function() {
+	migratePatchFunc( jQuery.fn, name, function() {
 		var args = Array.prototype.slice.call( arguments, 0 );
 
 		// If this is an ajax load() the first arg should be the string URL;
@@ -655,7 +816,8 @@ jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
 			return oldLoad.apply( this, args );
 		}
 
-		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+		migrateWarn( "shorthand-removed-v3",
+			"jQuery.fn." + name + "() is deprecated" );
 
 		args.splice( 0, 0, name );
 		if ( arguments.length ) {
@@ -668,7 +830,7 @@ jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
 		// See http://bugs.jquery.com/ticket/11820
 		this.triggerHandler.apply( this, args );
 		return this;
-	};
+	}, "shorthand-removed-v3" );
 
 } );
 
@@ -678,12 +840,13 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
 	function( _i, name ) {
 
 	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		migrateWarn( "jQuery.fn." + name + "() event shorthand is deprecated" );
+	migratePatchAndWarnFunc( jQuery.fn, name, function( data, fn ) {
 		return arguments.length > 0 ?
 			this.on( name, null, data, fn ) :
 			this.trigger( name );
-	};
+		},
+		"shorthand-deprecated-v3",
+		"jQuery.fn." + name + "() event shorthand is deprecated" );
 } );
 
 // Trigger "ready" event only once, on document ready
@@ -694,39 +857,30 @@ jQuery( function() {
 jQuery.event.special.ready = {
 	setup: function() {
 		if ( this === window.document ) {
-			migrateWarn( "'ready' event is deprecated" );
+			migrateWarn( "ready-event", "'ready' event is deprecated" );
 		}
 	}
 };
 
-jQuery.fn.extend( {
-
-	bind: function( types, data, fn ) {
-		migrateWarn( "jQuery.fn.bind() is deprecated" );
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		migrateWarn( "jQuery.fn.unbind() is deprecated" );
-		return this.off( types, null, fn );
-	},
-	delegate: function( selector, types, data, fn ) {
-		migrateWarn( "jQuery.fn.delegate() is deprecated" );
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		migrateWarn( "jQuery.fn.undelegate() is deprecated" );
-		return arguments.length === 1 ?
-			this.off( selector, "**" ) :
-			this.off( types, selector || "**", fn );
-	},
-	hover: function( fnOver, fnOut ) {
-		migrateWarn( "jQuery.fn.hover() is deprecated" );
-		return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
-	}
-} );
+migratePatchAndWarnFunc( jQuery.fn, "bind", function( types, data, fn ) {
+	return this.on( types, null, data, fn );
+}, "pre-on-methods", "jQuery.fn.bind() is deprecated" );
+migratePatchAndWarnFunc( jQuery.fn, "unbind", function( types, fn ) {
+	return this.off( types, null, fn );
+}, "pre-on-methods", "jQuery.fn.unbind() is deprecated" );
+migratePatchAndWarnFunc( jQuery.fn, "delegate", function( selector, types, data, fn ) {
+	return this.on( types, selector, data, fn );
+}, "pre-on-methods", "jQuery.fn.delegate() is deprecated" );
+migratePatchAndWarnFunc( jQuery.fn, "undelegate", function( selector, types, fn ) {
+	return arguments.length === 1 ?
+		this.off( selector, "**" ) :
+		this.off( types, selector || "**", fn );
+}, "pre-on-methods", "jQuery.fn.undelegate() is deprecated" );
+migratePatchAndWarnFunc( jQuery.fn, "hover", function( fnOver, fnOut ) {
+	return this.on( "mouseenter", fnOver ).on( "mouseleave", fnOut || fnOver );
+}, "pre-on-methods", "jQuery.fn.hover() is deprecated" );
 
 var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-	origHtmlPrefilter = jQuery.htmlPrefilter,
 	makeMarkup = function( html ) {
 		var doc = window.document.implementation.createHTMLDocument( "" );
 		doc.body.innerHTML = html;
@@ -735,62 +889,65 @@ var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\
 	warnIfChanged = function( html ) {
 		var changed = html.replace( rxhtmlTag, "<$1></$2>" );
 		if ( changed !== html && makeMarkup( html ) !== makeMarkup( changed ) ) {
-			migrateWarn( "HTML tags must be properly nested and closed: " + html );
+			migrateWarn( "self-closed-tags",
+				"HTML tags must be properly nested and closed: " + html );
 		}
 	};
 
+/**
+ * Deprecated, please use `jQuery.migrateDisablePatches( "self-closed-tags" )` instead.
+ * @deprecated
+ */
 jQuery.UNSAFE_restoreLegacyHtmlPrefilter = function() {
-	jQuery.htmlPrefilter = function( html ) {
-		warnIfChanged( html );
-		return html.replace( rxhtmlTag, "<$1></$2>" );
-	};
+	jQuery.migrateEnablePatches( "self-closed-tags" );
 };
 
-jQuery.htmlPrefilter = function( html ) {
+migratePatchFunc( jQuery, "htmlPrefilter", function( html ) {
 	warnIfChanged( html );
-	return origHtmlPrefilter( html );
-};
+	return html.replace( rxhtmlTag, "<$1></$2>" );
+}, "self-closed-tags" );
+
+// This patch needs to be disabled by default as it re-introduces
+// security issues (CVE-2020-11022, CVE-2020-11023).
+jQuery.migrateDisablePatches( "self-closed-tags" );
 
-var oldOffset = jQuery.fn.offset;
+var origOffset = jQuery.fn.offset;
 
-jQuery.fn.offset = function() {
+migratePatchFunc( jQuery.fn, "offset", function() {
 	var elem = this[ 0 ];
 
 	if ( elem && ( !elem.nodeType || !elem.getBoundingClientRect ) ) {
-		migrateWarn( "jQuery.fn.offset() requires a valid DOM element" );
+		migrateWarn( "offset-valid-elem", "jQuery.fn.offset() requires a valid DOM element" );
 		return arguments.length ? this : undefined;
 	}
 
-	return oldOffset.apply( this, arguments );
-};
+	return origOffset.apply( this, arguments );
+}, "offset-valid-elem" );
 
 // Support jQuery slim which excludes the ajax module
 // The jQuery.param patch is about respecting `jQuery.ajaxSettings.traditional`
 // so it doesn't make sense for the slim build.
 if ( jQuery.ajax ) {
 
-var oldParam = jQuery.param;
+var origParam = jQuery.param;
 
-jQuery.param = function( data, traditional ) {
+migratePatchFunc( jQuery, "param", function( data, traditional ) {
 	var ajaxTraditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
 
 	if ( traditional === undefined && ajaxTraditional ) {
 
-		migrateWarn( "jQuery.param() no longer uses jQuery.ajaxSettings.traditional" );
+		migrateWarn( "param-ajax-traditional",
+			"jQuery.param() no longer uses jQuery.ajaxSettings.traditional" );
 		traditional = ajaxTraditional;
 	}
 
-	return oldParam.call( this, data, traditional );
-};
+	return origParam.call( this, data, traditional );
+}, "param-ajax-traditional" );
 
 }
 
-var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
-
-jQuery.fn.andSelf = function() {
-	migrateWarn( "jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
-	return oldSelf.apply( this, arguments );
-};
+migratePatchAndWarnFunc( jQuery.fn, "andSelf", jQuery.fn.addBack, "andSelf",
+	"jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()" );
 
 // Support jQuery slim which excludes the deferred module in jQuery 4.0+
 if ( jQuery.Deferred ) {
@@ -807,15 +964,13 @@ var oldDeferred = jQuery.Deferred,
 			jQuery.Callbacks( "memory" ) ]
 	];
 
-jQuery.Deferred = function( func ) {
+migratePatchFunc( jQuery, "Deferred", function( func ) {
 	var deferred = oldDeferred(),
 		promise = deferred.promise();
 
-	deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+	function newDeferredPipe( /* fnDone, fnFail, fnProgress */ ) {
 		var fns = arguments;
 
-		migrateWarn( "deferred.pipe() is deprecated" );
-
 		return jQuery.Deferred( function( newDefer ) {
 			jQuery.each( tuples, function( i, tuple ) {
 				var fn = typeof fns[ i ] === "function" && fns[ i ];
@@ -840,15 +995,19 @@ jQuery.Deferred = function( func ) {
 			} );
 			fns = null;
 		} ).promise();
+	}
 
-	};
+	migratePatchAndWarnFunc( deferred, "pipe", newDeferredPipe, "deferred-pipe",
+		"deferred.pipe() is deprecated" );
+	migratePatchAndWarnFunc( promise, "pipe", newDeferredPipe, "deferred-pipe",
+		"deferred.pipe() is deprecated" );
 
 	if ( func ) {
 		func.call( deferred, deferred );
 	}
 
 	return deferred;
-};
+}, "deferred-pipe" );
 
 // Preserve handler of uncaught exceptions in promise chains
 jQuery.Deferred.exceptionHook = oldDeferred.exceptionHook;
diff --git a/src/js/_enqueues/vendor/jquery/jquery-migrate.min.js b/src/js/_enqueues/vendor/jquery/jquery-migrate.min.js
index 969c84a06f51b..29a4939df3349 100644
--- a/src/js/_enqueues/vendor/jquery/jquery-migrate.min.js
+++ b/src/js/_enqueues/vendor/jquery/jquery-migrate.min.js
@@ -1,2 +1,2 @@
-/*! jQuery Migrate v3.3.2 | (c) OpenJS Foundation and other contributors | jquery.org/license */
-"undefined"==typeof jQuery.migrateMute&&(jQuery.migrateMute=!0),function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e,window)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery"),window):t(jQuery,window)}(function(s,n){"use strict";function e(e){return 0<=function(e,t){for(var r=/^(\d+)\.(\d+)\.(\d+)/,n=r.exec(e)||[],o=r.exec(t)||[],i=1;i<=3;i++){if(+o[i]<+n[i])return 1;if(+n[i]<+o[i])return-1}return 0}(s.fn.jquery,e)}s.migrateVersion="3.3.2",n.console&&n.console.log&&(s&&e("3.0.0")||n.console.log("JQMIGRATE: jQuery 3.0.0+ REQUIRED"),s.migrateWarnings&&n.console.log("JQMIGRATE: Migrate plugin loaded multiple times"),n.console.log("JQMIGRATE: Migrate is installed"+(s.migrateMute?"":" with logging active")+", version "+s.migrateVersion));var r={};function u(e){var t=n.console;s.migrateDeduplicateWarnings&&r[e]||(r[e]=!0,s.migrateWarnings.push(e),t&&t.warn&&!s.migrateMute&&(t.warn("JQMIGRATE: "+e),s.migrateTrace&&t.trace&&t.trace()))}function t(e,t,r,n){Object.defineProperty(e,t,{configurable:!0,enumerable:!0,get:function(){return u(n),r},set:function(e){u(n),r=e}})}function o(e,t,r,n){e[t]=function(){return u(n),r.apply(this,arguments)}}s.migrateDeduplicateWarnings=!0,s.migrateWarnings=[],void 0===s.migrateTrace&&(s.migrateTrace=!0),s.migrateReset=function(){r={},s.migrateWarnings.length=0},"BackCompat"===n.document.compatMode&&u("jQuery is not compatible with Quirks Mode");var i,a,c,d={},l=s.fn.init,p=s.find,f=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,y=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,m=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;for(i in s.fn.init=function(e){var t=Array.prototype.slice.call(arguments);return"string"==typeof e&&"#"===e&&(u("jQuery( '#' ) is not a valid selector"),t[0]=[]),l.apply(this,t)},s.fn.init.prototype=s.fn,s.find=function(t){var r=Array.prototype.slice.call(arguments);if("string"==typeof t&&f.test(t))try{n.document.querySelector(t)}catch(e){t=t.replace(y,function(e,t,r,n){return"["+t+r+'"'+n+'"]'});try{n.document.querySelector(t),u("Attribute selector with '#' must be quoted: "+r[0]),r[0]=t}catch(e){u("Attribute selector with '#' was not fixed: "+r[0])}}return p.apply(this,r)},p)Object.prototype.hasOwnProperty.call(p,i)&&(s.find[i]=p[i]);o(s.fn,"size",function(){return this.length},"jQuery.fn.size() is deprecated and removed; use the .length property"),o(s,"parseJSON",function(){return JSON.parse.apply(null,arguments)},"jQuery.parseJSON is deprecated; use JSON.parse"),o(s,"holdReady",s.holdReady,"jQuery.holdReady is deprecated"),o(s,"unique",s.uniqueSort,"jQuery.unique is deprecated; use jQuery.uniqueSort"),t(s.expr,"filters",s.expr.pseudos,"jQuery.expr.filters is deprecated; use jQuery.expr.pseudos"),t(s.expr,":",s.expr.pseudos,"jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos"),e("3.1.1")&&o(s,"trim",function(e){return null==e?"":(e+"").replace(m,"")},"jQuery.trim is deprecated; use String.prototype.trim"),e("3.2.0")&&(o(s,"nodeName",function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},"jQuery.nodeName is deprecated"),o(s,"isArray",Array.isArray,"jQuery.isArray is deprecated; use Array.isArray")),e("3.3.0")&&(o(s,"isNumeric",function(e){var t=typeof e;return("number"==t||"string"==t)&&!isNaN(e-parseFloat(e))},"jQuery.isNumeric() is deprecated"),s.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){d["[object "+t+"]"]=t.toLowerCase()}),o(s,"type",function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?d[Object.prototype.toString.call(e)]||"object":typeof e},"jQuery.type is deprecated"),o(s,"isFunction",function(e){return"function"==typeof e},"jQuery.isFunction() is deprecated"),o(s,"isWindow",function(e){return null!=e&&e===e.window},"jQuery.isWindow() is deprecated")),s.ajax&&(a=s.ajax,c=/(=)\?(?=&|$)|\?\?/,s.ajax=function(){var e=a.apply(this,arguments);return e.promise&&(o(e,"success",e.done,"jQXHR.success is deprecated and removed"),o(e,"error",e.fail,"jQXHR.error is deprecated and removed"),o(e,"complete",e.always,"jQXHR.complete is deprecated and removed")),e},e("4.0.0")||s.ajaxPrefilter("+json",function(e){!1!==e.jsonp&&(c.test(e.url)||"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&c.test(e.data))&&u("JSON-to-JSONP auto-promotion is deprecated")}));var g=s.fn.removeAttr,h=s.fn.toggleClass,v=/\S+/g;function j(e){return e.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()})}s.fn.removeAttr=function(e){var r=this;return s.each(e.match(v),function(e,t){s.expr.match.bool.test(t)&&(u("jQuery.fn.removeAttr no longer sets boolean properties: "+t),r.prop(t,!1))}),g.apply(this,arguments)};var Q,b=!(s.fn.toggleClass=function(t){return void 0!==t&&"boolean"!=typeof t?h.apply(this,arguments):(u("jQuery.fn.toggleClass( boolean ) is deprecated"),this.each(function(){var e=this.getAttribute&&this.getAttribute("class")||"";e&&s.data(this,"__className__",e),this.setAttribute&&this.setAttribute("class",!e&&!1!==t&&s.data(this,"__className__")||"")}))}),w=/^[a-z]/,x=/^(?:Border(?:Top|Right|Bottom|Left)?(?:Width|)|(?:Margin|Padding)?(?:Top|Right|Bottom|Left)?|(?:Min|Max)?(?:Width|Height))$/;s.swap&&s.each(["height","width","reliableMarginRight"],function(e,t){var r=s.cssHooks[t]&&s.cssHooks[t].get;r&&(s.cssHooks[t].get=function(){var e;return b=!0,e=r.apply(this,arguments),b=!1,e})}),s.swap=function(e,t,r,n){var o,i,a={};for(i in b||u("jQuery.swap() is undocumented and deprecated"),t)a[i]=e.style[i],e.style[i]=t[i];for(i in o=r.apply(e,n||[]),t)e.style[i]=a[i];return o},e("3.4.0")&&"undefined"!=typeof Proxy&&(s.cssProps=new Proxy(s.cssProps||{},{set:function(){return u("JQMIGRATE: jQuery.cssProps is deprecated"),Reflect.set.apply(this,arguments)}})),s.cssNumber||(s.cssNumber={}),Q=s.fn.css,s.fn.css=function(e,t){var r,n,o=this;return e&&"object"==typeof e&&!Array.isArray(e)?(s.each(e,function(e,t){s.fn.css.call(o,e,t)}),this):("number"==typeof t&&(r=j(e),n=r,w.test(n)&&x.test(n[0].toUpperCase()+n.slice(1))||s.cssNumber[r]||u('Number-typed values are deprecated for jQuery.fn.css( "'+e+'", value )')),Q.apply(this,arguments))};var A,k,S,M,N=s.data;s.data=function(e,t,r){var n,o,i;if(t&&"object"==typeof t&&2===arguments.length){for(i in n=s.hasData(e)&&N.call(this,e),o={},t)i!==j(i)?(u("jQuery.data() always sets/gets camelCased names: "+i),n[i]=t[i]):o[i]=t[i];return N.call(this,e,o),t}return t&&"string"==typeof t&&t!==j(t)&&(n=s.hasData(e)&&N.call(this,e))&&t in n?(u("jQuery.data() always sets/gets camelCased names: "+t),2<arguments.length&&(n[t]=r),n[t]):N.apply(this,arguments)},s.fx&&(S=s.Tween.prototype.run,M=function(e){return e},s.Tween.prototype.run=function(){1<s.easing[this.easing].length&&(u("'jQuery.easing."+this.easing.toString()+"' should use only one argument"),s.easing[this.easing]=M),S.apply(this,arguments)},A=s.fx.interval||13,k="jQuery.fx.interval is deprecated",n.requestAnimationFrame&&Object.defineProperty(s.fx,"interval",{configurable:!0,enumerable:!0,get:function(){return n.document.hidden||u(k),A},set:function(e){u(k),A=e}}));var R=s.fn.load,H=s.event.add,C=s.event.fix;s.event.props=[],s.event.fixHooks={},t(s.event.props,"concat",s.event.props.concat,"jQuery.event.props.concat() is deprecated and removed"),s.event.fix=function(e){var t,r=e.type,n=this.fixHooks[r],o=s.event.props;if(o.length){u("jQuery.event.props are deprecated and removed: "+o.join());while(o.length)s.event.addProp(o.pop())}if(n&&!n._migrated_&&(n._migrated_=!0,u("jQuery.event.fixHooks are deprecated and removed: "+r),(o=n.props)&&o.length))while(o.length)s.event.addProp(o.pop());return t=C.call(this,e),n&&n.filter?n.filter(t,e):t},s.event.add=function(e,t){return e===n&&"load"===t&&"complete"===n.document.readyState&&u("jQuery(window).on('load'...) called after load event occurred"),H.apply(this,arguments)},s.each(["load","unload","error"],function(e,t){s.fn[t]=function(){var e=Array.prototype.slice.call(arguments,0);return"load"===t&&"string"==typeof e[0]?R.apply(this,e):(u("jQuery.fn."+t+"() is deprecated"),e.splice(0,0,t),arguments.length?this.on.apply(this,e):(this.triggerHandler.apply(this,e),this))}}),s.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,r){s.fn[r]=function(e,t){return u("jQuery.fn."+r+"() event shorthand is deprecated"),0<arguments.length?this.on(r,null,e,t):this.trigger(r)}}),s(function(){s(n.document).triggerHandler("ready")}),s.event.special.ready={setup:function(){this===n.document&&u("'ready' event is deprecated")}},s.fn.extend({bind:function(e,t,r){return u("jQuery.fn.bind() is deprecated"),this.on(e,null,t,r)},unbind:function(e,t){return u("jQuery.fn.unbind() is deprecated"),this.off(e,null,t)},delegate:function(e,t,r,n){return u("jQuery.fn.delegate() is deprecated"),this.on(t,e,r,n)},undelegate:function(e,t,r){return u("jQuery.fn.undelegate() is deprecated"),1===arguments.length?this.off(e,"**"):this.off(t,e||"**",r)},hover:function(e,t){return u("jQuery.fn.hover() is deprecated"),this.on("mouseenter",e).on("mouseleave",t||e)}});function T(e){var t=n.document.implementation.createHTMLDocument("");return t.body.innerHTML=e,t.body&&t.body.innerHTML}function P(e){var t=e.replace(O,"<$1></$2>");t!==e&&T(e)!==T(t)&&u("HTML tags must be properly nested and closed: "+e)}var O=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,q=s.htmlPrefilter;s.UNSAFE_restoreLegacyHtmlPrefilter=function(){s.htmlPrefilter=function(e){return P(e),e.replace(O,"<$1></$2>")}},s.htmlPrefilter=function(e){return P(e),q(e)};var D,_=s.fn.offset;s.fn.offset=function(){var e=this[0];return!e||e.nodeType&&e.getBoundingClientRect?_.apply(this,arguments):(u("jQuery.fn.offset() requires a valid DOM element"),arguments.length?this:void 0)},s.ajax&&(D=s.param,s.param=function(e,t){var r=s.ajaxSettings&&s.ajaxSettings.traditional;return void 0===t&&r&&(u("jQuery.param() no longer uses jQuery.ajaxSettings.traditional"),t=r),D.call(this,e,t)});var E,F,J=s.fn.andSelf||s.fn.addBack;return s.fn.andSelf=function(){return u("jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()"),J.apply(this,arguments)},s.Deferred&&(E=s.Deferred,F=[["resolve","done",s.Callbacks("once memory"),s.Callbacks("once memory"),"resolved"],["reject","fail",s.Callbacks("once memory"),s.Callbacks("once memory"),"rejected"],["notify","progress",s.Callbacks("memory"),s.Callbacks("memory")]],s.Deferred=function(e){var i=E(),a=i.promise();return i.pipe=a.pipe=function(){var o=arguments;return u("deferred.pipe() is deprecated"),s.Deferred(function(n){s.each(F,function(e,t){var r="function"==typeof o[e]&&o[e];i[t[1]](function(){var e=r&&r.apply(this,arguments);e&&"function"==typeof e.promise?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[t[0]+"With"](this===a?n.promise():this,r?[e]:arguments)})}),o=null}).promise()},e&&e.call(i,i),i},s.Deferred.exceptionHook=E.exceptionHook),s});
+/*! jQuery Migrate v3.4.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+"undefined"==typeof jQuery.migrateMute&&(jQuery.migrateMute=!0),function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e,window)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery"),window):t(jQuery,window)}(function(s,n){"use strict";function e(e){return 0<=function(e,t){for(var r=/^(\d+)\.(\d+)\.(\d+)/,n=r.exec(e)||[],o=r.exec(t)||[],a=1;a<=3;a++){if(+o[a]<+n[a])return 1;if(+n[a]<+o[a])return-1}return 0}(s.fn.jquery,e)}s.migrateVersion="3.4.1";var t=Object.create(null);s.migrateDisablePatches=function(){for(var e=0;e<arguments.length;e++)t[arguments[e]]=!0},s.migrateEnablePatches=function(){for(var e=0;e<arguments.length;e++)delete t[arguments[e]]},s.migrateIsPatchEnabled=function(e){return!t[e]},n.console&&n.console.log&&(s&&e("3.0.0")&&!e("5.0.0")||n.console.log("JQMIGRATE: jQuery 3.x-4.x REQUIRED"),s.migrateWarnings&&n.console.log("JQMIGRATE: Migrate plugin loaded multiple times"),n.console.log("JQMIGRATE: Migrate is installed"+(s.migrateMute?"":" with logging active")+", version "+s.migrateVersion));var o={};function u(e,t){var r=n.console;!s.migrateIsPatchEnabled(e)||s.migrateDeduplicateWarnings&&o[t]||(o[t]=!0,s.migrateWarnings.push(t+" ["+e+"]"),r&&r.warn&&!s.migrateMute&&(r.warn("JQMIGRATE: "+t),s.migrateTrace&&r.trace&&r.trace()))}function r(e,t,r,n,o){Object.defineProperty(e,t,{configurable:!0,enumerable:!0,get:function(){return u(n,o),r},set:function(e){u(n,o),r=e}})}function a(e,t,r,n,o){var a=e[t];e[t]=function(){return o&&u(n,o),(s.migrateIsPatchEnabled(n)?r:a||s.noop).apply(this,arguments)}}function c(e,t,r,n,o){if(!o)throw new Error("No warning message provided");return a(e,t,r,n,o),0}function i(e,t,r,n){return a(e,t,r,n),0}s.migrateDeduplicateWarnings=!0,s.migrateWarnings=[],void 0===s.migrateTrace&&(s.migrateTrace=!0),s.migrateReset=function(){o={},s.migrateWarnings.length=0},"BackCompat"===n.document.compatMode&&u("quirks","jQuery is not compatible with Quirks Mode");var d,l,p,f={},m=s.fn.init,y=s.find,h=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,g=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,v=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;for(d in i(s.fn,"init",function(e){var t=Array.prototype.slice.call(arguments);return s.migrateIsPatchEnabled("selector-empty-id")&&"string"==typeof e&&"#"===e&&(u("selector-empty-id","jQuery( '#' ) is not a valid selector"),t[0]=[]),m.apply(this,t)},"selector-empty-id"),s.fn.init.prototype=s.fn,i(s,"find",function(t){var r=Array.prototype.slice.call(arguments);if("string"==typeof t&&h.test(t))try{n.document.querySelector(t)}catch(e){t=t.replace(g,function(e,t,r,n){return"["+t+r+'"'+n+'"]'});try{n.document.querySelector(t),u("selector-hash","Attribute selector with '#' must be quoted: "+r[0]),r[0]=t}catch(e){u("selector-hash","Attribute selector with '#' was not fixed: "+r[0])}}return y.apply(this,r)},"selector-hash"),y)Object.prototype.hasOwnProperty.call(y,d)&&(s.find[d]=y[d]);c(s.fn,"size",function(){return this.length},"size","jQuery.fn.size() is deprecated and removed; use the .length property"),c(s,"parseJSON",function(){return JSON.parse.apply(null,arguments)},"parseJSON","jQuery.parseJSON is deprecated; use JSON.parse"),c(s,"holdReady",s.holdReady,"holdReady","jQuery.holdReady is deprecated"),c(s,"unique",s.uniqueSort,"unique","jQuery.unique is deprecated; use jQuery.uniqueSort"),r(s.expr,"filters",s.expr.pseudos,"expr-pre-pseudos","jQuery.expr.filters is deprecated; use jQuery.expr.pseudos"),r(s.expr,":",s.expr.pseudos,"expr-pre-pseudos","jQuery.expr[':'] is deprecated; use jQuery.expr.pseudos"),e("3.1.1")&&c(s,"trim",function(e){return null==e?"":(e+"").replace(v,"$1")},"trim","jQuery.trim is deprecated; use String.prototype.trim"),e("3.2.0")&&(c(s,"nodeName",function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},"nodeName","jQuery.nodeName is deprecated"),c(s,"isArray",Array.isArray,"isArray","jQuery.isArray is deprecated; use Array.isArray")),e("3.3.0")&&(c(s,"isNumeric",function(e){var t=typeof e;return("number"==t||"string"==t)&&!isNaN(e-parseFloat(e))},"isNumeric","jQuery.isNumeric() is deprecated"),s.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){f["[object "+t+"]"]=t.toLowerCase()}),c(s,"type",function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?f[Object.prototype.toString.call(e)]||"object":typeof e},"type","jQuery.type is deprecated"),c(s,"isFunction",function(e){return"function"==typeof e},"isFunction","jQuery.isFunction() is deprecated"),c(s,"isWindow",function(e){return null!=e&&e===e.window},"isWindow","jQuery.isWindow() is deprecated")),s.ajax&&(l=s.ajax,p=/(=)\?(?=&|$)|\?\?/,i(s,"ajax",function(){var e=l.apply(this,arguments);return e.promise&&(c(e,"success",e.done,"jqXHR-methods","jQXHR.success is deprecated and removed"),c(e,"error",e.fail,"jqXHR-methods","jQXHR.error is deprecated and removed"),c(e,"complete",e.always,"jqXHR-methods","jQXHR.complete is deprecated and removed")),e},"jqXHR-methods"),e("4.0.0")||s.ajaxPrefilter("+json",function(e){!1!==e.jsonp&&(p.test(e.url)||"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&p.test(e.data))&&u("jsonp-promotion","JSON-to-JSONP auto-promotion is deprecated")}));var j=s.fn.removeAttr,b=s.fn.toggleClass,w=/\S+/g;function x(e){return e.replace(/-([a-z])/g,function(e,t){return t.toUpperCase()})}i(s.fn,"removeAttr",function(e){var r=this,n=!1;return s.each(e.match(w),function(e,t){s.expr.match.bool.test(t)&&r.each(function(){if(!1!==s(this).prop(t))return!(n=!0)}),n&&(u("removeAttr-bool","jQuery.fn.removeAttr no longer sets boolean properties: "+t),r.prop(t,!1))}),j.apply(this,arguments)},"removeAttr-bool"),i(s.fn,"toggleClass",function(t){return void 0!==t&&"boolean"!=typeof t?b.apply(this,arguments):(u("toggleClass-bool","jQuery.fn.toggleClass( boolean ) is deprecated"),this.each(function(){var e=this.getAttribute&&this.getAttribute("class")||"";e&&s.data(this,"__className__",e),this.setAttribute&&this.setAttribute("class",!e&&!1!==t&&s.data(this,"__className__")||"")}))},"toggleClass-bool");var Q,A,R=!1,C=/^[a-z]/,N=/^(?:Border(?:Top|Right|Bottom|Left)?(?:Width|)|(?:Margin|Padding)?(?:Top|Right|Bottom|Left)?|(?:Min|Max)?(?:Width|Height))$/;s.swap&&s.each(["height","width","reliableMarginRight"],function(e,t){var r=s.cssHooks[t]&&s.cssHooks[t].get;r&&(s.cssHooks[t].get=function(){var e;return R=!0,e=r.apply(this,arguments),R=!1,e})}),i(s,"swap",function(e,t,r,n){var o,a,i={};for(a in R||u("swap","jQuery.swap() is undocumented and deprecated"),t)i[a]=e.style[a],e.style[a]=t[a];for(a in o=r.apply(e,n||[]),t)e.style[a]=i[a];return o},"swap"),e("3.4.0")&&"undefined"!=typeof Proxy&&(s.cssProps=new Proxy(s.cssProps||{},{set:function(){return u("cssProps","jQuery.cssProps is deprecated"),Reflect.set.apply(this,arguments)}})),e("4.0.0")?(A={animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},"undefined"!=typeof Proxy?s.cssNumber=new Proxy(A,{get:function(){return u("css-number","jQuery.cssNumber is deprecated"),Reflect.get.apply(this,arguments)},set:function(){return u("css-number","jQuery.cssNumber is deprecated"),Reflect.set.apply(this,arguments)}}):s.cssNumber=A):A=s.cssNumber,Q=s.fn.css,i(s.fn,"css",function(e,t){var r,n,o=this;return e&&"object"==typeof e&&!Array.isArray(e)?(s.each(e,function(e,t){s.fn.css.call(o,e,t)}),this):("number"==typeof t&&(r=x(e),n=r,C.test(n)&&N.test(n[0].toUpperCase()+n.slice(1))||A[r]||u("css-number",'Number-typed values are deprecated for jQuery.fn.css( "'+e+'", value )')),Q.apply(this,arguments))},"css-number");var S,P,k,H,E=s.data;i(s,"data",function(e,t,r){var n,o,a;if(t&&"object"==typeof t&&2===arguments.length){for(a in n=s.hasData(e)&&E.call(this,e),o={},t)a!==x(a)?(u("data-camelCase","jQuery.data() always sets/gets camelCased names: "+a),n[a]=t[a]):o[a]=t[a];return E.call(this,e,o),t}return t&&"string"==typeof t&&t!==x(t)&&(n=s.hasData(e)&&E.call(this,e))&&t in n?(u("data-camelCase","jQuery.data() always sets/gets camelCased names: "+t),2<arguments.length&&(n[t]=r),n[t]):E.apply(this,arguments)},"data-camelCase"),s.fx&&(k=s.Tween.prototype.run,H=function(e){return e},i(s.Tween.prototype,"run",function(){1<s.easing[this.easing].length&&(u("easing-one-arg","'jQuery.easing."+this.easing.toString()+"' should use only one argument"),s.easing[this.easing]=H),k.apply(this,arguments)},"easing-one-arg"),S=s.fx.interval,P="jQuery.fx.interval is deprecated",n.requestAnimationFrame&&Object.defineProperty(s.fx,"interval",{configurable:!0,enumerable:!0,get:function(){return n.document.hidden||u("fx-interval",P),s.migrateIsPatchEnabled("fx-interval")&&void 0===S?13:S},set:function(e){u("fx-interval",P),S=e}}));var M=s.fn.load,q=s.event.add,O=s.event.fix;s.event.props=[],s.event.fixHooks={},r(s.event.props,"concat",s.event.props.concat,"event-old-patch","jQuery.event.props.concat() is deprecated and removed"),i(s.event,"fix",function(e){var t,r=e.type,n=this.fixHooks[r],o=s.event.props;if(o.length){u("event-old-patch","jQuery.event.props are deprecated and removed: "+o.join());while(o.length)s.event.addProp(o.pop())}if(n&&!n._migrated_&&(n._migrated_=!0,u("event-old-patch","jQuery.event.fixHooks are deprecated and removed: "+r),(o=n.props)&&o.length))while(o.length)s.event.addProp(o.pop());return t=O.call(this,e),n&&n.filter?n.filter(t,e):t},"event-old-patch"),i(s.event,"add",function(e,t){return e===n&&"load"===t&&"complete"===n.document.readyState&&u("load-after-event","jQuery(window).on('load'...) called after load event occurred"),q.apply(this,arguments)},"load-after-event"),s.each(["load","unload","error"],function(e,t){i(s.fn,t,function(){var e=Array.prototype.slice.call(arguments,0);return"load"===t&&"string"==typeof e[0]?M.apply(this,e):(u("shorthand-removed-v3","jQuery.fn."+t+"() is deprecated"),e.splice(0,0,t),arguments.length?this.on.apply(this,e):(this.triggerHandler.apply(this,e),this))},"shorthand-removed-v3")}),s.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,r){c(s.fn,r,function(e,t){return 0<arguments.length?this.on(r,null,e,t):this.trigger(r)},"shorthand-deprecated-v3","jQuery.fn."+r+"() event shorthand is deprecated")}),s(function(){s(n.document).triggerHandler("ready")}),s.event.special.ready={setup:function(){this===n.document&&u("ready-event","'ready' event is deprecated")}},c(s.fn,"bind",function(e,t,r){return this.on(e,null,t,r)},"pre-on-methods","jQuery.fn.bind() is deprecated"),c(s.fn,"unbind",function(e,t){return this.off(e,null,t)},"pre-on-methods","jQuery.fn.unbind() is deprecated"),c(s.fn,"delegate",function(e,t,r,n){return this.on(t,e,r,n)},"pre-on-methods","jQuery.fn.delegate() is deprecated"),c(s.fn,"undelegate",function(e,t,r){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",r)},"pre-on-methods","jQuery.fn.undelegate() is deprecated"),c(s.fn,"hover",function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)},"pre-on-methods","jQuery.fn.hover() is deprecated");function T(e){var t=n.document.implementation.createHTMLDocument("");return t.body.innerHTML=e,t.body&&t.body.innerHTML}var F=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi;s.UNSAFE_restoreLegacyHtmlPrefilter=function(){s.migrateEnablePatches("self-closed-tags")},i(s,"htmlPrefilter",function(e){var t,r;return(r=(t=e).replace(F,"<$1></$2>"))!==t&&T(t)!==T(r)&&u("self-closed-tags","HTML tags must be properly nested and closed: "+t),e.replace(F,"<$1></$2>")},"self-closed-tags"),s.migrateDisablePatches("self-closed-tags");var D,W,_,I=s.fn.offset;return i(s.fn,"offset",function(){var e=this[0];return!e||e.nodeType&&e.getBoundingClientRect?I.apply(this,arguments):(u("offset-valid-elem","jQuery.fn.offset() requires a valid DOM element"),arguments.length?this:void 0)},"offset-valid-elem"),s.ajax&&(D=s.param,i(s,"param",function(e,t){var r=s.ajaxSettings&&s.ajaxSettings.traditional;return void 0===t&&r&&(u("param-ajax-traditional","jQuery.param() no longer uses jQuery.ajaxSettings.traditional"),t=r),D.call(this,e,t)},"param-ajax-traditional")),c(s.fn,"andSelf",s.fn.addBack,"andSelf","jQuery.fn.andSelf() is deprecated and removed, use jQuery.fn.addBack()"),s.Deferred&&(W=s.Deferred,_=[["resolve","done",s.Callbacks("once memory"),s.Callbacks("once memory"),"resolved"],["reject","fail",s.Callbacks("once memory"),s.Callbacks("once memory"),"rejected"],["notify","progress",s.Callbacks("memory"),s.Callbacks("memory")]],i(s,"Deferred",function(e){var a=W(),i=a.promise();function t(){var o=arguments;return s.Deferred(function(n){s.each(_,function(e,t){var r="function"==typeof o[e]&&o[e];a[t[1]](function(){var e=r&&r.apply(this,arguments);e&&"function"==typeof e.promise?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[t[0]+"With"](this===i?n.promise():this,r?[e]:arguments)})}),o=null}).promise()}return c(a,"pipe",t,"deferred-pipe","deferred.pipe() is deprecated"),c(i,"pipe",t,"deferred-pipe","deferred.pipe() is deprecated"),e&&e.call(a,a),a},"deferred-pipe"),s.Deferred.exceptionHook=W.exceptionHook),s});
diff --git a/src/js/_enqueues/vendor/mediaelement/wp-mediaelement.js b/src/js/_enqueues/vendor/mediaelement/wp-mediaelement.js
index c43c90289ec63..52e1bbd32f9e6 100644
--- a/src/js/_enqueues/vendor/mediaelement/wp-mediaelement.js
+++ b/src/js/_enqueues/vendor/mediaelement/wp-mediaelement.js
@@ -19,6 +19,8 @@
 		 * @return {void}
 		 */
 		function initialize() {
+			var selectors = [];
+
 			if ( typeof _wpmejsSettings !== 'undefined' ) {
 				settings = $.extend( true, {}, _wpmejsSettings );
 			}
@@ -63,8 +65,18 @@
 				}
 			};
 
+			if ( 'undefined' === typeof settings.videoShortcodeLibrary || 'mediaelement' === settings.videoShortcodeLibrary ) {
+				selectors.push( '.wp-video-shortcode' );
+			}
+			if ( 'undefined' === typeof settings.audioShortcodeLibrary || 'mediaelement' === settings.audioShortcodeLibrary ) {
+				selectors.push( '.wp-audio-shortcode' );
+			}
+			if ( ! selectors.length ) {
+				return;
+			}
+
 			// Only initialize new media elements.
-			$( '.wp-audio-shortcode, .wp-video-shortcode' )
+			$( selectors.join( ', ' ) )
 				.not( '.mejs-container' )
 				.filter(function () {
 					return ! $( this ).parent().hasClass( 'mejs-mediaelement' );
diff --git a/src/js/_enqueues/vendor/twemoji.js b/src/js/_enqueues/vendor/twemoji.js
new file mode 100644
index 0000000000000..37e074f4ed9b0
--- /dev/null
+++ b/src/js/_enqueues/vendor/twemoji.js
@@ -0,0 +1,589 @@
+/*jslint indent: 2, browser: true, bitwise: true, plusplus: true */
+var twemoji = (function (
+  /*! Copyright Twitter Inc. and other contributors. Licensed under MIT *//*
+    https://github.com/twitter/twemoji/blob/gh-pages/LICENSE
+  */
+
+  /*
+   * Note: this file was modified in two places to add support for a doNotParse() callback.
+   * The modifications are surrounded by `// WP start` and `// WP end` comments.
+   */
+
+  // WARNING:   this file is generated automatically via
+  //            `node scripts/build.js`
+  //            please update its `createTwemoji` function
+  //            at the bottom of the same file instead.
+
+) {
+  'use strict';
+
+  /*jshint maxparams:4 */
+
+  var
+    // the exported module object
+    twemoji = {
+
+
+    /////////////////////////
+    //      properties     //
+    /////////////////////////
+
+      // default assets url, by default will be Twitter Inc. CDN
+      base: 'https://twemoji.maxcdn.com/v/14.0.2/',
+
+      // default assets file extensions, by default '.png'
+      ext: '.png',
+
+      // default assets/folder size, by default "72x72"
+      // available via Twitter CDN: 72
+      size: '72x72',
+
+      // default class name, by default 'emoji'
+      className: 'emoji',
+
+      // basic utilities / helpers to convert code points
+      // to JavaScript surrogates and vice versa
+      convert: {
+
+        /**
+         * Given an HEX codepoint, returns UTF16 surrogate pairs.
+         *
+         * @param   string  generic codepoint, i.e. '1F4A9'
+         * @return  string  codepoint transformed into utf16 surrogates pair,
+         *          i.e. \uD83D\uDCA9
+         *
+         * @example
+         *  twemoji.convert.fromCodePoint('1f1e8');
+         *  // "\ud83c\udde8"
+         *
+         *  '1f1e8-1f1f3'.split('-').map(twemoji.convert.fromCodePoint).join('')
+         *  // "\ud83c\udde8\ud83c\uddf3"
+         */
+        fromCodePoint: fromCodePoint,
+
+        /**
+         * Given UTF16 surrogate pairs, returns the equivalent HEX codepoint.
+         *
+         * @param   string  generic utf16 surrogates pair, i.e. \uD83D\uDCA9
+         * @param   string  optional separator for double code points, default='-'
+         * @return  string  utf16 transformed into codepoint, i.e. '1F4A9'
+         *
+         * @example
+         *  twemoji.convert.toCodePoint('\ud83c\udde8\ud83c\uddf3');
+         *  // "1f1e8-1f1f3"
+         *
+         *  twemoji.convert.toCodePoint('\ud83c\udde8\ud83c\uddf3', '~');
+         *  // "1f1e8~1f1f3"
+         */
+        toCodePoint: toCodePoint
+      },
+
+
+    /////////////////////////
+    //       methods       //
+    /////////////////////////
+
+      /**
+       * User first: used to remove missing images
+       * preserving the original text intent when
+       * a fallback for network problems is desired.
+       * Automatically added to Image nodes via DOM
+       * It could be recycled for string operations via:
+       *  $('img.emoji').on('error', twemoji.onerror)
+       */
+      onerror: function onerror() {
+        if (this.parentNode) {
+          this.parentNode.replaceChild(createText(this.alt, false), this);
+        }
+      },
+
+      /**
+       * Main method/logic to generate either <img> tags or HTMLImage nodes.
+       *  "emojify" a generic text or DOM Element.
+       *
+       * @overloads
+       *
+       * String replacement for `innerHTML` or server side operations
+       *  twemoji.parse(string);
+       *  twemoji.parse(string, Function);
+       *  twemoji.parse(string, Object);
+       *
+       * HTMLElement tree parsing for safer operations over existing DOM
+       *  twemoji.parse(HTMLElement);
+       *  twemoji.parse(HTMLElement, Function);
+       *  twemoji.parse(HTMLElement, Object);
+       *
+       * @param   string|HTMLElement  the source to parse and enrich with emoji.
+       *
+       *          string              replace emoji matches with <img> tags.
+       *                              Mainly used to inject emoji via `innerHTML`
+       *                              It does **not** parse the string or validate it,
+       *                              it simply replaces found emoji with a tag.
+       *                              NOTE: be sure this won't affect security.
+       *
+       *          HTMLElement         walk through the DOM tree and find emoji
+       *                              that are inside **text node only** (nodeType === 3)
+       *                              Mainly used to put emoji in already generated DOM
+       *                              without compromising surrounding nodes and
+       *                              **avoiding** the usage of `innerHTML`.
+       *                              NOTE: Using DOM elements instead of strings should
+       *                              improve security without compromising too much
+       *                              performance compared with a less safe `innerHTML`.
+       *
+       * @param   Function|Object  [optional]
+       *                              either the callback that will be invoked or an object
+       *                              with all properties to use per each found emoji.
+       *
+       *          Function            if specified, this will be invoked per each emoji
+       *                              that has been found through the RegExp except
+       *                              those follwed by the invariant \uFE0E ("as text").
+       *                              Once invoked, parameters will be:
+       *
+       *                                iconId:string     the lower case HEX code point
+       *                                                  i.e. "1f4a9"
+       *
+       *                                options:Object    all info for this parsing operation
+       *
+       *                                variant:char      the optional \uFE0F ("as image")
+       *                                                  variant, in case this info
+       *                                                  is anyhow meaningful.
+       *                                                  By default this is ignored.
+       *
+       *                              If such callback will return a falsy value instead
+       *                              of a valid `src` to use for the image, nothing will
+       *                              actually change for that specific emoji.
+       *
+       *
+       *          Object              if specified, an object containing the following properties
+       *
+       *            callback   Function  the callback to invoke per each found emoji.
+       *            base       string    the base url, by default twemoji.base
+       *            ext        string    the image extension, by default twemoji.ext
+       *            size       string    the assets size, by default twemoji.size
+       *
+       * @example
+       *
+       *  twemoji.parse("I \u2764\uFE0F emoji!");
+       *  // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"/> emoji!
+       *
+       *
+       *  twemoji.parse("I \u2764\uFE0F emoji!", function(iconId, options) {
+       *    return '/assets/' + iconId + '.gif';
+       *  });
+       *  // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"/> emoji!
+       *
+       *
+       * twemoji.parse("I \u2764\uFE0F emoji!", {
+       *   size: 72,
+       *   callback: function(iconId, options) {
+       *     return '/assets/' + options.size + '/' + iconId + options.ext;
+       *   }
+       * });
+       *  // I <img class="emoji" draggable="false" alt="❤️" src="/assets/72x72/2764.png"/> emoji!
+       *
+       */
+      parse: parse,
+
+      /**
+       * Given a string, invokes the callback argument
+       *  per each emoji found in such string.
+       * This is the most raw version used by
+       *  the .parse(string) method itself.
+       *
+       * @param   string    generic string to parse
+       * @param   Function  a generic callback that will be
+       *                    invoked to replace the content.
+       *                    This callback will receive standard
+       *                    String.prototype.replace(str, callback)
+       *                    arguments such:
+       *  callback(
+       *    rawText,  // the emoji match
+       *  );
+       *
+       *                    and others commonly received via replace.
+       */
+      replace: replace,
+
+      /**
+       * Simplify string tests against emoji.
+       *
+       * @param   string  some text that might contain emoji
+       * @return  boolean true if any emoji was found, false otherwise.
+       *
+       * @example
+       *
+       *  if (twemoji.test(someContent)) {
+       *    console.log("emoji All The Things!");
+       *  }
+       */
+      test: test
+    },
+
+    // used to escape HTML special chars in attributes
+    escaper = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      "'": '&#39;',
+      '"': '&quot;'
+    },
+
+    // RegExp based on emoji's official Unicode standards
+    // http://www.unicode.org/Public/UNIDATA/EmojiSources.txt
+    re = /(?:\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83d\udc68\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc68\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc68\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc68\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffc-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffd-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb\udffc\udffe\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffd\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc68\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83d\udc69\ud83c[\udffb-\udfff]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc68\ud83c[\udffb-\udffe]|\ud83d\udc69\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83d\udc69\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udffb\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffc-\udfff]|\ud83e\uddd1\ud83c\udffb\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffd-\udfff]|\ud83e\uddd1\ud83c\udffc\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\uddd1\ud83c\udffd\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffd\udfff]|\ud83e\uddd1\ud83c\udffe\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83e\uddd1\ud83c\udfff\u200d\u2764\ufe0f\u200d\ud83e\uddd1\ud83c[\udffb-\udffe]|\ud83e\uddd1\ud83c\udfff\u200d\ud83e\udd1d\u200d\ud83e\uddd1\ud83c[\udffb-\udfff]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d\udc8b\u200d\ud83d[\udc68\udc69]|\ud83e\udef1\ud83c\udffb\u200d\ud83e\udef2\ud83c[\udffc-\udfff]|\ud83e\udef1\ud83c\udffc\u200d\ud83e\udef2\ud83c[\udffb\udffd-\udfff]|\ud83e\udef1\ud83c\udffd\u200d\ud83e\udef2\ud83c[\udffb\udffc\udffe\udfff]|\ud83e\udef1\ud83c\udffe\u200d\ud83e\udef2\ud83c[\udffb-\udffd\udfff]|\ud83e\udef1\ud83c\udfff\u200d\ud83e\udef2\ud83c[\udffb-\udffe]|\ud83d\udc68\u200d\u2764\ufe0f\u200d\ud83d\udc68|\ud83d\udc69\u200d\u2764\ufe0f\u200d\ud83d[\udc68\udc69]|\ud83e\uddd1\u200d\ud83e\udd1d\u200d\ud83e\uddd1|\ud83d\udc6b\ud83c[\udffb-\udfff]|\ud83d\udc6c\ud83c[\udffb-\udfff]|\ud83d\udc6d\ud83c[\udffb-\udfff]|\ud83d\udc8f\ud83c[\udffb-\udfff]|\ud83d\udc91\ud83c[\udffb-\udfff]|\ud83e\udd1d\ud83c[\udffb-\udfff]|\ud83d[\udc6b-\udc6d\udc8f\udc91]|\ud83e\udd1d)|(?:\ud83d[\udc68\udc69]|\ud83e\uddd1)(?:\ud83c[\udffb-\udfff])?\u200d(?:\u2695\ufe0f|\u2696\ufe0f|\u2708\ufe0f|\ud83c[\udf3e\udf73\udf7c\udf84\udf93\udfa4\udfa8\udfeb\udfed]|\ud83d[\udcbb\udcbc\udd27\udd2c\ude80\ude92]|\ud83e[\uddaf-\uddb3\uddbc\uddbd])|(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75]|\u26f9)((?:\ud83c[\udffb-\udfff]|\ufe0f)\u200d[\u2640\u2642]\ufe0f)|(?:\ud83c[\udfc3\udfc4\udfca]|\ud83d[\udc6e\udc70\udc71\udc73\udc77\udc81\udc82\udc86\udc87\ude45-\ude47\ude4b\ude4d\ude4e\udea3\udeb4-\udeb6]|\ud83e[\udd26\udd35\udd37-\udd39\udd3d\udd3e\uddb8\uddb9\uddcd-\uddcf\uddd4\uddd6-\udddd])(?:\ud83c[\udffb-\udfff])?\u200d[\u2640\u2642]\ufe0f|(?:\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc68\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc68\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc66\u200d\ud83d\udc66|\ud83d\udc69\u200d\ud83d\udc67\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83c\udff3\ufe0f\u200d\u26a7\ufe0f|\ud83c\udff3\ufe0f\u200d\ud83c\udf08|\ud83d\ude36\u200d\ud83c\udf2b\ufe0f|\u2764\ufe0f\u200d\ud83d\udd25|\u2764\ufe0f\u200d\ud83e\ude79|\ud83c\udff4\u200d\u2620\ufe0f|\ud83d\udc15\u200d\ud83e\uddba|\ud83d\udc3b\u200d\u2744\ufe0f|\ud83d\udc41\u200d\ud83d\udde8|\ud83d\udc68\u200d\ud83d[\udc66\udc67]|\ud83d\udc69\u200d\ud83d[\udc66\udc67]|\ud83d\udc6f\u200d\u2640\ufe0f|\ud83d\udc6f\u200d\u2642\ufe0f|\ud83d\ude2e\u200d\ud83d\udca8|\ud83d\ude35\u200d\ud83d\udcab|\ud83e\udd3c\u200d\u2640\ufe0f|\ud83e\udd3c\u200d\u2642\ufe0f|\ud83e\uddde\u200d\u2640\ufe0f|\ud83e\uddde\u200d\u2642\ufe0f|\ud83e\udddf\u200d\u2640\ufe0f|\ud83e\udddf\u200d\u2642\ufe0f|\ud83d\udc08\u200d\u2b1b)|[#*0-9]\ufe0f?\u20e3|(?:[©®\u2122\u265f]\ufe0f)|(?:\ud83c[\udc04\udd70\udd71\udd7e\udd7f\ude02\ude1a\ude2f\ude37\udf21\udf24-\udf2c\udf36\udf7d\udf96\udf97\udf99-\udf9b\udf9e\udf9f\udfcd\udfce\udfd4-\udfdf\udff3\udff5\udff7]|\ud83d[\udc3f\udc41\udcfd\udd49\udd4a\udd6f\udd70\udd73\udd76-\udd79\udd87\udd8a-\udd8d\udda5\udda8\uddb1\uddb2\uddbc\uddc2-\uddc4\uddd1-\uddd3\udddc-\uddde\udde1\udde3\udde8\uddef\uddf3\uddfa\udecb\udecd-\udecf\udee0-\udee5\udee9\udef0\udef3]|[\u203c\u2049\u2139\u2194-\u2199\u21a9\u21aa\u231a\u231b\u2328\u23cf\u23ed-\u23ef\u23f1\u23f2\u23f8-\u23fa\u24c2\u25aa\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614\u2615\u2618\u2620\u2622\u2623\u2626\u262a\u262e\u262f\u2638-\u263a\u2640\u2642\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267b\u267f\u2692-\u2697\u2699\u269b\u269c\u26a0\u26a1\u26a7\u26aa\u26ab\u26b0\u26b1\u26bd\u26be\u26c4\u26c5\u26c8\u26cf\u26d1\u26d3\u26d4\u26e9\u26ea\u26f0-\u26f5\u26f8\u26fa\u26fd\u2702\u2708\u2709\u270f\u2712\u2714\u2716\u271d\u2721\u2733\u2734\u2744\u2747\u2757\u2763\u2764\u27a1\u2934\u2935\u2b05-\u2b07\u2b1b\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299])(?:\ufe0f|(?!\ufe0e))|(?:(?:\ud83c[\udfcb\udfcc]|\ud83d[\udd74\udd75\udd90]|[\u261d\u26f7\u26f9\u270c\u270d])(?:\ufe0f|(?!\ufe0e))|(?:\ud83c[\udf85\udfc2-\udfc4\udfc7\udfca]|\ud83d[\udc42\udc43\udc46-\udc50\udc66-\udc69\udc6e\udc70-\udc78\udc7c\udc81-\udc83\udc85-\udc87\udcaa\udd7a\udd95\udd96\ude45-\ude47\ude4b-\ude4f\udea3\udeb4-\udeb6\udec0\udecc]|\ud83e[\udd0c\udd0f\udd18-\udd1c\udd1e\udd1f\udd26\udd30-\udd39\udd3d\udd3e\udd77\uddb5\uddb6\uddb8\uddb9\uddbb\uddcd-\uddcf\uddd1-\udddd\udec3-\udec5\udef0-\udef6]|[\u270a\u270b]))(?:\ud83c[\udffb-\udfff])?|(?:\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc65\udb40\udc6e\udb40\udc67\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc73\udb40\udc63\udb40\udc74\udb40\udc7f|\ud83c\udff4\udb40\udc67\udb40\udc62\udb40\udc77\udb40\udc6c\udb40\udc73\udb40\udc7f|\ud83c\udde6\ud83c[\udde8-\uddec\uddee\uddf1\uddf2\uddf4\uddf6-\uddfa\uddfc\uddfd\uddff]|\ud83c\udde7\ud83c[\udde6\udde7\udde9-\uddef\uddf1-\uddf4\uddf6-\uddf9\uddfb\uddfc\uddfe\uddff]|\ud83c\udde8\ud83c[\udde6\udde8\udde9\uddeb-\uddee\uddf0-\uddf5\uddf7\uddfa-\uddff]|\ud83c\udde9\ud83c[\uddea\uddec\uddef\uddf0\uddf2\uddf4\uddff]|\ud83c\uddea\ud83c[\udde6\udde8\uddea\uddec\udded\uddf7-\uddfa]|\ud83c\uddeb\ud83c[\uddee-\uddf0\uddf2\uddf4\uddf7]|\ud83c\uddec\ud83c[\udde6\udde7\udde9-\uddee\uddf1-\uddf3\uddf5-\uddfa\uddfc\uddfe]|\ud83c\udded\ud83c[\uddf0\uddf2\uddf3\uddf7\uddf9\uddfa]|\ud83c\uddee\ud83c[\udde8-\uddea\uddf1-\uddf4\uddf6-\uddf9]|\ud83c\uddef\ud83c[\uddea\uddf2\uddf4\uddf5]|\ud83c\uddf0\ud83c[\uddea\uddec-\uddee\uddf2\uddf3\uddf5\uddf7\uddfc\uddfe\uddff]|\ud83c\uddf1\ud83c[\udde6-\udde8\uddee\uddf0\uddf7-\uddfb\uddfe]|\ud83c\uddf2\ud83c[\udde6\udde8-\udded\uddf0-\uddff]|\ud83c\uddf3\ud83c[\udde6\udde8\uddea-\uddec\uddee\uddf1\uddf4\uddf5\uddf7\uddfa\uddff]|\ud83c\uddf4\ud83c\uddf2|\ud83c\uddf5\ud83c[\udde6\uddea-\udded\uddf0-\uddf3\uddf7-\uddf9\uddfc\uddfe]|\ud83c\uddf6\ud83c\udde6|\ud83c\uddf7\ud83c[\uddea\uddf4\uddf8\uddfa\uddfc]|\ud83c\uddf8\ud83c[\udde6-\uddea\uddec-\uddf4\uddf7-\uddf9\uddfb\uddfd-\uddff]|\ud83c\uddf9\ud83c[\udde6\udde8\udde9\uddeb-\udded\uddef-\uddf4\uddf7\uddf9\uddfb\uddfc\uddff]|\ud83c\uddfa\ud83c[\udde6\uddec\uddf2\uddf3\uddf8\uddfe\uddff]|\ud83c\uddfb\ud83c[\udde6\udde8\uddea\uddec\uddee\uddf3\uddfa]|\ud83c\uddfc\ud83c[\uddeb\uddf8]|\ud83c\uddfd\ud83c\uddf0|\ud83c\uddfe\ud83c[\uddea\uddf9]|\ud83c\uddff\ud83c[\udde6\uddf2\uddfc]|\ud83c[\udccf\udd8e\udd91-\udd9a\udde6-\uddff\ude01\ude32-\ude36\ude38-\ude3a\ude50\ude51\udf00-\udf20\udf2d-\udf35\udf37-\udf7c\udf7e-\udf84\udf86-\udf93\udfa0-\udfc1\udfc5\udfc6\udfc8\udfc9\udfcf-\udfd3\udfe0-\udff0\udff4\udff8-\udfff]|\ud83d[\udc00-\udc3e\udc40\udc44\udc45\udc51-\udc65\udc6a\udc6f\udc79-\udc7b\udc7d-\udc80\udc84\udc88-\udc8e\udc90\udc92-\udca9\udcab-\udcfc\udcff-\udd3d\udd4b-\udd4e\udd50-\udd67\udda4\uddfb-\ude44\ude48-\ude4a\ude80-\udea2\udea4-\udeb3\udeb7-\udebf\udec1-\udec5\uded0-\uded2\uded5-\uded7\udedd-\udedf\udeeb\udeec\udef4-\udefc\udfe0-\udfeb\udff0]|\ud83e[\udd0d\udd0e\udd10-\udd17\udd20-\udd25\udd27-\udd2f\udd3a\udd3c\udd3f-\udd45\udd47-\udd76\udd78-\uddb4\uddb7\uddba\uddbc-\uddcc\uddd0\uddde-\uddff\ude70-\ude74\ude78-\ude7c\ude80-\ude86\ude90-\udeac\udeb0-\udeba\udec0-\udec2\uded0-\uded9\udee0-\udee7]|[\u23e9-\u23ec\u23f0\u23f3\u267e\u26ce\u2705\u2728\u274c\u274e\u2753-\u2755\u2795-\u2797\u27b0\u27bf\ue50a])|\ufe0f/g,
+
+    // avoid runtime RegExp creation for not so smart,
+    // not JIT based, and old browsers / engines
+    UFE0Fg = /\uFE0F/g,
+
+    // avoid using a string literal like '\u200D' here because minifiers expand it inline
+    U200D = String.fromCharCode(0x200D),
+
+    // used to find HTML special chars in attributes
+    rescaper = /[&<>'"]/g,
+
+    // nodes with type 1 which should **not** be parsed
+    shouldntBeParsed = /^(?:iframe|noframes|noscript|script|select|style|textarea)$/,
+
+    // just a private shortcut
+    fromCharCode = String.fromCharCode;
+
+  return twemoji;
+
+
+  /////////////////////////
+  //  private functions  //
+  //     declaration     //
+  /////////////////////////
+
+  /**
+   * Shortcut to create text nodes
+   * @param   string  text used to create DOM text node
+   * @return  Node  a DOM node with that text
+   */
+  function createText(text, clean) {
+    return document.createTextNode(clean ? text.replace(UFE0Fg, '') : text);
+  }
+
+  /**
+   * Utility function to escape html attribute text
+   * @param   string  text use in HTML attribute
+   * @return  string  text encoded to use in HTML attribute
+   */
+  function escapeHTML(s) {
+    return s.replace(rescaper, replacer);
+  }
+
+  /**
+   * Default callback used to generate emoji src
+   *  based on Twitter CDN
+   * @param   string    the emoji codepoint string
+   * @param   string    the default size to use, i.e. "36x36"
+   * @return  string    the image source to use
+   */
+  function defaultImageSrcGenerator(icon, options) {
+    return ''.concat(options.base, options.size, '/', icon, options.ext);
+  }
+
+  /**
+   * Given a generic DOM nodeType 1, walk through all children
+   * and store every nodeType 3 (#text) found in the tree.
+   * @param   Element a DOM Element with probably some text in it
+   * @param   Array the list of previously discovered text nodes
+   * @return  Array same list with new discovered nodes, if any
+   */
+  function grabAllTextNodes(node, allText) {
+    var
+      childNodes = node.childNodes,
+      length = childNodes.length,
+      subnode,
+      nodeType;
+    while (length--) {
+      subnode = childNodes[length];
+      nodeType = subnode.nodeType;
+      // parse emoji only in text nodes
+      if (nodeType === 3) {
+        // collect them to process emoji later
+        allText.push(subnode);
+      }
+      // ignore all nodes that are not type 1, that are svg, or that
+      // should not be parsed as script, style, and others
+      else if (nodeType === 1 && !('ownerSVGElement' in subnode) &&
+          !shouldntBeParsed.test(subnode.nodeName.toLowerCase())) {
+
+        // WP start
+        // Use doNotParse() callback if set.
+        if ( twemoji.doNotParse && twemoji.doNotParse( subnode ) ) {
+            continue;
+        }
+        // WP end
+
+        grabAllTextNodes(subnode, allText);
+      }
+    }
+    return allText;
+  }
+
+  /**
+   * Used to both remove the possible variant
+   *  and to convert utf16 into code points.
+   *  If there is a zero-width-joiner (U+200D), leave the variants in.
+   * @param   string    the raw text of the emoji match
+   * @return  string    the code point
+   */
+  function grabTheRightIcon(rawText) {
+    // if variant is present as \uFE0F
+    return toCodePoint(rawText.indexOf(U200D) < 0 ?
+      rawText.replace(UFE0Fg, '') :
+      rawText
+    );
+  }
+
+  /**
+   * DOM version of the same logic / parser:
+   *  emojify all found sub-text nodes placing images node instead.
+   * @param   Element   generic DOM node with some text in some child node
+   * @param   Object    options  containing info about how to parse
+    *
+    *            .callback   Function  the callback to invoke per each found emoji.
+    *            .base       string    the base url, by default twemoji.base
+    *            .ext        string    the image extension, by default twemoji.ext
+    *            .size       string    the assets size, by default twemoji.size
+    *
+   * @return  Element same generic node with emoji in place, if any.
+   */
+  function parseNode(node, options) {
+    var
+      allText = grabAllTextNodes(node, []),
+      length = allText.length,
+      attrib,
+      attrname,
+      modified,
+      fragment,
+      subnode,
+      text,
+      match,
+      i,
+      index,
+      img,
+      rawText,
+      iconId,
+      src;
+    while (length--) {
+      modified = false;
+      fragment = document.createDocumentFragment();
+      subnode = allText[length];
+      text = subnode.nodeValue;
+      i = 0;
+      while ((match = re.exec(text))) {
+        index = match.index;
+        if (index !== i) {
+          fragment.appendChild(
+            createText(text.slice(i, index), true)
+          );
+        }
+        rawText = match[0];
+        iconId = grabTheRightIcon(rawText);
+        i = index + rawText.length;
+        src = options.callback(iconId, options);
+        if (iconId && src) {
+          img = new Image();
+          img.onerror = options.onerror;
+          img.setAttribute('draggable', 'false');
+          attrib = options.attributes(rawText, iconId);
+          for (attrname in attrib) {
+            if (
+              attrib.hasOwnProperty(attrname) &&
+              // don't allow any handlers to be set + don't allow overrides
+              attrname.indexOf('on') !== 0 &&
+              !img.hasAttribute(attrname)
+            ) {
+              img.setAttribute(attrname, attrib[attrname]);
+            }
+          }
+          img.className = options.className;
+          img.alt = rawText;
+          img.src = src;
+          modified = true;
+          fragment.appendChild(img);
+        }
+        if (!img) fragment.appendChild(createText(rawText, false));
+        img = null;
+      }
+      // is there actually anything to replace in here ?
+      if (modified) {
+        // any text left to be added ?
+        if (i < text.length) {
+          fragment.appendChild(
+            createText(text.slice(i), true)
+          );
+        }
+        // replace the text node only, leave intact
+        // anything else surrounding such text
+        subnode.parentNode.replaceChild(fragment, subnode);
+      }
+    }
+    return node;
+  }
+
+  /**
+   * String/HTML version of the same logic / parser:
+   *  emojify a generic text placing images tags instead of surrogates pair.
+   * @param   string    generic string with possibly some emoji in it
+   * @param   Object    options  containing info about how to parse
+   *
+   *            .callback   Function  the callback to invoke per each found emoji.
+   *            .base       string    the base url, by default twemoji.base
+   *            .ext        string    the image extension, by default twemoji.ext
+   *            .size       string    the assets size, by default twemoji.size
+   *
+   * @return  the string with <img tags> replacing all found and parsed emoji
+   */
+  function parseString(str, options) {
+    return replace(str, function (rawText) {
+      var
+        ret = rawText,
+        iconId = grabTheRightIcon(rawText),
+        src = options.callback(iconId, options),
+        attrib,
+        attrname;
+      if (iconId && src) {
+        // recycle the match string replacing the emoji
+        // with its image counter part
+        ret = '<img '.concat(
+          'class="', options.className, '" ',
+          'draggable="false" ',
+          // needs to preserve user original intent
+          // when variants should be copied and pasted too
+          'alt="',
+          rawText,
+          '"',
+          ' src="',
+          src,
+          '"'
+        );
+        attrib = options.attributes(rawText, iconId);
+        for (attrname in attrib) {
+          if (
+            attrib.hasOwnProperty(attrname) &&
+            // don't allow any handlers to be set + don't allow overrides
+            attrname.indexOf('on') !== 0 &&
+            ret.indexOf(' ' + attrname + '=') === -1
+          ) {
+            ret = ret.concat(' ', attrname, '="', escapeHTML(attrib[attrname]), '"');
+          }
+        }
+        ret = ret.concat('/>');
+      }
+      return ret;
+    });
+  }
+
+  /**
+   * Function used to actually replace HTML special chars
+   * @param   string  HTML special char
+   * @return  string  encoded HTML special char
+   */
+  function replacer(m) {
+    return escaper[m];
+  }
+
+  /**
+   * Default options.attribute callback
+   * @return  null
+   */
+  function returnNull() {
+    return null;
+  }
+
+  /**
+   * Given a generic value, creates its squared counterpart if it's a number.
+   *  As example, number 36 will return '36x36'.
+   * @param   any     a generic value.
+   * @return  any     a string representing asset size, i.e. "36x36"
+   *                  only in case the value was a number.
+   *                  Returns initial value otherwise.
+   */
+  function toSizeSquaredAsset(value) {
+    return typeof value === 'number' ?
+      value + 'x' + value :
+      value;
+  }
+
+
+  /////////////////////////
+  //  exported functions //
+  //     declaration     //
+  /////////////////////////
+
+  function fromCodePoint(codepoint) {
+    var code = typeof codepoint === 'string' ?
+          parseInt(codepoint, 16) : codepoint;
+    if (code < 0x10000) {
+      return fromCharCode(code);
+    }
+    code -= 0x10000;
+    return fromCharCode(
+      0xD800 + (code >> 10),
+      0xDC00 + (code & 0x3FF)
+    );
+  }
+
+  function parse(what, how) {
+    if (!how || typeof how === 'function') {
+      how = {callback: how};
+    }
+
+    // WP start
+    // Allow passing of the doNotParse() callback in the settings.
+    // The callback is used in `grabAllTextNodes()` (DOM mode only) as a filter
+    // that allows bypassing of some of the text nodes. It gets the current subnode as argument.
+    twemoji.doNotParse = how.doNotParse;
+    // WP end
+
+    // if first argument is string, inject html <img> tags
+    // otherwise use the DOM tree and parse text nodes only
+    return (typeof what === 'string' ? parseString : parseNode)(what, {
+      callback:   how.callback || defaultImageSrcGenerator,
+      attributes: typeof how.attributes === 'function' ? how.attributes : returnNull,
+      base:       typeof how.base === 'string' ? how.base : twemoji.base,
+      ext:        how.ext || twemoji.ext,
+      size:       how.folder || toSizeSquaredAsset(how.size || twemoji.size),
+      className:  how.className || twemoji.className,
+      onerror:    how.onerror || twemoji.onerror
+    });
+  }
+
+  function replace(text, callback) {
+    return String(text).replace(re, callback);
+  }
+
+  function test(text) {
+    // IE6 needs a reset before too
+    re.lastIndex = 0;
+    var result = re.test(text);
+    re.lastIndex = 0;
+    return result;
+  }
+
+  function toCodePoint(unicodeSurrogates, sep) {
+    var
+      r = [],
+      c = 0,
+      p = 0,
+      i = 0;
+    while (i < unicodeSurrogates.length) {
+      c = unicodeSurrogates.charCodeAt(i++);
+      if (p) {
+        r.push((0x10000 + ((p - 0xD800) << 10) + (c - 0xDC00)).toString(16));
+        p = 0;
+      } else if (0xD800 <= c && c <= 0xDBFF) {
+        p = c;
+      } else {
+        r.push(c.toString(16));
+      }
+    }
+    return r.join(sep || '-');
+  }
+
+}());
diff --git a/src/js/_enqueues/wp/api.js b/src/js/_enqueues/wp/api.js
index b033a6f02b0d2..1d0baea8cdf28 100644
--- a/src/js/_enqueues/wp/api.js
+++ b/src/js/_enqueues/wp/api.js
@@ -7,7 +7,7 @@
 	'use strict';
 
 	/**
-	 * Initialise the WP_API.
+	 * Initialize the WP_API.
 	 */
 	function WP_API() {
 		/** @namespace wp.api.models */
diff --git a/src/js/_enqueues/wp/customize/base.js b/src/js/_enqueues/wp/customize/base.js
index 24a5bf6669ef0..4afaa945571f0 100644
--- a/src/js/_enqueues/wp/customize/base.js
+++ b/src/js/_enqueues/wp/customize/base.js
@@ -391,8 +391,9 @@ window.wp = window.wp || {};
 		/**
 		 * Add an item to the collection.
 		 *
-		 * @param {string|wp.customize.Class} item - The item instance to add, or the ID for the instance to add. When an ID string is supplied, then itemObject must be provided.
-		 * @param {wp.customize.Class}        [itemObject] - The item instance when the first argument is a ID string.
+		 * @param {string|wp.customize.Class} item         - The item instance to add, or the ID for the instance to add.
+		 *                                                   When an ID string is supplied, then itemObject must be provided.
+		 * @param {wp.customize.Class}        [itemObject] - The item instance when the first argument is an ID string.
 		 * @return {wp.customize.Class} The new item's instance, or an existing instance if already added.
 		 */
 		add: function( item, itemObject ) {
diff --git a/src/js/_enqueues/wp/embed.js b/src/js/_enqueues/wp/embed.js
index fa2934f379c4b..315e573f5cb82 100644
--- a/src/js/_enqueues/wp/embed.js
+++ b/src/js/_enqueues/wp/embed.js
@@ -4,25 +4,23 @@
  * @since 4.4.0
  * @output wp-includes/js/wp-embed.js
  *
- * This file cannot have ampersands in it. This is to ensure
- * it can be embedded in older versions of WordPress.
- * See https://core.trac.wordpress.org/changeset/35708.
+ * Single line comments should not be used since they will break
+ * the script when inlined in get_post_embed_html(), specifically
+ * when the comments are not stripped out due to SCRIPT_DEBUG
+ * being turned on.
  */
 (function ( window, document ) {
 	'use strict';
 
-	var supportedBrowser = false,
-		loaded = false;
-
-		if ( document.querySelector ) {
-			if ( window.addEventListener ) {
-				supportedBrowser = true;
-			}
-		}
+	/* Abort for ancient browsers. */
+	if ( ! document.querySelector || ! window.addEventListener || typeof URL === 'undefined' ) {
+		return;
+	}
 
 	/** @namespace wp */
 	window.wp = window.wp || {};
 
+	/* Abort if script was already executed. */
 	if ( !! window.wp.receiveEmbedMessage ) {
 		return;
 	}
@@ -35,20 +33,17 @@
 	window.wp.receiveEmbedMessage = function( e ) {
 		var data = e.data;
 
-		if ( ! data ) {
-			return;
-		}
-
-		if ( ! ( data.secret || data.message || data.value ) ) {
-			return;
-		}
-
-		if ( /[^a-zA-Z0-9]/.test( data.secret ) ) {
+		/* Verify shape of message. */
+		if (
+			! ( data || data.secret || data.message || data.value ) ||
+			/[^a-zA-Z0-9]/.test( data.secret )
+		) {
 			return;
 		}
 
 		var iframes = document.querySelectorAll( 'iframe[data-secret="' + data.secret + '"]' ),
 			blockquotes = document.querySelectorAll( 'blockquote[data-secret="' + data.secret + '"]' ),
+			allowedProtocols = new RegExp( '^https?:$', 'i' ),
 			i, source, height, sourceURL, targetURL;
 
 		for ( i = 0; i < blockquotes.length; i++ ) {
@@ -64,8 +59,8 @@
 
 			source.removeAttribute( 'style' );
 
-			/* Resize the iframe on request. */
 			if ( 'height' === data.message ) {
+				/* Resize the iframe on request. */
 				height = parseInt( data.value, 10 );
 				if ( height > 1000 ) {
 					height = 1000;
@@ -74,37 +69,25 @@
 				}
 
 				source.height = height;
-			}
-
-			/* Link to a specific URL on request. */
-			if ( 'link' === data.message ) {
-				sourceURL = document.createElement( 'a' );
-				targetURL = document.createElement( 'a' );
-
-				sourceURL.href = source.getAttribute( 'src' );
-				targetURL.href = data.value;
-
-				/* Only continue if link hostname matches iframe's hostname. */
-				if ( targetURL.host === sourceURL.host ) {
-					if ( document.activeElement === source ) {
-						window.top.location.href = data.value;
-					}
+			} else if ( 'link' === data.message ) {
+				/* Link to a specific URL on request. */
+				sourceURL = new URL( source.getAttribute( 'src' ) );
+				targetURL = new URL( data.value );
+
+				if (
+					allowedProtocols.test( targetURL.protocol ) &&
+					targetURL.host === sourceURL.host &&
+					document.activeElement === source
+				) {
+					window.top.location.href = data.value;
 				}
 			}
 		}
 	};
 
 	function onLoad() {
-		if ( loaded ) {
-			return;
-		}
-
-		loaded = true;
-
-		var isIE10 = -1 !== navigator.appVersion.indexOf( 'MSIE 10' ),
-			isIE11 = !!navigator.userAgent.match( /Trident.*rv:11\./ ),
-			iframes = document.querySelectorAll( 'iframe.wp-embedded-content' ),
-			iframeClone, i, source, secret;
+		var iframes = document.querySelectorAll( 'iframe.wp-embedded-content' ),
+			i, source, secret;
 
 		for ( i = 0; i < iframes.length; i++ ) {
 			/** @var {IframeElement} */
@@ -113,18 +96,11 @@
 			secret = source.getAttribute( 'data-secret' );
 			if ( ! secret ) {
 				/* Add secret to iframe */
-				secret = Math.random().toString( 36 ).substr( 2, 10 );
+				secret = Math.random().toString( 36 ).substring( 2, 12 );
 				source.src += '#?secret=' + secret;
 				source.setAttribute( 'data-secret', secret );
 			}
 
-			/* Remove security attribute from iframes in IE10 and IE11. */
-			if ( ( isIE10 || isIE11 ) ) {
-				iframeClone = source.cloneNode( true );
-				iframeClone.removeAttribute( 'security' );
-				source.parentNode.replaceChild( iframeClone, source );
-			}
-
 			/*
 			 * Let post embed window know that the parent is ready for receiving the height message, in case the iframe
 			 * loaded before wp-embed.js was loaded. When the ready message is received by the post embed window, the
@@ -137,9 +113,6 @@
 		}
 	}
 
-	if ( supportedBrowser ) {
-		window.addEventListener( 'message', window.wp.receiveEmbedMessage, false );
-		document.addEventListener( 'DOMContentLoaded', onLoad, false );
-		window.addEventListener( 'load', onLoad, false );
-	}
+	window.addEventListener( 'message', window.wp.receiveEmbedMessage, false );
+	document.addEventListener( 'DOMContentLoaded', onLoad, false );
 })( window, document );
diff --git a/src/js/_enqueues/wp/emoji.js b/src/js/_enqueues/wp/emoji.js
index c737bb17bf637..34012e96cec08 100644
--- a/src/js/_enqueues/wp/emoji.js
+++ b/src/js/_enqueues/wp/emoji.js
@@ -145,17 +145,6 @@
 								node = node.parentNode;
 							}
 
-							/*
-							 * If the class name of a non-element node contains 'wp-exclude-emoji' ignore it.
-							 *
-							 * Node type 1 is an ELEMENT_NODE.
-							 */
-							if ( ! node || node.nodeType !== 1 ||
-								( node.className && typeof node.className === 'string' && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
-
-								continue;
-							}
-
 							if ( test( node.textContent ) ) {
 								parse( node );
 							}
@@ -263,6 +252,19 @@
 						this.setAttribute( 'data-error', 'load-failed' );
 						twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji );
 					}
+				},
+				doNotParse: function( node ) {
+					if (
+						node &&
+						node.className &&
+						typeof node.className === 'string' &&
+						node.className.indexOf( 'wp-exclude-emoji' ) !== -1
+					) {
+						// Do not parse this node. Emojis will not be replaced in this node and all sub-nodes.
+						return true;
+					}
+
+					return false;
 				}
 			};
 
diff --git a/src/js/_enqueues/wp/updates.js b/src/js/_enqueues/wp/updates.js
index c6d0ff56f2c3d..a994fda694ae9 100644
--- a/src/js/_enqueues/wp/updates.js
+++ b/src/js/_enqueues/wp/updates.js
@@ -5,7 +5,7 @@
  * @output wp-admin/js/updates.js
  */
 
-/* global pagenow */
+/* global pagenow, _wpThemeSettings */
 
 /**
  * @param {jQuery}  $                                        jQuery object.
@@ -515,7 +515,7 @@
 
 		if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
 			$pluginRow     = $( 'tr[data-plugin="' + response.plugin + '"]' )
-				.removeClass( 'update' )
+				.removeClass( 'update is-enqueued' )
 				.addClass( 'updated' );
 			$updateMessage = $pluginRow.find( '.update-message' )
 				.removeClass( 'updating-message notice-warning' )
@@ -567,7 +567,7 @@
 	 * @param {string}  response.errorMessage The error that occurred.
 	 */
 	wp.updates.updatePluginError = function( response ) {
-		var $card, $message, errorMessage,
+		var $pluginRow, $card, $message, errorMessage,
 			$adminBarUpdates = $( '#wp-admin-bar-updates' );
 
 		if ( ! wp.updates.isValidResponse( response, 'update' ) ) {
@@ -585,6 +585,8 @@
 		);
 
 		if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
+			$pluginRow = $( 'tr[data-plugin="' + response.plugin + '"]' ).removeClass( 'is-enqueued' );
+
 			if ( response.plugin ) {
 				$message = $( 'tr[data-plugin="' + response.plugin + '"]' ).find( '.update-message' );
 			} else {
@@ -1614,6 +1616,14 @@
 			} );
 		}
 
+		// DecrementCount from update count.
+		if ( 'themes' === pagenow ) {
+		    var theme = _.find( _wpThemeSettings.themes, { id: response.slug } );
+		    if ( theme.hasUpdate ) {
+		        wp.updates.decrementCount( 'theme' );
+		    }
+		}
+
 		wp.a11y.speak( _x( 'Deleted!', 'theme' ) );
 
 		$document.trigger( 'wp-theme-delete-success', response );
@@ -2460,6 +2470,13 @@
 					return;
 				}
 
+				// Don't add items to the update queue again, even if the user clicks the update button several times.
+				if ( 'update-selected' === bulkAction && $itemRow.hasClass( 'is-enqueued' ) ) {
+					return;
+				}
+
+				$itemRow.addClass( 'is-enqueued' );
+
 				// Add it to the queue.
 				wp.updates.queue.push( {
 					action: action,
@@ -2654,7 +2671,7 @@
 					sprintf(
 						/* translators: %s: Search query. */
 						__( 'Search results for: %s' ),
-						'<strong>' + _.escape( data.s ) + '</strong>'
+						'<strong>' + _.escape( decodeURIComponent( data.s ) ) + '</strong>'
 					) ),
 					$oldSubTitle = $( '.wrap .subtitle' );
 
diff --git a/src/js/media/views/attachment-compat.js b/src/js/media/views/attachment-compat.js
index c58755d227981..d24de569639bd 100644
--- a/src/js/media/views/attachment-compat.js
+++ b/src/js/media/views/attachment-compat.js
@@ -25,8 +25,10 @@ AttachmentCompat = View.extend(/** @lends wp.media.view.AttachmentCompat.prototy
 	},
 
 	initialize: function() {
-		this.listenTo( this.model, 'change:compat', this.render );
+		// Render the view when a new item is added.
+		this.listenTo( this.model, 'add', this.render );
 	},
+
 	/**
 	 * @return {wp.media.view.AttachmentCompat} Returns itself to allow chaining.
 	 */
diff --git a/src/js/media/views/frame/video-details.js b/src/js/media/views/frame/video-details.js
index 2dbb22f774a91..6a0d6042026e3 100644
--- a/src/js/media/views/frame/video-details.js
+++ b/src/js/media/views/frame/video-details.js
@@ -106,6 +106,7 @@ VideoDetails = MediaDetails.extend(/** @lends wp.media.view.MediaFrame.VideoDeta
 
 			wp.ajax.send( 'set-attachment-thumbnail', {
 				data : {
+					_ajax_nonce: wp.media.view.settings.nonce.setAttachmentThumbnail,
 					urls: urls,
 					thumbnail_id: attachment.get( 'id' )
 				}
diff --git a/src/license.txt b/src/license.txt
index 5efa95e73b8d3..018dd485b5de6 100644
--- a/src/license.txt
+++ b/src/license.txt
@@ -1,6 +1,6 @@
 WordPress - Web publishing software
 
-Copyright 2011-2022 by the contributors
+Copyright 2011-2023 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/src/readme.html b/src/readme.html
index 0048b9efa39f9..a40c5e98a95bd 100644
--- a/src/readme.html
+++ b/src/readme.html
@@ -47,18 +47,18 @@ <h3>Updating Manually</h3>
 </ol>
 
 <h2>Migrating from other systems</h2>
-<p>WordPress can <a href="https://wordpress.org/support/article/importing-content/">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php">our import tools</a>.</p>
+<p>WordPress can <a href="https://wordpress.org/documentation/article/importing-content/">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php">our import tools</a>.</p>
 
 <h2>System Requirements</h2>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>5.6.20</strong> or greater.</li>
+	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.0</strong> or greater.</li>
 	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or greater.</li>
 </ul>
 
 <h3>Recommendations</h3>
 <ul>
 	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
-	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.3</strong> or greater.</li>
+	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
@@ -67,7 +67,7 @@ <h3>Recommendations</h3>
 <h2>Online Resources</h2>
 <p>If you have any questions that are not addressed in this document, please take advantage of WordPress&#8217; numerous online resources:</p>
 <dl>
-	<dt><a href="https://wordpress.org/support/">HelpHub</a></dt>
+	<dt><a href="https://wordpress.org/documentation/">HelpHub</a></dt>
 		<dd>HelpHub is the encyclopedia of all things WordPress. It is the most comprehensive source of information for WordPress available.</dd>
 	<dt><a href="https://wordpress.org/news/">The WordPress Blog</a></dt>
 		<dd>This is where you&#8217;ll find the latest updates and news related to WordPress. Recent WordPress news appears in your administrative dashboard by default.</dd>
@@ -88,7 +88,7 @@ <h2>Final Notes</h2>
 <h2>Share the Love</h2>
 <p>WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better&#8212;you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgeable than yourself, or writing the author of a media article that overlooks us.</p>
 
-<p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/">donating</a>.</p>
+<p>WordPress is the official continuation of <a href="https://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/">donating</a>.</p>
 
 <h2>License</h2>
 <p>WordPress is free software, and is released under the terms of the <abbr>GPL</abbr> (GNU General Public License) version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
diff --git a/src/wp-activate.php b/src/wp-activate.php
index 92b062eff0e63..728edcf4e3d14 100644
--- a/src/wp-activate.php
+++ b/src/wp-activate.php
@@ -87,7 +87,7 @@
  */
 function do_activate_header() {
 	/**
-	 * Fires before the Site Activation page is loaded.
+	 * Fires within the `<head>` section of the Site Activation page.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
 	 *
@@ -120,7 +120,7 @@ function wpmu_activate_stylesheet() {
 
 get_header( 'wp-activate' );
 
-$blog_details = get_blog_details();
+$blog_details = get_site();
 ?>
 
 <div id="signup-content" class="widecolumn">
diff --git a/src/wp-admin/_index.php b/src/wp-admin/_index.php
index ccdf525c0c259..7278cfbf37c24 100644
--- a/src/wp-admin/_index.php
+++ b/src/wp-admin/_index.php
@@ -116,7 +116,7 @@
 if ( ! $is_dev_version ) {
 	$version_url = sprintf(
 		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+		esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 		sanitize_title( $wp_version )
 	);
 
@@ -129,8 +129,8 @@
 
 $screen->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/dashboard-screen/">Documentation on Dashboard</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/dashboard-screen/">Documentation on Dashboard</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>' .
 	'<p>' . $wp_version_text . '</p>'
 );
 
@@ -186,7 +186,7 @@
 		<a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>" aria-label="<?php esc_attr_e( 'Dismiss the welcome panel' ); ?>"><?php _e( 'Dismiss' ); ?></a>
 		<?php
 		/**
-		 * Add content to the welcome panel on the admin dashboard.
+		 * Fires when adding content to the welcome panel on the admin dashboard.
 		 *
 		 * To remove the default welcome panel, use remove_action():
 		 *
diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
index 87e321d00b41b..02dd6abd2e319 100644
--- a/src/wp-admin/about.php
+++ b/src/wp-admin/about.php
@@ -33,18 +33,19 @@
 			</div>
 
 			<div class="about__header-text"></div>
-
-			<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-				<a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What&#8217;s New' ); ?></a>
-				<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-				<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-				<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-			</nav>
 		</div>
 
-		<div class="about__section">
+		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+			<a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What&#8217;s New' ); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+			<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
+		</nav>
+
+		<div class="about__section aligncenter">
 			<div class="column">
-				<h2 class="aligncenter">
+				<h2>
 					<?php
 					printf(
 						/* translators: %s: Version number. */
@@ -54,440 +55,187 @@
 					?>
 				</h2>
 				<p class="is-subheading">
-					<?php _e( 'This page highlights some of the most significant changes to the product since the May 2022 release of WordPress 6.0. You will also find resources for developers and anyone seeking a deeper understanding of WordPress.' ); ?>
+					<?php _e( 'Create beautiful and compelling websites more efficiently than ever. Whether you want to build an entire site without coding or are a developer looking to customize every detail, WordPress 6.3 has something for you.' ); ?>
 				</p>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image" style="background-color:#353535;">
-					<img src="https://s.w.org/images/core/6.1/about-61-style-variations.webp" alt="" />
+			<div class="column is-vertically-aligned-center">
+				<div class="about__image">
+					<img src="https://s.w.org/images/core/6.3/1-site-editor.webp" alt="" height="436" width="436" />
 				</div>
 			</div>
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'A new default theme powered by 10 distinct style variations' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: Variation announcement post URL, 2: Accessibility-ready handbook page. */
-						__( 'Building on the foundational elements in the 5.9 and 6.0 releases for block themes and style variations, the new default theme, Twenty Twenty-Three, includes <a href="%1$s">10 different styles</a> and is &#147;<a href="%2$s">Accessibility Ready</a>&#148;.' ),
-						'https://make.wordpress.org/design/2022/09/07/tt3-default-theme-announcing-style-variation-selections/',
-						'https://make.wordpress.org/themes/handbook/review/accessibility/'
-					);
-					?>
-				</p>
+				<h3><?php _e( 'Do everything in the Site Editor' ); ?></h3>
+				<p><?php _e( 'WordPress 6.3 brings your content, templates, and patterns together in the Site Editor for the first time. Add pages, browse style variations, create synced patterns, and enjoy fine-tuned control over your navigation menus. No more time wasted switching across different site areas—now you can focus on what matters most. Creation to completion, all in one place.' ); ?></p>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'A better creator experience with refined and additional templates' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: Link to template options dev note, 2: Link to template creation dev note. */
-						__( '<a href="%1$s">New templates</a> include a custom template for posts and pages in the Site Editor. Search-and-replace tools speed up the design of <a href="%2$s">template parts</a>.' ),
-						'https://make.wordpress.org/core/2022/07/21/core-editor-improvement-deeper-customization-with-more-template-options/',
-						'https://make.wordpress.org/core/2022/08/25/core-editor-improvement-refining-the-template-creation-experience/'
-					);
-					?>
-				</p>
+				<h3><?php _e( 'Create and sync patterns' ); ?></h3>
+				<p><?php _e( 'Arrange blocks in unlimited ways and save them as Patterns for use throughout your site. You can even specify whether to sync your patterns (previously referred to as “reusable blocks”) so that one change applies to all parts of your site. Or, utilize patterns as a starting point with the ability to customize each instance.' ); ?></p>
 			</div>
-			<div class="column">
-				<div class="about__image has-subtle-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-templates.webp" alt="" />
+			<div class="column is-vertically-aligned-center">
+				<div class="about__image">
+					<img src="https://s.w.org/images/core/6.3/2-create-patterns.webp" alt="" height="436" width="436" />
 				</div>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image has-subtle-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-design-tools.webp" alt="" />
+			<div class="column is-vertically-aligned-center">
+				<div class="about__image">
+					<img src="https://s.w.org/images/core/6.3/3-command-palette.webp" alt="" height="436" width="436" />
 				</div>
 			</div>
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'More consistency and control across design tools' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to layout support refactor dev note. */
-						__( 'Upgrades to the <a href="%s">controls for design elements and blocks</a> make the layout and site-building process more consistent, complete, and intuitive.' ),
-						'https://make.wordpress.org/core/2022/10/11/roster-of-design-tools-per-block/'
-					);
-					?>
-				</p>
+				<h3><?php _e( 'Work faster with the Command Palette' ); ?></h3>
+				<p><?php _e( 'Switch to a specific template or open your editor preferences with a new tool that helps you quickly navigate expanded functionality. With simple keyboard shortcuts (⌘+k on Mac or Ctrl+k on Windows), clicking the sidebar search icon in Site View, or clicking the Title Bar, get where you need to go and do what you need to do in seconds.' ); ?></p>
 			</div>
 		</div>
 
 		<div class="about__section has-2-columns">
 			<div class="column is-vertically-aligned-center">
-				<h3><?php _e( 'Menus just got easier to create and manage' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to navigation block fallback dev note. */
-						__( '<a href="%s">New fallback options</a> in the navigation block mean you can edit the menu that’s open; no searching needed. Plus, the controls for choosing and working on menus have their own place in the block settings. The mobile menu system also gets an upgrade with new features, including different icon options, to make the menu yours.' ),
-						'https://make.wordpress.org/core/2022/09/27/navigation-block-fallback-behavior-in-wp-6-1-dev-note/'
-					);
-					?>
-				</p>
+				<h3><?php _e( 'Sharpen your designs with new tools' ); ?></h3>
+				<p><?php _e( 'New design controls bring more versatility for fine-tuning designs, starting with the ability to customize your caption&#8217;s styles from the Styles Interface without coding. You can manage your duotone filters in Styles for supported blocks and pick from the options provided by your theme or disable them entirely. The Cover block gets added settings for text color, layout controls, and border options, making this powerful block even more handy.' ); ?></p>
 			</div>
-			<div class="column">
-				<div class="about__image has-subtle-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-navigation.webp" alt="" />
-				</div>
-			</div>
-		</div>
-
-		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image has-accent-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-document-settings.webp" alt="" />
-				</div>
-				<h3><?php _e( 'Improved layout and visualization of document settings' ); ?></h3>
-				<p><?php _e( 'A cleaner, better-organized display helps you easily view and manage important post and page settings, especially the template picker and scheduler.' ); ?></p>
-			</div>
-			<div class="column">
-				<div class="about__image has-accent-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-lock.webp" alt="" />
+			<div class="column is-vertically-aligned-center">
+				<div class="about__image">
+					<img src="https://s.w.org/images/core/6.3/4-design-tools.webp" alt="" height="436" width="436" />
 				</div>
-				<h3><?php _e( 'One-click lock settings for all inner blocks' ); ?></h3>
-				<p><?php _e( 'When locking blocks, a new toggle lets you apply your lock settings to all the blocks in a containing block like the group, cover, and column blocks.' ); ?></p>
 			</div>
 		</div>
 
 		<div class="about__section has-3-columns">
-			<div class="column">
-				<div class="column about__image is-edge-to-edge has-accent-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-sub-feature-1.webp" alt="" />
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Improved block placeholders' ); ?></h3>
-				<p><?php _e( 'Various blocks have improved placeholders that reflect customization options to help you design your site and its content. For example, the Image block placeholder displays custom borders and duotone filters even before selecting an image.' ); ?></p>
-			</div>
-			<div class="column">
-				<div class="column about__image is-edge-to-edge has-accent-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-sub-feature-2.webp" alt="" />
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Compose richer lists and quotes with inner blocks' ); ?></h3>
-				<p><?php _e( 'The List and Quote blocks now support inner blocks, allowing for more flexible and rich compositions like adding headings inside your Quote blocks.' ); ?></p>
-			</div>
-			<div class="column">
-				<div class="column about__image is-edge-to-edge has-accent-background-color">
-					<img src="https://s.w.org/images/core/6.1/about-61-sub-feature-3.webp" alt="" />
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'More responsive text with fluid typography' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to fluid typography demo. */
-						__( '<a href="%s">Fluid typography</a> lets you define font sizes that adapt for easy reading in any screen size.' ),
-						'https://make.wordpress.org/core/2022/10/03/fluid-font-sizes-in-wordpress-6-1/'
-					);
-					?>
-				</p>
-			</div>
-		</div>
-
-		<hr />
-
-		<div class="about__section has-2-columns">
 			<div class="column">
 				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M29.25 18.75v2.5h1.5v-2.5h2.5v-1.5h-2.5v-2.5h-1.5v2.5h-2.5v1.5h2.5zm-6.5-1.5h-6a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-6h-1.5v6a.5.5 0 0 1-.5.5h-12a.5.5 0 0 1-.5-.5v-12a.5.5 0 0 1 .5-.5h6v-1.5z" fill="#fff"/>
-					</svg>
+					<img src="https://s.w.org/images/core/6.3/5-style-revisions.webp" alt="" height="270" width="270" />
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Add starter patterns to any post type' ); ?></h3>
-				<p><?php _e( 'In WordPress 6.0, when you created a new page, you would see suggested patterns so you did not have to start with a blank page. In 6.1, you will also see the starter patterns modal when you create a new instance of any post type.' ); ?></p>
+				<h3 class="is-smaller-heading" style="margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Track design changes with Style Revisions' ); ?></h3>
+				<p><?php _e( 'You can now see how your site looked at a specific time. Visualize these revisions in a timeline and access a one-click option to restore prior styles.' ); ?></p>
 			</div>
 			<div class="column">
 				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M29.99 23.16a4.628 4.628 0 1 1-9.257 0 4.628 4.628 0 0 1 9.257 0zm1.5 0a6.128 6.128 0 0 1-10.252 4.535l-3.74 3.273-.988-1.13 3.75-3.28a6.128 6.128 0 1 1 11.23-3.397z" fill="#fff"/>
-					</svg>
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Find block themes faster' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to "full site editing" themes on WordPress.org. */
-						__( 'The Themes Directory has <a href="%s">a filter for block themes</a>, and a pattern preview gives a better sense of what the theme might look like while exploring different themes and patterns.' ),
-						esc_url( __( 'https://wordpress.org/themes/tags/full-site-editing/' ) )
-					);
-					?>
-				</p>
-			</div>
-		</div>
-
-		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M22.29 16.836a1 1 0 0 1 .986-.836h1.306a1 1 0 0 1 .986.836l.244 1.466c.788.26 1.503.679 2.108 1.218l1.393-.522a1 1 0 0 1 1.217.437l.653 1.13a1 1 0 0 1-.23 1.273l-1.148.944a6.025 6.025 0 0 1 0 2.435l1.148.946a1 1 0 0 1 .23 1.272l-.652 1.13a1 1 0 0 1-1.217.437l-1.394-.522c-.605.54-1.32.958-2.108 1.218l-.244 1.466a1 1 0 0 1-.986.836h-1.306a1 1 0 0 1-.987-.836l-.244-1.466a5.994 5.994 0 0 1-2.108-1.218l-1.394.522a1 1 0 0 1-1.216-.436l-.653-1.131a1 1 0 0 1 .23-1.272l1.148-.946a6.028 6.028 0 0 1 0-2.435l-1.147-.944a1 1 0 0 1-.23-1.273l.652-1.13a1 1 0 0 1 1.217-.437l1.393.522a5.996 5.996 0 0 1 2.108-1.218l.244-1.466zM26.928 24a3 3 0 1 1-6 0 3 3 0 0 1 6 0z" fill="#fff"/>
-					</svg>
+					<img src="https://s.w.org/images/core/6.3/6-footnotes-block.webp" alt="" height="270" width="270" />
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Keep your Site Editor settings for later' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to block editor preferences dev note. */
-						__( 'Site Editor settings are now <a href="%s">persistent for each user</a>. This means your settings will now be consistent across browsers and devices.' ),
-						'https://make.wordpress.org/core/2022/10/10/changes-to-block-editor-preferences-in-wordpress-6-1/'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Annotate with the Footnotes block' ); ?></h3>
+				<p><?php _e( 'Footnotes add convenient annotations throughout your content. Now you can add and link footnotes for any paragraph.' ); ?></p>
 			</div>
 			<div class="column">
 				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M31 24a7 7 0 0 1-7 7V17a7 7 0 0 1 7 7zm-7-8a8 8 0 1 1 0 16 8 8 0 0 1 0-16z" fill="#fff"/>
-					</svg>
+					<img src="https://s.w.org/images/core/6.3/7-details-block.webp" alt="" height="270" width="270" />
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'A streamlined style system' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link style engine dev note. */
-						__( 'The CSS rules for margin, padding, typography, colors, and borders within the <a href="%s">styles engine</a> are now all in one place, reducing time spent on layout-specific tasks and helps to generate semantic class names.' ),
-						'https://make.wordpress.org/core/2022/10/10/block-styles-generation-style-engine/'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Show or hide content with the Details block' ); ?></h3>
+				<p><?php _e( 'Use the block to avoid spoiling a surprise, create an interactive Q&A section, or hide a long paragraph under a heading.' ); ?></p>
 			</div>
 		</div>
 
+		<hr class="is-large" />
+
 		<div class="about__section has-2-columns">
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path d="M24 18.285a1.58 1.58 0 0 1-1.159-.484 1.58 1.58 0 0 1-.484-1.159c0-.45.162-.836.484-1.158A1.58 1.58 0 0 1 24 15c.45 0 .836.161 1.159.484.322.322.483.708.483 1.158 0 .45-.16.837-.483 1.16a1.581 1.581 0 0 1-1.16.483zM21.592 33V21.008a44.174 44.174 0 0 1-2.958-.316 28.99 28.99 0 0 1-2.734-.517l.337-1.35c1.275.3 2.543.514 3.803.641 1.26.128 2.58.191 3.96.191s2.7-.063 3.96-.19a29.603 29.603 0 0 0 3.802-.642l.338 1.35c-.87.21-1.781.383-2.734.517-.952.136-1.939.24-2.959.316V33h-1.35v-5.85h-2.115V33h-1.35z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M25.7781 16.8569L25.8 22.8573L28.9984 22.8572C29.805 22.8572 30.2796 23.6339 29.8204 24.2024L23.8213 31.6292C23.2633 32.3201 22.2013 31.9819 22.2013 31.1416L22.2 25.1481H19.0016C18.1961 25.1481 17.7212 24.3733 18.1782 23.8047L24.1496 16.3722C24.7055 15.6804 25.7749 16.0169 25.7781 16.8569Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Improved admin and editor accessibility' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to accessibility improvements dev note. */
-						__( 'More than 40 improvements in accessibility include resolving focus loss problems in the editor, improving form labels and audible messages, making alternative text easier to edit, and fixing the sub-menu overlap in the expanded admin side navigation at smaller screen sizes and higher zoom levels. Learn more about <a href="%s">accessibility in WordPress</a>.' ),
-						'https://make.wordpress.org/core/2022/10/11/wordpress-6-1-accessibility-improvements/'
-					);
-					?>
-				</p>
+				<h3 style="margin-top:calc(var(--gap) * 0.75);margin-bottom:calc(var(--gap) * 0.5)"><?php _e( 'Performance gets a boost' ); ?></h3>
+				<p><?php _e( 'WordPress 6.3 has 170+ performance updates, including defer and async support for the Scripts API and fetchpriority support for images. These improvements can improve your website&#8217;s load time as perceived by visitors, along with block template resolution, image lazy-loading, and the emoji loader.' ); ?></p>
 			</div>
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M23.019 25.517l-4.258 4.385-.718-.697 4.212-4.337-5.752-.025.005-1 5.826.025-3.997-4.116.717-.696 3.952 4.07-.03-5.623 1-.005.03 5.567 3.894-4.01.717.697-4.007 4.126 6.046.026-.005 1-5.942-.025 4.201 4.326-.717.697-4.174-4.298.032 6.048-1 .006-.032-6.14z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M24 18.285C23.55 18.285 23.1638 18.1237 22.8413 17.8012C22.5188 17.4788 22.3575 17.0925 22.3575 16.6425C22.3575 16.1925 22.5188 15.8062 22.8413 15.4837C23.1638 15.1612 23.55 15 24 15C24.45 15 24.8363 15.1612 25.1588 15.4837C25.4813 15.8062 25.6425 16.1925 25.6425 16.6425C25.6425 17.0925 25.4813 17.4788 25.1588 17.8012C24.8363 18.1237 24.45 18.285 24 18.285ZM21.5925 33V21.0075C20.5725 20.9325 19.5863 20.8275 18.6338 20.6925C17.6813 20.5575 16.77 20.385 15.9 20.175L16.2375 18.825C17.5125 19.125 18.78 19.3387 20.04 19.4662C21.3 19.5938 22.62 19.6575 24 19.6575C25.38 19.6575 26.7 19.5938 27.96 19.4662C29.22 19.3387 30.4875 19.125 31.7625 18.825L32.1 20.175C31.23 20.385 30.3187 20.5575 29.3663 20.6925C28.4137 20.8275 27.4275 20.9325 26.4075 21.0075V33H25.0575V27.15H22.9425V33H21.5925Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Other notes of interest' ); ?></h3>
-				<p><?php _e( '6.1 includes a new time-to-read feature showing content authors the approximate time-to-read values for pages, posts, and custom post types.' ); ?></p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: "General Settings" admin page title, linked to the page if the user can edit options. */
-						__( 'The site tagline is empty by default in new sites but can be modified in %s.' ),
-						current_user_can( 'manage_options' ) ? '<a href="' . esc_url( admin_url( 'options-general.php' ) ) . '">' . __( 'General Settings' ) . '</a>' : __( 'General Settings' )
-					);
-					?>
-				</p>
-				<p><?php _e( 'A new modal design offers a background blur effect, making it easier to focus on the task at hand.' ); ?></p>
+				<h3 style="margin-top:calc(var(--gap) * 0.75);margin-bottom:calc(var(--gap) * 0.5)"><?php _e( 'Accessibility remains a core focus' ); ?></h3>
+				<p><?php _e( 'Incorporating more than 50 accessibility improvements across the platform, WordPress 6.3 is more accessible than ever. Improved labeling, optimized tab and arrow-key navigation, revised heading hierarchy, and new controls in the admin image editor allow those using assistive technologies to navigate more easily.' ); ?></p>
 			</div>
 		</div>
 
-		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<rect x="11" y="17" width="26" height="14" rx="7" fill="#fff"/>
-						<circle cx="18" cy="24" r="4" fill="#1E1E1E"/>
-					</svg>
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Updated interface options and features' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to styling elements dev note. */
-						__( 'Updates include <a href="%s">styling elements</a> like buttons, citations, and links globally; controlling hover, active, and focus states for links using theme.json (not available to control in the interface yet); and customizing outline support for blocks and elements, among other features.' ),
-						'https://make.wordpress.org/core/2022/10/10/styling-elements-in-block-themes/'
-					);
-					?>
-				</p>
-			</div>
+		<hr class="is-large" />
+
+		<div class="about__section has-3-columns">
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M18 16h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H18a2 2 0 0 1-2-2V18a2 2 0 0 1 2-2zm12 1.5H18a.5.5 0 0 0-.5.5v3h13v-3a.5.5 0 0 0-.5-.5zm.5 5H22v8h8a.5.5 0 0 0 .5-.5v-7.5zm-10 0h-3V30a.5.5 0 0 0 .5.5h2.5v-8z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M15.9996 25C16.6704 25.3354 16.6703 25.3357 16.6702 25.3359L16.673 25.3305C16.6762 25.3242 16.6818 25.3135 16.6899 25.2985C16.7059 25.2686 16.7316 25.2218 16.7669 25.1608C16.8377 25.0385 16.9469 24.8592 17.0954 24.6419C17.3931 24.2062 17.8444 23.624 18.4543 23.0431C19.6731 21.8824 21.4972 20.75 23.9996 20.75C26.502 20.75 28.3261 21.8824 29.5449 23.0431C30.1549 23.624 30.6061 24.2062 30.9038 24.6419C31.0523 24.8592 31.1615 25.0385 31.2323 25.1608C31.2676 25.2218 31.2933 25.2686 31.3093 25.2985C31.3174 25.3135 31.323 25.3242 31.3262 25.3305L31.3291 25.3359C31.3289 25.3357 31.3288 25.3354 31.9996 25C32.6704 24.6646 32.6703 24.6643 32.6701 24.664L32.6688 24.6614L32.6662 24.6563L32.6583 24.6408C32.6517 24.6282 32.6427 24.6108 32.631 24.5892C32.6078 24.5459 32.5744 24.4852 32.5306 24.4096C32.4432 24.2584 32.3141 24.0471 32.1423 23.7956C31.7994 23.2938 31.2819 22.626 30.5794 21.9569C29.1731 20.6176 26.9972 19.25 23.9996 19.25C21.002 19.25 18.8261 20.6176 17.4199 21.9569C16.7174 22.626 16.1998 23.2938 15.8569 23.7956C15.6851 24.0471 15.556 24.2584 15.4686 24.4096C15.4248 24.4852 15.3914 24.5459 15.3682 24.5892C15.3566 24.6108 15.3475 24.6282 15.3409 24.6408L15.333 24.6563L15.3304 24.6614L15.3295 24.6632C15.3293 24.6635 15.3288 24.6646 15.9996 25ZM23.9996 28C25.9326 28 27.4996 26.433 27.4996 24.5C27.4996 22.567 25.9326 21 23.9996 21C22.0666 21 20.4996 22.567 20.4996 24.5C20.4996 26.433 22.0666 28 23.9996 28Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Continued evolution of layout options' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to layout support refactor dev note. */
-						__( 'The default content dimensions provided by themes can now be overridden in the Styles Sidebar, giving site builders better control over full-width content. Developers have <a href="%s">fine-grained control over these controls</a>.' ),
-						'https://make.wordpress.org/core/2022/10/10/updated-editor-layout-support-in-6-1-after-refactor/'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Preview block themes' ); ?></h3>
+				<p><?php _e( 'Experience block themes before you switch and preview the Site Editor, with options to customize directly before committing to a new theme.' ); ?></p>
 			</div>
-		</div>
-
-		<div class="about__section has-2-columns">
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path d="M27.7 17.2l5.6 5.6c.7.6.7 1.8-.1 2.5l-5.6 5.6c-.3.3-.8.5-1.2.5-.4 0-.9-.2-1.2-.5l-5.6-5.6c-.7-.7-.7-1.8 0-2.5l5.6-5.6c.7-.7 1.8-.7 2.5 0z" fill="#fff"/>
-						<path d="M22 17.5l-6.3 6.3c-.1.1-.1.3.1.3l6.3 6.3-1.1 1.1-6.3-6.2c-.7-.7-.7-1.8 0-2.5l6.3-6.3 1 1z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5 19H17.5C17.2239 19 17 19.2239 17 19.5V28.5C17 28.7761 17.2239 29 17.5 29H30.5C30.7761 29 31 28.7761 31 28.5V19.5C31 19.2239 30.7761 19 30.5 19ZM17.5 17.5H30.5C31.6046 17.5 32.5 18.3954 32.5 19.5V28.5C32.5 29.6046 31.6046 30.5 30.5 30.5H17.5C16.3954 30.5 15.5 29.6046 15.5 28.5V19.5C15.5 18.3954 16.3954 17.5 17.5 17.5ZM18.5 20.5H19.25H22V22H20V24H18.5V21.25V20.5ZM28.75 27.5H29.5V26.75V24H28V26L26 26V27.5L28.75 27.5Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Block template parts in classic themes' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: Link to block-based template parts in classic themes dev note, 2: Folder name. */
-						__( '<a href="%1$s">Block template parts can now be defined in classic themes</a> by adding the appropriate HTML files to the %2$s directory at the root of the theme.' ),
-						'https://make.wordpress.org/core/2022/10/04/block-based-template-parts-in-traditional-themes/',
-						'<code>parts</code>'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Set aspect ratio on images' ); ?></h3>
+				<p><?php _e( 'Specify your aspect ratios and ensure design integrity, especially when using images in patterns.' ); ?></p>
 			</div>
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M31.349 23.579a3.18 3.18 0 0 1-6.262.796l-.007-.03-.01-.029-.734-2.166-.005.002a4.818 4.818 0 0 0-9.418 1.427 4.816 4.816 0 0 0 6.575 4.485l-.598-1.523a3.18 3.18 0 1 1 1.92-3.758l.012-.003.69 2.034a4.818 4.818 0 0 0 9.472-1.235 4.816 4.816 0 0 0-6.57-4.487l.596 1.524a3.18 3.18 0 0 1 4.34 2.963z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path fill-rule="evenodd" clip-rule="evenodd" d="M29.7499 14.9862L29.7499 14.0059L28.7939 14.279L28.7939 14.279L28.7928 14.2793L28.7928 14.2793L28.7821 14.2824L28.7506 14.2915C28.7234 14.2994 28.6837 14.3111 28.633 14.3261C28.5317 14.3562 28.386 14.4001 28.2068 14.4559C27.8488 14.5673 27.3551 14.7265 26.8128 14.9179C25.7533 15.2918 24.4209 15.8181 23.5839 16.3761C21.9787 17.4462 21.2703 18.4251 20.8568 19.1143C20.6874 19.3967 20.4992 19.8705 20.3226 20.3793C20.1388 20.9091 19.9461 21.5414 19.7753 22.1819C19.6047 22.8215 19.453 23.4805 19.3543 24.0621C19.2758 24.5242 19.2192 24.9991 19.2374 25.387L18.3036 27.7216C18.1498 28.1062 18.3368 28.5427 18.7214 28.6965C19.106 28.8503 19.5425 28.6633 19.6963 28.2787L20.3141 26.7342C20.635 26.7063 21.0572 26.6435 21.5194 26.5579C22.173 26.4369 22.9606 26.26 23.7647 26.0349C24.567 25.8102 25.3994 25.5337 26.137 25.2105C26.8594 24.8939 27.5557 24.5051 28.0303 24.0305C28.539 23.5218 28.8442 22.8139 29.0434 22.0898C29.2457 21.3547 29.36 20.5222 29.4345 19.6922C29.5006 18.9555 29.5374 18.1945 29.5718 17.4814L29.585 17.2087C29.6156 16.5862 29.6469 16.0134 29.6961 15.5127C29.7299 15.3451 29.7487 15.1792 29.7499 15.0162C29.7501 15.0062 29.7501 14.9962 29.7499 14.9862ZM21.8114 24.9706L22.8071 23.7536L27.0303 19.5305C27.386 19.1747 27.7182 18.8155 28.0194 18.4588C27.998 18.8284 27.973 19.1965 27.9405 19.5581C27.8692 20.353 27.7647 21.0831 27.5972 21.6918C27.4267 22.3114 27.211 22.7285 26.9697 22.9698C26.6943 23.2451 26.2031 23.5438 25.5349 23.8366C24.8818 24.1228 24.1205 24.3775 23.3603 24.5904C22.8227 24.7409 22.2925 24.8686 21.8114 24.9706ZM18 32.0002H26V30.5002H18V32.0002Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Expanded support for Query Loop blocks' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to query loop dev note. */
-						__( '<a href="%s">New filters</a> let Query Block variations support custom queries for more powerful variations and advanced hierarchical post types filtering options.' ),
-						'https://make.wordpress.org/core/2022/10/10/extending-the-query-loop-block/'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Build your site distraction-free' ); ?></h3>
+				<p><?php _e( 'Distraction-free designing is now available in the Site Editor.' ); ?></p>
 			</div>
 		</div>
 
-		<div class="about__section has-2-columns">
-			<div class="column">
-				<div class="about__image">
-					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path d="M17.25 30.25L24 17.594l6.75 12.656h-13.5z" stroke="#fff" stroke-width="1.5"/>
-						<path d="M24 16v15h-8l8-15z" fill="#fff"/>
-					</svg>
-				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Filters for all your styles' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to theme.json filters dev note. */
-						__( '<a href="%s">Leverage filters</a> in the Styles sidebar to control settings at all four levels of your site—core, theme, user, or block, from less to more specific.' ),
-						'https://make.wordpress.org/core/2022/10/10/filters-for-theme-json-data/'
-					);
-					?>
-				</p>
-			</div>
+		<div class="about__section has-3-columns">
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M19.114 20.5H16V19h3.114a2.501 2.501 0 0 1 4.771 0H32v1.5h-8.114a2.501 2.501 0 0 1-4.771 0zM16 29h8.114a2.501 2.501 0 0 0 4.771 0H32v-1.5h-3.114a2.501 2.501 0 0 0-4.771 0H16V29z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path fill="#fff" fill-rule="evenodd" d="m20.014 21.168 3.988-3.418 3.988 3.418-.976 1.14-3.012-2.582-3.012 2.581-.976-1.139Z" clip-rule="evenodd"/>
+						<path fill="#fff" d="M16 29h16v-1.5H16V29Z"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Spacing presets for faster, consistent design' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to spacing presets dev note. */
-						__( 'Save time and help avoid hard-coding a values into a theme with <a href="%s">preset margin and padding values for multiple blocks</a>.' ),
-						'https://make.wordpress.org/core/2022/10/07/introduction-of-presets-across-padding-margin-and-block-gap/'
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Rediscover the Top Toolbar' ); ?></h3>
+				<p><?php _e( 'A revamped top toolbar offers parent selectors for nested blocks, options when selecting multiple blocks, and a new interface embedded into the title bar with new functionality in mind.' ); ?></p>
 			</div>
-		</div>
-
-		<div class="about__section has-2-columns">
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M17.517 20.75A7.268 7.268 0 0 1 22 17.03a8.142 8.142 0 0 0-1.19 1.875 10.763 10.763 0 0 0-.657 1.845h-2.636zm-.554 1.5a7.266 7.266 0 0 0 0 3.5h2.9a13.453 13.453 0 0 1 0-3.5h-2.9zm4.415 0c-.084.56-.128 1.145-.128 1.75s.044 1.19.128 1.75h5.244c.084-.56.128-1.145.128-1.75s-.044-1.19-.128-1.75h-5.244zm6.759 0a13.45 13.45 0 0 1 0 3.5h2.9a7.266 7.266 0 0 0 0-3.5h-2.9zm2.346-1.5h-2.636a10.759 10.759 0 0 0-.657-1.845A8.14 8.14 0 0 0 26 17.03a7.269 7.269 0 0 1 4.483 3.721zm-4.194 0h-4.578c.13-.43.283-.836.458-1.211.495-1.063 1.139-1.847 1.831-2.306.692.46 1.335 1.243 1.83 2.306.176.375.33.78.46 1.211zm-8.772 6.5h2.636c.18.693.416 1.344.7 1.938A8.08 8.08 0 0 0 22 30.97a7.268 7.268 0 0 1-4.483-3.721zm8.772 0h-4.578c.138.46.305.892.495 1.29.491 1.024 1.12 1.78 1.794 2.227.692-.46 1.336-1.243 1.83-2.306a9.02 9.02 0 0 0 .46-1.211zm.901 1.845c.266-.57.486-1.188.657-1.845h2.636A7.268 7.268 0 0 1 26 30.97a8.145 8.145 0 0 0 1.19-1.875zM15.25 24a8.75 8.75 0 1 1 17.5 0 8.75 8.75 0 0 1-17.5 0z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M15 17.5H26V19H15V17.5Z" fill="white"/>
+						<path d="M18.5 23H29.5V24.5H18.5V23Z" fill="white"/>
+						<path d="M33 28.5H22V30H33V28.5Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Performance highlights' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: 1: REST API performance dev note, 2: Multisite performance dev note, 3: code-formatted "WP_Query" linked to dev note, 4: Block registration performance dev note, 5: Site health checks dev note; 6: code-formatted "async", 7: Performance field guide. */
-						__( 'WordPress 6.1 resolved more than 25 tickets dedicated to enhancing performance. From the  <a href="%1$s">REST API</a> to <a href="%2$s">multisite</a>, %3$s to <a href="%4$s">core block registration</a>, and <a href="%5$s">new Site Health checks</a> to the addition of the %6$s attribute to images, there are performance improvements for every type of site. A full breakdown can be found in the <a href="%7$s">Performance Field Guide</a>.' ),
-						'https://make.wordpress.org/core/2022/10/10/performance-improvements-to-the-rest-api/',
-						'https://make.wordpress.org/core/2022/10/10/multisite-improvements-in-wordpress-6-1/',
-						'<a href="https://make.wordpress.org/core/2022/10/07/improvements-to-wp_query-performance-in-6-1/"><code>WP_Query</code></a>',
-						'https://make.wordpress.org/core/2022/10/07/improved-php-performance-for-core-blocks-registration/',
-						'https://make.wordpress.org/core/2022/10/06/new-cache-site-health-checks-in-wordpress-6-1/',
-						'<code>async</code>',
-						'https://make.wordpress.org/core/2022/10/11/performance-field-guide-for-wordpress-6-1/'
-					);
-					?>
-				</p>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to install Performance Lab plugin if permitted, otherwise link to plugin on WordPress.org. */
-						__( 'Be among the first to get the latest improvements by adding the <a href="%s">Performance Lab plugin</a> to your WordPress test site or sandbox.' ),
-						current_user_can( 'install_plugins' ) ? admin_url( 'plugin-install.php?s=slug%253Aperformance-lab&tab=search&type=term' ) : esc_url( __( 'https://wordpress.org/plugins/performance-lab/' ) )
-					);
-					?>
-				</p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'List View improvements' ); ?></h3>
+				<p><?php _e( 'Drag and drop to every content layer and delete any block you would like in the updated List View.' ); ?></p>
 			</div>
 			<div class="column">
 				<div class="about__image">
 					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
-						<rect width="48" height="48" rx="4" fill="#1E1E1E"/>
-						<path fill-rule="evenodd" clip-rule="evenodd" d="M32.067 17.085l-3.245-3.14-10.621 10.726-1.303 4.412 4.528-1.252 10.64-10.746zM16 32.75h8v-1.5h-8v1.5z" fill="#fff"/>
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M27.7 17.2L33.3 22.8C34 23.4 34 24.6 33.2 25.3L27.6 30.9C27.3 31.2 26.8 31.4 26.4 31.4C26 31.4 25.5 31.2 25.2 30.9L19.6 25.3C18.9 24.6 18.9 23.5 19.6 22.8L25.2 17.2C25.9 16.5 27 16.5 27.7 17.2Z" fill="white"/>
+						<path d="M22 17.5L15.7 23.8C15.6 23.9 15.6 24.1 15.8 24.1L22.1 30.4L21 31.5L14.7 25.3C14 24.6 14 23.5 14.7 22.8L21 16.5L22 17.5Z" fill="white"/>
 					</svg>
 				</div>
-				<h3 class="is-smaller-heading"><?php _e( 'Content-only editing support for container blocks' ); ?></h3>
-				<p>
-					<?php
-					printf(
-						/* translators: %s: Link to content locking dev note. */
-						__( 'Thanks to <a href="%s">content-only editing settings</a>, layouts can be locked within container blocks. In a content-only block, its children are invisible to the List View and entirely uneditable. So you control the layout while your writers can focus on the content.' ),
-						'https://make.wordpress.org/core/2022/10/11/content-locking-features-and-updates/'
-					);
-					?>
-				</p>
-				<p><?php _e( 'Combine it with block locking options for even more advanced control over your blocks.' ); ?></p>
+				<h3 class="is-smaller-heading" style="margin-top:calc(var(--gap) / 2);margin-bottom:calc(var(--gap) / 4);"><?php _e( 'Build templates with Patterns' ); ?></h3>
+				<p><?php _e( 'Create unique patterns to jumpstart template creation with a new modal enabling access to pattern selection.' ); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
-		<div class="about__section has-2-columns is-wider-right">
+		<div class="about__section has-3-columns">
 			<div class="column about__image is-vertically-aligned-top">
-				<a href="https://youtu.be/1w9oywSa6Hw">
-					<img src="data:image/svg+xml,%3Csvg width='269' height='163' viewBox='0 0 269 163' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cg clip-path='url(%23a)'%3E%3Crect width='269' height='163' rx='4' fill='%23FDFF85'/%3E%3Cpath d='M238.84 130.043a1 1 0 0 0-1.524.852v8.21a1 1 0 0 0 1.524.852l6.671-4.105a1 1 0 0 0 0-1.703l-6.671-4.106Z' fill='%231E1E1E'/%3E%3Crect x='226.25' y='120.25' width='29.5' height='29.5' rx='2.75' stroke='%231E1E1E' stroke-width='1.5'/%3E%3Cpath d='M99.597 127.44c-6.16 0-11.36-1.16-15.6-3.48-4.24-2.32-7.68-5.4-10.32-9.24-2.56-3.84-4.4-8.16-5.52-12.96A64.74 64.74 0 0 1 66.477 87c0-9.28 1.28-17.4 3.84-24.36 2.64-6.96 6.4-12.36 11.28-16.2 4.88-3.92 10.8-5.88 17.76-5.88 5.521 0 10.241 1.08 14.161 3.24s6.96 5.04 9.12 8.64c2.24 3.6 3.6 7.52 4.08 11.76h-11.88c-.72-4.16-2.44-7.36-5.16-9.6-2.72-2.24-6.2-3.36-10.44-3.36-5.84 0-10.68 2.76-14.52 8.28-3.76 5.44-5.76 13.84-6 25.2 1.92-3.52 4.88-6.52 8.88-9 4.08-2.48 8.76-3.72 14.04-3.72 4.72 0 9.12 1.12 13.2 3.36 4.16 2.24 7.52 5.4 10.08 9.48 2.64 4 3.96 8.76 3.96 14.28 0 4.88-1.2 9.48-3.6 13.8-2.4 4.32-5.8 7.84-10.2 10.56-4.32 2.64-9.48 3.96-15.48 3.96Zm-.72-11.04c3.361 0 6.361-.72 9.001-2.16 2.64-1.44 4.72-3.4 6.24-5.88 1.52-2.56 2.28-5.44 2.28-8.64 0-5.12-1.68-9.2-5.04-12.24-3.28-3.04-7.48-4.56-12.6-4.56-3.36 0-6.4.76-9.12 2.28-2.64 1.52-4.72 3.56-6.24 6.12-1.52 2.48-2.28 5.24-2.28 8.28 0 3.28.76 6.2 2.28 8.76 1.6 2.48 3.72 4.44 6.36 5.88 2.72 1.44 5.76 2.16 9.12 2.16Zm45.925 10.32c-2.4 0-4.4-.76-6-2.28-1.52-1.6-2.28-3.48-2.28-5.64 0-2.24.76-4.12 2.28-5.64 1.6-1.6 3.6-2.4 6-2.4s4.36.8 5.88 2.4c1.52 1.52 2.28 3.4 2.28 5.64 0 2.16-.76 4.04-2.28 5.64-1.52 1.52-3.48 2.28-5.88 2.28Zm26.814-.72V56.4l-13.56 3.12v-9.36l18.6-8.16h8.16v84h-13.2Z' fill='%231E1E1E'/%3E%3C/g%3E%3Cdefs%3E%3CclipPath id='a'%3E%3Crect width='269' height='163' rx='4' fill='%23fff'/%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E%0A" alt="<?php echo esc_attr( __( 'Exploring WordPress 6.1 video' ) ); ?>" />
-				</a>
+				<img src="<?php echo esc_url( admin_url( 'images/about-release-badge.svg?ver=6.3' ) ); ?>" alt="" height="270" width="270" />
 			</div>
-			<div class="column">
+			<div class="column is-vertically-aligned-center" style="grid-column-end:span 2">
 				<h3>
 					<?php
 					printf(
@@ -500,50 +248,53 @@
 				<p>
 					<?php
 					printf(
-						/* translators: %s: 6.1 overview video link. */
-						__( 'See WordPress 6.1 in action! <a href="%s">Watch a brief overview video</a> highlighting some of the major features debuting in WordPress 6.1.' ),
-						'https://youtu.be/1w9oywSa6Hw'
+						/* translators: 1: Learn WordPress link, 2: Workshops link. */
+						__( '<a href="%1$s">Learn WordPress</a> is a free resource for new and experienced WordPress users. Learn is stocked with how-to videos on using various features in WordPress, <a href="%2$s">interactive events</a> for exploring topics in-depth, and lesson plans for diving deep into specific areas of WordPress.' ),
+						'https://learn.wordpress.org/',
+						'https://learn.wordpress.org/online-workshops/'
 					);
 					?>
 				</p>
 			</div>
 		</div>
 
-		<div class="about__section has-3-columns">
-			<div class="column" style="padding-top:0">
-				<p>
-					<?php
-					printf(
-						/* translators: 1: Learn WordPress link. */
-						__( 'Explore <a href="%s">learn.wordpress.org</a> for tutorial videos, online workshops, courses, and lesson plans for Meetup organizers, including new features in WordPress.' ),
-						'https://learn.wordpress.org/'
-					);
-					?>
-				</p>
-			</div>
-			<div class="column" style="padding-top:0">
-				<p>
+		<div class="about__section has-2-columns">
+			<div class="column">
+				<div class="about__image">
+					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M23 34v-4h-5l-2.293-2.293a1 1 0 0 1 0-1.414L18 24h5v-2h-7v-6h7v-2h2v2h5l2.293 2.293a1 1 0 0 1 0 1.414L30 22h-5v2h7v6h-7v4h-2Zm-5-14h11.175l.646-.646a.5.5 0 0 0 0-.708L29.175 18H18v2Zm.825 8H30v-2H18.825l-.646.646a.5.5 0 0 0 0 .708l.646.646Z" fill="#fff"/>
+					</svg>
+				</div>
+				<p style="margin-top:calc(var(--gap) / 2);">
 					<?php
 					printf(
 						/* translators: %s: WordPress Field Guide link. */
 						__( 'Check out the latest version of the <a href="%s">WordPress Field Guide</a>. It is overflowing with detailed developer notes to help you build with WordPress.' ),
-						__( 'https://make.wordpress.org/core/2022/10/12/wordpress-6-1-field-guide/' )
+						__( 'https://make.wordpress.org/core/2023/07/18/wordpress-6-3-field-guide/' )
 					);
 					?>
 				</p>
 			</div>
-			<div class="column" style="padding-top:0">
-				<p>
+			<div class="column">
+				<div class="about__image">
+					<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
+						<rect width="48" height="48" rx="4" fill="#151515"/>
+						<path d="M28 19.75h-8v1.5h8v-1.5ZM20 23h8v1.5h-8V23ZM26 26.25h-6v1.5h6v-1.5Z" fill="#fff"/>
+						<path fill-rule="evenodd" clip-rule="evenodd" d="M29 16H19a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V18a2 2 0 0 0-2-2Zm-10 1.5h10a.5.5 0 0 1 .5.5v12a.5.5 0 0 1-.5.5H19a.5.5 0 0 1-.5-.5V18a.5.5 0 0 1 .5-.5Z" fill="#fff"/>
+					</svg>
+				</div>
+				<p style="margin-top:calc(var(--gap) / 2);">
 					<?php
 					printf(
 						/* translators: 1: WordPress Release Notes link, 2: WordPress version number. */
 						__( '<a href="%1$s">Read the WordPress %2$s Release Notes</a> for more information on the included enhancements and issues fixed, installation information, developer notes and resources, release contributors, and the list of file changes in this release.' ),
 						sprintf(
 							/* translators: %s: WordPress version number. */
-							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-							'6-1'
+							esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
+							'6-3'
 						),
-						'6.1'
+						'6.3'
 					);
 					?>
 				</p>
@@ -553,12 +304,21 @@
 		<hr class="is-large" />
 
 		<div class="return-to-dashboard">
-			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-				<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-					<?php is_multisite() ? _e( 'Go to Updates' ) : _e( 'Go to Dashboard &rarr; Updates' ); ?>
-				</a> |
-			<?php endif; ?>
-			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+			<?php
+			if ( isset( $_GET['updated'] ) && current_user_can( 'update_core' ) ) {
+				printf(
+					'<a href="%1$s">%2$s</a> | ',
+					esc_url( self_admin_url( 'update-core.php' ) ),
+					is_multisite() ? __( 'Go to Updates' ) : __( 'Go to Dashboard &rarr; Updates' )
+				);
+			}
+
+			printf(
+				'<a href="%1$s">%2$s</a>',
+				esc_url( self_admin_url() ),
+				is_blog_admin() ? __( 'Go to Dashboard &rarr; Home' ) : __( 'Go to Dashboard' )
+			);
+			?>
 		</div>
 	</div>
 
@@ -609,3 +369,9 @@
 
 /* translators: 1: WordPress version number, 2: Link to update WordPress */
 __( 'Important! Your version of WordPress (%1$s) will stop receiving security updates in the near future. To keep your site secure, please <a href="%2$s">update to the latest version of WordPress</a>.' );
+
+/* translators: %s: The major version of WordPress for this branch. */
+__( 'This is the final release of WordPress %s' );
+
+/* translators: The localized WordPress download URL. */
+__( 'https://wordpress.org/download/' );
diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
index 3306c9125b129..fc836c20a2c1d 100644
--- a/src/wp-admin/admin-header.php
+++ b/src/wp-admin/admin-header.php
@@ -109,7 +109,7 @@
 <?php
 
 /**
- * Enqueue scripts for all admin pages.
+ * Fires when enqueuing scripts for all admin pages.
  *
  * @since 2.8.0
  *
@@ -242,7 +242,7 @@
 $admin_body_classes = apply_filters( 'admin_body_class', '' );
 $admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
 ?>
-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo esc_attr( $admin_body_classes ); ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>
diff --git a/src/wp-admin/admin.php b/src/wp-admin/admin.php
index 3718b47c3cc38..455620f1c7d21 100644
--- a/src/wp-admin/admin.php
+++ b/src/wp-admin/admin.php
@@ -348,7 +348,7 @@
 	define( 'WP_IMPORTING', true );
 
 	/**
-	 * Whether to filter imported data through kses on import.
+	 * Filters whether to filter imported data through kses on import.
 	 *
 	 * Multisite uses this hook to filter all data through kses by default,
 	 * as a super administrator may be assisting an untrusted user.
diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php
index c2e452bfe0b08..ccb72c0910556 100644
--- a/src/wp-admin/comment.php
+++ b/src/wp-admin/comment.php
@@ -68,8 +68,8 @@
 
 		get_current_screen()->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p>' . __( '<a href="https://wordpress.org/documentation/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 		);
 
 		wp_enqueue_script( 'comment' );
@@ -282,7 +282,7 @@
 			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
 		}
 
-		if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+		if ( wp_get_referer() && ! $noredir && ! str_contains( wp_get_referer(), 'comment.php' ) ) {
 			$redir = wp_get_referer();
 		} elseif ( wp_get_original_referer() && ! $noredir ) {
 			$redir = wp_get_original_referer();
diff --git a/src/wp-admin/contribute.php b/src/wp-admin/contribute.php
new file mode 100644
index 0000000000000..2cf73aec9b9cf
--- /dev/null
+++ b/src/wp-admin/contribute.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Contribute administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once __DIR__ . '/admin.php';
+
+// Used in the HTML title tag.
+$title = __( 'Get Involved' );
+
+list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
+<div class="wrap about__container">
+
+	<div class="about__header">
+		<div class="about__header-title">
+			<h1>
+				<?php _e( 'Get Involved' ); ?>
+			</h1>
+		</div>
+
+		<div class="about__header-text">
+			<?php _e( 'Be the future of WordPress' ); ?>
+		</div>
+	</div>
+
+	<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+		<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+		<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+		<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+		<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+		<a href="contribute.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Get Involved' ); ?></a>
+	</nav>
+
+	<div class="about__section has-2-columns is-wider-right">
+		<div class="column about__image">
+			<img src="<?php echo esc_url( admin_url( 'images/contribute-main.svg?ver=6.3' ) ); ?>" alt="" />
+		</div>
+		<div class="column is-vertically-aligned-center">
+			<p><?php _e( 'Do you use WordPress for work, for personal projects, or even just for fun? You can help shape the long-term success of the open source project that powers millions of websites around the world.' ); ?></p>
+			<p><?php _e( 'Join the WordPress contributor community and connect with others who are passionate about maintaining a free and open web.' ); ?></p>
+
+			<ul>
+				<li><?php _e( 'Be part of a global open source community.' ); ?></li>
+				<li><?php _e( 'Apply your skills or learn new ones.' ); ?></li>
+				<li><?php _e( 'Grow your network and make friends.' ); ?></li>
+			</ul>
+		</div>
+	</div>
+
+	<div class="about__section has-2-columns is-wider-left">
+		<div class="column is-vertically-aligned-center">
+			<h3><?php _e( 'No-code contribution' ); ?></h3>
+			<p><?php _e( 'WordPress may thrive on technical contributions, but you don&#8217;t have to code to contribute. Here are some of the ways you can make an impact without writing a single line of code:' ); ?></p>
+			<ul>
+				<li><?php _e( '<strong>Share</strong> your knowledge in the WordPress support forums.' ); ?></li>
+				<li><?php _e( '<strong>Write</strong> or improve documentation for WordPress.' ); ?></li>
+				<li><?php _e( '<strong>Translate</strong> WordPress into your local language.' ); ?></li>
+				<li><?php _e( '<strong>Create</strong> and improve WordPress educational materials.' ); ?></li>
+				<li><?php _e( '<strong>Promote</strong> the WordPress project to your community.' ); ?></li>
+				<li><?php _e( '<strong>Curate</strong> submissions or take photos for the WordPress Photos Directory.' ); ?></li>
+				<li><?php _e( '<strong>Organize</strong> or participate in local WordPress Meetups and WordCamps.' ); ?></li>
+				<li><?php _e( '<strong>Lend</strong> your creative imagination to the WordPress UI design.' ); ?></li>
+				<li><?php _e( '<strong>Edit</strong> videos and add captions to WordPress.tv.' ); ?></li>
+				<li><?php _e( '<strong>Explore</strong> ways to reduce the environmental impact of millions of websites.' ); ?></li>
+			</ul>
+		</div>
+		<div class="column">
+			<img src="<?php echo esc_url( admin_url( 'images/contribute-no-code.svg?ver=6.3' ) ); ?>" alt="" />
+		</div>
+	</div>
+	<div class="about__section has-2-columns is-wider-right">
+		<div class="column">
+			<img src="<?php echo esc_url( admin_url( 'images/contribute-code.svg?ver=6.3' ) ); ?>" alt="" />
+		</div>
+		<div class="column is-vertically-aligned-center">
+			<h3><?php _e( 'Code-based contribution' ); ?></h3>
+			<p><?php _e( 'If you do code, or want to learn how, you can contribute technically in numerous ways:' ); ?></p>
+			<ul>
+				<li><?php _e( '<strong>Find</strong> and report bugs in the WordPress core software.' ); ?></li>
+				<li><?php _e( '<strong>Test</strong> new releases and proposed features for the block editor.' ); ?></li>
+				<li><?php _e( '<strong>Write</strong> and submit patches to fix bugs or help build new features.' ); ?></li>
+				<li><?php _e( '<strong>Contribute</strong> to the code, improve the UX, and test the WordPress app.' ); ?></li>
+			</ul>
+			<p><?php _e( 'WordPress embraces new technologies, while being committed to backward compatibility. The WordPress project uses the following languages and libraries:' ); ?></p>
+			<ul>
+				<li><?php _e( 'Core and Block Editor: HTML, CSS, PHP, SQL, JavaScript, and React' ); ?></li>
+				<li><?php _e( 'WordPress app: Kotlin, Java, Swift, Objective-C, Vue, Python, and TypeScript' ); ?></li>
+			</ul>
+		</div>
+	</div>
+
+	<div class="about__section is-feature has-subtle-background-color">
+		<div class="column">
+			<h2><?php _e( 'Shape the future of the web with WordPress' ); ?></h2>
+			<p><?php _e( 'Finding the area that aligns with your skills and interests is the first step toward meaningful contribution. With more than 20 Make WordPress teams working on different parts of the open source WordPress project, there&#8217;s a place for everyone, no matter what your skill set is.' ); ?></p>
+			<p class="aligncenter"><a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Find your team &rarr;' ); ?></a></p>
+		</div>
+	</div>
+
+</div>
+<?php
+require_once ABSPATH . 'wp-admin/admin-footer.php';
diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php
index 2aac41f783afc..74fca3344f477 100644
--- a/src/wp-admin/credits.php
+++ b/src/wp-admin/credits.php
@@ -37,15 +37,16 @@
 			);
 			?>
 		</div>
-
-		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-		</nav>
 	</div>
 
+	<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+		<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+		<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
+		<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+		<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+		<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
+	</nav>
+
 	<div class="about__section has-1-column has-gutters">
 		<div class="column aligncenter">
 			<?php if ( ! $credits ) : ?>
@@ -59,7 +60,7 @@
 				);
 				?>
 				<br />
-				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
+				<a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php else : ?>
@@ -67,7 +68,7 @@
 			<p>
 				<?php _e( 'Want to see your name in lights on this page?' ); ?>
 				<br />
-				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
+				<a href="<?php echo esc_url( __( 'https://make.wordpress.org/contribute/' ) ); ?>"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php endif; ?>
diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css
index 70551d9bc84ce..f4eec067e2bee 100644
--- a/src/wp-admin/css/about.css
+++ b/src/wp-admin/css/about.css
@@ -1,7 +1,7 @@
 /*------------------------------------------------------------------------------
   22.0 - About Pages
 
-   1.0 Global: About, Credits, Freedoms, Privacy
+   1.0 Global: About, Credits, Freedoms, Privacy, Get Involved
     1.1 Layout
     1.2 Typography & Elements
     1.3 Header
@@ -21,16 +21,17 @@
 
 .about__container {
 	/* Section backgrounds */
-	--background: #274acd;
+	--background: #151515;
 	--subtle-background: #eff2ff;
 
 	/* Main text color */
-	--text: #000;
+	--text: #1e1e1e;
 	--text-light: #fff;
 
 	/* Accent colors: used in header, on special classes. */
-	--accent-1: #3858e9; /* Link color, credit image overlay */
-	--accent-2: #fffcb5; /* Accent background */
+	--accent-1: #3858e9; /* Link color */
+	--accent-2: #c7b9f2; /* Accent background */
+	--accent-3: #f0f0f1; /* hr background */
 
 	/* Navigation colors. */
 	--nav-background: #fff;
@@ -42,20 +43,22 @@
 }
 
 /*------------------------------------------------------------------------------
-  1.0 - Global: About, Credits, Freedoms, Privacy
+  1.0 - Global: About, Credits, Freedoms, Privacy, Get Involved
 ------------------------------------------------------------------------------*/
 
 .about-php,
 .credits-php,
 .freedoms-php,
-.privacy-php {
+.privacy-php,
+.contribute-php {
 	background: #fff;
 }
 
 .about-php #wpcontent,
 .credits-php #wpcontent,
 .freedoms-php #wpcontent,
-.privacy-php #wpcontent {
+.privacy-php #wpcontent,
+.contribute-php #wpcontent {
 	background: #fff;
 	padding: 0 24px;
 }
@@ -64,7 +67,8 @@
 	.about-php.auto-fold #wpcontent,
 	.credits-php.auto-fold #wpcontent,
 	.freedoms-php.auto-fold #wpcontent,
-	.privacy-php.auto-fold #wpcontent {
+	.privacy-php.auto-fold #wpcontent,
+	.contribute-php.auto-fold #wpcontent {
 		padding-left: 24px;
 	}
 }
@@ -220,76 +224,19 @@
 	grid-template-columns: 3fr 2fr;
 }
 
-.about__section.has-2-columns .is-section-header {
-	grid-column-start: 1;
-	-ms-grid-column-span: 2;
-	grid-column-end: span 2;
-}
-
-.about__section.has-2-columns .column:nth-of-type(2n+1) {
+.about__section .is-section-header {
 	grid-column-start: 1;
-}
-
-.about__section.has-2-columns .column:nth-of-type(2n) {
-	grid-column-start: 2;
+	grid-column-end: -1;
 }
 
 .about__section.has-3-columns {
 	grid-template-columns: repeat(3, 1fr);
 }
 
-.about__section.has-3-columns .is-section-header {
-	grid-column-start: 1;
-	-ms-grid-column-span: 3;
-	grid-column-end: span 3;
-}
-
-.about__section.has-3-columns .column:nth-of-type(3n+1) {
-	grid-column-start: 1;
-}
-
-.about__section.has-3-columns .column:nth-of-type(3n+2) {
-	grid-column-start: 2;
-}
-
-.about__section.has-3-columns .column:nth-of-type(3n) {
-	grid-column-start: 3;
-}
-
 .about__section.has-4-columns {
 	grid-template-columns: repeat(4, 1fr);
 }
 
-.about__section.has-4-columns .is-section-header {
-	grid-column-start: 1;
-	-ms-grid-column-span: 4;
-	grid-column-end: span 4;
-}
-
-.about__section.has-4-columns .column:nth-of-type(4n+1) {
-	grid-column-start: 1;
-}
-
-.about__section.has-4-columns .column:nth-of-type(4n+2) {
-	grid-column-start: 2;
-}
-
-.about__section.has-4-columns .column:nth-of-type(4n+3) {
-	grid-column-start: 3;
-}
-
-.about__section.has-4-columns .column:nth-of-type(4n) {
-	grid-column-start: 4;
-}
-
-/* Any columns following a section header need to be expicitly put into the second row, for IE support. */
-.about__section.has-2-columns .is-section-header ~ .column,
-.about__section.has-3-columns .is-section-header ~ .column,
-.about__section.has-4-columns .is-section-header ~ .column,
-.about__section.has-overlap-style .is-section-header ~ .column {
-	grid-row-start: 2;
-}
-
 .about__section.has-overlap-style {
 	grid-template-columns: repeat(7, 1fr);
 }
@@ -300,13 +247,11 @@
 
 .about__section.has-overlap-style .column:nth-of-type(2n+1) {
 	grid-column-start: 2;
-	-ms-grid-column-span: 3;
 	grid-column-end: span 3;
 }
 
 .about__section.has-overlap-style .column:nth-of-type(2n) {
 	grid-column-start: 4;
-	-ms-grid-column-span: 3;
 	grid-column-end: span 3;
 }
 
@@ -354,29 +299,6 @@
 		grid-template-columns: repeat(2, 1fr);
 	}
 
-	.about__section.has-4-columns .column:nth-of-type(2n+1) {
-		grid-column-start: 1;
-	}
-
-	.about__section.has-4-columns .column:nth-of-type(2n) {
-		grid-column-start: 2;
-	}
-
-	.about__section.has-4-columns .column:nth-of-type(4n+3),
-	.about__section.has-4-columns .column:nth-of-type(4n) {
-		grid-row-start: 2;
-	}
-
-	.about__section.has-4-columns .is-section-header {
-		-ms-grid-column-span: 2;
-		grid-column-end: span 2;
-	}
-
-	.about__section.has-4-columns .is-section-header ~ .column:nth-of-type(4n+3),
-	.about__section.has-4-columns .is-section-header ~ .column:nth-of-type(4n) {
-		grid-row-start: 3;
-	}
-
 	.about__section.has-overlap-style {
 		grid-template-columns: 1fr;
 	}
@@ -384,10 +306,8 @@
 	/* At this size, the two columns fully overlap */
 	.about__section.has-overlap-style .column.column {
 		grid-column-start: 1;
-		-ms-grid-column-span: 1;
 		grid-column-end: 2;
 		grid-row-start: 1;
-		-ms-grid-row-span: 1;
 		grid-row-end: 2;
 	}
 }
@@ -475,7 +395,7 @@
 .about__container h3.is-smaller-heading {
 	margin-top: 0;
 	font-size: 1.125rem;
-	font-weight: 700;
+	font-weight: 600;
 	line-height: 1.6;
 }
 
@@ -548,28 +468,28 @@
 	margin-right: auto;
 }
 
-.about__container .about__image + h3 {
-	margin-top: 1.5em;
+.about__container .about__image svg {
+	vertical-align: middle;
 }
 
-.about__container .column .about__image {
-	margin-bottom: calc(var(--gap) / 2);
+.about__container .about__image + h3 {
+	margin-top: 1.5em;
 }
 
 .about__container hr {
-	margin: 0;
-	height: var(--gap);
+	margin: calc(var(--gap) / 2) var(--gap);
+	height: 0;
 	border: none;
-	border-top: 4px solid #d9d9d9;
+	border-top: 4px solid var(--accent-3);
 }
 
 .about__container hr.is-small {
-	height: calc(var(--gap) / 4);
+	margin-top: 0;
+	margin-bottom: 0;
 }
 
 .about__container hr.is-large {
-	height: calc(var(--gap) * 2);
-	margin: calc(var(--gap) / 2) auto;
+	margin: var(--gap) auto;
 }
 
 .about__container div.updated,
@@ -587,6 +507,11 @@
 	font-size: 1.6em;
 }
 
+.about__section.has-3-columns,
+.about__section.has-4-columns {
+	font-size: 1rem;
+}
+
 @media screen and (max-width: 480px) {
 	.about__section.is-feature {
 		font-size: 1.4em;
@@ -602,41 +527,35 @@
 /* 1.3 - Header */
 
 .about__header {
-	--about-header-image-width: 780px;
-	--about-header-image-height: 550px;
-	--about-header-bg-width: var(--about-header-image-width);
-	--about-header-bg-height: var(--about-header-image-height);
-	--about-header-bg-offset-block: 0;
-
 	position: relative;
-	margin-bottom: var(--gap);
-	padding-top: 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	box-sizing: border-box;
+	padding: calc(var(--gap) * 2) 0;
+	min-height: 420px;
 	color: var(--text-light);
-	background: var(--background) url('../images/about-header-about.svg?ver=6.1') no-repeat;
-	background-size: var(--about-header-bg-width) var(--about-header-bg-height);
-	background-position: center top var(--about-header-bg-offset-block);
+	background: var(--background) url('../images/about-header-about.svg?ver=6.3') no-repeat;
+	background-size: cover;
+	background-position: center;
+	border-radius: 5px;
 }
 
 .credits-php .about__header {
-	--about-header-image-width: 863px;
-	--about-header-image-height: 550px;
-
-	background-image: url('../images/about-header-credits.svg?ver=6.1');
+	background-image: url('../images/about-header-credits.svg?ver=6.3');
 }
 
 .freedoms-php .about__header {
-	--about-header-image-width: 782px;
-	--about-header-image-height: 510px;
-
-	background-image: url('../images/about-header-freedoms.svg?ver=6.1');
+	background-image: url('../images/about-header-freedoms.svg?ver=6.3');
 }
 
 .privacy-php .about__header {
-	--about-header-image-width: 1005px;
-	--about-header-image-height: 500px;
-	--about-header-bg-offset-block: calc(var(--gap) * -2);
+	background-image: url('../images/about-header-privacy.svg?ver=6.3');
+}
 
-	background-image: url('../images/about-header-privacy.svg?ver=6.1');
+.contribute-php .about__header {
+	background-image: url('../images/about-header-contribute.svg?ver=6.3');
 }
 
 .about__header-image {
@@ -646,7 +565,7 @@
 .about__header-title {
 	box-sizing: border-box;
 	margin: 0 var(--gap);
-	padding: 9rem 0 0;
+	padding: 0;
 	text-align: center;
 }
 
@@ -656,36 +575,34 @@
 	/* Fluid font size scales on browser size 960px - 1200px. */
 	font-size: clamp(3rem, 20vw - 9rem, 6rem);
 	line-height: 1;
-	font-weight: 400;
+	font-weight: 600;
 }
 
 .credits-php .about__header-title h1,
+.freedoms-php .about__header-title h1,
 .privacy-php .about__header-title h1,
-.freedoms-php .about__header-title h1 {
+.contribute-php .about__header-title h1 {
 	/* Fluid font size scales on browser size 960px - 1200px. */
 	font-size: clamp(3rem, 10vw - 3rem, 4.5rem);
 }
 
 .about__header-text {
 	box-sizing: border-box;
-	max-width: 22em;
-	margin: 0 auto 10rem;
+	max-width: 26em;
+	margin: 0 auto;
 	padding: 0;
 	font-size: 1.6rem;
 	line-height: 1.15;
 	text-align: center;
 }
 
-.credits-php .about__header-text {
-	margin-bottom: 9rem;
-}
-
 .about__header-navigation {
 	position: relative;
 	z-index: 1;
 	display: flex;
 	justify-content: center;
 	padding-top: 0;
+	margin-bottom: var(--gap);
 	background: var(--nav-background);
 	color: var(--nav-color);
 	border-bottom: 3px solid var(--nav-border);
@@ -725,26 +642,22 @@
 }
 
 @media screen and (max-width: 960px) {
-	.about__header {
-		--about-header-bg-width: calc(var(--about-header-image-width) * 0.85);
-		--about-header-bg-height: calc(var(--about-header-image-height) * 0.85);
-	}
-
-	.privacy-php .about__header {
-		--about-header-bg-offset-block: 0;
-	}
-
 	.about__header-title h1 {
 		/* Fluid font size scales on browser size 600px - 960px. */
 		font-size: clamp(3rem, 13.33vw - 2rem, 6rem);
 	}
 
 	.credits-php .about__header-title h1,
+	.freedoms-php .about__header-title h1,
 	.privacy-php .about__header-title h1,
-	.freedoms-php .about__header-title h1 {
+	.contribute-php .about__header-title h1 {
 		/* Fluid font size scales on browser size 600px - 960px. */
 		font-size: clamp(3rem, 6.67vw - 0.5rem, 4.5rem);
 	}
+
+	.about__header-navigation .nav-tab {
+		padding: calc(var(--gap) * 0.75) calc(var(--gap) * 0.5);
+	}
 }
 
 @media screen and (max-width: 782px) {
@@ -776,16 +689,14 @@
 
 @media screen and (max-width: 600px) {
 	.about__header {
-		--about-header-bg-width: calc(var(--about-header-image-width) * 0.75);
-		--about-header-bg-height: calc(var(--about-header-image-height) * 0.75);
+		min-height: auto;
 	}
-}
 
-@media screen and (max-width: 480px) {
 	.about__header,
 	.credits-php .about__header,
+	.freedoms-php .about__header,
 	.privacy-php .about__header,
-	.freedoms-php .about__header {
+	.contribute-php .about__header {
 		background-image: none;
 	}
 
@@ -793,15 +704,9 @@
 		font-size: 2.4em;
 	}
 
-	.about__header-title {
-		padding-top: 2rem;
-	}
-
-	.about__header-text,
-	.credits-php .about__header-text {
+	.about__header-text {
 		margin-left: calc(var(--gap) / 2);
 		margin-right: calc(var(--gap) / 2);
-		margin-bottom: 2rem;
 	}
 
 	.about__header-navigation {
@@ -860,14 +765,12 @@
 	height: 140px;
 	border-radius: 100%;
 	overflow: hidden;
-	background: var(--accent-1);
 }
 
 .about__section .wp-person .gravatar {
 	width: 140px;
 	height: 140px;
 	filter: grayscale(100%);
-	mix-blend-mode: screen;
 }
 
 .about__section .compact .wp-person-avatar,
diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index e4c8c2fe6b105..59d17b17e809e 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -2,6 +2,10 @@
 @import 'variables';
 @import 'mixins';
 
+/**
+ * This function name uses British English to maintain backward compatibility, as developers
+ * may use the function in their own admin CSS files. See #56811.
+ */
 @function url-friendly-colour( $color ) {
 	@return '%23' + str-slice( '#{ $color }', 2, -1 );
 }
@@ -782,17 +786,3 @@ div#wp-responsive-toggle a:before {
 		color: $link;
 	}
 }
-
-/* Welcome Panel */
-.welcome-panel {
-	background-color: $dashboard-accent-1;
-}
-
-.welcome-panel-header-image circle {
-	stroke: $dashboard-accent-2;
-	fill: $dashboard-accent-1;
-}
-
-[class*="welcome-panel-icon"] {
-	background-color: $dashboard-icon-background;
-}
diff --git a/src/wp-admin/css/colors/_variables.scss b/src/wp-admin/css/colors/_variables.scss
index 03a32ea97a3b4..448d2f5e20d3b 100644
--- a/src/wp-admin/css/colors/_variables.scss
+++ b/src/wp-admin/css/colors/_variables.scss
@@ -65,8 +65,9 @@ $menu-customizer-text: mix( $base-color, $text-color, 40% ) !default;
 
 // Dashboard Colors
 
-$dashboard-accent-1: $highlight-color !default;
-$dashboard-accent-2: rgba(255, 255, 255, 0.5) !default;
+$custom-welcome-panel: "true" !default;
+$dashboard-accent-1: $menu-submenu-background !default;
+$dashboard-accent-2: $menu-background !default;
 $dashboard-icon-background: $dashboard-accent-2 !default;
 
 $low-contrast-theme: "false" !default;
diff --git a/src/wp-admin/css/colors/ectoplasm/colors.scss b/src/wp-admin/css/colors/ectoplasm/colors.scss
index e32fee395a295..230ff9efb4986 100644
--- a/src/wp-admin/css/colors/ectoplasm/colors.scss
+++ b/src/wp-admin/css/colors/ectoplasm/colors.scss
@@ -6,6 +6,4 @@ $notification-color: #d46f15;
 
 $form-checked: $base-color;
 
-$dashboard-accent-1: $base-color;
-
 @import "../_admin.scss";
diff --git a/src/wp-admin/css/colors/light/colors.scss b/src/wp-admin/css/colors/light/colors.scss
index ac1515ca79ec2..85ad1e0e521f5 100644
--- a/src/wp-admin/css/colors/light/colors.scss
+++ b/src/wp-admin/css/colors/light/colors.scss
@@ -18,6 +18,8 @@ $menu-submenu-background: #fff;
 $menu-collapse-text: #777;
 $menu-collapse-focus-icon: #555;
 
+$dashboard-accent-1: $highlight-color;
+$dashboard-accent-2: desaturate( lighten( $highlight-color, 7% ), 15% );
 $dashboard-icon-background: $text-color;
 
 @import "../_admin.scss";
diff --git a/src/wp-admin/css/colors/midnight/colors.scss b/src/wp-admin/css/colors/midnight/colors.scss
index acb2cc29d295f..a46eea3ae6a67 100644
--- a/src/wp-admin/css/colors/midnight/colors.scss
+++ b/src/wp-admin/css/colors/midnight/colors.scss
@@ -3,7 +3,6 @@ $base-color: #363b3f;
 $highlight-color: #e14d43;
 $notification-color: #69a8bb;
 
-$dashboard-accent-1: $notification-color;
-$dashboard-icon-background: $highlight-color;
+$dashboard-accent-2: mix($base-color, $notification-color, 90%);
 
 @import "../_admin.scss";
diff --git a/src/wp-admin/css/colors/modern/colors.scss b/src/wp-admin/css/colors/modern/colors.scss
index 35589df093cbd..dc5f9c6588412 100644
--- a/src/wp-admin/css/colors/modern/colors.scss
+++ b/src/wp-admin/css/colors/modern/colors.scss
@@ -7,8 +7,6 @@ $notification-color: $highlight-color;
 $link: $highlight-color;
 $link-focus: darken($highlight-color, 10%);
 
-$dashboard-accent-1: #273fcc;
-$dashboard-accent-2: #627eff;
-$dashboard-icon-background: #1d2327;
+$custom-welcome-panel: "false";
 
 @import "../_admin.scss";
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 5f9022ebf5b06..53520b82cb589 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -138,24 +138,32 @@
 	height: auto; /* Fixes a Safari+VoiceOver bug, see ticket #42006 */
 }
 
+.screen-reader-text + .dashicons-external {
+	margin-top: -1px;
+	margin-left: 2px;
+}
+
 .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
-}
-
-.screen-reader-shortcut:focus {
 	left: 6px;
-	top: -25px;
 	height: auto;
 	width: auto;
 	display: block;
 	font-size: 14px;
 	font-weight: 600;
 	padding: 15px 23px 14px;
+	/* Background and color set to prevent false positives in automated accessibility tests. */
 	background: #f0f0f1;
 	color: #2271b1;
 	z-index: 100000;
 	line-height: normal;
+}
+
+.screen-reader-shortcut:focus {
+	top: -25px;
+	/* Overrides a:focus in the admin. See ticket #56789. */
+	color: #2271b1;
 	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
 	text-decoration: none;
 	/* Only visible in Windows High Contrast mode */
@@ -188,7 +196,6 @@ p.popular-tags,
 .wp-editor-container,
 .popular-tags,
 .feature-filter,
-.imgedit-group,
 .comment-ays {
 	border: 1px solid #c3c4c7;
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
@@ -201,7 +208,6 @@ p.popular-tags,
 .widgets-holder-wrap,
 .popular-tags,
 .feature-filter,
-.imgedit-group,
 .comment-ays {
 	background: #fff;
 }
@@ -552,6 +558,14 @@ code {
 	margin-left: 0;
 }
 
+.js-update-details-toggle .dashicons {
+	text-decoration: none;
+}
+
+.js-update-details-toggle[aria-expanded="true"] .dashicons::before {
+	content: "\f142";
+}
+
 .no-js .widefat thead .check-column input,
 .no-js .widefat tfoot .check-column input {
 	display: none;
@@ -572,10 +586,6 @@ code {
 	margin: 10px 20px 0 2px;
 }
 
-.wrap.block-editor-no-js {
-	padding-left: 20px;
-}
-
 .wrap > h2:first-child, /* Back-compat for pre-4.4 */
 .wrap [class$="icon32"] + h2, /* Back-compat for pre-4.4 */
 .postbox .inside h2, /* Back-compat for pre-4.4 */
@@ -614,20 +624,26 @@ code {
 .wrap .add-new-h2:active, /* deprecated */
 .wrap .page-title-action,
 .wrap .page-title-action:active {
-	margin-left: 4px;
-	padding: 4px 8px;
+	display: inline-block;
 	position: relative;
-	top: -3px;
+	box-sizing: border-box;
+	cursor: pointer;
+	white-space: nowrap;
 	text-decoration: none;
-	border: 1px solid #2271b1;
-	border-radius: 2px;
 	text-shadow: none;
-	font-weight: 600;
+	top: -3px;
+	margin-left: 4px;
+	border: 1px solid #2271b1;
+	border-radius: 3px;
+	background: #f6f7f7;
 	font-size: 13px;
-	line-height: normal; /* IE8-IE11 need this for buttons */
+	font-weight: 400;
+	line-height: 2.15384615;
 	color: #2271b1; /* use the standard color used for buttons */
-	background: #f6f7f7;
-	cursor: pointer;
+	padding: 0 10px;
+	min-height: 30px;
+	-webkit-appearance: none;
+
 }
 
 .wrap .wp-heading-inline + .page-title-action {
@@ -1080,7 +1096,6 @@ th.action-links {
 }
 
 .wp-filter .search-form input[type="search"] {
-	margin: 1px 0;
 	width: 280px;
 	max-width: 100%;
 }
@@ -3005,7 +3020,6 @@ div.action-links {
 }
 
 @media print,
-	(-webkit-min-device-pixel-ratio: 1.25),
 	(min-resolution: 120dpi) {
 
 	#TB_window.plugin-details-modal.thickbox-loading:before {
@@ -3030,11 +3044,17 @@ div.action-links {
 
 .plugin-details-modal #TB_closeWindowButton:hover,
 .plugin-details-modal #TB_closeWindowButton:focus {
-	color: #135e96;
 	outline: none;
 	box-shadow: none;
 }
 
+.plugin-details-modal #TB_closeWindowButton:hover::after,
+.plugin-details-modal #TB_closeWindowButton:focus::after {
+	outline: 2px solid;
+	outline-offset: -4px;
+	border-radius: 4px;
+}
+
 .plugin-details-modal .tb-close-icon {
 	display: none;
 }
@@ -3154,7 +3174,6 @@ img {
 	font-family: Consolas, Monaco, monospace;
 	font-size: 13px;
 	background: #f6f7f7;
-	-o-tab-size: 4;
 	tab-size: 4;
 }
 
@@ -3743,7 +3762,6 @@ img {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	/* Back-compat for pre-3.8 */
 	div.star-holder,
@@ -4057,6 +4075,7 @@ img {
 	}
 
 	.wp-filter .search-form input[type="search"] {
+		width: 100%;
 		font-size: 1rem;
 	}
 
@@ -4110,9 +4129,16 @@ img {
 	.nav-tab-active:focus:active {
 		border-bottom: 1px solid #c3c4c7;
 	}
+}
 
-	.wp-filter .search-form input[type="search"] {
-		width: 100%;
+@media screen and (max-width: 480px) {
+	.metabox-prefs-container {
+		display: grid;
+	}
+
+	.metabox-prefs-container > * {
+		display: inline-block;
+		padding: 2px;
 	}
 }
 
diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index be4c082bcf3f0..4bd63832f9795 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -1604,7 +1604,6 @@ p.customize-section-description {
 	font-family: Consolas, Monaco, monospace;
 	font-size: 12px;
 	padding: 6px 8px;
-	-o-tab-size: 2;
 	tab-size: 2;
 }
 .customize-control-code_editor textarea,
diff --git a/src/wp-admin/css/dashboard.css b/src/wp-admin/css/dashboard.css
index 77084bd9f6045..c0d2459cacbd8 100644
--- a/src/wp-admin/css/dashboard.css
+++ b/src/wp-admin/css/dashboard.css
@@ -120,7 +120,7 @@
 	position: relative;
 	overflow: auto;
 	margin: 16px 0;
-	background-color: #273fcc;
+	background-color: #151515;
 	font-size: 14px;
 	line-height: 1.3;
 	clear: both;
@@ -146,8 +146,6 @@
 }
 
 .welcome-panel-header {
-	--about-header-bg-width: 780px;
-
 	position: relative;
 	color: #fff;
 }
@@ -165,10 +163,12 @@
 .welcome-panel-header-image svg {
 	display: block;
 	margin: auto;
-	width: var(--about-header-bg-width);
-	height: auto;
-	transform: scale(0.75);
-	transform-origin: center top;
+	width: 100%;
+	height: 100%;
+}
+
+.rtl .welcome-panel-header-image svg {
+	transform: scaleX(-1);
 }
 
 .welcome-panel-header * {
@@ -889,31 +889,32 @@ body #dashboard-widgets .postbox form .submit {
 
 #future-posts ul,
 #published-posts ul {
-	clear: both;
-	margin-bottom: 0;
+	margin: 8px -12px 0 -12px;
 }
 
 #future-posts li,
 #published-posts li {
-	margin-bottom: 8px;
+	display: grid;
+	grid-template-columns: clamp(160px, calc(2vw + 140px), 200px) auto;
+	column-gap: 10px;
+	color: #646970;
+	padding: 4px 12px;
 }
 
-#future-posts ul span,
-#published-posts ul span {
-	display: inline-block;
-	margin-right: 5px;
-	min-width: 150px;
-	color: #646970;
+#future-posts li:nth-child(odd),
+#published-posts li:nth-child(odd) {
+	background-color: #f6f7f7;
 }
 
 .activity-block {
 	border-bottom: 1px solid #f0f0f1;
-	margin: 0 -12px;
+	margin: 0 -12px 6px -12px;
 	padding: 8px 12px 4px;
 }
 
 .activity-block:last-child {
 	border-bottom: none;
+	margin-bottom: 0;
 }
 
 .activity-block .subsubsub li {
diff --git a/src/wp-admin/css/deprecated-media.css b/src/wp-admin/css/deprecated-media.css
index 359fc59e3c3b5..36fafeb65f76b 100644
--- a/src/wp-admin/css/deprecated-media.css
+++ b/src/wp-admin/css/deprecated-media.css
@@ -404,7 +404,6 @@ table.not-image tr.image-only {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 
 	.image-align-none-label {
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 203311366450c..f30e6698683c2 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -1068,6 +1068,10 @@ form#tags-filter {
 	padding: 0 8px 8px;
 }
 
+#postcustom #postcustomstuff .add-custom-field {
+	padding: 12px 8px 8px;
+}
+
 #side-sortables #postcustom #postcustomstuff .submit {
 	margin: 0;
 	padding: 0;
@@ -1118,7 +1122,8 @@ form#tags-filter {
 	width: auto;
 }
 
-#postcustomstuff #newmetaleft a {
+#postcustomstuff #newmetaleft a,
+#postcustomstuff #newmeta-button {
 	display: inline-block;
 	margin: 0 8px 8px;
 	text-decoration: none;
@@ -1683,7 +1688,6 @@ table.links-table {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	#content-resize-handle,
 	#post-body .wp_themeSkin .mceStatusbar a.mceResize {
diff --git a/src/wp-admin/css/forms.css b/src/wp-admin/css/forms.css
index 9066f583981bd..09ad1a3c3aa7d 100644
--- a/src/wp-admin/css/forms.css
+++ b/src/wp-admin/css/forms.css
@@ -547,10 +547,67 @@ fieldset label,
 
 .wp-generate-pw {
 	margin-top: 1em;
+	position: relative;
+}
+
+.wp-pwd button {
+	height: min-content;
+}
+
+.wp-pwd button.pwd-toggle .dashicons {
+	position: relative;
+	top: 0.25rem;
 }
 
 .wp-pwd {
 	margin-top: 1em;
+	position: relative;
+}
+
+.mailserver-pass-wrap .wp-pwd {
+	display: inline-block;
+	margin-top: 0;
+}
+
+/* rtl:ignore */
+#mailserver_pass {
+	padding-right: 2.5rem;
+}
+
+/* rtl:ignore */
+.mailserver-pass-wrap .button.wp-hide-pw {
+	background: transparent;
+	border: 1px solid transparent;
+	box-shadow: none;
+	font-size: 14px;
+	line-height: 2;
+	width: 2.5rem;
+	min-width: 40px;
+	margin: 0;
+	padding: 0 9px;
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:hover {
+	background: transparent;
+	border-color: transparent;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:focus {
+	background: transparent;
+	border-color: #3582c4;
+	border-radius: 4px;
+	box-shadow: 0 0 0 1px #3582c4;
+	/* Only visible in Windows High Contrast mode */
+	outline: 2px solid transparent;
+}
+
+.mailserver-pass-wrap .button.wp-hide-pw:active {
+	background: transparent;
+	box-shadow: none;
+	transform: none;
 }
 
 #misc-publishing-actions label {
@@ -593,6 +650,10 @@ fieldset label,
 	opacity: 1;
 }
 
+.password-input-wrapper {
+	display: inline-block;
+}
+
 .password-input-wrapper input {
 	font-family: Consolas, Monaco, monospace;
 }
@@ -671,7 +732,7 @@ input[type="text"].ui-autocomplete-loading,
 input[type="email"].ui-autocomplete-loading {
 	background-image: url(../images/loading.gif);
 	background-repeat: no-repeat;
-	background-position: right center;
+	background-position: right 5px center;
 	visibility: visible;
 }
 
@@ -1069,7 +1130,9 @@ table.form-table td .updated p {
 }
 
 .settings-php .language-install-spinner,
-.options-general-php .language-install-spinner {
+.options-general-php .language-install-spinner,
+.user-edit-php .language-install-spinner,
+.profile-php .language-install-spinner {
 	display: inline-block;
 	float: none;
 	margin: -3px 5px 0;
@@ -1080,9 +1143,18 @@ table.form-table td .updated p {
 	margin-top: 8px;
 }
 
+.form-table.permalink-structure .available-structure-tags ul {
+	display: flex;
+	flex-wrap: wrap;
+	margin: 8px 0 0;
+}
+
 .form-table.permalink-structure .available-structure-tags li {
-	float: left;
-	margin-right: 5px;
+	margin: 6px 5px 0 0;
+}
+
+.form-table.permalink-structure .available-structure-tags li:last-child {
+	margin-right: 0;
 }
 
 .form-table.permalink-structure .structure-selection .row {
@@ -1572,13 +1644,15 @@ table.form-table td .updated p {
 		padding: 8px;
 	}
 
+	.password-input-wrapper {
+		display: block;
+	}
+
 	p.search-box {
 		float: none;
-		position: absolute;
-		bottom: 0;
-		width: 98%;
-		height: 90px;
+		width: 100%;
 		margin-bottom: 20px;
+		display: flex;
 	}
 
 	p.search-box input[name="s"] {
@@ -1710,6 +1784,15 @@ table.form-table td .updated p {
 		display: inline-block;
 	}
 
+	.mailserver-pass-wrap .wp-pwd {
+		display: block;
+	}
+
+	/* rtl:ignore */
+	#mailserver_pass {
+		padding-left: 10px;
+	}
+
 	.options-general-php input[type="text"].small-text {
 		max-width: 6.25em;
 		margin: 0;
diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
index 62a596f0fe1fa..f42791dec8c72 100644
--- a/src/wp-admin/css/install.css
+++ b/src/wp-admin/css/install.css
@@ -131,7 +131,7 @@ textarea {
 	font-size: 14px;
 	text-align: left;
 	padding: 10px 20px 10px 0;
-	width: 140px;
+	width: 115px;
 	vertical-align: top;
 }
 
@@ -145,12 +145,30 @@ textarea {
 	font-size: 11px;
 }
 
+.form-table .setup-description {
+	margin: 4px 0 0;
+	line-height: 1.6;
+}
+
 .form-table input {
 	line-height: 1.33333333;
 	font-size: 15px;
 	padding: 3px 5px;
 }
 
+.wp-pwd {
+	margin-top: 0;
+}
+
+.form-table .wp-pwd {
+	display: flex;
+	column-gap: 4px;
+}
+
+.form-table .password-input-wrapper {
+	width: 100%;
+}
+
 input,
 submit {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -161,7 +179,7 @@ submit {
 .form-table input[type=url],
 .form-table input[type=password],
 #pass-strength-result {
-	width: 218px;
+	width: 100%;
 }
 
 .form-table th p {
@@ -286,6 +304,10 @@ body.rtl,
 		box-sizing: border-box;
 	}
 
+	#pwd {
+		padding-right: 2.5rem;
+	}
+
 	.wp-pwd #pass1 {
 		padding-right: 50px;
 	}
@@ -369,7 +391,6 @@ body.language-chooser {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 
 	.spinner {
diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css
index 440d2a5381796..3f0519e561f4e 100644
--- a/src/wp-admin/css/list-tables.css
+++ b/src/wp-admin/css/list-tables.css
@@ -461,50 +461,64 @@ table.media .column-title .filename {
 	width: 160px;
 }
 
+.sorting-indicators {
+	display: grid;
+}
+
 .sorting-indicator {
 	display: block;
-	visibility: hidden;
 	width: 10px;
 	height: 4px;
-	margin-top: 8px;
+	margin-top: 4px;
 	margin-left: 7px;
 }
 
 .sorting-indicator:before {
-	content: "\f142";
 	font: normal 20px/1 dashicons;
 	speak: never;
 	display: inline-block;
 	padding: 0;
 	top: -4px;
 	left: -8px;
-	color: #3c434a;
 	line-height: 0.5;
 	position: relative;
 	vertical-align: top;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 	text-decoration: none !important;
-	color: #3c434a;
-}
-
-.column-comments .sorting-indicator:before {
-	top: 0;
-	left: -10px;
+	color: #a7aaad;
 }
 
-th.sorted.asc .sorting-indicator:before,
-th.desc:hover span.sorting-indicator:before,
-th.desc a:focus span.sorting-indicator:before {
+.sorting-indicator.asc:before {
 	content: "\f142";
 }
 
-th.sorted.desc .sorting-indicator:before,
-th.asc:hover span.sorting-indicator:before,
-th.asc a:focus span.sorting-indicator:before {
+.sorting-indicator.desc:before {
 	content: "\f140";
 }
 
+th.sorted.desc .sorting-indicator.desc:before {
+	color: #1d2327;
+}
+
+th.sorted.asc .sorting-indicator.asc:before {
+	color: #1d2327;
+}
+
+th.sorted.asc a:focus .sorting-indicator.asc:before,
+th.sorted.asc:hover .sorting-indicator.asc:before,
+th.sorted.desc a:focus .sorting-indicator.desc:before,
+th.sorted.desc:hover .sorting-indicator.desc:before {
+	color: #a7aaad;
+}
+
+th.sorted.asc a:focus .sorting-indicator.desc:before,
+th.sorted.asc:hover .sorting-indicator.desc:before,
+th.sorted.desc a:focus .sorting-indicator.asc:before,
+th.sorted.desc:hover .sorting-indicator.asc:before {
+	color: #1d2327;
+}
+
 .wp-list-table .toggle-row {
 	position: absolute;
 	right: 8px;
@@ -552,6 +566,28 @@ th.asc a:focus span.sorting-indicator:before {
 	content: "\f142";
 }
 
+.check-column {
+	position: relative;
+}
+
+.check-column .label-covers-full-cell {
+	width: 100%;
+	height: 100%;
+	display: block;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.check-column .label-covers-full-cell + input {
+	position: relative;
+	z-index: 1;
+}
+
+.check-column .label-covers-full-cell:hover + input {
+	box-shadow: 0 0 0 1px #2271b1;
+}
+
 .locked-indicator {
 	display: none;
 	margin-left: 6px;
@@ -591,10 +627,6 @@ tr.wp-locked .row-actions .trash {
 	display: none;
 }
 
-.fixed .column-comments .sorting-indicator {
-	margin-top: 3px;
-}
-
 #menu-locations-wrap .widefat {
 	width: 60%;
 }
@@ -622,14 +654,6 @@ th.sorted a span {
 	cursor: pointer;
 }
 
-th.sorted .sorting-indicator,
-th.desc:hover span.sorting-indicator,
-th.desc a:focus span.sorting-indicator,
-th.asc:hover span.sorting-indicator,
-th.asc a:focus span.sorting-indicator {
-	visibility: visible;
-}
-
 .tablenav-pages .current-page {
 	margin: 0 2px 0 0;
 	font-size: 13px;
@@ -1636,6 +1660,7 @@ div.action-links,
 	font-style: normal;
 	margin: 0;
 	padding: 100px 0 0;
+	width: 100%;
 	text-align: center;
 }
 
diff --git a/src/wp-admin/css/login.css b/src/wp-admin/css/login.css
index 1f89db216eda0..8f43504c1c1a0 100644
--- a/src/wp-admin/css/login.css
+++ b/src/wp-admin/css/login.css
@@ -437,8 +437,7 @@ input::-ms-reveal {
 	height: auto;
 }
 
-.login .language-switcher .button-primary {
-	float: none;
+.login .language-switcher .button {
 	margin-bottom: 0;
 }
 
@@ -472,7 +471,7 @@ input::-ms-reveal {
 }
 
 @media screen and (max-width: 400px) {
-	.login .language-switcher .button-primary {
+	.login .language-switcher .button {
 		display: block;
 		margin: 5px auto 0;
 	}
diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index ea5787d4cb13a..c7f9100ca4654 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -191,7 +191,7 @@
 
 .media-item .original {
 	position: relative;
-	height: 34px;
+	min-height: 34px;
 }
 
 .media-item .progress {
@@ -583,7 +583,7 @@ border color while dragging a file over the uploader drop area */
 	margin-top: 0;
 }
 
-.media-search-input-label {
+.media-frame-content .media-search-input-label {
 	margin: 0 .2em 0 0;
 	vertical-align: baseline;
 }
@@ -877,16 +877,16 @@ border color while dragging a file over the uploader drop area */
 	padding-top: 10px;
 }
 
-.imgedit-settings p,
-.imgedit-settings fieldset {
+.image-editor p,
+.image-editor fieldset {
 	margin: 8px 0;
 }
 
-.imgedit-settings legend {
+.image-editor legend {
 	margin-bottom: 5px;
 }
 
-.describe .imgedit-wrap .imgedit-settings {
+.describe .imgedit-wrap .image-editor {
 	padding: 0 5px;
 }
 
@@ -898,19 +898,31 @@ border color while dragging a file over the uploader drop area */
 	height: auto;
 }
 
-.wp_attachment_holder .imgedit-wrap .imgedit-panel-content {
-	float: left;
-	padding: 3px 16px 0 0;
-	min-width: 400px;
-	max-width: calc( 100% - 266px );
+.imgedit-panel-content {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 20px;
+	margin-bottom: 20px;
 }
 
-.wp_attachment_holder .imgedit-wrap .imgedit-settings {
+.imgedit-settings {
+	max-width: 400px; /* Prevent reflow when help info is expanded. */
+}
+
+.imgedit-group-controls > * {
+	display: none;
+}
+
+.imgedit-panel-active .imgedit-group-controls > * {
+	display: block;
+}
+
+.wp_attachment_holder .imgedit-wrap .image-editor {
 	float: right;
 	width: 250px;
 }
 
-.imgedit-settings input {
+.image-editor input {
 	margin-top: 0;
 	vertical-align: middle;
 }
@@ -945,7 +957,7 @@ border color while dragging a file over the uploader drop area */
 }
 
 .media-disabled,
-.imgedit-settings .disabled {
+.image-editor .disabled {
 	/* WCAG 1.4.3 Text or images of text that are part of an inactive user
 	   interface component ... have no contrast requirement. */
 	color: #a7aaad;
@@ -969,10 +981,6 @@ border color while dragging a file over the uploader drop area */
 	float: left;
 }
 
-.imgedit-menu {
-	margin: 0 0 12px;
-}
-
 .imgedit-menu .note-no-rotate {
 	clear: both;
 	margin: 0;
@@ -985,10 +993,10 @@ border color while dragging a file over the uploader drop area */
 	min-height: 28px;
 	font-size: 13px;
 	line-height: 2;
-	margin: 0 8px 8px 0;
 	padding: 0 10px;
 }
 
+.imgedit-menu .button:after,
 .imgedit-menu .button:before {
 	font: normal 16px/1 dashicons;
 	margin-right: 8px;
@@ -1000,6 +1008,16 @@ border color while dragging a file over the uploader drop area */
 	-moz-osx-font-smoothing: grayscale;
 }
 
+.imgedit-menu .imgedit-rotate.button:after {
+	content: '\f140';
+	margin-left: 2px;
+	margin-right: 0;
+}
+
+.imgedit-menu .imgedit-rotate.button[aria-expanded="true"]:after {
+	content: '\f142';
+}
+
 .imgedit-menu .button.disabled {
 	color: #a7aaad;
 	border-color: #dcdcde;
@@ -1014,22 +1032,14 @@ border color while dragging a file over the uploader drop area */
 	content: "\f165";
 }
 
-.imgedit-rleft:before {
-	content: "\f166";
+.imgedit-scale:before {
+	content: "\f211";
 }
 
-.imgedit-rright:before {
+.imgedit-rotate:before {
 	content: "\f167";
 }
 
-.imgedit-flipv:before {
-	content: "\f168";
-}
-
-.imgedit-fliph:before {
-	content: "\f169";
-}
-
 .imgedit-undo:before {
 	content: "\f171";
 }
@@ -1048,23 +1058,19 @@ border color while dragging a file over the uploader drop area */
 	background-size: 20px 20px;
 }
 
-.imgedit-crop {
-	margin: 0 8px 0 0;
-}
-
-.imgedit-rleft {
-	margin: 0 3px;
+.imgedit-crop-wrap {
+	padding: 20px;
+	background-image: linear-gradient(45deg, #c3c4c7 25%, transparent 25%, transparent 75%, #c3c4c7 75%, #c3c4c7), linear-gradient(45deg, #c3c4c7 25%, transparent 25%, transparent 75%, #c3c4c7 75%, #c3c4c7);
+	background-position: 0 0, 10px 10px;
+	background-size: 20px 20px;
 }
 
-.imgedit-rright {
-	margin: 0 8px 0 3px;
-}
 
-.imgedit-flipv {
-	margin: 0 3px;
+.imgedit-crop {
+	margin: 0 8px 0 0;
 }
 
-.imgedit-fliph {
+.imgedit-rotate {
 	margin: 0 8px 0 3px;
 }
 
@@ -1076,6 +1082,12 @@ border color while dragging a file over the uploader drop area */
 	margin: 0 8px 0 3px;
 }
 
+.imgedit-thumbnail-preview-group {
+	display: flex;
+	flex-wrap: wrap;
+	column-gap: 10px;
+}
+
 .imgedit-thumbnail-preview {
 	margin: 10px 8px 0 0;
 }
@@ -1102,11 +1114,41 @@ border color while dragging a file over the uploader drop area */
 	padding: .5em 0 0;
 }
 
+.imgedit-popup-menu,
 .imgedit-help {
 	display: none;
 	padding-bottom: 8px;
 }
 
+.imgedit-panel-tools > .imgedit-menu {
+	display: flex;
+	column-gap: 4px;
+	align-items: start;
+	flex-wrap: wrap;
+}
+
+.imgedit-popup-menu {
+	width: calc( 100% - 20px );
+	position: absolute;
+	background: #fff;
+	padding: 10px;
+	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.3);
+}
+
+.image-editor .imgedit-menu .imgedit-popup-menu button {
+	display: block;
+	margin: 2px 0;
+	width: 100%;
+	white-space: break-spaces;
+	line-height: 1.5;
+	padding-top: 3px;
+	padding-bottom: 2px;
+}
+
+.imgedit-rotate-menu-container {
+	position: relative;
+}
+
 .imgedit-help.imgedit-restore {
 	padding-bottom: 0;
 }
@@ -1139,10 +1181,6 @@ border color while dragging a file over the uploader drop area */
 	padding: 0;
 }
 
-.imgedit-submit {
-	margin: 8px 0 0;
-}
-
 .imgedit-submit-btn {
 	margin-left: 20px;
 }
@@ -1154,8 +1192,11 @@ border color while dragging a file over the uploader drop area */
 }
 
 span.imgedit-scale-warn {
-	color: #d63638;
-	font-size: 20px;
+	display: flex;
+	align-items: center;
+	margin: 4px;
+	gap: 4px;
+	color: #b32d2e;
 	font-style: normal;
 	visibility: hidden;
 	vertical-align: middle;
@@ -1170,17 +1211,19 @@ span.imgedit-scale-warn {
 }
 
 .imgedit-group {
-	margin-bottom: 8px;
-	padding: 10px;
+	margin-bottom: 20px;
 }
 
-.imgedit-settings .imgedit-original-dimensions {
+.image-editor .imgedit-original-dimensions {
 	display: inline-block;
 }
 
-.imgedit-settings .imgedit-scale input[type="text"],
-.imgedit-settings .imgedit-crop-ratio input[type="text"],
-.imgedit-settings .imgedit-crop-sel input[type="text"] {
+.image-editor .imgedit-scale-controls input[type="text"],
+.image-editor .imgedit-crop-ratio input[type="text"],
+.image-editor .imgedit-crop-sel input[type="text"],
+.image-editor .imgedit-scale-controls input[type="number"],
+.image-editor .imgedit-crop-ratio input[type="number"],
+.image-editor .imgedit-crop-sel input[type="number"] {
 	width: 80px;
 	font-size: 14px;
 	padding: 0 8px;
@@ -1194,12 +1237,12 @@ span.imgedit-scale-warn {
 	color: #3c434a;
 }
 
-.imgedit-settings .imgedit-scale-button-wrapper {
+.image-editor .imgedit-scale-button-wrapper {
 	margin-top: 0.3077em;
 	display: block;
 }
 
-.imgedit-settings .imgedit-scale .button {
+.image-editor .imgedit-scale-controls .button {
 	margin-bottom: 0;
 }
 
@@ -1228,7 +1271,6 @@ audio, video {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	.imgedit-wait:before {
 		background-image: url(../images/spinner-2x.gif);
@@ -1268,15 +1310,15 @@ audio, video {
 		padding: 10px 0 10px 12px;
 	}
 
-	.imgedit-settings .imgedit-scale input[type="text"],
-	.imgedit-settings .imgedit-crop-ratio input[type="text"],
-	.imgedit-settings .imgedit-crop-sel input[type="text"] {
+	.image-editor .imgedit-scale input[type="text"],
+	.image-editor .imgedit-crop-ratio input[type="text"],
+	.image-editor .imgedit-crop-sel input[type="text"] {
 		font-size: 16px;
 		padding: 6px 10px;
 	}
 
 	.wp_attachment_holder .imgedit-wrap .imgedit-panel-content,
-	.wp_attachment_holder .imgedit-wrap .imgedit-settings {
+	.wp_attachment_holder .imgedit-wrap .image-editor {
 		float: none;
 		width: auto;
 		max-width: none;
@@ -1293,16 +1335,16 @@ audio, video {
 	}
 
 	.media-modal .imgedit-wrap .imgedit-panel-content,
-	.media-modal .imgedit-wrap .imgedit-settings {
+	.media-modal .imgedit-wrap .image-editor {
 		position: initial !important;
 	}
 
-	.media-modal .imgedit-wrap .imgedit-settings {
+	.media-modal .imgedit-wrap .image-editor {
 		box-sizing: border-box;
 		width: 100% !important;
 	}
 
-	.imgedit-settings .imgedit-scale-button-wrapper {
+	.image-editor .imgedit-scale-button-wrapper {
 		display: inline-block;
 	}
 }
@@ -1316,7 +1358,6 @@ audio, video {
 /**
  * Media queries for media grid.
  */
-
 @media only screen and (max-width: 1120px) {
 	/* override for media-views.css */
 	#wp-media-grid .wp-filter .attachment-filters {
@@ -1324,6 +1365,17 @@ audio, video {
 	}
 }
 
+@media only screen and (max-width: 1000px) {
+	/* override for forms.css */
+	.wp-filter p.search-box {
+		float: none;
+		width: 100%;
+		margin-bottom: 20px;
+		display: flex;
+	}
+
+}
+
 @media only screen and (max-width: 782px) {
 	.media-frame.mode-select .attachments-browser.fixed .media-toolbar {
 		top: 46px;
diff --git a/src/wp-admin/css/nav-menus.css b/src/wp-admin/css/nav-menus.css
index 8dfe84d1532a8..4fd178dbb0177 100644
--- a/src/wp-admin/css/nav-menus.css
+++ b/src/wp-admin/css/nav-menus.css
@@ -169,7 +169,7 @@ label.bulk-select-button:focus-within {
 	color: #0a4b78;
 }
 
-input.bulk-select-switcher:focus + .bulk-select-button-label{
+input.bulk-select-switcher:focus + .bulk-select-button-label {
 	color: #0a4b78;
 }
 
@@ -191,9 +191,7 @@ input.bulk-select-switcher:focus + .bulk-select-button-label{
 }
 
 .bulk-actions input.menu-items-delete.disabled {
-	cursor: default;
-	color: #a7aaad;
-	box-shadow: none;
+	display: none;
 }
 
 .menu-settings {
@@ -839,20 +837,13 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 
 /* Major/minor publishing actions (classes) */
 .nav-menus-php .major-publishing-actions {
-	clear: both;
 	padding: 10px 0;
-	line-height: 2.15384615;
-}
-
-.nav-menus-php .major-publishing-actions .publishing-action {
-	text-align: right;
-	float: right;
+	display: flex;
+	align-items: center;
 }
 
-/* Same as the Publish Meta Box #delete-action */
-.nav-menus-php .delete-action {
-	float: left;
-	line-height: 2.1;
+.nav-menus-php .major-publishing-actions > * {
+	margin-right: 10px;
 }
 
 .nav-menus-php .major-publishing-actions .form-invalid {
diff --git a/src/wp-admin/css/revisions.css b/src/wp-admin/css/revisions.css
index e523ee431ce93..46cf263b5e67c 100644
--- a/src/wp-admin/css/revisions.css
+++ b/src/wp-admin/css/revisions.css
@@ -558,7 +558,6 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	.revision-tick.completed-false {
 		background-image: url(../images/spinner-2x.gif);
diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index 61e290fe867e0..c1a1eb22dde49 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -840,7 +840,7 @@ body.folded .theme-browser ~ .theme-overlay .theme-wrap {
 	}
 }
 
-@media only screen and (max-width: 780px) {
+@media only screen and (max-width: 782px) {
 	body.folded .theme-overlay .theme-wrap,
 	.theme-overlay .theme-wrap {
 		top: 0; /* The adminmenu isn't fixed on mobile, so this can use the full viewport height */
@@ -1941,7 +1941,6 @@ body.full-overlay-active {
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	.wp-full-overlay .collapse-sidebar-arrow {
 		background-image: url(../images/arrows-2x.png);
diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
index 0df5d81ae571a..2f0bc87b86243 100644
--- a/src/wp-admin/customize.php
+++ b/src/wp-admin/customize.php
@@ -97,7 +97,7 @@
 }
 
 $registered             = $wp_scripts->registered;
-$wp_scripts             = new WP_Scripts;
+$wp_scripts             = new WP_Scripts();
 $wp_scripts->registered = $registered;
 
 add_action( 'customize_controls_print_scripts', 'print_head_scripts', 20 );
@@ -116,7 +116,7 @@
 wp_enqueue_style( 'customize-controls' );
 
 /**
- * Enqueue Customizer control scripts.
+ * Fires when enqueuing Customizer control scripts.
  *
  * @since 3.4.0
  */
@@ -207,7 +207,12 @@
 				<span class="preview"><?php _e( 'Preview' ); ?></span>
 			</button>
 			<a class="customize-controls-close" href="<?php echo esc_url( $wp_customize->get_return_url() ); ?>">
-				<span class="screen-reader-text"><?php _e( 'Close the Customizer and go back to the previous page' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Close the Customizer and go back to the previous page' );
+					?>
+				</span>
 			</a>
 		</div>
 
@@ -230,7 +235,12 @@
 							printf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
 						?>
 						</span>
-						<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+						<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Help' );
+							?>
+						</span></button>
 					</div>
 					<div class="customize-panel-description">
 						<p>
@@ -240,7 +250,7 @@
 						</p>
 						<p>
 							<?php
-							_e( '<a href="https://wordpress.org/support/article/appearance-customize-screen/">Documentation on Customizer</a>' );
+							_e( '<a href="https://wordpress.org/documentation/article/customizer/">Documentation on Customizer</a>' );
 							?>
 						</p>
 					</div>
diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php
index ed34545584dbd..d7f14f2cd09aa 100644
--- a/src/wp-admin/edit-comments.php
+++ b/src/wp-admin/edit-comments.php
@@ -32,7 +32,14 @@
 
 		$comment_status = wp_unslash( $_REQUEST['comment_status'] );
 		$delete_time    = wp_unslash( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids    = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+		$comment_ids    = $wpdb->get_col(
+			$wpdb->prepare(
+				"SELECT comment_ID FROM $wpdb->comments
+				WHERE comment_approved = %s AND %s > comment_date_gmt",
+				$comment_status,
+				$delete_time
+			)
+		);
 		$doaction       = 'delete';
 	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
 		$comment_ids = $_REQUEST['delete_comments'];
@@ -52,7 +59,19 @@
 	$untrashed  = 0;
 	$deleted    = 0;
 
-	$redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
+	$redirect_to = remove_query_arg(
+		array(
+			'trashed',
+			'untrashed',
+			'deleted',
+			'spammed',
+			'unspammed',
+			'approved',
+			'unapproved',
+			'ids',
+		),
+		wp_get_referer()
+	);
 	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
 
 	wp_defer_comment_counting( true );
@@ -197,7 +216,7 @@
 		'title'   => __( 'Moderating Comments' ),
 		'content' =>
 					'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-					'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
+					'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and site URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
 					'<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
 					'<p>' . __( 'In the <strong>In response to</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
 					'<p>' . __( 'In the <strong>Submitted on</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
@@ -207,10 +226,10 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/comment-spam/">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/comments-screen/">Documentation on Comments</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/understand-comment-spam/">Documentation on Comment Spam</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/keyboard-shortcuts-classic-editor/#keyboard-shortcuts-for-comments">Documentation on Keyboard Shortcuts</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -286,7 +305,14 @@
 	}
 }
 
-if ( isset( $_REQUEST['approved'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) || isset( $_REQUEST['spammed'] ) || isset( $_REQUEST['unspammed'] ) || isset( $_REQUEST['same'] ) ) {
+if ( isset( $_REQUEST['approved'] )
+	|| isset( $_REQUEST['deleted'] )
+	|| isset( $_REQUEST['trashed'] )
+	|| isset( $_REQUEST['untrashed'] )
+	|| isset( $_REQUEST['spammed'] )
+	|| isset( $_REQUEST['unspammed'] )
+	|| isset( $_REQUEST['same'] )
+) {
 	$approved  = isset( $_REQUEST['approved'] ) ? (int) $_REQUEST['approved'] : 0;
 	$deleted   = isset( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
 	$trashed   = isset( $_REQUEST['trashed'] ) ? (int) $_REQUEST['trashed'] : 0;
@@ -297,35 +323,63 @@
 
 	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
 		if ( $approved > 0 ) {
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment approved.', '%s comments approved.', $approved ), $approved );
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment approved.', '%s comments approved.', $approved ),
+				$approved
+			);
 		}
 
 		if ( $spammed > 0 ) {
 			$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
+
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ),
+				$spammed
+			) . sprintf(
+				' <a href="%1$s">%2$s</a><br />',
+				esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ),
+				__( 'Undo' )
+			);
 		}
 
 		if ( $unspammed > 0 ) {
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment restored from the spam.', '%s comments restored from the spam.', $unspammed ), $unspammed );
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment restored from the spam.', '%s comments restored from the spam.', $unspammed ),
+				$unspammed
+			);
 		}
 
 		if ( $trashed > 0 ) {
 			$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
+
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ),
+				$trashed
+			) . sprintf(
+				' <a href="%1$s">%2$s</a><br />',
+				esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ),
+				__( 'Undo' )
+			);
 		}
 
 		if ( $untrashed > 0 ) {
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment restored from the Trash.', '%s comments restored from the Trash.', $untrashed ), $untrashed );
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment restored from the Trash.', '%s comments restored from the Trash.', $untrashed ),
+				$untrashed
+			);
 		}
 
 		if ( $deleted > 0 ) {
-			/* translators: %s: Number of comments. */
-			$messages[] = sprintf( _n( '%s comment permanently deleted.', '%s comments permanently deleted.', $deleted ), $deleted );
+			$messages[] = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s comment permanently deleted.', '%s comments permanently deleted.', $deleted ),
+				$deleted
+			);
 		}
 
 		if ( $same > 0 ) {
@@ -333,19 +387,34 @@
 			if ( $comment ) {
 				switch ( $comment->comment_approved ) {
 					case '1':
-						$messages[] = __( 'This comment is already approved.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+						$messages[] = __( 'This comment is already approved.' ) . sprintf(
+							' <a href="%1$s">%2$s</a>',
+							esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ),
+							__( 'Edit comment' )
+						);
 						break;
 					case 'trash':
-						$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+						$messages[] = __( 'This comment is already in the Trash.' ) . sprintf(
+							' <a href="%1$s">%2$s</a>',
+							esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ),
+							__( 'View Trash' )
+						);
 						break;
 					case 'spam':
-						$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+						$messages[] = __( 'This comment is already marked as spam.' ) . sprintf(
+							' <a href="%1$s">%2$s</a>',
+							esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ),
+							__( 'Edit comment' )
+						);
 						break;
 				}
 			}
 		}
 
-		echo '<div id="moderated" class="updated notice is-dismissible"><p>' . implode( "<br />\n", $messages ) . '</p></div>';
+		printf(
+			'<div id="moderated" class="updated notice is-dismissible"><p>%s</p></div>',
+			implode( "<br />\n", $messages )
+		);
 	}
 }
 ?>
diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
index 907a760e6e27a..12344df3ba57a 100644
--- a/src/wp-admin/edit-form-advanced.php
+++ b/src/wp-admin/edit-form-advanced.php
@@ -316,8 +316,8 @@
 			'tools.php'
 		) . '</p>' .
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/wordpress-editor/">Documentation on Writing and Editing Posts</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p>' . __( '<a href="https://wordpress.org/documentation/article/write-posts-classic-editor/">Documentation on Writing and Editing Posts</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 } elseif ( 'page' === $post_type ) {
 	$about_pages = '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.' ) . '</p>' .
@@ -333,9 +333,9 @@
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/pages-add-new-screen/">Documentation on Adding New Pages</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/pages-screen/">Documentation on Editing Pages</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p>' . __( '<a href="https://wordpress.org/documentation/article/pages-add-new-screen/">Documentation on Adding New Pages</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/documentation/article/pages-screen/">Documentation on Editing Pages</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 } elseif ( 'attachment' === $post_type ) {
 	get_current_screen()->add_help_tab(
@@ -346,20 +346,20 @@
 				'<p>' . __( 'This screen allows you to edit fields for metadata in a file within the media library.' ) . '</p>' .
 				'<p>' . __( 'For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.' ) . '</p>' .
 				'<p>' . __( 'Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.' ) . '</p>' .
-				'<p>' . __( 'Remember to click Update Media to save metadata entered or changed.' ) . '</p>',
+				'<p>' . __( 'Remember to click Update to save metadata entered or changed.' ) . '</p>',
 		)
 	);
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/edit-media/">Documentation on Edit Media</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/edit-media/">Documentation on Edit Media</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 }
 
 if ( 'post' === $post_type || 'page' === $post_type ) {
 	$inserting_media  = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
-	$inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. <a href="https://wordpress.org/support/article/embeds/">Learn more about embeds</a>.' ) . '</p>';
+	$inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. <a href="https://wordpress.org/documentation/article/embeds/">Learn more about embeds</a>.' ) . '</p>';
 
 	get_current_screen()->add_help_tab(
 		array(
@@ -377,7 +377,7 @@
 	'</li>';
 
 	if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {
-		$publish_box .= '<li>' . __( '<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Your theme could enable all or some of 10 possible formats. <a href="https://wordpress.org/support/article/post-formats/#supported-formats">Learn more about each post format</a>.' ) . '</li>';
+		$publish_box .= '<li>' . __( '<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Your theme could enable all or some of 10 possible formats. <a href="https://wordpress.org/documentation/article/post-formats/#supported-formats">Learn more about each post format</a>.' ) . '</li>';
 	}
 
 	if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php
index f43c835168c1d..66a6bbfc25326 100644
--- a/src/wp-admin/edit-form-blocks.php
+++ b/src/wp-admin/edit-form-blocks.php
@@ -203,7 +203,7 @@ static function( $classes ) {
 		'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ),
 		'ajaxUrl'     => admin_url( 'admin-ajax.php' ),
 	),
-	'supportsLayout'       => WP_Theme_JSON_Resolver::theme_has_support(),
+	'supportsLayout'       => wp_theme_has_theme_json(),
 	'supportsTemplateMode' => current_theme_supports( 'block-templates' ),
 
 	// Whether or not to load the 'postcustom' meta box is stored as a user meta
@@ -319,7 +319,7 @@ static function( $classes ) {
 	<?php // JavaScript is disabled. ?>
 	<div class="wrap hide-if-js block-editor-no-js">
 		<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
-		<div class="notice notice-error notice-alt">
+		<div class="notice notice-error">
 			<p>
 				<?php
 					$message = sprintf(
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index 39bd35e76935f..134c8bb05de07 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -47,7 +47,12 @@
 <div class="inside">
 <h2 class="edit-comment-author"><?php _e( 'Author' ); ?></h2>
 <fieldset>
-<legend class="screen-reader-text"><?php _e( 'Comment Author' ); ?></legend>
+<legend class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Comment Author' );
+	?>
+</legend>
 <table class="form-table editcomment" role="presentation">
 <tbody>
 <tr>
@@ -73,8 +78,13 @@
 </div>
 
 <div id="postdiv" class="postarea">
+<label for="content" class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Comment' );
+	?>
+</label>
 <?php
-	echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
 	wp_editor(
 		$comment->comment_content,
@@ -117,7 +127,12 @@
 </span>
 
 <fieldset id="comment-status-radio">
-<legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
+<legend class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Comment status' );
+	?>
+</legend>
 <label><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
 <label><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
 <label><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
@@ -141,9 +156,19 @@
 printf( __( 'Submitted on: %s' ), '<b>' . $submitted . '</b>' );
 ?>
 </span>
-<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Edit date and time' );
+	?>
+</span></a>
 <fieldset id='timestampdiv' class='hide-if-js'>
-<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
+<legend class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Date and time' );
+	?>
+</legend>
 <?php
 /**
  * @global string $action
diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php
index d99eda00e49a5..d205a38f3131d 100644
--- a/src/wp-admin/edit-link-form.php
+++ b/src/wp-admin/edit-link-form.php
@@ -74,7 +74,7 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Links_Add_New_Screen">Documentation on Creating Links</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -121,7 +121,7 @@
 <div id="addressdiv" class="postbox">
 <h2 class="postbox-header"><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2>
 <div class="inside">
-	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" />
+	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_url( $link->link_url ); ?>" id="link_url" />
 	<p><?php _e( 'Example: <code>https://wordpress.org/</code> &#8212; do not forget the <code>https://</code>' ); ?></p>
 </div>
 </div>
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
index 9812d97c76446..159ffa68475d7 100644
--- a/src/wp-admin/edit-tags.php
+++ b/src/wp-admin/edit-tags.php
@@ -302,14 +302,14 @@
 	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
 	if ( 'category' === $taxonomy ) {
-		$help .= '<p>' . __( '<a href="https://wordpress.org/support/article/posts-categories-screen/">Documentation on Categories</a>' ) . '</p>';
+		$help .= '<p>' . __( '<a href="https://wordpress.org/documentation/article/posts-categories-screen/">Documentation on Categories</a>' ) . '</p>';
 	} elseif ( 'link_category' === $taxonomy ) {
 		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
 	} else {
-		$help .= '<p>' . __( '<a href="https://wordpress.org/support/article/posts-tags-screen/">Documentation on Tags</a>' ) . '</p>';
+		$help .= '<p>' . __( '<a href="https://wordpress.org/documentation/article/posts-tags-screen/">Documentation on Tags</a>' ) . '</p>';
 	}
 
-	$help .= '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>';
+	$help .= '<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>';
 
 	get_current_screen()->set_help_sidebar( $help );
 
diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php
index f56beabae81e3..b5ed3322ae401 100644
--- a/src/wp-admin/edit.php
+++ b/src/wp-admin/edit.php
@@ -81,7 +81,7 @@
 		$sendback = admin_url( $parent_file );
 	}
 	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos( $sendback, 'post.php' ) !== false ) {
+	if ( str_contains( $sendback, 'post.php' ) ) {
 		$sendback = admin_url( $post_new_file );
 	}
 
@@ -288,14 +288,18 @@
 			'title'   => __( 'Bulk actions' ),
 			'content' =>
 					'<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk actions menu and click Apply.' ) . '</p>' .
-							'<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
+					'<p>' . sprintf(
+						/* translators: %s: The dismiss dashicon used for buttons that dismiss or remove. */
+						__( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the %s<span class="screen-reader-text">remove</span> button next to its name in the Bulk Edit area that appears.' ),
+						'<span class="dashicons dashicons-dismiss" aria-hidden="true" style="font-size: 16px; width: 16px; vertical-align: middle;"></span>'
+					) . '</p>',
 		)
 	);
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/posts-screen/">Documentation on Managing Posts</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/posts-screen/">Documentation on Managing Posts</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 
 } elseif ( 'page' === $post_type ) {
@@ -319,8 +323,8 @@
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/pages-screen/">Documentation on Managing Pages</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/pages-screen/">Documentation on Managing Pages</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 
 }
@@ -442,8 +446,13 @@
 	}
 
 	if ( 'trashed' === $message && isset( $_REQUEST['ids'] ) ) {
-		$ids        = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
-		$messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", 'bulk-posts' ) ) . '">' . __( 'Undo' ) . '</a>';
+		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
+
+		$messages[] = sprintf(
+			'<a href="%1$s">%2$s</a>',
+			esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", 'bulk-posts' ) ),
+			__( 'Undo' )
+		);
 	}
 
 	if ( 'untrashed' === $message && isset( $_REQUEST['ids'] ) ) {
@@ -460,7 +469,10 @@
 }
 
 if ( $messages ) {
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . implode( ' ', $messages ) . '</p></div>';
+	printf(
+		'<div id="message" class="updated notice is-dismissible"><p>%s</p></div>',
+		implode( ' ', $messages )
+	);
 }
 unset( $messages );
 
@@ -474,7 +486,7 @@
 <?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
 
 <input type="hidden" name="post_status" class="post_status_page" value="<?php echo ! empty( $_REQUEST['post_status'] ) ? esc_attr( $_REQUEST['post_status'] ) : 'all'; ?>" />
-<input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
+<input type="hidden" name="post_type" class="post_type_page" value="<?php echo esc_attr( $post_type ); ?>" />
 
 <?php if ( ! empty( $_REQUEST['author'] ) ) { ?>
 <input type="hidden" name="author" value="<?php echo esc_attr( $_REQUEST['author'] ); ?>" />
diff --git a/src/wp-admin/erase-personal-data.php b/src/wp-admin/erase-personal-data.php
index 1fe3561f01fd2..0d2d96af45752 100644
--- a/src/wp-admin/erase-personal-data.php
+++ b/src/wp-admin/erase-personal-data.php
@@ -13,6 +13,9 @@
 	wp_die( __( 'Sorry, you are not allowed to erase personal data on this site.' ) );
 }
 
+// Used in the HTML title tag.
+$title = __( 'Erase Personal Data' );
+
 // Contextual help - choose Help on the top right of admin panel to preview this.
 get_current_screen()->add_help_tab(
 	array(
@@ -59,8 +62,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-erase-personal-data-screen/">Documentation on Erase Personal Data</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-erase-personal-data-screen/">Documentation on Erase Personal Data</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // Handle list table actions.
diff --git a/src/wp-admin/export-personal-data.php b/src/wp-admin/export-personal-data.php
index 1b1a3eb9eddff..2eedd90aa3062 100644
--- a/src/wp-admin/export-personal-data.php
+++ b/src/wp-admin/export-personal-data.php
@@ -13,6 +13,9 @@
 	wp_die( __( 'Sorry, you are not allowed to export personal data on this site.' ) );
 }
 
+// Used in the HTML title tag.
+$title = __( 'Export Personal Data' );
+
 // Contextual help - choose Help on the top right of admin panel to preview this.
 get_current_screen()->add_help_tab(
 	array(
@@ -59,8 +62,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-export-personal-data-screen/">Documentation on Export Personal Data</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-export-personal-data-screen/">Documentation on Export Personal Data</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // Handle list table actions.
diff --git a/src/wp-admin/export.php b/src/wp-admin/export.php
index 9a0bb0d4f68de..e073a24f2948a 100644
--- a/src/wp-admin/export.php
+++ b/src/wp-admin/export.php
@@ -56,8 +56,8 @@ function export_add_js() {
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-export-screen/">Documentation on Export</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-export-screen/">Documentation on Export</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // If the 'download' URL parameter is set, a WXR export file is baked and returned.
@@ -127,7 +127,7 @@ function export_add_js() {
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
 /**
- * Create the date options fields for exporting a given post type.
+ * Creates the date options fields for exporting a given post type.
  *
  * @global wpdb      $wpdb      WordPress database abstraction object.
  * @global WP_Locale $wp_locale WordPress date and time locale object.
@@ -141,12 +141,10 @@ function export_date_options( $post_type = 'post' ) {
 
 	$months = $wpdb->get_results(
 		$wpdb->prepare(
-			"
-		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-		FROM $wpdb->posts
-		WHERE post_type = %s AND post_status != 'auto-draft'
-		ORDER BY post_date DESC
-			",
+			"SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+			FROM $wpdb->posts
+			WHERE post_type = %s AND post_status != 'auto-draft'
+			ORDER BY post_date DESC",
 			$post_type
 		)
 	);
@@ -177,7 +175,12 @@ function export_date_options( $post_type = 'post' ) {
 <h2><?php _e( 'Choose what to export' ); ?></h2>
 <form method="get" id="export-filters">
 <fieldset>
-<legend class="screen-reader-text"><?php _e( 'Content to export' ); ?></legend>
+<legend class="screen-reader-text">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Content to export' );
+	?>
+</legend>
 <input type="hidden" name="download" value="true" />
 <p><label><input type="radio" name="content" value="all" checked="checked" aria-describedby="all-content-desc" /> <?php _e( 'All content' ); ?></label></p>
 <p class="description" id="all-content-desc"><?php _e( 'This will contain all of your posts, pages, comments, custom fields, terms, navigation menus, and custom posts.' ); ?></p>
@@ -207,7 +210,12 @@ function export_date_options( $post_type = 'post' ) {
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+		<legend class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Date range:' )
+			?>
+		</legend>
 		<label for="post-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
 		<select name="post_start_date" id="post-start-date">
 			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
@@ -254,7 +262,12 @@ function export_date_options( $post_type = 'post' ) {
 	</li>
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+		<legend class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Date range:' );
+			?>
+		</legend>
 		<label for="page-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
 		<select name="page_start_date" id="page-start-date">
 			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
@@ -294,7 +307,12 @@ function export_date_options( $post_type = 'post' ) {
 <ul id="attachment-filters" class="export-filters">
 	<li>
 		<fieldset>
-		<legend class="screen-reader-text"><?php _e( 'Date range:' ); ?></legend>
+		<legend class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Date range:' );
+			?>
+		</legend>
 		<label for="attachment-start-date" class="label-responsive"><?php _e( 'Start date:' ); ?></label>
 		<select name="attachment_start_date" id="attachment-start-date">
 			<option value="0"><?php _e( '&mdash; Select &mdash;' ); ?></option>
diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php
index 6638890550fc4..d3316cd3cf46d 100644
--- a/src/wp-admin/freedoms.php
+++ b/src/wp-admin/freedoms.php
@@ -34,15 +34,16 @@
 		<div class="about__header-text">
 			<?php _e( 'WordPress is free and open source software' ); ?>
 		</div>
-
-		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
-		</nav>
 	</div>
 
+	<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+		<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+		<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+		<a href="freedoms.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Freedoms' ); ?></a>
+		<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+		<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
+	</nav>
+
 	<div class="about__section is-feature">
 		<p class="about-description">
 		<?php
@@ -57,22 +58,22 @@
 
 	<div class="about__section has-2-columns">
 		<div class="column aligncenter">
-			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-1.svg?ver=6.1' ) ); ?>" alt="" />
+			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-1.svg?ver=6.3' ) ); ?>" alt="" />
 			<h2 class="is-smaller-heading"><?php _e( 'The 1st Freedom' ); ?></h2>
 			<p><?php _e( 'To run the program for any purpose.' ); ?></p>
 		</div>
 		<div class="column aligncenter">
-			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-2.svg?ver=6.1' ) ); ?>" alt="" />
+			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-2.svg?ver=6.3' ) ); ?>" alt="" />
 			<h2 class="is-smaller-heading"><?php _e( 'The 2nd Freedom' ); ?></h2>
 			<p><?php _e( 'To study how the program works and change it to make it do what you wish.' ); ?></p>
 		</div>
 		<div class="column aligncenter">
-			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-3.svg?ver=6.1' ) ); ?>" alt="" />
+			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-3.svg?ver=6.3' ) ); ?>" alt="" />
 			<h2 class="is-smaller-heading"><?php _e( 'The 3rd Freedom' ); ?></h2>
 			<p><?php _e( 'To redistribute.' ); ?></p>
 		</div>
 		<div class="column aligncenter">
-			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-4.svg?ver=6.1' ) ); ?>" alt="" />
+			<img class="freedom-image" src="<?php echo esc_url( admin_url( 'images/freedom-4.svg?ver=6.3' ) ); ?>" alt="" />
 			<h2 class="is-smaller-heading"><?php _e( 'The 4th Freedom' ); ?></h2>
 			<p><?php _e( 'To distribute copies of your modified versions to others.' ); ?></p>
 		</div>
diff --git a/src/wp-admin/images/about-header-about.svg b/src/wp-admin/images/about-header-about.svg
index ddc30916330c3..f8d0da54ee533 100644
--- a/src/wp-admin/images/about-header-about.svg
+++ b/src/wp-admin/images/about-header-about.svg
@@ -1 +1 @@
-<svg width="780" height="550" viewBox="0 0 780 550" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g opacity=".5" fill="#273FCC" stroke="#627EFF" stroke-width="2" stroke-miterlimit="10"><circle cx="434.757" cy="71.524" r="66.1" /><circle cx="432.587" cy="43.138" r="66.1" /><circle cx="426.277" cy="16.14" r="66.1" /><circle cx="416.143" cy="-9.165" r="66.1" /><circle cx="402.53" cy="-32.447" r="66.1" /><circle cx="385.755" cy="-53.376" r="66.1" /><circle cx="116.864" cy="-53.072" r="66.1" /><circle cx="99.984" cy="-32.183" r="66.1" /><circle cx="86.278" cy="-8.953" r="66.1" /><circle cx="76.078" cy="16.3" r="66.1" /><circle cx="69.714" cy="43.23" r="66.1" /><circle cx="67.518" cy="71.524" r="66.1" /><circle cx="67.518" cy="71.524" r="66.1" /><circle cx="67.518" cy="99.05" r="66.1" /><circle cx="67.518" cy="126.577" r="66.1" /><circle cx="67.518" cy="154.09" r="66.1" /><circle cx="67.518" cy="181.617" r="66.1" /><circle cx="67.518" cy="209.143" r="66.1" /><circle cx="67.518" cy="236.67" r="66.1" /><circle cx="67.518" cy="264.196" r="66.1" /><circle cx="67.518" cy="291.722" r="66.1" /><circle cx="67.518" cy="319.236" r="66.1" /><circle cx="67.518" cy="346.762" r="66.1" /><circle cx="67.518" cy="374.289" r="66.1" /><circle cx="67.518" cy="374.831" r="66.1" /><circle cx="68.471" cy="393.565" r="66.1" /><circle cx="71.249" cy="411.757" r="66.1" /><circle cx="75.76" cy="429.315" r="66.1" /><circle cx="81.925" cy="446.146" r="66.1" /><circle cx="89.651" cy="462.17" r="66.1" /><circle cx="411.579" cy="464.073" r="66.1" /><circle cx="423.208" cy="438.98" r="66.1" /><circle cx="430.986" cy="412.008" r="66.1" /><circle cx="434.558" cy="383.517" r="66.1" /><circle cx="433.831" cy="354.43" r="66.1" /><circle cx="428.777" cy="326.428" r="66.1" /><circle cx="419.635" cy="300.078" r="66.1" /><circle cx="406.763" cy="275.725" r="66.1" /><circle cx="390.491" cy="253.698" r="66.1" /><circle cx="371.189" cy="234.369" r="66.1" /><circle cx="349.188" cy="218.054" r="66.1" /><circle cx="324.846" cy="205.124" r="66.1" /><circle cx="298.506" cy="195.896" r="66.1" /><circle cx="270.512" cy="190.739" r="66.1" /><circle cx="241.368" cy="189.986" r="66.1" /><circle cx="213.003" cy="193.754" r="66.1" /><circle cx="186.147" cy="201.739" r="66.1" /><circle cx="161.157" cy="213.559" r="66.1" /><circle cx="138.389" cy="228.882" r="66.1" /><circle cx="118.174" cy="247.352" r="66.1" /><circle cx="100.857" cy="268.599" r="66.1" /><circle cx="86.794" cy="292.264" r="66.1" /><circle cx="76.316" cy="318.019" r="66.1" /><circle cx="69.781" cy="345.466" r="66.1" /><circle cx="67.518" cy="374.289" r="66.1" /><circle cx="712.577" cy="449.729" r="66.1" /><circle cx="712.577" cy="428.072" r="66.1" /><circle cx="712.577" cy="406.403" r="66.1" /><circle cx="712.577" cy="384.733" r="66.1" /><circle cx="712.577" cy="363.077" r="66.1" /><circle cx="712.577" cy="341.408" r="66.1" /><circle cx="712.577" cy="319.738" r="66.1" /><circle cx="712.577" cy="298.069" r="66.1" /><circle cx="712.577" cy="276.412" r="66.1" /><circle cx="712.577" cy="254.743" r="66.1" /><circle cx="712.577" cy="233.073" r="66.1" /><circle cx="712.577" cy="211.417" r="66.1" /><circle cx="712.577" cy="189.748" r="66.1" /><circle cx="712.577" cy="168.078" r="66.1" /><circle cx="712.577" cy="146.422" r="66.1" /><circle cx="712.577" cy="124.753" r="66.1" /><circle cx="712.577" cy="103.083" r="66.1" /><circle cx="712.577" cy="81.413" r="66.1" /><circle cx="712.577" cy="59.757" r="66.1" /><circle cx="712.577" cy="38.088" r="66.1" /><circle cx="712.577" cy="16.418" r="66.1" /><circle cx="712.577" cy="-5.238" r="66.1" /><circle cx="712.577" cy="-26.907" r="66.1" /><circle cx="712.577" cy="-48.577" r="66.1" /><circle cx="662.966" cy="-44.161" r="66.1" /><circle cx="646.429" cy="-21.024" r="66.1" /><circle cx="629.893" cy="2.113" r="66.1" /><circle cx="613.356" cy="25.25" r="66.1" /><circle cx="596.819" cy="48.387" r="66.1" /><circle cx="580.282" cy="71.524" r="66.1" /><circle cx="580.282" cy="465.515" r="66.1" /></g></svg>
+<svg width="1000" height="400" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_8299)"><path fill="#151515" d="M0 0h1000v400H0z"/><ellipse opacity=".2" cx="500" cy="463" rx="1497" ry="249" fill="url(#paint0_radial_1916_8299)"/><mask id="a" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="1000" height="400"><path fill="url(#paint1_radial_1916_8299)" d="M0 0h1000v400H0z"/></mask><g mask="url(#a)" stroke-width="2"><path d="M155 0v1635" stroke="url(#paint2_linear_1916_8299)"/><path d="M327.5 0v1635" stroke="url(#paint3_linear_1916_8299)"/><path d="M500 0v1635" stroke="url(#paint4_linear_1916_8299)"/><path d="M672.5 0v1635" stroke="url(#paint5_linear_1916_8299)"/><path d="M845 0v1635" stroke="url(#paint6_linear_1916_8299)"/></g></g><defs><radialGradient id="paint0_radial_1916_8299" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 249 -1497 0 500 463)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><radialGradient id="paint1_radial_1916_8299" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 493 -1232.5 0 500 162)"><stop offset=".161" stop-color="#151515" stop-opacity="0"/><stop offset=".833"/></radialGradient><linearGradient id="paint2_linear_1916_8299" x1="155.5" x2="155.5" y2="1635" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9" stop-opacity="0"/><stop offset=".297" stop-color="#3858E9"/><stop offset=".734" stop-color="#3858E9"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/></linearGradient><linearGradient id="paint3_linear_1916_8299" x1="328" x2="328" y2="1635" gradientUnits="userSpaceOnUse"><stop stop-color="#FFFCB5" stop-opacity="0"/><stop offset="0" stop-color="#FFFCB5" stop-opacity="0"/><stop offset=".297" stop-color="#FFFCB5"/><stop offset=".734" stop-color="#FFFCB5"/><stop offset="1" stop-color="#FFFCB5" stop-opacity="0"/></linearGradient><linearGradient id="paint4_linear_1916_8299" x1="500.5" x2="500.5" y2="1635" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB" stop-opacity="0"/><stop offset=".297" stop-color="#C7FFDB"/><stop offset=".693" stop-color="#C7FFDB"/><stop offset="1" stop-color="#C7FFDB" stop-opacity="0"/></linearGradient><linearGradient id="paint5_linear_1916_8299" x1="673" x2="673" y2="1635" gradientUnits="userSpaceOnUse"><stop stop-color="#FFB7A7" stop-opacity="0"/><stop offset=".297" stop-color="#FFB7A7"/><stop offset=".734" stop-color="#FFB7A7"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#FFB7A7" stop-opacity="0"/></linearGradient><linearGradient id="paint6_linear_1916_8299" x1="845.5" x2="845.5" y2="1635" gradientUnits="userSpaceOnUse"><stop stop-color="#7B90FF" stop-opacity="0"/><stop offset=".297" stop-color="#7B90FF"/><stop offset=".734" stop-color="#7B90FF"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#7B90FF" stop-opacity="0"/></linearGradient><clipPath id="clip0_1916_8299"><path fill="#fff" d="M0 0h1000v400H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/about-header-contribute.svg b/src/wp-admin/images/about-header-contribute.svg
new file mode 100644
index 0000000000000..1dfe7599517f8
--- /dev/null
+++ b/src/wp-admin/images/about-header-contribute.svg
@@ -0,0 +1 @@
+<svg width="1000" height="400" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_3974_29104)"><path fill="#151515" d="M0 0h1000v400H0z"/><ellipse opacity=".2" cx="500" cy="463" rx="1497" ry="249" fill="url(#paint0_radial_3974_29104)"/><g opacity=".3" stroke-width="2"><circle cx="100" cy="100" r="101" transform="matrix(-1 0 0 1 1100 55)" stroke="url(#paint1_linear_3974_29104)"/><circle cx="100" cy="100" r="101" transform="matrix(0 1 1 0 650 10)" stroke="url(#paint2_linear_3974_29104)"/><circle cx="100" cy="100" r="101" transform="matrix(0 1 1 0 150 190)" stroke="url(#paint3_linear_3974_29104)"/><circle opacity=".7" cx="100" cy="100" r="101" transform="matrix(0 1 1 0 400 100)" stroke="url(#paint4_linear_3974_29104)"/><circle cx="100" cy="100" r="101" transform="matrix(-1 0 0 1 100 145)" stroke="url(#paint5_linear_3974_29104)"/></g></g><defs><radialGradient id="paint0_radial_3974_29104" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 249 -1497 0 500 463)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><linearGradient id="paint1_linear_3974_29104" x1="190" y1="215" x2="76" y2="47" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9"/><stop offset=".516" stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint2_linear_3974_29104" x1="-19" y1="173" x2="100" y2="200" gradientUnits="userSpaceOnUse"><stop stop-color="#FFFCB5"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint3_linear_3974_29104" x1="14" y1="160" x2="175" y2="24" gradientUnits="userSpaceOnUse"><stop stop-color="#151515" stop-opacity="0"/><stop offset=".776" stop-color="#FFB7A7"/><stop offset="1" stop-color="#FFB7A7"/></linearGradient><linearGradient id="paint4_linear_3974_29104" x1="100" x2="100" y2="200" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB"/><stop offset=".563" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint5_linear_3974_29104" x1="100" x2="100" y2="200" gradientUnits="userSpaceOnUse"><stop stop-color="#7B90FF"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><clipPath id="clip0_3974_29104"><path fill="#fff" d="M0 0h1000v400H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/about-header-credits.svg b/src/wp-admin/images/about-header-credits.svg
index c954e3bac885a..f7979160d388c 100644
--- a/src/wp-admin/images/about-header-credits.svg
+++ b/src/wp-admin/images/about-header-credits.svg
@@ -1 +1 @@
-<svg width="863" height="550" fill="none" xmlns="http://www.w3.org/2000/svg"><g opacity=".5" clip-path="url(#clip0_1462_1686)" fill="#273FCC" stroke="#627EFF" stroke-width="2" stroke-miterlimit="10"><path d="M657.063-125.225c-30.085-19.747-70.482-11.366-90.229 18.719s-11.366 70.481 18.719 90.228C615.637 3.47 656.034-4.91 675.781-34.996s11.367-70.482-18.718-90.229z"/><path d="M676.828-109.389c-28.344-21.297-68.587-15.584-89.884 12.76-21.298 28.345-15.585 68.588 12.76 89.885 28.345 21.297 68.587 15.584 89.885-12.76 21.297-28.345 15.584-68.588-12.761-89.885z"/><path d="M695.788-92.49c-26.61-22.847-66.703-19.797-89.55 6.813-22.848 26.61-19.798 66.703 6.812 89.55 26.609 22.848 66.702 19.798 89.55-6.812s19.798-66.702-6.812-89.55z"/><path d="M624.72-73.595l-.009.01c-24.395 24.867-24.012 64.802.856 89.196l.009.01c24.868 24.394 64.802 24.01 89.197-.857l.009-.01c24.395-24.867 24.011-64.801-.856-89.196l-.01-.01c-24.867-24.394-64.802-24.01-89.196.857z"/><path d="M731.127-55.386c-23.132-25.945-62.917-28.225-88.862-5.092-25.945 23.132-28.225 62.916-5.092 88.861 23.132 25.945 62.916 28.225 88.861 5.093 25.945-23.133 28.225-62.917 5.093-88.862z"/><path d="M658.85-46.31l-.01.008c-27.491 21.393-32.435 61.023-11.041 88.515l.008.01c21.394 27.491 61.024 32.434 88.515 11.04l.011-.007c27.491-21.394 32.434-61.024 11.04-88.515l-.008-.01c-21.394-27.492-61.023-32.435-88.515-11.041z"/><path d="M762.616-14.067c-19.658-29.046-59.14-36.656-88.185-16.998-29.046 19.658-36.656 59.14-16.998 88.186 19.658 29.045 59.14 36.655 88.185 16.997 29.046-19.657 36.656-59.14 16.998-88.185z"/><path d="M776.748 8.226c-17.914-30.596-57.239-40.876-87.834-22.961-30.595 17.914-40.875 57.239-22.961 87.834 17.914 30.595 57.239 40.875 87.834 22.96 30.596-17.913 40.876-57.238 22.961-87.833z"/><path d="M789.707 31.304C773.527-.84 734.352-13.781 702.208 2.4c-32.144 16.18-45.085 55.355-28.904 87.5 16.181 32.143 55.356 45.084 87.499 28.903 32.144-16.181 45.085-55.355 28.904-87.5zM277.424 417.171c-30.085-19.747-70.481-11.366-90.228 18.719-19.747 30.084-11.367 70.481 18.718 90.228s70.481 11.367 90.228-18.718 11.367-70.482-18.718-90.229z"/><path d="M263.288 407.699c-28.344-21.298-68.587-15.585-89.884 12.76-21.298 28.345-15.585 68.587 12.76 89.885 28.345 21.297 68.587 15.584 89.885-12.761 21.297-28.344 15.584-68.587-12.761-89.884z"/><path d="M249.955 397.04c-26.61-22.848-66.703-19.798-89.55 6.812-22.848 26.609-19.798 66.702 6.812 89.55 26.609 22.848 66.702 19.798 89.55-6.812 22.847-26.61 19.798-66.703-6.812-89.55z"/><path d="M148.245 386.192l-.009.009c-24.395 24.867-24.012 64.802.856 89.197l.009.009c24.868 24.394 64.803 24.011 89.197-.856l.009-.01c24.395-24.867 24.011-64.802-.856-89.197l-.009-.009c-24.868-24.394-64.803-24.011-89.197.857z"/><path d="M225.844 372.537c-23.132-25.945-62.917-28.225-88.861-5.093-25.945 23.132-28.225 62.917-5.093 88.862 23.132 25.945 62.917 28.225 88.862 5.092 25.944-23.132 28.224-62.916 5.092-88.861z"/><path d="M126.7 347.625l-.01.008c-27.492 21.394-32.435 61.023-11.041 88.515l.008.01c21.394 27.492 61.023 32.435 88.515 11.041l.01-.008c27.492-21.394 32.435-61.023 11.041-88.515l-.008-.01c-21.394-27.492-61.024-32.435-88.515-11.041z"/><path d="M205.607 343.828c-19.658-29.046-59.141-36.656-88.186-16.998-29.046 19.658-36.656 59.14-16.998 88.186 19.658 29.046 59.14 36.656 88.186 16.998 29.045-19.658 36.656-59.14 16.998-88.186z"/><path d="M197.033 328.007c-17.915-30.595-57.239-40.875-87.835-22.961-30.595 17.915-40.875 57.239-22.96 87.835 17.914 30.595 57.238 40.875 87.834 22.961 30.595-17.915 40.875-57.239 22.961-87.835z"/><path d="M189.738 311.097c-16.181-32.144-55.356-45.085-87.499-28.904-32.144 16.181-45.085 55.355-28.904 87.499 16.18 32.144 55.355 45.085 87.499 28.904s45.085-55.356 28.904-87.499zM826.354 232.951c2.059-35.928-25.397-66.722-61.324-68.781-35.928-2.059-66.722 25.397-68.781 61.325-2.059 35.927 25.397 66.722 61.324 68.781 35.928 2.059 66.722-25.397 68.781-61.325z"/><path d="M766.532 186.522c-35.196-4.272-67.191 20.797-71.463 55.993-4.271 35.196 20.798 67.19 55.994 71.462 35.195 4.272 67.19-20.797 71.462-55.993 4.271-35.196-20.798-67.191-55.993-71.462z"/><path d="M766.674 208.705c-34.469-6.482-67.665 16.206-74.147 50.674-6.482 34.469 16.206 67.665 50.674 74.147 34.469 6.482 67.666-16.206 74.147-50.674 6.482-34.469-16.206-67.665-50.674-74.147z"/><path d="M688.641 276.1l-.004.013c-8.692 33.733 11.607 68.126 45.34 76.818l.013.004c33.733 8.692 68.126-11.607 76.818-45.34l.004-.013c8.692-33.733-11.607-68.126-45.34-76.819l-.013-.003c-33.733-8.692-68.126 11.607-76.818 45.34z"/><path d="M762.843 252.507c-33.006-10.903-68.6 7.015-79.503 40.02-10.902 33.006 7.015 68.6 40.021 79.503 33.005 10.903 68.6-7.015 79.502-40.02 10.903-33.006-7.015-68.6-40.02-79.503z"/><path d="M676.642 308.64l-.005.012c-13.112 32.273 2.422 69.065 34.696 82.176l.012.005c32.273 13.112 69.065-2.422 82.176-34.696l.005-.012c13.112-32.273-2.422-69.065-34.696-82.176l-.012-.005c-32.273-13.112-69.065 2.422-82.176 34.696z"/><path d="M753.439 295.05c-31.547-15.326-69.545-2.175-84.87 29.372-15.325 31.547-2.175 69.545 29.372 84.87 31.547 15.325 69.545 2.175 84.87-29.372 15.326-31.547 2.175-69.545-29.372-84.87z"/><path d="M746.666 315.824c-30.812-17.539-70.008-6.78-87.547 24.032s-6.78 70.008 24.032 87.548c30.812 17.539 70.008 6.779 87.547-24.033 17.54-30.812 6.78-70.008-24.032-87.547z"/><path d="M738.374 335.843c-30.085-19.747-70.482-11.367-90.229 18.718s-11.367 70.482 18.718 90.229 70.482 11.366 90.229-18.719c19.747-30.084 11.366-70.481-18.718-90.228zM166.79 175.376c2.059-35.928-25.397-66.722-61.325-68.781-35.928-2.059-66.722 25.397-68.781 61.324-2.06 35.928 25.397 66.722 61.325 68.781 35.927 2.059 66.722-25.397 68.781-61.324z"/><path d="M111.95 86.936c-35.196-4.272-67.191 20.797-71.463 55.993-4.271 35.196 20.798 67.19 55.994 71.462 35.195 4.272 67.19-20.797 71.462-55.993 4.271-35.196-20.798-67.19-55.993-71.462z"/><path d="M119.799 67.371c-34.468-6.481-67.665 16.206-74.147 50.675-6.481 34.468 16.206 67.665 50.675 74.147 34.468 6.481 67.665-16.206 74.147-50.675 6.482-34.468-16.206-67.665-50.675-74.147z"/><path d="M52.196 93.349l-.003.012C43.5 127.094 63.8 161.487 97.533 170.18l.012.003c33.733 8.692 68.126-11.607 76.819-45.34l.003-.013c8.693-33.733-11.607-68.126-45.34-76.818l-.013-.004c-33.733-8.692-68.126 11.607-76.818 45.34z"/><path d="M139.616 28.862c-33.005-10.902-68.6 7.015-79.502 40.02-10.903 33.006 7.015 68.601 40.02 79.504 33.006 10.902 68.6-7.016 79.503-40.021 10.903-33.005-7.015-68.6-40.021-79.503z"/><path d="M69.427 44.729l-.005.012c-13.112 32.274 2.422 69.065 34.696 82.177l.012.005c32.273 13.111 69.065-2.423 82.176-34.696l.005-.012c13.112-32.274-2.422-69.066-34.696-82.177l-.012-.005C119.33-3.078 82.538 12.456 69.427 44.73z"/><path d="M165.015-8.394C133.467-23.72 95.47-10.57 80.145 20.978c-15.326 31.547-2.175 69.545 29.372 84.87 31.547 15.326 69.545 2.175 84.87-29.372 15.325-31.547 2.175-69.545-29.372-84.87z"/><path d="M179.832-26.328c-30.812-17.539-70.009-6.78-87.548 24.032s-6.78 70.009 24.033 87.548c30.812 17.539 70.008 6.78 87.547-24.033 17.539-30.812 6.779-70.008-24.032-87.547z"/><path d="M196.078-43.852c-30.085-19.747-70.482-11.366-90.229 18.719s-11.366 70.481 18.718 90.228c30.085 19.747 70.482 11.367 90.229-18.718s11.366-70.482-18.718-90.229z"/></g><defs><clipPath id="clip0_1462_1686"><path fill="#fff" transform="rotate(5 2670.568 688.345)" d="M0 0h795v794.948H0z"/></clipPath></defs></svg>
+<svg width="1000" height="400" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_7547)"><path fill="#151515" d="M0 0h1000v400H0z"/><g opacity=".3" stroke-width="2"><circle cy="155" r="101" stroke="url(#paint0_linear_1916_7547)"/><circle cx="250" cy="110" r="101" transform="rotate(90 250 110)" stroke="url(#paint1_linear_1916_7547)"/><circle cx="750" cy="290" r="101" transform="rotate(90 750 290)" stroke="url(#paint2_linear_1916_7547)"/><circle opacity=".7" cx="500" cy="200" r="101" transform="rotate(90 500 200)" stroke="url(#paint3_linear_1916_7547)"/><circle cx="1000" cy="245" r="101" stroke="url(#paint4_linear_1916_7547)"/></g><ellipse opacity=".2" cx="500" cy="463" rx="1497" ry="249" fill="url(#paint5_radial_1916_7547)"/></g><defs><linearGradient id="paint0_linear_1916_7547" x1="90" y1="270" x2="-24" y2="102" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9"/><stop offset=".516" stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint1_linear_1916_7547" x1="131" y1="183" x2="250" y2="210" gradientUnits="userSpaceOnUse"><stop stop-color="#FFFCB5"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint2_linear_1916_7547" x1="664" y1="350" x2="825" y2="214" gradientUnits="userSpaceOnUse"><stop stop-color="#151515" stop-opacity="0"/><stop offset=".776" stop-color="#FFB7A7"/><stop offset="1" stop-color="#FFB7A7"/></linearGradient><linearGradient id="paint3_linear_1916_7547" x1="500" y1="100" x2="500" y2="300" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB"/><stop offset=".563" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint4_linear_1916_7547" x1="1000" y1="145" x2="1000" y2="345" gradientUnits="userSpaceOnUse"><stop stop-color="#7B90FF"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><radialGradient id="paint5_radial_1916_7547" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 249 -1497 0 500 463)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><clipPath id="clip0_1916_7547"><path fill="#fff" d="M0 0h1000v400H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/about-header-freedoms.svg b/src/wp-admin/images/about-header-freedoms.svg
index 85ddf75cfd813..b574317d25d8f 100644
--- a/src/wp-admin/images/about-header-freedoms.svg
+++ b/src/wp-admin/images/about-header-freedoms.svg
@@ -1 +1 @@
-<svg width="782" height="510" fill="none" xmlns="http://www.w3.org/2000/svg"><g opacity=".5" fill="#273FCC" stroke="#627EFF" stroke-width="2" stroke-miterlimit="10"><path d="M131 436.052c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M131 404.609c0-35.898-29.102-64.999-65-64.999-35.899 0-65 29.101-65 64.999 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M131 373.155c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 341.713c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 310.271c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M131 278.815c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 247.373c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 215.931c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 184.475c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M131 153.033c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 121.59c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 90.122c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 58.68c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131 27.225c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M131-4.217c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M131-35.66c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65zM347.667 436.052c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M347.667 404.609c0-35.898-29.102-64.999-65-64.999-35.899 0-65 29.101-65 64.999 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M347.667 373.155c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 341.713c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 310.271c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M347.667 278.815c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 247.373c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 215.931c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 184.475c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M347.667 153.033c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 121.59c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 90.122c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 58.68c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667 27.225c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M347.667-4.217c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M347.667-35.66c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65zM564.333 436.052c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 64.999 65 64.999 35.899 0 65-29.101 65-64.999z"/><path d="M564.333 404.609c0-35.898-29.101-64.999-65-64.999-35.898 0-65 29.101-65 64.999 0 35.899 29.102 65 65 65 35.899 0 65-29.101 65-65z"/><path d="M564.333 373.155c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 341.713c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 310.271c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 64.999 65 64.999 35.899 0 65-29.101 65-64.999z"/><path d="M564.333 278.815c0-35.898-29.101-65-65-65-35.898 0-65 29.102-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 247.373c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 215.931c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 184.475c0-35.898-29.101-65-65-65-35.898 0-65 29.102-65 65 0 35.899 29.102 65 65 65 35.899 0 65-29.101 65-65z"/><path d="M564.333 153.033c0-35.898-29.101-65-65-65-35.898 0-65 29.102-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 121.59c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 90.122c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 58.68c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333 27.225c0-35.898-29.101-65-65-65-35.898 0-65 29.102-65 65 0 35.899 29.102 65 65 65 35.899 0 65-29.101 65-65z"/><path d="M564.333-4.217c0-35.898-29.101-65-65-65-35.898 0-65 29.102-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65z"/><path d="M564.333-35.66c0-35.899-29.101-65-65-65-35.898 0-65 29.101-65 65 0 35.898 29.102 65 65 65 35.899 0 65-29.102 65-65zM781 436.052c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M781 404.609c0-35.898-29.102-64.999-65-64.999-35.899 0-65 29.101-65 64.999 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M781 373.155c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 341.713c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 310.271c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 64.999 65 64.999 35.898 0 65-29.101 65-64.999z"/><path d="M781 278.815c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 247.373c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 215.931c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 184.475c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M781 153.033c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 121.59c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 90.122c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 58.68c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781 27.225c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.899 29.101 65 65 65 35.898 0 65-29.101 65-65z"/><path d="M781-4.217c0-35.898-29.102-65-65-65-35.899 0-65 29.102-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/><path d="M781-35.66c0-35.899-29.102-65-65-65-35.899 0-65 29.101-65 65 0 35.898 29.101 65 65 65 35.898 0 65-29.102 65-65z"/></g></svg>
+<svg width="1000" height="400" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_6764)"><path fill="#151515" d="M0 0h1000v400H0z"/><ellipse opacity=".2" cx="500" cy="463" rx="1497" ry="249" fill="url(#paint0_radial_1916_6764)"/><path opacity=".4" d="M301 449h1v-95.447c0-4.441 0-7.834-.221-10.543-.223-2.73-.676-4.852-1.632-6.728a16.998 16.998 0 0 0-7.429-7.429c-1.876-.956-3.998-1.409-6.728-1.632-2.709-.221-6.102-.221-10.543-.221H160.154c-3.321 0-5.875 0-7.917.167-2.063.168-3.691.512-5.139 1.25a12.997 12.997 0 0 0-5.681 5.681c-.738 1.448-1.082 3.076-1.25 5.139-.167 2.042-.167 4.596-.167 7.917V449h161z" stroke="url(#paint1_linear_1916_6764)" stroke-width="2"/><path opacity=".4" d="M493 449h1v-95.447c0-4.441 0-7.834-.221-10.543-.223-2.73-.676-4.852-1.632-6.728a16.998 16.998 0 0 0-7.429-7.429c-1.876-.956-3.998-1.409-6.728-1.632-2.709-.221-6.102-.221-10.543-.221H352.154c-3.321 0-5.875 0-7.917.167-2.063.168-3.691.512-5.139 1.25a12.997 12.997 0 0 0-5.681 5.681c-.738 1.448-1.082 3.076-1.25 5.139-.167 2.042-.167 4.596-.167 7.917V449h161z" stroke="url(#paint2_linear_1916_6764)" stroke-width="2"/><path opacity=".4" d="M685 449h1v-95.447c0-4.441 0-7.834-.221-10.543-.223-2.73-.676-4.852-1.632-6.728a16.998 16.998 0 0 0-7.429-7.429c-1.876-.956-3.998-1.409-6.728-1.632-2.709-.221-6.102-.221-10.543-.221H544.154c-3.321 0-5.875 0-7.917.167-2.063.168-3.691.512-5.139 1.25a12.997 12.997 0 0 0-5.681 5.681c-.738 1.448-1.082 3.076-1.25 5.139-.167 2.042-.167 4.596-.167 7.917V449h161z" stroke="url(#paint3_linear_1916_6764)" stroke-width="2"/><path opacity=".4" d="M877 449h1v-95.447c0-4.441 0-7.834-.221-10.543-.223-2.73-.676-4.852-1.632-6.728a16.998 16.998 0 0 0-7.429-7.429c-1.876-.956-3.998-1.409-6.728-1.632-2.709-.221-6.102-.221-10.543-.221H736.154c-3.321 0-5.875 0-7.917.167-2.063.168-3.691.512-5.139 1.25a12.997 12.997 0 0 0-5.681 5.681c-.738 1.448-1.082 3.076-1.25 5.139-.167 2.042-.167 4.596-.167 7.917V449h161z" stroke="url(#paint4_linear_1916_6764)" stroke-width="2"/></g><defs><radialGradient id="paint0_radial_1916_6764" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 249 -1497 0 500 463)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><linearGradient id="paint1_linear_1916_6764" x1="221" y1="328" x2="221" y2="448" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint2_linear_1916_6764" x1="413" y1="328" x2="413" y2="448" gradientUnits="userSpaceOnUse"><stop stop-color="#FFFCB5"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint3_linear_1916_6764" x1="605" y1="328" x2="605" y2="448" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint4_linear_1916_6764" x1="797" y1="328" x2="797" y2="448" gradientUnits="userSpaceOnUse"><stop stop-color="#FFB7A7"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><clipPath id="clip0_1916_6764"><path fill="#fff" d="M0 0h1000v400H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/about-header-privacy.svg b/src/wp-admin/images/about-header-privacy.svg
index 3a11bfd343695..7b652e3bc7c31 100644
--- a/src/wp-admin/images/about-header-privacy.svg
+++ b/src/wp-admin/images/about-header-privacy.svg
@@ -1 +1 @@
-<svg width="1005" height="500" viewBox="0 -50 1005 550" fill="none" xmlns="http://www.w3.org/2000/svg"><g opacity=".5" clip-path="url(#clip0_1462_333)" fill="#273FCC" stroke="#627EFF" stroke-width="2" stroke-miterlimit="10"><path d="M580.347 367.235c-33.922-11.205-70.505 7.21-81.711 41.132-11.205 33.922 7.21 70.505 41.132 81.71 33.922 11.206 70.505-7.21 81.71-41.132 11.206-33.921-7.209-70.504-41.131-81.71z"/><path d="M568.518 341.834c-33.922-11.206-70.505 7.209-81.711 41.131-11.205 33.922 7.21 70.505 41.132 81.711 33.922 11.205 70.505-7.21 81.71-41.132 11.206-33.922-7.21-70.505-41.131-81.71z"/><path d="M556.665 316.433c-33.922-11.205-70.505 7.21-81.71 41.132-11.206 33.922 7.209 70.505 41.131 81.71 33.922 11.206 70.505-7.21 81.711-41.131 11.205-33.922-7.21-70.505-41.132-81.711z"/><path d="M544.806 291.021c-33.921-11.205-70.504 7.21-81.71 41.132-11.205 33.922 7.21 70.505 41.132 81.71 33.922 11.206 70.505-7.209 81.71-41.131 11.206-33.922-7.21-70.505-41.132-81.711z"/><path d="M532.966 265.625c-33.922-11.205-70.505 7.21-81.71 41.132-11.206 33.922 7.209 70.505 41.131 81.71 33.922 11.206 70.505-7.21 81.711-41.132 11.205-33.921-7.21-70.504-41.132-81.71z"/><path d="M521.125 240.22c-33.922-11.206-70.505 7.209-81.711 41.131-11.205 33.922 7.21 70.505 41.132 81.71 33.922 11.206 70.505-7.209 81.71-41.131 11.206-33.922-7.21-70.505-41.131-81.71z"/><path d="M509.272 214.819c-33.922-11.205-70.505 7.21-81.711 41.132-11.205 33.922 7.21 70.505 41.132 81.71 33.922 11.206 70.505-7.21 81.71-41.131 11.206-33.922-7.209-70.505-41.131-81.711zM709.467 173.444c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.584-31.287 85.962 15.097 32.378 53.584 46.385 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M731.428 163.203c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M753.401 152.957c-15.098-32.378-53.585-46.385-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.385-53.584 31.288-85.962z"/><path d="M775.715 142.894c-15.097-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M799.654 139.896c-15.097-32.378-53.584-46.385-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M822.252 146.602c-15.098-32.377-53.584-46.385-85.962-31.287-32.377 15.097-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.963 31.287 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M840.516 161.924c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M852.266 183.509c-15.098-32.377-53.584-46.385-85.962-31.287-32.378 15.097-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M862.507 205.47c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M872.747 227.431c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M882.993 249.403c-15.098-32.377-53.584-46.385-85.962-31.287-32.378 15.098-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.097 46.386-53.584 31.288-85.962z"/><path d="M893.234 271.364c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.378-15.098 46.385-53.584 31.288-85.962z"/><path d="M903.48 293.337c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M913.72 315.298c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.097 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M923.966 337.27c-15.098-32.377-53.584-46.385-85.962-31.287-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M934.207 359.231c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.097-46.386 53.584-31.288 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M944.447 381.192c-15.098-32.378-53.584-46.385-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.097 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M954.139 403.751c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M955.736 427.687c-15.097-32.378-53.584-46.385-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M947.775 449.857c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962zM302.013 442.238c-15.098-32.378-53.584-46.386-85.962-31.288-32.378 15.098-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M292.638 419.531c-15.098-32.378-53.584-46.386-85.962-31.288-32.378 15.098-46.385 53.584-31.288 85.962 15.098 32.378 53.585 46.385 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M291.856 395.629c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M300.528 373.727c-15.098-32.377-53.584-46.385-85.962-31.287-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M317.59 356.778c-15.097-32.378-53.584-46.385-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M339.58 345.925c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M361.552 335.679c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M383.513 325.438c-15.098-32.377-53.584-46.385-85.962-31.287-32.378 15.098-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962zM709.303 173.52c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.097-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M696.312 145.662c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.378 53.584 46.385 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M683.316 117.791c-15.098-32.377-53.584-46.385-85.962-31.287-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M670.326 89.933c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.385-53.585 31.288-85.962z"/><path d="M657.138 61.866C642.04 29.49 603.554 15.481 571.176 30.58c-32.378 15.098-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M640.504 34.98C625.406 2.6 586.919-11.407 554.542 3.69c-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.385-53.584 31.288-85.962z"/><path d="M619.971 12.008c-15.098-32.378-53.584-46.386-85.962-31.288-32.378 15.098-46.385 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M596.188-6.822c-15.098-32.377-53.584-46.385-85.962-31.287-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.963z"/><path d="M569.809-21.27c-15.098-32.379-53.585-46.386-85.962-31.289-32.378 15.098-46.386 53.585-31.288 85.963 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M541.451-31.115c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M511.752-36.123C496.654-68.5 458.168-82.508 425.79-67.41c-32.377 15.097-46.385 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M481.353-36.05c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M450.895-30.684C435.797-63.06 397.311-77.07 364.933-61.97c-32.377 15.097-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M421.022-19.78c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M393.528-3.833c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M369.902 16.12c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.584 31.288-85.962z"/><path d="M350.385 39.41C335.288 7.031 296.801-6.977 264.423 8.121c-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.098 46.385-53.584 31.287-85.962z"/><path d="M335.205 65.416c-15.098-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M324.605 93.498C309.507 61.12 271.02 47.112 238.643 62.21c-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M318.803 123.025c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M318.027 153.349c-15.098-32.377-53.585-46.385-85.962-31.287-32.378 15.097-46.386 53.584-31.288 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.098 46.385-53.584 31.288-85.962z"/><path d="M322.518 183.829c-15.097-32.378-53.584-46.386-85.962-31.288-32.377 15.098-46.385 53.585-31.287 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.287-85.962z"/><path d="M332.51 213.857c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.378-15.098 46.386-53.585 31.288-85.962z"/><path d="M344.841 241.709c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.585-31.288 85.962 15.098 32.378 53.585 46.386 85.962 31.288 32.378-15.098 46.386-53.584 31.288-85.962z"/><path d="M357.831 269.567c-15.097-32.377-53.584-46.385-85.962-31.287-32.377 15.098-46.385 53.584-31.287 85.962 15.098 32.377 53.584 46.385 85.962 31.287 32.377-15.097 46.385-53.584 31.287-85.962z"/><path d="M370.828 297.438c-15.098-32.378-53.585-46.386-85.962-31.288-32.378 15.098-46.386 53.584-31.288 85.962 15.098 32.378 53.584 46.386 85.962 31.288 32.377-15.098 46.385-53.585 31.288-85.962z"/><path d="M383.818 325.296c-15.098-32.377-53.584-46.385-85.962-31.287-32.378 15.097-46.386 53.584-31.288 85.962 15.098 32.377 53.585 46.385 85.962 31.287 32.378-15.098 46.386-53.584 31.288-85.962z"/></g><defs><clipPath id="clip0_1462_333"><path fill="#fff" transform="rotate(-25 233.984 51.873)" d="M0 0h740v789.924H0z"/></clipPath></defs></svg>
+<svg width="1000" height="400" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_7203)"><path fill="#151515" d="M0 0h1000v400H0z"/><ellipse opacity=".2" cx="500" cy="463" rx="1497" ry="249" fill="url(#paint0_radial_1916_7203)"/><path opacity=".4" d="M1138 449h1v-85.046c0-11.162 0-19.596-.55-26.307-.55-6.732-1.66-11.818-3.92-16.261a40.976 40.976 0 0 0-17.92-17.917c-4.44-2.264-9.52-3.371-16.26-3.921-6.71-.548-15.14-.548-26.3-.548H801.953c-11.161 0-19.596 0-26.306.548-6.732.55-11.818 1.657-16.261 3.921a41.006 41.006 0 0 0-17.917 17.917c-2.264 4.443-3.371 9.529-3.921 16.261-.548 6.71-.548 15.145-.548 26.306V449h401z" stroke="url(#paint1_linear_1916_7203)" stroke-width="2"/><path opacity=".4" d="M1058 291a119.98 119.98 0 0 0-35.15-84.853A119.987 119.987 0 0 0 938 171a120.003 120.003 0 0 0-120 120" stroke="url(#paint2_linear_1916_7203)" stroke-width="3"/></g><defs><radialGradient id="paint0_radial_1916_7203" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 249 -1497 0 500 463)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><linearGradient id="paint1_linear_1916_7203" x1="938" y1="300" x2="938" y2="448" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></linearGradient><linearGradient id="paint2_linear_1916_7203" x1="938" y1="171" x2="938" y2="291" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9"/><stop offset=".563" stop-color="#3858E9" stop-opacity="0"/></linearGradient><clipPath id="clip0_1916_7203"><path fill="#fff" d="M0 0h1000v400H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/about-release-badge.svg b/src/wp-admin/images/about-release-badge.svg
new file mode 100644
index 0000000000000..626d87ddec4e9
--- /dev/null
+++ b/src/wp-admin/images/about-release-badge.svg
@@ -0,0 +1 @@
+<svg width="280" height="280" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_2238_13933)"><rect width="280" height="280" rx="5" fill="#151515"/><ellipse opacity=".2" cx="140" cy="323" rx="928" ry="154" fill="url(#paint0_radial_2238_13933)"/><g clip-path="url(#clip1_2238_13933)" stroke-width="1.5"><path d="M53 135v1635" stroke="url(#paint1_linear_2238_13933)"/><path d="M111 135v1635" stroke="url(#paint2_linear_2238_13933)"/><path d="M169 135v1635" stroke="url(#paint3_linear_2238_13933)"/><path d="M227 135v1635" stroke="url(#paint4_linear_2238_13933)"/></g><path d="M99.984 177.221c-15.576 0-28.466-10.889-28.466-35.596v-.098c0-23.291 10.79-37.207 28.759-37.207 13.037 0 22.754 7.52 25 18.164l.098.537h-12.5l-.195-.439c-1.856-4.834-6.201-7.959-12.5-7.959-11.328 0-16.065 10.84-16.553 24.17-.049.732-.049 1.465-.049 2.246h.244c2.784-6.445 9.815-11.328 19.385-11.328 13.574 0 23.096 9.766 23.096 22.998v.098c0 14.209-11.133 24.414-26.319 24.414zm-14.257-24.219c0 7.812 6.2 13.916 14.062 13.916 7.861 0 14.111-6.055 14.111-13.672v-.098c0-8.007-5.908-13.72-13.965-13.72-8.056 0-14.208 5.664-14.208 13.525v.049zm54.494 23.779c-3.955 0-7.08-3.125-7.08-7.08 0-3.906 3.125-7.031 7.08-7.031s7.031 3.125 7.031 7.031c0 3.955-3.076 7.08-7.031 7.08zm39.357.44c-15.478 0-25.537-8.301-26.514-20.117l-.048-.586h12.06l.049.537c.684 5.713 6.152 9.863 14.404 9.863 8.155 0 13.575-4.492 13.575-10.889v-.097c0-7.422-5.469-11.524-14.454-11.524h-8.349v-9.375h8.056c7.764 0 12.94-4.394 12.94-10.547v-.097c0-6.348-4.297-10.059-11.865-10.059-7.422 0-12.5 3.858-13.135 9.912l-.049.488h-11.719l.049-.585c1.026-11.915 10.645-19.825 24.854-19.825 14.55 0 23.974 7.471 23.974 18.409v.097c0 8.74-6.347 14.551-14.795 16.309v.244c10.401.976 17.285 7.129 17.285 16.894v.098c0 12.256-10.742 20.85-26.318 20.85z" fill="#fff"/></g><defs><radialGradient id="paint0_radial_2238_13933" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 154 -928 0 140 323)"><stop stop-color="#3858E9"/><stop offset="1" stop-color="#151515" stop-opacity="0"/></radialGradient><linearGradient id="paint1_linear_2238_13933" x1="53.5" y1="135" x2="53.5" y2="1770" gradientUnits="userSpaceOnUse"><stop stop-color="#3858E9" stop-opacity="0"/><stop offset=".297" stop-color="#3858E9"/><stop offset=".734" stop-color="#3858E9"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/></linearGradient><linearGradient id="paint2_linear_2238_13933" x1="111.5" y1="135" x2="111.5" y2="1770" gradientUnits="userSpaceOnUse"><stop stop-color="#C7FFDB" stop-opacity="0"/><stop offset=".297" stop-color="#C7FFDB"/><stop offset=".693" stop-color="#C7FFDB"/><stop offset="1" stop-color="#C7FFDB" stop-opacity="0"/></linearGradient><linearGradient id="paint3_linear_2238_13933" x1="169.5" y1="135" x2="169.5" y2="1770" gradientUnits="userSpaceOnUse"><stop stop-color="#FFB7A7" stop-opacity="0"/><stop offset=".297" stop-color="#FFB7A7"/><stop offset=".734" stop-color="#FFB7A7"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#FFB7A7" stop-opacity="0"/></linearGradient><linearGradient id="paint4_linear_2238_13933" x1="227.5" y1="135" x2="227.5" y2="1770" gradientUnits="userSpaceOnUse"><stop stop-color="#7B90FF" stop-opacity="0"/><stop offset=".297" stop-color="#7B90FF"/><stop offset=".734" stop-color="#7B90FF"/><stop offset="1" stop-color="#3858E9" stop-opacity="0"/><stop offset="1" stop-color="#7B90FF" stop-opacity="0"/></linearGradient><clipPath id="clip0_2238_13933"><rect width="280" height="280" rx="5" fill="#fff"/></clipPath><clipPath id="clip1_2238_13933"><path fill="#fff" transform="translate(0 135)" d="M0 0h280v280H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/contribute-code.svg b/src/wp-admin/images/contribute-code.svg
new file mode 100644
index 0000000000000..237cfc1fb9fa6
--- /dev/null
+++ b/src/wp-admin/images/contribute-code.svg
@@ -0,0 +1 @@
+<svg width="290" height="290" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_4147_25483)"><path d="M145 288.965c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.617 0-57.247 25.63-57.247 57.247 0 31.616 25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M128.532 287.393c31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246 0 31.617 25.63 57.247 57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M112.658 282.732c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M97.956 275.154c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.247-57.246-57.247-31.617 0-57.247 25.631-57.247 57.247s25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M84.953 264.928c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247 0 31.616 25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M74.126 252.425c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M65.85 238.099c31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.617 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M60.444 222.464c31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M58.084 206.087c31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.247-57.247-57.247-31.616 0-57.246 25.631-57.246 57.247s25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M58.877 189.566c31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246 0 31.617 25.63 57.247 57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M62.774 173.497c31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M69.65 158.441c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M79.242 144.97c31.617 0 57.247-25.631 57.247-57.247s-25.63-57.246-57.247-57.246c-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M91.21 133.554c31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M105.128 124.612c31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.617 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M120.485 118.467c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M136.733 115.335c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246 0 31.616 25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M153.268 115.335c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M169.516 118.467c31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M184.873 124.612c31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246 0 31.617 25.63 57.247 57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M198.79 133.554c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M210.759 144.97c31.616 0 57.246-25.631 57.246-57.247s-25.63-57.246-57.246-57.246c-31.617 0-57.247 25.63-57.247 57.246 0 31.616 25.63 57.247 57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M220.359 158.441c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M227.227 173.497c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247 0 31.616 25.631 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M231.124 189.566c31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.617 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M231.917 206.087c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.247-57.246-57.247-31.617 0-57.247 25.631-57.247 57.247s25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M229.565 222.464c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.617 0-57.247 25.63-57.247 57.247 0 31.616 25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M224.151 238.099c31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.617 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M215.883 252.425c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246 0 31.616 25.63 57.246 57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M205.048 264.928c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M192.045 275.154c31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.247-57.247-57.247-31.616 0-57.246 25.631-57.246 57.247s25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M177.343 282.732c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M161.469 287.393c31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.617 25.63 57.247 57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M145 288.965c31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.617 0-57.247 25.63-57.247 57.247 0 31.616 25.63 57.246 57.247 57.246zM69.648 158.447c31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246zM220.359 158.447c31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246 0 31.616 25.63 57.246 57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path fill-rule="evenodd" clip-rule="evenodd" d="M211.515 100.276L217.806 94l1.059 1.063-6.291 6.276a.249.249 0 0 0-.001.353l6.294 6.31-1.063 1.059-6.294-6.31a1.75 1.75 0 0 1 .005-2.475zm21.642 0L226.865 94l-1.059 1.063 6.292 6.276a.25.25 0 0 1 .001.353l-6.295 6.31 1.063 1.059 6.294-6.31a1.75 1.75 0 0 0-.004-2.475zM147 224.5h-11a.5.5 0 0 0-.5.5v16a.5.5 0 0 0 .5.5h11v-17zm1.5 0h3.5a.5.5 0 0 1 .5.5v16a.5.5 0 0 1-.5.5h-3.5v-17zM136 223h16a2 2 0 0 1 2 2v16a2 2 0 0 1-2 2h-16a2 2 0 0 1-2-2v-16a2 2 0 0 1 2-2z" fill="#1E1E1E"/><path d="M69 102.5v10h1.5v-10h10V101h-10V91H69v10H59v1.5h10z" fill="#1E1E1E"/></g><defs><clipPath id="clip0_4147_25483"><path fill="#fff" d="M0 0h290v289.802H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/contribute-main.svg b/src/wp-admin/images/contribute-main.svg
new file mode 100644
index 0000000000000..a5e0344a96517
--- /dev/null
+++ b/src/wp-admin/images/contribute-main.svg
@@ -0,0 +1 @@
+<svg width="290" height="290" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_4147_25485)"><path d="M269.845 217.08c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.797-62.349-6.423-78.146 20.939-15.797 27.362-6.422 62.349 20.939 78.147 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M259.914 230.938c15.797-27.361 6.422-62.349-20.939-78.146-27.362-15.797-62.35-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.939 78.147 27.362 15.797 62.35 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M247.472 242.592c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.798-62.349-6.423-78.146 20.939-15.797 27.362-6.423 62.349 20.939 78.147 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M232.991 251.59c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.798-62.349-6.423-78.146 20.939-15.797 27.362-6.423 62.349 20.939 78.147 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M217.043 257.591c15.797-27.362 6.423-62.349-20.939-78.146-27.362-15.798-62.349-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.94 78.146 27.361 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M200.221 260.371c15.797-27.362 6.422-62.349-20.939-78.146-27.362-15.798-62.35-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.939 78.146 27.362 15.798 62.35 6.423 78.147-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M183.191 259.816c15.797-27.362 6.422-62.349-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.939 78.146 27.362 15.797 62.35 6.423 78.147-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M166.595 255.944c15.798-27.362 6.423-62.349-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.94 78.146 27.362 15.797 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M151.063 248.909c15.797-27.361 6.423-62.349-20.939-78.146-27.362-15.798-62.35-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.94 78.147 27.361 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M137.205 238.977c15.797-27.362 6.423-62.349-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.94 78.146 27.361 15.797 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M125.55 226.538c15.797-27.362 6.422-62.349-20.94-78.147-27.361-15.797-62.349-6.422-78.146 20.94-15.797 27.361-6.422 62.349 20.94 78.146 27.361 15.797 62.348 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M116.55 212.063c15.797-27.362 6.423-62.349-20.94-78.147-27.361-15.797-62.348-6.422-78.146 20.94-15.797 27.362-6.422 62.349 20.94 78.146 27.361 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M110.546 196.104c15.798-27.361 6.423-62.349-20.94-78.146-27.36-15.797-62.348-6.422-78.146 20.939-15.797 27.362-6.422 62.349 20.94 78.147 27.361 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M107.771 179.293c15.797-27.362 6.422-62.349-20.94-78.146-27.361-15.798-62.349-6.423-78.146 20.939-15.797 27.362-6.422 62.349 20.94 78.147 27.361 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M108.325 162.255c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.797-62.349-6.423-78.146 20.939-15.797 27.362-6.423 62.349 20.94 78.147 27.36 15.797 62.348 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M112.201 145.655c15.798-27.362 6.423-62.35-20.939-78.147-27.362-15.797-62.35-6.422-78.146 20.94-15.798 27.362-6.423 62.349 20.939 78.146 27.362 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M119.231 130.126c15.797-27.362 6.423-62.35-20.94-78.147-27.36-15.797-62.348-6.422-78.146 20.94-15.797 27.362-6.422 62.349 20.94 78.146 27.361 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M129.162 116.276c15.797-27.362 6.423-62.35-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.94 78.146 27.361 15.797 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M141.604 104.62c15.798-27.361 6.423-62.349-20.939-78.146-27.362-15.797-62.35-6.423-78.147 20.94-15.797 27.361-6.422 62.348 20.94 78.146 27.362 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M156.079 95.618c15.797-27.362 6.423-62.35-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.94 78.146 27.361 15.797 62.349 6.423 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M172.033 89.615c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.797-62.349-6.423-78.146 20.94-15.797 27.361-6.422 62.348 20.94 78.146 27.361 15.797 62.348 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M188.849 86.838c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.797-62.349-6.423-78.146 20.94-15.797 27.361-6.423 62.348 20.939 78.146 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M205.885 87.39c15.797-27.361 6.422-62.349-20.939-78.146-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.939 78.146 27.362 15.797 62.35 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M222.487 91.264c15.797-27.361 6.422-62.349-20.939-78.146-27.362-15.798-62.349-6.423-78.147 20.94-15.797 27.36-6.422 62.348 20.94 78.146 27.361 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M238.019 98.297c15.797-27.362 6.423-62.349-20.939-78.146-27.362-15.798-62.349-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.94 78.146 27.361 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M251.871 108.227c15.797-27.362 6.422-62.35-20.939-78.147-27.362-15.797-62.35-6.422-78.147 20.94-15.797 27.361-6.422 62.349 20.939 78.146 27.362 15.797 62.35 6.422 78.147-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M263.52 120.665c15.797-27.361 6.422-62.349-20.939-78.146-27.362-15.797-62.349-6.422-78.147 20.94-15.797 27.361-6.422 62.348 20.939 78.146 27.362 15.797 62.35 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M272.526 135.14c15.797-27.361 6.422-62.349-20.939-78.146-27.362-15.797-62.35-6.423-78.147 20.94-15.797 27.361-6.422 62.348 20.939 78.146 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M278.53 151.099c15.797-27.362 6.422-62.35-20.94-78.147-27.361-15.797-62.349-6.422-78.146 20.94-15.797 27.361-6.423 62.349 20.939 78.146 27.362 15.797 62.349 6.423 78.147-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M281.299 167.916c15.797-27.361 6.422-62.349-20.94-78.146-27.361-15.797-62.349-6.423-78.146 20.939-15.797 27.362-6.423 62.349 20.939 78.147 27.362 15.797 62.349 6.422 78.147-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M280.751 184.957c15.798-27.361 6.423-62.349-20.939-78.146-27.362-15.798-62.349-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.94 78.147 27.362 15.797 62.349 6.422 78.146-20.94z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M276.875 201.558c15.797-27.362 6.422-62.349-20.94-78.147-27.361-15.797-62.349-6.422-78.146 20.94-15.798 27.361-6.423 62.349 20.939 78.146 27.362 15.797 62.349 6.423 78.147-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M269.851 217.082c15.797-27.362 6.423-62.349-20.939-78.146-27.362-15.798-62.349-6.423-78.147 20.939-15.797 27.362-6.422 62.349 20.94 78.146 27.361 15.798 62.349 6.423 78.146-20.939z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M219 191.5v10h1.5v-10h10V190h-10v-10H219v10h-10v1.5h10z" fill="#1E1E1E"/></g><defs><clipPath id="clip0_4147_25485"><path fill="#fff" d="M0 0h290v290H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/contribute-no-code.svg b/src/wp-admin/images/contribute-no-code.svg
new file mode 100644
index 0000000000000..622cbd83d3252
--- /dev/null
+++ b/src/wp-admin/images/contribute-no-code.svg
@@ -0,0 +1 @@
+<svg width="290" height="290" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_4147_25484)"><path d="M.837 145c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.246-57.246-57.246C26.466 87.754.837 113.383.837 145z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M2.41 128.532c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M7.07 112.658c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M14.648 97.956c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.247-57.246 0-31.617-25.631-57.247-57.247-57.247S14.648 66.34 14.648 97.956z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M24.874 84.953c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M37.377 74.126c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M51.703 65.85c0 31.616 25.63 57.246 57.247 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M67.338 60.444c0 31.617 25.63 57.247 57.246 57.247 31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M83.715 58.084c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.247-25.63 57.247-57.247 0-31.616-25.631-57.246-57.247-57.246s-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M100.236 58.877c0 31.616 25.631 57.246 57.247 57.246s57.246-25.63 57.246-57.246c0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M116.305 62.774c0 31.617 25.63 57.247 57.246 57.247 31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M131.361 69.65c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M144.833 79.242c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M156.248 91.21c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M165.19 105.128c0 31.617 25.63 57.247 57.247 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M171.335 120.485c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M174.467 136.733c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M174.467 153.268c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M171.335 169.516c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M165.19 184.873c0 31.616 25.63 57.246 57.247 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.617 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M156.248 198.79c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M144.833 210.759c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M131.361 220.359c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M116.305 227.227c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M100.236 231.124c0 31.617 25.631 57.247 57.247 57.247s57.246-25.63 57.246-57.247c0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M83.715 231.917c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.247-25.63 57.247-57.246 0-31.616-25.631-57.246-57.247-57.247-31.616 0-57.246 25.631-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M67.338 229.565c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M51.703 224.151c0 31.617 25.63 57.247 57.247 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M37.377 215.883c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M24.874 205.048c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M14.648 192.045c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.247-57.247 0-31.616-25.631-57.246-57.247-57.246s-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M7.07 177.343c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M2.41 161.469c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M.837 145c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.246-57.246-57.246C26.466 87.754.837 113.383.837 145z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M2.41 128.532c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M7.07 112.658c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M14.648 97.956c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.247-57.246 0-31.617-25.631-57.247-57.247-57.247S14.648 66.34 14.648 97.956z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M24.874 84.953c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M37.377 74.126c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M51.703 65.85c0 31.616 25.63 57.246 57.247 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M67.338 60.444c0 31.617 25.63 57.247 57.246 57.247 31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M83.715 58.084c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.247-25.63 57.247-57.247 0-31.616-25.631-57.246-57.247-57.246s-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M100.236 58.877c0 31.616 25.631 57.246 57.247 57.246s57.246-25.63 57.246-57.246c0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M116.305 62.774c0 31.617 25.63 57.247 57.246 57.247 31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M131.361 69.65c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M144.833 79.242c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M156.248 91.21c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M165.19 105.128c0 31.617 25.63 57.247 57.247 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M171.335 120.485c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M174.467 136.733c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M174.467 153.268c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M171.335 169.516c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M165.19 184.873c0 31.616 25.63 57.246 57.247 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.617 0-57.247 25.63-57.247 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M156.248 198.79c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M144.833 210.759c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M131.361 220.359c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M116.305 227.227c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M100.236 231.124c0 31.617 25.631 57.247 57.247 57.247s57.246-25.63 57.246-57.247c0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M83.715 231.917c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.247-25.63 57.247-57.246 0-31.616-25.631-57.246-57.247-57.247-31.616 0-57.246 25.631-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M67.338 229.565c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.617-25.63-57.247-57.247-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M51.703 224.151c0 31.617 25.63 57.247 57.247 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M37.377 215.883c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.617-25.63-57.247-57.246-57.247-31.616 0-57.246 25.63-57.246 57.247z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M24.874 205.048c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M14.648 192.045c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.247-57.247 0-31.616-25.631-57.246-57.247-57.246s-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M7.07 177.343c0 31.616 25.63 57.246 57.246 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M2.41 161.469c0 31.617 25.63 57.247 57.246 57.247 31.616 0 57.246-25.63 57.246-57.247 0-31.616-25.63-57.246-57.246-57.246-31.616 0-57.247 25.63-57.247 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path d="M.917 145.797c0 31.616 25.63 57.246 57.247 57.246 31.616 0 57.246-25.63 57.246-57.246 0-31.616-25.63-57.246-57.246-57.246-31.617 0-57.247 25.63-57.247 57.246zM131.355 69.648c0 31.617 25.63 57.247 57.246 57.247 31.617 0 57.247-25.63 57.247-57.247 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path fill-rule="evenodd" clip-rule="evenodd" d="M48 137.5h17a.5.5 0 0 1 .5.5v10.357l-2.977-2.895a.75.75 0 0 0-1.046 0l-5.571 3.472-2.927-1.897a.75.75 0 0 0-.85.024l-4.629 2.646V138a.5.5 0 0 1 .5-.5zm-.5 14.064V155a.5.5 0 0 0 .5.5h17a.5.5 0 0 0 .5-.5v-4.597l-.023.024L62 147.046l-5.477 3.381a.749.749 0 0 1-.93.091l-2.997-1.941-5.096 2.987zM46 138a2 2 0 0 1 2-2h17a2 2 0 0 1 2 2v17a2 2 0 0 1-2 2H48a2 2 0 0 1-2-2v-17z" fill="#1E1E1E"/><path d="M131.355 220.359c0 31.616 25.63 57.246 57.246 57.246 31.617 0 57.247-25.63 57.247-57.246 0-31.616-25.63-57.246-57.247-57.246-31.616 0-57.246 25.63-57.246 57.246z" fill="#fff" stroke="#000" stroke-width="1.2" stroke-miterlimit="10"/><path fill-rule="evenodd" clip-rule="evenodd" d="M188.486 231.51c-.609 1.147-1.023 2.08-1.023 2.08l-5.222-19.745 17.705 10.056s-1.052.089-2.357.311c-1.565.266-3.495.725-5.411 2.453-1.921 1.733-2.951 3.448-3.692 4.845zm-.533-2.112c.223-.372.459-.744.703-1.096.451-.654 1.993-2.337 2.588-2.811.637-.506 2.479-1.85 3.243-2.094.4-.128.817-.24 1.231-.338l-11.12-6.001 3.355 12.34z" fill="#1E1E1E"/><path d="M188 71.5v10h1.5v-10h10V70h-10V60H188v10h-10v1.5h10z" fill="#1E1E1E"/></g><defs><clipPath id="clip0_4147_25484"><path fill="#fff" transform="rotate(90 144.901 144.901)" d="M0 0h290v289.802H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/dashboard-background.svg b/src/wp-admin/images/dashboard-background.svg
new file mode 100644
index 0000000000000..e4d70862d7ff4
--- /dev/null
+++ b/src/wp-admin/images/dashboard-background.svg
@@ -0,0 +1,63 @@
+<svg preserveAspectRatio="xMidYMin slice" fill="none" viewBox="0 0 1232 240" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
+  <g clip-path="url(#a)">
+    <path fill="#151515" d="M0 0h1232v240H0z"/>
+    <ellipse cx="616" cy="232" fill="url(#b)" opacity=".05" rx="1497" ry="249"/>
+    <mask id="d" width="1000" height="400" x="232" y="20" maskUnits="userSpaceOnUse" style="mask-type:alpha">
+      <path fill="url(#c)" d="M0 0h1000v400H0z" transform="translate(232 20)"/>
+    </mask>
+    <g stroke-width="2" mask="url(#d)">
+      <path stroke="url(#e)" d="M387 20v1635"/>
+      <path stroke="url(#f)" d="M559.5 20v1635"/>
+      <path stroke="url(#g)" d="M732 20v1635"/>
+      <path stroke="url(#h)" d="M904.5 20v1635"/>
+      <path stroke="url(#i)" d="M1077 20v1635"/>
+    </g>
+  </g>
+  <defs>
+    <linearGradient id="e" x1="387.5" x2="387.5" y1="20" y2="1655" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#3858E9" stop-opacity="0"/>
+      <stop offset=".297" stop-color="#3858E9"/>
+      <stop offset=".734" stop-color="#3858E9"/>
+      <stop offset="1" stop-color="#3858E9" stop-opacity="0"/>
+      <stop offset="1" stop-color="#3858E9" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="f" x1="560" x2="560" y1="20" y2="1655" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFFCB5" stop-opacity="0"/>
+      <stop offset="0" stop-color="#FFFCB5" stop-opacity="0"/>
+      <stop offset=".297" stop-color="#FFFCB5"/>
+      <stop offset=".734" stop-color="#FFFCB5"/>
+      <stop offset="1" stop-color="#FFFCB5" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="g" x1="732.5" x2="732.5" y1="20" y2="1655" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#C7FFDB" stop-opacity="0"/>
+      <stop offset=".297" stop-color="#C7FFDB"/>
+      <stop offset=".693" stop-color="#C7FFDB"/>
+      <stop offset="1" stop-color="#C7FFDB" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="h" x1="905" x2="905" y1="20" y2="1655" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#FFB7A7" stop-opacity="0"/>
+      <stop offset=".297" stop-color="#FFB7A7"/>
+      <stop offset=".734" stop-color="#FFB7A7"/>
+      <stop offset="1" stop-color="#3858E9" stop-opacity="0"/>
+      <stop offset="1" stop-color="#FFB7A7" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="i" x1="1077.5" x2="1077.5" y1="20" y2="1655" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#7B90FF" stop-opacity="0"/>
+      <stop offset=".297" stop-color="#7B90FF"/>
+      <stop offset=".734" stop-color="#7B90FF"/>
+      <stop offset="1" stop-color="#3858E9" stop-opacity="0"/>
+      <stop offset="1" stop-color="#7B90FF" stop-opacity="0"/>
+    </linearGradient>
+    <radialGradient id="b" cx="0" cy="0" r="1" gradientTransform="matrix(0 249 -1497 0 616 232)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#3858E9"/>
+      <stop offset="1" stop-color="#151515" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="c" cx="0" cy="0" r="1" gradientTransform="matrix(0 765 -1912.5 0 500 -110)" gradientUnits="userSpaceOnUse">
+      <stop offset=".161" stop-color="#151515" stop-opacity="0"/>
+      <stop offset=".682"/>
+    </radialGradient>
+    <clipPath id="a">
+      <path fill="#fff" d="M0 0h1232v240H0z"/>
+    </clipPath>
+  </defs>
+</svg>
diff --git a/src/wp-admin/images/freedom-1.svg b/src/wp-admin/images/freedom-1.svg
index 24f27d2d5f924..fd8a8a762f561 100644
--- a/src/wp-admin/images/freedom-1.svg
+++ b/src/wp-admin/images/freedom-1.svg
@@ -1 +1 @@
-<svg width="180" height="180" viewBox="0 0 180 180" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g fill="#FFFFFF" stroke="#3858E9" stroke-width="1.2" stroke-miterlimit="10"><circle cx="36.3" cy="90" r="35.8"/><circle cx="37.5" cy="101.2" r="35.8"/><circle cx="40.8" cy="111.5" r="35.8"/><circle cx="46.1" cy="120.8" r="35.8"/><circle cx="53" cy="128.9" r="35.8"/><circle cx="61.4" cy="135.5" r="35.8"/><circle cx="71" cy="140.3" r="35.8"/><circle cx="81.6" cy="143.1" r="35.8"/><circle cx="92.9" cy="143.7" r="35.8"/><circle cx="103.9" cy="141.9" r="35.8"/><circle cx="114" cy="138.1" r="35.8"/><circle cx="123.1" cy="132.4" r="35.8"/><circle cx="130.8" cy="125.1" r="35.8"/><circle cx="136.9" cy="116.4" r="35.8"/><circle cx="141.2" cy="106.5" r="35.8"/><circle cx="143.5" cy="95.7" r="35.8"/><circle cx="143.5" cy="84.3" r="35.8"/><circle cx="141.2" cy="73.6" r="35.8"/><circle cx="136.9" cy="63.7" r="35.8"/><circle cx="130.8" cy="55" r="35.8"/><circle cx="123.1" cy="47.6" r="35.8"/><circle cx="114" cy="41.9" r="35.8"/><circle cx="103.9" cy="38.1" r="35.8"/><circle cx="92.9" cy="36.4" r="35.8"/><circle cx="81.6" cy="37" r="35.8"/><circle cx="71" cy="39.7" r="35.8"/><circle cx="61.4" cy="44.5" r="35.8"/><circle cx="53" cy="51.1" r="35.8"/><circle cx="46.1" cy="59.2" r="35.8"/><circle cx="40.8" cy="68.5" r="35.8"/><circle cx="37.5" cy="78.9" r="35.8"/><circle cx="36.4" cy="90" r="35.8"/></g></svg>
\ No newline at end of file
+<svg width="180" height="180" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_6175)" fill="#fff" stroke="#151515" stroke-width="1.2" stroke-miterlimit="10"><path d="M36.352 125.815c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815C16.572 54.185.537 70.22.537 90c0 19.78 16.035 35.815 35.815 35.815z"/><path d="M37.513 136.982c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M40.84 147.347c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M46.094 156.677c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M53.039 164.732c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.036 35.815 35.816 35.815z"/><path d="M61.437 171.275c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M71.047 176.071c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.035 35.815 35.816 35.815z"/><path d="M81.637 178.879c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M92.93 179.463c19.78 0 35.815-16.035 35.815-35.815 0-19.781-16.035-35.816-35.815-35.816-19.78 0-35.816 16.035-35.816 35.816 0 19.78 16.036 35.815 35.816 35.815z"/><path d="M103.918 177.74c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M114.046 173.908c19.781 0 35.816-16.035 35.816-35.815 0-19.781-16.035-35.816-35.816-35.816-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M123.079 168.21c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.781 16.035 35.816 35.815 35.816z"/><path d="M130.779 160.878c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M136.907 152.157c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M141.23 142.279c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M143.504 131.485c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.036-35.816-35.816-35.816S107.689 75.89 107.689 95.67c0 19.78 16.035 35.815 35.815 35.815z"/><path d="M143.504 120.149c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.036-35.815-35.816-35.815s-35.815 16.035-35.815 35.815c0 19.78 16.035 35.815 35.815 35.815z"/><path d="M141.23 109.355c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z"/><path d="M136.907 99.477c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M130.779 90.752c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M123.079 83.424c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M114.046 77.722c19.781 0 35.816-16.034 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z"/><path d="M103.918 73.894c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M92.93 72.168c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.036 35.816 35.816 35.816z"/><path d="M81.637 72.751c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M71.047 75.56c19.78 0 35.815-16.036 35.815-35.816S90.827 3.93 71.047 3.93c-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.035 35.815 35.816 35.815z"/><path d="M61.437 80.355c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M53.039 86.898c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.036 35.815 35.816 35.815z"/><path d="M46.094 94.953c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M40.84 104.283c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z"/><path d="M37.513 114.652c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z"/><path d="M36.352 125.815c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815C16.572 54.185.537 70.22.537 90c0 19.78 16.035 35.815 35.815 35.815z"/></g><defs><clipPath id="clip0_1916_6175"><path fill="#fff" d="M0 0h179.857v180H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/freedom-2.svg b/src/wp-admin/images/freedom-2.svg
index 79bd3166a3258..94000025f7403 100644
--- a/src/wp-admin/images/freedom-2.svg
+++ b/src/wp-admin/images/freedom-2.svg
@@ -1 +1 @@
-<svg width="181" height="180" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g clip-path="url(#a)" stroke-width="1.2" stroke-miterlimit="10"><path d="M98.433 106.656c0-26.396-21.4-47.796-47.796-47.796-26.397 0-47.225 20.828-47.786 46.737a89.029 89.029 0 0 0 14.708 35.561c8.586 8.235 20.239 13.295 33.078 13.295 26.396 0 47.796-21.4 47.796-47.797Z" fill="#fff" stroke="#D8DEF8"/><path d="M102.871 120.491c0-26.396-21.4-47.796-47.796-47.796-26.397 0-47.8 21.396-47.8 47.796 0 .418.007.835.017 1.249 7.337 19.33 21.176 35.46 38.853 45.713a48.01 48.01 0 0 0 8.93.835c26.396 0 47.796-21.4 47.796-47.797Z" fill="#fff" stroke="#D8DEF8"/><path d="M109.886 132.94c0-26.396-21.4-47.796-47.797-47.796-26.396 0-47.8 21.4-47.8 47.796 0 1.141.042 2.274.123 3.393 13.382 22.06 36.028 37.874 62.544 42.042 19.119-6.252 32.933-24.231 32.933-45.438l-.003.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M119.153 143.691c0-26.396-21.4-47.796-47.797-47.796-26.396 0-47.796 21.4-47.796 47.796 0 1.86.108 3.691.315 5.495 16.393 18.572 40.376 30.288 67.095 30.288 4.46 0 8.846-.33 13.13-.962 9.267-8.719 15.056-21.091 15.056-34.821h-.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M82.56 104.628c-26.397 0-47.797 21.4-47.797 47.797 0 2.617.214 5.182.617 7.687 15.267 12.12 34.58 19.362 55.586 19.362 12.442 0 24.291-2.541 35.056-7.13a47.615 47.615 0 0 0 4.337-19.916c0-26.396-21.4-47.796-47.796-47.796l-.004-.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M95.387 111.028c-26.396 0-47.796 21.4-47.796 47.797 0 3.438.365 6.789 1.056 10.024 12.6 6.779 27.01 10.625 42.32 10.625 19.417 0 37.389-6.19 52.055-16.698.106-1.302.165-2.622.165-3.951 0-26.397-21.4-47.797-47.796-47.797h-.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M109.517 114.776c-26.396 0-47.796 21.4-47.796 47.796 0 4.347.586 8.561 1.673 12.565a89.435 89.435 0 0 0 27.572 4.337c25.625 0 48.73-10.776 65.042-28.039-5.017-21.024-23.926-36.659-46.491-36.659Z" fill="#fff" stroke="#D8DEF8"/><path d="M124.588 115.554c-26.397 0-47.797 21.4-47.797 47.797a47.79 47.79 0 0 0 2.523 15.368c3.814.495 7.702.755 11.649.755 31.288 0 58.817-16.063 74.81-40.386-8.315-14.084-23.645-23.534-41.185-23.534Z" fill="#fff" stroke="#D8DEF8"/><path d="M172.556 126.768c-8.607-8.364-20.355-13.519-33.305-13.519-26.397 0-47.797 21.4-47.797 47.797 0 6.491 1.298 12.68 3.642 18.326 34.537-1.568 63.972-22.716 77.463-52.607l-.003.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M104.973 155.937c0 7.73 1.835 15.028 5.095 21.488 32.186-7 57.909-31.316 66.912-62.706a47.573 47.573 0 0 0-24.207-6.579c-26.396 0-47.796 21.4-47.796 47.797h-.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M117.029 148.33a47.586 47.586 0 0 0 6.958 24.849c29.253-11.625 50.916-38.228 55.53-70.344a47.714 47.714 0 0 0-14.691-2.305c-26.397 0-47.797 21.4-47.797 47.796v.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M127.303 138.547a47.598 47.598 0 0 0 9.344 28.393c25.937-15.435 43.404-43.607 43.776-75.894a48.471 48.471 0 0 0-5.323-.299c-26.397 0-47.797 21.4-47.797 47.797v.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M135.485 126.909c0 12.368 4.699 23.638 12.404 32.126 19.877-16.41 32.547-41.242 32.547-69.031 0-3.642-.224-7.236-.645-10.762-24.769 1.79-44.309 22.446-44.309 47.67l.003-.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M177.538 67.326c-20.838 5.151-36.288 23.972-36.288 46.4 0 14.351 6.327 27.225 16.344 35.986C171.798 133.874 180.44 112.947 180.44 90a89.629 89.629 0 0 0-2.902-22.674Z" fill="#fff" stroke="#D8DEF8"/><path d="M173.454 55.288c-17.144 7.263-29.168 24.242-29.168 44.031 0 16.649 8.515 31.309 21.424 39.867 9.305-14.112 14.727-31.014 14.727-49.186 0-12.309-2.488-24.039-6.986-34.712h.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M167.303 43.309c-13.8 8.382-23.017 23.554-23.017 40.88 0 19.285 11.421 35.899 27.866 43.453 5.316-11.442 8.288-24.196 8.288-37.645 0-17.113-4.807-33.099-13.137-46.692v.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M159.363 32.323c-11.035 8.754-18.113 22.28-18.113 37.46 0 22.094 14.997 40.687 35.362 46.161A89.489 89.489 0 0 0 180.436 90c0-21.979-7.929-42.102-21.077-57.677h.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M135.485 56.6c0 25.06 19.285 45.611 43.821 47.632A90.123 90.123 0 0 0 180.436 90c0-26.916-11.884-51.053-30.691-67.453-8.803 8.67-14.263 20.723-14.263 34.053h.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M175.103 92.758c1.793 0 3.562-.102 5.302-.295.021-.817.035-1.638.035-2.463 0-31.94-16.74-59.965-41.919-75.796a47.598 47.598 0 0 0-11.214 30.758c0 26.396 21.4 47.796 47.796 47.796Z" fill="#fff" stroke="#D8DEF8"/><path d="M164.826 82.975c5.281 0 10.365-.86 15.112-2.442-3.463-32.94-24.796-60.558-54.133-72.972a47.576 47.576 0 0 0-8.779 27.614c0 26.397 21.4 47.797 47.796 47.797l.004.003Z" fill="#fff" stroke="#D8DEF8"/><path d="M152.77 75.368a47.576 47.576 0 0 0 25.014-7.063c-8.039-32.273-33.6-57.614-66-65.336a47.585 47.585 0 0 0-6.814 24.603c0 26.396 21.4 47.796 47.796 47.796h.004Z" fill="#fff" stroke="#D8DEF8"/><path d="M139.251 70.256c13.491 0 25.673-5.59 34.361-14.579C160.847 24.965 131.461 2.905 96.675.712c-3.34 6.523-5.22 13.916-5.22 21.748 0 26.396 21.399 47.796 47.796 47.796Z" fill="#fff" stroke="#D8DEF8"/><path d="M90.966.526c-3.46 0-6.87.204-10.228.586a47.646 47.646 0 0 0-3.947 19.046c0 26.396 21.4 47.796 47.797 47.796 18.308 0 34.207-10.294 42.235-25.407C151.005 17.31 122.949.527 90.966.527Z" fill="#fff" stroke="#D8DEF8"/><path d="M90.966.526a89.533 89.533 0 0 0-26.333 3.94 47.702 47.702 0 0 0-2.912 16.47c0 26.397 21.4 47.797 47.796 47.797 23.579 0 43.169-17.073 47.084-39.533C140.258 11.57 116.903.526 90.966.526Z" fill="#fff" stroke="#C5CDF4"/><path d="M49.7 10.597a47.784 47.784 0 0 0-2.113 14.087c0 26.397 21.4 47.797 47.797 47.797 26.396 0 47.796-21.4 47.796-47.797 0-2.656-.221-5.26-.635-7.796C127.97 6.583 110.177.526 90.966.526c-14.884 0-28.915 3.639-41.263 10.07H49.7Z" fill="#fff" stroke="#9EAAEE"/><path d="M36.25 19.207a47.825 47.825 0 0 0-1.487 11.874c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.796 0-8.909-2.442-17.25-6.685-24.39C113.542 2.712 102.51.526 90.966.526c-20.61 0-39.59 6.972-54.716 18.681Z" fill="#fff" stroke="#8C9AEC"/><path d="M24.56 30.039a48.022 48.022 0 0 0-1.004 9.779c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.796 0-16.05-7.909-30.25-20.043-38.92a90.564 90.564 0 0 0-8.143-.372c-26.344 0-50.032 11.39-66.404 29.513Z" fill="#fff" stroke="#7789E9"/><path d="M62.086 98.365c26.396 0 47.796-21.4 47.796-47.797 0-24.07-17.793-43.982-40.944-47.305C46.215 9.014 26.96 23.463 14.91 42.86a48.116 48.116 0 0 0-.62 7.708c0 26.397 21.4 47.797 47.796 47.797Z" fill="#fff" stroke="#3858E9"/><path d="M102.871 63.018c0-26.397-21.4-47.797-47.796-47.797a47.668 47.668 0 0 0-18.432 3.684c-12.901 9.87-23.035 23.172-29.042 38.54a48.69 48.69 0 0 0-.326 5.573c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.796h.003Z" fill="#fff" stroke="#3858E9"/><path d="M98.433 76.853c0-26.397-21.4-47.797-47.797-47.797-16.89 0-31.736 8.762-40.238 21.99a88.832 88.832 0 0 0-7.474 22.933c-.056.95-.088 1.909-.088 2.877 0 26.397 21.4 47.797 47.797 47.797 26.396 0 47.796-21.4 47.796-47.797l.004-.003Z" fill="#fff" stroke="#3858E9"/><path d="M49.082 139.551c26.397 0 47.797-21.399 47.797-47.796 0-26.398-21.4-47.797-47.797-47.797S1.286 65.358 1.286 91.754c0 26.398 21.399 47.797 47.796 47.797Z" fill="#fff" stroke="#3858E9"/><path d="M49.037 139.712c26.397 0 47.796-21.399 47.796-47.796S75.434 44.119 49.037 44.119 1.24 65.52 1.24 91.916s21.4 47.796 47.797 47.796ZM82.749 125.568l27.677 27.678" stroke="#3858E9"/><path d="m41.802 60.677 3.508 3.383C31.465 65.786 20.75 77.59 20.75 91.905c0 14.316 10.716 26.116 24.561 27.846M55.837 123.133l-3.509-3.382c13.846-1.726 24.561-13.53 24.561-27.846S66.174 65.79 52.33 64.06" stroke="#8C9AEC"/><path d="m36.633 79.512 24.81 24.811M36.633 104.323l24.81-24.81M49.037 74.372v35.088M31.493 91.916H66.58M90.966 179.474c49.415 0 89.474-40.059 89.474-89.474 0-49.415-40.059-89.474-89.474-89.474C41.551.526 1.493 40.586 1.493 90c0 49.415 40.058 89.474 89.473 89.474Z" stroke="#3858E9"/></g><defs><clipPath id="a"><path fill="#fff" transform="translate(.714)" d="M0 0h180.253v180H0z"/></clipPath></defs></svg>
\ No newline at end of file
+<svg width="181" height="180" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_6212)" stroke="#151515" stroke-width="1.2"><path d="M144.361 125.815c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M143.197 114.652c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z" fill="#fff" stroke-miterlimit="10"/><path d="M139.87 104.283c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M134.616 94.953c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M127.671 86.898c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M119.276 80.355c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M109.663 75.56c19.78 0 35.816-16.036 35.816-35.816S129.443 3.93 109.663 3.93 73.848 19.964 73.848 39.744c0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M99.076 72.751c19.781 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M87.784 72.168c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z" fill="#fff" stroke-miterlimit="10"/><path d="M76.796 73.894c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.036 35.815 35.816 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M66.667 77.722c19.78 0 35.815-16.034 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z" fill="#fff" stroke-miterlimit="10"/><path d="M57.631 83.424c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M49.934 90.752c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M43.803 99.477c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M39.483 109.355c19.78 0 35.816-16.035 35.816-35.816 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.816 35.815 35.816z" fill="#fff" stroke-miterlimit="10"/><path d="M37.21 120.149c19.78 0 35.814-16.035 35.814-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M37.21 131.485c19.78 0 35.814-16.035 35.814-35.815 0-19.78-16.035-35.816-35.815-35.816-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M39.483 142.279c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M43.803 152.157c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M49.934 160.878c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M57.631 168.21c19.78 0 35.815-16.035 35.815-35.816 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.781 16.035 35.816 35.815 35.816z" fill="#fff" stroke-miterlimit="10"/><path d="M66.667 173.908c19.78 0 35.815-16.035 35.815-35.815 0-19.781-16.035-35.816-35.815-35.816-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M76.796 177.74c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.816 16.035-35.816 35.815 0 19.78 16.036 35.815 35.816 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M87.784 179.463c19.78 0 35.815-16.035 35.815-35.815 0-19.781-16.035-35.816-35.815-35.816-19.78 0-35.815 16.035-35.815 35.816 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M99.076 178.879c19.781 0 35.816-16.035 35.816-35.815 0-19.78-16.035-35.815-35.816-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M109.663 176.071c19.78 0 35.816-16.035 35.816-35.815 0-19.78-16.036-35.815-35.816-35.815s-35.815 16.035-35.815 35.815c0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M119.276 171.275c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M127.671 164.732c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M134.616 156.677c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M139.87 147.347c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M143.197 136.982c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M144.361 125.815c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M144.361 125.815c19.78 0 35.815-16.035 35.815-35.815 0-19.78-16.035-35.815-35.815-35.815-19.78 0-35.815 16.035-35.815 35.815 0 19.78 16.035 35.815 35.815 35.815z" fill="#fff" stroke-miterlimit="10"/><path d="M154.49 74.807l-10.129 10.129-10.132-10.129M159.554 100.132L149.425 90l10.129-10.129M129.165 79.871L139.293 90l-10.128 10.132M134.229 105.196l10.132-10.132 10.129 10.132" stroke-linejoin="bevel"/><path d="M90.638 107.908c9.89 0 17.908-8.018 17.908-17.908s-8.018-17.908-17.908-17.908S72.731 80.11 72.731 90s8.017 17.908 17.907 17.908z" fill="#fff" stroke-miterlimit="10"/><path d="M76.943 101.54c1.801-5.853 7.252-10.107 13.695-10.107 6.443 0 11.869 4.233 13.682 10.067M90.638 91.433a7.163 7.163 0 1 0 0-14.326 7.163 7.163 0 0 0 0 14.326z" stroke-miterlimit="10"/></g><defs><clipPath id="clip0_1916_6212"><path fill="#fff" transform="translate(.857)" d="M0 0h179.857v180H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/freedom-3.svg b/src/wp-admin/images/freedom-3.svg
index 215c0b0510f77..75ac314cada00 100644
--- a/src/wp-admin/images/freedom-3.svg
+++ b/src/wp-admin/images/freedom-3.svg
@@ -1 +1 @@
-<svg width="181" height="180" viewBox="0 0 181 180" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g fill="#FFF" stroke-miterlimit="10" stroke-width="1.2"><g stroke="#D8DEF8"><circle cx="143.2" cy="78.9" r="35.8"/><circle cx="139.9" cy="68.5" r="35.8"/><circle cx="134.6" cy="59.2" r="35.8"/><circle cx="127.7" cy="51.1" r="35.8"/><circle cx="119.3" cy="44.6" r="35.8"/><circle cx="109.7" cy="39.8" r="35.8"/><circle cx="99.1" cy="37" r="35.8"/><circle cx="87.8" cy="36.4" r="35.8"/><circle cx="76.8" cy="38.1" r="35.8"/><circle cx="66.7" cy="41.9" r="35.8"/><circle cx="57.6" cy="47.6" r="35.8"/><circle cx="49.9" cy="55" r="35.8"/><circle cx="43.8" cy="63.7" r="35.8"/><circle cx="39.4" cy="73.6" r="35.8"/><circle cx="37.2" cy="84.3" r="35.8"/><circle cx="37.2" cy="95.7" r="35.8"/><circle cx="39.5" cy="106.5" r="35.8"/><circle cx="43.8" cy="116.4" r="35.8"/><circle cx="49.9" cy="125.1" r="35.8"/><circle cx="57.6" cy="132.4" r="35.8"/><circle cx="66.7" cy="138.1" r="35.8"/><circle cx="76.9" cy="141.9" r="35.8"/></g><circle cx="87.8" cy="143.7" r="35.8" stroke="#C5CDF4"/><circle cx="99.1" cy="143.1" r="35.8" stroke="#B1BCF1"/><circle cx="109.7" cy="140.3" r="35.8" stroke="#9EAAEE"/><circle cx="119.3" cy="135.5" r="35.8" stroke="#8C9AEC"/><circle cx="127.7" cy="128.9" r="35.8" stroke="#7789E9"/><g stroke="#3858E9"><circle cx="134.9" cy="120.9" r="35.8"/><circle cx="140.2" cy="111.5" r="35.8"/><circle cx="143.2" cy="101.2" r="35.8"/><circle cx="144.4" cy="89.8" r="35.8"/><path d="m154.5 74.8-10.1 10.1-10.1-10.1m25.3 25.3L149.4 90l10.1-10.1m-30.3 0L139.3 90l-10.1 10.1m5 5.1 10.1-10.1 10.1 10.1"/><circle cx="90.6" cy="90" r="17.9"/><path d="M76.9 101.5a14.3 14.3 0 0 1 27.4 0M90.6 91.4c4 0 7.2-3.2 7.2-7.2S94.6 77 90.6 77s-7.2 3.2-7.2 7.2 3.3 7.2 7.2 7.2z"/></g></g></svg>
\ No newline at end of file
+<svg width="181" height="180" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_6260)" stroke="#151515" stroke-width="1.2"><path d="M90.713 179.474c49.415 0 89.474-40.059 89.474-89.474 0-49.415-40.059-89.474-89.474-89.474C41.3.526 1.24 40.585 1.24 90c0 49.415 40.058 89.474 89.474 89.474z" stroke-miterlimit="10"/><path d="M32.819 144.035c-4.274 0-8.369.576-12.158 1.625 11.649 14.645 27.793 25.551 46.347 30.635.586-1.909.898-3.899.898-5.944 0-14.533-15.708-26.316-35.087-26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M32.819 133.509c-6.614 0-12.8 1.372-18.08 3.758 10.806 17.337 27.378 30.705 47.038 37.421 3.866-4.228 6.13-9.348 6.13-14.863 0-14.534-15.71-26.316-35.088-26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M67.906 149.298c0-14.533-15.708-26.316-35.087-26.316-8.6 0-16.474 2.323-22.576 6.172A89.833 89.833 0 0 0 52.668 171c9.203-4.744 15.238-12.695 15.238-21.702z" fill="#fff" stroke-miterlimit="10"/><path d="M67.906 138.772c0-14.533-15.708-26.316-35.087-26.316-10.32 0-19.597 3.34-26.018 8.66 6.59 17.768 18.66 32.87 34.162 43.259 15.452-2.754 26.943-13.171 26.943-25.6v-.003z" fill="#fff" stroke-miterlimit="10"/><path d="M67.906 128.246c0-14.534-15.708-26.316-35.087-26.316-11.797 0-22.232 4.365-28.593 11.059 4.238 15.993 12.796 30.225 24.347 41.379 1.393.127 2.807.193 4.246.193 19.379 0 35.087-11.782 35.087-26.315z" fill="#fff" stroke-miterlimit="10"/><path d="M67.906 117.719c0-14.533-15.708-26.316-35.087-26.316-12.986 0-24.327 5.292-30.393 13.158a88.985 88.985 0 0 0 15.038 36.825c4.639 1.695 9.85 2.649 15.355 2.649 19.379 0 35.087-11.782 35.087-26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M67.906 107.193c0-14.533-15.708-26.316-35.087-26.316-13.755 0-25.656 5.937-31.407 14.576a88.992 88.992 0 0 0 7.603 31.07c6.256 4.337 14.618 6.986 23.807 6.986 19.38 0 35.088-11.783 35.088-26.316h-.004z" fill="#fff" stroke-miterlimit="10"/><path d="M20.587 98.021l24.814 18.607M20.587 116.628l24.814-18.607M32.994 94.168v26.316M15.45 107.323l35.088.003" stroke-miterlimit="10"/><path d="M102.994 154.561c19.379 0 35.088-11.782 35.088-26.315 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.533 15.71 26.315 35.088 26.315z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 144.474c19.379 0 35.088-11.782 35.088-26.316 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 134.386c19.379 0 35.088-11.782 35.088-26.316 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 124.298c19.379 0 35.088-11.782 35.088-26.316 0-14.533-15.709-26.315-35.088-26.315-19.378 0-35.088 11.782-35.088 26.316 0 14.533 15.71 26.315 35.088 26.315z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 114.211c19.379 0 35.088-11.782 35.088-26.316 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 104.123c19.379 0 35.088-11.782 35.088-26.316 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 94.035c19.379 0 35.088-11.782 35.088-26.316 0-14.533-15.709-26.315-35.088-26.315-19.378 0-35.088 11.781-35.088 26.315s15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 83.947c19.379 0 35.088-11.782 35.088-26.315 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.533 15.71 26.315 35.088 26.315z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 73.86c19.379 0 35.088-11.782 35.088-26.316 0-14.534-15.709-26.316-35.088-26.316-19.378 0-35.088 11.782-35.088 26.316 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M112.917 36.379l-9.923 7.442-9.923-7.442M117.882 54.986l-9.926-7.442 9.926-7.442M88.106 40.102l9.927 7.442-9.927 7.442M93.071 58.709l9.923-7.442 9.923 7.442" stroke-linejoin="bevel"/><path d="M102.994 140.526c-19.379 0-35.088 11.783-35.088 26.316 0 3.691 1.014 7.204 2.846 10.393a89.72 89.72 0 0 0 19.962 2.239c17.385 0 33.61-4.965 47.343-13.548-.642-14.108-16.094-25.4-35.063-25.4z" fill="#fff" stroke-miterlimit="10"/><path d="M134.363 168.116c2.379-3.548 3.719-7.558 3.719-11.8 0-14.534-15.709-26.316-35.088-26.316s-35.088 11.782-35.088 26.316c0 9.916 7.313 18.551 18.116 23.035 1.555.081 3.12.123 4.691.123 15.853 0 30.737-4.127 43.65-11.358z" fill="#fff" stroke-miterlimit="10"/><path d="M102.994 172.105c19.379 0 35.088-11.782 35.088-26.316 0-14.533-15.709-26.315-35.088-26.315-19.378 0-35.088 11.782-35.088 26.315 0 14.534 15.71 26.316 35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M120.538 145.789c0 7.267-7.856 13.158-17.544 13.158s-17.544-5.891-17.544-13.158M103.096 159.081l-.053-26.316" stroke-miterlimit="10"/><path d="M120.538 145.789c0-7.266-7.856-13.157-17.544-13.157s-17.544 5.891-17.544 13.157" stroke-miterlimit="10"/><path d="M172.426 126.498c-19.035.299-34.344 11.962-34.344 26.309 0 3.93 1.151 7.656 3.207 11.004 13.523-9.285 24.368-22.186 31.133-37.313h.004z" fill="#fff" stroke-miterlimit="10"/><path d="M138.082 142.281c0 6.666 3.309 12.758 8.761 17.393 13.786-11.12 24.2-26.242 29.481-43.604a46.925 46.925 0 0 0-3.154-.105c-19.379 0-35.088 11.782-35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M138.082 131.754c0 9.109 6.168 17.134 15.544 21.86 12.849-12.709 21.87-29.281 25.172-47.835a47.025 47.025 0 0 0-5.632-.34c-19.379 0-35.088 11.782-35.088 26.315h.004z" fill="#fff" stroke-miterlimit="10"/><path d="M138.082 121.228c0 11.225 9.368 20.804 22.558 24.586 11.175-13.982 18.242-31.393 19.379-50.4a46.51 46.51 0 0 0-6.849-.502c-19.379 0-35.088 11.783-35.088 26.316z" fill="#fff" stroke-miterlimit="10"/><path d="M155.801 108.204v26.312M155.801 134.516h12.632M155.801 108.204h22.456M173.345 108.204v16.357M155.801 121.358l18.948.003" stroke-miterlimit="10"/></g><defs><clipPath id="clip0_1916_6260"><path fill="#fff" transform="translate(.714)" d="M0 0h180v180H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/freedom-4.svg b/src/wp-admin/images/freedom-4.svg
index 0347b33c18804..ec03b644da0bf 100644
--- a/src/wp-admin/images/freedom-4.svg
+++ b/src/wp-admin/images/freedom-4.svg
@@ -1 +1 @@
-<svg width="181" height="180" viewBox="0 0 181 180" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g fill="#FFFFFF" stroke="#3858E9" stroke-width="1.2" stroke-miterlimit="10"><path d="M32.8,144c-4.3,0-8.4,0.6-12.2,1.6c11.6,14.6,27.8,25.6,46.3,30.6c0.6-1.9,0.9-3.9,0.9-5.9C67.9,155.8,52.2,144,32.8,144z"/><path d="M32.8,133.5c-6.6,0-12.8,1.4-18.1,3.8c10.8,17.3,27.4,30.7,47,37.4c3.9-4.2,6.1-9.3,6.1-14.9C67.9,145.3,52.2,133.5,32.8,133.5z"/><path d="M67.9,149.3c0-14.5-15.7-26.3-35.1-26.3c-8.6,0-16.5,2.3-22.6,6.2c9,18.4,23.9,33.1,42.4,41.8C6.9,158.3,67.9,149.3z"/><path d="M67.9,138.8c0-14.5-15.7-26.3-35.1-26.3c-10.3,0-19.6,3.3-26,8.7c6.6,17.8,18.7,32.9,34.2,43.3C56.4,161.6,67.9,151.2,67.9,138.8L67.9,138.8L67.9,138.8z"/><path d="M67.9,128.2c0-14.5-15.7-26.3-35.1-26.3c-11.8,0-22.2,4.4-28.6,11.1c4.2,16,12.8,30.2,24.3,41.4c1.4,0.1,2.8,0.2,4.2,0.2C52.2,154.6,67.9,142.8,67.9,128.2z"/><path d="M67.9,117.7c0-14.5-15.7-26.3-35.1-26.3c-13,0-24.3,5.3-30.4,13.2c2.2,13.3,7.3,25.8,15,36.8c4.6,1.7,9.8,2.6,15.4,2.6C52.2,144,67.9,132.3,67.9,117.7z"/><path d="M67.9,107.2c0-14.5-15.7-26.3-35.1-26.3C19,80.9,7.1,86.8,1.4,95.5c0.6,10.7,3.2,21.2,7.6,31c6.3,4.3,14.6,7,23.8,7C52.2,133.5,67.9,121.7,67.9,107.2L67.9,107.2z"/><path d="M20.6,98l24.8,18.6 M20.6,116.6L45.4,98 M33,94.2v26.3 M15.4,107.3h35.1"/><ellipse cx="103" cy="128.2" rx="35.1" ry="26.3"/><ellipse cx="103" cy="118.2" rx="35.1" ry="26.3"/><ellipse cx="103" cy="108.1" rx="35.1" ry="26.3"/><ellipse cx="103" cy="98" rx="35.1" ry="26.3"/><ellipse cx="103" cy="87.9" rx="35.1" ry="26.3"/><ellipse cx="103" cy="77.8" rx="35.1" ry="26.3"/><ellipse cx="103" cy="67.7" rx="35.1" ry="26.3"/><ellipse cx="103" cy="57.6" rx="35.1" ry="26.3"/><ellipse cx="103" cy="47.5" rx="35.1" ry="26.3"/><path d="M112.9,36.4l-9.9,7.4l-9.9-7.4 M117.9,55l-9.9-7.4l9.9-7.4 M88.1,40.1l9.9,7.4L88.1,55 M93.1,58.7l9.9-7.4l9.9,7.4"/><path d="M103,140.5c-19.4,0-35.1,11.8-35.1,26.3c0,3.7,1,7.2,2.8,10.4c6.5,1.5,13.2,2.2,20,2.2c17.4,0,33.6-5,47.3-13.5C137.4,151.8,122,140.5,103,140.5z"/><path d="M134.4,168.1c2.4-3.5,3.7-7.6,3.7-11.8c0-14.5-15.7-26.3-35.1-26.3s-35.1,11.8-35.1,26.3c0,9.9,7.3,18.6,18.1,23c1.6,0.1,3.1,0.1,4.7,0.1C106.6,179.5,121.5,175.3,134.4,168.1L134.4,168.1z"/><ellipse cx="103" cy="145.8" rx="35.1" ry="26.3"/><ellipse cx="103" cy="145.8" rx="17.5" ry="13.2"/><line x1="103" y1="132.8" x2="103" y2="159"/><path d="M172.4,126.5c-19,0.3-34.3,12-34.3,26.3c0,3.9,1.2,7.7,3.2,11C154.8,154.5,165.7,141.6,172.4,126.5L172.4,126.5z"/><path d="M138.1,142.3c0,6.7,3.3,12.8,8.8,17.4c13.8-11.1,24.2-26.2,29.5-43.6c-1-0.1-2.1-0.1-3.2-0.1C153.8,116,138.1,127.7,138.1,142.3z"/><path d="M138.1,131.8c0,9.1,6.2,17.1,15.5,21.9c12.8-12.7,21.9-29.3,25.2-47.8c-1.9-0.2-3.7-0.3-5.6-0.3C153.8,105.4,138.1,117.2,138.1,131.8L138.1,131.8z"/><path d="M138.1,121.2c0,11.2,9.4,20.8,22.6,24.6c11.2-14,18.2-31.4,19.4-50.4c-2.3-0.3-4.6-0.5-6.8-0.5C153.8,94.9,138.1,106.7,138.1,121.2z"/><path d="M155.8,108.2v26.3 M155.8,134.5h12.6 M155.8,108.2h22.5 M173.3,108.2v16.4 M155.8,121.4h18.9"/></g><path fill="none" stroke="#3858E9" stroke-width="1.2" stroke-miterlimit="10" d="M90.7,179.5c49.4,0,89.5-40.1,89.5-89.5S140.1,0.5,90.7,0.5S1.2,40.6,1.2,90S41.3,179.5,90.7,179.5z"/></svg>
\ No newline at end of file
+<svg width="181" height="180" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_6316)" stroke="#151515" stroke-width="1.2" stroke-miterlimit="10"><path d="M98.433 106.656c0-26.396-21.4-47.796-47.797-47.796-26.396 0-47.224 20.828-47.786 46.736a89.029 89.029 0 0 0 14.71 35.562c8.585 8.235 20.238 13.295 33.076 13.295 26.397 0 47.797-21.4 47.797-47.797z" fill="#fff"/><path d="M102.871 120.491c0-26.396-21.4-47.796-47.796-47.796-26.397 0-47.8 21.396-47.8 47.796 0 .418.007.835.017 1.249 7.337 19.33 21.176 35.46 38.853 45.713a48.01 48.01 0 0 0 8.93.835c26.396 0 47.796-21.4 47.796-47.797z" fill="#fff"/><path d="M109.885 132.94c0-26.396-21.4-47.796-47.796-47.796-26.397 0-47.8 21.4-47.8 47.796 0 1.141.042 2.274.123 3.393 13.382 22.06 36.028 37.874 62.544 42.042 19.119-6.252 32.933-24.231 32.933-45.438l-.004.003z" fill="#fff"/><path d="M119.152 143.691c0-26.396-21.4-47.796-47.796-47.796-26.397 0-47.797 21.4-47.797 47.796 0 1.86.109 3.691.316 5.495 16.393 18.572 40.375 30.288 67.095 30.288 4.46 0 8.845-.33 13.129-.962 9.267-8.719 15.057-21.091 15.057-34.821h-.004z" fill="#fff"/><path d="M82.56 104.628c-26.397 0-47.797 21.4-47.797 47.797 0 2.617.214 5.182.617 7.687 15.267 12.12 34.58 19.362 55.586 19.362 12.442 0 24.291-2.541 35.056-7.13a47.615 47.615 0 0 0 4.337-19.916c0-26.396-21.4-47.796-47.796-47.796l-.004-.004z" fill="#fff"/><path d="M95.387 111.028c-26.396 0-47.796 21.4-47.796 47.797 0 3.438.365 6.789 1.056 10.024 12.6 6.779 27.01 10.625 42.32 10.625 19.417 0 37.389-6.19 52.055-16.699.106-1.301.165-2.621.165-3.95 0-26.397-21.4-47.797-47.796-47.797h-.004z" fill="#fff"/><path d="M109.517 114.775c-26.396 0-47.796 21.4-47.796 47.797 0 4.347.586 8.561 1.673 12.565a89.435 89.435 0 0 0 27.572 4.337c25.625 0 48.73-10.776 65.042-28.039-5.017-21.024-23.926-36.66-46.491-36.66z" fill="#fff"/><path d="M124.587 115.554c-26.396 0-47.796 21.4-47.796 47.797a47.79 47.79 0 0 0 2.523 15.368 90.47 90.47 0 0 0 11.649.755c31.287 0 58.817-16.063 74.81-40.386-8.316-14.084-23.645-23.534-41.186-23.534z" fill="#fff"/><path d="M172.556 126.768c-8.607-8.364-20.355-13.519-33.306-13.519-26.396 0-47.796 21.4-47.796 47.797 0 6.491 1.298 12.68 3.642 18.326 34.537-1.569 63.972-22.716 77.463-52.607l-.003.003z" fill="#fff"/><path d="M104.973 155.937c0 7.73 1.835 15.028 5.095 21.488 32.186-7 57.909-31.316 66.912-62.706a47.573 47.573 0 0 0-24.207-6.579c-26.396 0-47.796 21.4-47.796 47.797h-.004z" fill="#fff"/><path d="M117.029 148.33a47.586 47.586 0 0 0 6.958 24.849c29.253-11.625 50.916-38.228 55.53-70.344a47.714 47.714 0 0 0-14.691-2.305c-26.397 0-47.797 21.4-47.797 47.796v.004z" fill="#fff"/><path d="M127.303 138.547a47.598 47.598 0 0 0 9.344 28.393c25.937-15.435 43.403-43.607 43.775-75.894a48.457 48.457 0 0 0-5.323-.299c-26.396 0-47.796 21.4-47.796 47.797v.003z" fill="#fff"/><path d="M135.485 126.909c0 12.368 4.699 23.638 12.404 32.126 19.877-16.41 32.547-41.242 32.547-69.031 0-3.643-.224-7.236-.645-10.762-24.769 1.79-44.309 22.446-44.309 47.67l.003-.003z" fill="#fff"/><path d="M177.538 67.326c-20.839 5.151-36.288 23.972-36.288 46.4 0 14.351 6.327 27.225 16.344 35.986C171.798 133.874 180.44 112.947 180.44 90a89.629 89.629 0 0 0-2.902-22.674z" fill="#fff"/><path d="M173.454 55.288c-17.144 7.263-29.169 24.242-29.169 44.031 0 16.649 8.516 31.309 21.425 39.867 9.305-14.112 14.726-31.014 14.726-49.186 0-12.309-2.487-24.039-6.986-34.712h.004z" fill="#fff"/><path d="M167.303 43.309c-13.8 8.382-23.018 23.554-23.018 40.88 0 19.285 11.421 35.899 27.867 43.453 5.316-11.442 8.288-24.196 8.288-37.645 0-17.113-4.807-33.099-13.137-46.692v.004z" fill="#fff"/><path d="M159.363 32.323c-11.035 8.754-18.113 22.28-18.113 37.46 0 22.094 14.997 40.687 35.362 46.161A89.489 89.489 0 0 0 180.436 90c0-21.979-7.929-42.102-21.077-57.677h.004z" fill="#fff"/><path d="M135.485 56.6c0 25.06 19.285 45.611 43.821 47.632A90.123 90.123 0 0 0 180.436 90c0-26.916-11.884-51.053-30.691-67.453-8.803 8.67-14.263 20.723-14.263 34.053h.003z" fill="#fff"/><path d="M175.103 92.758c1.793 0 3.561-.102 5.302-.295.021-.817.035-1.638.035-2.463 0-31.94-16.741-59.965-41.919-75.796a47.598 47.598 0 0 0-11.214 30.757c0 26.397 21.4 47.797 47.796 47.797z" fill="#fff"/><path d="M164.826 82.975c5.28 0 10.365-.86 15.112-2.442-3.463-32.94-24.796-60.558-54.133-72.972a47.576 47.576 0 0 0-8.779 27.614c0 26.397 21.4 47.797 47.796 47.797l.004.003z" fill="#fff"/><path d="M152.77 75.368a47.579 47.579 0 0 0 25.014-7.063c-8.039-32.274-33.6-57.614-66-65.337a47.586 47.586 0 0 0-6.814 24.604c0 26.396 21.4 47.796 47.796 47.796h.004z" fill="#fff"/><path d="M139.25 70.256c13.492 0 25.674-5.59 34.362-14.579C160.847 24.965 131.461 2.905 96.675.712c-3.34 6.523-5.221 13.916-5.221 21.748 0 26.396 21.4 47.796 47.796 47.796z" fill="#fff"/><path d="M90.966.526c-3.46 0-6.87.204-10.228.586a47.646 47.646 0 0 0-3.947 19.046c0 26.396 21.4 47.796 47.796 47.796 18.309 0 34.207-10.294 42.235-25.407C151.005 17.31 122.949.527 90.966.527z" fill="#fff"/><path d="M90.966.526a89.533 89.533 0 0 0-26.333 3.94 47.703 47.703 0 0 0-2.912 16.47c0 26.397 21.4 47.797 47.796 47.797 23.579 0 43.168-17.073 47.084-39.533C140.257 11.568 116.903.526 90.966.526z" fill="#fff"/><path d="M49.7 10.597a47.78 47.78 0 0 0-2.113 14.087c0 26.397 21.4 47.797 47.797 47.797 26.396 0 47.796-21.4 47.796-47.797 0-2.656-.221-5.26-.635-7.796C127.97 6.582 110.177.526 90.966.526c-14.884 0-28.916 3.639-41.263 10.07h-.004z" fill="#fff"/><path d="M36.25 19.207a47.82 47.82 0 0 0-1.487 11.874c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.796 0-8.91-2.442-17.25-6.685-24.39C113.542 2.712 102.51.526 90.966.526c-20.61 0-39.59 6.972-54.716 18.681z" fill="#fff"/><path d="M24.56 30.039a48.03 48.03 0 0 0-1.004 9.779c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.797 0-16.049-7.909-30.249-20.043-38.919a90.565 90.565 0 0 0-8.143-.372c-26.344 0-50.032 11.39-66.404 29.513z" fill="#fff"/><path d="M62.085 98.365c26.397 0 47.797-21.4 47.797-47.797 0-24.07-17.793-43.982-40.944-47.305C46.215 9.014 26.96 23.463 14.91 42.86a48.118 48.118 0 0 0-.621 7.708c0 26.397 21.4 47.797 47.796 47.797z" fill="#fff"/><path d="M102.871 63.018c0-26.397-21.4-47.797-47.796-47.797a47.668 47.668 0 0 0-18.432 3.684c-12.901 9.87-23.035 23.172-29.042 38.54a48.69 48.69 0 0 0-.326 5.573c0 26.396 21.4 47.796 47.796 47.796 26.397 0 47.797-21.4 47.797-47.796h.003z" fill="#fff"/><path d="M98.433 76.853c0-26.397-21.4-47.797-47.797-47.797-16.89 0-31.737 8.762-40.238 21.99a88.832 88.832 0 0 0-7.474 22.933c-.056.95-.088 1.909-.088 2.877 0 26.397 21.4 47.797 47.797 47.797 26.396 0 47.796-21.4 47.796-47.797l.004-.003z" fill="#fff"/><path d="M49.082 139.551c26.397 0 47.796-21.399 47.796-47.797 0-26.397-21.399-47.796-47.796-47.796S1.285 65.358 1.285 91.754c0 26.398 21.4 47.797 47.797 47.797z" fill="#fff"/><path d="M49.036 139.712c26.398 0 47.797-21.399 47.797-47.796s-21.4-47.797-47.797-47.797S1.24 65.52 1.24 91.916s21.399 47.796 47.796 47.796zM82.749 125.568l27.677 27.678"/><path d="M41.801 60.677l3.509 3.383c-13.846 1.726-24.561 13.53-24.561 27.845 0 14.316 10.715 26.116 24.561 27.846M55.836 123.133l-3.508-3.382c13.845-1.726 24.56-13.53 24.56-27.846S66.174 65.79 52.329 64.06M36.633 79.512l24.81 24.811M36.633 104.323l24.81-24.81M49.036 74.372v35.088M31.492 91.916H66.58"/><path d="M90.966 179.474c49.415 0 89.474-40.059 89.474-89.474 0-49.415-40.059-89.474-89.474-89.474C41.551.526 1.492 40.585 1.492 90c0 49.415 40.06 89.474 89.474 89.474z"/></g><defs><clipPath id="clip0_1916_6316"><path fill="#fff" transform="translate(.714)" d="M0 0h180.253v180H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/images/privacy.svg b/src/wp-admin/images/privacy.svg
index d3f3d11e1911b..7f37208f6f9f5 100644
--- a/src/wp-admin/images/privacy.svg
+++ b/src/wp-admin/images/privacy.svg
@@ -1 +1 @@
-<svg width="320" height="320" viewBox="0 0 320 320" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><g fill="#FFFFFF" stroke="#3858E9" stroke-width="1.2" stroke-miterlimit="10"><path d="M256.7.9H63.3C28.9.9.9 28.9.9 63.3V160a159.1 159.1 0 0 0 318.2 0V63.3c0-34.4-28-62.4-62.4-62.4z"/><circle cx="231.7" cy="104.2" r="35.1"/><circle cx="221.1" cy="114.8" r="35.1"/><circle cx="210.5" cy="125.4" r="35.1"/><circle cx="199.9" cy="136" r="35.1"/><circle cx="189.3" cy="146.6" r="35.1"/><circle cx="178.7" cy="157.2" r="35.1"/><circle cx="168.1" cy="167.8" r="35.1"/><circle cx="158.1" cy="177.8" r="35.1"/><circle cx="146.9" cy="189" r="35.1"/><circle cx="136.3" cy="199.6" r="35.1"/><circle cx="126.2" cy="189.5" r="35.1"/><circle cx="116.1" cy="179.4" r="35.1"/><circle cx="106" cy="169.3" r="35.1"/><circle cx="95.9" cy="159.2" r="35.1"/><circle cx="85.8" cy="149.1" r="35.1"/></g></svg>
\ No newline at end of file
+<svg width="320" height="320" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_1916_5672)" fill="#fff" stroke="#151515" stroke-width="1.2" stroke-miterlimit="10"><path d="M256.686.936H63.314C28.862.936.936 28.862.936 63.314V160c0 87.847 71.217 159.064 159.064 159.064S319.064 247.847 319.064 160V63.314c0-34.452-27.926-62.378-62.378-62.378z"/><path d="M231.735 139.259c19.378 0 35.088-15.709 35.088-35.087 0-19.379-15.71-35.088-35.088-35.088s-35.088 15.71-35.088 35.088 15.71 35.087 35.088 35.087z"/><path d="M221.131 149.864c19.378 0 35.087-15.71 35.087-35.088 0-19.379-15.709-35.088-35.087-35.088-19.379 0-35.088 15.71-35.088 35.088s15.709 35.088 35.088 35.088z"/><path d="M210.526 160.468c19.379 0 35.088-15.71 35.088-35.088s-15.709-35.088-35.088-35.088c-19.378 0-35.087 15.71-35.087 35.088s15.709 35.088 35.087 35.088z"/><path d="M199.922 171.072c19.378 0 35.088-15.709 35.088-35.088 0-19.378-15.71-35.087-35.088-35.087s-35.088 15.709-35.088 35.087c0 19.379 15.71 35.088 35.088 35.088z"/><path d="M189.318 181.676c19.378 0 35.087-15.709 35.087-35.087 0-19.379-15.709-35.088-35.087-35.088-19.379 0-35.088 15.709-35.088 35.088 0 19.378 15.709 35.087 35.088 35.087z"/><path d="M178.713 192.281c19.379 0 35.088-15.71 35.088-35.088s-15.709-35.088-35.088-35.088c-19.378 0-35.087 15.71-35.087 35.088s15.709 35.088 35.087 35.088z"/><path d="M168.109 202.885c19.379 0 35.088-15.709 35.088-35.088 0-19.378-15.709-35.087-35.088-35.087-19.378 0-35.088 15.709-35.088 35.087 0 19.379 15.71 35.088 35.088 35.088z"/><path d="M157.505 213.489c19.378 0 35.088-15.709 35.088-35.087 0-19.379-15.71-35.088-35.088-35.088-19.379 0-35.088 15.709-35.088 35.088 0 19.378 15.709 35.087 35.088 35.087z"/><path d="M146.901 224.094c19.378 0 35.087-15.71 35.087-35.088 0-19.379-15.709-35.088-35.087-35.088-19.379 0-35.088 15.709-35.088 35.088 0 19.378 15.709 35.088 35.088 35.088z"/><path d="M136.296 234.698c19.379 0 35.088-15.709 35.088-35.088 0-19.378-15.709-35.088-35.088-35.088-19.378 0-35.087 15.71-35.087 35.088 0 19.379 15.709 35.088 35.087 35.088z"/><path d="M136.296 234.698c19.379 0 35.088-15.709 35.088-35.088 0-19.378-15.709-35.088-35.088-35.088-19.378 0-35.087 15.71-35.087 35.088 0 19.379 15.709 35.088 35.087 35.088z"/><path d="M126.191 224.593c19.378 0 35.088-15.71 35.088-35.088 0-19.379-15.71-35.088-35.088-35.088s-35.088 15.709-35.088 35.088c0 19.378 15.71 35.088 35.088 35.088z"/><path d="M116.086 214.487c19.378 0 35.087-15.709 35.087-35.087 0-19.379-15.709-35.088-35.087-35.088-19.379 0-35.088 15.709-35.088 35.088 0 19.378 15.71 35.087 35.088 35.087z"/><path d="M105.98 204.382c19.379 0 35.088-15.709 35.088-35.088 0-19.378-15.709-35.087-35.088-35.087-19.378 0-35.087 15.709-35.087 35.087 0 19.379 15.71 35.088 35.087 35.088z"/><path d="M95.875 194.277c19.379 0 35.088-15.71 35.088-35.088s-15.709-35.088-35.088-35.088c-19.378 0-35.087 15.71-35.087 35.088s15.709 35.088 35.087 35.088z"/><path d="M85.77 184.172c19.378 0 35.088-15.71 35.088-35.088 0-19.379-15.71-35.088-35.088-35.088s-35.088 15.709-35.088 35.088c0 19.378 15.71 35.088 35.088 35.088z"/></g><defs><clipPath id="clip0_1916_5672"><path fill="#fff" d="M0 0h320v320H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php
index fe911f86c94da..7bf1c1a135490 100644
--- a/src/wp-admin/import.php
+++ b/src/wp-admin/import.php
@@ -29,8 +29,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-import-screen/">Documentation on Import</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-import-screen/">Documentation on Import</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums">Support</a>' ) . '</p>'
 );
 
 if ( current_user_can( 'install_plugins' ) ) {
diff --git a/src/wp-admin/includes/admin.php b/src/wp-admin/includes/admin.php
index c2c1890ec864c..ce2ec0c68b855 100644
--- a/src/wp-admin/includes/admin.php
+++ b/src/wp-admin/includes/admin.php
@@ -13,7 +13,9 @@
 	 * some setup was skipped. Make sure the admin message catalog is loaded since
 	 * load_default_textdomain() will not have done so in this context.
 	 */
-	load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+	$admin_locale = get_locale();
+	load_textdomain( 'default', WP_LANG_DIR . '/admin-' . $admin_locale . '.mo', $admin_locale );
+	unset( $admin_locale );
 }
 
 /** WordPress Administration Hooks */
diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
index 6ca6a0217ac1e..3c5dab31b500b 100644
--- a/src/wp-admin/includes/ajax-actions.php
+++ b/src/wp-admin/includes/ajax-actions.php
@@ -12,7 +12,7 @@
 //
 
 /**
- * Ajax handler for the Heartbeat API in the no-privilege context.
+ * Handles the Heartbeat API in the no-privilege context via AJAX .
  *
  * Runs when the user is not logged in.
  *
@@ -76,7 +76,7 @@ function wp_ajax_nopriv_heartbeat() {
 //
 
 /**
- * Ajax handler for fetching a list table.
+ * Handles fetching a list table via AJAX.
  *
  * @since 3.1.0
  */
@@ -99,7 +99,7 @@ function wp_ajax_fetch_list() {
 }
 
 /**
- * Ajax handler for tag search.
+ * Handles tag search via AJAX.
  *
  * @since 3.1.0
  */
@@ -126,7 +126,7 @@ function wp_ajax_ajax_tag_search() {
 		$search = str_replace( $comma, ',', $search );
 	}
 
-	if ( false !== strpos( $search, ',' ) ) {
+	if ( str_contains( $search, ',' ) ) {
 		$search = explode( ',', $search );
 		$search = $search[ count( $search ) - 1 ];
 	}
@@ -178,7 +178,7 @@ function wp_ajax_ajax_tag_search() {
 }
 
 /**
- * Ajax handler for compression testing.
+ * Handles compression testing via AJAX.
  *
  * @since 3.1.0
  */
@@ -188,7 +188,12 @@ function wp_ajax_wp_compression_test() {
 	}
 
 	if ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) ) {
-		update_site_option( 'can_compress_scripts', 0 );
+		// Use `update_option()` on single site to mark the option for autoloading.
+		if ( is_multisite() ) {
+			update_site_option( 'can_compress_scripts', 0 );
+		} else {
+			update_option( 'can_compress_scripts', 0, 'yes' );
+		}
 		wp_die( 0 );
 	}
 
@@ -222,10 +227,20 @@ function wp_ajax_wp_compression_test() {
 			wp_die();
 		} elseif ( 'no' === $_GET['test'] ) {
 			check_ajax_referer( 'update_can_compress_scripts' );
-			update_site_option( 'can_compress_scripts', 0 );
+			// Use `update_option()` on single site to mark the option for autoloading.
+			if ( is_multisite() ) {
+				update_site_option( 'can_compress_scripts', 0 );
+			} else {
+				update_option( 'can_compress_scripts', 0, 'yes' );
+			}
 		} elseif ( 'yes' === $_GET['test'] ) {
 			check_ajax_referer( 'update_can_compress_scripts' );
-			update_site_option( 'can_compress_scripts', 1 );
+			// Use `update_option()` on single site to mark the option for autoloading.
+			if ( is_multisite() ) {
+				update_site_option( 'can_compress_scripts', 1 );
+			} else {
+				update_option( 'can_compress_scripts', 1, 'yes' );
+			}
 		}
 	}
 
@@ -233,7 +248,7 @@ function wp_ajax_wp_compression_test() {
 }
 
 /**
- * Ajax handler for image editor previews.
+ * Handles image editor previews via AJAX.
  *
  * @since 3.1.0
  */
@@ -245,7 +260,7 @@ function wp_ajax_imgedit_preview() {
 
 	check_ajax_referer( "image_editor-$post_id" );
 
-	include_once ABSPATH . 'wp-admin/includes/image-edit.php';
+	require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 
 	if ( ! stream_preview_image( $post_id ) ) {
 		wp_die( -1 );
@@ -255,7 +270,7 @@ function wp_ajax_imgedit_preview() {
 }
 
 /**
- * Ajax handler for oEmbed caching.
+ * Handles oEmbed caching via AJAX.
  *
  * @since 3.1.0
  *
@@ -267,7 +282,7 @@ function wp_ajax_oembed_cache() {
 }
 
 /**
- * Ajax handler for user autocomplete.
+ * Handles user autocomplete via AJAX.
  *
  * @since 3.4.0
  */
@@ -283,16 +298,20 @@ function wp_ajax_autocomplete_user() {
 
 	$return = array();
 
-	// Check the type of request.
-	// Current allowed values are `add` and `search`.
+	/*
+	 * Check the type of request.
+	 * Current allowed values are `add` and `search`.
+	 */
 	if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {
 		$type = $_REQUEST['autocomplete_type'];
 	} else {
 		$type = 'add';
 	}
 
-	// Check the desired field for value.
-	// Current allowed values are `user_email` and `user_login`.
+	/*
+	 * Check the desired field for value.
+	 * Current allowed values are `user_email` and `user_login`.
+	 */
 	if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {
 		$field = $_REQUEST['autocomplete_field'];
 	} else {
@@ -394,7 +413,7 @@ function wp_ajax_get_community_events() {
 }
 
 /**
- * Ajax handler for dashboard widgets.
+ * Handles dashboard widgets via AJAX.
  *
  * @since 3.4.0
  */
@@ -415,7 +434,7 @@ function wp_ajax_dashboard_widgets() {
 }
 
 /**
- * Ajax handler for Customizer preview logged-in status.
+ * Handles Customizer preview logged-in status via AJAX.
  *
  * @since 3.4.0
  */
@@ -563,7 +582,7 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
 //
 
 /**
- * Ajax handler for adding a hierarchical term.
+ * Handles adding a hierarchical term via AJAX.
  *
  * @since 3.1.0
  * @access private
@@ -693,7 +712,7 @@ function _wp_ajax_add_hierarchical_term() {
 }
 
 /**
- * Ajax handler for deleting a comment.
+ * Handles deleting a comment via AJAX.
  *
  * @since 3.1.0
  */
@@ -763,7 +782,7 @@ function wp_ajax_delete_comment() {
 }
 
 /**
- * Ajax handler for deleting a tag.
+ * Handles deleting a tag via AJAX.
  *
  * @since 3.1.0
  */
@@ -790,7 +809,7 @@ function wp_ajax_delete_tag() {
 }
 
 /**
- * Ajax handler for deleting a link.
+ * Handles deleting a link via AJAX.
  *
  * @since 3.1.0
  */
@@ -816,7 +835,7 @@ function wp_ajax_delete_link() {
 }
 
 /**
- * Ajax handler for deleting meta.
+ * Handles deleting meta via AJAX.
  *
  * @since 3.1.0
  */
@@ -842,7 +861,7 @@ function wp_ajax_delete_meta() {
 }
 
 /**
- * Ajax handler for deleting a post.
+ * Handles deleting a post via AJAX.
  *
  * @since 3.1.0
  *
@@ -872,7 +891,7 @@ function wp_ajax_delete_post( $action ) {
 }
 
 /**
- * Ajax handler for sending a post to the Trash.
+ * Handles sending a post to the Trash via AJAX.
  *
  * @since 3.1.0
  *
@@ -908,7 +927,7 @@ function wp_ajax_trash_post( $action ) {
 }
 
 /**
- * Ajax handler to restore a post from the Trash.
+ * Handles restoring a post from the Trash via AJAX.
  *
  * @since 3.1.0
  *
@@ -923,7 +942,7 @@ function wp_ajax_untrash_post( $action ) {
 }
 
 /**
- * Ajax handler to delete a page.
+ * Handles deleting a page via AJAX.
  *
  * @since 3.1.0
  *
@@ -953,7 +972,7 @@ function wp_ajax_delete_page( $action ) {
 }
 
 /**
- * Ajax handler to dim a comment.
+ * Handles dimming a comment via AJAX.
  *
  * @since 3.1.0
  */
@@ -1009,7 +1028,7 @@ function wp_ajax_dim_comment() {
 }
 
 /**
- * Ajax handler for adding a link category.
+ * Handles adding a link category via AJAX.
  *
  * @since 3.1.0
  *
@@ -1062,7 +1081,7 @@ function wp_ajax_add_link_category( $action ) {
 }
 
 /**
- * Ajax handler to add a tag.
+ * Handles adding a tag via AJAX.
  *
  * @since 3.1.0
  */
@@ -1154,7 +1173,7 @@ function wp_ajax_add_tag() {
 }
 
 /**
- * Ajax handler for getting a tagcloud.
+ * Handles getting a tagcloud via AJAX.
  *
  * @since 3.1.0
  */
@@ -1214,7 +1233,7 @@ function wp_ajax_get_tagcloud() {
 }
 
 /**
- * Ajax handler for getting comments.
+ * Handles getting comments via AJAX.
  *
  * @since 3.1.0
  *
@@ -1277,7 +1296,7 @@ function wp_ajax_get_comments( $action ) {
 }
 
 /**
- * Ajax handler for replying to a comment.
+ * Handles replying to a comment via AJAX.
  *
  * @since 3.1.0
  *
@@ -1437,7 +1456,7 @@ function wp_ajax_replyto_comment( $action ) {
 }
 
 /**
- * Ajax handler for editing a comment.
+ * Handles editing a comment via AJAX.
  *
  * @since 3.1.0
  */
@@ -1492,7 +1511,7 @@ function wp_ajax_edit_comment() {
 }
 
 /**
- * Ajax handler for adding a menu item.
+ * Handles adding a menu item via AJAX.
  *
  * @since 3.1.0
  */
@@ -1505,8 +1524,10 @@ function wp_ajax_add_menu_item() {
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
-	// For performance reasons, we omit some object properties from the checklist.
-	// The following is a hacky way to restore them when adding non-custom items.
+	/*
+	 * For performance reasons, we omit some object properties from the checklist.
+	 * The following is a hacky way to restore them when adding non-custom items.
+	 */
 	$menu_items_data = array();
 
 	foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
@@ -1570,7 +1591,7 @@ function wp_ajax_add_menu_item() {
 			'before'      => '',
 			'link_after'  => '',
 			'link_before' => '',
-			'walker'      => new $walker_class_name,
+			'walker'      => new $walker_class_name(),
 		);
 
 		echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
@@ -1580,7 +1601,7 @@ function wp_ajax_add_menu_item() {
 }
 
 /**
- * Ajax handler for adding meta.
+ * Handles adding meta via AJAX.
  *
  * @since 3.1.0
  */
@@ -1702,7 +1723,7 @@ function wp_ajax_add_meta() {
 }
 
 /**
- * Ajax handler for adding a user.
+ * Handles adding a user via AJAX.
  *
  * @since 3.1.0
  *
@@ -1757,7 +1778,7 @@ function wp_ajax_add_user( $action ) {
 }
 
 /**
- * Ajax handler for closed post boxes.
+ * Handles closed post boxes via AJAX.
  *
  * @since 3.1.0
  */
@@ -1794,7 +1815,7 @@ function wp_ajax_closed_postboxes() {
 }
 
 /**
- * Ajax handler for hidden columns.
+ * Handles hidden columns via AJAX.
  *
  * @since 3.1.0
  */
@@ -1818,7 +1839,7 @@ function wp_ajax_hidden_columns() {
 }
 
 /**
- * Ajax handler for updating whether to display the welcome panel.
+ * Handles updating whether to display the welcome panel via AJAX.
  *
  * @since 3.1.0
  */
@@ -1835,7 +1856,7 @@ function wp_ajax_update_welcome_panel() {
 }
 
 /**
- * Ajax handler for retrieving menu meta boxes.
+ * Handles for retrieving menu meta boxes via AJAX.
  *
  * @since 3.1.0
  */
@@ -1886,7 +1907,7 @@ function wp_ajax_menu_get_metabox() {
 }
 
 /**
- * Ajax handler for internal linking.
+ * Handles internal linking via AJAX.
  *
  * @since 3.1.0
  */
@@ -1922,7 +1943,7 @@ function wp_ajax_wp_link_ajax() {
 }
 
 /**
- * Ajax handler for menu locations save.
+ * Handles saving menu locations via AJAX.
  *
  * @since 3.1.0
  */
@@ -1942,7 +1963,7 @@ function wp_ajax_menu_locations_save() {
 }
 
 /**
- * Ajax handler for saving the meta box order.
+ * Handles saving the meta box order via AJAX.
  *
  * @since 3.1.0
  */
@@ -1978,7 +1999,7 @@ function wp_ajax_meta_box_order() {
 }
 
 /**
- * Ajax handler for menu quick searching.
+ * Handles menu quick searching via AJAX.
  *
  * @since 3.1.0
  */
@@ -1995,7 +2016,7 @@ function wp_ajax_menu_quick_search() {
 }
 
 /**
- * Ajax handler to retrieve a permalink.
+ * Handles retrieving a permalink via AJAX.
  *
  * @since 3.1.0
  */
@@ -2006,7 +2027,7 @@ function wp_ajax_get_permalink() {
 }
 
 /**
- * Ajax handler to retrieve a sample permalink.
+ * Handles retrieving a sample permalink via AJAX.
  *
  * @since 3.1.0
  */
@@ -2019,7 +2040,7 @@ function wp_ajax_sample_permalink() {
 }
 
 /**
- * Ajax handler for Quick Edit saving a post from a list table.
+ * Handles Quick Edit saving a post from a list table via AJAX.
  *
  * @since 3.1.0
  *
@@ -2034,19 +2055,19 @@ function wp_ajax_inline_save() {
 		wp_die();
 	}
 
-	$post_ID = (int) $_POST['post_ID'];
+	$post_id = (int) $_POST['post_ID'];
 
 	if ( 'page' === $_POST['post_type'] ) {
-		if ( ! current_user_can( 'edit_page', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_page', $post_id ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
 		}
 	} else {
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 	}
 
-	$last = wp_check_post_lock( $post_ID );
+	$last = wp_check_post_lock( $post_id );
 	if ( $last ) {
 		$last_user      = get_userdata( $last );
 		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
@@ -2065,7 +2086,7 @@ function wp_ajax_inline_save() {
 
 	$data = &$_POST;
 
-	$post = get_post( $post_ID, ARRAY_A );
+	$post = get_post( $post_id, ARRAY_A );
 
 	// Since it's coming from the database.
 	$post = wp_slash( $post );
@@ -2138,7 +2159,7 @@ function wp_ajax_inline_save() {
 }
 
 /**
- * Ajax handler for quick edit saving for a term.
+ * Handles Quick Edit saving for a term via AJAX.
  *
  * @since 3.1.0
  */
@@ -2198,7 +2219,7 @@ function wp_ajax_inline_save_tax() {
 }
 
 /**
- * Ajax handler for querying posts for the Find Posts modal.
+ * Handles querying posts for the Find Posts modal via AJAX.
  *
  * @see window.findPosts
  *
@@ -2267,7 +2288,7 @@ function wp_ajax_find_posts() {
 }
 
 /**
- * Ajax handler for saving the widgets order.
+ * Handles saving the widgets order via AJAX.
  *
  * @since 3.1.0
  */
@@ -2291,7 +2312,7 @@ function wp_ajax_widgets_order() {
 				$val = explode( ',', $val );
 
 				foreach ( $val as $k => $v ) {
-					if ( strpos( $v, 'widget-' ) === false ) {
+					if ( ! str_contains( $v, 'widget-' ) ) {
 						continue;
 					}
 
@@ -2309,7 +2330,7 @@ function wp_ajax_widgets_order() {
 }
 
 /**
- * Ajax handler for saving a widget.
+ * Handles saving a widget via AJAX.
  *
  * @since 3.1.0
  *
@@ -2418,7 +2439,7 @@ function wp_ajax_save_widget() {
 }
 
 /**
- * Ajax handler for updating a widget.
+ * Handles updating a widget via AJAX.
  *
  * @since 3.9.0
  *
@@ -2430,7 +2451,7 @@ function wp_ajax_update_widget() {
 }
 
 /**
- * Ajax handler for removing inactive widgets.
+ * Handles removing inactive widgets via AJAX.
  *
  * @since 4.4.0
  */
@@ -2467,7 +2488,7 @@ function wp_ajax_delete_inactive_widgets() {
 }
 
 /**
- * Ajax handler for creating missing image sub-sizes for just uploaded images.
+ * Handles creating missing image sub-sizes for just uploaded images via AJAX.
  *
  * @since 5.3.0
  */
@@ -2497,14 +2518,18 @@ function wp_ajax_media_create_image_subsizes() {
 		}
 	}
 
-	// Set a custom header with the attachment_id.
-	// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+	/*
+	 * Set a custom header with the attachment_id.
+	 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+	 */
 	if ( ! headers_sent() ) {
 		header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
 	}
 
-	// This can still be pretty slow and cause timeout or out of memory errors.
-	// The js that handles the response would need to also handle HTTP 500 errors.
+	/*
+	 * This can still be pretty slow and cause timeout or out of memory errors.
+	 * The js that handles the response would need to also handle HTTP 500 errors.
+	 */
 	wp_update_image_subsizes( $attachment_id );
 
 	if ( ! empty( $_POST['_legacy_support'] ) ) {
@@ -2524,7 +2549,7 @@ function wp_ajax_media_create_image_subsizes() {
 }
 
 /**
- * Ajax handler for uploading attachments
+ * Handles uploading attachments via AJAX.
  *
  * @since 3.3.0
  */
@@ -2532,7 +2557,7 @@ function wp_ajax_upload_attachment() {
 	check_ajax_referer( 'media-form' );
 	/*
 	 * This function does not use wp_send_json_success() / wp_send_json_error()
-	 * as the html4 Plupload handler requires a text/html content-type for older IE.
+	 * as the html4 Plupload handler requires a text/html Content-Type for older IE.
 	 * See https://core.trac.wordpress.org/ticket/31037
 	 */
 
@@ -2637,7 +2662,7 @@ function wp_ajax_upload_attachment() {
 }
 
 /**
- * Ajax handler for image editing.
+ * Handles image editing via AJAX.
  *
  * @since 3.1.0
  */
@@ -2649,7 +2674,7 @@ function wp_ajax_image_editor() {
 	}
 
 	check_ajax_referer( "image_editor-$attachment_id" );
-	include_once ABSPATH . 'wp-admin/includes/image-edit.php';
+	require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 
 	$msg = false;
 
@@ -2692,37 +2717,37 @@ function wp_ajax_image_editor() {
 }
 
 /**
- * Ajax handler for setting the featured image.
+ * Handles setting the featured image via AJAX.
  *
  * @since 3.1.0
  */
 function wp_ajax_set_post_thumbnail() {
 	$json = ! empty( $_REQUEST['json'] ); // New-style request.
 
-	$post_ID = (int) $_POST['post_id'];
-	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+	$post_id = (int) $_POST['post_id'];
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		wp_die( -1 );
 	}
 
 	$thumbnail_id = (int) $_POST['thumbnail_id'];
 
 	if ( $json ) {
-		check_ajax_referer( "update-post_$post_ID" );
+		check_ajax_referer( "update-post_$post_id" );
 	} else {
-		check_ajax_referer( "set_post_thumbnail-$post_ID" );
+		check_ajax_referer( "set_post_thumbnail-$post_id" );
 	}
 
 	if ( '-1' == $thumbnail_id ) {
-		if ( delete_post_thumbnail( $post_ID ) ) {
-			$return = _wp_post_thumbnail_html( null, $post_ID );
+		if ( delete_post_thumbnail( $post_id ) ) {
+			$return = _wp_post_thumbnail_html( null, $post_id );
 			$json ? wp_send_json_success( $return ) : wp_die( $return );
 		} else {
 			wp_die( 0 );
 		}
 	}
 
-	if ( set_post_thumbnail( $post_ID, $thumbnail_id ) ) {
-		$return = _wp_post_thumbnail_html( $thumbnail_id, $post_ID );
+	if ( set_post_thumbnail( $post_id, $thumbnail_id ) ) {
+		$return = _wp_post_thumbnail_html( $thumbnail_id, $post_id );
 		$json ? wp_send_json_success( $return ) : wp_die( $return );
 	}
 
@@ -2730,16 +2755,16 @@ function wp_ajax_set_post_thumbnail() {
 }
 
 /**
- * Ajax handler for retrieving HTML for the featured image.
+ * Handles retrieving HTML for the featured image via AJAX.
  *
  * @since 4.6.0
  */
 function wp_ajax_get_post_thumbnail_html() {
-	$post_ID = (int) $_POST['post_id'];
+	$post_id = (int) $_POST['post_id'];
 
-	check_ajax_referer( "update-post_$post_ID" );
+	check_ajax_referer( "update-post_$post_id" );
 
-	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		wp_die( -1 );
 	}
 
@@ -2750,12 +2775,12 @@ function wp_ajax_get_post_thumbnail_html() {
 		$thumbnail_id = null;
 	}
 
-	$return = _wp_post_thumbnail_html( $thumbnail_id, $post_ID );
+	$return = _wp_post_thumbnail_html( $thumbnail_id, $post_id );
 	wp_send_json_success( $return );
 }
 
 /**
- * Ajax handler for setting the featured image for an attachment.
+ * Handles setting the featured image for an attachment via AJAX.
  *
  * @since 4.0.0
  *
@@ -2771,6 +2796,10 @@ function wp_ajax_set_attachment_thumbnail() {
 		wp_send_json_error();
 	}
 
+	if ( false === check_ajax_referer( 'set-attachment-thumbnail', '_ajax_nonce', false ) ) {
+		wp_send_json_error();
+	}
+
 	$post_ids = array();
 	// For each URL, try to find its corresponding post ID.
 	foreach ( $_POST['urls'] as $url ) {
@@ -2806,7 +2835,7 @@ function wp_ajax_set_attachment_thumbnail() {
 }
 
 /**
- * Ajax handler for date formatting.
+ * Handles formatting a date via AJAX.
  *
  * @since 3.1.0
  */
@@ -2815,7 +2844,7 @@ function wp_ajax_date_format() {
 }
 
 /**
- * Ajax handler for time formatting.
+ * Handles formatting a time via AJAX.
  *
  * @since 3.1.0
  */
@@ -2824,7 +2853,7 @@ function wp_ajax_time_format() {
 }
 
 /**
- * Ajax handler for saving posts from the fullscreen editor.
+ * Handles saving posts from the fullscreen editor via AJAX.
  *
  * @since 3.1.0
  * @deprecated 4.3.0
@@ -2868,7 +2897,7 @@ function wp_ajax_wp_fullscreen_save_post() {
 }
 
 /**
- * Ajax handler for removing a post lock.
+ * Handles removing a post lock via AJAX.
  *
  * @since 3.1.0
  */
@@ -2910,7 +2939,7 @@ function wp_ajax_wp_remove_post_lock() {
 }
 
 /**
- * Ajax handler for dismissing a WordPress pointer.
+ * Handles dismissing a WordPress pointer via AJAX.
  *
  * @since 3.1.0
  */
@@ -2937,7 +2966,7 @@ function wp_ajax_dismiss_wp_pointer() {
 }
 
 /**
- * Ajax handler for getting an attachment.
+ * Handles getting an attachment via AJAX.
  *
  * @since 3.5.0
  */
@@ -2973,7 +3002,7 @@ function wp_ajax_get_attachment() {
 }
 
 /**
- * Ajax handler for querying attachments.
+ * Handles querying attachments via AJAX.
  *
  * @since 3.5.0
  */
@@ -3064,7 +3093,7 @@ function wp_ajax_query_attachments() {
 }
 
 /**
- * Ajax handler for updating attachment attributes.
+ * Handles updating attachment attributes via AJAX.
  *
  * @since 3.5.0
  */
@@ -3150,7 +3179,7 @@ function wp_ajax_save_attachment() {
 }
 
 /**
- * Ajax handler for saving backward compatible attachment attributes.
+ * Handles saving backward compatible attachment attributes via AJAX.
  *
  * @since 3.5.0
  */
@@ -3208,7 +3237,7 @@ function wp_ajax_save_attachment_compat() {
 }
 
 /**
- * Ajax handler for saving the attachment order.
+ * Handles saving the attachment order via AJAX.
  *
  * @since 3.5.0
  */
@@ -3261,7 +3290,7 @@ function wp_ajax_save_attachment_order() {
 }
 
 /**
- * Ajax handler for sending an attachment to the editor.
+ * Handles sending an attachment to the editor via AJAX.
  *
  * Generates the HTML to send an attachment to the editor.
  * Backward compatible with the {@see 'media_send_to_editor'} filter
@@ -3300,11 +3329,11 @@ function wp_ajax_send_attachment_to_editor() {
 	}
 
 	$url = empty( $attachment['url'] ) ? '' : $attachment['url'];
-	$rel = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $id ) == $url );
+	$rel = ( str_contains( $url, 'attachment_id' ) || get_attachment_link( $id ) === $url );
 
 	remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
 
-	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
+	if ( str_starts_with( $post->post_mime_type, 'image' ) ) {
 		$align = isset( $attachment['align'] ) ? $attachment['align'] : 'none';
 		$size  = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
 		$alt   = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
@@ -3335,7 +3364,7 @@ function wp_ajax_send_attachment_to_editor() {
 }
 
 /**
- * Ajax handler for sending a link to the editor.
+ * Handles sending a link to the editor via AJAX.
  *
  * Generates the HTML to send a non-image embed link to the editor.
  *
@@ -3407,7 +3436,7 @@ function wp_ajax_send_link_to_editor() {
 }
 
 /**
- * Ajax handler for the Heartbeat API.
+ * Handles the Heartbeat API via AJAX.
  *
  * Runs when the user is logged in.
  *
@@ -3494,7 +3523,7 @@ function wp_ajax_heartbeat() {
 }
 
 /**
- * Ajax handler for getting revision diffs.
+ * Handles getting revision diffs via AJAX.
  *
  * @since 3.6.0
  */
@@ -3517,7 +3546,10 @@ function wp_ajax_get_revision_diffs() {
 	}
 
 	$return = array();
-	set_time_limit( 0 );
+
+	if ( function_exists( 'set_time_limit' ) ) {
+		set_time_limit( 0 );
+	}
 
 	foreach ( $_REQUEST['compare'] as $compare_key ) {
 		list( $compare_from, $compare_to ) = explode( ':', $compare_key ); // from:to
@@ -3531,8 +3563,8 @@ function wp_ajax_get_revision_diffs() {
 }
 
 /**
- * Ajax handler for auto-saving the selected color scheme for
- * a user's own profile.
+ * Handles auto-saving the selected color scheme for
+ * a user's own profile via AJAX.
  *
  * @since 3.8.0
  *
@@ -3561,7 +3593,7 @@ function wp_ajax_save_user_color_scheme() {
 }
 
 /**
- * Ajax handler for getting themes from themes_api().
+ * Handles getting themes from themes_api() via AJAX.
  *
  * @since 3.9.0
  *
@@ -3692,7 +3724,7 @@ function wp_ajax_query_themes() {
 }
 
 /**
- * Apply [embed] Ajax handlers to a string.
+ * Applies [embed] Ajax handlers to a string.
  *
  * @since 4.0.0
  *
@@ -3746,9 +3778,11 @@ function wp_ajax_parse_embed() {
 		$wp_embed->usecache = false;
 	}
 
-	if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
-		// Admin is ssl and the user pasted non-ssl URL.
-		// Check if the provider supports ssl embeds and use that for the preview.
+	if ( is_ssl() && str_starts_with( $url, 'http://' ) ) {
+		/*
+		 * Admin is ssl and the user pasted non-ssl URL.
+		 * Check if the provider supports ssl embeds and use that for the preview.
+		 */
 		$ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
 		$parsed        = $wp_embed->run_shortcode( $ssl_shortcode );
 
@@ -3819,7 +3853,7 @@ function wp_ajax_parse_embed() {
 		'attr' => $wp_embed->last_attr,
 	);
 
-	if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
+	if ( str_contains( $parsed, 'class="wp-embedded-content' ) ) {
 		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
 			$script_src = includes_url( 'js/wp-embed.js' );
 		} else {
@@ -3904,7 +3938,7 @@ function wp_ajax_parse_media_shortcode() {
 }
 
 /**
- * Ajax handler for destroying multiple open sessions for a user.
+ * Handles destroying multiple open sessions for a user via AJAX.
  *
  * @since 4.1.0
  */
@@ -3942,7 +3976,7 @@ function wp_ajax_destroy_sessions() {
 }
 
 /**
- * Ajax handler for cropping an image.
+ * Handles cropping an image via AJAX.
  *
  * @since 4.3.0
  */
@@ -4081,7 +4115,7 @@ function wp_ajax_crop_image() {
 }
 
 /**
- * Ajax handler for generating a password.
+ * Handles generating a password via AJAX.
  *
  * @since 4.4.0
  */
@@ -4090,7 +4124,7 @@ function wp_ajax_generate_password() {
 }
 
 /**
- * Ajax handler for generating a password in the no-privilege context.
+ * Handles generating a password in the no-privilege context via AJAX.
  *
  * @since 5.7.0
  */
@@ -4099,7 +4133,7 @@ function wp_ajax_nopriv_generate_password() {
 }
 
 /**
- * Ajax handler for saving the user's WordPress.org username.
+ * Handles saving the user's WordPress.org username via AJAX.
  *
  * @since 4.4.0
  */
@@ -4120,7 +4154,7 @@ function wp_ajax_save_wporg_username() {
 }
 
 /**
- * Ajax handler for installing a theme.
+ * Handles installing a theme via AJAX.
  *
  * @since 4.6.0
  *
@@ -4154,7 +4188,7 @@ function wp_ajax_install_theme() {
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	include_once ABSPATH . 'wp-admin/includes/theme.php';
+	require_once ABSPATH . 'wp-admin/includes/theme.php';
 
 	$api = themes_api(
 		'theme_information',
@@ -4246,7 +4280,7 @@ function wp_ajax_install_theme() {
 }
 
 /**
- * Ajax handler for updating a theme.
+ * Handles updating a theme via AJAX.
  *
  * @since 4.6.0
  *
@@ -4341,7 +4375,7 @@ function wp_ajax_update_theme() {
 }
 
 /**
- * Ajax handler for deleting a theme.
+ * Handles deleting a theme via AJAX.
  *
  * @since 4.6.0
  *
@@ -4399,7 +4433,7 @@ function wp_ajax_delete_theme() {
 		wp_send_json_error( $status );
 	}
 
-	include_once ABSPATH . 'wp-admin/includes/theme.php';
+	require_once ABSPATH . 'wp-admin/includes/theme.php';
 
 	$result = delete_theme( $stylesheet );
 
@@ -4415,7 +4449,7 @@ function wp_ajax_delete_theme() {
 }
 
 /**
- * Ajax handler for installing a plugin.
+ * Handles installing a plugin via AJAX.
  *
  * @since 4.6.0
  *
@@ -4447,7 +4481,7 @@ function wp_ajax_install_plugin() {
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+	require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 
 	$api = plugins_api(
 		'plugin_information',
@@ -4524,7 +4558,7 @@ function wp_ajax_install_plugin() {
 }
 
 /**
- * Ajax handler for updating a plugin.
+ * Handles updating a plugin via AJAX.
  *
  * @since 4.2.0
  *
@@ -4632,7 +4666,7 @@ function wp_ajax_update_plugin() {
 }
 
 /**
- * Ajax handler for deleting a plugin.
+ * Handles deleting a plugin via AJAX.
  *
  * @since 4.6.0
  *
@@ -4709,7 +4743,7 @@ function wp_ajax_delete_plugin() {
 }
 
 /**
- * Ajax handler for searching plugins.
+ * Handles searching plugins via AJAX.
  *
  * @since 4.6.0
  *
@@ -4766,7 +4800,7 @@ function wp_ajax_search_plugins() {
 }
 
 /**
- * Ajax handler for searching plugins to install.
+ * Handles searching plugins to install via AJAX.
  *
  * @since 4.6.0
  */
@@ -4816,7 +4850,7 @@ function wp_ajax_search_install_plugins() {
 }
 
 /**
- * Ajax handler for editing a theme or plugin file.
+ * Handles editing a theme or plugin file via AJAX.
  *
  * @since 4.9.0
  *
@@ -4845,7 +4879,7 @@ function wp_ajax_edit_theme_plugin_file() {
 }
 
 /**
- * Ajax handler for exporting a user's personal data.
+ * Handles exporting a user's personal data via AJAX.
  *
  * @since 4.9.6
  */
@@ -5035,7 +5069,7 @@ function wp_ajax_wp_privacy_export_personal_data() {
 }
 
 /**
- * Ajax handler for erasing personal data.
+ * Handles erasing personal data via AJAX.
  *
  * @since 4.9.6
  */
@@ -5264,7 +5298,7 @@ function wp_ajax_wp_privacy_erase_personal_data() {
 }
 
 /**
- * Ajax handler for site health checks on server communication.
+ * Handles site health checks on server communication via AJAX.
  *
  * @since 5.2.0
  * @deprecated 5.6.0 Use WP_REST_Site_Health_Controller::test_dotorg_communication()
@@ -5297,7 +5331,7 @@ function wp_ajax_health_check_dotorg_communication() {
 }
 
 /**
- * Ajax handler for site health checks on background updates.
+ * Handles site health checks on background updates via AJAX.
  *
  * @since 5.2.0
  * @deprecated 5.6.0 Use WP_REST_Site_Health_Controller::test_background_updates()
@@ -5330,7 +5364,7 @@ function wp_ajax_health_check_background_updates() {
 }
 
 /**
- * Ajax handler for site health checks on loopback requests.
+ * Handles site health checks on loopback requests via AJAX.
  *
  * @since 5.2.0
  * @deprecated 5.6.0 Use WP_REST_Site_Health_Controller::test_loopback_requests()
@@ -5363,7 +5397,7 @@ function wp_ajax_health_check_loopback_requests() {
 }
 
 /**
- * Ajax handler for site health check to update the result status.
+ * Handles site health check to update the result status via AJAX.
  *
  * @since 5.2.0
  */
@@ -5380,7 +5414,7 @@ function wp_ajax_health_check_site_status_result() {
 }
 
 /**
- * Ajax handler for site health check to get directories and database sizes.
+ * Handles site health check to get directories and database sizes via AJAX.
  *
  * @since 5.2.0
  * @deprecated 5.6.0 Use WP_REST_Site_Health_Controller::get_directory_sizes()
@@ -5446,7 +5480,7 @@ function wp_ajax_health_check_get_sizes() {
 }
 
 /**
- * Ajax handler to renew the REST API nonce.
+ * Handles renewing the REST API nonce via AJAX.
  *
  * @since 5.3.0
  */
@@ -5455,7 +5489,7 @@ function wp_ajax_rest_nonce() {
 }
 
 /**
- * Ajax handler to enable or disable plugin and theme auto-updates.
+ * Handles enabling or disable plugin and theme auto-updates via AJAX.
  *
  * @since 5.5.0
  */
@@ -5525,7 +5559,7 @@ function wp_ajax_toggle_auto_updates() {
 }
 
 /**
- * Ajax handler sends a password reset link.
+ * Handles sending a password reset link via AJAX.
  *
  * @since 5.7.0
  */
diff --git a/src/wp-admin/includes/bookmark.php b/src/wp-admin/includes/bookmark.php
index 8d26e27a5eb2b..c5600bf38a546 100644
--- a/src/wp-admin/includes/bookmark.php
+++ b/src/wp-admin/includes/bookmark.php
@@ -7,7 +7,7 @@
  */
 
 /**
- * Add a link to using values provided in $_POST.
+ * Adds a link using values provided in $_POST.
  *
  * @since 2.0.0
  *
@@ -34,7 +34,6 @@ function edit_link( $link_id = 0 ) {
 		);
 	}
 
-	$_POST['link_url']   = esc_html( $_POST['link_url'] );
 	$_POST['link_url']   = esc_url( $_POST['link_url'] );
 	$_POST['link_name']  = esc_html( $_POST['link_name'] );
 	$_POST['link_image'] = esc_html( $_POST['link_image'] );
@@ -59,7 +58,7 @@ function edit_link( $link_id = 0 ) {
  * @return stdClass Default link object.
  */
 function get_default_link_to_edit() {
-	$link = new stdClass;
+	$link = new stdClass();
 	if ( isset( $_GET['linkurl'] ) ) {
 		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
 	} else {
@@ -84,7 +83,7 @@ function get_default_link_to_edit() {
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $link_id ID of the link to delete
+ * @param int $link_id ID of the link to delete.
  * @return true Always true.
  */
 function wp_delete_link( $link_id ) {
@@ -268,7 +267,7 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
 }
 
 /**
- * Update link with the specified link categories.
+ * Updates link with the specified link categories.
  *
  * @since 2.1.0
  *
diff --git a/src/wp-admin/includes/class-automatic-upgrader-skin.php b/src/wp-admin/includes/class-automatic-upgrader-skin.php
index 15ea79f5f46e7..4fee6205fc463 100644
--- a/src/wp-admin/includes/class-automatic-upgrader-skin.php
+++ b/src/wp-admin/includes/class-automatic-upgrader-skin.php
@@ -84,7 +84,7 @@ public function feedback( $feedback, ...$args ) {
 			$string = $this->upgrader->strings[ $string ];
 		}
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if ( str_contains( $string, '%' ) ) {
 			if ( ! empty( $args ) ) {
 				$string = vsprintf( $string, $args );
 			}
diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php
index 89367c4cf82f3..8ce4a70ff7221 100644
--- a/src/wp-admin/includes/class-bulk-upgrader-skin.php
+++ b/src/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -59,7 +59,7 @@ public function feedback( $feedback, ...$args ) {
 			$feedback = $this->upgrader->strings[ $feedback ];
 		}
 
-		if ( strpos( $feedback, '%' ) !== false ) {
+		if ( str_contains( $feedback, '%' ) ) {
 			if ( $args ) {
 				$args     = array_map( 'strip_tags', $args );
 				$args     = array_map( 'esc_html', $args );
@@ -79,13 +79,13 @@ public function feedback( $feedback, ...$args ) {
 	/**
 	 */
 	public function header() {
-		// Nothing, This will be displayed within a iframe.
+		// Nothing. This will be displayed within an iframe.
 	}
 
 	/**
 	 */
 	public function footer() {
-		// Nothing, This will be displayed within a iframe.
+		// Nothing. This will be displayed within an iframe.
 	}
 
 	/**
@@ -131,7 +131,7 @@ public function before( $title = '' ) {
 		$this->in_loop = true;
 		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
 		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
-		// This progress messages div gets moved via JavaScript when clicking on "Show details.".
+		// This progress messages div gets moved via JavaScript when clicking on "More details.".
 		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
 		$this->flush_output();
 	}
@@ -154,7 +154,7 @@ public function after( $title = '' ) {
 			if ( ! $this->error ) {
 				echo '<div class="updated js-update-details" data-update-details="progress-' . esc_attr( $this->upgrader->update_current ) . '">' .
 					'<p>' . sprintf( $this->upgrader->strings['skin_update_successful'], $title ) .
-					' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'Show details.' ) . '</button>' .
+					' <button type="button" class="hide-if-no-js button-link js-update-details-toggle" aria-expanded="false">' . __( 'More details.' ) . '<span class="dashicons dashicons-arrow-down" aria-hidden="true"></span></button>' .
 					'</p></div>';
 			}
 
diff --git a/src/wp-admin/includes/class-core-upgrader.php b/src/wp-admin/includes/class-core-upgrader.php
index f6b6dfaed1635..165e1f7baee5d 100644
--- a/src/wp-admin/includes/class-core-upgrader.php
+++ b/src/wp-admin/includes/class-core-upgrader.php
@@ -21,7 +21,7 @@
 class Core_Upgrader extends WP_Upgrader {
 
 	/**
-	 * Initialize the upgrade strings.
+	 * Initializes the upgrade strings.
 	 *
 	 * @since 2.8.0
 	 */
@@ -30,16 +30,16 @@ public function upgrade_strings() {
 		$this->strings['locked']     = __( 'Another update is currently in progress.' );
 		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package']   = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package']   = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']        = __( 'Unpacking the update&#8230;' );
 		$this->strings['copy_failed']           = __( 'Could not copy files.' );
 		$this->strings['copy_failed_space']     = __( 'Could not copy files. You may have run out of disk space.' );
-		$this->strings['start_rollback']        = __( 'Attempting to roll back to previous version.' );
-		$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' );
+		$this->strings['start_rollback']        = __( 'Attempting to restore the previous version.' );
+		$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has been restored to your previous version.' );
 	}
 
 	/**
-	 * Upgrade WordPress core.
+	 * Upgrades WordPress core.
 	 *
 	 * @since 2.8.0
 	 *
@@ -123,8 +123,10 @@ public function upgrade( $current, $args = array() ) {
 
 		$download = $this->download_package( $current->packages->$to_download, true );
 
-		// Allow for signature soft-fail.
-		// WARNING: This may be removed in the future.
+		/*
+		 * Allow for signature soft-fail.
+		 * WARNING: This may be removed in the future.
+		 */
 		if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
 			// Output the failure error as a normal feedback, and not as an error:
 			/** This filter is documented in wp-admin/includes/update-core.php */
@@ -181,9 +183,9 @@ public function upgrade( $current, $args = array() ) {
 				 * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
 				 * do_rollback allows for update_core() to trigger a rollback if needed.
 				 */
-				if ( false !== strpos( $error_code, 'do_rollback' ) ) {
+				if ( str_contains( $error_code, 'do_rollback' ) ) {
 					$try_rollback = true;
-				} elseif ( false !== strpos( $error_code, '__copy_dir' ) ) {
+				} elseif ( str_contains( $error_code, '__copy_dir' ) ) {
 					$try_rollback = true;
 				} elseif ( 'disk_full' === $error_code ) {
 					$try_rollback = true;
@@ -323,7 +325,7 @@ public static function should_update_to_version( $offered_ver ) {
 			}
 
 			// Don't claim we can update on update-core.php if we have a non-critical failure logged.
-			if ( $wp_version === $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
+			if ( $wp_version === $failure_data['current'] && str_contains( $offered_ver, '.1.next.minor' ) ) {
 				return false;
 			}
 
@@ -385,7 +387,7 @@ public static function should_update_to_version( $offered_ver ) {
 	}
 
 	/**
-	 * Compare the disk file checksums against the expected checksums.
+	 * Compares the disk file checksums against the expected checksums.
 	 *
 	 * @since 3.7.0
 	 *
@@ -405,7 +407,7 @@ public function check_files() {
 
 		foreach ( $checksums as $file => $checksum ) {
 			// Skip files which get updated.
-			if ( 'wp-content' === substr( $file, 0, 10 ) ) {
+			if ( str_starts_with( $file, 'wp-content' ) ) {
 				continue;
 			}
 			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {
diff --git a/src/wp-admin/includes/class-custom-background.php b/src/wp-admin/includes/class-custom-background.php
index 07a72dd1b1e41..e8aee43c2edbb 100644
--- a/src/wp-admin/includes/class-custom-background.php
+++ b/src/wp-admin/includes/class-custom-background.php
@@ -63,7 +63,14 @@ public function __construct( $admin_header_callback = '', $admin_image_div_callb
 	 * @since 3.0.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
+		$page = add_theme_page(
+			_x( 'Background', 'custom background' ),
+			_x( 'Background', 'custom background' ),
+			'edit_theme_options',
+			'custom-background',
+			array( $this, 'admin_page' )
+		);
+
 		if ( ! $page ) {
 			return;
 		}
@@ -98,7 +105,7 @@ public function admin_load() {
 		get_current_screen()->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen">Documentation on Custom Background</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 		);
 
 		wp_enqueue_media();
@@ -413,7 +420,12 @@ public function admin_page() {
 			?>
 <tr>
 <th scope="row"><?php _e( 'Image Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Image Position' );
+			?>
+</span></legend>
 <div class="background-position-control">
 			<?php foreach ( $background_position_options as $group ) : ?>
 	<div class="button-group">
@@ -432,7 +444,12 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Image Size' );
+			?>
+</span></legend>
 <select id="background-size" name="background-size">
 <option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
 <option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
@@ -443,7 +460,12 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+			<?php
+			/* translators: Hidden accessibility text. */
+			_ex( 'Repeat', 'Background Repeat' );
+			?>
+</span></legend>
 <input name="background-repeat" type="hidden" value="no-repeat">
 <label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
 </fieldset></td>
@@ -451,7 +473,12 @@ public function admin_page() {
 
 <tr>
 <th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+			<?php
+			/* translators: Hidden accessibility text. */
+			_ex( 'Scroll', 'Background Scroll' );
+			?>
+</span></legend>
 <input name="background-attachment" type="hidden" value="fixed">
 <label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
 </fieldset></td>
@@ -459,7 +486,12 @@ public function admin_page() {
 <?php endif; // get_background_image() ?>
 <tr>
 <th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Background Color' );
+		?>
+</span></legend>
 		<?php
 		$default_color = '';
 		if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php
index c8809ade2ff20..f1361440fa9cd 100644
--- a/src/wp-admin/includes/class-custom-image-header.php
+++ b/src/wp-admin/includes/class-custom-image-header.php
@@ -66,12 +66,18 @@ public function __construct( $admin_header_callback, $admin_image_div_callback =
 	}
 
 	/**
-	 * Set up the hooks for the Custom Header admin page.
+	 * Sets up the hooks for the Custom Header admin page.
 	 *
 	 * @since 2.1.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
+		$page = add_theme_page(
+			_x( 'Header', 'custom image header' ),
+			_x( 'Header', 'custom image header' ),
+			'edit_theme_options',
+			'custom-header',
+			array( $this, 'admin_page' )
+		);
 
 		if ( ! $page ) {
 			return;
@@ -135,12 +141,12 @@ public function help() {
 		get_current_screen()->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen">Documentation on Custom Header</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 		);
 	}
 
 	/**
-	 * Get the current step.
+	 * Gets the current step.
 	 *
 	 * @since 2.6.0
 	 *
@@ -163,7 +169,7 @@ public function step() {
 	}
 
 	/**
-	 * Set up the enqueue for the JavaScript files.
+	 * Sets up the enqueue for the JavaScript files.
 	 *
 	 * @since 2.1.0
 	 */
@@ -182,7 +188,7 @@ public function js_includes() {
 	}
 
 	/**
-	 * Set up the enqueue for the CSS files
+	 * Sets up the enqueue for the CSS files.
 	 *
 	 * @since 2.7.0
 	 */
@@ -197,7 +203,7 @@ public function css_includes() {
 	}
 
 	/**
-	 * Execute custom header modification.
+	 * Executes custom header modification.
 	 *
 	 * @since 2.6.0
 	 */
@@ -256,7 +262,7 @@ public function take_action() {
 	}
 
 	/**
-	 * Process the default headers
+	 * Processes the default headers.
 	 *
 	 * @since 3.0.0
 	 *
@@ -293,9 +299,9 @@ public function process_default_headers() {
 	}
 
 	/**
-	 * Display UI for selecting one of several default headers.
+	 * Displays UI for selecting one of several default headers.
 	 *
-	 * Show the random image option if this theme has multiple header images.
+	 * Shows the random image option if this theme has multiple header images.
 	 * Random image option is on by default if no header has been set.
 	 *
 	 * @since 3.0.0
@@ -332,7 +338,7 @@ public function show_header_selector( $type = 'default' ) {
 			if ( ! empty( $header['attachment_id'] ) ) {
 				$width = ' width="230"';
 			}
-			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) . '"' . $width . ' /></label>';
+			echo '<img src="' . esc_url( set_url_scheme( $header_thumbnail ) ) . '" alt="' . esc_attr( $header_alt_text ) . '"' . $width . ' /></label>';
 			echo '</div>';
 		}
 
@@ -340,7 +346,7 @@ public function show_header_selector( $type = 'default' ) {
 	}
 
 	/**
-	 * Execute JavaScript depending on step.
+	 * Executes JavaScript depending on step.
 	 *
 	 * @since 2.1.0
 	 */
@@ -355,7 +361,7 @@ public function js() {
 	}
 
 	/**
-	 * Display JavaScript based on Step 1 and 3.
+	 * Displays JavaScript based on Step 1 and 3.
 	 *
 	 * @since 2.6.0
 	 */
@@ -363,7 +369,7 @@ public function js_1() {
 		$default_color = '';
 		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
 			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
+			if ( $default_color && ! str_contains( $default_color, '#' ) ) {
 				$default_color = '#' . $default_color;
 			}
 		}
@@ -416,7 +422,7 @@ function toggle_text() {
 	}
 
 	/**
-	 * Display JavaScript based on Step 2.
+	 * Displays JavaScript based on Step 2.
 	 *
 	 * @since 2.6.0
 	 */
@@ -492,7 +498,7 @@ function onEndCrop( coords ) {
 	}
 
 	/**
-	 * Display first step of custom header image page.
+	 * Displays first step of custom header image page.
 	 *
 	 * @since 2.1.0
 	 */
@@ -697,7 +703,7 @@ public function step_1() {
 <th scope="row"><?php _e( 'Default Images' ); ?></th>
 <td>
 			<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
-	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
+	<p><?php _e( 'If you do not want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
 	<?php else : ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
 	<?php endif; ?>
@@ -762,7 +768,7 @@ public function step_1() {
 			$default_color = '';
 			if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
 				$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-				if ( $default_color && false === strpos( $default_color, '#' ) ) {
+				if ( $default_color && ! str_contains( $default_color, '#' ) ) {
 					$default_color = '#' . $default_color;
 				}
 			}
@@ -770,7 +776,7 @@ public function step_1() {
 			$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
 
 			$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
+			if ( $header_textcolor && ! str_contains( $header_textcolor, '#' ) ) {
 				$header_textcolor = '#' . $header_textcolor;
 			}
 
@@ -806,7 +812,7 @@ public function step_1() {
 	}
 
 	/**
-	 * Display second step of custom header image page.
+	 * Displays second step of custom header image page.
 	 *
 	 * @since 2.1.0
 	 */
@@ -949,7 +955,7 @@ public function step_2() {
 
 
 	/**
-	 * Upload the file to be cropped in the second step.
+	 * Uploads the file to be cropped in the second step.
 	 *
 	 * @since 3.4.0
 	 */
@@ -990,7 +996,7 @@ public function step_2_manage_upload() {
 	}
 
 	/**
-	 * Display third step of custom header image page.
+	 * Displays third step of custom header image page.
 	 *
 	 * @since 2.1.0
 	 * @since 4.4.0 Switched to using wp_get_attachment_url() instead of the guid
@@ -1086,7 +1092,7 @@ public function step_3() {
 	}
 
 	/**
-	 * Display last step of custom header image page.
+	 * Displays last step of custom header image page.
 	 *
 	 * @since 2.1.0
 	 */
@@ -1096,7 +1102,7 @@ public function finished() {
 	}
 
 	/**
-	 * Display the page based on the current step.
+	 * Displays the page based on the current step.
 	 *
 	 * @since 2.1.0
 	 */
@@ -1141,16 +1147,17 @@ public function filter_upload_tabs( $tabs ) {
 	}
 
 	/**
-	 * Choose a header image, selected from existing uploaded and default headers,
-	 * or provide an array of uploaded header data (either new, or from media library).
+	 * Chooses a header image, selected from existing uploaded and default headers,
+	 * or provides an array of uploaded header data (either new, or from media library).
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param mixed $choice Which header image to select. Allows for values of 'random-default-image',
-	 *  for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
-	 *  among the uploaded images; the key of a default image registered for that theme; and
-	 *  the key of an image uploaded for that theme (the attachment ID of the image).
-	 *  Or an array of arguments: attachment_id, url, width, height. All are required.
+	 *                      for randomly cycling among the default images; 'random-uploaded-image',
+	 *                      for randomly cycling among the uploaded images; the key of a default image
+	 *                      registered for that theme; and the key of an image uploaded for that theme
+	 *                      (the attachment ID of the image). Or an array of arguments: attachment_id,
+	 *                      url, width, height. All are required.
 	 */
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
@@ -1203,7 +1210,7 @@ final public function set_header_image( $choice ) {
 	}
 
 	/**
-	 * Remove a header image.
+	 * Removes a header image.
 	 *
 	 * @since 3.4.0
 	 */
@@ -1212,7 +1219,7 @@ final public function remove_header_image() {
 	}
 
 	/**
-	 * Reset a header image to the default image for the theme.
+	 * Resets a header image to the default image for the theme.
 	 *
 	 * This method does not do anything if the theme does not have a default header image.
 	 *
@@ -1242,7 +1249,7 @@ final public function reset_header_image() {
 	}
 
 	/**
-	 * Calculate width and height based on what the currently selected theme supports.
+	 * Calculates width and height based on what the currently selected theme supports.
 	 *
 	 * @since 3.9.0
 	 *
@@ -1293,7 +1300,7 @@ final public function get_header_dimensions( $dimensions ) {
 	}
 
 	/**
-	 * Create an attachment 'object'.
+	 * Creates an attachment 'object'.
 	 *
 	 * @since 3.9.0
 	 *
@@ -1322,7 +1329,7 @@ final public function create_attachment_object( $cropped, $parent_attachment_id
 	}
 
 	/**
-	 * Insert an attachment and its metadata.
+	 * Inserts an attachment and its metadata.
 	 *
 	 * @since 3.9.0
 	 *
@@ -1572,7 +1579,7 @@ public function get_uploaded_header_images() {
 	}
 
 	/**
-	 * Get the ID of a previous crop from the same base image.
+	 * Gets the ID of a previous crop from the same base image.
 	 *
 	 * @since 4.9.0
 	 *
diff --git a/src/wp-admin/includes/class-file-upload-upgrader.php b/src/wp-admin/includes/class-file-upload-upgrader.php
index d7c459dd60ef1..2b76e41ea61d1 100644
--- a/src/wp-admin/includes/class-file-upload-upgrader.php
+++ b/src/wp-admin/includes/class-file-upload-upgrader.php
@@ -108,14 +108,14 @@ public function __construct( $form, $urlholder ) {
 			$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
 			$this->package  = $uploads['basedir'] . '/' . $this->filename;
 
-			if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
+			if ( ! str_starts_with( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
 				wp_die( __( 'Please select a file' ) );
 			}
 		}
 	}
 
 	/**
-	 * Delete the attachment/uploaded file.
+	 * Deletes the attachment/uploaded file.
 	 *
 	 * @since 3.2.2
 	 *
diff --git a/src/wp-admin/includes/class-ftp.php b/src/wp-admin/includes/class-ftp.php
index 07cb936de1214..7658a0bc966e0 100644
--- a/src/wp-admin/includes/class-ftp.php
+++ b/src/wp-admin/includes/class-ftp.php
@@ -797,7 +797,7 @@ function glob_pattern_match($pattern,$subject) {
 		$chunks=explode(';',$pattern);
 		foreach($chunks as $pattern) {
 			$escape=array('$','^','.','{','}','(',')','[',']','|');
-			while(strpos($pattern,'**')!==false)
+			while(str_contains($pattern,'**'))
 				$pattern=str_replace('**','*',$pattern);
 			foreach($escape as $probe)
 				$pattern=str_replace($probe,"\\$probe",$pattern);
diff --git a/src/wp-admin/includes/class-language-pack-upgrader.php b/src/wp-admin/includes/class-language-pack-upgrader.php
index c21999956946d..adeac200d4f80 100644
--- a/src/wp-admin/includes/class-language-pack-upgrader.php
+++ b/src/wp-admin/includes/class-language-pack-upgrader.php
@@ -62,7 +62,7 @@ public static function async_upgrade( $upgrader = false ) {
 		 * Avoid messing with VCS installations, at least for now.
 		 * Noted: this is not the ideal way to accomplish this.
 		 */
-		$check_vcs = new WP_Automatic_Updater;
+		$check_vcs = new WP_Automatic_Updater();
 		if ( $check_vcs->is_vcs_checkout( WP_CONTENT_DIR ) ) {
 			return;
 		}
@@ -105,7 +105,7 @@ public static function async_upgrade( $upgrader = false ) {
 	}
 
 	/**
-	 * Initialize the upgrade strings.
+	 * Initializes the upgrade strings.
 	 *
 	 * @since 3.7.0
 	 */
@@ -114,7 +114,7 @@ public function upgrade_strings() {
 		$this->strings['up_to_date']       = __( 'Your translations are all up to date.' );
 		$this->strings['no_package']       = __( 'Update package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading translation from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package'] = sprintf( __( 'Downloading translation from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
 		$this->strings['process_failed']      = __( 'Translation update failed.' );
 		$this->strings['process_success']     = __( 'Translation updated successfully.' );
@@ -123,7 +123,7 @@ public function upgrade_strings() {
 	}
 
 	/**
-	 * Upgrade a language pack.
+	 * Upgrades a language pack.
 	 *
 	 * @since 3.7.0
 	 *
@@ -147,13 +147,13 @@ public function upgrade( $update = false, $args = array() ) {
 	}
 
 	/**
-	 * Bulk upgrade language packs.
+	 * Upgrades several language packs at once.
 	 *
 	 * @since 3.7.0
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
 	 *
-	 * @param object[] $language_updates Optional. Array of language packs to update. @see wp_get_translation_updates().
+	 * @param object[] $language_updates Optional. Array of language packs to update. See {@see wp_get_translation_updates()}.
 	 *                                   Default empty array.
 	 * @param array    $args {
 	 *     Other arguments for upgrading multiple language packs. Default empty array.
@@ -336,9 +336,9 @@ public function check_package( $source, $remote_source ) {
 		$po = false;
 		$mo = false;
 		foreach ( (array) $files as $file => $filedata ) {
-			if ( '.po' === substr( $file, -3 ) ) {
+			if ( str_ends_with( $file, '.po' ) ) {
 				$po = true;
-			} elseif ( '.mo' === substr( $file, -3 ) ) {
+			} elseif ( str_ends_with( $file, '.mo' ) ) {
 				$mo = true;
 			}
 		}
@@ -360,7 +360,7 @@ public function check_package( $source, $remote_source ) {
 	}
 
 	/**
-	 * Get the name of an item being updated.
+	 * Gets the name of an item being updated.
 	 *
 	 * @since 3.7.0
 	 *
diff --git a/src/wp-admin/includes/class-pclzip.php b/src/wp-admin/includes/class-pclzip.php
index b1b39e2dfe67b..3fdade5dd11f2 100644
--- a/src/wp-admin/includes/class-pclzip.php
+++ b/src/wp-admin/includes/class-pclzip.php
@@ -632,9 +632,9 @@ function add($p_filelist)
   //                newer_exist : the file was not extracted because a newer file exists
   //                path_creation_fail : the file is not extracted because the folder
   //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
+  //                write_error : the file was not extracted because there was an
   //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
+  //                read_error : the file was not extracted because there was an error
   //                             while reading the file
   //                invalid_header : the file was not extracted because of an archive
   //                                 format error (bad file header)
@@ -1170,8 +1170,8 @@ function duplicate($p_archive)
     // ----- Reset the error handler
     $this->privErrorReset();
 
-    // ----- Look if the $p_archive is a PclZip object
-    if (is_object($p_archive) && $p_archive instanceof pclzip)
+    // ----- Look if the $p_archive is an instantiated PclZip object
+    if ($p_archive instanceof pclzip)
     {
 
       // ----- Duplicate the archive
@@ -1234,8 +1234,8 @@ function merge($p_archive_to_add)
       return(0);
     }
 
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if (is_object($p_archive_to_add) && $p_archive_to_add instanceof pclzip)
+    // ----- Look if the $p_archive_to_add is an instantiated PclZip object
+    if ($p_archive_to_add instanceof pclzip)
     {
 
       // ----- Merge the archive
diff --git a/src/wp-admin/includes/class-plugin-installer-skin.php b/src/wp-admin/includes/class-plugin-installer-skin.php
index 8a1ee5609ad1a..ed165ed2d150e 100644
--- a/src/wp-admin/includes/class-plugin-installer-skin.php
+++ b/src/wp-admin/includes/class-plugin-installer-skin.php
@@ -46,7 +46,7 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Action to perform before installing a plugin.
+	 * Performs an action before installing a plugin.
 	 *
 	 * @since 2.8.0
 	 */
@@ -66,7 +66,7 @@ public function before() {
 	 * @since 5.5.0
 	 *
 	 * @param WP_Error $wp_error WP_Error object.
-	 * @return bool
+	 * @return bool True if the error should be hidden, false otherwise.
 	 */
 	public function hide_process_failed( $wp_error ) {
 		if (
@@ -81,7 +81,7 @@ public function hide_process_failed( $wp_error ) {
 	}
 
 	/**
-	 * Action to perform following a plugin install.
+	 * Performs an action following a plugin install.
 	 *
 	 * @since 2.8.0
 	 */
@@ -177,7 +177,7 @@ public function after() {
 	}
 
 	/**
-	 * Check if the plugin can be overwritten and output the HTML for overwriting a plugin on upload.
+	 * Checks if the plugin can be overwritten and outputs the HTML for overwriting a plugin on upload.
 	 *
 	 * @since 5.5.0
 	 *
@@ -293,13 +293,13 @@ private function do_overwrite() {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
 					__( 'You are uploading an older version of a current plugin. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__( 'https://wordpress.org/documentation/article/wordpress-backups/' )
 				);
 			} else {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
 					__( 'You are updating a plugin. Be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__( 'https://wordpress.org/documentation/article/wordpress-backups/' )
 				);
 			}
 
diff --git a/src/wp-admin/includes/class-plugin-upgrader-skin.php b/src/wp-admin/includes/class-plugin-upgrader-skin.php
index 1d56b29d216cf..0e3e778360061 100644
--- a/src/wp-admin/includes/class-plugin-upgrader-skin.php
+++ b/src/wp-admin/includes/class-plugin-upgrader-skin.php
@@ -72,7 +72,7 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Action to perform following a single plugin update.
+	 * Performs an action following a single plugin update.
 	 *
 	 * @since 2.8.0
 	 */
diff --git a/src/wp-admin/includes/class-plugin-upgrader.php b/src/wp-admin/includes/class-plugin-upgrader.php
index 812a5691a8363..0bb711f019c95 100644
--- a/src/wp-admin/includes/class-plugin-upgrader.php
+++ b/src/wp-admin/includes/class-plugin-upgrader.php
@@ -49,7 +49,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 	public $new_plugin_data = array();
 
 	/**
-	 * Initialize the upgrade strings.
+	 * Initializes the upgrade strings.
 	 *
 	 * @since 2.8.0
 	 */
@@ -57,7 +57,7 @@ public function upgrade_strings() {
 		$this->strings['up_to_date'] = __( 'The plugin is at the latest version.' );
 		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']       = __( 'Unpacking the update&#8230;' );
 		$this->strings['remove_old']           = __( 'Removing the old version of the plugin&#8230;' );
 		$this->strings['remove_old_failed']    = __( 'Could not remove the old plugin.' );
@@ -67,14 +67,14 @@ public function upgrade_strings() {
 	}
 
 	/**
-	 * Initialize the installation strings.
+	 * Initializes the installation strings.
 	 *
 	 * @since 2.8.0
 	 */
 	public function install_strings() {
 		$this->strings['no_package'] = __( 'Installation package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
 		$this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
 		$this->strings['remove_old']          = __( 'Removing the current plugin&#8230;' );
@@ -173,7 +173,7 @@ public function install( $package, $args = array() ) {
 	}
 
 	/**
-	 * Upgrade a plugin.
+	 * Upgrades a plugin.
 	 *
 	 * @since 2.8.0
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
@@ -212,8 +212,10 @@ public function upgrade( $plugin, $args = array() ) {
 		add_filter( 'upgrader_pre_install', array( $this, 'active_before' ), 10, 2 );
 		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
 		add_filter( 'upgrader_post_install', array( $this, 'active_after' ), 10, 2 );
-		// There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.
-		// 'source_selection' => array( $this, 'source_selection' ),
+		/*
+		 * There's a Trac ticket to move up the directory for zips which are made a bit differently, useful for non-.org plugins.
+		 * 'source_selection' => array( $this, 'source_selection' ),
+		 */
 		if ( $parsed_args['clear_update_cache'] ) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
 			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
@@ -226,14 +228,19 @@ public function upgrade( $plugin, $args = array() ) {
 				'clear_destination' => true,
 				'clear_working'     => true,
 				'hook_extra'        => array(
-					'plugin' => $plugin,
-					'type'   => 'plugin',
-					'action' => 'update',
+					'plugin'      => $plugin,
+					'type'        => 'plugin',
+					'action'      => 'update',
+					'temp_backup' => array(
+						'slug' => dirname( $plugin ),
+						'src'  => WP_PLUGIN_DIR,
+						'dir'  => 'plugins',
+					),
 				),
 			)
 		);
 
-		// Cleanup our hooks, in case something else does a upgrade on this connection.
+		// Cleanup our hooks, in case something else does an upgrade on this connection.
 		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
 		remove_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ) );
 		remove_filter( 'upgrader_pre_install', array( $this, 'active_before' ) );
@@ -247,8 +254,10 @@ public function upgrade( $plugin, $args = array() ) {
 		// Force refresh of plugin update information.
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
 
-		// Ensure any future auto-update failures trigger a failure email by removing
-		// the last failure notification from the list when plugins update successfully.
+		/*
+		 * Ensure any future auto-update failures trigger a failure email by removing
+		 * the last failure notification from the list when plugins update successfully.
+		 */
 		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
 
 		if ( isset( $past_failure_emails[ $plugin ] ) ) {
@@ -260,7 +269,7 @@ public function upgrade( $plugin, $args = array() ) {
 	}
 
 	/**
-	 * Bulk upgrade several plugins at once.
+	 * Upgrades several plugins at once.
 	 *
 	 * @since 2.8.0
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the plugin update cache optional.
@@ -342,7 +351,12 @@ public function bulk_upgrade( $plugins, $args = array() ) {
 					'clear_working'     => true,
 					'is_multi'          => true,
 					'hook_extra'        => array(
-						'plugin' => $plugin,
+						'plugin'      => $plugin,
+						'temp_backup' => array(
+							'slug' => dirname( $plugin ),
+							'src'  => WP_PLUGIN_DIR,
+							'dir'  => 'plugins',
+						),
 					),
 				)
 			);
@@ -376,11 +390,13 @@ public function bulk_upgrade( $plugins, $args = array() ) {
 
 		$this->skin->footer();
 
-		// Cleanup our hooks, in case something else does a upgrade on this connection.
+		// Cleanup our hooks, in case something else does an upgrade on this connection.
 		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
 
-		// Ensure any future auto-update failures trigger a failure email by removing
-		// the last failure notification from the list when plugins update successfully.
+		/*
+		 * Ensure any future auto-update failures trigger a failure email by removing
+		 * the last failure notification from the list when plugins update successfully.
+		 */
 		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
 
 		foreach ( $results as $plugin => $result ) {
@@ -469,7 +485,7 @@ public function check_package( $source ) {
 	}
 
 	/**
-	 * Retrieve the path to the file that contains the plugin info.
+	 * Retrieves the path to the file that contains the plugin info.
 	 *
 	 * This isn't used internally in the class, but is called by the skins.
 	 *
@@ -641,8 +657,10 @@ public function delete_old_plugin( $removed, $local_destination, $remote_destina
 			return $removed;
 		}
 
-		// If plugin is in its own directory, recursively delete the directory.
-		// Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+		/*
+		 * If plugin is in its own directory, recursively delete the directory.
+		 * Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+		 */
 		if ( strpos( $plugin, '/' ) && $this_plugin_dir !== $plugins_dir ) {
 			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
 		} else {
diff --git a/src/wp-admin/includes/class-theme-installer-skin.php b/src/wp-admin/includes/class-theme-installer-skin.php
index acdb1de122b62..99fe32250b2ae 100644
--- a/src/wp-admin/includes/class-theme-installer-skin.php
+++ b/src/wp-admin/includes/class-theme-installer-skin.php
@@ -46,7 +46,7 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Action to perform before installing a theme.
+	 * Performs an action before installing a theme.
 	 *
 	 * @since 2.8.0
 	 */
@@ -66,7 +66,7 @@ public function before() {
 	 * @since 5.5.0
 	 *
 	 * @param WP_Error $wp_error WP_Error object.
-	 * @return bool
+	 * @return bool True if the error should be hidden, false otherwise.
 	 */
 	public function hide_process_failed( $wp_error ) {
 		if (
@@ -81,7 +81,7 @@ public function hide_process_failed( $wp_error ) {
 	}
 
 	/**
-	 * Action to perform following a single theme install.
+	 * Performs an action following a single theme install.
 	 *
 	 * @since 2.8.0
 	 */
@@ -129,7 +129,7 @@ public function after() {
 				'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 				esc_url( $customize_url ),
 				__( 'Live Preview' ),
-				/* translators: %s: Theme name. */
+				/* translators: Hidden accessibility text. %s: Theme name. */
 				sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name )
 			);
 		}
@@ -139,7 +139,7 @@ public function after() {
 			'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 			esc_url( $activate_link ),
 			__( 'Activate' ),
-			/* translators: %s: Theme name. */
+			/* translators: Hidden accessibility text. %s: Theme name. */
 			sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $name )
 		);
 
@@ -188,7 +188,7 @@ public function after() {
 	}
 
 	/**
-	 * Check if the theme can be overwritten and output the HTML for overwriting a theme on upload.
+	 * Checks if the theme can be overwritten and outputs the HTML for overwriting a theme on upload.
 	 *
 	 * @since 5.5.0
 	 *
@@ -328,13 +328,13 @@ private function do_overwrite() {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
 					__( 'You are uploading an older version of the active theme. You can continue to install the older version, but be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__( 'https://wordpress.org/documentation/article/wordpress-backups/' )
 				);
 			} else {
 				$warning = sprintf(
 					/* translators: %s: Documentation URL. */
 					__( 'You are updating a theme. Be sure to <a href="%s">back up your database and files</a> first.' ),
-					__( 'https://wordpress.org/support/article/wordpress-backups/' )
+					__( 'https://wordpress.org/documentation/article/wordpress-backups/' )
 				);
 			}
 
diff --git a/src/wp-admin/includes/class-theme-upgrader-skin.php b/src/wp-admin/includes/class-theme-upgrader-skin.php
index e1420b032f48c..97d76a80fefa3 100644
--- a/src/wp-admin/includes/class-theme-upgrader-skin.php
+++ b/src/wp-admin/includes/class-theme-upgrader-skin.php
@@ -51,7 +51,7 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Action to perform following a single theme update.
+	 * Performs an action following a single theme update.
 	 *
 	 * @since 2.8.0
 	 */
@@ -90,7 +90,7 @@ public function after() {
 						'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 						esc_url( $customize_url ),
 						__( 'Customize' ),
-						/* translators: %s: Theme name. */
+						/* translators: Hidden accessibility text. %s: Theme name. */
 						sprintf( __( 'Customize &#8220;%s&#8221;' ), $name )
 					);
 				}
@@ -101,7 +101,7 @@ public function after() {
 						'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 						esc_url( $customize_url ),
 						__( 'Live Preview' ),
-						/* translators: %s: Theme name. */
+						/* translators: Hidden accessibility text. %s: Theme name. */
 						sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name )
 					);
 				}
@@ -111,7 +111,7 @@ public function after() {
 					'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
 					esc_url( $activate_link ),
 					__( 'Activate' ),
-					/* translators: %s: Theme name. */
+					/* translators: Hidden accessibility text. %s: Theme name. */
 					sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $name )
 				);
 			}
diff --git a/src/wp-admin/includes/class-theme-upgrader.php b/src/wp-admin/includes/class-theme-upgrader.php
index 9907c44feb3b7..6bb9ba784a2c5 100644
--- a/src/wp-admin/includes/class-theme-upgrader.php
+++ b/src/wp-admin/includes/class-theme-upgrader.php
@@ -48,7 +48,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	public $new_theme_data = array();
 
 	/**
-	 * Initialize the upgrade strings.
+	 * Initializes the upgrade strings.
 	 *
 	 * @since 2.8.0
 	 */
@@ -56,7 +56,7 @@ public function upgrade_strings() {
 		$this->strings['up_to_date'] = __( 'The theme is at the latest version.' );
 		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
 		$this->strings['remove_old']          = __( 'Removing the old version of the theme&#8230;' );
 		$this->strings['remove_old_failed']   = __( 'Could not remove the old theme.' );
@@ -65,14 +65,14 @@ public function upgrade_strings() {
 	}
 
 	/**
-	 * Initialize the installation strings.
+	 * Initializes the installation strings.
 	 *
 	 * @since 2.8.0
 	 */
 	public function install_strings() {
 		$this->strings['no_package'] = __( 'Installation package not available.' );
 		/* translators: %s: Package URL. */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code pre">%s</span>' );
 		$this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
 		$this->strings['installing_package']  = __( 'Installing the theme&#8230;' );
 		$this->strings['remove_old']          = __( 'Removing the old version of the theme&#8230;' );
@@ -110,7 +110,7 @@ public function install_strings() {
 	}
 
 	/**
-	 * Check if a child theme is being installed and we need to install its parent.
+	 * Checks if a child theme is being installed and its parent also needs to be installed.
 	 *
 	 * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::install().
 	 *
@@ -278,7 +278,7 @@ public function install( $package, $args = array() ) {
 	}
 
 	/**
-	 * Upgrade a theme.
+	 * Upgrades a theme.
 	 *
 	 * @since 2.8.0
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
@@ -328,9 +328,14 @@ public function upgrade( $theme, $args = array() ) {
 				'clear_destination' => true,
 				'clear_working'     => true,
 				'hook_extra'        => array(
-					'theme'  => $theme,
-					'type'   => 'theme',
-					'action' => 'update',
+					'theme'       => $theme,
+					'type'        => 'theme',
+					'action'      => 'update',
+					'temp_backup' => array(
+						'slug' => $theme,
+						'src'  => get_theme_root( $theme ),
+						'dir'  => 'themes',
+					),
 				),
 			)
 		);
@@ -346,8 +351,10 @@ public function upgrade( $theme, $args = array() ) {
 
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
 
-		// Ensure any future auto-update failures trigger a failure email by removing
-		// the last failure notification from the list when themes update successfully.
+		/*
+		 * Ensure any future auto-update failures trigger a failure email by removing
+		 * the last failure notification from the list when themes update successfully.
+		 */
 		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
 
 		if ( isset( $past_failure_emails[ $theme ] ) ) {
@@ -359,7 +366,7 @@ public function upgrade( $theme, $args = array() ) {
 	}
 
 	/**
-	 * Upgrade several themes at once.
+	 * Upgrades several themes at once.
 	 *
 	 * @since 3.0.0
 	 * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
@@ -443,7 +450,12 @@ public function bulk_upgrade( $themes, $args = array() ) {
 					'clear_working'     => true,
 					'is_multi'          => true,
 					'hook_extra'        => array(
-						'theme' => $theme,
+						'theme'       => $theme,
+						'temp_backup' => array(
+							'slug' => $theme,
+							'src'  => get_theme_root( $theme ),
+							'dir'  => 'themes',
+						),
 					),
 				)
 			);
@@ -477,13 +489,15 @@ public function bulk_upgrade( $themes, $args = array() ) {
 
 		$this->skin->footer();
 
-		// Cleanup our hooks, in case something else does a upgrade on this connection.
+		// Cleanup our hooks, in case something else does an upgrade on this connection.
 		remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) );
 		remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
 		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
 
-		// Ensure any future auto-update failures trigger a failure email by removing
-		// the last failure notification from the list when themes update successfully.
+		/*
+		 * Ensure any future auto-update failures trigger a failure email by removing
+		 * the last failure notification from the list when themes update successfully.
+		 */
 		$past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
 
 		foreach ( $results as $theme => $result ) {
@@ -622,7 +636,7 @@ public function check_package( $source ) {
 	}
 
 	/**
-	 * Turn on maintenance mode before attempting to upgrade the active theme.
+	 * Turns on maintenance mode before attempting to upgrade the active theme.
 	 *
 	 * Hooked to the {@see 'upgrader_pre_install'} filter by Theme_Upgrader::upgrade() and
 	 * Theme_Upgrader::bulk_upgrade().
@@ -654,7 +668,7 @@ public function current_before( $response, $theme ) {
 	}
 
 	/**
-	 * Turn off maintenance mode after upgrading the active theme.
+	 * Turns off maintenance mode after upgrading the active theme.
 	 *
 	 * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::upgrade()
 	 * and Theme_Upgrader::bulk_upgrade().
@@ -692,7 +706,7 @@ public function current_after( $response, $theme ) {
 	}
 
 	/**
-	 * Delete the old theme during an upgrade.
+	 * Deletes the old theme during an upgrade.
 	 *
 	 * Hooked to the {@see 'upgrader_clear_destination'} filter by Theme_Upgrader::upgrade()
 	 * and Theme_Upgrader::bulk_upgrade().
@@ -730,7 +744,7 @@ public function delete_old_theme( $removed, $local_destination, $remote_destinat
 	}
 
 	/**
-	 * Get the WP_Theme object for a theme.
+	 * Gets the WP_Theme object for a theme.
 	 *
 	 * @since 2.8.0
 	 * @since 3.0.0 The `$theme` argument was added.
diff --git a/src/wp-admin/includes/class-walker-category-checklist.php b/src/wp-admin/includes/class-walker-category-checklist.php
index b86ba23a2b375..1deb3f9206932 100644
--- a/src/wp-admin/includes/class-walker-category-checklist.php
+++ b/src/wp-admin/includes/class-walker-category-checklist.php
@@ -32,7 +32,7 @@ class Walker_Category_Checklist extends Walker {
 	 *
 	 * @param string $output Used to append additional content (passed by reference).
 	 * @param int    $depth  Depth of category. Used for tab indentation.
-	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
+	 * @param array  $args   An array of arguments. See {@see wp_terms_checklist()}.
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent  = str_repeat( "\t", $depth );
@@ -48,7 +48,7 @@ public function start_lvl( &$output, $depth = 0, $args = array() ) {
 	 *
 	 * @param string $output Used to append additional content (passed by reference).
 	 * @param int    $depth  Depth of category. Used for tab indentation.
-	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
+	 * @param array  $args   An array of arguments. See {@see wp_terms_checklist()}.
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent  = str_repeat( "\t", $depth );
@@ -67,7 +67,7 @@ public function end_lvl( &$output, $depth = 0, $args = array() ) {
 	 * @param string  $output            Used to append additional content (passed by reference).
 	 * @param WP_Term $data_object       The current term object.
 	 * @param int     $depth             Depth of the term in reference to parents. Default 0.
-	 * @param array   $args              An array of arguments. @see wp_terms_checklist()
+	 * @param array   $args              An array of arguments. See {@see wp_terms_checklist()}.
 	 * @param int     $current_object_id Optional. ID of the current term. Default 0.
 	 */
 	public function start_el( &$output, $data_object, $depth = 0, $args = array(), $current_object_id = 0 ) {
@@ -130,7 +130,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 	 * @param string  $output      Used to append additional content (passed by reference).
 	 * @param WP_Term $data_object The current term object.
 	 * @param int     $depth       Depth of the term in reference to parents. Default 0.
-	 * @param array   $args        An array of arguments. @see wp_terms_checklist()
+	 * @param array   $args        An array of arguments. See {@see wp_terms_checklist()}.
 	 */
 	public function end_el( &$output, $data_object, $depth = 0, $args = array() ) {
 		$output .= "</li>\n";
diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php
index 31f021dbc5bc4..cb585c9b18f82 100644
--- a/src/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -180,8 +180,9 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 						printf(
 							'<a class="item-edit" id="edit-%s" href="%s" aria-label="%s"><span class="screen-reader-text">%s</span></a>',
 							$item_id,
-							$edit_url,
+							esc_url( $edit_url ),
 							esc_attr__( 'Edit menu item' ),
+							/* translators: Hidden accessibility text. */
 							__( 'Edit' )
 						);
 						?>
diff --git a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
index a3b2f9aaef45f..1ac8e31b43e00 100644
--- a/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php
@@ -118,7 +118,7 @@ public function error( $errors, ...$args ) {
 				$string = $this->upgrader->strings[ $string ];
 			}
 
-			if ( false !== strpos( $string, '%' ) ) {
+			if ( str_contains( $string, '%' ) ) {
 				if ( ! empty( $args ) ) {
 					$string = vsprintf( $string, $args );
 				}
diff --git a/src/wp-admin/includes/class-wp-application-passwords-list-table.php b/src/wp-admin/includes/class-wp-application-passwords-list-table.php
index 98061a4cc6f4f..6c0bf26f76b65 100644
--- a/src/wp-admin/includes/class-wp-application-passwords-list-table.php
+++ b/src/wp-admin/includes/class-wp-application-passwords-list-table.php
@@ -21,7 +21,7 @@ class WP_Application_Passwords_List_Table extends WP_List_Table {
 	 *
 	 * @since 5.6.0
 	 *
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		return array(
@@ -253,7 +253,10 @@ public function print_js_template_row() {
 			}
 
 			if ( $is_primary ) {
-				echo '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+				echo '<button type="button" class="toggle-row"><span class="screen-reader-text">' .
+					/* translators: Hidden accessibility text. */
+					__( 'Show more details' ) .
+				'</span></button>';
 			}
 
 			echo '</td>';
diff --git a/src/wp-admin/includes/class-wp-automatic-updater.php b/src/wp-admin/includes/class-wp-automatic-updater.php
index 2d62527a98bc1..e835f0cd35984 100644
--- a/src/wp-admin/includes/class-wp-automatic-updater.php
+++ b/src/wp-admin/includes/class-wp-automatic-updater.php
@@ -27,6 +27,8 @@ class WP_Automatic_Updater {
 	 * Determines whether the entire automatic updater is disabled.
 	 *
 	 * @since 3.7.0
+	 *
+	 * @return bool True if the automatic updater is disabled, false otherwise.
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
@@ -56,6 +58,54 @@ public function is_disabled() {
 		return apply_filters( 'automatic_updater_disabled', $disabled );
 	}
 
+	/**
+	 * Checks whether access to a given directory is allowed.
+	 *
+	 * This is used when detecting version control checkouts. Takes into account
+	 * the PHP `open_basedir` restrictions, so that WordPress does not try to access
+	 * directories it is not allowed to.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $dir The directory to check.
+	 * @return bool True if access to the directory is allowed, false otherwise.
+	 */
+	public function is_allowed_dir( $dir ) {
+		if ( is_string( $dir ) ) {
+			$dir = trim( $dir );
+		}
+
+		if ( ! is_string( $dir ) || '' === $dir ) {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: The "$dir" argument. */
+					__( 'The "%s" argument must be a non-empty string.' ),
+					'$dir'
+				),
+				'6.2.0'
+			);
+
+			return false;
+		}
+
+		$open_basedir = ini_get( 'open_basedir' );
+
+		if ( empty( $open_basedir ) ) {
+			return true;
+		}
+
+		$open_basedir_list = explode( PATH_SEPARATOR, $open_basedir );
+
+		foreach ( $open_basedir_list as $basedir ) {
+			if ( '' !== trim( $basedir ) && str_starts_with( $dir, $basedir ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Checks for version control checkouts.
 	 *
@@ -98,11 +148,16 @@ public function is_vcs_checkout( $context ) {
 		}
 
 		$check_dirs = array_unique( $check_dirs );
+		$checkout   = false;
 
 		// Search all directories we've found for evidence of version control.
 		foreach ( $vcs_dirs as $vcs_dir ) {
 			foreach ( $check_dirs as $check_dir ) {
-				$checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
+				if ( ! $this->is_allowed_dir( $check_dir ) ) {
+					continue;
+				}
+
+				$checkout = is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
 				if ( $checkout ) {
 					break 2;
 				}
@@ -139,7 +194,7 @@ public function is_vcs_checkout( $context ) {
 	 */
 	public function should_update( $type, $item, $context ) {
 		// Used to see if WP_Filesystem is set up to allow unattended updates.
-		$skin = new Automatic_Upgrader_Skin;
+		$skin = new Automatic_Upgrader_Skin();
 
 		if ( $this->is_disabled() ) {
 			return false;
@@ -305,7 +360,7 @@ protected function send_core_update_notification_email( $item ) {
 	 * @return null|WP_Error
 	 */
 	public function update( $type, $item ) {
-		$skin = new Automatic_Upgrader_Skin;
+		$skin = new Automatic_Upgrader_Skin();
 
 		switch ( $type ) {
 			case 'core':
@@ -415,8 +470,10 @@ public function update( $type, $item ) {
 				&& ( 'up_to_date' === $upgrade_result->get_error_code()
 					|| 'locked' === $upgrade_result->get_error_code() )
 			) {
-				// These aren't actual errors, treat it as a skipped-update instead
-				// to avoid triggering the post-core update failure routines.
+				/*
+				 * These aren't actual errors, treat it as a skipped-update instead
+				 * to avoid triggering the post-core update failure routines.
+				 */
 				return false;
 			}
 
@@ -493,8 +550,10 @@ public function run() {
 			$this->update( 'core', $core_update );
 		}
 
-		// Clean up, and check for any pending translations.
-		// (Core_Upgrader checks for core updates.)
+		/*
+		 * Clean up, and check for any pending translations.
+		 * (Core_Upgrader checks for core updates.)
+		 */
 		$theme_stats = array();
 		if ( isset( $this->update_results['theme'] ) ) {
 			foreach ( $this->update_results['theme'] as $upgrade ) {
@@ -528,7 +587,7 @@ public function run() {
 
 		// Send debugging email to admin for all development installations.
 		if ( ! empty( $this->update_results ) ) {
-			$development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
+			$development_version = str_contains( get_bloginfo( 'version' ), '-' );
 
 			/**
 			 * Filters whether to send a debugging email for each automatic background update.
@@ -563,8 +622,8 @@ public function run() {
 	}
 
 	/**
-	 * If we tried to perform a core update, check if we should send an email,
-	 * and if we need to avoid processing future updates.
+	 * Checks whether to send an email and avoid processing future updates after
+	 * attempting a core update.
 	 *
 	 * @since 3.7.0
 	 *
@@ -583,16 +642,18 @@ protected function after_core_update( $update_result ) {
 
 		$error_code = $result->get_error_code();
 
-		// Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
-		// We should not try to perform a background update again until there is a successful one-click update performed by the user.
+		/*
+		 * Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
+		 * We should not try to perform a background update again until there is a successful one-click update performed by the user.
+		 */
 		$critical = false;
-		if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
+		if ( 'disk_full' === $error_code || str_contains( $error_code, '__copy_dir' ) ) {
 			$critical = true;
 		} elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
 			// A rollback is only critical if it failed too.
 			$critical        = true;
 			$rollback_result = $result->get_error_data()->rollback;
-		} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
+		} elseif ( str_contains( $error_code, 'do_rollback' ) ) {
 			$critical = true;
 		}
 
@@ -776,8 +837,10 @@ protected function send_email( $type, $core_update, $result = null ) {
 
 				$body .= "\n\n";
 
-				// Don't show this message if there is a newer version available.
-				// Potential for confusion, and also not useful for them to know at this point.
+				/*
+				 * Don't show this message if there is a newer version available.
+				 * Potential for confusion, and also not useful for them to know at this point.
+				 */
 				if ( 'fail' === $type && ! $newer_version_available ) {
 					$body .= __( 'An attempt was made, but your site could not be updated automatically.' ) . ' ';
 				}
@@ -848,8 +911,10 @@ protected function send_email( $type, $core_update, $result = null ) {
 			$body .= ' ' . __( 'Some data that describes the error your site encountered has been put together.' );
 			$body .= ' ' . __( 'Your hosting company, support forum volunteers, or a friendly developer may be able to use this information to help you:' );
 
-			// If we had a rollback and we're still critical, then the rollback failed too.
-			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
+			/*
+			 * If we had a rollback and we're still critical, then the rollback failed too.
+			 * Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
+			 */
 			if ( 'rollback_was_required' === $result->get_error_code() ) {
 				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
 			} else {
@@ -913,7 +978,7 @@ protected function send_email( $type, $core_update, $result = null ) {
 
 
 	/**
-	 * If we tried to perform plugin or theme updates, check if we should send an email.
+	 * Checks whether an email should be sent after attempting plugin or theme updates.
 	 *
 	 * @since 5.5.0
 	 *
@@ -1112,7 +1177,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body_message .= sprintf(
 							/* translators: 1: Plugin name, 2: Current version number, 3: New version number, 4: Plugin URL. */
 							__( '- %1$s (from version %2$s to %3$s)%4$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->current_version,
 							$item->item->new_version,
 							$item_url
@@ -1121,7 +1186,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body_message .= sprintf(
 							/* translators: 1: Plugin name, 2: Version number, 3: Plugin URL. */
 							__( '- %1$s version %2$s%3$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->new_version,
 							$item_url
 						);
@@ -1144,7 +1209,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
 							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->current_version,
 							$item->item->new_version
 						);
@@ -1152,7 +1217,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Version number. */
 							__( '- %1$s version %2$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->new_version
 						);
 					}
@@ -1184,7 +1249,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body_message .= sprintf(
 							/* translators: 1: Plugin name, 2: Current version number, 3: New version number, 4: Plugin URL. */
 							__( '- %1$s (from version %2$s to %3$s)%4$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->current_version,
 							$item->item->new_version,
 							$item_url
@@ -1193,7 +1258,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body_message .= sprintf(
 							/* translators: 1: Plugin name, 2: Version number, 3: Plugin URL. */
 							__( '- %1$s version %2$s%3$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->new_version,
 							$item_url
 						);
@@ -1215,7 +1280,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Current version number, 3: New version number. */
 							__( '- %1$s (from version %2$s to %3$s)' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->current_version,
 							$item->item->new_version
 						);
@@ -1223,7 +1288,7 @@ protected function send_plugin_theme_email( $type, $successful_updates, $failed_
 						$body[] = sprintf(
 							/* translators: 1: Theme name, 2: Version number. */
 							__( '- %1$s version %2$s' ),
-							$item->name,
+							html_entity_decode( $item->name ),
 							$item->item->new_version
 						);
 					}
diff --git a/src/wp-admin/includes/class-wp-comments-list-table.php b/src/wp-admin/includes/class-wp-comments-list-table.php
index 1b288786cd89e..7d87ae9aabdc4 100644
--- a/src/wp-admin/includes/class-wp-comments-list-table.php
+++ b/src/wp-admin/includes/class-wp-comments-list-table.php
@@ -140,16 +140,17 @@ public function prepare_items() {
 		);
 
 		$args = array(
-			'status'    => isset( $status_map[ $comment_status ] ) ? $status_map[ $comment_status ] : $comment_status,
-			'search'    => $search,
-			'user_id'   => $user_id,
-			'offset'    => $start,
-			'number'    => $number,
-			'post_id'   => $post_id,
-			'type'      => $comment_type,
-			'orderby'   => $orderby,
-			'order'     => $order,
-			'post_type' => $post_type,
+			'status'                    => isset( $status_map[ $comment_status ] ) ? $status_map[ $comment_status ] : $comment_status,
+			'search'                    => $search,
+			'user_id'                   => $user_id,
+			'offset'                    => $start,
+			'number'                    => $number,
+			'post_id'                   => $post_id,
+			'type'                      => $comment_type,
+			'orderby'                   => $orderby,
+			'order'                     => $order,
+			'post_type'                 => $post_type,
+			'update_comment_post_cache' => true,
 		);
 
 		/**
@@ -164,8 +165,6 @@ public function prepare_items() {
 		$_comments = get_comments( $args );
 
 		if ( is_array( $_comments ) ) {
-			update_comment_cache( $_comments );
-
 			$this->items       = array_slice( $_comments, 0, $comments_per_page );
 			$this->extra_items = array_slice( $_comments, $comments_per_page );
 
@@ -457,7 +456,7 @@ public function current_action() {
 	/**
 	 * @global int $post_id
 	 *
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		global $post_id;
@@ -506,7 +505,11 @@ protected function comment_type_dropdown( $comment_type ) {
 		);
 
 		if ( $comment_types && is_array( $comment_types ) ) {
-			printf( '<label class="screen-reader-text" for="filter-by-comment-type">%s</label>', __( 'Filter by comment type' ) );
+			printf(
+				'<label class="screen-reader-text" for="filter-by-comment-type">%s</label>',
+				/* translators: Hidden accessibility text. */
+				__( 'Filter by comment type' )
+			);
 
 			echo '<select id="filter-by-comment-type" name="comment_type">';
 
@@ -537,8 +540,8 @@ protected function comment_type_dropdown( $comment_type ) {
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'author'   => 'comment_author',
-			'response' => 'comment_post_ID',
+			'author'   => array( 'comment_author', false, __( 'Author' ), __( 'Table ordered by Comment Author.' ) ),
+			'response' => array( 'comment_post_ID', false, _x( 'In Response To', 'column name' ), __( 'Table ordered by Post Replied To.' ) ),
 			'date'     => 'comment_date',
 		);
 	}
@@ -577,6 +580,17 @@ public function display() {
 
 		?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+		<?php
+		if ( ! isset( $_GET['orderby'] ) ) {
+			// In the initial view, Comments are ordered by comment's date but there's no column for that.
+			echo '<caption class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Ordered by Comment Date, descending.' ) .
+			'</caption>';
+		} else {
+			$this->print_table_description();
+		}
+		?>
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -862,7 +876,10 @@ protected function handle_row_actions( $item, $column_name, $primary ) {
 
 		$output .= '</div>';
 
-		$output .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$output .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Show more details' ) .
+		'</span></button>';
 
 		return $output;
 	}
@@ -878,7 +895,14 @@ public function column_cb( $item ) {
 
 		if ( $this->user_can ) {
 			?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $comment->comment_ID; ?>"><?php _e( 'Select comment' ); ?></label>
+		<label class="label-covers-full-cell" for="cb-select-<?php echo $comment->comment_ID; ?>">
+			<span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Select comment' );
+			?>
+			</span>
+		</label>
 		<input id="cb-select-<?php echo $comment->comment_ID; ?>" type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" />
 			<?php
 		}
diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
index 67d79b936902e..39ecd016e81af 100644
--- a/src/wp-admin/includes/class-wp-debug-data.php
+++ b/src/wp-admin/includes/class-wp-debug-data.php
@@ -29,12 +29,13 @@ public static function check_for_updates() {
 	 * @since 5.5.0 Added pretty permalinks support information.
 	 *
 	 * @throws ImagickException
-	 * @global wpdb $wpdb WordPress database abstraction object.
+	 * @global wpdb  $wpdb               WordPress database abstraction object.
+	 * @global array $_wp_theme_features
 	 *
 	 * @return array The debug data for the site.
 	 */
 	public static function debug_data() {
-		global $wpdb;
+		global $wpdb, $_wp_theme_features;
 
 		// Save few function calls.
 		$upload_dir             = wp_upload_dir();
@@ -322,6 +323,11 @@ public static function debug_data() {
 					'value' => $wp_environment_type,
 					'debug' => $wp_environment_type,
 				),
+				'WP_DEVELOPMENT_MODE' => array(
+					'label' => 'WP_DEVELOPMENT_MODE',
+					'value' => WP_DEVELOPMENT_MODE ? WP_DEVELOPMENT_MODE : __( 'Disabled' ),
+					'debug' => WP_DEVELOPMENT_MODE,
+				),
 				'DB_CHARSET'          => array(
 					'label' => 'DB_CHARSET',
 					'value' => ( defined( 'DB_CHARSET' ) ? DB_CHARSET : __( 'Undefined' ) ),
@@ -580,6 +586,7 @@ public static function debug_data() {
 				'map'    => ( defined( 'imagick::RESOURCETYPE_MAP' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MAP ) ) : $not_available ),
 				'memory' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : $not_available ),
 				'thread' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : $not_available ),
+				'time'   => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : $not_available ),
 			);
 
 			$limits_debug = array(
@@ -589,6 +596,7 @@ public static function debug_data() {
 				'imagick::RESOURCETYPE_MAP'    => ( defined( 'imagick::RESOURCETYPE_MAP' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MAP ) ) : 'not available' ),
 				'imagick::RESOURCETYPE_MEMORY' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : 'not available' ),
 				'imagick::RESOURCETYPE_THREAD' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : 'not available' ),
+				'imagick::RESOURCETYPE_TIME'   => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : 'not available' ),
 			);
 
 			$info['wp-media']['fields']['imagick_limits'] = array(
@@ -692,12 +700,6 @@ public static function debug_data() {
 			$php_version_debug .= ' 64bit';
 		}
 
-		if ( function_exists( 'php_sapi_name' ) ) {
-			$php_sapi = php_sapi_name();
-		} else {
-			$php_sapi = 'unknown';
-		}
-
 		$info['wp-server']['fields']['server_architecture'] = array(
 			'label' => __( 'Server architecture' ),
 			'value' => ( 'unknown' !== $server_architecture ? $server_architecture : __( 'Unable to determine server architecture' ) ),
@@ -715,8 +717,8 @@ public static function debug_data() {
 		);
 		$info['wp-server']['fields']['php_sapi']            = array(
 			'label' => __( 'PHP SAPI' ),
-			'value' => ( 'unknown' !== $php_sapi ? $php_sapi : __( 'Unable to determine PHP SAPI' ) ),
-			'debug' => $php_sapi,
+			'value' => PHP_SAPI,
+			'debug' => PHP_SAPI,
 		);
 
 		// Some servers disable `ini_set()` and `ini_get()`, we check this before trying to get configuration values.
@@ -836,6 +838,22 @@ public static function debug_data() {
 			);
 		}
 
+		// Server time.
+		$date = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
+
+		$info['wp-server']['fields']['current']     = array(
+			'label' => __( 'Current time' ),
+			'value' => $date->format( DateTime::ATOM ),
+		);
+		$info['wp-server']['fields']['utc-time']    = array(
+			'label' => __( 'Current UTC time' ),
+			'value' => $date->format( DateTime::RFC850 ),
+		);
+		$info['wp-server']['fields']['server-time'] = array(
+			'label' => __( 'Current Server time' ),
+			'value' => wp_date( 'c', $_SERVER['REQUEST_TIME'] ),
+		);
+
 		// Populate the database debug fields.
 		if ( is_resource( $wpdb->dbh ) ) {
 			// Old mysql extension.
@@ -1064,7 +1082,6 @@ public static function debug_data() {
 		}
 
 		// Populate the section for the currently active theme.
-		global $_wp_theme_features;
 		$theme_features = array();
 
 		if ( ! empty( $_wp_theme_features ) ) {
@@ -1558,6 +1575,8 @@ public static function format( $info_array, $data_type ) {
 	 *
 	 * @since 5.2.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @return int The size of the database, in bytes.
 	 */
 	public static function get_database_size() {
@@ -1595,20 +1614,26 @@ public static function get_sizes() {
 			$max_execution_time = ini_get( 'max_execution_time' );
 		}
 
-		// The max_execution_time defaults to 0 when PHP runs from cli.
-		// We still want to limit it below.
+		/*
+		 * The max_execution_time defaults to 0 when PHP runs from cli.
+		 * We still want to limit it below.
+		 */
 		if ( empty( $max_execution_time ) ) {
 			$max_execution_time = 30; // 30 seconds.
 		}
 
 		if ( $max_execution_time > 20 ) {
-			// If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
-			// edge-case timeouts that may happen after the size loop has finished running.
+			/*
+			 * If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
+			 * edge-case timeouts that may happen after the size loop has finished running.
+			 */
 			$max_execution_time -= 2;
 		}
 
-		// Go through the various installation directories and calculate their sizes.
-		// No trailing slashes.
+		/*
+		 * Go through the various installation directories and calculate their sizes.
+		 * No trailing slashes.
+		 */
 		$paths = array(
 			'wordpress_size' => untrailingslashit( ABSPATH ),
 			'themes_size'    => get_theme_root(),
diff --git a/src/wp-admin/includes/class-wp-filesystem-base.php b/src/wp-admin/includes/class-wp-filesystem-base.php
index aae09e8dfa53c..07e3f379876e9 100644
--- a/src/wp-admin/includes/class-wp-filesystem-base.php
+++ b/src/wp-admin/includes/class-wp-filesystem-base.php
@@ -57,8 +57,10 @@ class WP_Filesystem_Base {
 	public function abspath() {
 		$folder = $this->find_folder( ABSPATH );
 
-		// Perhaps the FTP folder is rooted at the WordPress install.
-		// Check for wp-includes folder in root. Could have some false positives, but rare.
+		/*
+		 * Perhaps the FTP folder is rooted at the WordPress install.
+		 * Check for wp-includes folder in root. Could have some false positives, but rare.
+		 */
 		if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
 			$folder = '/';
 		}
@@ -305,8 +307,10 @@ public function search_for_folder( $folder, $base = '.', $loop = false ) {
 			}
 		}
 
-		// Only check this as a last resort, to prevent locating the incorrect install.
-		// All above procedures will fail quickly if this is the right branch to take.
+		/*
+		 * Only check this as a last resort, to prevent locating the incorrect install.
+		 * All above procedures will fail quickly if this is the right branch to take.
+		 */
 		if ( isset( $files[ $last_path ] ) ) {
 			if ( $this->verbose ) {
 				/* translators: %s: Directory name. */
@@ -316,14 +320,18 @@ public function search_for_folder( $folder, $base = '.', $loop = false ) {
 			return trailingslashit( $base . $last_path );
 		}
 
-		// Prevent this function from looping again.
-		// No need to proceed if we've just searched in `/`.
+		/*
+		 * Prevent this function from looping again.
+		 * No need to proceed if we've just searched in `/`.
+		 */
 		if ( $loop || '/' === $base ) {
 			return false;
 		}
 
-		// As an extra last resort, Change back to / if the folder wasn't found.
-		// This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
+		/*
+		 * As an extra last resort, Change back to / if the folder wasn't found.
+		 * This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
+		 */
 		return $this->search_for_folder( $folder, '/', true );
 
 	}
@@ -398,7 +406,7 @@ public function getchmod( $file ) {
 	}
 
 	/**
-	 * Converts *nix-style file permissions to a octal number.
+	 * Converts *nix-style file permissions to an octal number.
 	 *
 	 * Converts '-rw-r--r--' to 0644
 	 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
@@ -827,18 +835,28 @@ public function rmdir( $path, $recursive = false ) {
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
+	 *
+	 *     @type array $0... {
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
+	 *
+	 *         @type string           $name        Name of the file or directory.
+	 *         @type string           $perms       *nix representation of permissions.
+	 *         @type string           $permsn      Octal representation of permissions.
+	 *         @type int|string|false $number      File number. May be a numeric string. False if not available.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
+	 *         @type string|false     $group       File permissions group, or false if not available.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
diff --git a/src/wp-admin/includes/class-wp-filesystem-direct.php b/src/wp-admin/includes/class-wp-filesystem-direct.php
index e84dfed39f1f3..9fdfeb95cbf66 100644
--- a/src/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/src/wp-admin/includes/class-wp-filesystem-direct.php
@@ -316,7 +316,14 @@ public function copy( $source, $destination, $overwrite = false, $mode = false )
 	}
 
 	/**
-	 * Moves a file.
+	 * Moves a file or directory.
+	 *
+	 * After moving files or directories, OPcache will need to be invalidated.
+	 *
+	 * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
+	 *
+	 * Use `move_dir()` for moving directories with OPcache invalidation and a
+	 * fallback to `copy_dir()`.
 	 *
 	 * @since 2.5.0
 	 *
@@ -331,12 +338,18 @@ public function move( $source, $destination, $overwrite = false ) {
 			return false;
 		}
 
+		if ( $overwrite && $this->exists( $destination ) && ! $this->delete( $destination, true ) ) {
+			// Can't overwrite if the destination couldn't be deleted.
+			return false;
+		}
+
 		// Try using rename first. if that fails (for example, source is read only) try copy.
 		if ( @rename( $source, $destination ) ) {
 			return true;
 		}
 
-		if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
+		// Backward compatibility: Only fall back to `::copy()` for single files.
+		if ( $this->is_file( $source ) && $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
 			$this->delete( $source );
 
 			return true;
@@ -584,18 +597,28 @@ public function rmdir( $path, $recursive = false ) {
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
+	 *
+	 *     @type array $0... {
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
+	 *
+	 *         @type string           $name        Name of the file or directory.
+	 *         @type string           $perms       *nix representation of permissions.
+	 *         @type string           $permsn      Octal representation of permissions.
+	 *         @type false            $number      File number. Always false in this context.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
+	 *         @type string|false     $group       File permissions group, or false if not available.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
@@ -616,7 +639,8 @@ public function dirlist( $path, $include_hidden = true, $recursive = false ) {
 			return false;
 		}
 
-		$ret = array();
+		$path = trailingslashit( $path );
+		$ret  = array();
 
 		while ( false !== ( $entry = $dir->read() ) ) {
 			$struc         = array();
@@ -634,20 +658,20 @@ public function dirlist( $path, $include_hidden = true, $recursive = false ) {
 				continue;
 			}
 
-			$struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+			$struc['perms']       = $this->gethchmod( $path . $entry );
 			$struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
 			$struc['number']      = false;
-			$struc['owner']       = $this->owner( $path . '/' . $entry );
-			$struc['group']       = $this->group( $path . '/' . $entry );
-			$struc['size']        = $this->size( $path . '/' . $entry );
-			$struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+			$struc['owner']       = $this->owner( $path . $entry );
+			$struc['group']       = $this->group( $path . $entry );
+			$struc['size']        = $this->size( $path . $entry );
+			$struc['lastmodunix'] = $this->mtime( $path . $entry );
 			$struc['lastmod']     = gmdate( 'M j', $struc['lastmodunix'] );
 			$struc['time']        = gmdate( 'h:i:s', $struc['lastmodunix'] );
-			$struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
+			$struc['type']        = $this->is_dir( $path . $entry ) ? 'd' : 'f';
 
 			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+					$struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
diff --git a/src/wp-admin/includes/class-wp-filesystem-ftpext.php b/src/wp-admin/includes/class-wp-filesystem-ftpext.php
index c3bb635809b92..7db0685fc5166 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/src/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -358,13 +358,20 @@ public function copy( $source, $destination, $overwrite = false, $mode = false )
 	}
 
 	/**
-	 * Moves a file.
+	 * Moves a file or directory.
+	 *
+	 * After moving files or directories, OPcache will need to be invalidated.
+	 *
+	 * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
+	 *
+	 * Use `move_dir()` for moving directories with OPcache invalidation and a
+	 * fallback to `copy_dir()`.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $source      Path to the source file.
-	 * @param string $destination Path to the destination file.
-	 * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
+	 * @param string $source      Path to the source file or directory.
+	 * @param string $destination Path to the destination file or directory.
+	 * @param bool   $overwrite   Optional. Whether to overwrite the destination if it exists.
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
@@ -412,18 +419,29 @@ public function delete( $file, $recursive = false, $type = false ) {
 	 * Checks if a file or directory exists.
 	 *
 	 * @since 2.5.0
-	 * @since 6.1.0 Uses WP_Filesystem_FTPext::is_dir() to check for directory existence
-	 *              and ftp_rawlist() to check for file existence.
+	 * @since 6.3.0 Returns false for an empty path.
 	 *
 	 * @param string $path Path to file or directory.
 	 * @return bool Whether $path exists or not.
 	 */
 	public function exists( $path ) {
-		if ( $this->is_dir( $path ) ) {
-			return true;
+		/*
+		 * Check for empty path. If ftp_nlist() receives an empty path,
+		 * it checks the current working directory and may return true.
+		 *
+		 * See https://core.trac.wordpress.org/ticket/33058.
+		 */
+		if ( '' === $path ) {
+			return false;
 		}
 
-		return ! empty( ftp_rawlist( $this->link, $path ) );
+		$list = ftp_nlist( $this->link, $path );
+
+		if ( empty( $list ) && $this->is_dir( $path ) ) {
+			return true; // File is an empty directory.
+		}
+
+		return ! empty( $list ); // Empty list = no file, so invert.
 	}
 
 	/**
@@ -584,7 +602,24 @@ public function rmdir( $path, $recursive = false ) {
 
 	/**
 	 * @param string $line
-	 * @return array
+	 * @return array {
+	 *     Array of file information.
+	 *
+	 *     @type string       $name        Name of the file or directory.
+	 *     @type string       $perms       *nix representation of permissions.
+	 *     @type string       $permsn      Octal representation of permissions.
+	 *     @type string|false $number      File number as a string, or false if not available.
+	 *     @type string|false $owner       Owner name or ID, or false if not available.
+	 *     @type string|false $group       File permissions group, or false if not available.
+	 *     @type string|false $size        Size of file in bytes as a string, or false if not available.
+	 *     @type string|false $lastmodunix Last modified unix timestamp as a string, or false if not available.
+	 *     @type string|false $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                     false if not available.
+	 *     @type string|false $time        Last modified time, or false if not available.
+	 *     @type string       $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *     @type array|false  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *                                     False if unable to list directory contents.
+	 * }
 	 */
 	public function parselisting( $line ) {
 		static $is_windows = null;
@@ -694,18 +729,28 @@ public function parselisting( $line ) {
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
+	 *
+	 *     @type array $0... {
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
+	 *
+	 *         @type string           $name        Name of the file or directory.
+	 *         @type string           $perms       *nix representation of permissions.
+	 *         @type string           $permsn      Octal representation of permissions.
+	 *         @type int|string|false $number      File number. May be a numeric string. False if not available.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
+	 *         @type string|false     $group       File permissions group, or false if not available.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
@@ -754,12 +799,13 @@ public function dirlist( $path = '.', $include_hidden = true, $recursive = false
 			$dirlist[ $entry['name'] ] = $entry;
 		}
 
-		$ret = array();
+		$path = trailingslashit( $path );
+		$ret  = array();
 
 		foreach ( (array) $dirlist as $struc ) {
 			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+					$struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
diff --git a/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index f88166c2093f8..c69d8012cad58 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -33,7 +33,7 @@ public function __construct( $opt = '' ) {
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
+		if ( ! require_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) {
 			return;
 		}
 
@@ -368,13 +368,20 @@ public function copy( $source, $destination, $overwrite = false, $mode = false )
 	}
 
 	/**
-	 * Moves a file.
+	 * Moves a file or directory.
+	 *
+	 * After moving files or directories, OPcache will need to be invalidated.
+	 *
+	 * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
+	 *
+	 * Use `move_dir()` for moving directories with OPcache invalidation and a
+	 * fallback to `copy_dir()`.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $source      Path to the source file.
-	 * @param string $destination Path to the destination file.
-	 * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
+	 * @param string $source      Path to the source file or directory.
+	 * @param string $destination Path to the destination file or directory.
+	 * @param bool   $overwrite   Optional. Whether to overwrite the destination if it exists.
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
@@ -414,18 +421,30 @@ public function delete( $file, $recursive = false, $type = false ) {
 	 * Checks if a file or directory exists.
 	 *
 	 * @since 2.5.0
-	 * @since 6.1.0 Uses WP_Filesystem_ftpsockets::is_dir() to check for directory existence
-	 *              and file size to check for file existence.
+	 * @since 6.3.0 Returns false for an empty path.
 	 *
 	 * @param string $path Path to file or directory.
 	 * @return bool Whether $path exists or not.
 	 */
 	public function exists( $path ) {
-		if ( $this->is_dir( $path ) ) {
-			return true;
+		/*
+		 * Check for empty path. If ftp::nlist() receives an empty path,
+		 * it checks the current working directory and may return true.
+		 *
+		 * See https://core.trac.wordpress.org/ticket/33058.
+		 */
+		if ( '' === $path ) {
+			return false;
+		}
+
+		$list = $this->ftp->nlist( $path );
+
+		if ( empty( $list ) && $this->is_dir( $path ) ) {
+			return true; // File is an empty directory.
 		}
 
-		return is_numeric( $this->size( $path ) );
+		return ! empty( $list ); // Empty list = no file, so invert.
+		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	}
 
 	/**
@@ -604,18 +623,28 @@ public function rmdir( $path, $recursive = false ) {
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
+	 *
+	 *     @type array $0... {
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
+	 *
+	 *         @type string           $name        Name of the file or directory.
+	 *         @type string           $perms       *nix representation of permissions.
+	 *         @type string           $permsn      Octal representation of permissions.
+	 *         @type int|string|false $number      File number. May be a numeric string. False if not available.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
+	 *         @type string|false     $group       File permissions group, or false if not available.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
@@ -637,7 +666,8 @@ public function dirlist( $path = '.', $include_hidden = true, $recursive = false
 			return false;
 		}
 
-		$ret = array();
+		$path = trailingslashit( $path );
+		$ret  = array();
 
 		foreach ( $list as $struc ) {
 
@@ -655,7 +685,7 @@ public function dirlist( $path = '.', $include_hidden = true, $recursive = false
 
 			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+					$struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
diff --git a/src/wp-admin/includes/class-wp-filesystem-ssh2.php b/src/wp-admin/includes/class-wp-filesystem-ssh2.php
index 540ecb54fa4b2..d68f1433d103f 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/src/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -103,6 +103,8 @@ public function __construct( $opt = '' ) {
 			// Password can be blank if we are using keys.
 			if ( ! $this->keys ) {
 				$this->errors->add( 'empty_password', __( 'SSH2 password is required' ) );
+			} else {
+				$this->options['password'] = null;
 			}
 		} else {
 			$this->options['password'] = $opt['password'];
@@ -496,20 +498,27 @@ public function copy( $source, $destination, $overwrite = false, $mode = false )
 	}
 
 	/**
-	 * Moves a file.
+	 * Moves a file or directory.
+	 *
+	 * After moving files or directories, OPcache will need to be invalidated.
+	 *
+	 * If moving a directory fails, `copy_dir()` can be used for a recursive copy.
+	 *
+	 * Use `move_dir()` for moving directories with OPcache invalidation and a
+	 * fallback to `copy_dir()`.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string $source      Path to the source file.
-	 * @param string $destination Path to the destination file.
-	 * @param bool   $overwrite   Optional. Whether to overwrite the destination file if it exists.
+	 * @param string $source      Path to the source file or directory.
+	 * @param string $destination Path to the destination file or directory.
+	 * @param bool   $overwrite   Optional. Whether to overwrite the destination if it exists.
 	 *                            Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function move( $source, $destination, $overwrite = false ) {
 		if ( $this->exists( $destination ) ) {
 			if ( $overwrite ) {
-				// We need to remove the destination file before we can rename the source.
+				// We need to remove the destination before we can rename the source.
 				$this->delete( $destination, false, 'f' );
 			} else {
 				// If we're not overwriting, the rename will fail, so return early.
@@ -734,18 +743,28 @@ public function rmdir( $path, $recursive = false ) {
 	 * @param bool   $recursive      Optional. Whether to recursively include file details in nested directories.
 	 *                               Default false.
 	 * @return array|false {
-	 *     Array of files. False if unable to list directory contents.
-	 *
-	 *     @type string $name        Name of the file or directory.
-	 *     @type string $perms       *nix representation of permissions.
-	 *     @type string $permsn      Octal representation of permissions.
-	 *     @type string $owner       Owner name or ID.
-	 *     @type int    $size        Size of file in bytes.
-	 *     @type int    $lastmodunix Last modified unix timestamp.
-	 *     @type mixed  $lastmod     Last modified month (3 letter) and day (without leading 0).
-	 *     @type int    $time        Last modified time.
-	 *     @type string $type        Type of resource. 'f' for file, 'd' for directory.
-	 *     @type mixed  $files       If a directory and `$recursive` is true, contains another array of files.
+	 *     Array of arrays containing file information. False if unable to list directory contents.
+	 *
+	 *     @type array $0... {
+	 *         Array of file information. Note that some elements may not be available on all filesystems.
+	 *
+	 *         @type string           $name        Name of the file or directory.
+	 *         @type string           $perms       *nix representation of permissions.
+	 *         @type string           $permsn      Octal representation of permissions.
+	 *         @type false            $number      File number. Always false in this context.
+	 *         @type string|false     $owner       Owner name or ID, or false if not available.
+	 *         @type string|false     $group       File permissions group, or false if not available.
+	 *         @type int|string|false $size        Size of file in bytes. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type int|string|false $lastmodunix Last modified unix timestamp. May be a numeric string.
+	 *                                             False if not available.
+	 *         @type string|false     $lastmod     Last modified month (3 letters) and day (without leading 0), or
+	 *                                             false if not available.
+	 *         @type string|false     $time        Last modified time, or false if not available.
+	 *         @type string           $type        Type of resource. 'f' for file, 'd' for directory, 'l' for link.
+	 *         @type array|false      $files       If a directory and `$recursive` is true, contains another array of
+	 *                                             files. False if unable to list directory contents.
+	 *     }
 	 * }
 	 */
 	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
@@ -767,6 +786,8 @@ public function dirlist( $path, $include_hidden = true, $recursive = false ) {
 			return false;
 		}
 
+		$path = trailingslashit( $path );
+
 		while ( false !== ( $entry = $dir->read() ) ) {
 			$struc         = array();
 			$struc['name'] = $entry;
@@ -783,20 +804,20 @@ public function dirlist( $path, $include_hidden = true, $recursive = false ) {
 				continue;
 			}
 
-			$struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+			$struc['perms']       = $this->gethchmod( $path . $entry );
 			$struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
 			$struc['number']      = false;
-			$struc['owner']       = $this->owner( $path . '/' . $entry );
-			$struc['group']       = $this->group( $path . '/' . $entry );
-			$struc['size']        = $this->size( $path . '/' . $entry );
-			$struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+			$struc['owner']       = $this->owner( $path . $entry );
+			$struc['group']       = $this->group( $path . $entry );
+			$struc['size']        = $this->size( $path . $entry );
+			$struc['lastmodunix'] = $this->mtime( $path . $entry );
 			$struc['lastmod']     = gmdate( 'M j', $struc['lastmodunix'] );
 			$struc['time']        = gmdate( 'h:i:s', $struc['lastmodunix'] );
-			$struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
+			$struc['type']        = $this->is_dir( $path . $entry ) ? 'd' : 'f';
 
 			if ( 'd' === $struc['type'] ) {
 				if ( $recursive ) {
-					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+					$struc['files'] = $this->dirlist( $path . $struc['name'], $include_hidden, $recursive );
 				} else {
 					$struc['files'] = array();
 				}
diff --git a/src/wp-admin/includes/class-wp-importer.php b/src/wp-admin/includes/class-wp-importer.php
index 4804c888b23f3..eca3199a7b5c7 100644
--- a/src/wp-admin/includes/class-wp-importer.php
+++ b/src/wp-admin/includes/class-wp-importer.php
@@ -10,7 +10,7 @@ class WP_Importer {
 	public function __construct() {}
 
 	/**
-	 * Returns array with imported permalinks from WordPress database
+	 * Returns array with imported permalinks from WordPress database.
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -41,13 +41,13 @@ public function get_imported_posts( $importer_name, $blog_id ) {
 					$hashtable[ $r->meta_value ] = (int) $r->post_id;
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while ( count( $results ) === $limit );
 
 		return $hashtable;
 	}
 
 	/**
-	 * Return count of imported permalinks from WordPress database
+	 * Returns count of imported permalinks from WordPress database.
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -74,7 +74,7 @@ public function count_imported_posts( $importer_name, $blog_id ) {
 	}
 
 	/**
-	 * Set array with imported comments from WordPress database
+	 * Sets array with imported comments from WordPress database.
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -105,12 +105,12 @@ public function get_imported_comments( $blog_id ) {
 					$source_comment_id = (int) $source_comment_id;
 
 					// Check if this comment came from this blog.
-					if ( $blog_id == $comment_agent_blog_id ) {
+					if ( (int) $blog_id === (int) $comment_agent_blog_id ) {
 						$hashtable[ $source_comment_id ] = (int) $r->comment_ID;
 					}
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while ( count( $results ) === $limit );
 
 		return $hashtable;
 	}
@@ -176,7 +176,7 @@ public function set_user( $user_id ) {
 	}
 
 	/**
-	 * Sort by strlen, longest string first
+	 * Sorts by strlen, longest string first.
 	 *
 	 * @param string $a
 	 * @param string $b
@@ -187,7 +187,7 @@ public function cmpr_strlen( $a, $b ) {
 	}
 
 	/**
-	 * GET URL
+	 * Gets URL.
 	 *
 	 * @param string $url
 	 * @param string $username
@@ -214,7 +214,7 @@ public function get_page( $url, $username = '', $password = '', $head = false )
 	}
 
 	/**
-	 * Bump up the request timeout for http requests
+	 * Bumps up the request timeout for http requests.
 	 *
 	 * @param int $val
 	 * @return int
@@ -224,7 +224,7 @@ public function bump_request_timeout( $val ) {
 	}
 
 	/**
-	 * Check if user has exceeded disk quota
+	 * Checks if user has exceeded disk quota.
 	 *
 	 * @return bool
 	 */
@@ -239,7 +239,7 @@ public function is_user_over_quota() {
 	}
 
 	/**
-	 * Replace newlines, tabs, and multiple spaces with a single space.
+	 * Replaces newlines, tabs, and multiple spaces with a single space.
 	 *
 	 * @param string $text
 	 * @return string
diff --git a/src/wp-admin/includes/class-wp-internal-pointers.php b/src/wp-admin/includes/class-wp-internal-pointers.php
index 884f27ea1f247..6d7ebe958087a 100644
--- a/src/wp-admin/includes/class-wp-internal-pointers.php
+++ b/src/wp-admin/includes/class-wp-internal-pointers.php
@@ -104,7 +104,7 @@ public static function enqueue_scripts( $hook_suffix ) {
 	}
 
 	/**
-	 * Print the pointer JavaScript data.
+	 * Prints the pointer JavaScript data.
 	 *
 	 * @since 3.3.0
 	 *
diff --git a/src/wp-admin/includes/class-wp-links-list-table.php b/src/wp-admin/includes/class-wp-links-list-table.php
index ebfde174ed60e..f29cf7b3e237e 100644
--- a/src/wp-admin/includes/class-wp-links-list-table.php
+++ b/src/wp-admin/includes/class-wp-links-list-table.php
@@ -124,7 +124,7 @@ protected function extra_tablenav( $which ) {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		return array(
@@ -143,15 +143,15 @@ public function get_columns() {
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'name'    => 'name',
-			'url'     => 'url',
-			'visible' => 'visible',
-			'rating'  => 'rating',
+			'name'    => array( 'name', false, _x( 'Name', 'link name' ), __( 'Table ordered by Name.' ), 'asc' ),
+			'url'     => array( 'url', false, __( 'URL' ), __( 'Table ordered by URL.' ) ),
+			'visible' => array( 'visible', false, __( 'Visible' ), __( 'Table ordered by Visibility.' ) ),
+			'rating'  => array( 'rating', false, __( 'Rating' ), __( 'Table ordered by Rating.' ) ),
 		);
 	}
 
 	/**
-	 * Get the name of the default primary column.
+	 * Gets the name of the default primary column.
 	 *
 	 * @since 4.3.0
 	 *
@@ -174,11 +174,13 @@ public function column_cb( $item ) {
 		$link = $item;
 
 		?>
-		<label class="screen-reader-text" for="cb-select-<?php echo $link->link_id; ?>">
+		<label class="label-covers-full-cell" for="cb-select-<?php echo $link->link_id; ?>">
+			<span class="screen-reader-text">
 			<?php
-			/* translators: %s: Link name. */
+			/* translators: Hidden accessibility text. %s: Link name. */
 			printf( __( 'Select %s' ), $link->link_name );
 			?>
+			</span>
 		</label>
 		<input type="checkbox" name="linkcheck[]" id="cb-select-<?php echo $link->link_id; ?>" value="<?php echo esc_attr( $link->link_id ); ?>" />
 		<?php
diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index a043af12d1507..03fe097538858 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -173,9 +173,10 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Make private properties readable for backward compatibility.
+	 * Makes private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Getting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -184,27 +185,42 @@ public function __get( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return $this->$name;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Getting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
+		return null;
 	}
 
 	/**
-	 * Make private properties settable for backward compatibility.
+	 * Makes private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Setting a dynamic property is deprecated.
 	 *
 	 * @param string $name  Property to check if set.
 	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
 	 */
 	public function __set( $name, $value ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
-			return $this->$name = $value;
+			$this->$name = $value;
+			return;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Setting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 
 	/**
-	 * Make private properties checkable for backward compatibility.
+	 * Makes private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Checking a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is a back-compat property and it is set.
@@ -214,24 +230,37 @@ public function __isset( $name ) {
 			return isset( $this->$name );
 		}
 
+		trigger_error(
+			"The property `{$name}` is not declared. Checking `isset()` on a dynamic property " .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 		return false;
 	}
 
 	/**
-	 * Make private properties un-settable for backward compatibility.
+	 * Makes private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Unsetting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to unset.
 	 */
 	public function __unset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			unset( $this->$name );
+			return;
 		}
+
+		trigger_error(
+			"A property `{$name}` is not declared. Unsetting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 
 	/**
-	 * Make private/protected methods readable for backward compatibility.
+	 * Makes private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
@@ -269,7 +298,7 @@ public function prepare_items() {
 	}
 
 	/**
-	 * An internal method that sets all the necessary pagination arguments
+	 * Sets all the necessary pagination arguments.
 	 *
 	 * @since 3.1.0
 	 *
@@ -320,7 +349,7 @@ public function get_pagination_arg( $key ) {
 	}
 
 	/**
-	 * Whether the table has items to display or not
+	 * Determines whether the table has items to display or not
 	 *
 	 * @since 3.1.0
 	 *
@@ -387,7 +416,7 @@ public function search_box( $text, $input_id ) {
 	 *     @type string $label   The link label.
 	 *     @type bool   $current Optional. Whether this is the currently selected view.
 	 * }
-	 * @return array An array of link markup. Keys match the `$link_data` input array.
+	 * @return string[] An array of link markup. Keys match the `$link_data` input array.
 	 */
 	protected function get_views_links( $link_data = array() ) {
 		if ( ! is_array( $link_data ) ) {
@@ -560,7 +589,10 @@ protected function bulk_actions( $which = '' ) {
 			return;
 		}
 
-		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
+		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Select bulk action' ) .
+		'</label>';
 		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
 		echo '<option value="-1">' . __( 'Bulk actions' ) . "</option>\n";
 
@@ -642,7 +674,10 @@ protected function row_actions( $actions, $always_visible = false ) {
 
 		$output .= '</div>';
 
-		$output .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+		$output .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Show more details' ) .
+		'</span></button>';
 
 		return $output;
 	}
@@ -692,13 +727,11 @@ protected function months_dropdown( $post_type ) {
 
 			$months = $wpdb->get_results(
 				$wpdb->prepare(
-					"
-				SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-				FROM $wpdb->posts
-				WHERE post_type = %s
-				$extra_checks
-				ORDER BY post_date DESC
-			",
+					"SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+					FROM $wpdb->posts
+					WHERE post_type = %s
+					$extra_checks
+					ORDER BY post_date DESC",
 					$post_type
 				)
 			);
@@ -769,7 +802,9 @@ protected function view_switcher( $current_mode ) {
 			}
 
 			printf(
-				"<a href='%s' class='%s' id='view-switch-$mode'$aria_current><span class='screen-reader-text'>%s</span></a>\n",
+				"<a href='%s' class='%s' id='view-switch-$mode'$aria_current>" .
+					"<span class='screen-reader-text'>%s</span>" .
+				"</a>\n",
 				esc_url( remove_query_arg( 'attachment-filter', add_query_arg( 'mode', $mode ) ) ),
 				implode( ' ', $classes ),
 				$title
@@ -815,20 +850,27 @@ protected function comments_bubble( $post_id, $pending_comments ) {
 		if ( ! $approved_comments && ! $pending_comments ) {
 			// No comments at all.
 			printf(
-				'<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
+				'<span aria-hidden="true">&#8212;</span>' .
+				'<span class="screen-reader-text">%s</span>',
 				__( 'No comments' )
 			);
 		} elseif ( $approved_comments && 'trash' === get_post_status( $post_id ) ) {
 			// Don't link the comment bubble for a trashed post.
 			printf(
-				'<span class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+				'<span class="post-com-count post-com-count-approved">' .
+					'<span class="comment-count-approved" aria-hidden="true">%s</span>' .
+					'<span class="screen-reader-text">%s</span>' .
+				'</span>',
 				$approved_comments_number,
 				$pending_comments ? $approved_phrase : $approved_only_phrase
 			);
 		} elseif ( $approved_comments ) {
 			// Link the comment bubble to approved comments.
 			printf(
-				'<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				'<a href="%s" class="post-com-count post-com-count-approved">' .
+					'<span class="comment-count-approved" aria-hidden="true">%s</span>' .
+					'<span class="screen-reader-text">%s</span>' .
+				'</a>',
 				esc_url(
 					add_query_arg(
 						array(
@@ -844,15 +886,25 @@ protected function comments_bubble( $post_id, $pending_comments ) {
 		} else {
 			// Don't link the comment bubble when there are no approved comments.
 			printf(
-				'<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+				'<span class="post-com-count post-com-count-no-comments">' .
+					'<span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span>' .
+					'<span class="screen-reader-text">%s</span>' .
+				'</span>',
 				$approved_comments_number,
-				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
+				$pending_comments ?
+				/* translators: Hidden accessibility text. */
+				__( 'No approved comments' ) :
+				/* translators: Hidden accessibility text. */
+				__( 'No comments' )
 			);
 		}
 
 		if ( $pending_comments ) {
 			printf(
-				'<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				'<a href="%s" class="post-com-count post-com-count-pending">' .
+					'<span class="comment-count-pending" aria-hidden="true">%s</span>' .
+					'<span class="screen-reader-text">%s</span>' .
+				'</a>',
 				esc_url(
 					add_query_arg(
 						array(
@@ -867,9 +919,16 @@ protected function comments_bubble( $post_id, $pending_comments ) {
 			);
 		} else {
 			printf(
-				'<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+				'<span class="post-com-count post-com-count-pending post-com-count-no-pending">' .
+					'<span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span>' .
+					'<span class="screen-reader-text">%s</span>' .
+				'</span>',
 				$pending_comments_number,
-				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
+				$approved_comments ?
+				/* translators: Hidden accessibility text. */
+				__( 'No pending comments' ) :
+				/* translators: Hidden accessibility text. */
+				__( 'No comments' )
 			);
 		}
 	}
@@ -992,8 +1051,12 @@ protected function pagination( $which ) {
 			$page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">&laquo;</span>';
 		} else {
 			$page_links[] = sprintf(
-				"<a class='first-page button' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				"<a class='first-page button' href='%s'>" .
+					"<span class='screen-reader-text'>%s</span>" .
+					"<span aria-hidden='true'>%s</span>" .
+				'</a>',
 				esc_url( remove_query_arg( 'paged', $current_url ) ),
+				/* translators: Hidden accessibility text. */
 				__( 'First page' ),
 				'&laquo;'
 			);
@@ -1003,8 +1066,12 @@ protected function pagination( $which ) {
 			$page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">&lsaquo;</span>';
 		} else {
 			$page_links[] = sprintf(
-				"<a class='prev-page button' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				"<a class='prev-page button' href='%s'>" .
+					"<span class='screen-reader-text'>%s</span>" .
+					"<span aria-hidden='true'>%s</span>" .
+				'</a>',
 				esc_url( add_query_arg( 'paged', max( 1, $current - 1 ), $current_url ) ),
+				/* translators: Hidden accessibility text. */
 				__( 'Previous page' ),
 				'&lsaquo;'
 			);
@@ -1012,17 +1079,29 @@ protected function pagination( $which ) {
 
 		if ( 'bottom' === $which ) {
 			$html_current_page  = $current;
-			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input"><span class="tablenav-paging-text">';
+			$total_pages_before = sprintf(
+				'<span class="screen-reader-text">%s</span>' .
+				'<span id="table-paging" class="paging-input">' .
+				'<span class="tablenav-paging-text">',
+				/* translators: Hidden accessibility text. */
+				__( 'Current Page' )
+			);
 		} else {
 			$html_current_page = sprintf(
-				"%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
-				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
+				'<label for="current-page-selector" class="screen-reader-text">%s</label>' .
+				"<input class='current-page' id='current-page-selector' type='text'
+					name='paged' value='%s' size='%d' aria-describedby='table-paging' />" .
+				"<span class='tablenav-paging-text'>",
+				/* translators: Hidden accessibility text. */
+				__( 'Current Page' ),
 				$current,
 				strlen( $total_pages )
 			);
 		}
+
 		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[]     = $total_pages_before . sprintf(
+
+		$page_links[] = $total_pages_before . sprintf(
 			/* translators: 1: Current page, 2: Total pages. */
 			_x( '%1$s of %2$s', 'paging' ),
 			$html_current_page,
@@ -1033,8 +1112,12 @@ protected function pagination( $which ) {
 			$page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">&rsaquo;</span>';
 		} else {
 			$page_links[] = sprintf(
-				"<a class='next-page button' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				"<a class='next-page button' href='%s'>" .
+					"<span class='screen-reader-text'>%s</span>" .
+					"<span aria-hidden='true'>%s</span>" .
+				'</a>',
 				esc_url( add_query_arg( 'paged', min( $total_pages, $current + 1 ), $current_url ) ),
+				/* translators: Hidden accessibility text. */
 				__( 'Next page' ),
 				'&rsaquo;'
 			);
@@ -1044,8 +1127,12 @@ protected function pagination( $which ) {
 			$page_links[] = '<span class="tablenav-pages-navspan button disabled" aria-hidden="true">&raquo;</span>';
 		} else {
 			$page_links[] = sprintf(
-				"<a class='last-page button' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				"<a class='last-page button' href='%s'>" .
+					"<span class='screen-reader-text'>%s</span>" .
+					"<span aria-hidden='true'>%s</span>" .
+				'</a>',
 				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
+				/* translators: Hidden accessibility text. */
 				__( 'Last page' ),
 				'&raquo;'
 			);
@@ -1087,10 +1174,17 @@ public function get_columns() {
 	 *
 	 * The format is:
 	 * - `'internal-name' => 'orderby'`
+	 * - `'internal-name' => array( 'orderby', bool, 'abbr', 'orderby-text', 'initially-sorted-column-order' )` -
 	 * - `'internal-name' => array( 'orderby', 'asc' )` - The second element sets the initial sorting order.
 	 * - `'internal-name' => array( 'orderby', true )`  - The second element makes the initial order descending.
 	 *
+	 * In the second format, passing true as second parameter will make the initial
+	 * sorting order be descending. Following parameters add a short column name to
+	 * be used as 'abbr' attribute, a translatable string for the current sorting,
+	 * and the initial order for the initial sorted column, 'asc' or 'desc' (default: false).
+	 *
 	 * @since 3.1.0
+	 * @since 6.3.0 Added 'abbr', 'orderby-text' and 'initially-sorted-column-order'.
 	 *
 	 * @return array
 	 */
@@ -1113,8 +1207,10 @@ protected function get_default_primary_column_name() {
 			return $column;
 		}
 
-		// We need a primary defined so responsive views show something,
-		// so let's fall back to the first non-checkbox column.
+		/*
+		 * We need a primary defined so responsive views show something,
+		 * so let's fall back to the first non-checkbox column.
+		 */
 		foreach ( $columns as $col => $column_name ) {
 			if ( 'cb' === $col ) {
 				continue;
@@ -1128,6 +1224,8 @@ protected function get_default_primary_column_name() {
 	}
 
 	/**
+	 * Gets the name of the primary column.
+	 *
 	 * Public wrapper for WP_List_Table::get_default_primary_column_name().
 	 *
 	 * @since 4.4.0
@@ -1149,8 +1247,10 @@ protected function get_primary_column_name() {
 		$columns = get_column_headers( $this->screen );
 		$default = $this->get_default_primary_column_name();
 
-		// If the primary column doesn't exist,
-		// fall back to the first non-checkbox column.
+		/*
+		 * If the primary column doesn't exist,
+		 * fall back to the first non-checkbox column.
+		 */
 		if ( ! isset( $columns[ $default ] ) ) {
 			$default = self::get_default_primary_column_name();
 		}
@@ -1229,9 +1329,22 @@ protected function get_column_info() {
 			}
 
 			$data = (array) $data;
+			// Descending initial sorting.
 			if ( ! isset( $data[1] ) ) {
 				$data[1] = false;
 			}
+			// Current sorting translatable string.
+			if ( ! isset( $data[2] ) ) {
+				$data[2] = '';
+			}
+			// Initial view sorted column and asc/desc order, default: false.
+			if ( ! isset( $data[3] ) ) {
+				$data[3] = false;
+			}
+			// Initial order for the initial sorted column, default: false.
+			if ( ! isset( $data[4] ) ) {
+				$data[4] = false;
+			}
 
 			$sortable[ $id ] = $data;
 		}
@@ -1268,27 +1381,39 @@ public function print_column_headers( $with_id = true ) {
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
 		$current_url = remove_query_arg( 'paged', $current_url );
 
+		// When users click on a column header to sort by other columns.
 		if ( isset( $_GET['orderby'] ) ) {
 			$current_orderby = $_GET['orderby'];
+			// In the initial view there's no orderby parameter.
 		} else {
 			$current_orderby = '';
 		}
 
+		// Not in the initial view and descending order.
 		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
 			$current_order = 'desc';
 		} else {
+			// The initial view is not always 'asc', we'll take care of this below.
 			$current_order = 'asc';
 		}
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
-			$columns['cb']     = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
-				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
+			$columns['cb']     = '<label class="label-covers-full-cell" for="cb-select-all-' . $cb_counter . '">' .
+				'<span class="screen-reader-text">' .
+					/* translators: Hidden accessibility text. */
+					__( 'Select All' ) .
+				'</span>' .
+				'</label>' .
+				'<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
 			$cb_counter++;
 		}
 
 		foreach ( $columns as $column_key => $column_display_name ) {
-			$class = array( 'manage-column', "column-$column_key" );
+			$class          = array( 'manage-column', "column-$column_key" );
+			$aria_sort_attr = '';
+			$abbr_attr      = '';
+			$order_text     = '';
 
 			if ( in_array( $column_key, $hidden, true ) ) {
 				$class[] = 'hidden';
@@ -1305,14 +1430,41 @@ public function print_column_headers( $with_id = true ) {
 			}
 
 			if ( isset( $sortable[ $column_key ] ) ) {
-				list( $orderby, $desc_first ) = $sortable[ $column_key ];
+				$orderby       = isset( $sortable[ $column_key ][0] ) ? $sortable[ $column_key ][0] : '';
+				$desc_first    = isset( $sortable[ $column_key ][1] ) ? $sortable[ $column_key ][1] : false;
+				$abbr          = isset( $sortable[ $column_key ][2] ) ? $sortable[ $column_key ][2] : '';
+				$orderby_text  = isset( $sortable[ $column_key ][3] ) ? $sortable[ $column_key ][3] : '';
+				$initial_order = isset( $sortable[ $column_key ][4] ) ? $sortable[ $column_key ][4] : '';
+
+				/*
+				 * We're in the initial view and there's no $_GET['orderby'] then check if the
+				 * initial sorting information is set in the sortable columns and use that.
+				 */
+				if ( '' === $current_orderby && $initial_order ) {
+					// Use the initially sorted column $orderby as current orderby.
+					$current_orderby = $orderby;
+					// Use the initially sorted column asc/desc order as initial order.
+					$current_order = $initial_order;
+				}
 
+				/*
+				 * True in the initial view when an initial orderby is set via get_sortable_columns()
+				 * and true in the sorted views when the actual $_GET['orderby'] is equal to $orderby.
+				 */
 				if ( $current_orderby === $orderby ) {
-					$order = 'asc' === $current_order ? 'desc' : 'asc';
+					// The sorted column. The `aria-sort` attribute must be set only on the sorted column.
+					if ( 'asc' === $current_order ) {
+						$order          = 'desc';
+						$aria_sort_attr = ' aria-sort="ascending"';
+					} else {
+						$order          = 'asc';
+						$aria_sort_attr = ' aria-sort="descending"';
+					}
 
 					$class[] = 'sorted';
 					$class[] = $current_order;
 				} else {
+					// The other sortable columns.
 					$order = strtolower( $desc_first );
 
 					if ( ! in_array( $order, array( 'desc', 'asc' ), true ) ) {
@@ -1321,12 +1473,33 @@ public function print_column_headers( $with_id = true ) {
 
 					$class[] = 'sortable';
 					$class[] = 'desc' === $order ? 'asc' : 'desc';
+
+					/* translators: Hidden accessibility text. */
+					$asc_text = __( 'Sort ascending.' );
+					/* translators: Hidden accessibility text. */
+					$desc_text  = __( 'Sort descending.' );
+					$order_text = 'asc' === $order ? $asc_text : $desc_text;
+				}
+
+				if ( '' !== $order_text ) {
+					$order_text = ' <span class="screen-reader-text">' . $order_text . '</span>';
 				}
 
+				// Print an 'abbr' attribute if a value is provided via get_sortable_columns().
+				$abbr_attr = $abbr ? ' abbr="' . esc_attr( $abbr ) . '"' : '';
+
 				$column_display_name = sprintf(
-					'<a href="%s"><span>%s</span><span class="sorting-indicator"></span></a>',
+					'<a href="%1$s">' .
+						'<span>%2$s</span>' .
+						'<span class="sorting-indicators">' .
+							'<span class="sorting-indicator asc" aria-hidden="true"></span>' .
+							'<span class="sorting-indicator desc" aria-hidden="true"></span>' .
+						'</span>' .
+						'%3$s' .
+					'</a>',
 					esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ),
-					$column_display_name
+					$column_display_name,
+					$order_text
 				);
 			}
 
@@ -1338,7 +1511,80 @@ public function print_column_headers( $with_id = true ) {
 				$class = "class='" . implode( ' ', $class ) . "'";
 			}
 
-			echo "<$tag $scope $id $class>$column_display_name</$tag>";
+			echo "<$tag $scope $id $class $aria_sort_attr $abbr_attr>$column_display_name</$tag>";
+		}
+	}
+
+	/**
+	 * Print a table description with information about current sorting and order.
+	 *
+	 * For the table initial view, information about initial orderby and order
+	 * should be provided via get_sortable_columns().
+	 *
+	 * @since 6.3.0
+	 * @access public
+	 */
+	public function print_table_description() {
+		list( $columns, $hidden, $sortable ) = $this->get_column_info();
+
+		if ( empty( $sortable ) ) {
+			return;
+		}
+
+		// When users click on a column header to sort by other columns.
+		if ( isset( $_GET['orderby'] ) ) {
+			$current_orderby = $_GET['orderby'];
+			// In the initial view there's no orderby parameter.
+		} else {
+			$current_orderby = '';
+		}
+
+		// Not in the initial view and descending order.
+		if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
+			$current_order = 'desc';
+		} else {
+			// The initial view is not always 'asc', we'll take care of this below.
+			$current_order = 'asc';
+		}
+
+		foreach ( array_keys( $columns ) as $column_key ) {
+
+			if ( isset( $sortable[ $column_key ] ) ) {
+				$orderby       = isset( $sortable[ $column_key ][0] ) ? $sortable[ $column_key ][0] : '';
+				$desc_first    = isset( $sortable[ $column_key ][1] ) ? $sortable[ $column_key ][1] : false;
+				$abbr          = isset( $sortable[ $column_key ][2] ) ? $sortable[ $column_key ][2] : '';
+				$orderby_text  = isset( $sortable[ $column_key ][3] ) ? $sortable[ $column_key ][3] : '';
+				$initial_order = isset( $sortable[ $column_key ][4] ) ? $sortable[ $column_key ][4] : '';
+
+				if ( ! is_string( $orderby_text ) || '' === $orderby_text ) {
+					return;
+				}
+				/*
+				 * We're in the initial view and there's no $_GET['orderby'] then check if the
+				 * initial sorting information is set in the sortable columns and use that.
+				 */
+				if ( '' === $current_orderby && $initial_order ) {
+					// Use the initially sorted column $orderby as current orderby.
+					$current_orderby = $orderby;
+					// Use the initially sorted column asc/desc order as initial order.
+					$current_order = $initial_order;
+				}
+
+				/*
+				 * True in the initial view when an initial orderby is set via get_sortable_columns()
+				 * and true in the sorted views when the actual $_GET['orderby'] is equal to $orderby.
+				 */
+				if ( $current_orderby === $orderby ) {
+					/* translators: Hidden accessibility text. */
+					$asc_text = __( 'Ascending.' );
+					/* translators: Hidden accessibility text. */
+					$desc_text  = __( 'Descending.' );
+					$order_text = 'asc' === $current_order ? $asc_text : $desc_text;
+					echo '<caption class="screen-reader-text">' . $orderby_text . ' ' . $order_text . '</caption>';
+
+					return;
+				}
+			}
 		}
 	}
 
@@ -1355,6 +1601,7 @@ public function display() {
 		$this->screen->render_screen_reader_content( 'heading_list' );
 		?>
 <table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+		<?php $this->print_table_description(); ?>
 	<thead>
 	<tr>
 		<?php $this->print_column_headers(); ?>
@@ -1426,7 +1673,7 @@ protected function display_tablenav( $which ) {
 	}
 
 	/**
-	 * Extra controls to be displayed between bulk actions and pagination.
+	 * Displays extra controls between bulk actions and pagination.
 	 *
 	 * @since 3.1.0
 	 *
@@ -1504,8 +1751,10 @@ protected function single_row_columns( $item ) {
 				$classes .= ' hidden';
 			}
 
-			// Comments column uses HTML in the display name with screen reader text.
-			// Strip tags to get closer to a user-friendly string.
+			/*
+			 * Comments column uses HTML in the display name with screen reader text.
+			 * Strip tags to get closer to a user-friendly string.
+			 */
 			$data = 'data-colname="' . esc_attr( wp_strip_all_tags( $column_display_name ) ) . '"';
 
 			$attributes = "class='$classes' $data";
@@ -1548,7 +1797,10 @@ protected function single_row_columns( $item ) {
 	 *                if the current column is not the primary column.
 	 */
 	protected function handle_row_actions( $item, $column_name, $primary ) {
-		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
+		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Show more details' ) .
+		'</span></button>' : '';
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
index 09c98a483714f..9eae94ef92ed7 100644
--- a/src/wp-admin/includes/class-wp-media-list-table.php
+++ b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -110,8 +110,10 @@ public function prepare_items() {
 				'per_page'    => $wp_query->query_vars['posts_per_page'],
 			)
 		);
-
-		update_post_parent_caches( $wp_query->posts );
+		if ( $wp_query->posts ) {
+			update_post_thumbnail_cache( $wp_query );
+			update_post_parent_caches( $wp_query->posts );
+		}
 	}
 
 	/**
@@ -138,7 +140,7 @@ protected function get_views() {
 			}
 
 			$selected = selected(
-				$filter && 0 === strpos( $filter, 'post_mime_type:' ) &&
+				$filter && str_starts_with( $filter, 'post_mime_type:' ) &&
 					wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $filter ) ),
 				true,
 				false
@@ -261,7 +263,7 @@ public function no_items() {
 	}
 
 	/**
-	 * Override parent views so we can use the filter bar display.
+	 * Overrides parent views to use the filter bar display.
 	 *
 	 * @global string $mode List table view mode.
 	 */
@@ -276,7 +278,12 @@ public function views() {
 			<div class="filter-items">
 				<?php $this->view_switcher( $mode ); ?>
 
-				<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+				<label for="attachment-filter" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Filter by type' );
+					?>
+				</label>
 				<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
 					<?php
 					if ( ! empty( $views ) ) {
@@ -290,7 +297,7 @@ public function views() {
 				<?php
 				$this->extra_tablenav( 'bar' );
 
-				/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+				/** This filter is documented in wp-admin/includes/class-wp-list-table.php */
 				$views = apply_filters( "views_{$this->screen->id}", array() );
 
 				// Back compat for pre-4.0 view links.
@@ -305,15 +312,23 @@ public function views() {
 			</div>
 
 			<div class="search-form">
-				<label for="media-search-input" class="media-search-input-label"><?php esc_html_e( 'Search' ); ?></label>
-				<input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
+				<p class="search-box">
+					<label class="screen-reader-text" for="media-search-input">
+					<?php
+					/* translators: Hidden accessibility text. */
+					esc_html_e( 'Search Media' );
+					?>
+					</label>
+					<input type="search" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>">
+					<input id="search-submit" type="submit" class="button" value="<?php esc_attr_e( 'Search Media' ); ?>">
+				</p>
 			</div>
 		</div>
 		<?php
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$posts_columns       = array();
@@ -356,6 +371,7 @@ public function get_columns() {
 				$posts_columns['comments'] = sprintf(
 					'<span class="vers comment-grey-bubble" title="%1$s" aria-hidden="true"></span><span class="screen-reader-text">%2$s</span>',
 					esc_attr__( 'Comments' ),
+					/* translators: Hidden accessibility text. */
 					__( 'Comments' )
 				);
 			}
@@ -381,11 +397,11 @@ public function get_columns() {
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'title'    => 'title',
-			'author'   => 'author',
-			'parent'   => 'parent',
-			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
+			'title'    => array( 'title', false, _x( 'File', 'column name' ), __( 'Table ordered by File Name.' ) ),
+			'author'   => array( 'author', false, __( 'Author' ), __( 'Table ordered by Author.' ) ),
+			'parent'   => array( 'parent', false, _x( 'Uploaded to', 'column name' ), __( 'Table ordered by Uploaded To.' ) ),
+			'comments' => array( 'comment_count', __( 'Comments' ), false, __( 'Table ordered by Comments.' ) ),
+			'date'     => array( 'date', true, __( 'Date' ), __( 'Table ordered by Date.' ), 'desc' ),
 		);
 	}
 
@@ -403,11 +419,13 @@ public function column_cb( $item ) {
 
 		if ( current_user_can( 'edit_post', $post->ID ) ) {
 			?>
-			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>">
+			<label class="label-covers-full-cell" for="cb-select-<?php echo $post->ID; ?>">
+				<span class="screen-reader-text">
 				<?php
-				/* translators: %s: Attachment title. */
+				/* translators: Hidden accessibility text. %s: Attachment title. */
 				printf( __( 'Select %s' ), _draft_or_post_title() );
 				?>
+				</span>
 			</label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
 			<?php
@@ -424,8 +442,18 @@ public function column_cb( $item ) {
 	public function column_title( $post ) {
 		list( $mime ) = explode( '/', $post->post_mime_type );
 
+		$attachment_id = $post->ID;
+
+		if ( has_post_thumbnail( $post ) ) {
+			$thumbnail_id = get_post_thumbnail_id( $post );
+
+			if ( ! empty( $thumbnail_id ) ) {
+				$attachment_id = $thumbnail_id;
+			}
+		}
+
 		$title      = _draft_or_post_title();
-		$thumb      = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$thumb      = wp_get_attachment_image( $attachment_id, array( 60, 60 ), true, array( 'alt' => '' ) );
 		$link_start = '';
 		$link_end   = '';
 
@@ -457,7 +485,12 @@ public function column_title( $post ) {
 			?>
 		</strong>
 		<p class="filename">
-			<span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span>
+			<span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'File name:' );
+				?>
+			</span>
 			<?php
 			$file = get_attached_file( $post->ID );
 			echo esc_html( wp_basename( $file ) );
@@ -485,10 +518,13 @@ public function column_author( $post ) {
 	 * Handles the description column output.
 	 *
 	 * @since 4.3.0
+	 * @deprecated 6.2.0
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
 	public function column_desc( $post ) {
+		_deprecated_function( __METHOD__, '6.2.0' );
+
 		echo has_excerpt() ? $post->post_excerpt : '';
 	}
 
@@ -626,7 +662,7 @@ public function column_default( $item, $column_name ) {
 			$taxonomy = 'category';
 		} elseif ( 'tags' === $column_name ) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
+		} elseif ( str_starts_with( $column_name, 'taxonomy-' ) ) {
 			$taxonomy = substr( $column_name, 9 );
 		} else {
 			$taxonomy = false;
@@ -722,126 +758,104 @@ protected function get_default_primary_column_name() {
 	private function _get_row_actions( $post, $att_title ) {
 		$actions = array();
 
-		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
-				$actions['edit'] = sprintf(
-					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
-					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
-				);
-			}
-
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-					$actions['trash'] = sprintf(
-						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
-						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
-					);
-				} else {
-					$delete_ays        = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = sprintf(
-						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
-						$delete_ays,
-						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
-					);
-				}
-			}
-
-			$actions['view'] = sprintf(
-				'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-				get_permalink( $post->ID ),
+		if ( ! $this->is_trash && current_user_can( 'edit_post', $post->ID ) ) {
+			$actions['edit'] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
+				esc_url( get_edit_post_link( $post->ID ) ),
 				/* translators: %s: Attachment title. */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
-				__( 'View' )
+				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
+				__( 'Edit' )
 			);
+		}
 
-			if ( current_user_can( 'edit_post', $post->ID ) ) {
-				$actions['attach'] = sprintf(
-					'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
-					$post->ID,
+		if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( $this->is_trash ) {
+				$actions['untrash'] = sprintf(
+					'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
+					esc_url( wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) ),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $att_title ) ),
-					__( 'Attach' )
+					esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $att_title ) ),
+					__( 'Restore' )
 				);
-			}
-		} else {
-			if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
-				$actions['edit'] = sprintf(
-					'<a href="%s" aria-label="%s">%s</a>',
-					get_edit_post_link( $post->ID ),
+			} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+				$actions['trash'] = sprintf(
+					'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
+					esc_url( wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) ),
 					/* translators: %s: Attachment title. */
-					esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $att_title ) ),
-					__( 'Edit' )
+					esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
+					_x( 'Trash', 'verb' )
 				);
 			}
 
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash ) {
-					$actions['untrash'] = sprintf(
-						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ),
-						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $att_title ) ),
-						__( 'Restore' )
-					);
-				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-					$actions['trash'] = sprintf(
-						'<a href="%s" class="submitdelete aria-button-if-js" aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ),
-						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $att_title ) ),
-						_x( 'Trash', 'verb' )
-					);
-				}
+			if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
+				$show_confirmation = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
 
-				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
-					$delete_ays        = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = sprintf(
-						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
-						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
-						$delete_ays,
-						/* translators: %s: Attachment title. */
-						esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
-						__( 'Delete Permanently' )
-					);
-				}
+				$actions['delete'] = sprintf(
+					'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
+					esc_url( wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) ),
+					$show_confirmation,
+					/* translators: %s: Attachment title. */
+					esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $att_title ) ),
+					__( 'Delete Permanently' )
+				);
 			}
+		}
 
-			if ( ! $this->is_trash ) {
+		$attachment_url = wp_get_attachment_url( $post->ID );
+
+		if ( ! $this->is_trash ) {
+			$permalink = get_permalink( $post->ID );
+
+			if ( $permalink ) {
 				$actions['view'] = sprintf(
 					'<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
-					get_permalink( $post->ID ),
+					esc_url( $permalink ),
 					/* translators: %s: Attachment title. */
 					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
 					__( 'View' )
 				);
+			}
 
+			if ( $attachment_url ) {
 				$actions['copy'] = sprintf(
 					'<span class="copy-to-clipboard-container"><button type="button" class="button-link copy-attachment-url media-library" data-clipboard-text="%s" aria-label="%s">%s</button><span class="success hidden" aria-hidden="true">%s</span></span>',
-					esc_url( wp_get_attachment_url( $post->ID ) ),
+					esc_url( $attachment_url ),
 					/* translators: %s: Attachment title. */
 					esc_attr( sprintf( __( 'Copy &#8220;%s&#8221; URL to clipboard' ), $att_title ) ),
-					__( 'Copy URL to clipboard' ),
+					__( 'Copy URL' ),
 					__( 'Copied!' )
 				);
 			}
 		}
 
+		if ( $attachment_url ) {
+			$actions['download'] = sprintf(
+				'<a href="%s" aria-label="%s" download>%s</a>',
+				esc_url( $attachment_url ),
+				/* translators: %s: Attachment title. */
+				esc_attr( sprintf( __( 'Download &#8220;%s&#8221;' ), $att_title ) ),
+				__( 'Download file' )
+			);
+		}
+
+		if ( $this->detached && current_user_can( 'edit_post', $post->ID ) ) {
+			$actions['attach'] = sprintf(
+				'<a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
+				$post->ID,
+				/* translators: %s: Attachment title. */
+				esc_attr( sprintf( __( 'Attach &#8220;%s&#8221; to existing content' ), $att_title ) ),
+				__( 'Attach' )
+			);
+		}
+
 		/**
 		 * Filters the action links for each attachment in the Media list table.
 		 *
 		 * @since 2.8.0
 		 *
 		 * @param string[] $actions  An array of action links for each attachment.
-		 *                           Default 'Edit', 'Delete Permanently', 'View'.
+		 *                           Includes 'Edit', 'Delete Permanently', 'View',
+		 *                           'Copy URL' and 'Download file'.
 		 * @param WP_Post  $post     WP_Post object for the current attachment.
 		 * @param bool     $detached Whether the list table contains media not attached
 		 *                           to any posts. Default true.
diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
index 3d4583f1ecdf7..ec48bf37c7b26 100644
--- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -81,7 +81,7 @@ public function prepare_items() {
 
 		$s    = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
 		$wild = '';
-		if ( false !== strpos( $s, '*' ) ) {
+		if ( str_contains( $s, '*' ) ) {
 			$wild = '*';
 			$s    = trim( $s, '*' );
 		}
@@ -109,12 +109,17 @@ public function prepare_items() {
 
 		if ( empty( $s ) ) {
 			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s )
+			|| preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s )
+			|| preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s )
+			|| preg_match( '/^[0-9]{1,3}\.$/', $s )
+		) {
 			// IPv4 address.
-			$sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
+			$sql = $wpdb->prepare(
+				"SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s",
+				$wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' )
+			);
+
 			$reg_blog_ids = $wpdb->get_col( $sql );
 
 			if ( $reg_blog_ids ) {
@@ -262,7 +267,11 @@ protected function get_views() {
 
 		foreach ( $statuses as $status => $label_count ) {
 			if ( (int) $counts[ $status ] > 0 ) {
-				$label    = sprintf( translate_nooped_plural( $label_count, $counts[ $status ] ), number_format_i18n( $counts[ $status ] ) );
+				$label = sprintf(
+					translate_nooped_plural( $label_count, $counts[ $status ] ),
+					number_format_i18n( $counts[ $status ] )
+				);
+
 				$full_url = 'all' === $status ? $url : add_query_arg( 'status', $status, $url );
 
 				$view_links[ $status ] = array(
@@ -306,7 +315,7 @@ protected function pagination( $which ) {
 	}
 
 	/**
-	 * Extra controls to be displayed between bulk actions and pagination.
+	 * Displays extra controls between bulk actions and pagination.
 	 *
 	 * @since 5.3.0
 	 *
@@ -350,7 +359,7 @@ protected function extra_tablenav( $which ) {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$sites_columns = array(
@@ -380,10 +389,19 @@ public function get_columns() {
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
+
+		if ( is_subdomain_install() ) {
+			$blogname_abbr         = __( 'Domain' );
+			$blogname_orderby_text = __( 'Table ordered by Site Domain Name.' );
+		} else {
+			$blogname_abbr         = __( 'Path' );
+			$blogname_orderby_text = __( 'Table ordered by Site Path.' );
+		}
+
 		return array(
-			'blogname'    => 'blogname',
-			'lastupdated' => 'lastupdated',
-			'registered'  => 'blog_id',
+			'blogname'    => array( 'blogname', false, $blogname_abbr, $blogname_orderby_text ),
+			'lastupdated' => array( 'lastupdated', true, __( 'Last Updated' ), __( 'Table ordered by Last Updated.' ) ),
+			'registered'  => array( 'blog_id', true, _x( 'Registered', 'site' ), __( 'Table ordered by Site Registered Date.' ), 'desc' ),
 		);
 	}
 
@@ -402,13 +420,16 @@ public function column_cb( $item ) {
 		if ( ! is_main_site( $blog['blog_id'] ) ) :
 			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
 			?>
-			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>">
+			<label class="label-covers-full-cell" for="blog_<?php echo $blog['blog_id']; ?>">
+				<span class="screen-reader-text">
 				<?php
 				/* translators: %s: Site URL. */
 				printf( __( 'Select %s' ), $blogname );
 				?>
+				</span>
 			</label>
-			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id']; ?>" name="allblogs[]"
+				value="<?php echo esc_attr( $blog['blog_id'] ); ?>" />
 			<?php
 		endif;
 	}
@@ -440,8 +461,15 @@ public function column_blogname( $blog ) {
 
 		?>
 		<strong>
-			<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname; ?></a>
-			<?php $this->site_states( $blog ); ?>
+			<?php
+			printf(
+				'<a href="%1$s" class="edit">%2$s</a>',
+				esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ),
+				$blogname
+			);
+
+			$this->site_states( $blog );
+			?>
 		</strong>
 		<?php
 		if ( 'list' !== $mode ) {
@@ -476,7 +504,11 @@ public function column_lastupdated( $blog ) {
 			$date = __( 'Y/m/d g:i:s a' );
 		}
 
-		echo ( '0000-00-00 00:00:00' === $blog['last_updated'] ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+		if ( '0000-00-00 00:00:00' === $blog['last_updated'] ) {
+			_e( 'Never' );
+		} else {
+			echo mysql2date( $date, $blog['last_updated'] );
+		}
 	}
 
 	/**
@@ -527,7 +559,7 @@ public function column_users( $blog ) {
 		}
 
 		printf(
-			'<a href="%s">%s</a>',
+			'<a href="%1$s">%2$s</a>',
 			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
 			number_format_i18n( $user_count )
 		);
@@ -586,7 +618,7 @@ public function display_rows() {
 			reset( $this->status_list );
 
 			foreach ( $this->status_list as $status => $col ) {
-				if ( 1 == $blog[ $status ] ) {
+				if ( '1' === $blog[ $status ] ) {
 					$class = " class='{$col[0]}'";
 				}
 			}
@@ -600,7 +632,7 @@ public function display_rows() {
 	}
 
 	/**
-	 * Maybe output comma-separated site states.
+	 * Determines whether to output comma-separated site states.
 	 *
 	 * @since 5.3.0
 	 *
@@ -620,7 +652,7 @@ protected function site_states( $site ) {
 
 		$site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
 		foreach ( $this->status_list as $status => $col ) {
-			if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
+			if ( '1' === $_site->{$status} && $site_status !== $status ) {
 				$site_states[ $col[0] ] = $col[1];
 			}
 		}
@@ -699,33 +731,110 @@ protected function handle_row_actions( $item, $column_name, $primary ) {
 			'visit'      => '',
 		);
 
-		$actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-		if ( get_network()->site_id != $blog['blog_id'] ) {
-			if ( '1' == $blog['deleted'] ) {
-				$actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+		$actions['edit'] = sprintf(
+			'<a href="%1$s">%2$s</a>',
+			esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ),
+			__( 'Edit' )
+		);
+
+		$actions['backend'] = sprintf(
+			'<a href="%1$s" class="edit">%2$s</a>',
+			esc_url( get_admin_url( $blog['blog_id'] ) ),
+			__( 'Dashboard' )
+		);
+
+		if ( ! is_main_site( $blog['blog_id'] ) ) {
+			if ( '1' === $blog['deleted'] ) {
+				$actions['activate'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ),
+							'activateblog_' . $blog['blog_id']
+						)
+					),
+					__( 'Activate' )
+				);
 			} else {
-				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+				$actions['deactivate'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ),
+							'deactivateblog_' . $blog['blog_id']
+						)
+					),
+					__( 'Deactivate' )
+				);
 			}
 
-			if ( '1' == $blog['archived'] ) {
-				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+			if ( '1' === $blog['archived'] ) {
+				$actions['unarchive'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ),
+							'unarchiveblog_' . $blog['blog_id']
+						)
+					),
+					__( 'Unarchive' )
+				);
 			} else {
-				$actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+				$actions['archive'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ),
+							'archiveblog_' . $blog['blog_id']
+						)
+					),
+					_x( 'Archive', 'verb; site' )
+				);
 			}
 
-			if ( '1' == $blog['spam'] ) {
-				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+			if ( '1' === $blog['spam'] ) {
+				$actions['unspam'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ),
+							'unspamblog_' . $blog['blog_id']
+						)
+					),
+					_x( 'Not Spam', 'site' )
+				);
 			} else {
-				$actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+				$actions['spam'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ),
+							'spamblog_' . $blog['blog_id']
+						)
+					),
+					_x( 'Spam', 'site' )
+				);
 			}
 
 			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
+				$actions['delete'] = sprintf(
+					'<a href="%1$s">%2$s</a>',
+					esc_url(
+						wp_nonce_url(
+							network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ),
+							'deleteblog_' . $blog['blog_id']
+						)
+					),
+					__( 'Delete' )
+				);
 			}
 		}
 
-		$actions['visit'] = "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = sprintf(
+			'<a href="%1$s" rel="bookmark">%2$s</a>',
+			esc_url( get_home_url( $blog['blog_id'], '/' ) ),
+			__( 'Visit' )
+		);
 
 		/**
 		 * Filters the action links displayed for each site in the Sites list table.
diff --git a/src/wp-admin/includes/class-wp-ms-themes-list-table.php b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
index faff7eb63a629..4b94e539213ea 100644
--- a/src/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -322,7 +322,7 @@ public function no_items() {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$columns = array(
@@ -343,7 +343,7 @@ public function get_columns() {
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'name' => 'name',
+			'name' => array( 'name', false, __( 'Theme' ), __( 'Table ordered by Theme Name.' ), 'asc' ),
 		);
 	}
 
@@ -512,8 +512,18 @@ public function column_cb( $item ) {
 		$theme       = $item;
 		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
 		?>
+		<label class="label-covers-full-cell" for="<?php echo $checkbox_id; ?>" >
+			<span class="screen-reader-text">
+			<?php
+			printf(
+				/* translators: Hidden accessibility text. %s: Theme name */
+				__( 'Select %s' ),
+				$theme->display( 'Name' )
+			);
+			?>
+			</span>
+		</label>
 		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" id="<?php echo $checkbox_id; ?>" />
-		<label class="screen-reader-text" for="<?php echo $checkbox_id; ?>" ><?php _e( 'Select' ); ?>  <?php echo $theme->display( 'Name' ); ?></label>
 		<?php
 	}
 
@@ -849,7 +859,13 @@ public function column_autoupdates( $theme ) {
 		 */
 		echo apply_filters( 'theme_auto_update_setting_html', $html, $stylesheet, $theme );
 
-		echo '<div class="notice notice-error notice-alt inline hidden"><p></p></div>';
+		wp_admin_notice(
+			'',
+			array(
+				'type'               => 'error',
+				'additional_classes' => array( 'notice-alt', 'inline', 'hidden' ),
+			)
+		);
 	}
 
 	/**
diff --git a/src/wp-admin/includes/class-wp-ms-users-list-table.php b/src/wp-admin/includes/class-wp-ms-users-list-table.php
index fdaf762cccc35..2e6772f69d1d3 100644
--- a/src/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -185,7 +185,7 @@ protected function pagination( $which ) {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$users_columns = array(
@@ -212,10 +212,10 @@ public function get_columns() {
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'username'   => 'login',
-			'name'       => 'name',
-			'email'      => 'email',
-			'registered' => 'id',
+			'username'   => array( 'login', false, __( 'Username' ), __( 'Table ordered by Username.' ), 'asc' ),
+			'name'       => array( 'name', false, __( 'Name' ), __( 'Table ordered by Name.' ) ),
+			'email'      => array( 'email', false, __( 'E-mail' ), __( 'Table ordered by E-mail.' ) ),
+			'registered' => array( 'id', false, _x( 'Registered', 'user' ), __( 'Table ordered by User Registered Date.' ) ),
 		);
 	}
 
@@ -235,11 +235,13 @@ public function column_cb( $item ) {
 			return;
 		}
 		?>
-		<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>">
+		<label class="label-covers-full-cell" for="blog_<?php echo $user->ID; ?>">
+			<span class="screen-reader-text">
 			<?php
-			/* translators: %s: User login. */
+			/* translators: Hidden accessibility text. %s: User login. */
 			printf( __( 'Select %s' ), $user->user_login );
 			?>
+			</span>
 		</label>
 		<input type="checkbox" id="blog_<?php echo $user->ID; ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ); ?>" />
 		<?php
@@ -309,7 +311,10 @@ public function column_name( $user ) {
 		} elseif ( $user->last_name ) {
 			echo $user->last_name;
 		} else {
-			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
+			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' .
+				/* translators: Hidden accessibility text. */
+				_x( 'Unknown', 'name' ) .
+			'</span>';
 		}
 	}
 
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index e6a709e4d016c..ee744dec9de60 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -30,7 +30,7 @@ public function ajax_user_can() {
 	}
 
 	/**
-	 * Return the list of known plugins.
+	 * Returns the list of known plugins.
 	 *
 	 * Uses the transient data from the updates API to determine the known
 	 * installed plugins.
@@ -88,7 +88,7 @@ protected function get_installed_plugin_slugs() {
 	 * @global string $term
 	 */
 	public function prepare_items() {
-		include_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+		require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 
 		global $tabs, $tab, $paged, $type, $term;
 
@@ -105,7 +105,7 @@ public function prepare_items() {
 			$tabs['search'] = __( 'Search Results' );
 		}
 
-		if ( 'beta' === $tab || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
+		if ( 'beta' === $tab || str_contains( get_bloginfo( 'version' ), '-' ) ) {
 			$tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
 		}
 
@@ -115,8 +115,10 @@ public function prepare_items() {
 		$tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
 
 		if ( current_user_can( 'upload_plugins' ) ) {
-			// No longer a real tab. Here for filter compatibility.
-			// Gets skipped in get_views().
+			/*
+			 * No longer a real tab. Here for filter compatibility.
+			 * Gets skipped in get_views().
+			 */
 			$tabs['upload'] = __( 'Upload Plugin' );
 		}
 
@@ -327,7 +329,7 @@ protected function get_views() {
 	public function views() {
 		$views = $this->get_views();
 
-		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
+		/** This filter is documented in wp-admin/includes/class-wp-list-table.php */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
 		$this->screen->render_screen_reader_content( 'heading_views' );
@@ -424,7 +426,7 @@ protected function get_table_classes() {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		return array();
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
index cad2df794cd84..56e76251dacc3 100644
--- a/src/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -61,8 +61,7 @@ public function __construct( $args = array() ) {
 
 		$this->show_autoupdates = wp_is_auto_update_enabled_for_type( 'plugin' )
 			&& current_user_can( 'update_plugins' )
-			&& ( ! is_multisite() || $this->screen->in_admin( 'network' ) )
-			&& ! in_array( $status, array( 'mustuse', 'dropins' ), true );
+			&& ( ! is_multisite() || $this->screen->in_admin( 'network' ) );
 	}
 
 	/**
@@ -262,8 +261,10 @@ public function prepare_items() {
 				}
 			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
 				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
-				// On the non-network screen, populate the active list with plugins that are individually activated.
-				// On the network admin screen, populate the active list with plugins that are network-activated.
+				/*
+				 * On the non-network screen, populate the active list with plugins that are individually activated.
+				 * On the network admin screen, populate the active list with plugins that are network-activated.
+				 */
 				$plugins['active'][ $plugin_file ] = $plugin_data;
 
 				if ( ! $screen->in_admin( 'network' ) && is_plugin_paused( $plugin_file ) ) {
@@ -297,6 +298,15 @@ public function prepare_items() {
 			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
 		}
 
+		/**
+		 * Filters the array of plugins for the list table.
+		 *
+		 * @since 6.3.0
+		 *
+		 * @param array[] $plugins An array of arrays of plugin data, keyed by context.
+		 */
+		$plugins = apply_filters( 'plugins_list', $plugins );
+
 		$totals = array();
 		foreach ( $plugins as $type => $list ) {
 			$totals[ $type ] = count( $list );
@@ -403,7 +413,7 @@ public function no_items() {
 		global $plugins;
 
 		if ( ! empty( $_REQUEST['s'] ) ) {
-			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
+			$s = esc_html( urldecode( wp_unslash( $_REQUEST['s'] ) ) );
 
 			/* translators: %s: Plugin search term. */
 			printf( __( 'No plugins found for: %s.' ), '<strong>' . $s . '</strong>' );
@@ -451,7 +461,8 @@ public function search_box( $text, $input_id ) {
 
 	/**
 	 * @global string $status
-	 * @return array
+	 *
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		global $status;
@@ -462,7 +473,7 @@ public function get_columns() {
 			'description' => __( 'Description' ),
 		);
 
-		if ( $this->show_autoupdates ) {
+		if ( $this->show_autoupdates && ! in_array( $status, array( 'mustuse', 'dropins' ), true ) ) {
 			$columns['auto-updates'] = __( 'Automatic Updates' );
 		}
 
@@ -982,10 +993,10 @@ public function single_row( $item ) {
 			$checkbox = '';
 		} else {
 			$checkbox = sprintf(
-				'<label class="screen-reader-text" for="%1$s">%2$s</label>' .
+				'<label class="label-covers-full-cell" for="%1$s"><span class="screen-reader-text">%2$s</span></label>' .
 				'<input type="checkbox" name="checked[]" value="%3$s" id="%1$s" />',
 				$checkbox_id,
-				/* translators: %s: Plugin name. */
+				/* translators: Hidden accessibility text. %s: Plugin name. */
 				sprintf( __( 'Select %s' ), $plugin_data['Name'] ),
 				esc_attr( $plugin_file )
 			);
@@ -1021,8 +1032,7 @@ public function single_row( $item ) {
 
 		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
-		$auto_updates      = (array) get_site_option( 'auto_update_plugins', array() );
-		$available_updates = get_site_transient( 'update_plugins' );
+		$auto_updates = (array) get_site_option( 'auto_update_plugins', array() );
 
 		foreach ( $columns as $column_name => $column_display_name ) {
 			$extra_classes = '';
@@ -1154,7 +1164,7 @@ public function single_row( $item ) {
 					echo '</td>';
 					break;
 				case 'auto-updates':
-					if ( ! $this->show_autoupdates ) {
+					if ( ! $this->show_autoupdates || in_array( $status, array( 'mustuse', 'dropins' ), true ) ) {
 						break;
 					}
 
diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
index 067dae49e7f97..6e9bcdc527add 100644
--- a/src/wp-admin/includes/class-wp-posts-list-table.php
+++ b/src/wp-admin/includes/class-wp-posts-list-table.php
@@ -226,7 +226,7 @@ public function no_items() {
 	}
 
 	/**
-	 * Determine if the current view is the "All" view.
+	 * Determines if the current view is the "All" view.
 	 *
 	 * @since 4.2.0
 	 *
@@ -246,7 +246,7 @@ protected function is_base_request() {
 	}
 
 	/**
-	 * Helper to create links to edit.php with params.
+	 * Creates a link to edit.php with params.
 	 *
 	 * @since 4.4.0
 	 *
@@ -534,7 +534,12 @@ protected function formats_dropdown( $post_type ) {
 
 		$displayed_post_format = isset( $_GET['post_format'] ) ? $_GET['post_format'] : '';
 		?>
-		<label for="filter-by-format" class="screen-reader-text"><?php _e( 'Filter by post format' ); ?></label>
+		<label for="filter-by-format" class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Filter by post format' );
+			?>
+		</label>
 		<select name="post_format" id="filter-by-format">
 			<option<?php selected( $displayed_post_format, '' ); ?> value=""><?php _e( 'All formats' ); ?></option>
 			<?php
@@ -646,7 +651,7 @@ protected function get_table_classes() {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$post_type = $this->screen->post_type;
@@ -704,6 +709,7 @@ public function get_columns() {
 			$posts_columns['comments'] = sprintf(
 				'<span class="vers comment-grey-bubble" title="%1$s" aria-hidden="true"></span><span class="screen-reader-text">%2$s</span>',
 				esc_attr__( 'Comments' ),
+				/* translators: Hidden accessibility text. */
 				__( 'Comments' )
 			);
 		}
@@ -754,12 +760,33 @@ public function get_columns() {
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
-		return array(
-			'title'    => 'title',
-			'parent'   => 'parent',
-			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
-		);
+
+		$post_type = $this->screen->post_type;
+
+		if ( 'page' === $post_type ) {
+			if ( isset( $_GET['orderby'] ) ) {
+				$title_orderby_text = __( 'Table ordered by Title.' );
+			} else {
+				$title_orderby_text = __( 'Table ordered by Hierarchical Menu Order and Title.' );
+			}
+
+			$sortables = array(
+				'title'    => array( 'title', false, __( 'Title' ), $title_orderby_text, 'asc' ),
+				'parent'   => array( 'parent', false ),
+				'comments' => array( 'comment_count', false, __( 'Comments' ), __( 'Table ordered by Comments.' ) ),
+				'date'     => array( 'date', true, __( 'Date' ), __( 'Table ordered by Date.' ) ),
+			);
+		} else {
+			$sortables = array(
+				'title'    => array( 'title', false, __( 'Title' ), __( 'Table ordered by Title.' ) ),
+				'parent'   => array( 'parent', false ),
+				'comments' => array( 'comment_count', false, __( 'Comments' ), __( 'Table ordered by Comments.' ) ),
+				'date'     => array( 'date', true, __( 'Date' ), __( 'Table ordered by Date.' ), 'desc' ),
+			);
+		}
+		// Custom Post Types: there's a filter for that, see get_column_info().
+
+		return $sortables;
 	}
 
 	/**
@@ -911,8 +938,8 @@ private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 2
 	}
 
 	/**
-	 * Given a top level page ID, display the nested hierarchy of sub-pages
-	 * together with paging support
+	 * Displays the nested hierarchy of sub-pages together with paging
+	 * support, based on a top level page ID.
 	 *
 	 * @since 3.1.0 (Standalone function exists since 2.6.0)
 	 * @since 4.2.0 Added the `$to_display` parameter.
@@ -1006,11 +1033,13 @@ public function column_cb( $item ) {
 		 */
 		if ( apply_filters( 'wp_list_table_show_post_checkbox', $show, $post ) ) :
 			?>
-			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>">
+			<label class="label-covers-full-cell" for="cb-select-<?php the_ID(); ?>">
+				<span class="screen-reader-text">
 				<?php
 					/* translators: %s: Post title. */
 					printf( __( 'Select %s' ), _draft_or_post_title() );
 				?>
+				</span>
 			</label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator">
@@ -1018,7 +1047,7 @@ public function column_cb( $item ) {
 				<span class="screen-reader-text">
 				<?php
 				printf(
-					/* translators: %s: Post title. */
+					/* translators: Hidden accessibility text. %s: Post title. */
 					__( '&#8220;%s&#8221; is locked' ),
 					_draft_or_post_title()
 				);
@@ -1199,7 +1228,7 @@ public function column_date( $post ) {
 		}
 
 		/**
-		 * Filters the published time of the post.
+		 * Filters the published, scheduled, or unpublished time of the post.
 		 *
 		 * @since 2.5.1
 		 * @since 5.5.0 Removed the difference between 'excerpt' and 'list' modes.
@@ -1265,7 +1294,7 @@ public function column_default( $item, $column_name ) {
 			$taxonomy = 'category';
 		} elseif ( 'tags' === $column_name ) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
+		} elseif ( str_starts_with( $column_name, 'taxonomy-' ) ) {
 			$taxonomy = substr( $column_name, 9 );
 		} else {
 			$taxonomy = false;
diff --git a/src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php b/src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php
index c74471a0cecfa..53d67459fe30f 100644
--- a/src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php
+++ b/src/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php
@@ -36,7 +36,7 @@ class WP_Privacy_Data_Removal_Requests_List_Table extends WP_Privacy_Requests_Ta
 	protected $post_type = 'user_request';
 
 	/**
-	 * Actions column.
+	 * Outputs the Actions column.
 	 *
 	 * @since 4.9.6
 	 *
@@ -108,7 +108,7 @@ public function column_email( $item ) {
 	}
 
 	/**
-	 * Next steps column.
+	 * Outputs the Next steps column.
 	 *
 	 * @since 4.9.6
 	 *
diff --git a/src/wp-admin/includes/class-wp-privacy-policy-content.php b/src/wp-admin/includes/class-wp-privacy-policy-content.php
index 9b11d09a66f02..46b10e15f6b66 100644
--- a/src/wp-admin/includes/class-wp-privacy-policy-content.php
+++ b/src/wp-admin/includes/class-wp-privacy-policy-content.php
@@ -20,7 +20,7 @@ final class WP_Privacy_Policy_Content {
 	private function __construct() {}
 
 	/**
-	 * Add content to the postbox shown when editing the privacy policy.
+	 * Adds content to the postbox shown when editing the privacy policy.
 	 *
 	 * Plugins and themes should suggest text for inclusion in the site's privacy policy.
 	 * The suggested text should contain information about any functionality that affects user privacy,
@@ -49,7 +49,7 @@ public static function add( $plugin_name, $policy_text ) {
 	}
 
 	/**
-	 * Quick check if any privacy info has changed.
+	 * Performs a quick check to determine whether any privacy info has changed.
 	 *
 	 * @since 4.9.6
 	 */
@@ -103,11 +103,15 @@ public static function text_change_check() {
 		sort( $old );
 		sort( $new );
 
-		// The == operator (equal, not identical) was used intentionally.
-		// See http://php.net/manual/en/language.operators.array.php
+		/*
+		 * The == operator (equal, not identical) was used intentionally.
+		 * See https://www.php.net/manual/en/language.operators.array.php
+		 */
 		if ( $new != $old ) {
-			// A plugin was activated or deactivated, or some policy text has changed.
-			// Show a notice on the relevant screens to inform the admin.
+			/*
+			 * A plugin was activated or deactivated, or some policy text has changed.
+			 * Show a notice on the relevant screens to inform the admin.
+			 */
 			add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'policy_text_changed_notice' ) );
 			$state = 'changed';
 		} else {
@@ -123,7 +127,7 @@ public static function text_change_check() {
 	}
 
 	/**
-	 * Output a warning when some privacy info has changed.
+	 * Outputs a warning when some privacy info has changed.
 	 *
 	 * @since 4.9.6
 	 *
@@ -154,7 +158,7 @@ public static function policy_text_changed_notice() {
 	}
 
 	/**
-	 * Update the cached policy info when the policy page is updated.
+	 * Updates the cached policy info when the policy page is updated.
 	 *
 	 * @since 4.9.6
 	 * @access private
@@ -203,7 +207,7 @@ public static function _policy_page_updated( $post_id ) {
 	}
 
 	/**
-	 * Check for updated, added or removed privacy policy information from plugins.
+	 * Checks for updated, added or removed privacy policy information from plugins.
 	 *
 	 * Caches the current info in post_meta of the policy page.
 	 *
@@ -301,7 +305,7 @@ public static function get_suggested_policy_text() {
 	}
 
 	/**
-	 * Add a notice with a link to the guide when editing the privacy policy page.
+	 * Adds a notice with a link to the guide when editing the privacy policy page.
 	 *
 	 * @since 4.9.6
 	 * @since 5.0.0 The `$post` parameter was made optional.
@@ -361,7 +365,7 @@ public static function notice( $post = null ) {
 					' <a href="%s" target="_blank">%s <span class="screen-reader-text">%s</span></a>',
 					$url,
 					$label,
-					/* translators: Accessibility text. */
+					/* translators: Hidden accessibility text. */
 					__( '(opens in a new tab)' )
 				);
 				?>
@@ -372,7 +376,7 @@ public static function notice( $post = null ) {
 	}
 
 	/**
-	 * Output the privacy policy guide together with content from the theme and plugins.
+	 * Outputs the privacy policy guide together with content from the theme and plugins.
 	 *
 	 * @since 4.9.6
 	 */
@@ -428,7 +432,7 @@ public static function privacy_policy_guide() {
 						<span aria-hidden="true"><?php _e( 'Copy suggested policy text to clipboard' ); ?></span>
 						<span class="screen-reader-text">
 							<?php
-							/* translators: %s: Plugin name. */
+							/* translators: Hidden accessibility text. %s: Plugin name. */
 							printf( __( 'Copy suggested policy text from %s.' ), $plugin_name );
 							?>
 						</span>
@@ -441,7 +445,7 @@ public static function privacy_policy_guide() {
 	}
 
 	/**
-	 * Return the default suggested privacy policy content.
+	 * Returns the default suggested privacy policy content.
 	 *
 	 * @since 4.9.6
 	 * @since 5.0.0 Added the `$blocks` parameter.
@@ -656,11 +660,11 @@ public static function get_default_content( $description = false, $blocks = true
 
 		if ( $blocks ) {
 			foreach ( $strings as $key => $string ) {
-				if ( 0 === strpos( $string, '<p>' ) ) {
+				if ( str_starts_with( $string, '<p>' ) ) {
 					$strings[ $key ] = '<!-- wp:paragraph -->' . $string . '<!-- /wp:paragraph -->';
 				}
 
-				if ( 0 === strpos( $string, '<h2>' ) ) {
+				if ( str_starts_with( $string, '<h2>' ) ) {
 					$strings[ $key ] = '<!-- wp:heading -->' . $string . '<!-- /wp:heading -->';
 				}
 			}
@@ -690,7 +694,7 @@ public static function get_default_content( $description = false, $blocks = true
 	}
 
 	/**
-	 * Add the suggested privacy policy text to the policy postbox.
+	 * Adds the suggested privacy policy text to the policy postbox.
 	 *
 	 * @since 4.9.6
 	 */
diff --git a/src/wp-admin/includes/class-wp-privacy-requests-table.php b/src/wp-admin/includes/class-wp-privacy-requests-table.php
index 3061b73375d88..cbc8c01892617 100644
--- a/src/wp-admin/includes/class-wp-privacy-requests-table.php
+++ b/src/wp-admin/includes/class-wp-privacy-requests-table.php
@@ -31,7 +31,7 @@ abstract class WP_Privacy_Requests_Table extends WP_List_Table {
 	protected $post_type = 'INVALID';
 
 	/**
-	 * Get columns to show in the list table.
+	 * Gets columns to show in the list table.
 	 *
 	 * @since 4.9.6
 	 *
@@ -49,7 +49,7 @@ public function get_columns() {
 	}
 
 	/**
-	 * Normalize the admin URL to the current page (by request_type).
+	 * Normalizes the admin URL to the current page (by request_type).
 	 *
 	 * @since 5.3.0
 	 *
@@ -66,7 +66,7 @@ protected function get_admin_url() {
 	}
 
 	/**
-	 * Get a list of sortable columns.
+	 * Gets a list of sortable columns.
 	 *
 	 * @since 4.9.6
 	 *
@@ -87,7 +87,7 @@ protected function get_sortable_columns() {
 	}
 
 	/**
-	 * Default primary column.
+	 * Returns the default primary column.
 	 *
 	 * @since 4.9.6
 	 *
@@ -98,7 +98,7 @@ protected function get_default_primary_column_name() {
 	}
 
 	/**
-	 * Count number of requests for each status.
+	 * Counts the number of requests for each status.
 	 *
 	 * @since 4.9.6
 	 *
@@ -137,7 +137,7 @@ protected function get_request_counts() {
 	}
 
 	/**
-	 * Get an associative array ( id => link ) with the list of views available on this table.
+	 * Gets an associative array ( id => link ) with the list of views available on this table.
 	 *
 	 * @since 4.9.6
 	 *
@@ -200,7 +200,7 @@ protected function get_views() {
 	}
 
 	/**
-	 * Get bulk actions.
+	 * Gets bulk actions.
 	 *
 	 * @since 4.9.6
 	 *
@@ -354,7 +354,7 @@ public function process_bulk_action() {
 	}
 
 	/**
-	 * Prepare items to output.
+	 * Prepares items to output.
 	 *
 	 * @since 4.9.6
 	 * @since 5.1.0 Added support for column sorting.
@@ -407,7 +407,7 @@ public function prepare_items() {
 	}
 
 	/**
-	 * Checkbox column.
+	 * Returns the markup for the Checkbox column.
 	 *
 	 * @since 4.9.6
 	 *
@@ -415,7 +415,13 @@ public function prepare_items() {
 	 * @return string Checkbox column markup.
 	 */
 	public function column_cb( $item ) {
-		return sprintf( '<input type="checkbox" name="request_id[]" value="%1$s" /><span class="spinner"></span>', esc_attr( $item->ID ) );
+		return sprintf(
+			'<label class="label-covers-full-cell" for="requester_%1$s"><span class="screen-reader-text">%2$s</span></label>' .
+			'<input type="checkbox" name="request_id[]" id="requester_%1$s" value="%1$s" /><span class="spinner"></span>',
+			esc_attr( $item->ID ),
+			/* translators: Hidden accessibility text. %s: Email address. */
+			sprintf( __( 'Select %s' ), $item->email )
+		);
 	}
 
 	/**
@@ -456,7 +462,7 @@ public function column_status( $item ) {
 	}
 
 	/**
-	 * Convert timestamp for display.
+	 * Converts a timestamp for display.
 	 *
 	 * @since 4.9.6
 	 *
@@ -479,7 +485,7 @@ protected function get_timestamp_as_date( $timestamp ) {
 	}
 
 	/**
-	 * Default column handler.
+	 * Handles the default column.
 	 *
 	 * @since 4.9.6
 	 * @since 5.7.0 Added `manage_{$this->screen->id}_custom_column` action.
@@ -503,7 +509,7 @@ public function column_default( $item, $column_name ) {
 	}
 
 	/**
-	 * Created timestamp column. Overridden by children.
+	 * Returns the markup for the Created timestamp column. Overridden by children.
 	 *
 	 * @since 5.7.0
 	 *
@@ -527,7 +533,7 @@ public function column_email( $item ) {
 	}
 
 	/**
-	 * Next steps column. Overridden by children.
+	 * Returns the markup for the next steps column. Overridden by children.
 	 *
 	 * @since 4.9.6
 	 *
@@ -551,7 +557,7 @@ public function single_row( $item ) {
 	}
 
 	/**
-	 * Embed scripts used to perform actions. Overridden by children.
+	 * Embeds scripts used to perform actions. Overridden by children.
 	 *
 	 * @since 4.9.6
 	 */
diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php
index 73f6275fe605c..739a182ded075 100644
--- a/src/wp-admin/includes/class-wp-screen.php
+++ b/src/wp-admin/includes/class-wp-screen.php
@@ -89,7 +89,7 @@ final class WP_Screen {
 	 * have a `$parent_base` of 'edit'.
 	 *
 	 * @since 3.3.0
-	 * @var string
+	 * @var string|null
 	 */
 	public $parent_base;
 
@@ -99,7 +99,7 @@ final class WP_Screen {
 	 * Some `$parent_file` values are 'edit.php?post_type=page', 'edit.php', and 'options-general.php'.
 	 *
 	 * @since 3.3.0
-	 * @var string
+	 * @var string|null
 	 */
 	public $parent_file;
 
@@ -144,7 +144,7 @@ final class WP_Screen {
 	 * The accessible hidden headings and text associated with the screen, if any.
 	 *
 	 * @since 4.4.0
-	 * @var array
+	 * @var string[]
 	 */
 	private $_screen_reader_content = array();
 
@@ -230,7 +230,7 @@ public static function get( $hook_name = '' ) {
 			$post_type = $id;
 			$id        = 'post'; // Changes later. Ends up being $base.
 		} else {
-			if ( '.php' === substr( $id, -4 ) ) {
+			if ( str_ends_with( $id, '.php' ) ) {
 				$id = substr( $id, 0, -4 );
 			}
 
@@ -241,16 +241,16 @@ public static function get( $hook_name = '' ) {
 		}
 
 		if ( ! $post_type && $hook_name ) {
-			if ( '-network' === substr( $id, -8 ) ) {
+			if ( str_ends_with( $id, '-network' ) ) {
 				$id       = substr( $id, 0, -8 );
 				$in_admin = 'network';
-			} elseif ( '-user' === substr( $id, -5 ) ) {
+			} elseif ( str_ends_with( $id, '-user' ) ) {
 				$id       = substr( $id, 0, -5 );
 				$in_admin = 'user';
 			}
 
 			$id = sanitize_key( $id );
-			if ( 'edit-comments' !== $id && 'edit-tags' !== $id && 'edit-' === substr( $id, 0, 5 ) ) {
+			if ( 'edit-comments' !== $id && 'edit-tags' !== $id && str_starts_with( $id, 'edit-' ) ) {
 				$maybe = substr( $id, 5 );
 				if ( taxonomy_exists( $maybe ) ) {
 					$id       = 'edit-tags';
@@ -721,7 +721,7 @@ public function get_columns() {
 	 *
 	 * @see set_screen_reader_content() For more information on the array format.
 	 *
-	 * @return array An associative array of screen reader text strings.
+	 * @return string[] An associative array of screen reader text strings.
 	 */
 	public function get_screen_reader_content() {
 		return $this->_screen_reader_content;
@@ -1118,6 +1118,7 @@ public function render_meta_boxes_preferences() {
 			<?php _e( 'Some screen elements can be shown or hidden by using the checkboxes.' ); ?>
 			<?php _e( 'Expand or collapse the elements by clicking on their headings, and arrange them by dragging their headings or by clicking on the up and down arrows.' ); ?>
 		</p>
+		<div class="metabox-prefs-container">
 		<?php
 
 		meta_box_prefs( $this );
@@ -1137,6 +1138,7 @@ public function render_meta_boxes_preferences() {
 			echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
 		}
 		?>
+		</div>
 		</fieldset>
 		<?php
 	}
diff --git a/src/wp-admin/includes/class-wp-site-health-auto-updates.php b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
index f6fb7d79b9654..d1655eb1d87d6 100644
--- a/src/wp-admin/includes/class-wp-site-health-auto-updates.php
+++ b/src/wp-admin/includes/class-wp-site-health-auto-updates.php
@@ -277,10 +277,10 @@ public function test_vcs_abspath() {
 	public function test_check_wp_filesystem_method() {
 		// Make sure the `request_filesystem_credentials()` function is available during our REST API call.
 		if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-			require_once ABSPATH . '/wp-admin/includes/file.php';
+			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}
 
-		$skin    = new Automatic_Upgrader_Skin;
+		$skin    = new Automatic_Upgrader_Skin();
 		$success = $skin->request_filesystem_credentials( false, ABSPATH );
 
 		if ( ! $success ) {
@@ -313,7 +313,7 @@ public function test_all_files_writable() {
 
 		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
 
-		$skin    = new Automatic_Upgrader_Skin;
+		$skin    = new Automatic_Upgrader_Skin();
 		$success = $skin->request_filesystem_credentials( false, ABSPATH );
 
 		if ( ! $success ) {
@@ -328,11 +328,11 @@ public function test_all_files_writable() {
 
 		// Make sure the `get_core_checksums()` function is available during our REST API call.
 		if ( ! function_exists( 'get_core_checksums' ) ) {
-			require_once ABSPATH . '/wp-admin/includes/update.php';
+			require_once ABSPATH . 'wp-admin/includes/update.php';
 		}
 
 		$checksums = get_core_checksums( $wp_version, 'en_US' );
-		$dev       = ( false !== strpos( $wp_version, '-' ) );
+		$dev       = ( str_contains( $wp_version, '-' ) );
 		// Get the last stable version's files and test against that.
 		if ( ! $checksums && $dev ) {
 			$checksums = get_core_checksums( (float) $wp_version - 0.1, 'en_US' );
@@ -358,7 +358,7 @@ public function test_all_files_writable() {
 
 		$unwritable_files = array();
 		foreach ( array_keys( $checksums ) as $file ) {
-			if ( 'wp-content' === substr( $file, 0, 10 ) ) {
+			if ( str_starts_with( $file, 'wp-content' ) ) {
 				continue;
 			}
 			if ( ! file_exists( ABSPATH . $file ) ) {
@@ -396,7 +396,7 @@ public function test_all_files_writable() {
 	public function test_accepts_dev_updates() {
 		require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
 		// Only for dev versions.
-		if ( false === strpos( $wp_version, '-' ) ) {
+		if ( ! str_contains( $wp_version, '-' ) ) {
 			return false;
 		}
 
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index abe0fc618488c..a0e1de586bde2 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -18,7 +18,7 @@ class WP_Site_Health {
 	private $mysql_server_version        = '';
 	private $mysql_required_version      = '5.5';
 	private $mysql_recommended_version   = '5.7';
-	private $mariadb_recommended_version = '10.3';
+	private $mariadb_recommended_version = '10.4';
 
 	public $php_memory_limit;
 
@@ -65,7 +65,7 @@ public function __construct() {
 	 */
 	public function show_site_health_tab( $tab ) {
 		if ( 'debug' === $tab ) {
-			require_once ABSPATH . '/wp-admin/site-health-info.php';
+			require_once ABSPATH . 'wp-admin/site-health-info.php';
 		}
 	}
 
@@ -746,10 +746,10 @@ public function get_test_php_version() {
 				)
 			),
 			'actions'     => sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				esc_url( wp_get_update_php_url() ),
 				__( 'Learn more about updating PHP' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 			'test'        => 'php_version',
@@ -772,8 +772,10 @@ public function get_test_php_version() {
 			return $result;
 		}
 
-		// The PHP version is still receiving security fixes, but is lower than
-		// the expected minimum version that will be required by WordPress in the near future.
+		/*
+		 * The PHP version is still receiving security fixes, but is lower than
+		 * the expected minimum version that will be required by WordPress in the near future.
+		 */
 		if ( $response['is_secure'] && $response['is_lower_than_future_minimum'] ) {
 			// The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates.
 
@@ -892,8 +894,8 @@ public function get_test_php_extensions() {
 					esc_url( __( 'https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions' ) ),
 					'target="_blank" rel="noopener"',
 					sprintf(
-						' <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span>',
-						/* translators: Accessibility text. */
+						'<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span>',
+						/* translators: Hidden accessibility text. */
 						__( '(opens in a new tab)' )
 					)
 				)
@@ -1051,7 +1053,8 @@ public function get_test_php_extensions() {
 				if ( $module['required'] ) {
 					$result['status'] = 'critical';
 
-					$class         = 'error';
+					$class = 'error';
+					/* translators: Hidden accessibility text. */
 					$screen_reader = __( 'Error' );
 					$message       = sprintf(
 						/* translators: %s: The module name. */
@@ -1059,7 +1062,8 @@ public function get_test_php_extensions() {
 						$library
 					);
 				} else {
-					$class         = 'warning';
+					$class = 'warning';
+					/* translators: Hidden accessibility text. */
 					$screen_reader = __( 'Warning' );
 					$message       = sprintf(
 						/* translators: %s: The module name. */
@@ -1214,11 +1218,11 @@ public function get_test_sql_server() {
 				__( 'The SQL server is a required piece of software for the database WordPress uses to store all your site&#8217;s content and settings.' )
 			),
 			'actions'     => sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				/* translators: Localized version of WordPress requirements if one exists. */
 				esc_url( __( 'https://wordpress.org/about/requirements/' ) ),
 				__( 'Learn more about what WordPress requires to run.' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 			'test'        => 'sql_server',
@@ -1284,6 +1288,8 @@ public function get_test_sql_server() {
 	 *
 	 * @since 5.2.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @return array The test results.
 	 */
 	public function get_test_utf8mb4_support() {
@@ -1362,7 +1368,7 @@ public function get_test_utf8mb4_support() {
 		 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
 		 * mysqlnd has supported utf8mb4 since 5.0.9.
 		 */
-		if ( false !== strpos( $mysql_client_version, 'mysqlnd' ) ) {
+		if ( str_contains( $mysql_client_version, 'mysqlnd' ) ) {
 			$mysql_client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $mysql_client_version );
 			if ( version_compare( $mysql_client_version, '5.0.9', '<' ) ) {
 				$result['status'] = 'recommended';
@@ -1440,6 +1446,7 @@ public function get_test_dotorg_communication() {
 				'<p>%s</p>',
 				sprintf(
 					'<span class="error"><span class="screen-reader-text">%s</span></span> %s',
+					/* translators: Hidden accessibility text. */
 					__( 'Error' ),
 					sprintf(
 						/* translators: 1: The IP address WordPress.org resolves to. 2: The error returned by the lookup. */
@@ -1451,11 +1458,11 @@ public function get_test_dotorg_communication() {
 			);
 
 			$result['actions'] = sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				/* translators: Localized Support reference. */
-				esc_url( __( 'https://wordpress.org/support' ) ),
+				esc_url( __( 'https://wordpress.org/support/forums/' ) ),
 				__( 'Get help resolving this issue.' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			);
 		}
@@ -1489,11 +1496,11 @@ public function get_test_is_in_debug_mode() {
 				__( 'Debug mode is often enabled to gather more details about an error or site failure, but may contain sensitive information which should not be available on a publicly available website.' )
 			),
 			'actions'     => sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				/* translators: Documentation explaining debugging in WordPress. */
-				esc_url( __( 'https://wordpress.org/support/article/debugging-in-wordpress/' ) ),
+				esc_url( __( 'https://wordpress.org/documentation/article/debugging-in-wordpress/' ) ),
 				__( 'Learn more about debugging in WordPress.' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 			'test'        => 'is_in_debug_mode',
@@ -1503,7 +1510,7 @@ public function get_test_is_in_debug_mode() {
 			if ( defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) {
 				$result['label'] = __( 'Your site is set to log errors to a potentially public file' );
 
-				$result['status'] = ( 0 === strpos( ini_get( 'error_log' ), ABSPATH ) ) ? 'critical' : 'recommended';
+				$result['status'] = str_starts_with( ini_get( 'error_log' ), ABSPATH ) ? 'critical' : 'recommended';
 
 				$result['description'] .= sprintf(
 					'<p>%s</p>',
@@ -1552,8 +1559,10 @@ public function get_test_is_in_debug_mode() {
 	 * @return array The test results.
 	 */
 	public function get_test_https_status() {
-		// Enforce fresh HTTPS detection results. This is normally invoked by using cron,
-		// but for Site Health it should always rely on the latest results.
+		/*
+		 * Enforce fresh HTTPS detection results. This is normally invoked by using cron,
+		 * but for Site Health it should always rely on the latest results.
+		 */
 		wp_update_https_detection_errors();
 
 		$default_update_url = wp_get_default_update_https_url();
@@ -1573,15 +1582,17 @@ public function get_test_https_status() {
 				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				esc_url( $default_update_url ),
 				__( 'Learn more about why you should use HTTPS' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 			'test'        => 'https_status',
 		);
 
 		if ( ! wp_is_using_https() ) {
-			// If the website is not using HTTPS, provide more information
-			// about whether it is supported and how it can be enabled.
+			/*
+			 * If the website is not using HTTPS, provide more information
+			 * about whether it is supported and how it can be enabled.
+			 */
 			$result['status'] = 'recommended';
 			$result['label']  = __( 'Your website does not use HTTPS' );
 
@@ -1655,7 +1666,7 @@ public function get_test_https_status() {
 							'<p class="button-container"><a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s<span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 							esc_url( $direct_update_url ),
 							__( 'Update your site to use HTTPS' ),
-							/* translators: Accessibility text. */
+							/* translators: Hidden accessibility text. */
 							__( '(opens in a new tab)' )
 						);
 					} else {
@@ -1674,7 +1685,7 @@ public function get_test_https_status() {
 						'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 						esc_url( $update_url ),
 						__( 'Talk to your web host about supporting HTTPS for your website.' ),
-						/* translators: Accessibility text. */
+						/* translators: Hidden accessibility text. */
 						__( '(opens in a new tab)' )
 					);
 				} else {
@@ -1835,14 +1846,17 @@ public function get_test_background_updates() {
 			require_once ABSPATH . 'wp-admin/includes/class-wp-site-health-auto-updates.php';
 		}
 
-		// Run the auto-update tests in a separate class,
-		// as there are many considerations to be made.
+		/*
+		 * Run the auto-update tests in a separate class,
+		 * as there are many considerations to be made.
+		 */
 		$automatic_updates = new WP_Site_Health_Auto_Updates();
 		$tests             = $automatic_updates->run_tests();
 
 		$output = '<ul>';
 
 		foreach ( $tests as $test ) {
+			/* translators: Hidden accessibility text. */
 			$severity_string = __( 'Passed' );
 
 			if ( 'fail' === $test->severity ) {
@@ -1850,6 +1864,7 @@ public function get_test_background_updates() {
 
 				$result['status'] = 'critical';
 
+				/* translators: Hidden accessibility text. */
 				$severity_string = __( 'Error' );
 			}
 
@@ -1858,6 +1873,7 @@ public function get_test_background_updates() {
 
 				$result['status'] = 'recommended';
 
+				/* translators: Hidden accessibility text. */
 				$severity_string = __( 'Warning' );
 			}
 
@@ -1917,6 +1933,183 @@ public function get_test_plugin_theme_auto_updates() {
 		return $result;
 	}
 
+	/**
+	 * Tests available disk space for updates.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array The test results.
+	 */
+	public function get_test_available_updates_disk_space() {
+		$available_space = function_exists( 'disk_free_space' ) ? @disk_free_space( WP_CONTENT_DIR . '/upgrade/' ) : false;
+
+		$result = array(
+			'label'       => __( 'Disk space available to safely perform updates' ),
+			'status'      => 'good',
+			'badge'       => array(
+				'label' => __( 'Security' ),
+				'color' => 'blue',
+			),
+			'description' => sprintf(
+				/* translators: %s: Available disk space in MB or GB. */
+				'<p>' . __( '%s available disk space was detected, update routines can be performed safely.' ) . '</p>',
+				size_format( $available_space )
+			),
+			'actions'     => '',
+			'test'        => 'available_updates_disk_space',
+		);
+
+		if ( false === $available_space ) {
+			$result['description'] = __( 'Could not determine available disk space for updates.' );
+			$result['status']      = 'recommended';
+		} elseif ( $available_space < 20 * MB_IN_BYTES ) {
+			$result['description'] = __( 'Available disk space is critically low, less than 20 MB available. Proceed with caution, updates may fail.' );
+			$result['status']      = 'critical';
+		} elseif ( $available_space < 100 * MB_IN_BYTES ) {
+			$result['description'] = __( 'Available disk space is low, less than 100 MB available.' );
+			$result['status']      = 'recommended';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Tests if plugin and theme temporary backup directories are writable or can be created.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @return array The test results.
+	 */
+	public function get_test_update_temp_backup_writable() {
+		global $wp_filesystem;
+
+		$result = array(
+			'label'       => __( 'Plugin and theme temporary backup directory is writable' ),
+			'status'      => 'good',
+			'badge'       => array(
+				'label' => __( 'Security' ),
+				'color' => 'blue',
+			),
+			'description' => sprintf(
+				/* translators: %s: wp-content/upgrade-temp-backup */
+				'<p>' . __( 'The %s directory used to improve the stability of plugin and theme updates is writable.' ) . '</p>',
+				'<code>wp-content/upgrade-temp-backup</code>'
+			),
+			'actions'     => '',
+			'test'        => 'update_temp_backup_writable',
+		);
+
+		if ( ! function_exists( 'WP_Filesystem' ) ) {
+			require_once ABSPATH . '/wp-admin/includes/file.php';
+		}
+
+		ob_start();
+		$credentials = request_filesystem_credentials( '' );
+		ob_end_clean();
+
+		if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
+			$result['status']      = 'recommended';
+			$result['label']       = __( 'Could not access filesystem' );
+			$result['description'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
+			return $result;
+		}
+
+		$wp_content = $wp_filesystem->wp_content_dir();
+
+		if ( ! $wp_content ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'Unable to locate WordPress content directory' );
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content */
+				'<p>' . __( 'The %s directory cannot be located.' ) . '</p>',
+				'<code>wp-content</code>'
+			);
+			return $result;
+		}
+
+		$upgrade_dir_exists      = $wp_filesystem->is_dir( "$wp_content/upgrade" );
+		$upgrade_dir_is_writable = $wp_filesystem->is_writable( "$wp_content/upgrade" );
+		$backup_dir_exists       = $wp_filesystem->is_dir( "$wp_content/upgrade-temp-backup" );
+		$backup_dir_is_writable  = $wp_filesystem->is_writable( "$wp_content/upgrade-temp-backup" );
+
+		$plugins_dir_exists      = $wp_filesystem->is_dir( "$wp_content/upgrade-temp-backup/plugins" );
+		$plugins_dir_is_writable = $wp_filesystem->is_writable( "$wp_content/upgrade-temp-backup/plugins" );
+		$themes_dir_exists       = $wp_filesystem->is_dir( "$wp_content/upgrade-temp-backup/themes" );
+		$themes_dir_is_writable  = $wp_filesystem->is_writable( "$wp_content/upgrade-temp-backup/themes" );
+
+		if ( $plugins_dir_exists && ! $plugins_dir_is_writable && $themes_dir_exists && ! $themes_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'Plugin and theme temporary backup directories exist but are not writable' );
+			$result['description'] = sprintf(
+				/* translators: 1: wp-content/upgrade-temp-backup/plugins, 2: wp-content/upgrade-temp-backup/themes. */
+				'<p>' . __( 'The %1$s and %2$s directories exist but are not writable. These directories are used to improve the stability of plugin updates. Please make sure the server has write permissions to these directories.' ) . '</p>',
+				'<code>wp-content/upgrade-temp-backup/plugins</code>',
+				'<code>wp-content/upgrade-temp-backup/themes</code>'
+			);
+			return $result;
+		}
+
+		if ( $plugins_dir_exists && ! $plugins_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'Plugin temporary backup directory exists but is not writable' );
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade-temp-backup/plugins */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of plugin updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade-temp-backup/plugins</code>'
+			);
+			return $result;
+		}
+
+		if ( $themes_dir_exists && ! $themes_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'Theme temporary backup directory exists but is not writable' );
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade-temp-backup/themes */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade-temp-backup/themes</code>'
+			);
+			return $result;
+		}
+
+		if ( ( ! $plugins_dir_exists || ! $themes_dir_exists ) && $backup_dir_exists && ! $backup_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'The temporary backup directory exists but is not writable' );
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade-temp-backup */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used to improve the stability of plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade-temp-backup</code>'
+			);
+			return $result;
+		}
+
+		if ( ! $backup_dir_exists && $upgrade_dir_exists && ! $upgrade_dir_is_writable ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'The upgrade directory exists but is not writable' );
+			$result['description'] = sprintf(
+				/* translators: %s: wp-content/upgrade */
+				'<p>' . __( 'The %s directory exists but is not writable. This directory is used for plugin and theme updates. Please make sure the server has write permissions to this directory.' ) . '</p>',
+				'<code>wp-content/upgrade</code>'
+			);
+			return $result;
+		}
+
+		if ( ! $upgrade_dir_exists && ! $wp_filesystem->is_writable( $wp_content ) ) {
+			$result['status']      = 'critical';
+			$result['label']       = __( 'The upgrade directory cannot be created' );
+			$result['description'] = sprintf(
+				/* translators: 1: wp-content/upgrade, 2: wp-content. */
+				'<p>' . __( 'The %1$s directory does not exist, and the server does not have write permissions in %2$s to create it. This directory is used for plugin and theme updates. Please make sure the server has write permissions in %2$s.' ) . '</p>',
+				'<code>wp-content/upgrade</code>',
+				'<code>wp-content</code>'
+			);
+			return $result;
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Tests if loopbacks work as expected.
 	 *
@@ -2287,10 +2480,10 @@ public function get_test_authorization_header() {
 			);
 		} else {
 			$result['actions'] .= sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				__( 'https://developer.wordpress.org/rest-api/frequently-asked-questions/#why-is-authentication-not-working' ),
 				__( 'Learn how to configure the Authorization header.' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			);
 		}
@@ -2320,10 +2513,10 @@ public function get_test_page_cache() {
 			'status'      => 'good',
 			'label'       => '',
 			'actions'     => sprintf(
-				'<p><a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
-				__( 'https://wordpress.org/support/article/optimization/#Caching' ),
+				'<p><a href="%1$s" target="_blank" rel="noopener noreferrer">%2$s<span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				__( 'https://wordpress.org/documentation/article/optimization/#Caching' ),
 				__( 'Learn more about page cache' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 		);
@@ -2430,7 +2623,7 @@ public function get_test_persistent_object_cache() {
 		$action_url = apply_filters(
 			'site_status_persistent_object_cache_url',
 			/* translators: Localized Support reference. */
-			__( 'https://wordpress.org/support/article/optimization/#persistent-object-cache' )
+			__( 'https://wordpress.org/documentation/article/optimization/#persistent-object-cache' )
 		);
 
 		$result = array(
@@ -2446,10 +2639,10 @@ public function get_test_persistent_object_cache() {
 				__( 'A persistent object cache makes your site&#8217;s database more efficient, resulting in faster load times because WordPress can retrieve your site&#8217;s content and settings much more quickly.' )
 			),
 			'actions'     => sprintf(
-				'<p><a href="%s" target="_blank" rel="noopener">%s <span class="screen-reader-text">%s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
+				'<p><a href="%s" target="_blank" rel="noopener">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
 				esc_url( $action_url ),
 				__( 'Learn more about persistent object caching.' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			),
 		);
@@ -2524,71 +2717,79 @@ public function get_test_persistent_object_cache() {
 	public static function get_tests() {
 		$tests = array(
 			'direct' => array(
-				'wordpress_version'         => array(
+				'wordpress_version'            => array(
 					'label' => __( 'WordPress Version' ),
 					'test'  => 'wordpress_version',
 				),
-				'plugin_version'            => array(
+				'plugin_version'               => array(
 					'label' => __( 'Plugin Versions' ),
 					'test'  => 'plugin_version',
 				),
-				'theme_version'             => array(
+				'theme_version'                => array(
 					'label' => __( 'Theme Versions' ),
 					'test'  => 'theme_version',
 				),
-				'php_version'               => array(
+				'php_version'                  => array(
 					'label' => __( 'PHP Version' ),
 					'test'  => 'php_version',
 				),
-				'php_extensions'            => array(
+				'php_extensions'               => array(
 					'label' => __( 'PHP Extensions' ),
 					'test'  => 'php_extensions',
 				),
-				'php_default_timezone'      => array(
+				'php_default_timezone'         => array(
 					'label' => __( 'PHP Default Timezone' ),
 					'test'  => 'php_default_timezone',
 				),
-				'php_sessions'              => array(
+				'php_sessions'                 => array(
 					'label' => __( 'PHP Sessions' ),
 					'test'  => 'php_sessions',
 				),
-				'sql_server'                => array(
+				'sql_server'                   => array(
 					'label' => __( 'Database Server version' ),
 					'test'  => 'sql_server',
 				),
-				'utf8mb4_support'           => array(
+				'utf8mb4_support'              => array(
 					'label' => __( 'MySQL utf8mb4 support' ),
 					'test'  => 'utf8mb4_support',
 				),
-				'ssl_support'               => array(
+				'ssl_support'                  => array(
 					'label' => __( 'Secure communication' ),
 					'test'  => 'ssl_support',
 				),
-				'scheduled_events'          => array(
+				'scheduled_events'             => array(
 					'label' => __( 'Scheduled events' ),
 					'test'  => 'scheduled_events',
 				),
-				'http_requests'             => array(
+				'http_requests'                => array(
 					'label' => __( 'HTTP Requests' ),
 					'test'  => 'http_requests',
 				),
-				'rest_availability'         => array(
+				'rest_availability'            => array(
 					'label'     => __( 'REST API availability' ),
 					'test'      => 'rest_availability',
 					'skip_cron' => true,
 				),
-				'debug_enabled'             => array(
+				'debug_enabled'                => array(
 					'label' => __( 'Debugging enabled' ),
 					'test'  => 'is_in_debug_mode',
 				),
-				'file_uploads'              => array(
+				'file_uploads'                 => array(
 					'label' => __( 'File uploads' ),
 					'test'  => 'file_uploads',
 				),
-				'plugin_theme_auto_updates' => array(
+				'plugin_theme_auto_updates'    => array(
 					'label' => __( 'Plugin and theme auto-updates' ),
 					'test'  => 'plugin_theme_auto_updates',
 				),
+				'update_temp_backup_writable'  => array(
+					'label' => __( 'Plugin and theme temporary backup directory access' ),
+					'test'  => 'update_temp_backup_writable',
+				),
+				'available_updates_disk_space' => array(
+					'label' => __( 'Available disk space' ),
+					'test'  => 'available_updates_disk_space',
+				),
 			),
 			'async'  => array(
 				'dotorg_communication' => array(
@@ -3132,7 +3333,7 @@ public function is_development_environment() {
 	public function get_page_cache_headers() {
 
 		$cache_hit_callback = static function ( $header_value ) {
-			return false !== strpos( strtolower( $header_value ), 'hit' );
+			return str_contains( strtolower( $header_value ), 'hit' );
 		};
 
 		$cache_headers = array(
@@ -3187,9 +3388,11 @@ private function check_for_page_caching() {
 
 		$headers = array();
 
-		// Include basic auth in loopback requests. Note that this will only pass along basic auth when user is
-		// initiating the test. If a site requires basic auth, the test will fail when it runs in WP Cron as part of
-		// wp_site_health_scheduled_check. This logic is copied from WP_Site_Health::can_perform_loopback().
+		/*
+		 * Include basic auth in loopback requests. Note that this will only pass along basic auth when user is
+		 * initiating the test. If a site requires basic auth, the test will fail when it runs in WP Cron as part of
+		 * wp_site_health_scheduled_check. This logic is copied from WP_Site_Health::can_perform_loopback().
+		 */
 		if ( isset( $_SERVER['PHP_AUTH_USER'] ) && isset( $_SERVER['PHP_AUTH_PW'] ) ) {
 			$headers['Authorization'] = 'Basic ' . base64_encode( wp_unslash( $_SERVER['PHP_AUTH_USER'] ) . ':' . wp_unslash( $_SERVER['PHP_AUTH_PW'] ) );
 		}
diff --git a/src/wp-admin/includes/class-wp-site-icon.php b/src/wp-admin/includes/class-wp-site-icon.php
index e799c7fb7980d..ff417718f6a39 100644
--- a/src/wp-admin/includes/class-wp-site-icon.php
+++ b/src/wp-admin/includes/class-wp-site-icon.php
@@ -201,9 +201,9 @@ public function intermediate_image_sizes( $sizes = array() ) {
 	 * @param int $post_id Attachment ID.
 	 */
 	public function delete_attachment_data( $post_id ) {
-		$site_icon_id = get_option( 'site_icon' );
+		$site_icon_id = (int) get_option( 'site_icon' );
 
-		if ( $site_icon_id && $post_id == $site_icon_id ) {
+		if ( $site_icon_id && $post_id === $site_icon_id ) {
 			delete_option( 'site_icon' );
 		}
 	}
@@ -222,9 +222,9 @@ public function delete_attachment_data( $post_id ) {
 	 */
 	public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
 		if ( $single && '_wp_attachment_backup_sizes' === $meta_key ) {
-			$site_icon_id = get_option( 'site_icon' );
+			$site_icon_id = (int) get_option( 'site_icon' );
 
-			if ( $post_id == $site_icon_id ) {
+			if ( $post_id === $site_icon_id ) {
 				add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
 			}
 		}
diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
index 1d4b57cca2da6..3c277d6a61f7c 100644
--- a/src/wp-admin/includes/class-wp-terms-list-table.php
+++ b/src/wp-admin/includes/class-wp-terms-list-table.php
@@ -185,7 +185,7 @@ public function current_action() {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		$columns = array(
@@ -208,12 +208,20 @@ public function get_columns() {
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
+		$taxonomy = $this->screen->taxonomy;
+
+		if ( ! isset( $_GET['orderby'] ) && is_taxonomy_hierarchical( $taxonomy ) ) {
+			$name_orderby_text = __( 'Table ordered hierarchically.' );
+		} else {
+			$name_orderby_text = __( 'Table ordered by Name.' );
+		}
+
 		return array(
-			'name'        => 'name',
-			'description' => 'description',
-			'slug'        => 'slug',
-			'posts'       => 'count',
-			'links'       => 'count',
+			'name'        => array( 'name', false, _x( 'Name', 'term name' ), $name_orderby_text, 'asc' ),
+			'description' => array( 'description', false, __( 'Description' ), __( 'Table ordered by Description.' ) ),
+			'slug'        => array( 'slug', false, __( 'Slug' ), __( 'Table ordered by Slug.' ) ),
+			'posts'       => array( 'count', false, _x( 'Count', 'Number/count of items' ), __( 'Table ordered by Posts Count.' ) ),
+			'links'       => array( 'count', false, __( 'Links' ), __( 'Table ordered by Links.' ) ),
 		);
 	}
 
@@ -357,10 +365,10 @@ public function column_cb( $item ) {
 
 		if ( current_user_can( 'delete_term', $tag->term_id ) ) {
 			return sprintf(
-				'<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label>' .
+				'<label class="label-covers-full-cell" for="cb-select-%1$s"><span class="screen-reader-text">%2$s</span></label>' .
 				'<input type="checkbox" name="delete_tags[]" value="%1$s" id="cb-select-%1$s" />',
 				$tag->term_id,
-				/* translators: %s: Taxonomy term name. */
+				/* translators: Hidden accessibility text. %s: Taxonomy term name. */
 				sprintf( __( 'Select %s' ), $tag->name )
 			);
 		}
@@ -547,7 +555,10 @@ public function column_description( $tag ) {
 		if ( $tag->description ) {
 			return $tag->description;
 		} else {
-			return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . __( 'No description' ) . '</span>';
+			return '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' .
+				/* translators: Hidden accessibility text. */
+				__( 'No description' ) .
+			'</span>';
 		}
 	}
 
diff --git a/src/wp-admin/includes/class-wp-theme-install-list-table.php b/src/wp-admin/includes/class-wp-theme-install-list-table.php
index 3e5c03433ba15..318d8d872a98a 100644
--- a/src/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -544,7 +544,7 @@ public function _js_vars( $extra_args = array() ) {
 	}
 
 	/**
-	 * Check to see if the theme is already installed.
+	 * Checks to see if the theme is already installed.
 	 *
 	 * @since 3.4.0
 	 *
diff --git a/src/wp-admin/includes/class-wp-themes-list-table.php b/src/wp-admin/includes/class-wp-themes-list-table.php
index 7fb72e6bb753d..8d385f9a78fb6 100644
--- a/src/wp-admin/includes/class-wp-themes-list-table.php
+++ b/src/wp-admin/includes/class-wp-themes-list-table.php
@@ -170,7 +170,7 @@ public function display() {
 	}
 
 	/**
-	 * @return array
+	 * @return string[] Array of column titles keyed by their column name.
 	 */
 	public function get_columns() {
 		return array();
diff --git a/src/wp-admin/includes/class-wp-upgrader-skin.php b/src/wp-admin/includes/class-wp-upgrader-skin.php
index d0d2a39b01dd3..598724f61cf71 100644
--- a/src/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/src/wp-admin/includes/class-wp-upgrader-skin.php
@@ -197,7 +197,7 @@ public function feedback( $feedback, ...$args ) {
 			$feedback = $this->upgrader->strings[ $feedback ];
 		}
 
-		if ( strpos( $feedback, '%' ) !== false ) {
+		if ( str_contains( $feedback, '%' ) ) {
 			if ( $args ) {
 				$args     = array_map( 'strip_tags', $args );
 				$args     = array_map( 'esc_html', $args );
@@ -211,21 +211,21 @@ public function feedback( $feedback, ...$args ) {
 	}
 
 	/**
-	 * Action to perform before an update.
+	 * Performs an action before an update.
 	 *
 	 * @since 2.8.0
 	 */
 	public function before() {}
 
 	/**
-	 * Action to perform following an update.
+	 * Performs and action following an update.
 	 *
 	 * @since 2.8.0
 	 */
 	public function after() {}
 
 	/**
-	 * Output JavaScript that calls function to decrement the update counts.
+	 * Outputs JavaScript that calls function to decrement the update counts.
 	 *
 	 * @since 3.9.0
 	 *
@@ -270,7 +270,7 @@ public function bulk_footer() {}
 	 * @since 5.5.0
 	 *
 	 * @param WP_Error $wp_error WP_Error object.
-	 * @return bool
+	 * @return bool True if the error should be hidden, false otherwise.
 	 */
 	public function hide_process_failed( $wp_error ) {
 		return false;
diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index a2b2c9ed06fca..d3788c906cb12 100644
--- a/src/wp-admin/includes/class-wp-upgrader.php
+++ b/src/wp-admin/includes/class-wp-upgrader.php
@@ -112,6 +112,26 @@ class WP_Upgrader {
 	 */
 	public $update_current = 0;
 
+	/**
+	 * Stores the list of plugins or themes added to temporary backup directory.
+	 *
+	 * Used by the rollback functions.
+	 *
+	 * @since 6.3.0
+	 * @var array
+	 */
+	private $temp_backups = array();
+
+	/**
+	 * Stores the list of plugins or themes to be restored from temporary backup directory.
+	 *
+	 * Used by the rollback functions.
+	 *
+	 * @since 6.3.0
+	 * @var array
+	 */
+	private $temp_restores = array();
+
 	/**
 	 * Construct the upgrader with a skin.
 	 *
@@ -129,20 +149,38 @@ public function __construct( $skin = null ) {
 	}
 
 	/**
-	 * Initialize the upgrader.
+	 * Initializes the upgrader.
 	 *
 	 * This will set the relationship between the skin being used and this upgrader,
 	 * and also add the generic strings to `WP_Upgrader::$strings`.
 	 *
+	 * Additionally, it will schedule a weekly task to clean up the temporary backup directory.
+	 *
 	 * @since 2.8.0
+	 * @since 6.3.0 Added the `schedule_temp_backup_cleanup()` task.
 	 */
 	public function init() {
 		$this->skin->set_upgrader( $this );
 		$this->generic_strings();
+
+		if ( ! wp_installing() ) {
+			$this->schedule_temp_backup_cleanup();
+		}
+	}
+
+	/**
+	 * Schedules the cleanup of the temporary backup directory.
+	 *
+	 * @since 6.3.0
+	 */
+	protected function schedule_temp_backup_cleanup() {
+		if ( false === wp_next_scheduled( 'wp_delete_temp_updater_backups' ) ) {
+			wp_schedule_event( time(), 'weekly', 'wp_delete_temp_updater_backups' );
+		}
 	}
 
 	/**
-	 * Add the generic strings to WP_Upgrader::$strings.
+	 * Adds the generic strings to WP_Upgrader::$strings.
 	 *
 	 * @since 2.8.0
 	 */
@@ -151,7 +189,8 @@ public function generic_strings() {
 		$this->strings['fs_unavailable']    = __( 'Could not access filesystem.' );
 		$this->strings['fs_error']          = __( 'Filesystem error.' );
 		$this->strings['fs_no_root_dir']    = __( 'Unable to locate WordPress root directory.' );
-		$this->strings['fs_no_content_dir'] = __( 'Unable to locate WordPress content directory (wp-content).' );
+		/* translators: %s: Directory name. */
+		$this->strings['fs_no_content_dir'] = sprintf( __( 'Unable to locate WordPress content directory (%s).' ), 'wp-content' );
 		$this->strings['fs_no_plugins_dir'] = __( 'Unable to locate WordPress plugin directory.' );
 		$this->strings['fs_no_themes_dir']  = __( 'Unable to locate WordPress theme directory.' );
 		/* translators: %s: Directory name. */
@@ -167,10 +206,19 @@ public function generic_strings() {
 
 		$this->strings['maintenance_start'] = __( 'Enabling Maintenance mode&#8230;' );
 		$this->strings['maintenance_end']   = __( 'Disabling Maintenance mode&#8230;' );
+
+		/* translators: %s: upgrade-temp-backup */
+		$this->strings['temp_backup_mkdir_failed'] = sprintf( __( 'Could not create the %s directory.' ), 'upgrade-temp-backup' );
+		/* translators: %s: upgrade-temp-backup */
+		$this->strings['temp_backup_move_failed'] = sprintf( __( 'Could not move the old version to the %s directory.' ), 'upgrade-temp-backup' );
+		/* translators: %s: The plugin or theme slug. */
+		$this->strings['temp_backup_restore_failed'] = __( 'Could not restore the original version of %s.' );
+		/* translators: %s: The plugin or theme slug. */
+		$this->strings['temp_backup_delete_failed'] = __( 'Could not delete the temporary backup directory for %s.' );
 	}
 
 	/**
-	 * Connect to the filesystem.
+	 * Connects to the filesystem.
 	 *
 	 * @since 2.8.0
 	 *
@@ -242,7 +290,7 @@ public function fs_connect( $directories = array(), $allow_relaxed_file_ownershi
 	}
 
 	/**
-	 * Download a package.
+	 * Downloads a package.
 	 *
 	 * @since 2.8.0
 	 * @since 5.2.0 Added the `$check_signatures` parameter.
@@ -292,7 +340,7 @@ public function download_package( $package, $check_signatures = false, $hook_ext
 	}
 
 	/**
-	 * Unpack a compressed package file.
+	 * Unpacks a compressed package file.
 	 *
 	 * @since 2.8.0
 	 *
@@ -308,6 +356,10 @@ public function unpack_package( $package, $delete_package = true ) {
 
 		$this->skin->feedback( 'unpack_package' );
 
+		if ( ! $wp_filesystem->wp_content_dir() ) {
+			return new WP_Error( 'fs_no_content_dir', $this->strings['fs_no_content_dir'] );
+		}
+
 		$upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
 
 		// Clean up contents of upgrade directory beforehand.
@@ -346,7 +398,7 @@ public function unpack_package( $package, $delete_package = true ) {
 	}
 
 	/**
-	 * Flatten the results of WP_Filesystem_Base::dirlist() for iterating over.
+	 * Flattens the results of WP_Filesystem_Base::dirlist() for iterating over.
 	 *
 	 * @since 4.9.0
 	 * @access protected
@@ -429,6 +481,7 @@ public function clear_destination( $remote_destination ) {
 	 * clear out the destination folder if it already exists.
 	 *
 	 * @since 2.8.0
+	 * @since 6.2.0 Use move_dir() instead of copy_dir() when possible.
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem        WordPress filesystem subclass.
 	 * @global array              $wp_theme_directories
@@ -470,7 +523,9 @@ public function install_package( $args = array() ) {
 		$destination       = $args['destination'];
 		$clear_destination = $args['clear_destination'];
 
-		set_time_limit( 300 );
+		if ( function_exists( 'set_time_limit' ) ) {
+			set_time_limit( 300 );
+		}
 
 		if ( empty( $source ) || empty( $destination ) ) {
 			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
@@ -509,8 +564,10 @@ public function install_package( $args = array() ) {
 			// There are no files?
 			return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] );
 		} else {
-			// It's only a single file, the upgrader will use the folder name of this file as the destination folder.
-			// Folder name is based on zip filename.
+			/*
+			 * It's only a single file, the upgrader will use the folder name of this file as the destination folder.
+			 * Folder name is based on zip filename.
+			 */
 			$source = trailingslashit( $args['source'] );
 		}
 
@@ -531,6 +588,16 @@ public function install_package( $args = array() ) {
 			return $source;
 		}
 
+		if ( ! empty( $args['hook_extra']['temp_backup'] ) ) {
+			$temp_backup = $this->move_to_temp_backup_dir( $args['hook_extra']['temp_backup'] );
+
+			if ( is_wp_error( $temp_backup ) ) {
+				return $temp_backup;
+			}
+
+			$this->temp_backups[] = $args['hook_extra']['temp_backup'];
+		}
+
 		// Has the source location changed? If so, we need a new source_files list.
 		if ( $source !== $remote_source ) {
 			$source_files = array_keys( $wp_filesystem->dirlist( $source ) );
@@ -577,8 +644,10 @@ public function install_package( $args = array() ) {
 				return $removed;
 			}
 		} elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists( $remote_destination ) ) {
-			// If we're not clearing the destination folder and something exists there already, bail.
-			// But first check to see if there are actually any files in the folder.
+			/*
+			 * If we're not clearing the destination folder and something exists there already, bail.
+			 * But first check to see if there are actually any files in the folder.
+			 */
 			$_files = $wp_filesystem->dirlist( $remote_destination );
 			if ( ! empty( $_files ) ) {
 				$wp_filesystem->delete( $remote_source, true ); // Clear out the source files.
@@ -586,43 +655,40 @@ public function install_package( $args = array() ) {
 			}
 		}
 
-		// Create destination if needed.
-		if ( ! $wp_filesystem->exists( $remote_destination ) ) {
-			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
-				return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
-			}
-		}
-
-		// Copy new version of item into place.
-		if ( class_exists( 'Rollback_Update_Failure\WP_Upgrader' )
-			&& function_exists( '\Rollback_Update_Failure\move_dir' )
+		/*
+		 * If 'clear_working' is false, the source should not be removed, so use copy_dir() instead.
+		 *
+		 * Partial updates, like language packs, may want to retain the destination.
+		 * If the destination exists or has contents, this may be a partial update,
+		 * and the destination should not be removed, so use copy_dir() instead.
+		 */
+		if ( $args['clear_working']
+			&& (
+				// Destination does not exist or has no contents.
+				! $wp_filesystem->exists( $remote_destination )
+				|| empty( $wp_filesystem->dirlist( $remote_destination ) )
+			)
 		) {
-			/*
-			 * If the {@link https://wordpress.org/plugins/rollback-update-failure/ Rollback Update Failure}
-			 * feature plugin is installed, use the move_dir() function from there for better performance.
-			 * Instead of copying a directory from one location to another, it uses the rename() PHP function
-			 * to speed up the process. If the renaming failed, it falls back to copy_dir().
-			 *
-			 * This condition aims to facilitate broader testing of the Rollbacks (temp backups) feature project.
-			 * It is temporary, until the plugin is merged into core.
-			 */
-			$result = \Rollback_Update_Failure\move_dir( $source, $remote_destination );
+			$result = move_dir( $source, $remote_destination, true );
 		} else {
-			$result = copy_dir( $source, $remote_destination );
-		}
-
-		if ( is_wp_error( $result ) ) {
-			if ( $args['clear_working'] ) {
-				$wp_filesystem->delete( $remote_source, true );
+			// Create destination if needed.
+			if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+				if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
+					return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
+				}
 			}
-			return $result;
+			$result = copy_dir( $source, $remote_destination );
 		}
 
-		// Clear the working folder?
+		// Clear the working directory?
 		if ( $args['clear_working'] ) {
 			$wp_filesystem->delete( $remote_source, true );
 		}
 
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+
 		$destination_name = basename( str_replace( $local_destination, '', $destination ) );
 		if ( '.' === $destination_name ) {
 			$destination_name = '';
@@ -651,7 +717,7 @@ public function install_package( $args = array() ) {
 	}
 
 	/**
-	 * Run an upgrade/installation.
+	 * Runs an upgrade/installation.
 	 *
 	 * Attempts to download the package (if it is not a local file), unpack it, and
 	 * install it in the destination folder.
@@ -760,8 +826,10 @@ public function run( $options ) {
 		 */
 		$download = $this->download_package( $options['package'], true, $options['hook_extra'] );
 
-		// Allow for signature soft-fail.
-		// WARNING: This may be removed in the future.
+		/*
+		 * Allow for signature soft-fail.
+		 * WARNING: This may be removed in the future.
+		 */
 		if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
 
 			// Don't output the 'no signature could be found' failure message for now.
@@ -827,7 +895,19 @@ public function run( $options ) {
 		$result = apply_filters( 'upgrader_install_package_result', $result, $options['hook_extra'] );
 
 		$this->skin->set_result( $result );
+
 		if ( is_wp_error( $result ) ) {
+			if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
+				$this->temp_restores[] = $options['hook_extra']['temp_backup'];
+
+				/*
+				 * Restore the backup on shutdown.
+				 * Actions running on `shutdown` are immune to PHP timeouts,
+				 * so in case the failure was due to a PHP timeout,
+				 * it will still be able to properly restore the previous version.
+				 */
+				add_action( 'shutdown', array( $this, 'restore_temp_backup' ) );
+			}
 			$this->skin->error( $result );
 
 			if ( ! method_exists( $this->skin, 'hide_process_failed' ) || ! $this->skin->hide_process_failed( $result ) ) {
@@ -840,6 +920,12 @@ public function run( $options ) {
 
 		$this->skin->after();
 
+		// Clean up the backup kept in the temporary backup directory.
+		if ( ! empty( $options['hook_extra']['temp_backup'] ) ) {
+			// Delete the backup on `shutdown` to avoid a PHP timeout.
+			add_action( 'shutdown', array( $this, 'delete_temp_backup' ), 100, 0 );
+		}
+
 		if ( ! $options['is_multi'] ) {
 
 			/**
@@ -881,7 +967,7 @@ public function run( $options ) {
 	}
 
 	/**
-	 * Toggle maintenance mode for the site.
+	 * Toggles maintenance mode for the site.
 	 *
 	 * Creates/deletes the maintenance file to enable/disable maintenance mode.
 	 *
@@ -911,6 +997,8 @@ public function maintenance_mode( $enable = false ) {
 	 *
 	 * @since 4.5.0
 	 *
+	 * @global wpdb $wpdb The WordPress database abstraction object.
+	 *
 	 * @param string $lock_name       The name of this unique lock.
 	 * @param int    $release_timeout Optional. The duration in seconds to respect an existing lock.
 	 *                                Default: 1 hour.
@@ -964,6 +1052,170 @@ public static function create_lock( $lock_name, $release_timeout = null ) {
 	public static function release_lock( $lock_name ) {
 		return delete_option( $lock_name . '.lock' );
 	}
+
+	/**
+	 * Moves the plugin or theme being updated into a temporary backup directory.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @param string[] $args {
+	 *     Array of data for the temporary backup.
+	 *
+	 *     @type string $slug Plugin or theme slug.
+	 *     @type string $src  Path to the root directory for plugins or themes.
+	 *     @type string $dir  Destination subdirectory name. Accepts 'plugins' or 'themes'.
+	 * }
+	 *
+	 * @return bool|WP_Error True on success, false on early exit, otherwise WP_Error.
+	 */
+	public function move_to_temp_backup_dir( $args ) {
+		global $wp_filesystem;
+
+		if ( empty( $args['slug'] ) || empty( $args['src'] ) || empty( $args['dir'] ) ) {
+			return false;
+		}
+
+		/*
+		 * Skip any plugin that has "." as its slug.
+		 * A slug of "." will result in a `$src` value ending in a period.
+		 *
+		 * On Windows, this will cause the 'plugins' folder to be moved,
+		 * and will cause a failure when attempting to call `mkdir()`.
+		 */
+		if ( '.' === $args['slug'] ) {
+			return false;
+		}
+
+		if ( ! $wp_filesystem->wp_content_dir() ) {
+			return new WP_Error( 'fs_no_content_dir', $this->strings['fs_no_content_dir'] );
+		}
+
+		$dest_dir = $wp_filesystem->wp_content_dir() . 'upgrade-temp-backup/';
+		$sub_dir  = $dest_dir . $args['dir'] . '/';
+
+		// Create the temporary backup directory if it does not exist.
+		if ( ! $wp_filesystem->is_dir( $sub_dir ) ) {
+			if ( ! $wp_filesystem->is_dir( $dest_dir ) ) {
+				$wp_filesystem->mkdir( $dest_dir, FS_CHMOD_DIR );
+			}
+
+			if ( ! $wp_filesystem->mkdir( $sub_dir, FS_CHMOD_DIR ) ) {
+				// Could not create the backup directory.
+				return new WP_Error( 'fs_temp_backup_mkdir', $this->strings['temp_backup_mkdir_failed'] );
+			}
+		}
+
+		$src_dir = $wp_filesystem->find_folder( $args['src'] );
+		$src     = trailingslashit( $src_dir ) . $args['slug'];
+		$dest    = $dest_dir . trailingslashit( $args['dir'] ) . $args['slug'];
+
+		// Delete the temporary backup directory if it already exists.
+		if ( $wp_filesystem->is_dir( $dest ) ) {
+			$wp_filesystem->delete( $dest, true );
+		}
+
+		// Move to the temporary backup directory.
+		$result = move_dir( $src, $dest, true );
+		if ( is_wp_error( $result ) ) {
+			return new WP_Error( 'fs_temp_backup_move', $this->strings['temp_backup_move_failed'] );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Restores the plugin or theme from temporary backup.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @return bool|WP_Error True on success, false on early exit, otherwise WP_Error.
+	 */
+	public function restore_temp_backup() {
+		global $wp_filesystem;
+
+		$errors = new WP_Error();
+
+		foreach ( $this->temp_restores as $args ) {
+			if ( empty( $args['slug'] ) || empty( $args['src'] ) || empty( $args['dir'] ) ) {
+				return false;
+			}
+
+			if ( ! $wp_filesystem->wp_content_dir() ) {
+				$errors->add( 'fs_no_content_dir', $this->strings['fs_no_content_dir'] );
+				return $errors;
+			}
+
+			$src      = $wp_filesystem->wp_content_dir() . 'upgrade-temp-backup/' . $args['dir'] . '/' . $args['slug'];
+			$dest_dir = $wp_filesystem->find_folder( $args['src'] );
+			$dest     = trailingslashit( $dest_dir ) . $args['slug'];
+
+			if ( $wp_filesystem->is_dir( $src ) ) {
+				// Cleanup.
+				if ( $wp_filesystem->is_dir( $dest ) && ! $wp_filesystem->delete( $dest, true ) ) {
+					$errors->add(
+						'fs_temp_backup_delete',
+						sprintf( $this->strings['temp_backup_restore_failed'], $args['slug'] )
+					);
+					continue;
+				}
+
+				// Move it.
+				$result = move_dir( $src, $dest, true );
+				if ( is_wp_error( $result ) ) {
+					$errors->add(
+						'fs_temp_backup_delete',
+						sprintf( $this->strings['temp_backup_restore_failed'], $args['slug'] )
+					);
+					continue;
+				}
+			}
+		}
+
+		return $errors->has_errors() ? $errors : true;
+	}
+
+	/**
+	 * Deletes a temporary backup.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+	 *
+	 * @return bool|WP_Error True on success, false on early exit, otherwise WP_Error.
+	 */
+	public function delete_temp_backup() {
+		global $wp_filesystem;
+
+		$errors = new WP_Error();
+
+		foreach ( $this->temp_backups as $args ) {
+			if ( empty( $args['slug'] ) || empty( $args['dir'] ) ) {
+				return false;
+			}
+
+			if ( ! $wp_filesystem->wp_content_dir() ) {
+				$errors->add( 'fs_no_content_dir', $this->strings['fs_no_content_dir'] );
+				return $errors;
+			}
+
+			$temp_backup_dir = $wp_filesystem->wp_content_dir() . "upgrade-temp-backup/{$args['dir']}/{$args['slug']}";
+
+			if ( ! $wp_filesystem->delete( $temp_backup_dir, true ) ) {
+				$errors->add(
+					'temp_backup_delete_failed',
+					sprintf( $this->strings['temp_backup_delete_failed'] ),
+					$args['slug']
+				);
+				continue;
+			}
+		}
+
+		return $errors->has_errors() ? $errors : true;
+	}
 }
 
 /** Plugin_Upgrader class */
diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php
index 4b6c17ab99cf7..43abd608aeadc 100644
--- a/src/wp-admin/includes/class-wp-users-list-table.php
+++ b/src/wp-admin/includes/class-wp-users-list-table.php
@@ -58,7 +58,7 @@ public function __construct( $args = array() ) {
 	}
 
 	/**
-	 * Check the current user's permissions.
+	 * Checks the current user's permissions.
 	 *
 	 * @since 3.1.0
 	 *
@@ -73,7 +73,7 @@ public function ajax_user_can() {
 	}
 
 	/**
-	 * Prepare the users list for display.
+	 * Prepares the users list for display.
 	 *
 	 * @since 3.1.0
 	 *
@@ -150,7 +150,7 @@ public function prepare_items() {
 	}
 
 	/**
-	 * Output 'no users' message.
+	 * Outputs 'no users' message.
 	 *
 	 * @since 3.1.0
 	 */
@@ -159,7 +159,7 @@ public function no_items() {
 	}
 
 	/**
-	 * Return an associative array listing all the views that can be used
+	 * Returns an associative array listing all the views that can be used
 	 * with this table.
 	 *
 	 * Provides a list of roles and user count for that role for easy
@@ -262,7 +262,7 @@ protected function get_views() {
 	}
 
 	/**
-	 * Retrieve an associative array of bulk actions available on this table.
+	 * Retrieves an associative array of bulk actions available on this table.
 	 *
 	 * @since 3.1.0
 	 *
@@ -290,7 +290,7 @@ protected function get_bulk_actions() {
 	}
 
 	/**
-	 * Output the controls to allow user roles to be changed in bulk.
+	 * Outputs the controls to allow user roles to be changed in bulk.
 	 *
 	 * @since 3.1.0
 	 *
@@ -303,7 +303,12 @@ protected function extra_tablenav( $which ) {
 		?>
 	<div class="alignleft actions">
 		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
-		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to&hellip;' ); ?></label>
+		<label class="screen-reader-text" for="<?php echo $id; ?>">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Change role to&hellip;' );
+			?>
+		</label>
 		<select name="<?php echo $id; ?>" id="<?php echo $id; ?>">
 			<option value=""><?php _e( 'Change role to&hellip;' ); ?></option>
 			<?php wp_dropdown_roles(); ?>
@@ -338,7 +343,7 @@ protected function extra_tablenav( $which ) {
 	}
 
 	/**
-	 * Capture the bulk action required, and return it.
+	 * Captures the bulk action required, and return it.
 	 *
 	 * Overridden from the base class implementation to capture
 	 * the role change drop-down.
@@ -348,7 +353,7 @@ protected function extra_tablenav( $which ) {
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['changeit'] ) && ! empty( $_REQUEST['new_role'] ) ) {
+		if ( isset( $_REQUEST['changeit'] ) ) {
 			return 'promote';
 		}
 
@@ -356,7 +361,7 @@ public function current_action() {
 	}
 
 	/**
-	 * Get a list of columns for the list table.
+	 * Gets a list of columns for the list table.
 	 *
 	 * @since 3.1.0
 	 *
@@ -380,7 +385,7 @@ public function get_columns() {
 	}
 
 	/**
-	 * Get a list of sortable columns for the list table.
+	 * Gets a list of sortable columns for the list table.
 	 *
 	 * @since 3.1.0
 	 *
@@ -388,15 +393,15 @@ public function get_columns() {
 	 */
 	protected function get_sortable_columns() {
 		$columns = array(
-			'username' => 'login',
-			'email'    => 'email',
+			'username' => array( 'login', false, __( 'Username' ), __( 'Table ordered by Username.' ), 'asc' ),
+			'email'    => array( 'email', false, __( 'E-mail' ), __( 'Table ordered by E-mail.' ) ),
 		);
 
 		return $columns;
 	}
 
 	/**
-	 * Generate the list table rows.
+	 * Generates the list table rows.
 	 *
 	 * @since 3.1.0
 	 */
@@ -412,7 +417,7 @@ public function display_rows() {
 	}
 
 	/**
-	 * Generate HTML for a single row on the users.php admin panel.
+	 * Generates HTML for a single row on the users.php admin panel.
 	 *
 	 * @since 3.1.0
 	 * @since 4.2.0 The `$style` parameter was deprecated.
@@ -497,6 +502,7 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 			// Add a link to send the user a reset password link by email.
 			if ( get_current_user_id() !== $user_object->ID
 				&& current_user_can( 'edit_user', $user_object->ID )
+				&& true === wp_is_password_reset_allowed_for_user( $user_object )
 			) {
 				$actions['resetpassword'] = "<a class='resetpassword' href='" . wp_nonce_url( "users.php?action=resetpassword&amp;users=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Send password reset' ) . '</a>';
 			}
@@ -518,10 +524,10 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 
 			// Set up the checkbox (because the user is editable, otherwise it's empty).
 			$checkbox = sprintf(
-				'<label class="screen-reader-text" for="user_%1$s">%2$s</label>' .
+				'<label class="label-covers-full-cell" for="user_%1$s"><span class="screen-reader-text">%2$s</span></label>' .
 				'<input type="checkbox" name="users[]" id="user_%1$s" class="%3$s" value="%1$s" />',
 				$user_object->ID,
-				/* translators: %s: User login. */
+				/* translators: Hidden accessibility text. %s: User login. */
 				sprintf( __( 'Select %s' ), $user_object->user_login ),
 				$role_classes
 			);
@@ -579,6 +585,7 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 						} else {
 							$row .= sprintf(
 								'<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
+								/* translators: Hidden accessibility text. */
 								_x( 'Unknown', 'name' )
 							);
 						}
@@ -596,7 +603,7 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 								"edit.php?author={$user_object->ID}",
 								$numposts,
 								sprintf(
-									/* translators: %s: Number of posts. */
+									/* translators: Hidden accessibility text. %s: Number of posts. */
 									_n( '%s post by this author', '%s posts by this author', $numposts ),
 									number_format_i18n( $numposts )
 								)
diff --git a/src/wp-admin/includes/credits.php b/src/wp-admin/includes/credits.php
index 833b676cec812..907ee93c0bae3 100644
--- a/src/wp-admin/includes/credits.php
+++ b/src/wp-admin/includes/credits.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Retrieve the contributor credits.
+ * Retrieves the contributor credits.
  *
  * @since 3.2.0
  * @since 5.6.0 Added the `$version` and `$locale` parameters.
@@ -32,8 +32,8 @@ function wp_credits( $version = '', $locale = '' ) {
 	$results = get_site_transient( 'wordpress_credits_' . $locale );
 
 	if ( ! is_array( $results )
-		|| false !== strpos( $version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $version, $results['data']['version'] ) !== 0 )
+		|| str_contains( $version, '-' )
+		|| ( isset( $results['data']['version'] ) && ! str_starts_with( $version, $results['data']['version'] ) )
 	) {
 		$url     = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
 		$options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );
@@ -61,7 +61,7 @@ function wp_credits( $version = '', $locale = '' ) {
 }
 
 /**
- * Retrieve the link to a contributor's WordPress.org profile page.
+ * Retrieves the link to a contributor's WordPress.org profile page.
  *
  * @access private
  * @since 3.2.0
@@ -75,7 +75,7 @@ function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
 }
 
 /**
- * Retrieve the link to an external library used in WordPress.
+ * Retrieves the link to an external library used in WordPress.
  *
  * @access private
  * @since 3.2.0
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
index 4c1f1f6797778..f0d0da1779b9e 100644
--- a/src/wp-admin/includes/dashboard.php
+++ b/src/wp-admin/includes/dashboard.php
@@ -492,7 +492,12 @@ function wp_network_dashboard_right_now() {
 
 	<form action="<?php echo esc_url( network_admin_url( 'users.php' ) ); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+			<label class="screen-reader-text" for="search-users">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Search Users' );
+				?>
+			</label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users" />
 			<?php submit_button( __( 'Search Users' ), '', false, false, array( 'id' => 'submit_users' ) ); ?>
 		</p>
@@ -500,7 +505,12 @@ function wp_network_dashboard_right_now() {
 
 	<form action="<?php echo esc_url( network_admin_url( 'sites.php' ) ); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+			<label class="screen-reader-text" for="search-sites">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Search Sites' );
+				?>
+			</label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites" />
 			<?php submit_button( __( 'Search Sites' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
@@ -522,7 +532,7 @@ function wp_network_dashboard_right_now() {
 }
 
 /**
- * The Quick Draft widget display and creation of drafts.
+ * Displays the Quick Draft widget.
  *
  * @since 3.8.0
  *
@@ -910,7 +920,9 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 }
 
 /**
- * Callback function for Activity widget.
+ * Outputs the Activity widget.
+ *
+ * Callback function for {@see 'dashboard_activity'}.
  *
  * @since 3.8.0
  */
@@ -972,7 +984,7 @@ function wp_dashboard_recent_posts( $args ) {
 		'order'          => $args['order'],
 		'posts_per_page' => (int) $args['max'],
 		'no_found_rows'  => true,
-		'cache_results'  => false,
+		'cache_results'  => true,
 		'perm'           => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
 	);
 
@@ -1096,7 +1108,10 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 		echo '</ul>';
 
 		if ( current_user_can( 'edit_posts' ) ) {
-			echo '<h3 class="screen-reader-text">' . __( 'View more comments' ) . '</h3>';
+			echo '<h3 class="screen-reader-text">' .
+				/* translators: Hidden accessibility text. */
+				__( 'View more comments' ) .
+			'</h3>';
 			_get_list_table( 'WP_Comments_List_Table' )->views();
 		}
 
@@ -1214,10 +1229,9 @@ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
 }
 
 /**
- * The RSS dashboard widget control.
+ * Sets up the RSS dashboard widget control and $args to be used as input to wp_widget_rss_form().
  *
- * Sets up $args to be used as input to wp_widget_rss_form(). Handles POST data
- * from RSS-type widgets.
+ * Handles POST data from RSS-type widgets.
  *
  * @since 2.5.0
  *
@@ -1284,10 +1298,10 @@ function wp_dashboard_events_news() {
 	<p class="community-events-footer">
 		<?php
 			printf(
-				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				'https://make.wordpress.org/community/meetups-landing-page',
 				__( 'Meetups' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			);
 		?>
@@ -1296,10 +1310,10 @@ function wp_dashboard_events_news() {
 
 		<?php
 			printf(
-				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				'https://central.wordcamp.org/schedule/',
 				__( 'WordCamps' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			);
 		?>
@@ -1308,11 +1322,11 @@ function wp_dashboard_events_news() {
 
 		<?php
 			printf(
-				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				/* translators: If a Rosetta site exists (e.g. https://es.wordpress.org/news/), then use that. Otherwise, leave untranslated. */
 				esc_url( _x( 'https://wordpress.org/news/', 'Events and News dashboard widget' ) ),
 				__( 'News' ),
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			);
 		?>
@@ -1634,9 +1648,10 @@ function wp_dashboard_quota() {
 				number_format_i18n( $quota )
 			);
 			printf(
-				'<a href="%1$s">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
+				'<a href="%1$s">%2$s<span class="screen-reader-text"> (%3$s)</span></a>',
 				esc_url( admin_url( 'upload.php' ) ),
 				$text,
+				/* translators: Hidden accessibility text. */
 				__( 'Manage Uploads' )
 			);
 			?>
@@ -1649,9 +1664,10 @@ function wp_dashboard_quota() {
 				$percentused
 			);
 			printf(
-				'<a href="%1$s" class="musublink">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
+				'<a href="%1$s" class="musublink">%2$s<span class="screen-reader-text"> (%3$s)</span></a>',
 				esc_url( admin_url( 'upload.php' ) ),
 				$text,
+				/* translators: Hidden accessibility text. */
 				__( 'Manage Uploads' )
 			);
 			?>
@@ -1879,10 +1895,10 @@ function wp_dashboard_php_nag() {
 	<p class="button-container">
 		<?php
 		printf(
-			'<a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+			'<a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s<span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 			esc_url( wp_get_update_php_url() ),
 			__( 'Learn more about updating PHP' ),
-			/* translators: Accessibility text. */
+			/* translators: Hidden accessibility text. */
 			__( '(opens in a new tab)' )
 		);
 		?>
@@ -2008,7 +2024,9 @@ function wp_dashboard_site_health() {
 }
 
 /**
- * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
+ * Outputs empty dashboard widget to be populated by JS later.
+ *
+ * Usable by plugins.
  *
  * @since 2.5.0
  */
@@ -2028,7 +2046,7 @@ function wp_welcome_panel() {
 	<div class="welcome-panel-content">
 	<div class="welcome-panel-header">
 		<div class="welcome-panel-header-image">
-			<?php echo file_get_contents( dirname( __DIR__ ) . '/images/about-header-about.svg' ); ?>
+			<?php echo file_get_contents( dirname( __DIR__ ) . '/images/dashboard-background.svg' ); ?>
 		</div>
 		<h2><?php _e( 'Welcome to WordPress!' ); ?></h2>
 		<p>
@@ -2080,11 +2098,11 @@ function wp_welcome_panel() {
 			<?php if ( $is_block_theme ) : ?>
 				<h3><?php _e( 'Switch up your site&#8217;s look & feel with Styles' ); ?></h3>
 				<p><?php _e( 'Tweak your site, or give it a whole new look! Get creative &#8212; how about a new color palette or font?' ); ?></p>
-				<a href="<?php echo esc_url( admin_url( 'site-editor.php?styles=open' ) ); ?>"><?php _e( 'Edit styles' ); ?></a>
+				<a href="<?php echo esc_url( admin_url( '/site-editor.php?path=%2Fwp_global_styles' ) ); ?>"><?php _e( 'Edit styles' ); ?></a>
 			<?php else : ?>
 				<h3><?php _e( 'Discover a new way to build your site.' ); ?></h3>
 				<p><?php _e( 'There is a new kind of WordPress theme, called a block theme, that lets you build the site you&#8217;ve always wanted &#8212; with blocks and styles.' ); ?></p>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/support/article/block-themes/' ) ); ?>"><?php _e( 'Learn about block themes' ); ?></a>
+				<a href="<?php echo esc_url( __( 'https://wordpress.org/documentation/article/block-themes/' ) ); ?>"><?php _e( 'Learn about block themes' ); ?></a>
 			<?php endif; ?>
 			</div>
 		</div>
diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php
index 75f9bfd1bf07f..d588ad4f54fc2 100644
--- a/src/wp-admin/includes/deprecated.php
+++ b/src/wp-admin/includes/deprecated.php
@@ -197,7 +197,7 @@ function remove_option_update_handler( $option_group, $option_name, $sanitize_ca
  * @deprecated 3.0.0
  *
  * @param string $filename
-**/
+ */
 function codepress_get_lang( $filename ) {
 	_deprecated_function( __FUNCTION__, '3.0.0' );
 }
@@ -207,7 +207,7 @@ function codepress_get_lang( $filename ) {
  *
  * @since 2.8.0
  * @deprecated 3.0.0
-**/
+ */
 function codepress_footer_js() {
 	_deprecated_function( __FUNCTION__, '3.0.0' );
 }
@@ -217,7 +217,7 @@ function codepress_footer_js() {
  *
  * @since 2.8.0
  * @deprecated 3.0.0
-**/
+ */
 function use_codepress() {
 	_deprecated_function( __FUNCTION__, '3.0.0' );
 }
@@ -493,7 +493,7 @@ class WP_User_Search {
 	 * @return WP_User_Search
 	 */
 	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1.0', 'WP_User_Query' );
+		_deprecated_class( 'WP_User_Search', '3.1.0', 'WP_User_Query' );
 
 		$this->search_term = wp_unslash( $search_term );
 		$this->raw_page = ( '' == $page ) ? false : (int) $page;
@@ -516,6 +516,7 @@ function __construct( $search_term = '', $page = '', $role = '' ) {
 	 * @return WP_User_Search
 	 */
 	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
+		_deprecated_constructor( 'WP_User_Search', '3.1.0', get_class( $this ) );
 		self::__construct( $search_term, $page, $role );
 	}
 
@@ -524,6 +525,8 @@ public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
 	 *
 	 * @since 2.1.0
 	 * @access public
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
 	public function prepare_query() {
 		global $wpdb;
@@ -562,6 +565,8 @@ public function prepare_query() {
 	 *
 	 * @since 2.1.0
 	 * @access public
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
 	public function query() {
 		global $wpdb;
@@ -1361,7 +1366,7 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
 			// Is this random plugin's slug already installed? If so, try again.
 			reset( $plugin_slugs );
 			foreach ( $plugin_slugs as $plugin_slug ) {
-				if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
+				if ( str_starts_with( $plugin_slug, $slug ) ) {
 					unset( $items[$item_key] );
 					continue 2;
 				}
@@ -1372,7 +1377,7 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
 		}
 
 		// Eliminate some common badly formed plugin descriptions.
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+		while ( ( null !== $item_key = array_rand($items) ) && str_contains( $items[$item_key]->get_description(), 'Plugin Name:' ) )
 			unset($items[$item_key]);
 
 		if ( !isset($items[$item_key]) )
diff --git a/src/wp-admin/includes/export.php b/src/wp-admin/includes/export.php
index 1c7694f02b4fd..9610ac8c9f521 100644
--- a/src/wp-admin/includes/export.php
+++ b/src/wp-admin/includes/export.php
@@ -218,7 +218,7 @@ function wxr_site_url() {
 			// Multisite: the base URL.
 			return network_home_url();
 		} else {
-			// WordPress (single site): the blog URL.
+			// WordPress (single site): the site URL.
 			return get_bloginfo_rss( 'url' );
 		}
 	}
@@ -318,6 +318,8 @@ function wxr_term_description( $term ) {
 	 *
 	 * @since 4.6.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param WP_Term $term Term object.
 	 */
 	function wxr_term_meta( $term ) {
@@ -519,7 +521,8 @@ function wxr_filter_postmeta( $return_me, $meta_key ) {
 	<?php endforeach; ?>
 	<?php
 	if ( 'all' === $args['content'] ) {
-		wxr_nav_menu_terms();}
+		wxr_nav_menu_terms();
+	}
 	?>
 
 	<?php
diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
index bfd32ec8991c7..94777598e86db 100644
--- a/src/wp-admin/includes/file.php
+++ b/src/wp-admin/includes/file.php
@@ -127,13 +127,16 @@ function get_home_path() {
  *
  * @since 2.6.0
  * @since 4.9.0 Added the `$exclusions` parameter.
+ * @since 6.3.0 Added the `$include_hidden` parameter.
  *
- * @param string   $folder     Optional. Full path to folder. Default empty.
- * @param int      $levels     Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
- * @param string[] $exclusions Optional. List of folders and files to skip.
+ * @param string   $folder         Optional. Full path to folder. Default empty.
+ * @param int      $levels         Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
+ * @param string[] $exclusions     Optional. List of folders and files to skip.
+ * @param bool     $include_hidden Optional. Whether to include details of hidden ("." prefixed) files.
+ *                                 Default false.
  * @return string[]|false Array of files on success, false on failure.
  */
-function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
+function list_files( $folder = '', $levels = 100, $exclusions = array(), $include_hidden = false ) {
 	if ( empty( $folder ) ) {
 		return false;
 	}
@@ -156,12 +159,12 @@ function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
 			}
 
 			// Skip hidden and excluded files.
-			if ( '.' === $file[0] || in_array( $file, $exclusions, true ) ) {
+			if ( ( ! $include_hidden && '.' === $file[0] ) || in_array( $file, $exclusions, true ) ) {
 				continue;
 			}
 
 			if ( is_dir( $folder . $file ) ) {
-				$files2 = list_files( $folder . $file, $levels - 1 );
+				$files2 = list_files( $folder . $file, $levels - 1, array(), $include_hidden );
 				if ( $files2 ) {
 					$files = array_merge( $files, $files2 );
 				} else {
@@ -310,7 +313,7 @@ function wp_print_file_editor_templates() {
 					<?php
 					printf(
 						/* translators: 1: Line number, 2: File path. */
-						__( 'Your PHP code changes were rolled back due to an error on line %1$s of file %2$s. Please fix and try saving again.' ),
+						__( 'Your PHP code changes were not applied due to an error on line %1$s of file %2$s. Please fix and try saving again.' ),
 						'{{ data.line }}',
 						'{{ data.file }}'
 					);
@@ -323,7 +326,7 @@ function wp_print_file_editor_templates() {
 					printf(
 						/* translators: %s: Documentation URL. */
 						__( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),
-						__( 'https://wordpress.org/support/article/changing-file-permissions/' )
+						__( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
 					);
 					?>
 				</p>
@@ -339,7 +342,12 @@ function wp_print_file_editor_templates() {
 				<# } #>
 			<# } #>
 			<# if ( data.dismissible ) { #>
-				<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php _e( 'Dismiss' ); ?></span></button>
+				<button type="button" class="notice-dismiss"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Dismiss' );
+					?>
+				</span></button>
 			<# } #>
 		</div>
 	</script>
@@ -540,7 +548,9 @@ function wp_edit_theme_plugin_file( $args ) {
 		}
 
 		// Make sure PHP process doesn't die before loopback requests complete.
-		set_time_limit( 5 * MINUTE_IN_SECONDS );
+		if ( function_exists( 'set_time_limit' ) ) {
+			set_time_limit( 5 * MINUTE_IN_SECONDS );
+		}
 
 		// Time to wait for loopback requests to finish.
 		$timeout = 100; // 100 seconds.
@@ -564,8 +574,10 @@ function wp_edit_theme_plugin_file( $args ) {
 		}
 
 		if ( function_exists( 'session_status' ) && PHP_SESSION_ACTIVE === session_status() ) {
-			// Close any active session to prevent HTTP requests from timing out
-			// when attempting to connect back to the site.
+			/*
+			 * Close any active session to prevent HTTP requests from timing out
+			 * when attempting to connect back to the site.
+			 */
 			session_write_close();
 		}
 
@@ -677,7 +689,25 @@ function wp_tempnam( $filename = '', $dir = '' ) {
 	// Suffix some random data to avoid filename conflicts.
 	$temp_filename .= '-' . wp_generate_password( 6, false );
 	$temp_filename .= '.tmp';
-	$temp_filename  = $dir . wp_unique_filename( $dir, $temp_filename );
+	$temp_filename  = wp_unique_filename( $dir, $temp_filename );
+
+	/*
+	 * Filesystems typically have a limit of 255 characters for a filename.
+	 *
+	 * If the generated unique filename exceeds this, truncate the initial
+	 * filename and try again.
+	 *
+	 * As it's possible that the truncated filename may exist, producing a
+	 * suffix of "-1" or "-10" which could exceed the limit again, truncate
+	 * it to 252 instead.
+	 */
+	$characters_over_limit = strlen( $temp_filename ) - 252;
+	if ( $characters_over_limit > 0 ) {
+		$filename = substr( $filename, 0, -$characters_over_limit );
+		return wp_tempnam( $filename, $dir );
+	}
+
+	$temp_filename = $dir . $temp_filename;
 
 	$fp = @fopen( $temp_filename, 'x' );
 
@@ -747,9 +777,9 @@ function validate_file_to_edit( $file, $allowed_files = array() ) {
  *     An array of override parameters for this file, or boolean false if none are provided.
  *
  *     @type callable $upload_error_handler     Function to call when there is an error during the upload process.
- *                                              @see wp_handle_upload_error().
+ *                                              See {@see wp_handle_upload_error()}.
  *     @type callable $unique_filename_callback Function to call when determining a unique file name for the file.
- *                                              @see wp_unique_filename().
+ *                                              See {@see wp_unique_filename()}.
  *     @type string[] $upload_error_strings     The strings that describe the error indicated in
  *                                              `$_FILES[{form field}]['error']`.
  *     @type bool     $test_form                Whether to test that the `$_POST['action']` parameter is as expected.
@@ -815,7 +845,7 @@ function wp_handle_upload_error( &$file, $message ) {
 	 * @since 5.7.0
 	 *
 	 * @param array|false $overrides An array of override parameters for this file. Boolean false if none are
-	 *                               provided. @see _wp_handle_upload().
+	 *                               provided. See {@see _wp_handle_upload()}.
 	 * @param array       $file      {
 	 *     Reference to a single element from `$_FILES`.
 	 *
@@ -883,7 +913,7 @@ function wp_handle_upload_error( &$file, $message ) {
 
 	// If you override this, you must provide $ext and $type!!
 	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-	$mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+	$mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : null;
 
 	// A correct form post will pass this test.
 	if ( $test_form && ( ! isset( $_POST['action'] ) || $_POST['action'] !== $action ) ) {
@@ -990,7 +1020,7 @@ function wp_handle_upload_error( &$file, $message ) {
 		}
 
 		if ( false === $move_new_file ) {
-			if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
+			if ( str_starts_with( $uploads['basedir'], ABSPATH ) ) {
 				$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
 			} else {
 				$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
@@ -1184,12 +1214,12 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), $data );
 	}
 
-	$content_disposition = wp_remote_retrieve_header( $response, 'content-disposition' );
+	$content_disposition = wp_remote_retrieve_header( $response, 'Content-Disposition' );
 
 	if ( $content_disposition ) {
 		$content_disposition = strtolower( $content_disposition );
 
-		if ( 0 === strpos( $content_disposition, 'attachment; filename=' ) ) {
+		if ( str_starts_with( $content_disposition, 'attachment; filename=' ) ) {
 			$tmpfname_disposition = sanitize_file_name( substr( $content_disposition, 21 ) );
 		} else {
 			$tmpfname_disposition = '';
@@ -1211,7 +1241,7 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 		}
 	}
 
-	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
+	$content_md5 = wp_remote_retrieve_header( $response, 'Content-MD5' );
 
 	if ( $content_md5 ) {
 		$md5_check = verify_file_md5( $tmpfname, $content_md5 );
@@ -1238,15 +1268,17 @@ function download_url( $url, $timeout = 300, $signature_verification = false ) {
 
 	// Perform signature valiation if supported.
 	if ( $signature_verification ) {
-		$signature = wp_remote_retrieve_header( $response, 'x-content-signature' );
+		$signature = wp_remote_retrieve_header( $response, 'X-Content-Signature' );
 
 		if ( ! $signature ) {
-			// Retrieve signatures from a file if the header wasn't included.
-			// WordPress.org stores signatures at $package_url.sig.
+			/*
+			 * Retrieve signatures from a file if the header wasn't included.
+			 * WordPress.org stores signatures at $package_url.sig.
+			 */
 
 			$signature_url = false;
 
-			if ( is_string( $url_path ) && ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) ) {
+			if ( is_string( $url_path ) && ( str_ends_with( $url_path, '.zip' ) || str_ends_with( $url_path, '.tar.gz' ) ) ) {
 				$signature_url = str_replace( $url_path, $url_path . '.sig', $url );
 			}
 
@@ -1370,14 +1402,16 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
 		);
 	}
 
-	// Check for a edge-case affecting PHP Maths abilities.
+	// Check for an edge-case affecting PHP Maths abilities.
 	if (
 		! extension_loaded( 'sodium' ) &&
 		in_array( PHP_VERSION_ID, array( 70200, 70201, 70202 ), true ) &&
 		extension_loaded( 'opcache' )
 	) {
-		// Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
-		// https://bugs.php.net/bug.php?id=75938
+		/*
+		 * Sodium_Compat isn't compatible with PHP 7.2.0~7.2.2 due to a bug in the PHP Opcache extension, bail early as it'll fail.
+		 * https://bugs.php.net/bug.php?id=75938
+		 */
 		return new WP_Error(
 			'signature_verification_unsupported',
 			sprintf(
@@ -1410,8 +1444,10 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f
 			// phpcs:enable
 		}
 
-		// This cannot be performed in a reasonable amount of time.
-		// https://github.com/paragonie/sodium_compat#help-sodium_compat-is-slow-how-can-i-make-it-fast
+		/*
+		 * This cannot be performed in a reasonable amount of time.
+		 * https://github.com/paragonie/sodium_compat#help-sodium_compat-is-slow-how-can-i-make-it-fast
+		 */
 		if ( ! $sodium_compat_is_fast ) {
 			return new WP_Error(
 				'signature_verification_unsupported',
@@ -1639,7 +1675,7 @@ function _unzip_file_ziparchive( $file, $to, $needed_dirs = array() ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 		}
 
-		if ( '__MACOSX/' === substr( $info['name'], 0, 9 ) ) { // Skip the OS X-created __MACOSX directory.
+		if ( str_starts_with( $info['name'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
 			continue;
 		}
 
@@ -1652,7 +1688,7 @@ function _unzip_file_ziparchive( $file, $to, $needed_dirs = array() ) {
 
 		$dirname = dirname( $info['name'] );
 
-		if ( '/' === substr( $info['name'], -1 ) ) {
+		if ( str_ends_with( $info['name'], '/' ) ) {
 			// Directory.
 			$needed_dirs[] = $to . untrailingslashit( $info['name'] );
 		} elseif ( '.' !== $dirname ) {
@@ -1686,7 +1722,7 @@ function _unzip_file_ziparchive( $file, $to, $needed_dirs = array() ) {
 			continue;
 		}
 
-		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
+		if ( ! str_contains( $dir, $to ) ) { // If the directory is not within the working directory, skip it.
 			continue;
 		}
 
@@ -1719,11 +1755,11 @@ function _unzip_file_ziparchive( $file, $to, $needed_dirs = array() ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
 		}
 
-		if ( '/' === substr( $info['name'], -1 ) ) { // Directory.
+		if ( str_ends_with( $info['name'], '/' ) ) { // Directory.
 			continue;
 		}
 
-		if ( '__MACOSX/' === substr( $info['name'], 0, 9 ) ) { // Don't extract the OS X-created __MACOSX directory files.
+		if ( str_starts_with( $info['name'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
 			continue;
 		}
 
@@ -1793,7 +1829,7 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 
 	// Determine any children directories needed (From within the archive).
 	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr( $file['filename'], 0, 9 ) ) { // Skip the OS X-created __MACOSX directory.
+		if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Skip the OS X-created __MACOSX directory.
 			continue;
 		}
 
@@ -1827,7 +1863,7 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 			continue;
 		}
 
-		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
+		if ( ! str_contains( $dir, $to ) ) { // If the directory is not within the working directory, skip it.
 			continue;
 		}
 
@@ -1859,7 +1895,7 @@ function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 			continue;
 		}
 
-		if ( '__MACOSX/' === substr( $file['filename'], 0, 9 ) ) { // Don't extract the OS X-created __MACOSX directory files.
+		if ( str_starts_with( $file['filename'], '__MACOSX/' ) ) { // Don't extract the OS X-created __MACOSX directory files.
 			continue;
 		}
 
@@ -1897,12 +1933,20 @@ function copy_dir( $from, $to, $skip_list = array() ) {
 	$dirlist = $wp_filesystem->dirlist( $from );
 
 	if ( false === $dirlist ) {
-		return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $to ) );
+		return new WP_Error( 'dirlist_failed_copy_dir', __( 'Directory listing failed.' ), basename( $from ) );
 	}
 
 	$from = trailingslashit( $from );
 	$to   = trailingslashit( $to );
 
+	if ( ! $wp_filesystem->exists( $to ) && ! $wp_filesystem->mkdir( $to ) ) {
+		return new WP_Error(
+			'mkdir_destination_failed_copy_dir',
+			__( 'Could not create the destination directory.' ),
+			basename( $to )
+		);
+	}
+
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
 		if ( in_array( $filename, $skip_list, true ) ) {
 			continue;
@@ -1930,7 +1974,7 @@ function copy_dir( $from, $to, $skip_list = array() ) {
 			$sub_skip_list = array();
 
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
+				if ( str_starts_with( $skip_item, $filename . '/' ) ) {
 					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
 				}
 			}
@@ -1946,6 +1990,79 @@ function copy_dir( $from, $to, $skip_list = array() ) {
 	return true;
 }
 
+/**
+ * Moves a directory from one location to another.
+ *
+ * Recursively invalidates OPcache on success.
+ *
+ * If the renaming failed, falls back to copy_dir().
+ *
+ * Assumes that WP_Filesystem() has already been called and setup.
+ *
+ * This function is not designed to merge directories, copy_dir() should be used instead.
+ *
+ * @since 6.2.0
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ *
+ * @param string $from      Source directory.
+ * @param string $to        Destination directory.
+ * @param bool   $overwrite Optional. Whether to overwrite the destination directory if it exists.
+ *                          Default false.
+ * @return true|WP_Error True on success, WP_Error on failure.
+ */
+function move_dir( $from, $to, $overwrite = false ) {
+	global $wp_filesystem;
+
+	if ( trailingslashit( strtolower( $from ) ) === trailingslashit( strtolower( $to ) ) ) {
+		return new WP_Error( 'source_destination_same_move_dir', __( 'The source and destination are the same.' ) );
+	}
+
+	if ( $wp_filesystem->exists( $to ) ) {
+		if ( ! $overwrite ) {
+			return new WP_Error( 'destination_already_exists_move_dir', __( 'The destination folder already exists.' ), $to );
+		} elseif ( ! $wp_filesystem->delete( $to, true ) ) {
+			// Can't overwrite if the destination couldn't be deleted.
+			return new WP_Error( 'destination_not_deleted_move_dir', __( 'The destination directory already exists and could not be removed.' ) );
+		}
+	}
+
+	if ( $wp_filesystem->move( $from, $to ) ) {
+		/*
+		 * When using an environment with shared folders,
+		 * there is a delay in updating the filesystem's cache.
+		 *
+		 * This is a known issue in environments with a VirtualBox provider.
+		 *
+		 * A 200ms delay gives time for the filesystem to update its cache,
+		 * prevents "Operation not permitted", and "No such file or directory" warnings.
+		 *
+		 * This delay is used in other projects, including Composer.
+		 * @link https://github.com/composer/composer/blob/2.5.1/src/Composer/Util/Platform.php#L228-L233
+		 */
+		usleep( 200000 );
+		wp_opcache_invalidate_directory( $to );
+
+		return true;
+	}
+
+	// Fall back to a recursive copy.
+	if ( ! $wp_filesystem->is_dir( $to ) ) {
+		if ( ! $wp_filesystem->mkdir( $to, FS_CHMOD_DIR ) ) {
+			return new WP_Error( 'mkdir_failed_move_dir', __( 'Could not create directory.' ), $to );
+		}
+	}
+
+	$result = copy_dir( $from, $to, array( basename( $to ) ) );
+
+	// Clear the source directory.
+	if ( true === $result ) {
+		$wp_filesystem->delete( $from, true );
+	}
+
+	return $result;
+}
+
 /**
  * Initializes and connects the WordPress Filesystem Abstraction classes.
  *
@@ -2044,7 +2161,7 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
  * The return value can be overridden by defining the `FS_METHOD` constant in `wp-config.php`,
  * or filtering via {@see 'filesystem_method'}.
  *
- * @link https://wordpress.org/support/article/editing-wp-config-php/#wordpress-upgrade-constants
+ * @link https://wordpress.org/documentation/article/editing-wp-config-php/#wordpress-upgrade-constants
  *
  * Plugins may define a custom transport handler, See WP_Filesystem().
  *
@@ -2236,8 +2353,10 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 		'private_key' => 'FTP_PRIKEY',
 	);
 
-	// If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
-	// Otherwise, keep it as it previously was (saved details in option).
+	/*
+	 * If defined, set it to that. Else, if POST'd, set it to that. If not, set it to an empty string.
+	 * Otherwise, keep it as it previously was (saved details in option).
+	 */
 	foreach ( $ftp_constants as $key => $constant ) {
 		if ( defined( $constant ) ) {
 			$credentials[ $key ] = constant( $constant );
@@ -2390,10 +2509,11 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> />
+		<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> spellcheck="false" />
 		<?php
 		if ( ! defined( 'FTP_PASS' ) ) {
-			_e( 'This password will not be stored on the server.' );}
+			_e( 'This password will not be stored on the server.' );
+		}
 		?>
 	</label>
 </div>
@@ -2439,10 +2559,12 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 		}
 	}
 
-	// Make sure the `submit_button()` function is available during the REST API call
-	// from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
+	/*
+	 * Make sure the `submit_button()` function is available during the REST API call
+	 * from WP_Site_Health_Auto_Updates::test_check_wp_filesystem_method().
+	 */
 	if ( ! function_exists( 'submit_button' ) ) {
-		require_once ABSPATH . '/wp-admin/includes/template.php';
+		require_once ABSPATH . 'wp-admin/includes/template.php';
 	}
 	?>
 	<p class="request-filesystem-credentials-action-buttons">
@@ -2556,3 +2678,65 @@ function wp_opcache_invalidate( $filepath, $force = false ) {
 
 	return false;
 }
+
+/**
+ * Attempts to clear the opcode cache for a directory of files.
+ *
+ * @since 6.2.0
+ *
+ * @see wp_opcache_invalidate()
+ * @link https://www.php.net/manual/en/function.opcache-invalidate.php
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ *
+ * @param string $dir The path to the directory for which the opcode cache is to be cleared.
+ */
+function wp_opcache_invalidate_directory( $dir ) {
+	global $wp_filesystem;
+
+	if ( ! is_string( $dir ) || '' === trim( $dir ) ) {
+		if ( WP_DEBUG ) {
+			$error_message = sprintf(
+				/* translators: %s: The function name. */
+				__( '%s expects a non-empty string.' ),
+				'<code>wp_opcache_invalidate_directory()</code>'
+			);
+			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+			trigger_error( $error_message );
+		}
+		return;
+	}
+
+	$dirlist = $wp_filesystem->dirlist( $dir, false, true );
+
+	if ( empty( $dirlist ) ) {
+		return;
+	}
+
+	/*
+	 * Recursively invalidate opcache of files in a directory.
+	 *
+	 * WP_Filesystem_*::dirlist() returns an array of file and directory information.
+	 *
+	 * This does not include a path to the file or directory.
+	 * To invalidate files within sub-directories, recursion is needed
+	 * to prepend an absolute path containing the sub-directory's name.
+	 *
+	 * @param array  $dirlist Array of file/directory information from WP_Filesystem_Base::dirlist(),
+	 *                        with sub-directories represented as nested arrays.
+	 * @param string $path    Absolute path to the directory.
+	 */
+	$invalidate_directory = static function( $dirlist, $path ) use ( &$invalidate_directory ) {
+		$path = trailingslashit( $path );
+
+		foreach ( $dirlist as $name => $details ) {
+			if ( 'f' === $details['type'] ) {
+				wp_opcache_invalidate( $path . $name, true );
+			} elseif ( is_array( $details['files'] ) && ! empty( $details['files'] ) ) {
+				$invalidate_directory( $details['files'], $path . $name );
+			}
+		}
+	};
+
+	$invalidate_directory( $dirlist, $dir );
+}
diff --git a/src/wp-admin/includes/image-edit.php b/src/wp-admin/includes/image-edit.php
index e814fc47e78e1..58861b1a6f66b 100644
--- a/src/wp-admin/includes/image-edit.php
+++ b/src/wp-admin/includes/image-edit.php
@@ -28,10 +28,11 @@ function wp_image_editor( $post_id, $msg = false ) {
 		die( __( 'Image data does not exist. Please re-upload the image.' ) );
 	}
 
-	$sizer = $big > 400 ? 400 / $big : 1;
+	$sizer = $big > 600 ? 600 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$can_restore  = false;
+
 	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
 		$can_restore = wp_basename( $meta['file'] ) !== $backup_sizes['full-orig']['file'];
 	}
@@ -43,25 +44,28 @@ function wp_image_editor( $post_id, $msg = false ) {
 			$note = "<div class='notice notice-success' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
 		}
 	}
-	$edit_custom_sizes = false;
+
 	/**
-	 * Filters whether custom sizes are available options for image editing.
+	 * Shows the settings in the Image Editor that allow selecting to edit only the thumbnail of an image.
 	 *
-	 * @since 6.0.0
+	 * @since 6.3.0
 	 *
-	 * @param bool|string[] $edit_custom_sizes True if custom sizes can be edited or array of custom size names.
+	 * @param bool $show Whether to show the settings in the Image Editor. Default false.
 	 */
-	$edit_custom_sizes = apply_filters( 'edit_custom_thumbnail_sizes', $edit_custom_sizes );
+	$edit_thumbnails_separately = (bool) apply_filters( 'image_edit_thumbnails_separately', false );
+
 	?>
 	<div class="imgedit-wrap wp-clearfix">
 	<div id="imgedit-panel-<?php echo $post_id; ?>">
-
-	<div class="imgedit-panel-content wp-clearfix">
-		<?php echo $note; ?>
+	<?php echo $note; ?>
+	<div class="imgedit-panel-content imgedit-panel-tools wp-clearfix">
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this )" class="imgedit-crop button disabled" disabled><?php esc_html_e( 'Crop' ); ?></button>
+			<button type="button" onclick="imageEdit.toggleCropTool( <?php echo "$post_id, '$nonce'"; ?>, this );" aria-expanded="false" aria-controls="imgedit-crop" class="imgedit-crop button disabled" disabled><?php esc_html_e( 'Crop' ); ?></button>
+			<button type="button" class="imgedit-scale button" onclick="imageEdit.toggleControls(this);" aria-expanded="false" aria-controls="imgedit-scale"><?php esc_html_e( 'Scale' ); ?></button>
+			<div class="imgedit-rotate-menu-container">
+				<button type="button" aria-controls="imgedit-rotate-menu" class="imgedit-rotate button" aria-expanded="false" onclick="imageEdit.togglePopup(this)"><?php esc_html_e( 'Image Rotation' ); ?></button>
+				<div id="imgedit-rotate-menu" class="imgedit-popup-menu">
 			<?php
-
 			// On some setups GD library does not provide imagerotate() - Ticket #11536.
 			if ( wp_image_editor_supports(
 				array(
@@ -71,211 +75,256 @@ function wp_image_editor( $post_id, $msg = false ) {
 			) ) {
 				$note_no_rotate = '';
 				?>
-				<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate left' ); ?></button>
-				<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate right' ); ?></button>
+					<button type="button" class="imgedit-rleft button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate 90° left' ); ?></button>
+					<button type="button" class="imgedit-rright button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate 90° right' ); ?></button>
+					<button type="button" class="imgedit-rfull button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.rotate(180, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate 180°' ); ?></button>
 				<?php
 			} else {
 				$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
 				?>
-				<button type="button" class="imgedit-rleft button disabled" disabled></button>
-				<button type="button" class="imgedit-rright button disabled" disabled></button>
-			<?php } ?>
-
-			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button>
-			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button>
-
-			<br class="imgedit-undo-redo-separator" />
-			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><?php esc_html_e( 'Undo' ); ?></button>
-			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><?php esc_html_e( 'Redo' ); ?></button>
-			<?php echo $note_no_rotate; ?>
-		</div>
-
-		<input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
-		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
-		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
-
-		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')"
-			src="<?php echo esc_url( admin_url( 'admin-ajax.php', 'relative' ) ) . '?action=imgedit-preview&amp;_ajax_nonce=' . $nonce . '&amp;postid=' . $post_id . '&amp;rand=' . rand( 1, 99999 ); ?>" alt="" />
-		</div>
-
-		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
-		</div>
-	</div>
-
-	<div class="imgedit-settings">
-	<div class="imgedit-group">
-	<div class="imgedit-group-top">
-		<h2><?php _e( 'Scale Image' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
-		<div class="imgedit-help">
-		<p><?php _e( 'You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.' ); ?></p>
-		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
-		<p>
-			<?php
-			printf(
-				/* translators: %s: Image width and height in pixels. */
-				__( 'Original dimensions %s' ),
-				'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
-			);
-			?>
-		</p>
-		<?php endif; ?>
-		<div class="imgedit-submit">
-
-		<fieldset class="imgedit-scale">
-		<legend><?php _e( 'New dimensions:' ); ?></legend>
-		<div class="nowrap">
-		<label for="imgedit-scale-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale width' ); ?></label>
-		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<span class="imgedit-separator" aria-hidden="true">&times;</span>
-		<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
-		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
-		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
-		</div>
-		</fieldset>
-
-		</div>
-	</div>
-	</div>
-
-	<?php if ( $can_restore ) { ?>
-
-	<div class="imgedit-group">
-	<div class="imgedit-group-top">
-		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link" aria-expanded="false"><?php _e( 'Restore original image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
-		<div class="imgedit-help imgedit-restore">
-		<p>
-			<?php
-			_e( 'Discard any changes and restore the original image.' );
-
-			if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
-				echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+					<button type="button" class="imgedit-rleft button disabled" disabled></button>
+					<button type="button" class="imgedit-rright button disabled" disabled></button>
+				<?php
 			}
 			?>
-		</p>
-		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
-		</div>
+					<hr />
+					<button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button>
+					<button type="button" onkeyup="imageEdit.browsePopup(this)" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button>
+					<?php echo $note_no_rotate; ?>
+				</div>
+			</div>
 		</div>
-	</div>
-	</div>
-
-	<?php } ?>
-
-	<div class="imgedit-group">
-	<div class="imgedit-group-top">
-		<h2><?php _e( 'Image Crop' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
-
-		<div class="imgedit-help">
-		<p><?php _e( 'To crop the image, click on it and drag to make your selection.' ); ?></p>
-
-		<p><strong><?php _e( 'Crop Aspect Ratio' ); ?></strong><br />
-		<?php _e( 'The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.' ); ?></p>
-
-		<p><strong><?php _e( 'Crop Selection' ); ?></strong><br />
-		<?php _e( 'Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.' ); ?></p>
+		<div class="imgedit-submit imgedit-menu">
+			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><?php esc_html_e( 'Undo' ); ?></button>
+			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><?php esc_html_e( 'Redo' ); ?></button>
+			<button type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn"><?php esc_html_e( 'Cancel Editing' ); ?></button>
+			<button type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn"><?php esc_html_e( 'Save Edits' ); ?></button>
 		</div>
 	</div>
 
-	<fieldset class="imgedit-crop-ratio">
-		<legend><?php _e( 'Aspect ratio:' ); ?></legend>
-		<div class="nowrap">
-		<label for="imgedit-crop-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></label>
-		<input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
-		<span class="imgedit-separator" aria-hidden="true">:</span>
-		<label for="imgedit-crop-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></label>
-		<input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
+	<div class="imgedit-panel-content wp-clearfix">
+		<div class="imgedit-tools">
+			<input type="hidden" id="imgedit-nonce-<?php echo $post_id; ?>" value="<?php echo $nonce; ?>" />
+			<input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
+			<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
+			<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
+			<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
+			<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+			<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+
+			<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
+			<div class="imgedit-crop-grid"></div>
+			<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')"
+				src="<?php echo esc_url( admin_url( 'admin-ajax.php', 'relative' ) ) . '?action=imgedit-preview&amp;_ajax_nonce=' . $nonce . '&amp;postid=' . $post_id . '&amp;rand=' . rand( 1, 99999 ); ?>" alt="" />
+			</div>
 		</div>
-	</fieldset>
-
-	<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
-		<legend><?php _e( 'Selection:' ); ?></legend>
-		<div class="nowrap">
-		<label for="imgedit-sel-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection width' ); ?></label>
-		<input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
-		<span class="imgedit-separator" aria-hidden="true">&times;</span>
-		<label for="imgedit-sel-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection height' ); ?></label>
-		<input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
+		<div class="imgedit-settings">
+			<div class="imgedit-tool-active">
+				<div class="imgedit-group">
+				<div id="imgedit-scale" tabindex="-1" class="imgedit-group-controls">
+					<div class="imgedit-group-top">
+						<h2><?php _e( 'Scale Image' ); ?></h2>
+						<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						esc_html_e( 'Scale Image Help' );
+						?>
+						</span></button>
+						<div class="imgedit-help">
+						<p><?php _e( 'You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.' ); ?></p>
+						</div>
+						<?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
+						<p>
+							<?php
+							printf(
+								/* translators: %s: Image width and height in pixels. */
+								__( 'Original dimensions %s' ),
+								'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
+							);
+							?>
+						</p>
+						<?php endif; ?>
+						<div class="imgedit-submit">
+						<fieldset class="imgedit-scale-controls">
+							<legend><?php _e( 'New dimensions:' ); ?></legend>
+							<div class="nowrap">
+							<label for="imgedit-scale-width-<?php echo $post_id; ?>" class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'scale height' );
+							?>
+							</label>
+							<input type="number" step="1" min="0" max="<?php echo isset( $meta['width'] ) ? $meta['width'] : ''; ?>" aria-describedby="imgedit-scale-warn-<?php echo $post_id; ?>"  id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+							<span class="imgedit-separator" aria-hidden="true">&times;</span>
+							<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
+							<input type="number" step="1" min="0" max="<?php echo isset( $meta['height'] ) ? $meta['height'] : ''; ?>" aria-describedby="imgedit-scale-warn-<?php echo $post_id; ?>" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+							<button id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary"><?php esc_html_e( 'Scale' ); ?></button>
+							<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>"><span class="dashicons dashicons-warning" aria-hidden="true"></span><?php esc_html_e( 'Images cannot be scaled to a size larger than the original.' ); ?></span>
+							</div>
+						</fieldset>
+						</div>
+					</div>
+				</div>
+			</div>
+
+		<?php if ( $can_restore ) { ?>
+				<div class="imgedit-group">
+				<div class="imgedit-group-top">
+					<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link" aria-expanded="false"><?php _e( 'Restore original image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+					<div class="imgedit-help imgedit-restore">
+					<p>
+					<?php
+					_e( 'Discard any changes and restore the original image.' );
+					if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
+						echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+					}
+					?>
+					</p>
+					<div class="imgedit-submit">
+						<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+					</div>
+				</div>
+			</div>
+			</div>
+		<?php } ?>
+			<div class="imgedit-group">
+				<div id="imgedit-crop" tabindex="-1" class="imgedit-group-controls">
+				<div class="imgedit-group-top">
+					<h2><?php _e( 'Crop Image' ); ?></h2>
+					<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Image Crop Help' );
+					?>
+					</span></button>
+					<div class="imgedit-help">
+						<p><?php _e( 'To crop the image, click on it and drag to make your selection.' ); ?></p>
+						<p><strong><?php _e( 'Crop Aspect Ratio' ); ?></strong><br />
+						<?php _e( 'The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.' ); ?></p>
+
+						<p><strong><?php _e( 'Crop Selection' ); ?></strong><br />
+						<?php _e( 'Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.' ); ?></p>
+					</div>
+				</div>
+				<fieldset class="imgedit-crop-ratio">
+					<legend><?php _e( 'Aspect ratio:' ); ?></legend>
+					<div class="nowrap">
+					<label for="imgedit-crop-width-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'crop ratio width' );
+					?>
+					</label>
+					<input type="number" step="1" min="1" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
+					<span class="imgedit-separator" aria-hidden="true">:</span>
+					<label for="imgedit-crop-height-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'crop ratio height' );
+					?>
+					</label>
+					<input  type="number" step="1" min="0" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
+					</div>
+				</fieldset>
+				<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
+					<legend><?php _e( 'Selection:' ); ?></legend>
+					<div class="nowrap">
+					<label for="imgedit-sel-width-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'selection width' );
+					?>
+					</label>
+					<input  type="number" step="1" min="0" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
+					<span class="imgedit-separator" aria-hidden="true">&times;</span>
+					<label for="imgedit-sel-height-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'selection height' );
+					?>
+					</label>
+					<input  type="number" step="1" min="0" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
+					</div>
+				</fieldset>
+				<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
+					<legend><?php _e( 'Starting Coordinates:' ); ?></legend>
+					<div class="nowrap">
+					<label for="imgedit-start-x-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'horizontal start position' );
+					?>
+					</label>
+					<input  type="number" step="1" min="0" id="imgedit-start-x-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" value="0" />
+					<span class="imgedit-separator" aria-hidden="true">&times;</span>
+					<label for="imgedit-start-y-<?php echo $post_id; ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'vertical start position' );
+					?>
+					</label>
+					<input  type="number" step="1" min="0" id="imgedit-start-y-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" value="0" />
+					</div>
+				</fieldset>
+				<div class="imgedit-crop-apply imgedit-menu container">
+					<button class="button-primary" type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this );" class="imgedit-crop-apply button"><?php esc_html_e( 'Apply Crop' ); ?></button> <button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this );" class="imgedit-crop-clear button" disabled="disabled"><?php esc_html_e( 'Clear Crop' ); ?></button>
+				</div>
+			</div>
 		</div>
-	</fieldset>
-
 	</div>
 
 	<?php
-	if ( $thumb && $sub_sizes ) {
+	if ( $edit_thumbnails_separately && $thumb && $sub_sizes ) {
 		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
 		?>
 
 	<div class="imgedit-group imgedit-applyto">
-	<div class="imgedit-group-top">
-		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
-		<div class="imgedit-help">
-		<p><?php _e( 'You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.' ); ?></p>
+		<div class="imgedit-group-top">
+			<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
+			<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			esc_html_e( 'Thumbnail Settings Help' );
+			?>
+			</span></button>
+			<div class="imgedit-help">
+			<p><?php _e( 'You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.' ); ?></p>
+			</div>
+		</div>
+		<div class="imgedit-thumbnail-preview-group">
+			<figure class="imgedit-thumbnail-preview">
+				<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
+				<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+			</figure>
+			<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
+			<fieldset>
+				<legend><?php _e( 'Apply changes to:' ); ?></legend>
+
+				<span class="imgedit-label">
+					<input type="radio" id="imgedit-target-all" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
+					<label for="imgedit-target-all"><?php _e( 'All image sizes' ); ?></label>
+				</span>
+
+				<span class="imgedit-label">
+					<input type="radio" id="imgedit-target-thumbnail" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
+					<label for="imgedit-target-thumbnail"><?php _e( 'Thumbnail' ); ?></label>
+				</span>
+
+				<span class="imgedit-label">
+					<input type="radio" id="imgedit-target-nothumb" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
+					<label for="imgedit-target-nothumb"><?php _e( 'All sizes except thumbnail' ); ?></label>
+				</span>
+
+				</fieldset>
+			</div>
 		</div>
 	</div>
-
-	<figure class="imgedit-thumbnail-preview">
-		<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
-		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
-	</figure>
-
-	<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
-	<fieldset>
-		<legend><?php _e( 'Apply changes to:' ); ?></legend>
-
-		<span class="imgedit-label">
-			<input type="radio" id="imgedit-target-all" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
-			<label for="imgedit-target-all"><?php _e( 'All image sizes' ); ?></label>
-		</span>
-
-		<span class="imgedit-label">
-			<input type="radio" id="imgedit-target-thumbnail" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
-			<label for="imgedit-target-thumbnail"><?php _e( 'Thumbnail' ); ?></label>
-		</span>
-
-		<span class="imgedit-label">
-			<input type="radio" id="imgedit-target-nothumb" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
-			<label for="imgedit-target-nothumb"><?php _e( 'All sizes except thumbnail' ); ?></label>
-		</span>
-		<?php
-		if ( $edit_custom_sizes ) {
-			if ( ! is_array( $edit_custom_sizes ) ) {
-				$edit_custom_sizes = get_intermediate_image_sizes();
-			}
-			foreach ( array_unique( $edit_custom_sizes ) as $key => $size ) {
-				if ( array_key_exists( $size, $meta['sizes'] ) ) {
-					if ( 'thumbnail' === $size ) {
-						continue;
-					}
-					?>
-					<span class="imgedit-label">
-						<input type="radio" id="imgedit-target-custom<?php echo esc_attr( $key ); ?>" name="imgedit-target-<?php echo $post_id; ?>" value="<?php echo esc_attr( $size ); ?>" />
-						<label for="imgedit-target-custom<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $size ); ?></label>
-					</span>
-					<?php
-				}
-			}
-		}
-		?>
-	</fieldset>
-	</div>
-	</div>
-
 	<?php } ?>
-
+		</div>
 	</div>
 
 	</div>
+
 	<div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
 	<div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e( "There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor." ); ?></div>
 	</div>
@@ -463,7 +512,7 @@ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
  */
 function _image_get_preview_ratio( $w, $h ) {
 	$max = max( $w, $h );
-	return $max > 400 ? ( 400 / $max ) : 1;
+	return $max > 600 ? ( 600 / $max ) : 1;
 }
 
 /**
@@ -588,15 +637,18 @@ function image_edit_apply_changes( $image, $changes ) {
 			$obj->sel  = $obj->c;
 			unset( $obj->c );
 		}
+
 		$changes[ $key ] = $obj;
 	}
 
 	// Combine operations.
 	if ( count( $changes ) > 1 ) {
 		$filtered = array( $changes[0] );
+
 		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
 			$combined = false;
-			if ( $filtered[ $i ]->type == $changes[ $j ]->type ) {
+
+			if ( $filtered[ $i ]->type === $changes[ $j ]->type ) {
 				switch ( $filtered[ $i ]->type ) {
 					case 'rotate':
 						$filtered[ $i ]->angle += $changes[ $j ]->angle;
@@ -608,10 +660,12 @@ function image_edit_apply_changes( $image, $changes ) {
 						break;
 				}
 			}
+
 			if ( ! $combined ) {
 				$filtered[ ++$i ] = $changes[ $j ];
 			}
 		}
+
 		$changes = $filtered;
 		unset( $filtered );
 	}
@@ -645,7 +699,7 @@ function image_edit_apply_changes( $image, $changes ) {
 	foreach ( $changes as $operation ) {
 		switch ( $operation->type ) {
 			case 'rotate':
-				if ( 0 != $operation->angle ) {
+				if ( 0 !== $operation->angle ) {
 					if ( $image instanceof WP_Image_Editor ) {
 						$image->rotate( $operation->angle );
 					} else {
@@ -654,11 +708,11 @@ function image_edit_apply_changes( $image, $changes ) {
 				}
 				break;
 			case 'flip':
-				if ( 0 != $operation->axis ) {
+				if ( 0 !== $operation->axis ) {
 					if ( $image instanceof WP_Image_Editor ) {
-						$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image->flip( ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
 					} else {
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
 					}
 				}
 				break;
@@ -739,7 +793,7 @@ function wp_restore_image( $post_id ) {
 	$backup_sizes     = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$old_backup_sizes = $backup_sizes;
 	$restored         = false;
-	$msg              = new stdClass;
+	$msg              = new stdClass();
 
 	if ( ! is_array( $backup_sizes ) ) {
 		$msg->error = __( 'Cannot load image metadata.' );
@@ -753,9 +807,8 @@ function wp_restore_image( $post_id ) {
 	if ( isset( $backup_sizes['full-orig'] ) && is_array( $backup_sizes['full-orig'] ) ) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
+		if ( $parts['basename'] !== $data['file'] ) {
 			if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
-
 				// Delete only if it's an edited image.
 				if ( preg_match( '/-e[0-9]{13}\./', $parts['basename'] ) ) {
 					wp_delete_file( $file );
@@ -780,9 +833,9 @@ function wp_restore_image( $post_id ) {
 	foreach ( $default_sizes as $default_size ) {
 		if ( isset( $backup_sizes[ "$default_size-orig" ] ) ) {
 			$data = $backup_sizes[ "$default_size-orig" ];
-			if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] != $data['file'] ) {
-				if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
 
+			if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] !== $data['file'] ) {
+				if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
 					// Delete only if it's an edited image.
 					if ( preg_match( '/-e[0-9]{13}-/', $meta['sizes'][ $default_size ]['file'] ) ) {
 						$delete_file = path_join( $parts['dirname'], $meta['sizes'][ $default_size ]['file'] );
@@ -799,9 +852,9 @@ function wp_restore_image( $post_id ) {
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
-
+	if ( ! wp_update_attachment_metadata( $post_id, $meta )
+		|| ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) )
+	) {
 		$msg->error = __( 'Cannot save image metadata.' );
 		return $msg;
 	}
@@ -810,6 +863,10 @@ function wp_restore_image( $post_id ) {
 		$msg->error = __( 'Image metadata is inconsistent.' );
 	} else {
 		$msg->msg = __( 'Image restored successfully.' );
+
+		if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
+			delete_post_meta( $post_id, '_wp_attachment_backup_sizes' );
+		}
 	}
 
 	return $msg;
@@ -827,7 +884,7 @@ function wp_restore_image( $post_id ) {
 function wp_save_image( $post_id ) {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-	$return  = new stdClass;
+	$return  = new stdClass();
 	$success = false;
 	$delete  = false;
 	$scaled  = false;
@@ -835,34 +892,45 @@ function wp_save_image( $post_id ) {
 	$post    = get_post( $post_id );
 
 	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
+
 	if ( is_wp_error( $img ) ) {
 		$return->error = esc_js( __( 'Unable to create new image.' ) );
 		return $return;
 	}
 
-	$fwidth  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
-	$fheight = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
-	$target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
-	$scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
-
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
-		$size = $img->get_size();
-		$sX   = $size['width'];
-		$sY   = $size['height'];
-
-		// Check if it has roughly the same w / h ratio.
-		$diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
-		if ( -0.1 < $diff && $diff < 0.1 ) {
-			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) ) {
-				$scaled = true;
-			}
-		}
+	$full_width  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
+	$full_height = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
+	$target      = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
+	$scale       = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
+
+	/** This filter is documented in wp-admin/includes/image-edit.php */
+	$edit_thumbnails_separately = (bool) apply_filters( 'image_edit_thumbnails_separately', false );
 
-		if ( ! $scaled ) {
-			$return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
+	if ( $scale ) {
+		$size            = $img->get_size();
+		$original_width  = $size['width'];
+		$original_height = $size['height'];
+
+		if ( $full_width > $original_width || $full_height > $original_height ) {
+			$return->error = esc_js( __( 'Images cannot be scaled to a size larger than the original.' ) );
 			return $return;
 		}
+
+		if ( $full_width > 0 && $full_height > 0 ) {
+			// Check if it has roughly the same w / h ratio.
+			$diff = round( $original_width / $original_height, 2 ) - round( $full_width / $full_height, 2 );
+			if ( -0.1 < $diff && $diff < 0.1 ) {
+				// Scale the full size image.
+				if ( $img->resize( $full_width, $full_height ) ) {
+					$scaled = true;
+				}
+			}
+
+			if ( ! $scaled ) {
+				$return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
+				return $return;
+			}
+		}
 	} elseif ( ! empty( $_REQUEST['history'] ) ) {
 		$changes = json_decode( wp_unslash( $_REQUEST['history'] ) );
 		if ( $changes ) {
@@ -894,10 +962,11 @@ function wp_save_image( $post_id ) {
 	$filename = pathinfo( $path, PATHINFO_FILENAME );
 	$suffix   = time() . rand( 100, 999 );
 
-	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
-		isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
+	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE
+		&& isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] !== $basename
+	) {
 
-		if ( 'thumbnail' === $target ) {
+		if ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
 			$new_path = "{$dirname}/{$filename}-temp.{$ext}";
 		} else {
 			$new_path = $path;
@@ -908,6 +977,7 @@ function wp_save_image( $post_id ) {
 			$filename    .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$ext}";
 			$new_path     = "{$dirname}/$new_filename";
+
 			if ( file_exists( $new_path ) ) {
 				$suffix++;
 			} else {
@@ -924,8 +994,11 @@ function wp_save_image( $post_id ) {
 
 	if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
 		$tag = false;
+
 		if ( isset( $backup_sizes['full-orig'] ) ) {
-			if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
+			if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+				&& $backup_sizes['full-orig']['file'] !== $basename
+			) {
 				$tag = "full-$suffix";
 			}
 		} else {
@@ -939,6 +1012,7 @@ function wp_save_image( $post_id ) {
 				'file'   => $basename,
 			);
 		}
+
 		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
 		$meta['file'] = _wp_relative_upload_path( $new_path );
@@ -947,29 +1021,21 @@ function wp_save_image( $post_id ) {
 		$meta['width']  = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success ) {
+		if ( $success && ( 'nothumb' === $target || 'all' === $target ) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' === $target || 'all' === $target ) {
-				if ( 'nothumb' === $target ) {
-					$sizes = array_diff( $sizes, array( 'thumbnail' ) );
-				}
-			} elseif ( 'thumbnail' !== $target ) {
-				$sizes = array_diff( $sizes, array( $target ) );
+
+			if ( $edit_thumbnails_separately && 'nothumb' === $target ) {
+				$sizes = array_diff( $sizes, array( 'thumbnail' ) );
 			}
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' === $target ) {
+	} elseif ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
 		$sizes   = array( 'thumbnail' );
 		$success = true;
 		$delete  = true;
 		$nocrop  = true;
-	} else {
-		$sizes   = array( $target );
-		$success = true;
-		$delete  = true;
-		$nocrop  = $_wp_additional_image_sizes[ $size ]['crop'];
 	}
 
 	/*
@@ -992,9 +1058,12 @@ function wp_save_image( $post_id ) {
 
 		foreach ( $sizes as $size ) {
 			$tag = false;
+
 			if ( isset( $meta['sizes'][ $size ] ) ) {
 				if ( isset( $backup_sizes[ "$size-orig" ] ) ) {
-					if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes[ "$size-orig" ]['file'] != $meta['sizes'][ $size ]['file'] ) {
+					if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+						&& $backup_sizes[ "$size-orig" ]['file'] !== $meta['sizes'][ $size ]['file']
+					) {
 						$tag = "$size-$suffix";
 					}
 				} else {
@@ -1035,10 +1104,12 @@ function wp_save_image( $post_id ) {
 		if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
 			// Check if it's an image edit from attachment edit screen.
 			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' === $_REQUEST['context'] ) {
-				$thumb_url         = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url( $post_id );
+
 				if ( ! empty( $meta['sizes']['thumbnail'] ) ) {
 					$thumb             = $meta['sizes']['thumbnail'];
 					$return->thumbnail = path_join( dirname( $file_url ), $thumb['file'] );
@@ -1056,5 +1127,6 @@ function wp_save_image( $post_id ) {
 	}
 
 	$return->msg = esc_js( __( 'Image saved' ) );
+
 	return $return;
 }
diff --git a/src/wp-admin/includes/image.php b/src/wp-admin/includes/image.php
index f937bdc2ff53d..fabe9da7c0c5b 100644
--- a/src/wp-admin/includes/image.php
+++ b/src/wp-admin/includes/image.php
@@ -28,8 +28,10 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s
 		$src_file = get_attached_file( $src );
 
 		if ( ! file_exists( $src_file ) ) {
-			// If the file doesn't exist, attempt a URL fopen on the src link.
-			// This can occur with certain file replication plugins.
+			/*
+			 * If the file doesn't exist, attempt a URL fopen on the src link.
+			 * This can occur with certain file replication plugins.
+			 */
 			$src = _load_image_to_edit_path( $src, 'full' );
 		} else {
 			$src = $src_file;
@@ -159,8 +161,10 @@ function wp_update_image_subsizes( $attachment_id ) {
 	$image_file = wp_get_original_image_path( $attachment_id );
 
 	if ( empty( $image_meta ) || ! is_array( $image_meta ) ) {
-		// Previously failed upload?
-		// If there is an uploaded file, make all sub-sizes and generate all of the attachment meta.
+		/*
+		 * Previously failed upload?
+		 * If there is an uploaded file, make all sub-sizes and generate all of the attachment meta.
+		 */
 		if ( ! empty( $image_file ) ) {
 			$image_meta = wp_create_image_subsizes( $image_file, $attachment_id );
 		} else {
@@ -283,8 +287,10 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
 		 */
 		$threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
 
-		// If the original image's dimensions are over the threshold,
-		// scale the image and use it as the "full" size.
+		/*
+		 * If the original image's dimensions are over the threshold,
+		 * scale the image and use it as the "full" size.
+		 */
 		if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
 			$editor = wp_get_image_editor( $file );
 
@@ -304,8 +310,10 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
 			}
 
 			if ( ! is_wp_error( $resized ) ) {
-				// Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
-				// This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
+				/*
+				 * Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
+				 * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
+				 */
 				$saved = $editor->save( $editor->generate_filename( 'scaled' ) );
 
 				if ( ! is_wp_error( $saved ) ) {
diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index c479ddc851156..0910693fc9810 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -254,6 +254,9 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
  *
  * @access private
  * @since 3.4.0
+ *
+ * @param array $matches Single regex match.
+ * @return string Cleaned up HTML for caption.
  */
 function _cleanup_image_add_caption( $matches ) {
 	// Remove any line breaks from inside the tags.
@@ -385,7 +388,7 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 		}
 
 		// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) ) {
+	} elseif ( str_starts_with( $type, 'image/' ) ) {
 		$image_meta = wp_read_image_metadata( $file );
 
 		if ( $image_meta ) {
@@ -419,14 +422,18 @@ function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrid
 	$attachment_id = wp_insert_attachment( $attachment, $file, $post_id, true );
 
 	if ( ! is_wp_error( $attachment_id ) ) {
-		// Set a custom header with the attachment_id.
-		// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+		/*
+		 * Set a custom header with the attachment_id.
+		 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+		 */
 		if ( ! headers_sent() ) {
 			header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
 		}
 
-		// The image sub-sizes are created during wp_generate_attachment_metadata().
-		// This is generally slow and may cause timeouts or out of memory errors.
+		/*
+		 * The image sub-sizes are created during wp_generate_attachment_metadata().
+		 * This is generally slow and may cause timeouts or out of memory errors.
+		 */
 		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 	}
 
@@ -534,8 +541,8 @@ function wp_iframe( $content_func, ...$args ) {
 	wp_enqueue_style( 'colors' );
 	// Check callback name for 'media'.
 	if (
-		( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) ) ||
-		( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) )
+		( is_array( $content_func ) && ! empty( $content_func[1] ) && str_starts_with( (string) $content_func[1], 'media' ) ) ||
+		( ! is_array( $content_func ) && str_starts_with( $content_func, 'media' ) )
 	) {
 		wp_enqueue_style( 'deprecated-media' );
 	}
@@ -828,7 +835,7 @@ function media_upload_form_handler() {
 		if ( ! empty( $attachment['url'] ) ) {
 			$rel = '';
 
-			if ( strpos( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) == $attachment['url'] ) {
+			if ( str_contains( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) === $attachment['url'] ) {
 				$rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
 			}
 
@@ -993,6 +1000,7 @@ function wp_media_upload_handler() {
  * @since 5.3.0 The `$post_id` parameter was made optional.
  * @since 5.4.0 The original URL of the attachment is stored in the `_source_url`
  *              post meta value.
+ * @since 5.8.0 Added 'webp' to the default list of allowed file extensions.
  *
  * @param string $file        The URL of the image to download.
  * @param int    $post_id     Optional. The post ID the media is to be associated with.
@@ -1017,8 +1025,10 @@ function media_sideload_image( $file, $post_id = 0, $desc = null, $return_type =
 		 *  - `jpe`
 		 *  - `png`
 		 *  - `gif`
+		 *  - `webp`
 		 *
 		 * @since 5.6.0
+		 * @since 5.8.0 Added 'webp' to the default list of allowed file extensions.
 		 *
 		 * @param string[] $allowed_extensions Array of allowed file extensions.
 		 * @param string   $file               The URL of the image to download.
@@ -1348,12 +1358,12 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
 function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
 	$post = get_post( $attachment_id );
 
-	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
+	if ( str_starts_with( $post->post_mime_type, 'image' ) ) {
 		$url   = $attachment['url'];
 		$align = ! empty( $attachment['align'] ) ? $attachment['align'] : 'none';
 		$size  = ! empty( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
 		$alt   = ! empty( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
-		$rel   = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
+		$rel   = ( str_contains( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
 
 		return get_image_send_to_editor( $attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt );
 	}
@@ -1459,7 +1469,7 @@ function get_attachment_fields_to_edit( $post, $errors = null ) {
 	$form_fields = array_merge_recursive( $form_fields, (array) $errors );
 
 	// This was formerly in image_attachment_fields_to_edit().
-	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
+	if ( str_starts_with( $post->post_mime_type, 'image' ) ) {
 		$alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
 
 		if ( empty( $alt ) ) {
@@ -2177,8 +2187,8 @@ function media_upload_form( $errors = null ) {
 	 */
 	if (
 		wp_is_mobile() &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false
+		str_contains( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) &&
+		str_contains( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' )
 	) {
 		$plupload_init['multi_selection'] = false;
 	}
@@ -2258,7 +2268,12 @@ function media_upload_form( $errors = null ) {
 
 	?>
 	<p id="async-upload-wrap">
-		<label class="screen-reader-text" for="async-upload"><?php _e( 'Upload' ); ?></label>
+		<label class="screen-reader-text" for="async-upload">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Upload' );
+			?>
+		</label>
 		<input type="file" name="async-upload" id="async-upload" />
 		<?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
@@ -2726,7 +2741,12 @@ function media_upload_library_form( $errors ) {
 	<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
 
 	<p id="media-search" class="search-box">
-		<label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
+		<label class="screen-reader-text" for="media-search-input">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Search Media:' );
+			?>
+		</label>
 		<input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
 		<?php submit_button( __( 'Search Media' ), '', '', false ); ?>
 	</p>
@@ -3204,7 +3224,7 @@ function edit_form_image_editor( $post ) {
 	?>
 	</div>
 	<div class="wp_attachment_details edit-form-section">
-	<?php if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) : ?>
+	<?php if ( str_starts_with( $post->post_mime_type, 'image' ) ) : ?>
 		<p class="attachment-alt-text">
 			<label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
 			<textarea class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" aria-describedby="alt-text-description"><?php echo esc_attr( $alt_text ); ?></textarea>
@@ -3219,7 +3239,7 @@ function edit_form_image_editor( $post ) {
 			'target="_blank" rel="noopener"',
 			sprintf(
 				'<span class="screen-reader-text"> %s</span>',
-				/* translators: Accessibility text. */
+				/* translators: Hidden accessibility text. */
 				__( '(opens in a new tab)' )
 			)
 		);
@@ -3333,6 +3353,9 @@ function attachment_submitbox_metadata() {
 			<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
 		</span>
 	</div>
+	<div class="misc-pub-section misc-pub-download">
+		<a href="<?php echo esc_attr( $att_url ); ?>" download><?php _e( 'Download file' ); ?></a>
+	</div>
 	<div class="misc-pub-section misc-pub-filename">
 		<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
 	</div>
@@ -3469,7 +3492,7 @@ function attachment_submitbox_metadata() {
 		<div class="misc-pub-section misc-pub-original-image word-wrap-break-word">
 			<?php _e( 'Original image:' ); ?>
 			<a href="<?php echo esc_url( wp_get_original_image_url( $attachment_id ) ); ?>">
-				<?php echo esc_html( wp_basename( wp_get_original_image_path( $attachment_id ) ) ); ?>
+				<strong><?php echo esc_html( wp_basename( wp_get_original_image_path( $attachment_id ) ) ); ?></strong>
 			</a>
 		</div>
 		<?php
@@ -3491,7 +3514,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
 				if ( 'length' !== $key && ! empty( $list ) ) {
 					$metadata[ $key ] = wp_kses_post( reset( $list ) );
 					// Fix bug in byte stream analysis.
-					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[ $key ], 'yright notice.' ) ) {
+					if ( 'terms_of_use' === $key && str_starts_with( $metadata[ $key ], 'yright notice.' ) ) {
 						$metadata[ $key ] = 'Cop' . $metadata[ $key ];
 					}
 				}
@@ -3831,7 +3854,7 @@ function wp_media_attach_action( $parent_id, $action = 'attach' ) {
 		$referer  = wp_get_referer();
 
 		if ( $referer ) {
-			if ( false !== strpos( $referer, 'upload.php' ) ) {
+			if ( str_contains( $referer, 'upload.php' ) ) {
 				$location = remove_query_arg( array( 'attached', 'detach' ), $referer );
 			}
 		}
diff --git a/src/wp-admin/includes/menu.php b/src/wp-admin/includes/menu.php
index 07c382b9892b7..ae8e06be6e747 100644
--- a/src/wp-admin/includes/menu.php
+++ b/src/wp-admin/includes/menu.php
@@ -44,11 +44,13 @@
 // Create list of page plugin hook names.
 foreach ( $menu as $menu_page ) {
 	$pos = strpos( $menu_page[2], '?' );
+
 	if ( false !== $pos ) {
 		// Handle post_type=post|page|foo pages.
 		$hook_name = substr( $menu_page[2], 0, $pos );
 		$hook_args = substr( $menu_page[2], $pos + 1 );
 		wp_parse_str( $hook_args, $hook_args );
+
 		// Set the hook name to be the post type.
 		if ( isset( $hook_args['post_type'] ) ) {
 			$hook_name = $hook_args['post_type'];
@@ -59,6 +61,7 @@
 	} else {
 		$hook_name = basename( $menu_page[2], '.php' );
 	}
+
 	$hook_name = sanitize_title( $hook_name );
 
 	if ( isset( $compat[ $hook_name ] ) ) {
@@ -98,17 +101,20 @@
 	if ( empty( $submenu[ $data[2] ] ) ) {
 		continue;
 	}
+
 	$subs       = $submenu[ $data[2] ];
 	$first_sub  = reset( $subs );
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
+
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
+	if ( $new_parent !== $old_parent ) {
 		$_wp_real_parent_file[ $old_parent ] = $new_parent;
-		$menu[ $id ][2]                      = $new_parent;
+
+		$menu[ $id ][2] = $new_parent;
 
 		foreach ( $submenu[ $old_parent ] as $index => $data ) {
 			$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
@@ -171,7 +177,8 @@
 	if ( ! empty( $submenu[ $data[2] ] ) && 1 === count( $submenu[ $data[2] ] ) ) {
 		$subs      = $submenu[ $data[2] ];
 		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] ) {
+
+		if ( $data[2] === $first_sub[2] ) {
 			unset( $submenu[ $data[2] ] );
 		}
 	}
@@ -217,32 +224,36 @@ function add_menu_classes( $menu ) {
 	$first_item  = false;
 	$last_order  = false;
 	$items_count = count( $menu );
-	$i           = 0;
+
+	$i = 0;
 
 	foreach ( $menu as $order => $top ) {
 		$i++;
 
-		if ( 0 == $order ) { // Dashboard is always shown/single.
+		if ( 0 === $order ) { // Dashboard is always shown/single.
 			$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
 			$last_order = 0;
 			continue;
 		}
 
-		if ( 0 === strpos( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
-			$first_item             = true;
-			$classes                = $menu[ $last_order ][4];
+		if ( str_starts_with( $top[2], 'separator' ) && false !== $last_order ) { // If separator.
+			$first_item = true;
+			$classes    = $menu[ $last_order ][4];
+
 			$menu[ $last_order ][4] = add_cssclass( 'menu-top-last', $classes );
 			continue;
 		}
 
 		if ( $first_item ) {
-			$classes           = $menu[ $order ][4];
+			$first_item = false;
+			$classes    = $menu[ $order ][4];
+
 			$menu[ $order ][4] = add_cssclass( 'menu-top-first', $classes );
-			$first_item        = false;
 		}
 
-		if ( $i == $items_count ) { // Last item.
-			$classes           = $menu[ $order ][4];
+		if ( $i === $items_count ) { // Last item.
+			$classes = $menu[ $order ][4];
+
 			$menu[ $order ][4] = add_cssclass( 'menu-top-last', $classes );
 		}
 
@@ -272,10 +283,12 @@ function add_menu_classes( $menu ) {
  */
 if ( apply_filters( 'custom_menu_order', false ) ) {
 	$menu_order = array();
+
 	foreach ( $menu as $menu_item ) {
 		$menu_order[] = $menu_item[2];
 	}
 	unset( $menu_item );
+
 	$default_menu_order = $menu_order;
 
 	/**
@@ -290,8 +303,9 @@ function add_menu_classes( $menu ) {
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order         = apply_filters( 'menu_order', $menu_order );
-	$menu_order         = array_flip( $menu_order );
+	$menu_order = apply_filters( 'menu_order', $menu_order );
+	$menu_order = array_flip( $menu_order );
+
 	$default_menu_order = array_flip( $default_menu_order );
 
 	/**
@@ -304,14 +318,16 @@ function add_menu_classes( $menu ) {
 	 */
 	function sort_menu( $a, $b ) {
 		global $menu_order, $default_menu_order;
+
 		$a = $a[2];
 		$b = $b[2];
+
 		if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
 			return -1;
 		} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
 			return 1;
 		} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
-			if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
+			if ( $menu_order[ $a ] === $menu_order[ $b ] ) {
 				return 0;
 			}
 			return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
diff --git a/src/wp-admin/includes/meta-boxes.php b/src/wp-admin/includes/meta-boxes.php
index e822d7c40fc71..0584a2edc49a4 100644
--- a/src/wp-admin/includes/meta-boxes.php
+++ b/src/wp-admin/includes/meta-boxes.php
@@ -76,7 +76,7 @@ function post_submit_meta_box( $post, $args = array() ) {
 				$preview_button = sprintf(
 					'%1$s<span class="screen-reader-text"> %2$s</span>',
 					$preview_button_text,
-					/* translators: Accessibility text. */
+					/* translators: Hidden accessibility text. */
 					__( '(opens in a new tab)' )
 				);
 				?>
@@ -132,11 +132,21 @@ function post_submit_meta_box( $post, $args = array() ) {
 					$private_style = 'style="display:none"';
 				}
 				?>
-				<a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
+				<a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Edit status' );
+					?>
+				</span></a>
 
 				<div id="post-status-select" class="hide-if-js">
 					<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
-					<label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
+					<label for="post_status" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Set status' );
+						?>
+					</label>
 					<select name="post_status" id="post_status">
 						<?php if ( 'publish' === $post->post_status ) : ?>
 							<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
@@ -184,7 +194,12 @@ function post_submit_meta_box( $post, $args = array() ) {
 			</span>
 
 			<?php if ( $can_publish ) { ?>
-				<a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
+				<a href="#visibility" class="edit-visibility hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Edit visibility' );
+					?>
+				</span></a>
 
 				<div id="post-visibility-select" class="hide-if-js">
 					<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
@@ -257,7 +272,12 @@ function post_submit_meta_box( $post, $args = array() ) {
 				/* translators: Post revisions heading. %s: The number of available revisions. */
 				printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' );
 				?>
-				<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
+				<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Browse revisions' );
+					?>
+				</span></a>
 			</div>
 			<?php
 		endif;
@@ -270,10 +290,20 @@ function post_submit_meta_box( $post, $args = array() ) {
 				</span>
 				<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" role="button">
 					<span aria-hidden="true"><?php _e( 'Edit' ); ?></span>
-					<span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Edit date and time' );
+						?>
+					</span>
 				</a>
 				<fieldset id="timestampdiv" class="hide-if-js">
-					<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
+					<legend class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Date and time' );
+						?>
+					</legend>
 					<?php touch_time( ( 'edit' === $action ), 1 ); ?>
 				</fieldset>
 			</div>
@@ -439,10 +469,20 @@ function attachment_submit_meta_box( $post ) {
 	<?php
 	if ( current_user_can( 'delete_post', $post->ID ) ) {
 		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
+			printf(
+				'<a class="submitdelete deletion" href="%1$s">%2$s</a>',
+				get_delete_post_link( $post->ID ),
+				__( 'Move to Trash' )
+			);
 		} else {
-			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-			echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete permanently' ) . '</a>';
+			$show_confirmation = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+
+			printf(
+				'<a class="submitdelete deletion"%1$s href="%2$s">%3$s</a>',
+				$show_confirmation,
+				get_delete_post_link( $post->ID, '', true ),
+				__( 'Delete permanently' )
+			);
 		}
 	}
 	?>
@@ -492,7 +532,12 @@ function post_format_meta_box( $post, $box ) {
 			?>
 		<div id="post-formats-select">
 		<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
+			<legend class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Post Formats' );
+				?>
+			</legend>
 			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
 			<?php foreach ( $post_formats[0] as $format ) : ?>
 			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>" class="post-format-icon post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
@@ -700,13 +745,18 @@ function post_categories_meta_box( $post, $box ) {
  */
 function post_excerpt_meta_box( $post ) {
 	?>
-<label class="screen-reader-text" for="excerpt"><?php _e( 'Excerpt' ); ?></label><textarea rows="1" cols="40" name="excerpt" id="excerpt"><?php echo $post->post_excerpt; // textarea_escaped ?></textarea>
+<label class="screen-reader-text" for="excerpt">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Excerpt' );
+	?>
+</label><textarea rows="1" cols="40" name="excerpt" id="excerpt"><?php echo $post->post_excerpt; // textarea_escaped ?></textarea>
 <p>
 	<?php
 	printf(
 		/* translators: %s: Documentation URL. */
 		__( 'Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.' ),
-		__( 'https://wordpress.org/support/article/excerpt/' )
+		__( 'https://wordpress.org/documentation/article/what-is-an-excerpt-classic-editor/' )
 	);
 	?>
 </p>
@@ -744,7 +794,7 @@ function post_trackback_meta_box( $post ) {
 	printf(
 		/* translators: %s: Documentation URL. */
 		__( 'Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.' ),
-		__( 'https://wordpress.org/support/article/introduction-to-blogging/#comments' )
+		__( 'https://wordpress.org/documentation/article/introduction-to-blogging/#comments' )
 	);
 	?>
 </p>
@@ -781,7 +831,7 @@ function post_custom_meta_box( $post ) {
 	printf(
 		/* translators: %s: Documentation URL. */
 		__( 'Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.' ),
-		__( 'https://wordpress.org/support/article/custom-fields/' )
+		__( 'https://wordpress.org/documentation/article/assign-custom-fields/' )
 	);
 	?>
 </p>
@@ -804,8 +854,8 @@ function post_comment_status_meta_box( $post ) {
 		<?php
 		printf(
 			/* translators: %s: Documentation URL. */
-			__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
-			__( 'https://wordpress.org/support/article/introduction-to-blogging/#managing-comments' )
+			__( 'Allow <a href="%s">trackbacks and pingbacks</a>' ),
+			__( 'https://wordpress.org/documentation/article/introduction-to-blogging/#managing-comments' )
 		);
 		?>
 	</label>
@@ -888,7 +938,12 @@ function post_slug_meta_box( $post ) {
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
 	?>
-<label class="screen-reader-text" for="post_name"><?php _e( 'Slug' ); ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
+<label class="screen-reader-text" for="post_name">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Slug' );
+	?>
+</label><input name="post_name" type="text" class="large-text" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
 	<?php
 }
 
@@ -906,7 +961,12 @@ function post_author_meta_box( $post ) {
 
 	$post_type_object = get_post_type_object( $post->post_type );
 	?>
-<label class="screen-reader-text" for="post_author_override"><?php _e( 'Author' ); ?></label>
+<label class="screen-reader-text" for="post_author_override">
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Author' );
+	?>
+</label>
 	<?php
 	wp_dropdown_users(
 		array(
@@ -973,7 +1033,7 @@ function page_attributes_meta_box( $post ) {
 		endif; // End empty pages check.
 	endif;  // End hierarchical check.
 
-	if ( count( get_page_templates( $post ) ) > 0 && get_option( 'page_for_posts' ) != $post->ID ) :
+	if ( count( get_page_templates( $post ) ) > 0 && (int) get_option( 'page_for_posts' ) !== $post->ID ) :
 		$template = ! empty( $post->page_template ) ? $post->page_template : false;
 		?>
 <p class="post-attributes-label-wrapper page-template-label-wrapper"><label class="post-attributes-label" for="page_template"><?php _e( 'Template' ); ?></label>
@@ -1143,7 +1203,12 @@ function link_categories_meta_box( $link ) {
 	<div id="category-adder" class="wp-hidden-children">
 		<a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e( '+ Add New Category' ); ?></a>
 		<p id="link-category-add" class="wp-hidden-child">
-			<label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
+			<label class="screen-reader-text" for="newcat">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( '+ Add New Category' );
+				?>
+			</label>
 			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
 			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
 			<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
@@ -1164,7 +1229,12 @@ function link_categories_meta_box( $link ) {
 function link_target_meta_box( $link ) {
 
 	?>
-<fieldset><legend class="screen-reader-text"><span><?php _e( 'Target' ); ?></span></legend>
+<fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Target' );
+	?>
+</span></legend>
 <p><label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( '_blank' === $link->link_target ) ? 'checked="checked"' : '' ); ?> />
 	<?php _e( '<code>_blank</code> &mdash; new window or tab.' ); ?></label></p>
@@ -1254,7 +1324,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'identity' ); ?></span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'identity' );
+				?>
+			</span></legend>
 			<label for="me">
 			<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check( 'identity', 'me' ); ?> />
 			<?php _e( 'another web address of mine' ); ?></label>
@@ -1262,7 +1338,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'friendship' ); ?></span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'friendship' );
+				?>
+			</span></legend>
 			<label for="contact">
 			<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check( 'friendship', 'contact' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'contact' ); ?>
 			</label>
@@ -1279,7 +1361,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?> </th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'physical' ); ?></span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'physical' );
+				?>
+			</span></legend>
 			<label for="met">
 			<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check( 'physical', 'met' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'met' ); ?>
 			</label>
@@ -1287,7 +1375,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?> </th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'professional' ); ?></span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'professional' );
+				?>
+			</span></legend>
 			<label for="co-worker">
 			<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check( 'professional', 'co-worker' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-worker' ); ?>
 			</label>
@@ -1298,7 +1392,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'geographical' ); ?> </span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'geographical' );
+				?>
+			</span></legend>
 			<label for="co-resident">
 			<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check( 'geographical', 'co-resident' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'co-resident' ); ?>
 			</label>
@@ -1312,7 +1412,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'family' ); ?> </span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'family' );
+				?>
+			</span></legend>
 			<label for="child">
 			<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check( 'family', 'child' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'child' ); ?>
 			</label>
@@ -1335,7 +1441,13 @@ function link_xfn_meta_box( $link ) {
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'romantic' ); ?> </span></legend>
+		<td><fieldset>
+			<legend class="screen-reader-text"><span>
+				<?php
+				/* translators: Hidden accessibility text. xfn: https://gmpg.org/xfn/ */
+				_e( 'romantic' );
+				?>
+			</span></legend>
 			<label for="muse">
 			<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check( 'romantic', 'muse' ); ?> />&nbsp;<?php /* translators: xfn: https://gmpg.org/xfn/ */ _e( 'muse' ); ?>
 			</label>
@@ -1384,7 +1496,7 @@ function link_advanced_meta_box( $link ) {
 		<?php
 		for ( $rating = 0; $rating <= 10; $rating++ ) {
 			echo '<option value="' . $rating . '"';
-			if ( isset( $link->link_rating ) && $link->link_rating == $rating ) {
+			if ( isset( $link->link_rating ) && $link->link_rating === $rating ) {
 				echo ' selected="selected"';
 			}
 			echo '>' . $rating . '</option>';
@@ -1560,8 +1672,10 @@ function register_and_do_post_meta_boxes( $post ) {
 	 */
 	do_action_deprecated( 'dbx_post_advanced', array( $post ), '3.7.0', 'add_meta_boxes' );
 
-	// Allow the Discussion meta box to show up if the post type supports comments,
-	// or if comments or pings are open.
+	/*
+	 * Allow the Discussion meta box to show up if the post type supports comments,
+	 * or if comments or pings are open.
+	 */
 	if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
 		add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
 	}
@@ -1573,8 +1687,10 @@ function register_and_do_post_meta_boxes( $post ) {
 	$stati[] = 'private';
 
 	if ( in_array( get_post_status( $post ), $stati, true ) ) {
-		// If the post type support comments, or the post has comments,
-		// allow the Comments meta box.
+		/*
+		 * If the post type support comments, or the post has comments,
+		 * allow the Comments meta box.
+		 */
 		if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
 			add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => true ) );
 		}
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 78c1aab1c8298..24cd26d661842 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -76,19 +76,19 @@ function extract_from_markers( $filename, $marker ) {
 	$state = false;
 
 	foreach ( $markerdata as $markerline ) {
-		if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
+		if ( str_contains( $markerline, '# END ' . $marker ) ) {
 			$state = false;
 		}
 
 		if ( $state ) {
-			if ( '#' === substr( $markerline, 0, 1 ) ) {
+			if ( str_starts_with( $markerline, '#' ) ) {
 				continue;
 			}
 
 			$result[] = $markerline;
 		}
 
-		if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
+		if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {
 			$state = true;
 		}
 	}
@@ -194,10 +194,10 @@ function insert_with_markers( $filename, $marker, $insertion ) {
 	$found_end_marker = false;
 
 	foreach ( $lines as $line ) {
-		if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+		if ( ! $found_marker && str_contains( $line, $start_marker ) ) {
 			$found_marker = true;
 			continue;
-		} elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+		} elseif ( ! $found_end_marker && str_contains( $line, $end_marker ) ) {
 			$found_end_marker = true;
 			continue;
 		}
@@ -414,7 +414,12 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
 				aria-level="<?php echo esc_attr( $level ); ?>"
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
 				aria-posinset="<?php echo esc_attr( $index ); ?>">
-				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text"><?php _e( 'folder' ); ?></span><span aria-hidden="true" class="icon"></span></span>
+				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'folder' );
+					?>
+				</span><span aria-hidden="true" class="icon"></span></span>
 				<ul role="group" class="tree-folder"><?php wp_print_theme_file_tree( $theme_file, $level + 1, $index, $size ); ?></ul>
 			</li>
 			<?php
@@ -511,7 +516,12 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
 				aria-level="<?php echo esc_attr( $level ); ?>"
 				aria-setsize="<?php echo esc_attr( $size ); ?>"
 				aria-posinset="<?php echo esc_attr( $index ); ?>">
-				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text"><?php _e( 'folder' ); ?></span><span aria-hidden="true" class="icon"></span></span>
+				<span class="folder-label"><?php echo esc_html( $label ); ?> <span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'folder' );
+					?>
+				</span><span aria-hidden="true" class="icon"></span></span>
 				<ul role="group" class="tree-folder"><?php wp_print_plugin_file_tree( $plugin_file, '', $level + 1, $index, $size ); ?></ul>
 			</li>
 			<?php
@@ -740,7 +750,7 @@ function set_screen_options() {
 		default:
 			$screen_option = false;
 
-			if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) {
+			if ( str_ends_with( $option, '_page' ) || 'layout_columns' === $option ) {
 				/**
 				 * Filters a screen option value before it is set.
 				 *
@@ -1012,7 +1022,12 @@ function admin_color_scheme_picker( $user_id ) {
 	}
 	?>
 	<fieldset id="color-picker" class="scheme-list">
-		<legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
+		<legend class="screen-reader-text"><span>
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Admin Color Scheme' );
+			?>
+		</span></legend>
 		<?php
 		wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
 		foreach ( $_wp_admin_css_colors as $color => $color_info ) :
@@ -1457,7 +1472,7 @@ function update_option_new_admin_email( $old_value, $value ) {
 	);
 	update_option( 'adminhash', $new_admin_email );
 
-	$switched_locale = switch_to_locale( get_user_locale() );
+	$switched_locale = switch_to_user_locale( get_current_user_id() );
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
@@ -1557,7 +1572,16 @@ function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) {
  * @since 5.1.0
  * @since 5.1.1 Added the {@see 'wp_is_php_version_acceptable'} filter.
  *
- * @return array|false Array of PHP version data. False on failure.
+ * @return array|false {
+ *     Array of PHP version data. False on failure.
+ *
+ *     @type string $recommended_version The PHP version recommended by WordPress.
+ *     @type string $minimum_version     The minimum required PHP version.
+ *     @type bool   $is_supported        Whether the PHP version is actively supported.
+ *     @type bool   $is_secure           Whether the PHP version receives security updates.
+ *     @type bool   $is_acceptable       Whether the PHP version is still acceptable or warnings
+ *                                       should be shown and an update recommended.
+ * }
  */
 function wp_check_php_version() {
 	$version = PHP_VERSION;
@@ -1580,14 +1604,6 @@ function wp_check_php_version() {
 			return false;
 		}
 
-		/**
-		 * Response should be an array with:
-		 *  'recommended_version' - string - The PHP version recommended by WordPress.
-		 *  'is_supported' - boolean - Whether the PHP version is actively supported.
-		 *  'is_secure' - boolean - Whether the PHP version receives security updates.
-		 *  'is_acceptable' - boolean - Whether the PHP version is still acceptable or warnings
-		 *                              should be shown and an update recommended.
-		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
 		if ( ! is_array( $response ) ) {
@@ -1626,3 +1642,131 @@ function wp_check_php_version() {
 
 	return $response;
 }
+
+/**
+ * Creates and returns the markup for an admin notice.
+ *
+ * @since 6.4.0
+ *
+ * @param string $message The message.
+ * @param array  $args {
+ *     Optional. An array of arguments for the admin notice. Default empty array.
+ *
+ *     @type string   $type               Optional. The type of admin notice.
+ *                                        For example, 'error', 'success', 'warning', 'info'.
+ *                                        Default empty string.
+ *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+ *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+ *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+ *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+ * }
+ * @return string The markup for an admin notice.
+ */
+function wp_get_admin_notice( $message, $args = array() ) {
+	$defaults = array(
+		'type'               => '',
+		'dismissible'        => false,
+		'id'                 => '',
+		'additional_classes' => array(),
+		'paragraph_wrap'     => true,
+	);
+
+	$args = wp_parse_args( $args, $defaults );
+
+	/**
+	 * Filters the arguments for an admin notice.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param array  $args    The arguments for the admin notice.
+	 * @param string $message The message for the admin notice.
+	 */
+	$args    = apply_filters( 'wp_admin_notice_args', $args, $message );
+	$id      = '';
+	$classes = 'notice';
+
+	if ( is_string( $args['id'] ) ) {
+		$trimmed_id = trim( $args['id'] );
+
+		if ( '' !== $trimmed_id ) {
+			$id = 'id="' . $trimmed_id . '" ';
+		}
+	}
+
+	if ( is_string( $args['type'] ) ) {
+		$type = trim( $args['type'] );
+
+		if ( str_contains( $type, ' ' ) ) {
+			_doing_it_wrong(
+				__FUNCTION__,
+				sprintf(
+					/* translators: %s: The "type" key. */
+					__( 'The %s key must be a string without spaces.' ),
+					'<code>type</code>'
+				),
+				'6.4.0'
+			);
+		}
+
+		if ( '' !== $type ) {
+			$classes .= ' notice-' . $type;
+		}
+	}
+
+	if ( true === $args['dismissible'] ) {
+		$classes .= ' is-dismissible';
+	}
+
+	if ( is_array( $args['additional_classes'] ) && ! empty( $args['additional_classes'] ) ) {
+		$classes .= ' ' . implode( ' ', $args['additional_classes'] );
+	}
+
+	if ( false !== $args['paragraph_wrap'] ) {
+		$message = "<p>$message</p>";
+	}
+
+	$markup = sprintf( '<div %1$sclass="%2$s">%3$s</div>', $id, $classes, $message );
+
+	/**
+	 * Filters the markup for an admin notice.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $markup  The HTML markup for the admin notice.
+	 * @param string $message The message for the admin notice.
+	 * @param array  $args    The arguments for the admin notice.
+	 */
+	return apply_filters( 'wp_admin_notice_markup', $markup, $message, $args );
+}
+
+/**
+ * Outputs an admin notice.
+ *
+ * @since 6.4.0
+ *
+ * @param string $message The message to output.
+ * @param array  $args {
+ *     Optional. An array of arguments for the admin notice. Default empty array.
+ *
+ *     @type string   $type               Optional. The type of admin notice.
+ *                                        For example, 'error', 'success', 'warning', 'info'.
+ *                                        Default empty string.
+ *     @type bool     $dismissible        Optional. Whether the admin notice is dismissible. Default false.
+ *     @type string   $id                 Optional. The value of the admin notice's ID attribute. Default empty string.
+ *     @type string[] $additional_classes Optional. A string array of class names. Default empty array.
+ *     @type bool     $paragraph_wrap     Optional. Whether to wrap the message in paragraph tags. Default true.
+ * }
+ */
+function wp_admin_notice( $message, $args = array() ) {
+	/**
+	 * Fires before an admin notice is output.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $message The message for the admin notice.
+	 * @param array  $args    The arguments for the admin notice.
+	 */
+	do_action( 'wp_admin_notice', $message, $args );
+
+	echo wp_kses_post( wp_get_admin_notice( $message, $args ) );
+}
diff --git a/src/wp-admin/includes/ms.php b/src/wp-admin/includes/ms.php
index 741d02e9c9b86..c769375b4b017 100644
--- a/src/wp-admin/includes/ms.php
+++ b/src/wp-admin/includes/ms.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Determine if uploaded file exceeds space quota.
+ * Determines whether uploaded file exceeds space quota.
  *
  * @since 3.0.0
  *
@@ -53,7 +53,7 @@ function check_upload_size( $file ) {
 }
 
 /**
- * Delete a site.
+ * Deletes a site.
  *
  * @since 3.0.0
  * @since 5.1.0 Use wp_delete_site() internally to delete the site row from the database.
@@ -130,16 +130,21 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 }
 
 /**
- * Delete a user from the network and remove from all sites.
+ * Deletes a user and all of their posts from the network.
  *
- * @since 3.0.0
+ * This function:
+ *
+ * - Deletes all posts (of all post types) authored by the user on all sites on the network
+ * - Deletes all links owned by the user on all sites on the network
+ * - Removes the user from all sites on the network
+ * - Deletes the user from the database
  *
- * @todo Merge with wp_delete_user()?
+ * @since 3.0.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $id The user ID.
- * @return bool True if the user was deleted, otherwise false.
+ * @return bool True if the user was deleted, false otherwise.
  */
 function wpmu_delete_user( $id ) {
 	global $wpdb;
@@ -213,7 +218,7 @@ function wpmu_delete_user( $id ) {
 }
 
 /**
- * Check whether a site has used its allotted upload space.
+ * Checks whether a site has used its allotted upload space.
  *
  * @since MU (3.0.0)
  *
@@ -269,12 +274,12 @@ function display_space_usage() {
 }
 
 /**
- * Get the remaining upload space for this site.
+ * Gets the remaining upload space for this site.
  *
  * @since MU (3.0.0)
  *
- * @param int $size Current max size in bytes
- * @return int Max size in bytes
+ * @param int $size Current max size in bytes.
+ * @return int Max size in bytes.
  */
 function fix_import_form_size( $size ) {
 	if ( upload_is_user_over_quota( false ) ) {
@@ -305,7 +310,12 @@ function upload_space_setting( $id ) {
 		<th><label for="blog-upload-space-number"><?php _e( 'Site Upload Space Quota' ); ?></label></th>
 		<td>
 			<input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog-upload-space-number" aria-describedby="blog-upload-space-desc" value="<?php echo $quota; ?>" />
-			<span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e( 'Size in megabytes' ); ?></span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
+			<span id="blog-upload-space-desc"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Size in megabytes' );
+				?>
+			</span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
 		</td>
 	</tr>
 	<?php
@@ -783,7 +793,7 @@ function choose_primary_blog() {
 				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
 			}
 		} else {
-			echo 'N/A';
+			_e( 'Not available' );
 		}
 		?>
 		</td>
@@ -793,7 +803,7 @@ function choose_primary_blog() {
 }
 
 /**
- * Whether or not we can edit this network from this page.
+ * Determines whether or not this network from this page can be edited.
  *
  * By default editing of network is restricted to the Network Admin for that `$network_id`.
  * This function allows for this to be overridden.
@@ -801,7 +811,7 @@ function choose_primary_blog() {
  * @since 3.1.0
  *
  * @param int $network_id The network ID to check.
- * @return bool True if network can be edited, otherwise false.
+ * @return bool True if network can be edited, false otherwise.
  */
 function can_edit_network( $network_id ) {
 	if ( get_current_network_id() === (int) $network_id ) {
@@ -822,7 +832,7 @@ function can_edit_network( $network_id ) {
 }
 
 /**
- * Thickbox image paths for Network Admin.
+ * Prints thickbox image paths for Network Admin.
  *
  * @since 3.1.0
  *
@@ -838,6 +848,7 @@ function _thickbox_path_admin_subfolder() {
 
 /**
  * @param array $users
+ * @return bool
  */
 function confirm_delete_users( $users ) {
 	$current_user = wp_get_current_user();
@@ -915,8 +926,11 @@ function confirm_delete_users( $users ) {
 					);
 
 					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
-						$user_site      = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown  = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+						$user_site     = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
+						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' .
+								/* translators: Hidden accessibility text. */
+								__( 'Select a user' ) .
+							'</label>';
 						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
 						$user_list      = '';
 
@@ -981,7 +995,7 @@ function confirm_delete_users( $users ) {
 }
 
 /**
- * Print JavaScript in the header on the Network Settings screen.
+ * Prints JavaScript in the header on the Network Settings screen.
  *
  * @since 4.1.0
  */
@@ -991,8 +1005,10 @@ function network_settings_add_js() {
 jQuery( function($) {
 	var languageSelect = $( '#WPLANG' );
 	$( 'form' ).on( 'submit', function() {
-		// Don't show a spinner for English and installed languages,
-		// as there is nothing to download.
+		/*
+		 * Don't show a spinner for English and installed languages,
+		 * as there is nothing to download.
+		 */
 		if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
 			$( '#submit', this ).after( '<span class="spinner language-install-spinner is-active" />' );
 		}
@@ -1146,6 +1162,6 @@ function get_site_screen_help_tab_args() {
  */
 function get_site_screen_help_sidebar_content() {
 	return '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>';
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>';
 }
diff --git a/src/wp-admin/includes/nav-menu.php b/src/wp-admin/includes/nav-menu.php
index ad8b04cff6017..1ace5cdd43618 100644
--- a/src/wp-admin/includes/nav-menu.php
+++ b/src/wp-admin/includes/nav-menu.php
@@ -32,15 +32,20 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 	}
 
 	if ( 'markup' === $response_format ) {
-		$args['walker'] = new Walker_Nav_Menu_Checklist;
+		$args['walker'] = new Walker_Nav_Menu_Checklist();
 	}
 
 	if ( 'get-post-item' === $type ) {
 		if ( post_type_exists( $object_type ) ) {
 			if ( isset( $request['ID'] ) ) {
 				$object_id = (int) $request['ID'];
+
 				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree(
+						array_map( 'wp_setup_nav_menu_item', array( get_post( $object_id ) ) ),
+						0,
+						(object) $args
+					);
 				} elseif ( 'json' === $response_format ) {
 					echo wp_json_encode(
 						array(
@@ -55,8 +60,13 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 		} elseif ( taxonomy_exists( $object_type ) ) {
 			if ( isset( $request['ID'] ) ) {
 				$object_id = (int) $request['ID'];
+
 				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree(
+						array_map( 'wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ),
+						0,
+						(object) $args
+					);
 				} elseif ( 'json' === $response_format ) {
 					$post_obj = get_term( $object_id, $object_type );
 					echo wp_json_encode(
@@ -84,18 +94,26 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 					's'                      => $query,
 				)
 			);
+
 			if ( isset( $post_type_obj->_default_query ) ) {
 				$args = array_merge( $args, (array) $post_type_obj->_default_query );
 			}
+
 			$search_results_query = new WP_Query( $args );
 			if ( ! $search_results_query->have_posts() ) {
 				return;
 			}
+
 			while ( $search_results_query->have_posts() ) {
 				$post = $search_results_query->next_post();
+
 				if ( 'markup' === $response_format ) {
 					$var_by_ref = $post->ID;
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree(
+						array_map( 'wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ),
+						0,
+						(object) $args
+					);
 				} elseif ( 'json' === $response_format ) {
 					echo wp_json_encode(
 						array(
@@ -116,12 +134,18 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 					'hide_empty' => false,
 				)
 			);
+
 			if ( empty( $terms ) || is_wp_error( $terms ) ) {
 				return;
 			}
+
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
+					echo walk_nav_menu_tree(
+						array_map( 'wp_setup_nav_menu_item', array( $term ) ),
+						0,
+						(object) $args
+					);
 				} elseif ( 'json' === $response_format ) {
 					echo wp_json_encode(
 						array(
@@ -145,7 +169,14 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 function wp_nav_menu_setup() {
 	// Register meta boxes.
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box(
+		'add-custom-links',
+		__( 'Custom Links' ),
+		'wp_nav_menu_item_link_meta_box',
+		'nav-menus',
+		'side',
+		'default'
+	);
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns).
@@ -227,11 +258,20 @@ function wp_nav_menu_post_type_meta_boxes() {
 		 *                                      meta box for.
 		 */
 		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
+
 		if ( $post_type ) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
 			$priority = ( 'page' === $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			add_meta_box(
+				"add-post-type-{$id}",
+				$post_type->labels->name,
+				'wp_nav_menu_item_post_type_meta_box',
+				'nav-menus',
+				'side',
+				$priority,
+				$post_type
+			);
 		}
 	}
 }
@@ -251,9 +291,18 @@ function wp_nav_menu_taxonomy_meta_boxes() {
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
 		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
+
 		if ( $tax ) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box(
+				"add-{$id}",
+				$tax->labels->name,
+				'wp_nav_menu_item_taxonomy_meta_box',
+				'nav-menus',
+				'side',
+				'default',
+				$tax
+			);
 		}
 	}
 }
@@ -298,17 +347,26 @@ function wp_nav_menu_item_link_meta_box() {
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
 			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
-			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="code menu-item-textbox form-required" placeholder="https://" />
+			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]"
+				type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+				class="code menu-item-textbox form-required" placeholder="https://"
+			/>
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
 			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
-			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="regular-text menu-item-textbox" />
+			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]"
+				type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+				class="regular-text menu-item-textbox"
+			/>
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input id="submit-customlinkdiv" name="add-custom-menu-item"
+					type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>"
+				/>
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -374,8 +432,12 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 		$front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
 
 		$front_page_obj = null;
+
 		if ( ! empty( $front_page ) ) {
-			$front_page_obj                = get_post( $front_page );
+			$front_page_obj = get_post( $front_page );
+		}
+
+		if ( $front_page_obj ) {
 			$front_page_obj->front_or_home = true;
 
 			$important_pages[]   = $front_page_obj;
@@ -402,11 +464,14 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 		$posts_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
 
 		if ( ! empty( $posts_page ) ) {
-			$posts_page_obj             = get_post( $posts_page );
-			$posts_page_obj->posts_page = true;
+			$posts_page_obj = get_post( $posts_page );
+
+			if ( $posts_page_obj ) {
+				$front_page_obj->posts_page = true;
 
-			$important_pages[]   = $posts_page_obj;
-			$suppress_page_ids[] = $posts_page_obj->ID;
+				$important_pages[]   = $posts_page_obj;
+				$suppress_page_ids[] = $posts_page_obj->ID;
+			}
 		}
 
 		// Insert Privacy Policy Page.
@@ -414,6 +479,7 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 
 		if ( ! empty( $privacy_policy_page_id ) ) {
 			$privacy_policy_page = get_post( $privacy_policy_page_id );
+
 			if ( $privacy_policy_page instanceof WP_Post && 'publish' === $privacy_policy_page->post_status ) {
 				$privacy_policy_page->privacy_policy_page = true;
 
@@ -429,14 +495,14 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 	}
 
 	// @todo Transient caching of these results with proper invalidation on updating of a post of this type.
-	$get_posts = new WP_Query;
+	$get_posts = new WP_Query();
 	$posts     = $get_posts->query( $args );
 
 	// Only suppress and insert when more than just suppression pages available.
 	if ( ! $get_posts->post_count ) {
 		if ( ! empty( $suppress_page_ids ) ) {
 			unset( $args['post__not_in'] );
-			$get_posts = new WP_Query;
+			$get_posts = new WP_Query();
 			$posts     = $get_posts->query( $args );
 		} else {
 			echo '<p>' . __( 'No items.' ) . '</p>';
@@ -461,6 +527,7 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 			'format'             => '',
 			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
 			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+			/* translators: Hidden accessibility text. */
 			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
 			'total'              => $num_pages,
 			'current'            => $pagenum,
@@ -483,7 +550,7 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 		$current_tab = $_REQUEST[ $tab_name ];
 	}
 
-	if ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
+	if ( ! empty( $_REQUEST[ "quick-search-posttype-{$post_type_name}" ] ) ) {
 		$current_tab = 'search';
 	}
 
@@ -499,35 +566,50 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 	$most_recent_url = '';
 	$view_all_url    = '';
 	$search_url      = '';
+
 	if ( $nav_menu_selected_id ) {
-		$most_recent_url = esc_url( add_query_arg( $tab_name, 'most-recent', remove_query_arg( $removed_args ) ) );
-		$view_all_url    = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
-		$search_url      = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
+		$most_recent_url = add_query_arg( $tab_name, 'most-recent', remove_query_arg( $removed_args ) );
+		$view_all_url    = add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) );
+		$search_url      = add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) );
 	}
 	?>
-	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
-		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
+	<div id="<?php echo esc_attr( "posttype-{$post_type_name}" ); ?>" class="posttypediv">
+		<ul id="<?php echo esc_attr( "posttype-{$post_type_name}-tabs" ); ?>" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "tabs-panel-posttype-{$post_type_name}-most-recent" ); ?>"
+					href="<?php echo esc_url( $most_recent_url . "#tabs-panel-posttype-{$post_type_name}-most-recent" ); ?>"
+				>
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "{$post_type_name}-all" ); ?>"
+					href="<?php echo esc_url( $view_all_url . "#{$post_type_name}-all" ); ?>"
+				>
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "tabs-panel-posttype-{$post_type_name}-search" ); ?>"
+					href="<?php echo esc_url( $search_url . "#tabs-panel-posttype-{$post_type_name}-search" ); ?>"
+				>
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php _e( 'Most Recent' ); ?>" tabindex="0">
-			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
+		<div id="<?php echo esc_attr( "tabs-panel-posttype-{$post_type_name}-most-recent" ); ?>"
+			class="tabs-panel <?php echo ( 'most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php esc_attr_e( 'Most Recent' ); ?>" tabindex="0"
+		>
+			<ul id="<?php echo esc_attr( "{$post_type_name}checklist-most-recent" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 				<?php
-				$recent_args    = array_merge(
+				$recent_args = array_merge(
 					$args,
 					array(
 						'orderby'        => 'post_date',
@@ -535,7 +617,8 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 						'posts_per_page' => 15,
 					)
 				);
-				$most_recent    = $get_posts->query( $recent_args );
+				$most_recent = $get_posts->query( $recent_args );
+
 				$args['walker'] = $walker;
 
 				/**
@@ -557,17 +640,30 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 				 * @param array     $box         Arguments passed to `wp_nav_menu_item_post_type_meta_box()`.
 				 * @param array     $recent_args An array of `WP_Query` arguments for 'Most Recent' tab.
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box, $recent_args );
+				$most_recent = apply_filters(
+					"nav_menu_items_{$post_type_name}_recent",
+					$most_recent,
+					$args,
+					$box,
+					$recent_args
+				);
 
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $most_recent ), 0, (object) $args );
+				echo walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $most_recent ),
+					0,
+					(object) $args
+				);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
+		<div id="<?php echo esc_attr( "tabs-panel-posttype-{$post_type_name}-search" ); ?>"
+			class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php echo esc_attr( $post_type->labels->search_items ); ?>" tabindex="0"
+		>
 			<?php
-			if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
-				$searched       = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
+			if ( isset( $_REQUEST[ "quick-search-posttype-{$post_type_name}" ] ) ) {
+				$searched       = esc_attr( $_REQUEST[ "quick-search-posttype-{$post_type_name}" ] );
 				$search_results = get_posts(
 					array(
 						's'         => $searched,
@@ -582,17 +678,41 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
-				<input type="search"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
+				<label for="<?php echo esc_attr( "quick-search-posttype-{$post_type_name}" ); ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search' );
+					?>
+				</label>
+				<input type="search"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					class="quick-search" value="<?php echo $searched; ?>"
+					name="<?php echo esc_attr( "quick-search-posttype-{$post_type_name}" ); ?>"
+					id="<?php echo esc_attr( "quick-search-posttype-{$post_type_name}" ); ?>"
+				/>
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php
+				submit_button(
+					__( 'Search' ),
+					'small quick-search-submit hide-if-js',
+					'submit',
+					false,
+					array( 'id' => "submit-quick-search-posttype-{$post_type_name}" )
+				);
+				?>
 			</p>
 
-			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo esc_attr( "{$post_type_name}-search-checklist" ); ?>"
+				data-wp-lists="<?php echo esc_attr( "list:{$post_type_name}" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+				echo walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $search_results ),
+					0,
+					(object) $args
+				);
 				?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
@@ -602,13 +722,20 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
+		<div id="<?php echo esc_attr( "{$post_type_name}-all" ); ?>"
+			class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php echo esc_attr( $post_type->labels->all_items ); ?>" tabindex="0"
+		>
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
-			<ul id="<?php echo $post_type_name; ?>checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
+
+			<ul id="<?php echo esc_attr( "{$post_type_name}checklist" ); ?>"
+				data-wp-lists="<?php echo esc_attr( "list:{$post_type_name}" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 				<?php
 				$args['walker'] = $walker;
 
@@ -652,13 +779,23 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 				 * @param array        $args      An array of `WP_Query` arguments.
 				 * @param WP_Post_Type $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
+				$posts = apply_filters(
+					"nav_menu_items_{$post_type_name}",
+					$posts,
+					$args,
+					$post_type
+				);
 
-				$checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
+				$checkbox_items = walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $posts ),
+					0,
+					(object) $args
+				);
 
 				echo $checkbox_items;
 				?>
 			</ul>
+
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
@@ -666,14 +803,19 @@ function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr( $post_type_name ); ?>">
+		<p class="button-controls wp-clearfix" data-items-type="<?php echo esc_attr( "posttype-{$post_type_name}" ); ?>">
 			<span class="list-controls hide-if-no-js">
-				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					id="<?php echo esc_attr( $tab_name ); ?>" class="select-all"
+				/>
 				<label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>"
+					name="add-post-type-menu-item" id="<?php echo esc_attr( "submit-posttype-{$post_type_name}" ); ?>"
+				/>
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -757,6 +899,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 			'format'             => '',
 			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
 			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+			/* translators: Hidden accessibility text. */
 			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
 			'total'              => $num_pages,
 			'current'            => $pagenum,
@@ -779,7 +922,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 		$current_tab = $_REQUEST[ $tab_name ];
 	}
 
-	if ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
+	if ( ! empty( $_REQUEST[ "quick-search-taxonomy-{$taxonomy_name}" ] ) ) {
 		$current_tab = 'search';
 	}
 
@@ -795,35 +938,50 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 	$most_used_url = '';
 	$view_all_url  = '';
 	$search_url    = '';
+
 	if ( $nav_menu_selected_id ) {
-		$most_used_url = esc_url( add_query_arg( $tab_name, 'most-used', remove_query_arg( $removed_args ) ) );
-		$view_all_url  = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
-		$search_url    = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
+		$most_used_url = add_query_arg( $tab_name, 'most-used', remove_query_arg( $removed_args ) );
+		$view_all_url  = add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) );
+		$search_url    = add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) );
 	}
 	?>
-	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
-		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
+	<div id="<?php echo esc_attr( "taxonomy-{$taxonomy_name}" ); ?>" class="taxonomydiv">
+		<ul id="<?php echo esc_attr( "taxonomy-{$taxonomy_name}-tabs" ); ?>" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "tabs-panel-{$taxonomy_name}-pop" ); ?>"
+					href="<?php echo esc_url( $most_used_url . "#tabs-panel-{$taxonomy_name}-pop" ); ?>"
+				>
 					<?php echo esc_html( $taxonomy->labels->most_used ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "tabs-panel-{$taxonomy_name}-all" ); ?>"
+					href="<?php echo esc_url( $view_all_url . "#tabs-panel-{$taxonomy_name}-all" ); ?>"
+				>
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link"
+					data-type="<?php echo esc_attr( "tabs-panel-search-taxonomy-{$taxonomy_name}" ); ?>"
+					href="<?php echo esc_url( $search_url . "#tabs-panel-search-taxonomy-{$taxonomy_name}" ); ?>"
+				>
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
-			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
+		<div id="<?php echo esc_attr( "tabs-panel-{$taxonomy_name}-pop" ); ?>"
+			class="tabs-panel <?php echo ( 'most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php echo esc_attr( $taxonomy->labels->most_used ); ?>" tabindex="0"
+		>
+			<ul id="<?php echo esc_attr( "{$taxonomy_name}checklist-pop" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 				<?php
-				$popular_terms  = get_terms(
+				$popular_terms = get_terms(
 					array(
 						'taxonomy'     => $taxonomy_name,
 						'orderby'      => 'count',
@@ -832,24 +990,41 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 						'hierarchical' => false,
 					)
 				);
+
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args );
+				echo walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $popular_terms ),
+					0,
+					(object) $args
+				);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
+		<div id="<?php echo esc_attr( "tabs-panel-{$taxonomy_name}-all" ); ?>"
+			class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php echo esc_attr( $taxonomy->labels->all_items ); ?>" tabindex="0"
+		>
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
-			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
+
+			<ul id="<?php echo esc_attr( "{$taxonomy_name}checklist" ); ?>"
+				data-wp-lists="<?php echo esc_attr( "list:{$taxonomy_name}" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $terms ), 0, (object) $args );
+				echo walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $terms ),
+					0,
+					(object) $args
+				);
 				?>
 			</ul>
+
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
@@ -857,10 +1032,12 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
+		<div id="<?php echo esc_attr( "tabs-panel-search-taxonomy-{$taxonomy_name}" ); ?>"
+			class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>"
+			role="region" aria-label="<?php echo esc_attr( $taxonomy->labels->search_items ); ?>" tabindex="0">
 			<?php
-			if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
-				$searched       = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
+			if ( isset( $_REQUEST[ "quick-search-taxonomy-{$taxonomy_name}" ] ) ) {
+				$searched       = esc_attr( $_REQUEST[ "quick-search-taxonomy-{$taxonomy_name}" ] );
 				$search_results = get_terms(
 					array(
 						'taxonomy'     => $taxonomy_name,
@@ -877,17 +1054,41 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
-				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
+				<label for="<?php echo esc_attr( "quick-search-taxonomy-{$taxonomy_name}" ); ?>" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search' );
+					?>
+				</label>
+				<input type="search"
+					class="quick-search" value="<?php echo $searched; ?>"
+					name="<?php echo esc_attr( "quick-search-taxonomy-{$taxonomy_name}" ); ?>"
+					id="<?php echo esc_attr( "quick-search-taxonomy-{$taxonomy_name}" ); ?>"
+				/>
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php
+				submit_button(
+					__( 'Search' ),
+					'small quick-search-submit hide-if-js',
+					'submit',
+					false,
+					array( 'id' => "submit-quick-search-taxonomy-{$taxonomy_name}" )
+				);
+				?>
 			</p>
 
-			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo esc_attr( "{$taxonomy_name}-search-checklist" ); ?>"
+				data-wp-lists="<?php echo esc_attr( "list:{$taxonomy_name}" ); ?>"
+				class="categorychecklist form-no-clear"
+			>
 			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+				echo walk_nav_menu_tree(
+					array_map( 'wp_setup_nav_menu_item', $search_results ),
+					0,
+					(object) $args
+				);
 				?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
@@ -897,14 +1098,19 @@ function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>">
+		<p class="button-controls wp-clearfix" data-items-type="<?php echo esc_attr( "taxonomy-{$taxonomy_name}" ); ?>">
 			<span class="list-controls hide-if-no-js">
-				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					id="<?php echo esc_attr( $tab_name ); ?>" class="select-all"
+				/>
 				<label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?>
+					class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>"
+					name="add-taxonomy-menu-item" id="<?php echo esc_attr( "submit-taxonomy-{$taxonomy_name}" ); ?>"
+				/>
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -926,7 +1132,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
 	$menu_id     = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if ( 0 === $menu_id || is_nav_menu( $menu_id ) ) {
 
 		// Loop through all the menu items' POST values.
 		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
@@ -952,7 +1158,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
 			if (
 				empty( $_item_object_data['menu-item-db-id'] ) ||
 				( 0 > $_possible_db_id ) ||
-				$_possible_db_id != $_item_object_data['menu-item-db-id']
+				$_possible_db_id !== (int) $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
 			} else {
@@ -979,6 +1185,7 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
 
 		}
 	}
+
 	return $items_saved;
 }
 
@@ -1059,7 +1266,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
 
 		if ( class_exists( $walker_class_name ) ) {
-			$walker = new $walker_class_name;
+			$walker = new $walker_class_name();
 		} else {
 			return new WP_Error(
 				'menu_walker_not_exist',
@@ -1073,6 +1280,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 
 		$some_pending_menu_items = false;
 		$some_invalid_menu_items = false;
+
 		foreach ( (array) $menu_items as $menu_item ) {
 			if ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
 				$some_pending_menu_items = true;
@@ -1083,16 +1291,25 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 		}
 
 		if ( $some_pending_menu_items ) {
-			$result .= '<div class="notice notice-info notice-alt inline"><p>' . __( 'Click Save Menu to make pending menu items public.' ) . '</p></div>';
+			$result .= '<div class="notice notice-info notice-alt inline"><p>'
+				. __( 'Click Save Menu to make pending menu items public.' )
+				. '</p></div>';
 		}
 
 		if ( $some_invalid_menu_items ) {
-			$result .= '<div class="notice notice-error notice-alt inline"><p>' . __( 'There are some invalid menu items. Please check or delete them.' ) . '</p></div>';
+			$result .= '<div class="notice notice-error notice-alt inline"><p>'
+				. __( 'There are some invalid menu items. Please check or delete them.' )
+				. '</p></div>';
 		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items ), 0, (object) array( 'walker' => $walker ) );
+		$result .= walk_nav_menu_tree(
+			array_map( 'wp_setup_nav_menu_item', $menu_items ),
+			0,
+			(object) array( 'walker' => $walker )
+		);
 		$result .= ' </ul> ';
+
 		return $result;
 	} elseif ( is_wp_error( $menu ) ) {
 		return $menu;
@@ -1129,10 +1346,19 @@ function wp_nav_menu_manage_columns() {
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
+
 	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col(
+		$wpdb->prepare(
+			"SELECT ID FROM $wpdb->posts AS p
+			LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id
+			WHERE post_type = 'nav_menu_item' AND post_status = 'draft'
+			AND meta_key = '_menu_item_orphaned' AND meta_value < %d",
+			$delete_timestamp
+		)
+	);
 
 	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
 		wp_delete_post( $menu_item_id, true );
@@ -1140,13 +1366,13 @@ function _wp_delete_orphaned_draft_menu_items() {
 }
 
 /**
- * Saves nav menu items
+ * Saves nav menu items.
  *
  * @since 3.6.0
  *
  * @param int|string $nav_menu_selected_id    ID, slug, or name of the currently-selected menu.
  * @param string     $nav_menu_selected_title Title of the currently-selected menu.
- * @return array The menu updated message
+ * @return string[] The menu updated messages.
  */
 function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) {
 	$unsorted_menu_items = wp_get_nav_menu_items(
@@ -1199,7 +1425,11 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte
 				$args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : '';
 			}
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][ $_key ] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item(
+				$nav_menu_selected_id,
+				( (int) $_POST['menu-item-db-id'][ $_key ] !== $_key ? 0 : $_key ),
+				$args
+			);
 
 			if ( is_wp_error( $menu_item_db_id ) ) {
 				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
@@ -1238,7 +1468,11 @@ function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selecte
 	}
 
 	// Remove non-existent/deleted menus.
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
+	$nav_menu_option['auto_add'] = array_intersect(
+		$nav_menu_option['auto_add'],
+		wp_get_nav_menus( array( 'fields' => 'ids' ) )
+	);
+
 	update_option( 'nav_menu_options', $nav_menu_option );
 
 	wp_defer_term_counting( false );
@@ -1275,8 +1509,10 @@ function _wp_expand_nav_menu_post_data() {
 
 	if ( ! is_null( $data ) && $data ) {
 		foreach ( $data as $post_input_data ) {
-			// For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
-			// derive the array path keys via regex and set the value in $_POST.
+			/*
+			 * For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
+			 * derive the array path keys via regex and set the value in $_POST.
+			 */
 			preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
 
 			$array_bits = array( $matches[1] );
@@ -1289,7 +1525,7 @@ function _wp_expand_nav_menu_post_data() {
 
 			// Build the new array value from leaf to trunk.
 			for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
-				if ( count( $array_bits ) - 1 == $i ) {
+				if ( count( $array_bits ) - 1 === $i ) {
 					$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
 				} else {
 					$new_post_data = array( $array_bits[ $i ] => $new_post_data );
diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php
index aef0b2e4b6801..07969ff2229ed 100644
--- a/src/wp-admin/includes/network.php
+++ b/src/wp-admin/includes/network.php
@@ -125,11 +125,14 @@ function network_step1( $errors = false ) {
 
 	$active_plugins = get_option( 'active_plugins' );
 	if ( ! empty( $active_plugins ) ) {
-		echo '<div class="notice notice-warning"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
-			/* translators: %s: URL to Plugins screen. */
-			__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
-			admin_url( 'plugins.php?plugin_status=active' )
-		) . '</p></div>';
+		wp_admin_notice(
+			'<strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
+				/* translators: %s: URL to Plugins screen. */
+				__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
+				admin_url( 'plugins.php?plugin_status=active' )
+			),
+			array( 'type' => 'warning' )
+		);
 		echo '<p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
 		echo '</div>';
 		require_once ABSPATH . 'wp-admin/admin-footer.php';
@@ -263,7 +266,7 @@ function network_step1( $errors = false ) {
 		echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
 	}
 
-	$is_www = ( 0 === strpos( $hostname, 'www.' ) );
+	$is_www = str_starts_with( $hostname, 'www.' );
 	if ( $is_www ) :
 		?>
 		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
@@ -394,7 +397,7 @@ function network_step2( $errors = false ) {
 	$base              = parse_url( $slashed_home, PHP_URL_PATH );
 	$document_root_fix = str_replace( '\\', '/', realpath( $_SERVER['DOCUMENT_ROOT'] ) );
 	$abspath_fix       = str_replace( '\\', '/', ABSPATH );
-	$home_path         = 0 === strpos( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
+	$home_path         = str_starts_with( $abspath_fix, $document_root_fix ) ? $document_root_fix . $base : get_home_path();
 	$wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
 	$rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
 
@@ -438,35 +441,36 @@ function network_step2( $errors = false ) {
 		?>
 		<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
 		<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
-		<div class="notice notice-warning inline"><p>
 		<?php
+		$notice_message = '<strong>' . __( 'Caution:' ) . '</strong> ';
+		$notice_args    = array(
+			'type'               => 'warning',
+			'additional_classes' => array( 'inline' ),
+		);
+
 		if ( file_exists( $home_path . '.htaccess' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
+			$notice_message .= sprintf(
 				/* translators: 1: wp-config.php, 2: .htaccess */
 				__( 'You should back up your existing %1$s and %2$s files.' ),
 				'<code>wp-config.php</code>',
 				'<code>.htaccess</code>'
 			);
 		} elseif ( file_exists( $home_path . 'web.config' ) ) {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
+			$notice_message .= sprintf(
 				/* translators: 1: wp-config.php, 2: web.config */
 				__( 'You should back up your existing %1$s and %2$s files.' ),
 				'<code>wp-config.php</code>',
 				'<code>web.config</code>'
 			);
 		} else {
-			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-			printf(
+			$notice_message .= sprintf(
 				/* translators: %s: wp-config.php */
 				__( 'You should back up your existing %s file.' ),
 				'<code>wp-config.php</code>'
 			);
 		}
-		?>
-		</p></div>
-		<?php
+
+		wp_admin_notice( $notice_message, $notice_args );
 	}
 	?>
 	<ol>
@@ -645,7 +649,7 @@ function network_step2( $errors = false ) {
 		printf(
 			/* translators: %s: Documentation URL. */
 			__( 'It seems your network is running with Nginx web server. <a href="%s">Learn more about further configuration</a>.' ),
-			__( 'https://wordpress.org/support/article/nginx/' )
+			__( 'https://wordpress.org/documentation/article/nginx/' )
 		);
 		echo '</p></li>';
 
diff --git a/src/wp-admin/includes/noop.php b/src/wp-admin/includes/noop.php
index ba611fc9e13e5..b29f6044d8bdc 100644
--- a/src/wp-admin/includes/noop.php
+++ b/src/wp-admin/includes/noop.php
@@ -66,7 +66,8 @@ function get_bloginfo() {}
  * @ignore
  */
 function is_admin() {
-	return true;}
+	return true;
+}
 
 /**
  * @ignore
diff --git a/src/wp-admin/includes/options.php b/src/wp-admin/includes/options.php
index 68e9138a2fc04..816313ce83379 100644
--- a/src/wp-admin/includes/options.php
+++ b/src/wp-admin/includes/options.php
@@ -90,8 +90,10 @@ function options_general_add_js() {
 
 		var languageSelect = $( '#WPLANG' );
 		$( 'form' ).on( 'submit', function() {
-			// Don't show a spinner for English and installed languages,
-			// as there is nothing to download.
+			/*
+			 * Don't show a spinner for English and installed languages,
+			 * as there is nothing to download.
+			 */
 			if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
 				$( '#submit', this ).after( '<span class="spinner language-install-spinner is-active" />' );
 			}
@@ -130,5 +132,5 @@ function options_reading_add_js() {
  */
 function options_reading_blog_charset() {
 	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
-	echo '<p class="description">' . __( 'The <a href="https://wordpress.org/support/article/glossary/#character-set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+	echo '<p class="description">' . __( 'The <a href="https://wordpress.org/documentation/article/wordpress-glossary/#character-set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
 }
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
index 61bc77fb7e442..8bb1b61072d0b 100644
--- a/src/wp-admin/includes/plugin-install.php
+++ b/src/wp-admin/includes/plugin-install.php
@@ -316,17 +316,27 @@ function install_dashboard() {
  */
 function install_search_form( $deprecated = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+	$term = isset( $_REQUEST['s'] ) ? urldecode( wp_unslash( $_REQUEST['s'] ) ) : '';
 	?>
 	<form class="search-form search-plugins" method="get">
 		<input type="hidden" name="tab" value="search" />
-		<label class="screen-reader-text" for="typeselector"><?php _e( 'Search plugins by:' ); ?></label>
+		<label class="screen-reader-text" for="typeselector">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Search plugins by:' );
+			?>
+		</label>
 		<select name="type" id="typeselector">
 			<option value="term"<?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
 			<option value="author"<?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
 			<option value="tag"<?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Plugin Installer' ); ?></option>
 		</select>
-		<label class="screen-reader-text" for="search-plugins"><?php _e( 'Search Plugins' ); ?></label>
+		<label class="screen-reader-text" for="search-plugins">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Search Plugins' );
+			?>
+		</label>
 		<input type="search" name="s" id="search-plugins" value="<?php echo esc_attr( $term ); ?>" class="wp-filter-search" placeholder="<?php esc_attr_e( 'Search plugins...' ); ?>" />
 		<?php submit_button( __( 'Search Plugins' ), 'hide-if-js', false, false, array( 'id' => 'search-submit' ) ); ?>
 	</form>
@@ -344,7 +354,12 @@ function install_plugins_upload() {
 	<p class="install-help"><?php _e( 'If you have a plugin in a .zip format, you may install or update it by uploading it here.' ); ?></p>
 	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url( self_admin_url( 'update.php?action=upload-plugin' ) ); ?>">
 		<?php wp_nonce_field( 'plugin-upload' ); ?>
-		<label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
+		<label class="screen-reader-text" for="pluginzip">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Plugin zip file' );
+			?>
+		</label>
 		<input type="file" id="pluginzip" name="pluginzip" accept=".zip" />
 		<?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
 	</form>
@@ -395,7 +410,7 @@ function display_plugins_table() {
 		case 'install_plugins_featured':
 			printf(
 				/* translators: %s: https://wordpress.org/plugins/ */
-				'<p>' . __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ) . '</p>',
+				'<p>' . __( 'Plugins extend and expand the functionality of WordPress. You may install plugins in the <a href="%s">WordPress Plugin Directory</a> right from here, or upload a plugin in .zip format by clicking the button at the top of this page.' ) . '</p>',
 				__( 'https://wordpress.org/plugins/' )
 			);
 			break;
@@ -471,8 +486,10 @@ function install_plugin_install_status( $api, $loop = false ) {
 				}
 			} else {
 				$key = array_keys( $installed_plugin );
-				// Use the first plugin regardless of the name.
-				// Could have issues for multiple plugins in one directory if they share different version numbers.
+				/*
+				 * Use the first plugin regardless of the name.
+				 * Could have issues for multiple plugins in one directory if they share different version numbers.
+				 */
 				$key = reset( $key );
 
 				$update_file = $api->slug . '/' . $key;
diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
index 3084312da5b4e..d5e62ed06ff37 100644
--- a/src/wp-admin/includes/plugin.php
+++ b/src/wp-admin/includes/plugin.php
@@ -102,7 +102,7 @@ function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
 	// If no text domain is defined fall back to the plugin slug.
 	if ( ! $plugin_data['TextDomain'] ) {
 		$plugin_slug = dirname( plugin_basename( $plugin_file ) );
-		if ( '.' !== $plugin_slug && false === strpos( $plugin_slug, '/' ) ) {
+		if ( '.' !== $plugin_slug && ! str_contains( $plugin_slug, '/' ) ) {
 			$plugin_data['TextDomain'] = $plugin_slug;
 		}
 	}
@@ -178,8 +178,10 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup
 		'title' => true,
 	);
 
-	// Name is marked up inside <a> tags. Don't allow these.
-	// Author is too, but some plugins have used <a> here (omitting Author URI).
+	/*
+	 * Name is marked up inside <a> tags. Don't allow these.
+	 * Author is too, but some plugins have used <a> here (omitting Author URI).
+	 */
 	$plugin_data['Name']   = wp_kses( $plugin_data['Name'], $allowed_tags_in_links );
 	$plugin_data['Author'] = wp_kses( $plugin_data['Author'], $allowed_tags );
 
@@ -294,7 +296,7 @@ function get_plugins( $plugin_folder = '' ) {
 
 	if ( $plugins_dir ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( '.' === substr( $file, 0, 1 ) ) {
+			if ( str_starts_with( $file, '.' ) ) {
 				continue;
 			}
 
@@ -303,11 +305,11 @@ function get_plugins( $plugin_folder = '' ) {
 
 				if ( $plugins_subdir ) {
 					while ( ( $subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( '.' === substr( $subfile, 0, 1 ) ) {
+						if ( str_starts_with( $subfile, '.' ) ) {
 							continue;
 						}
 
-						if ( '.php' === substr( $subfile, -4 ) ) {
+						if ( str_ends_with( $subfile, '.php' ) ) {
 							$plugin_files[] = "$file/$subfile";
 						}
 					}
@@ -315,7 +317,7 @@ function get_plugins( $plugin_folder = '' ) {
 					closedir( $plugins_subdir );
 				}
 			} else {
-				if ( '.php' === substr( $file, -4 ) ) {
+				if ( str_ends_with( $file, '.php' ) ) {
 					$plugin_files[] = $file;
 				}
 			}
@@ -371,7 +373,7 @@ function get_mu_plugins() {
 	$plugins_dir = @opendir( WPMU_PLUGIN_DIR );
 	if ( $plugins_dir ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( '.php' === substr( $file, -4 ) ) {
+			if ( str_ends_with( $file, '.php' ) ) {
 				$plugin_files[] = $file;
 			}
 		}
@@ -852,7 +854,7 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
  * @param bool            $network_wide Whether to enable the plugin for all sites in the network.
  *                                      Default false.
  * @param bool            $silent       Prevent calling activation hooks. Default false.
- * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
+ * @return true|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
 function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
 	if ( ! is_array( $plugins ) ) {
@@ -969,8 +971,10 @@ function delete_plugins( $plugins, $deprecated = '' ) {
 
 		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
 
-		// If plugin is in its own directory, recursively delete the directory.
-		// Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+		/*
+		 * If plugin is in its own directory, recursively delete the directory.
+		 * Base check on if plugin includes directory separator AND that it's not the root plugin folder.
+		 */
 		if ( strpos( $plugin_file, '/' ) && $this_plugin_dir !== $plugins_dir ) {
 			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
 		} else {
@@ -1935,7 +1939,7 @@ function get_admin_page_parent( $parent_page = '' ) {
 				$parent_file = $parent_page;
 				return $parent_page;
 			} elseif ( empty( $typenow ) && $pagenow === $submenu_array[2]
-				&& ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) )
+				&& ( empty( $parent_file ) || ! str_contains( $parent_file, '?' ) )
 			) {
 				$parent_file = $parent_page;
 				return $parent_page;
@@ -2436,7 +2440,7 @@ function wp_get_plugin_error( $plugin ) {
  *
  * @param string $plugin   Single plugin to resume.
  * @param string $redirect Optional. URL to redirect to. Default empty string.
- * @return bool|WP_Error True on success, false if `$plugin` was not paused,
+ * @return true|WP_Error True on success, false if `$plugin` was not paused,
  *                       `WP_Error` on failure.
  */
 function resume_plugin( $plugin, $redirect = '' ) {
diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php
index 8db8861c42c08..ed73b8ff5fd14 100644
--- a/src/wp-admin/includes/post.php
+++ b/src/wp-admin/includes/post.php
@@ -135,8 +135,10 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 
 	$published_statuses = array( 'publish', 'future' );
 
-	// Posts 'submitted for approval' are submitted to $_POST the same as if they were being published.
-	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
+	/*
+	 * Posts 'submitted for approval' are submitted to $_POST the same as if they were being published.
+	 * Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
+	 */
 	if ( isset( $post_data['post_status'] )
 		&& ( in_array( $post_data['post_status'], $published_statuses, true )
 		&& ! current_user_can( $ptype->cap->publish_posts ) )
@@ -169,6 +171,10 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 		}
 	}
 
+	if ( isset( $post_data['edit_date'] ) && 'false' === $post_data['edit_date'] ) {
+		$post_data['edit_date'] = false;
+	}
+
 	if ( ! empty( $post_data['edit_date'] ) ) {
 		$aa = $post_data['aa'];
 		$mm = $post_data['mm'];
@@ -252,8 +258,8 @@ function edit_post( $post_data = null ) {
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
 
-	$post_ID = (int) $post_data['post_ID'];
-	$post    = get_post( $post_ID );
+	$post_id = (int) $post_data['post_ID'];
+	$post    = get_post( $post_id );
 
 	$post_data['post_type']      = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
@@ -267,7 +273,7 @@ function edit_post( $post_data = null ) {
 	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
-	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		if ( 'page' === $post_data['post_type'] ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
 		} else {
@@ -277,7 +283,7 @@ function edit_post( $post_data = null ) {
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
 		$revisions = wp_get_post_revisions(
-			$post_ID,
+			$post_id,
 			array(
 				'order'          => 'ASC',
 				'posts_per_page' => 1,
@@ -287,7 +293,7 @@ function edit_post( $post_data = null ) {
 
 		// Check if the revisions have been upgraded.
 		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_id ) );
 		}
 	}
 
@@ -315,14 +321,14 @@ function edit_post( $post_data = null ) {
 
 	// Post formats.
 	if ( isset( $post_data['post_format'] ) ) {
-		set_post_format( $post_ID, $post_data['post_format'] );
+		set_post_format( $post_id, $post_data['post_format'] );
 	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			update_post_meta( $post_ID, $keyed, wp_slash( sanitize_url( wp_unslash( $post_data[ $keyed ] ) ) ) );
+			update_post_meta( $post_id, $keyed, wp_slash( sanitize_url( wp_unslash( $post_data[ $keyed ] ) ) ) );
 		}
 	}
 
@@ -332,15 +338,15 @@ function edit_post( $post_data = null ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
 			if ( current_user_can( 'unfiltered_html' ) ) {
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+				update_post_meta( $post_id, $keyed, $post_data[ $keyed ] );
 			} else {
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+				update_post_meta( $post_id, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
 			}
 		}
 	}
 
 	if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
-		$id3data = wp_get_attachment_metadata( $post_ID );
+		$id3data = wp_get_attachment_metadata( $post_id );
 		if ( ! is_array( $id3data ) ) {
 			$id3data = array();
 		}
@@ -350,7 +356,7 @@ function edit_post( $post_data = null ) {
 				$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
 			}
 		}
-		wp_update_attachment_metadata( $post_ID, $id3data );
+		wp_update_attachment_metadata( $post_id, $id3data );
 	}
 
 	// Meta stuff.
@@ -360,15 +366,23 @@ function edit_post( $post_data = null ) {
 			if ( ! $meta ) {
 				continue;
 			}
-			if ( $meta->post_id != $post_ID ) {
+
+			if ( $meta->post_id != $post_id ) {
 				continue;
 			}
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) ) {
+
+			if ( is_protected_meta( $meta->meta_key, 'post' )
+				|| ! current_user_can( 'edit_post_meta', $post_id, $meta->meta_key )
+			) {
 				continue;
 			}
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+
+			if ( is_protected_meta( $value['key'], 'post' )
+				|| ! current_user_can( 'edit_post_meta', $post_id, $value['key'] )
+			) {
 				continue;
 			}
+
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
@@ -379,12 +393,17 @@ function edit_post( $post_data = null ) {
 			if ( ! $meta ) {
 				continue;
 			}
-			if ( $meta->post_id != $post_ID ) {
+
+			if ( $meta->post_id != $post_id ) {
 				continue;
 			}
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+
+			if ( is_protected_meta( $meta->meta_key, 'post' )
+				|| ! current_user_can( 'delete_post_meta', $post_id, $meta->meta_key )
+			) {
 				continue;
 			}
+
 			delete_meta( $key );
 		}
 	}
@@ -394,15 +413,15 @@ function edit_post( $post_data = null ) {
 		if ( isset( $post_data['_wp_attachment_image_alt'] ) ) {
 			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
 
-			if ( get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) !== $image_alt ) {
+			if ( get_post_meta( $post_id, '_wp_attachment_image_alt', true ) !== $image_alt ) {
 				$image_alt = wp_strip_all_tags( $image_alt, true );
 
 				// update_post_meta() expects slashed.
-				update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta( $post_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
 			}
 		}
 
-		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+		$attachment_data = isset( $post_data['attachments'][ $post_id ] ) ? $post_data['attachments'][ $post_id ] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
 		$translated = apply_filters( 'attachment_fields_to_save', $translated, $attachment_data );
@@ -419,9 +438,9 @@ function edit_post( $post_data = null ) {
 		}
 	}
 
-	add_meta( $post_ID );
+	add_meta( $post_id );
 
-	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
+	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
 
 	$success = wp_update_post( $translated );
 
@@ -439,19 +458,19 @@ function edit_post( $post_data = null ) {
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs.
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links( $post_id );
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock( $post_id );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
 		if ( ! empty( $post_data['sticky'] ) ) {
-			stick_post( $post_ID );
+			stick_post( $post_id );
 		} else {
-			unstick_post( $post_ID );
+			unstick_post( $post_id );
 		}
 	}
 
-	return $post_ID;
+	return $post_id;
 }
 
 /**
@@ -505,7 +524,7 @@ function bulk_edit_posts( $post_data = null ) {
 		}
 	}
 
-	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
+	$post_ids = array_map( 'intval', (array) $post_data['post'] );
 
 	$reset = array(
 		'post_author',
@@ -542,6 +561,7 @@ function bulk_edit_posts( $post_data = null ) {
 			if ( empty( $terms ) ) {
 				continue;
 			}
+
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
@@ -576,26 +596,26 @@ function bulk_edit_posts( $post_data = null ) {
 	$locked           = array();
 	$shared_post_data = $post_data;
 
-	foreach ( $post_IDs as $post_ID ) {
+	foreach ( $post_ids as $post_id ) {
 		// Start with fresh post data with each iteration.
 		$post_data = $shared_post_data;
 
-		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
+		$post_type_object = get_post_type_object( get_post_type( $post_id ) );
 
 		if ( ! isset( $post_type_object )
-			|| ( isset( $children ) && in_array( $post_ID, $children, true ) )
-			|| ! current_user_can( 'edit_post', $post_ID )
+			|| ( isset( $children ) && in_array( $post_id, $children, true ) )
+			|| ! current_user_can( 'edit_post', $post_id )
 		) {
-			$skipped[] = $post_ID;
+			$skipped[] = $post_id;
 			continue;
 		}
 
-		if ( wp_check_post_lock( $post_ID ) ) {
-			$locked[] = $post_ID;
+		if ( wp_check_post_lock( $post_id ) ) {
+			$locked[] = $post_id;
 			continue;
 		}
 
-		$post      = get_post( $post_ID );
+		$post      = get_post( $post_id );
 		$tax_names = get_object_taxonomies( $post );
 
 		foreach ( $tax_names as $tax_name ) {
@@ -612,21 +632,21 @@ function bulk_edit_posts( $post_data = null ) {
 			}
 
 			if ( $taxonomy_obj->hierarchical ) {
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'ids' ) );
+				$current_terms = (array) wp_get_object_terms( $post_id, $tax_name, array( 'fields' => 'ids' ) );
 			} else {
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'names' ) );
+				$current_terms = (array) wp_get_object_terms( $post_id, $tax_name, array( 'fields' => 'names' ) );
 			}
 
 			$post_data['tax_input'][ $tax_name ] = array_merge( $current_terms, $new_terms );
 		}
 
 		if ( isset( $new_cats ) && in_array( 'category', $tax_names, true ) ) {
-			$cats                       = (array) wp_get_post_categories( $post_ID );
+			$cats                       = (array) wp_get_post_categories( $post_id );
 			$post_data['post_category'] = array_unique( array_merge( $cats, $new_cats ) );
 			unset( $post_data['tax_input']['category'] );
 		}
 
-		$post_data['post_ID']        = $post_ID;
+		$post_data['post_ID']        = $post_id;
 		$post_data['post_type']      = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
 
@@ -638,31 +658,50 @@ function bulk_edit_posts( $post_data = null ) {
 
 		$post_data = _wp_translate_postdata( true, $post_data );
 		if ( is_wp_error( $post_data ) ) {
-			$skipped[] = $post_ID;
+			$skipped[] = $post_id;
 			continue;
 		}
 		$post_data = _wp_get_allowed_postdata( $post_data );
 
 		if ( isset( $shared_post_data['post_format'] ) ) {
-			set_post_format( $post_ID, $shared_post_data['post_format'] );
+			set_post_format( $post_id, $shared_post_data['post_format'] );
 		}
 
 		// Prevent wp_insert_post() from overwriting post format with the old data.
 		unset( $post_data['tax_input']['post_format'] );
 
+		// Reset post date of scheduled post to be published.
+		if (
+			in_array( $post->post_status, array( 'future', 'draft' ), true ) &&
+			'publish' === $post_data['post_status']
+		) {
+			$post_data['post_date']     = current_time( 'mysql' );
+			$post_data['post_date_gmt'] = '';
+		}
+
 		$post_id = wp_update_post( $post_data );
 		update_post_meta( $post_id, '_edit_last', get_current_user_id() );
 		$updated[] = $post_id;
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
 			if ( 'sticky' === $post_data['sticky'] ) {
-				stick_post( $post_ID );
+				stick_post( $post_id );
 			} else {
-				unstick_post( $post_ID );
+				unstick_post( $post_id );
 			}
 		}
 	}
 
+	/**
+	 * Fires after processing the post data for bulk edit.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int[] $updated          An array of updated post IDs.
+	 * @param array $shared_post_data Associative array containing the post data.
+	 */
+	do_action( 'bulk_edit_posts', $updated, $shared_post_data );
+
 	return array(
 		'updated' => $updated,
 		'skipped' => $skipped,
@@ -716,7 +755,7 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
 			wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
 		}
 	} else {
-		$post                 = new stdClass;
+		$post                 = new stdClass();
 		$post->ID             = 0;
 		$post->post_author    = '';
 		$post->post_date      = '';
@@ -887,25 +926,25 @@ function wp_write_post() {
 	$translated = _wp_get_allowed_postdata( $translated );
 
 	// Create the post.
-	$post_ID = wp_insert_post( $translated );
-	if ( is_wp_error( $post_ID ) ) {
-		return $post_ID;
+	$post_id = wp_insert_post( $translated );
+	if ( is_wp_error( $post_id ) ) {
+		return $post_id;
 	}
 
-	if ( empty( $post_ID ) ) {
+	if ( empty( $post_id ) ) {
 		return 0;
 	}
 
-	add_meta( $post_ID );
+	add_meta( $post_id );
 
-	add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
+	add_post_meta( $post_id, '_edit_last', $GLOBALS['current_user']->ID );
 
 	// Now that we have an ID we can fix any attachment anchor hrefs.
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links( $post_id );
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock( $post_id );
 
-	return $post_ID;
+	return $post_id;
 }
 
 /**
@@ -933,11 +972,11 @@ function write_post() {
  *
  * @since 1.2.0
  *
- * @param int $post_ID
+ * @param int $post_id
  * @return int|bool
  */
-function add_meta( $post_ID ) {
-	$post_ID = (int) $post_ID;
+function add_meta( $post_id ) {
+	$post_id = (int) $post_id;
 
 	$metakeyselect = isset( $_POST['metakeyselect'] ) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
 	$metakeyinput  = isset( $_POST['metakeyinput'] ) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
@@ -959,13 +998,13 @@ function add_meta( $post_ID ) {
 			$metakey = $metakeyinput; // Default.
 		}
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_id, $metakey ) ) {
 			return false;
 		}
 
 		$metakey = wp_slash( $metakey );
 
-		return add_post_meta( $post_ID, $metakey, $metavalue );
+		return add_post_meta( $post_id, $metakey, $metavalue );
 	}
 
 	return false;
@@ -996,11 +1035,10 @@ function get_meta_keys() {
 	global $wpdb;
 
 	$keys = $wpdb->get_col(
-		"
-			SELECT meta_key
-			FROM $wpdb->postmeta
-			GROUP BY meta_key
-			ORDER BY meta_key"
+		"SELECT meta_key
+		FROM $wpdb->postmeta
+		GROUP BY meta_key
+		ORDER BY meta_key"
 	);
 
 	return $keys;
@@ -1112,7 +1150,7 @@ function _fix_attachment_links( $post ) {
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos( $url_match[0], $site_url ) === false ) {
+		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || ! str_contains( $url_match[0], $site_url ) ) {
 			continue;
 		}
 
@@ -1407,8 +1445,10 @@ function get_sample_permalink( $post, $title = null, $name = null ) {
 		$post->post_name   = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
 	}
 
-	// If the user wants to set a new name -- override the current one.
-	// Note: if empty name is supplied -- use the title instead, see #6072.
+	/*
+	 * If the user wants to set a new name -- override the current one.
+	 * Note: if empty name is supplied -- use the title instead, see #6072.
+	 */
 	if ( ! is_null( $name ) ) {
 		$post->post_name = sanitize_title( $name ? $name : $title, $post->ID );
 	}
@@ -1502,7 +1542,7 @@ function get_sample_permalink_html( $post, $new_title = null, $new_slug = null )
 	}
 
 	// Permalinks without a post/page name placeholder don't have anything to edit.
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
+	if ( ! str_contains( $permalink, '%postname%' ) && ! str_contains( $permalink, '%pagename%' ) ) {
 		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
 
 		if ( false !== $view_link ) {
@@ -1541,11 +1581,11 @@ function get_sample_permalink_html( $post, $new_title = null, $new_slug = null )
 	 * @since 2.9.0
 	 * @since 4.4.0 Added `$post` parameter.
 	 *
-	 * @param string  $return    Sample permalink HTML markup.
-	 * @param int     $post_id   Post ID.
-	 * @param string  $new_title New sample permalink title.
-	 * @param string  $new_slug  New sample permalink slug.
-	 * @param WP_Post $post      Post object.
+	 * @param string      $return    Sample permalink HTML markup.
+	 * @param int         $post_id   Post ID.
+	 * @param string|null $new_title New sample permalink title.
+	 * @param string|null $new_slug  New sample permalink slug.
+	 * @param WP_Post     $post      Post object.
 	 */
 	$return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
 
@@ -1742,7 +1782,7 @@ function _admin_notice_post_locked() {
 	}
 
 	$sendback = wp_get_referer();
-	if ( $locked && $sendback && false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+	if ( $locked && $sendback && ! str_contains( $sendback, 'post.php' ) && ! str_contains( $sendback, 'post-new.php' ) ) {
 
 		$sendback_text = __( 'Go back' );
 	} else {
@@ -1941,10 +1981,10 @@ function wp_create_post_autosave( $post_data ) {
  */
 function post_preview() {
 
-	$post_ID     = (int) $_POST['post_ID'];
-	$_POST['ID'] = $post_ID;
+	$post_id     = (int) $_POST['post_ID'];
+	$_POST['ID'] = $post_id;
 
-	$post = get_post( $post_ID );
+	$post = get_post( $post_id );
 
 	if ( ! $post ) {
 		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
@@ -2037,8 +2077,10 @@ function wp_autosave( $post_data ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked.
 		return edit_post( wp_slash( $post_data ) );
 	} else {
-		// Non-drafts or other users' drafts are not overwritten.
-		// The autosave is stored in a special post revision for each user.
+		/*
+		 * Non-drafts or other users' drafts are not overwritten.
+		 * The autosave is stored in a special post revision for each user.
+		 */
 		return wp_create_post_autosave( wp_slash( $post_data ) );
 	}
 }
@@ -2164,6 +2206,7 @@ function taxonomy_meta_box_sanitize_cb_input( $taxonomy, $terms ) {
  * of a block relevant for client registration.
  *
  * @since 5.0.0
+ * @since 6.3.0 Added `selectors` field.
  *
  * @return array An associative array of registered block data.
  */
@@ -2178,6 +2221,7 @@ function get_block_editor_server_block_settings() {
 		'attributes'       => 'attributes',
 		'provides_context' => 'providesContext',
 		'uses_context'     => 'usesContext',
+		'selectors'        => 'selectors',
 		'supports'         => 'supports',
 		'category'         => 'category',
 		'styles'           => 'styles',
@@ -2210,6 +2254,10 @@ function get_block_editor_server_block_settings() {
  * Renders the meta boxes forms.
  *
  * @since 5.0.0
+ *
+ * @global WP_Post   $post           Global post object.
+ * @global WP_Screen $current_screen WordPress current screen object.
+ * @global array     $wp_meta_boxes
  */
 function the_block_editor_meta_boxes() {
 	global $post, $current_screen, $wp_meta_boxes;
@@ -2418,7 +2466,7 @@ function the_block_editor_meta_box_post_form_hidden_fields( $post ) {
 	$classic_elements = wp_html_split( $classic_output );
 	$hidden_inputs    = '';
 	foreach ( $classic_elements as $element ) {
-		if ( 0 !== strpos( $element, '<input ' ) ) {
+		if ( ! str_starts_with( $element, '<input ' ) ) {
 			continue;
 		}
 
diff --git a/src/wp-admin/includes/privacy-tools.php b/src/wp-admin/includes/privacy-tools.php
index f974ea8a5da64..c5d7c9a97fee5 100644
--- a/src/wp-admin/includes/privacy-tools.php
+++ b/src/wp-admin/includes/privacy-tools.php
@@ -275,7 +275,7 @@ function wp_privacy_generate_personal_data_export_group_html( $group_data, $grou
 		foreach ( (array) $group_item_data as $group_item_datum ) {
 			$value = $group_item_datum['value'];
 			// If it looks like a link, make it a link.
-			if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
+			if ( ! str_contains( $value, ' ' ) && ( str_starts_with( $value, 'http://' ) || str_starts_with( $value, 'https://' ) ) ) {
 				$value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
 			}
 
@@ -535,7 +535,7 @@ function wp_privacy_generate_personal_data_export_file( $request_id ) {
 		wp_delete_file( $archive_pathname );
 	}
 
-	$zip = new ZipArchive;
+	$zip = new ZipArchive();
 	if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
 		if ( ! $zip->addFile( $json_report_pathname, 'export.json' ) ) {
 			$error = __( 'Unable to archive the personal data export file (JSON format).' );
@@ -595,13 +595,11 @@ function wp_privacy_send_personal_data_export_email( $request_id ) {
 
 	// Localize message content for user; fallback to site default for visitors.
 	if ( ! empty( $request->user_id ) ) {
-		$locale = get_user_locale( $request->user_id );
+		$switched_locale = switch_to_user_locale( $request->user_id );
 	} else {
-		$locale = get_locale();
+		$switched_locale = switch_to_locale( get_locale() );
 	}
 
-	$switched_locale = switch_to_locale( $locale );
-
 	/** This filter is documented in wp-includes/functions.php */
 	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
 	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
diff --git a/src/wp-admin/includes/revision.php b/src/wp-admin/includes/revision.php
index 01ef368d40b8f..530e2fdea252d 100644
--- a/src/wp-admin/includes/revision.php
+++ b/src/wp-admin/includes/revision.php
@@ -39,8 +39,10 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 		return false;
 	}
 
-	// If comparing revisions, make sure we're dealing with the right post parent.
-	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
+	/*
+	 * If comparing revisions, make sure we are dealing with the right post parent.
+	 * The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
+	 */
 	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID ) {
 		return false;
 	}
@@ -118,8 +120,10 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 		$diff = wp_text_diff( $content_from, $content_to, $args );
 
 		if ( ! $diff && 'post_title' === $field ) {
-			// It's a better user experience to still show the Title, even if it didn't change.
-			// No, you didn't see this.
+			/*
+			 * It's a better user experience to still show the Title, even if it didn't change.
+			 * No, you didn't see this.
+			 */
 			$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
 
 			// In split screen mode, show the title before/after side by side.
@@ -194,7 +198,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 
 	$show_avatars = get_option( 'show_avatars' );
 
-	cache_users( wp_list_pluck( $revisions, 'post_author' ) );
+	update_post_author_caches( $revisions );
 
 	$can_restore = current_user_can( 'edit_post', $post->ID );
 	$current_id  = false;
diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
index 57ffe69054e01..89d9fabfc0288 100644
--- a/src/wp-admin/includes/schema.php
+++ b/src/wp-admin/includes/schema.php
@@ -38,7 +38,7 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
 
 	$charset_collate = $wpdb->get_charset_collate();
 
-	if ( $blog_id && $blog_id != $wpdb->blogid ) {
+	if ( $blog_id && (int) $blog_id !== $wpdb->blogid ) {
 		$old_blog_id = $wpdb->set_blog_id( $blog_id );
 	}
 
@@ -548,8 +548,10 @@ function populate_options( array $options = array() ) {
 		// 5.6.0
 		'auto_update_core_dev'            => 'enabled',
 		'auto_update_core_minor'          => 'enabled',
-		// Default to enabled for new installs.
-		// See https://core.trac.wordpress.org/ticket/51742.
+		/*
+		 * Default to enabled for new installs.
+		 * See https://core.trac.wordpress.org/ticket/51742.
+		 */
 		'auto_update_core_major'          => 'enabled',
 
 		// 5.8.0
@@ -977,12 +979,14 @@ function install_network() {
  * @param string $path              Optional. The path to append to the network's domain name. Default '/'.
  * @param bool   $subdomain_install Optional. Whether the network is a subdomain installation or a subdirectory installation.
  *                                  Default false, meaning the network is a subdirectory installation.
- * @return bool|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
+ * @return true|WP_Error True on success, or WP_Error on warning (with the installation otherwise successful,
  *                       so the error code must be checked) or failure.
  */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
 	global $wpdb, $current_site, $wp_rewrite;
 
+	$network_id = (int) $network_id;
+
 	$errors = new WP_Error();
 	if ( '' === $domain ) {
 		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
@@ -994,11 +998,13 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	// Check for network collision.
 	$network_exists = false;
 	if ( is_multisite() ) {
-		if ( get_network( (int) $network_id ) ) {
+		if ( get_network( $network_id ) ) {
 			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
 		}
 	} else {
-		if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+		if ( $network_id === (int) $wpdb->get_var(
+			$wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id )
+		) ) {
 			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
 		}
 	}
@@ -1011,7 +1017,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 		return $errors;
 	}
 
-	if ( 1 == $network_id ) {
+	if ( 1 === $network_id ) {
 		$wpdb->insert(
 			$wpdb->site,
 			array(
@@ -1040,8 +1046,6 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 		)
 	);
 
-	$site_user = get_userdata( (int) $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", 'admin_user_id', $network_id ) ) );
-
 	/*
 	 * When upgrading from single to multisite, assume the current site will
 	 * become the main site of the network. When using populate_network()
@@ -1050,7 +1054,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	 * created.
 	 */
 	if ( ! is_multisite() ) {
-		$current_site            = new stdClass;
+		$current_site            = new stdClass();
 		$current_site->domain    = $domain;
 		$current_site->path      = $path;
 		$current_site->site_name = ucfirst( $domain );
@@ -1065,8 +1069,19 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 			)
 		);
 		$current_site->blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $current_site->blog_id );
+
+		$site_user_id = (int) $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT meta_value
+				FROM $wpdb->sitemeta
+				WHERE meta_key = %s AND site_id = %d",
+				'admin_user_id',
+				$network_id
+			)
+		);
+
+		update_user_meta( $site_user_id, 'source_domain', $domain );
+		update_user_meta( $site_user_id, 'primary_blog', $current_site->blog_id );
 
 		// Unable to use update_network_option() while populating the network.
 		$wpdb->insert(
@@ -1102,7 +1117,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 		);
 		if ( is_wp_error( $page ) ) {
 			$errstr = $page->get_error_message();
-		} elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
+		} elseif ( 200 === wp_remote_retrieve_response_code( $page ) ) {
 				$vhost_ok = true;
 		}
 
@@ -1168,11 +1183,11 @@ function populate_network_meta( $network_id, array $meta = array() ) {
 	$stylesheet     = get_option( 'stylesheet' );
 	$allowed_themes = array( $stylesheet => true );
 
-	if ( $template != $stylesheet ) {
+	if ( $template !== $stylesheet ) {
 		$allowed_themes[ $template ] = true;
 	}
 
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
+	if ( WP_DEFAULT_THEME !== $stylesheet && WP_DEFAULT_THEME !== $template ) {
 		$allowed_themes[ WP_DEFAULT_THEME ] = true;
 	}
 
diff --git a/src/wp-admin/includes/taxonomy.php b/src/wp-admin/includes/taxonomy.php
index 2326e9eb5092d..7765084fa75a4 100644
--- a/src/wp-admin/includes/taxonomy.php
+++ b/src/wp-admin/includes/taxonomy.php
@@ -186,14 +186,14 @@ function wp_insert_category( $catarr, $wp_error = false ) {
  * @return int|false The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
 function wp_update_category( $catarr ) {
-	$cat_ID = (int) $catarr['cat_ID'];
+	$cat_id = (int) $catarr['cat_ID'];
 
-	if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
+	if ( isset( $catarr['category_parent'] ) && ( $cat_id === (int) $catarr['category_parent'] ) ) {
 		return false;
 	}
 
 	// First, get all of the original fields.
-	$category = get_term( $cat_ID, 'category', ARRAY_A );
+	$category = get_term( $cat_id, 'category', ARRAY_A );
 	_make_cat_compat( $category );
 
 	// Escape data pulled from DB.
diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
index b0c6cb362f01c..2394fbb6f2084 100644
--- a/src/wp-admin/includes/template.php
+++ b/src/wp-admin/includes/template.php
@@ -104,7 +104,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	$parsed_args = wp_parse_args( $params, $defaults );
 
 	if ( empty( $parsed_args['walker'] ) || ! ( $parsed_args['walker'] instanceof Walker ) ) {
-		$walker = new Walker_Category_Checklist;
+		$walker = new Walker_Category_Checklist();
 	} else {
 		$walker = $parsed_args['walker'];
 	}
@@ -165,8 +165,10 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	$output = '';
 
 	if ( $parsed_args['checked_ontop'] ) {
-		// Post-process $categories rather than adding an exclude to the get_terms() query
-		// to keep the query the same across all posts (for any query cache).
+		/*
+		 * Post-process $categories rather than adding an exclude to the get_terms() query
+		 * to keep the query the same across all posts (for any query cache).
+		 */
 		$checked_categories = array();
 		$keys               = array_keys( $categories );
 
@@ -260,7 +262,7 @@ function wp_popular_terms_checklist( $taxonomy, $default_term = 0, $number = 10,
  *
  * @since 2.5.1
  *
- * @param int $link_id
+ * @param int $link_id Optional. The link ID. Default 0.
  */
 function wp_link_category_checklist( $link_id = 0 ) {
 	$default = 1;
@@ -402,10 +404,11 @@ function get_inline_data( $post ) {
  *
  * @global WP_List_Table $wp_list_table
  *
- * @param int    $position
- * @param bool   $checkbox
- * @param string $mode
- * @param bool   $table_row
+ * @param int    $position  Optional. The value of the 'position' input field. Default 1.
+ * @param bool   $checkbox  Optional. The value of the 'checkbox' input field. Default false.
+ * @param string $mode      Optional. If set to 'single', will use WP_Post_Comments_List_Table,
+ *                          otherwise WP_Comments_List_Table. Default 'single'.
+ * @param bool   $table_row Optional. Whether to use a table instead of a div element. Default true.
  */
 function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
 	global $wp_list_table;
@@ -462,7 +465,12 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	</legend>
 
 	<div id="replycontainer">
-	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
+	<label for="replycontent" class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Comment' );
+		?>
+	</label>
 	<?php
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
 	wp_editor(
@@ -565,7 +573,7 @@ function wp_comment_trashnotice() {
  *
  * @since 1.2.0
  *
- * @param array $meta
+ * @param array[] $meta An array of meta data arrays keyed on 'meta_key' and 'meta_value'.
  */
 function list_meta( $meta ) {
 	// Exit if no meta.
@@ -609,9 +617,9 @@ function list_meta( $meta ) {
  *
  * @since 2.5.0
  *
- * @param array $entry
- * @param int   $count
- * @return string
+ * @param array $entry An array of meta data keyed on 'meta_key' and 'meta_value'.
+ * @param int   $count Reference to the row number.
+ * @return string A single row of public meta data.
  */
 function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = '';
@@ -625,7 +633,7 @@ function _list_meta_row( $entry, &$count ) {
 	}
 
 	$r = '';
-	++ $count;
+	++$count;
 
 	if ( is_serialized( $entry['meta_value'] ) ) {
 		if ( is_serialized_string( $entry['meta_value'] ) ) {
@@ -645,7 +653,10 @@ function _list_meta_row( $entry, &$count ) {
 	$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
 
 	$r .= "\n\t<tr id='meta-{$entry['meta_id']}'>";
-	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
+	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" .
+		/* translators: Hidden accessibility text. */
+		__( 'Key' ) .
+	"</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
 
 	$r .= "\n\t\t<div class='submit'>";
 	$r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
@@ -655,7 +666,10 @@ function _list_meta_row( $entry, &$count ) {
 	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
 	$r .= '</td>';
 
-	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
+	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" .
+		/* translators: Hidden accessibility text. */
+		__( 'Value' ) .
+	"</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
 	return $r;
 }
 
@@ -712,16 +726,13 @@ function meta_form( $post = null ) {
 
 	if ( $keys ) {
 		natcasesort( $keys );
-		$meta_key_input_id = 'metakeyselect';
-	} else {
-		$meta_key_input_id = 'metakeyinput';
 	}
 	?>
 <p><strong><?php _e( 'Add New Custom Field:' ); ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ); ?></label></th>
+<th class="left"><label for="metakeyselect"><?php _ex( 'Name', 'meta name' ); ?></label></th>
 <th><label for="metavalue"><?php _e( 'Value' ); ?></label></th>
 </tr>
 </thead>
@@ -741,19 +752,21 @@ function meta_form( $post = null ) {
 		}
 		?>
 </select>
-<input class="hide-if-js" type="text" id="metakeyinput" name="metakeyinput" value="" />
-<a href="#postcustomstuff" class="hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggle();return false;">
+<input class="hidden" type="text" id="metakeyinput" name="metakeyinput" value="" aria-label="<?php _e( 'New custom field name' ); ?>" />
+<button type="button" id="newmeta-button" class="button button-small hide-if-no-js" onclick="jQuery('#metakeyinput, #metakeyselect, #enternew, #cancelnew').toggleClass('hidden');jQuery('#metakeyinput, #metakeyselect').filter(':visible').trigger('focus');">
 <span id="enternew"><?php _e( 'Enter new' ); ?></span>
-<span id="cancelnew" class="hidden"><?php _e( 'Cancel' ); ?></span></a>
+<span id="cancelnew" class="hidden"><?php _e( 'Cancel' ); ?></span></button>
 <?php } else { ?>
 <input type="text" id="metakeyinput" name="metakeyinput" value="" />
 <?php } ?>
 </td>
-<td><textarea id="metavalue" name="metavalue" rows="2" cols="25"></textarea></td>
+<td><textarea id="metavalue" name="metavalue" rows="2" cols="25"></textarea>
+	<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
+</td>
 </tr>
-
-<tr><td colspan="2">
-<div class="submit">
+</tbody>
+</table>
+<div class="submit add-custom-field">
 	<?php
 	submit_button(
 		__( 'Add Custom Field' ),
@@ -767,12 +780,7 @@ function meta_form( $post = null ) {
 	);
 	?>
 </div>
-	<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
-</td></tr>
-</tbody>
-</table>
 	<?php
-
 }
 
 /**
@@ -819,7 +827,10 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 	$cur_hh = current_time( 'H' );
 	$cur_mn = current_time( 'i' );
 
-	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select class="form-required" ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
+	$month = '<label><span class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Month' ) .
+	'</span><select class="form-required" ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
 	for ( $i = 1; $i < 13; $i = $i + 1 ) {
 		$monthnum  = zeroise( $i, 2 );
 		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
@@ -829,10 +840,22 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 	}
 	$month .= '</select></label>';
 
-	$day    = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
-	$year   = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
-	$hour   = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
-	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
+	$day = '<label><span class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Day' ) .
+	'</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
+	$year = '<label><span class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Year' ) .
+	'</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
+	$hour = '<label><span class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Hour' ) .
+	'</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
+	$minute = '<label><span class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Minute' ) .
+	'</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" class="form-required" /></label>';
 
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: Month, 2: Day, 3: Year, 4: Hour, 5: Minute. */
@@ -877,7 +900,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
  * @since 4.7.0 Added the `$post_type` parameter.
  *
  * @param string $default_template Optional. The template file name. Default empty.
- * @param string $post_type        Optional. Post type to get templates for. Default 'post'.
+ * @param string $post_type        Optional. Post type to get templates for. Default 'page'.
  */
 function page_template_dropdown( $default_template = '', $post_type = 'page' ) {
 	$templates = get_page_templates( null, $post_type );
@@ -1213,7 +1236,7 @@ function _get_plugin_from_callback( $callback ) {
 	try {
 		if ( is_array( $callback ) ) {
 			$reflection = new ReflectionMethod( $callback[0], $callback[1] );
-		} elseif ( is_string( $callback ) && false !== strpos( $callback, '::' ) ) {
+		} elseif ( is_string( $callback ) && str_contains( $callback, '::' ) ) {
 			$reflection = new ReflectionMethod( $callback );
 		} else {
 			$reflection = new ReflectionFunction( $callback );
@@ -1230,14 +1253,14 @@ function _get_plugin_from_callback( $callback ) {
 		$filename   = wp_normalize_path( $reflection->getFileName() );
 		$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
 
-		if ( strpos( $filename, $plugin_dir ) === 0 ) {
+		if ( str_starts_with( $filename, $plugin_dir ) ) {
 			$filename = str_replace( $plugin_dir, '', $filename );
 			$filename = preg_replace( '|^/([^/]*/).*$|', '\\1', $filename );
 
 			$plugins = get_plugins();
 
 			foreach ( $plugins as $name => $plugin ) {
-				if ( strpos( $name, $filename ) === 0 ) {
+				if ( str_starts_with( $name, $filename ) ) {
 					return $plugin;
 				}
 			}
@@ -1280,8 +1303,10 @@ function do_meta_boxes( $screen, $context, $data_object ) {
 
 	printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context ) );
 
-	// Grab the ones the user has manually sorted.
-	// Pull them out of their previous context/priority and into the one the user chose.
+	/*
+	 * Grab the ones the user has manually sorted.
+	 * Pull them out of their previous context/priority and into the one the user chose.
+	 */
 	$sorted = get_user_option( "meta-box-order_$page" );
 
 	if ( ! $already_sorted && $sorted ) {
@@ -1339,7 +1364,10 @@ function do_meta_boxes( $screen, $context, $data_object ) {
 					echo '<h2 class="hndle">';
 					if ( 'dashboard_php_nag' === $box['id'] ) {
 						echo '<span aria-hidden="true" class="dashicons dashicons-warning"></span>';
-						echo '<span class="screen-reader-text">' . __( 'Warning:' ) . ' </span>';
+						echo '<span class="screen-reader-text">' .
+							/* translators: Hidden accessibility text. */
+							__( 'Warning:' ) .
+						' </span>';
 					}
 					echo $box['title'];
 					echo "</h2>\n";
@@ -1356,7 +1384,10 @@ function do_meta_boxes( $screen, $context, $data_object ) {
 						echo '<div class="handle-actions hide-if-no-js">';
 
 						echo '<button type="button" class="handle-order-higher" aria-disabled="false" aria-describedby="' . $box['id'] . '-handle-order-higher-description">';
-						echo '<span class="screen-reader-text">' . __( 'Move up' ) . '</span>';
+						echo '<span class="screen-reader-text">' .
+							/* translators: Hidden accessibility text. */
+							__( 'Move up' ) .
+						'</span>';
 						echo '<span class="order-higher-indicator" aria-hidden="true"></span>';
 						echo '</button>';
 						echo '<span class="hidden" id="' . $box['id'] . '-handle-order-higher-description">' . sprintf(
@@ -1366,7 +1397,10 @@ function do_meta_boxes( $screen, $context, $data_object ) {
 						) . '</span>';
 
 						echo '<button type="button" class="handle-order-lower" aria-disabled="false" aria-describedby="' . $box['id'] . '-handle-order-lower-description">';
-						echo '<span class="screen-reader-text">' . __( 'Move down' ) . '</span>';
+						echo '<span class="screen-reader-text">' .
+							/* translators: Hidden accessibility text. */
+							__( 'Move down' ) .
+						'</span>';
 						echo '<span class="order-lower-indicator" aria-hidden="true"></span>';
 						echo '</button>';
 						echo '<span class="hidden" id="' . $box['id'] . '-handle-order-lower-description">' . sprintf(
@@ -1377,7 +1411,7 @@ function do_meta_boxes( $screen, $context, $data_object ) {
 
 						echo '<button type="button" class="handlediv" aria-expanded="true">';
 						echo '<span class="screen-reader-text">' . sprintf(
-							/* translators: %s: Meta box title. */
+							/* translators: %s: Hidden accessibility text. Meta box title. */
 							__( 'Toggle panel: %s' ),
 							$widget_title
 						) . '</span>';
@@ -1529,7 +1563,12 @@ function do_accordion_sections( $screen, $context, $data_object ) {
 					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
 						<h3 class="accordion-section-title hndle" tabindex="0">
 							<?php echo esc_html( $box['title'] ); ?>
-							<span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Press return or enter to open this section' );
+								?>
+							</span>
 						</h3>
 						<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
 							<div class="inside">
@@ -1845,15 +1884,19 @@ function add_settings_error( $setting, $code, $message, $type = 'error' ) {
  *
  * @param string $setting  Optional. Slug title of a specific setting whose errors you want.
  * @param bool   $sanitize Optional. Whether to re-sanitize the setting value before returning errors.
- * @return array {
- *     Array of settings errors.
- *
- *     @type string $setting Slug title of the setting to which this error applies.
- *     @type string $code    Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
- *     @type string $message The formatted message text to display to the user (will be shown inside styled
- *                           `<div>` and `<p>` tags).
- *     @type string $type    Optional. Message type, controls HTML class. Possible values include 'error',
- *                           'success', 'warning', 'info'. Default 'error'.
+ * @return array[] {
+ *     Array of settings error arrays.
+ *
+ *     @type array ...$0 {
+ *         Associative array of setting error data.
+ *
+ *         @type string $setting Slug title of the setting to which this error applies.
+ *         @type string $code    Slug-name to identify the error. Used as part of 'id' attribute in HTML output.
+ *         @type string $message The formatted message text to display to the user (will be shown inside styled
+ *                               `<div>` and `<p>` tags).
+ *         @type string $type    Optional. Message type, controls HTML class. Possible values include 'error',
+ *                               'success', 'warning', 'info'. Default 'error'.
+ *     }
  * }
  */
 function get_settings_errors( $setting = '', $sanitize = false ) {
@@ -1969,14 +2012,19 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa
  *
  * @since 2.7.0
  *
- * @param string $found_action
+ * @param string $found_action Optional. The value of the 'found_action' input field. Default empty string.
  */
 function find_posts_div( $found_action = '' ) {
 	?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
 			<?php _e( 'Attach to existing content' ); ?>
-			<button type="button" id="find-posts-close"><span class="screen-reader-text"><?php _e( 'Close media attachment panel' ); ?></span></button>
+			<button type="button" id="find-posts-close"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Close media attachment panel' );
+				?>
+			</span></button>
 		</div>
 		<div class="find-box-inside">
 			<div class="find-box-search">
@@ -1985,7 +2033,12 @@ function find_posts_div( $found_action = '' ) {
 				<?php } ?>
 				<input type="hidden" name="affected" id="affected" value="" />
 				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-				<label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
+				<label class="screen-reader-text" for="find-posts-input">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search' );
+					?>
+				</label>
 				<input type="text" id="find-posts-input" name="ps" value="" />
 				<span class="spinner"></span>
 				<input type="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" />
@@ -2123,7 +2176,7 @@ function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_r
 	$admin_body_classes = apply_filters( 'admin_body_class', '' );
 	$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
 	?>
-<body <?php echo $admin_body_id; ?>class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes; ?>">
+<body <?php echo $admin_body_id; ?>class="wp-admin wp-core-ui no-js iframe <?php echo esc_attr( $admin_body_classes ); ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -2695,11 +2748,11 @@ function wp_star_rating( $args = array() ) {
 	$empty_stars = 5 - $full_stars - $half_stars;
 
 	if ( $parsed_args['number'] ) {
-		/* translators: 1: The rating, 2: The number of ratings. */
+		/* translators: Hidden accessibility text. 1: The rating, 2: The number of ratings. */
 		$format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $parsed_args['number'] );
 		$title  = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $parsed_args['number'] ) );
 	} else {
-		/* translators: %s: The rating. */
+		/* translators: Hidden accessibility text. %s: The rating. */
 		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
 	}
 
diff --git a/src/wp-admin/includes/theme-install.php b/src/wp-admin/includes/theme-install.php
index 2cfb9dbb025d4..94b591eedf75f 100644
--- a/src/wp-admin/includes/theme-install.php
+++ b/src/wp-admin/includes/theme-install.php
@@ -98,7 +98,12 @@ function install_theme_search_form( $type_selector = true ) {
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
 	<?php if ( $type_selector ) : ?>
-	<label class="screen-reader-text" for="typeselector"><?php _e( 'Type of search' ); ?></label>
+	<label class="screen-reader-text" for="typeselector">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Type of search' );
+		?>
+	</label>
 	<select	name="type" id="typeselector">
 	<option value="term" <?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
 	<option value="author" <?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
@@ -108,19 +113,27 @@ function install_theme_search_form( $type_selector = true ) {
 		<?php
 		switch ( $type ) {
 			case 'term':
+				/* translators: Hidden accessibility text. */
 				_e( 'Search by keyword' );
 				break;
 			case 'author':
+				/* translators: Hidden accessibility text. */
 				_e( 'Search by author' );
 				break;
 			case 'tag':
+				/* translators: Hidden accessibility text. */
 				_e( 'Search by tag' );
 				break;
 		}
 		?>
 	</label>
 	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
+	<label class="screen-reader-text" for="s">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Search by keyword' );
+		?>
+	</label>
 	<?php endif; ?>
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr( $term ); ?>" autofocus="autofocus" />
 	<?php submit_button( __( 'Search' ), '', 'search', false ); ?>
@@ -184,7 +197,12 @@ function install_themes_upload() {
 <p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install or update it by uploading it here.' ); ?></p>
 <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url( self_admin_url( 'update.php?action=upload-theme' ) ); ?>">
 	<?php wp_nonce_field( 'theme-upload' ); ?>
-	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
+	<label class="screen-reader-text" for="themezip">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Theme zip file' );
+		?>
+	</label>
 	<input type="file" id="themezip" name="themezip" accept=".zip" />
 	<?php submit_button( __( 'Install Now' ), '', 'install-theme-submit', false ); ?>
 </form>
diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
index 020927a154960..d98cb5de33dd3 100644
--- a/src/wp-admin/includes/theme.php
+++ b/src/wp-admin/includes/theme.php
@@ -299,6 +299,8 @@ function get_theme_update_available( $theme ) {
  *              and 'Full Site Editing' features.
  * @since 5.5.0 Added 'Wide Blocks' layout option.
  * @since 5.8.1 Added 'Template Editing' feature.
+ * @since 6.1.1 Replaced 'Full Site Editing' feature name with 'Site Editor'.
+ * @since 6.2.0 Added 'Style Variations' feature.
  *
  * @param bool $api Optional. Whether try to fetch tags from the WordPress.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
@@ -331,10 +333,11 @@ function get_theme_feature_list( $api = true ) {
 			'featured-image-header' => __( 'Featured Image Header' ),
 			'featured-images'       => __( 'Featured Images' ),
 			'footer-widgets'        => __( 'Footer Widgets' ),
-			'full-site-editing'     => __( 'Full Site Editing' ),
+			'full-site-editing'     => __( 'Site Editor' ),
 			'full-width-template'   => __( 'Full Width Template' ),
 			'post-formats'          => __( 'Post Formats' ),
 			'sticky-post'           => __( 'Sticky Post' ),
+			'style-variations'      => __( 'Style Variations' ),
 			'template-editing'      => __( 'Template Editing' ),
 			'theme-options'         => __( 'Theme Options' ),
 		),
@@ -552,6 +555,7 @@ function themes_api( $action, $args = array() ) {
 		}
 
 		$http_args = array(
+			'timeout'    => 15,
 			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 		);
 		$request   = wp_remote_get( $url, $http_args );
@@ -707,16 +711,21 @@ function wp_prepare_themes_for_js( $themes = null ) {
 		$is_block_theme         = $theme->is_block_theme();
 
 		if ( $is_block_theme && $can_edit_theme_options ) {
-			$customize_action = esc_url( admin_url( 'site-editor.php' ) );
+			$customize_action = admin_url( 'site-editor.php' );
+			if ( $current_theme !== $slug ) {
+				$customize_action = add_query_arg( 'wp_theme_preview', $slug, $customize_action );
+			}
 		} elseif ( ! $is_block_theme && $can_customize && $can_edit_theme_options ) {
-			$customize_action = esc_url(
-				add_query_arg(
-					array(
-						'return' => urlencode( sanitize_url( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
-					),
-					wp_customize_url( $slug )
-				)
+			$customize_action = wp_customize_url( $slug );
+		}
+		if ( null !== $customize_action ) {
+			$customize_action = add_query_arg(
+				array(
+					'return' => urlencode( sanitize_url( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+				),
+				$customize_action
 			);
+			$customize_action = esc_url( $customize_action );
 		}
 
 		$update_requires_wp  = isset( $updates[ $slug ]['requires'] ) ? $updates[ $slug ]['requires'] : null;
@@ -816,9 +825,24 @@ function customize_themes_print_templates() {
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap wp-clearfix" role="document">
 			<div class="theme-header">
-				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Show previous theme' );
+					?>
+				</span></button>
+				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Show next theme' );
+					?>
+				</span></button>
+				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Close details dialog' );
+					?>
+				</span></button>
 			</div>
 			<div class="theme-about wp-clearfix">
 				<div class="theme-screenshots">
@@ -855,7 +879,7 @@ function customize_themes_print_templates() {
 									'%1$s <span class="screen-reader-text">%2$s</span>',
 									/* translators: %s: Number of ratings. */
 									sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' ),
-									/* translators: Accessibility text. */
+									/* translators: Hidden accessibility text. */
 									__( '(opens in a new tab)' )
 								);
 								?>
@@ -1143,9 +1167,9 @@ function resume_theme( $theme, $redirect = '' ) {
 	 */
 	if ( ! empty( $redirect ) ) {
 		$functions_path = '';
-		if ( strpos( STYLESHEETPATH, $extension ) ) {
+		if ( str_contains( STYLESHEETPATH, $extension ) ) {
 			$functions_path = STYLESHEETPATH . '/functions.php';
-		} elseif ( strpos( TEMPLATEPATH, $extension ) ) {
+		} elseif ( str_contains( TEMPLATEPATH, $extension ) ) {
 			$functions_path = TEMPLATEPATH . '/functions.php';
 		}
 
diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php
index dc7cb89a05682..01c61bbb7b820 100644
--- a/src/wp-admin/includes/translation-install.php
+++ b/src/wp-admin/includes/translation-install.php
@@ -237,7 +237,7 @@ function wp_download_language_pack( $download ) {
 	$translation = (object) $translation;
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin              = new Automatic_Upgrader_Skin;
+	$skin              = new Automatic_Upgrader_Skin();
 	$upgrader          = new Language_Pack_Upgrader( $skin );
 	$translation->type = 'core';
 	$result            = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
@@ -263,7 +263,7 @@ function wp_can_install_language_pack() {
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin     = new Automatic_Upgrader_Skin;
+	$skin     = new Automatic_Upgrader_Skin();
 	$upgrader = new Language_Pack_Upgrader( $skin );
 	$upgrader->init();
 
diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php
index af7ae29d7238a..6085b02c8fdc4 100644
--- a/src/wp-admin/includes/update-core.php
+++ b/src/wp-admin/includes/update-core.php
@@ -10,6 +10,8 @@
 /**
  * Stores files to be deleted.
  *
+ * Bundled theme files should not be included in this list.
+ *
  * @since 2.7.0
  *
  * @global array $_old_files
@@ -843,11 +845,7 @@
 	'wp-includes/blocks/tag-cloud/editor.min.css',
 	'wp-includes/blocks/tag-cloud/editor-rtl.css',
 	'wp-includes/blocks/tag-cloud/editor-rtl.min.css',
-	// 6.0
-	'wp-content/themes/twentytwentytwo/assets/fonts/LICENSE.md',
 	// 6.1
-	'wp-content/themes/twentytwentyone/assets/sass/05-blocks/spacer/_style.scss',
-	'wp-content/themes/twentytwentyone/assets/sass/05-blocks/spacer',
 	'wp-includes/blocks/post-comments.php',
 	'wp-includes/blocks/post-comments/block.json',
 	'wp-includes/blocks/post-comments/editor.css',
@@ -864,6 +862,101 @@
 	'wp-includes/blocks/comments-query-loop/editor.min.css',
 	'wp-includes/blocks/comments-query-loop/editor-rtl.css',
 	'wp-includes/blocks/comments-query-loop/editor-rtl.min.css',
+	'wp-includes/blocks/comments-query-loop',
+	// 6.3
+	'wp-includes/images/wlw',
+	'wp-includes/wlwmanifest.xml',
+	'wp-includes/random_compat',
+);
+
+/**
+ * Stores Requests files to be preloaded and deleted.
+ *
+ * For classes/interfaces, use the class/interface name
+ * as the array key.
+ *
+ * All other files/directories should not have a key.
+ *
+ * @since 6.2.0
+ *
+ * @global array $_old_requests_files
+ * @var array
+ * @name $_old_requests_files
+ */
+global $_old_requests_files;
+
+$_old_requests_files = array(
+	// Interfaces.
+	'Requests_Auth'                              => 'wp-includes/Requests/Auth.php',
+	'Requests_Hooker'                            => 'wp-includes/Requests/Hooker.php',
+	'Requests_Proxy'                             => 'wp-includes/Requests/Proxy.php',
+	'Requests_Transport'                         => 'wp-includes/Requests/Transport.php',
+
+	// Classes.
+	'Requests_Auth_Basic'                        => 'wp-includes/Requests/Auth/Basic.php',
+	'Requests_Cookie_Jar'                        => 'wp-includes/Requests/Cookie/Jar.php',
+	'Requests_Exception_HTTP'                    => 'wp-includes/Requests/Exception/HTTP.php',
+	'Requests_Exception_Transport'               => 'wp-includes/Requests/Exception/Transport.php',
+	'Requests_Exception_HTTP_304'                => 'wp-includes/Requests/Exception/HTTP/304.php',
+	'Requests_Exception_HTTP_305'                => 'wp-includes/Requests/Exception/HTTP/305.php',
+	'Requests_Exception_HTTP_306'                => 'wp-includes/Requests/Exception/HTTP/306.php',
+	'Requests_Exception_HTTP_400'                => 'wp-includes/Requests/Exception/HTTP/400.php',
+	'Requests_Exception_HTTP_401'                => 'wp-includes/Requests/Exception/HTTP/401.php',
+	'Requests_Exception_HTTP_402'                => 'wp-includes/Requests/Exception/HTTP/402.php',
+	'Requests_Exception_HTTP_403'                => 'wp-includes/Requests/Exception/HTTP/403.php',
+	'Requests_Exception_HTTP_404'                => 'wp-includes/Requests/Exception/HTTP/404.php',
+	'Requests_Exception_HTTP_405'                => 'wp-includes/Requests/Exception/HTTP/405.php',
+	'Requests_Exception_HTTP_406'                => 'wp-includes/Requests/Exception/HTTP/406.php',
+	'Requests_Exception_HTTP_407'                => 'wp-includes/Requests/Exception/HTTP/407.php',
+	'Requests_Exception_HTTP_408'                => 'wp-includes/Requests/Exception/HTTP/408.php',
+	'Requests_Exception_HTTP_409'                => 'wp-includes/Requests/Exception/HTTP/409.php',
+	'Requests_Exception_HTTP_410'                => 'wp-includes/Requests/Exception/HTTP/410.php',
+	'Requests_Exception_HTTP_411'                => 'wp-includes/Requests/Exception/HTTP/411.php',
+	'Requests_Exception_HTTP_412'                => 'wp-includes/Requests/Exception/HTTP/412.php',
+	'Requests_Exception_HTTP_413'                => 'wp-includes/Requests/Exception/HTTP/413.php',
+	'Requests_Exception_HTTP_414'                => 'wp-includes/Requests/Exception/HTTP/414.php',
+	'Requests_Exception_HTTP_415'                => 'wp-includes/Requests/Exception/HTTP/415.php',
+	'Requests_Exception_HTTP_416'                => 'wp-includes/Requests/Exception/HTTP/416.php',
+	'Requests_Exception_HTTP_417'                => 'wp-includes/Requests/Exception/HTTP/417.php',
+	'Requests_Exception_HTTP_418'                => 'wp-includes/Requests/Exception/HTTP/418.php',
+	'Requests_Exception_HTTP_428'                => 'wp-includes/Requests/Exception/HTTP/428.php',
+	'Requests_Exception_HTTP_429'                => 'wp-includes/Requests/Exception/HTTP/429.php',
+	'Requests_Exception_HTTP_431'                => 'wp-includes/Requests/Exception/HTTP/431.php',
+	'Requests_Exception_HTTP_500'                => 'wp-includes/Requests/Exception/HTTP/500.php',
+	'Requests_Exception_HTTP_501'                => 'wp-includes/Requests/Exception/HTTP/501.php',
+	'Requests_Exception_HTTP_502'                => 'wp-includes/Requests/Exception/HTTP/502.php',
+	'Requests_Exception_HTTP_503'                => 'wp-includes/Requests/Exception/HTTP/503.php',
+	'Requests_Exception_HTTP_504'                => 'wp-includes/Requests/Exception/HTTP/504.php',
+	'Requests_Exception_HTTP_505'                => 'wp-includes/Requests/Exception/HTTP/505.php',
+	'Requests_Exception_HTTP_511'                => 'wp-includes/Requests/Exception/HTTP/511.php',
+	'Requests_Exception_HTTP_Unknown'            => 'wp-includes/Requests/Exception/HTTP/Unknown.php',
+	'Requests_Exception_Transport_cURL'          => 'wp-includes/Requests/Exception/Transport/cURL.php',
+	'Requests_Proxy_HTTP'                        => 'wp-includes/Requests/Proxy/HTTP.php',
+	'Requests_Response_Headers'                  => 'wp-includes/Requests/Response/Headers.php',
+	'Requests_Transport_cURL'                    => 'wp-includes/Requests/Transport/cURL.php',
+	'Requests_Transport_fsockopen'               => 'wp-includes/Requests/Transport/fsockopen.php',
+	'Requests_Utility_CaseInsensitiveDictionary' => 'wp-includes/Requests/Utility/CaseInsensitiveDictionary.php',
+	'Requests_Utility_FilteredIterator'          => 'wp-includes/Requests/Utility/FilteredIterator.php',
+	'Requests_Cookie'                            => 'wp-includes/Requests/Cookie.php',
+	'Requests_Exception'                         => 'wp-includes/Requests/Exception.php',
+	'Requests_Hooks'                             => 'wp-includes/Requests/Hooks.php',
+	'Requests_IDNAEncoder'                       => 'wp-includes/Requests/IDNAEncoder.php',
+	'Requests_IPv6'                              => 'wp-includes/Requests/IPv6.php',
+	'Requests_IRI'                               => 'wp-includes/Requests/IRI.php',
+	'Requests_Response'                          => 'wp-includes/Requests/Response.php',
+	'Requests_SSL'                               => 'wp-includes/Requests/SSL.php',
+	'Requests_Session'                           => 'wp-includes/Requests/Session.php',
+
+	// Directories.
+	'wp-includes/Requests/Auth/',
+	'wp-includes/Requests/Cookie/',
+	'wp-includes/Requests/Exception/HTTP/',
+	'wp-includes/Requests/Exception/Transport/',
+	'wp-includes/Requests/Exception/',
+	'wp-includes/Requests/Proxy/',
+	'wp-includes/Requests/Response/',
+	'wp-includes/Requests/Transport/',
+	'wp-includes/Requests/Utility/',
 );
 
 /**
@@ -950,6 +1043,7 @@
  *
  * @global WP_Filesystem_Base $wp_filesystem          WordPress filesystem subclass.
  * @global array              $_old_files
+ * @global array              $_old_requests_files
  * @global array              $_new_bundled_files
  * @global wpdb               $wpdb                   WordPress database abstraction object.
  * @global string             $wp_version
@@ -961,9 +1055,19 @@
  * @return string|WP_Error New WordPress version on success, WP_Error on failure.
  */
 function update_core( $from, $to ) {
-	global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
+	global $wp_filesystem, $_old_files, $_old_requests_files, $_new_bundled_files, $wpdb;
 
-	set_time_limit( 300 );
+	if ( function_exists( 'set_time_limit' ) ) {
+		set_time_limit( 300 );
+	}
+
+	/*
+	 * Merge the old Requests files and directories into the `$_old_files`.
+	 * Then preload these Requests files first, before the files are deleted
+	 * and replaced to ensure the code is in memory if needed.
+	 */
+	$_old_files = array_merge( $_old_files, array_values( $_old_requests_files ) );
+	_preload_old_requests_classes_and_interfaces( $to );
 
 	/**
 	 * Filters feedback messages displayed during the core update process.
@@ -1034,9 +1138,14 @@ function update_core( $from, $to ) {
 	require WP_CONTENT_DIR . '/upgrade/version-current.php';
 	$wp_filesystem->delete( $versions_file );
 
-	$php_version       = PHP_VERSION;
-	$mysql_version     = $wpdb->db_version();
-	$old_wp_version    = $GLOBALS['wp_version']; // The version of WordPress we're updating from.
+	$php_version    = PHP_VERSION;
+	$mysql_version  = $wpdb->db_version();
+	$old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from.
+	/*
+	 * Note: str_contains() is not used here, as this file is included
+	 * when updating from older WordPress versions, in which case
+	 * the polyfills from wp-includes/compat.php may not be available.
+	 */
 	$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.
 	$php_compat        = version_compare( $php_version, $required_php_version, '>=' );
 
@@ -1121,8 +1230,10 @@ function update_core( $from, $to ) {
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Preparing to install the latest version&#8230;' ) );
 
-	// Don't copy wp-content, we'll deal with that below.
-	// We also copy version.php last so failed updates report their old version.
+	/*
+	 * Don't copy wp-content, we'll deal with that below.
+	 * We also copy version.php last so failed updates report their old version.
+	 */
 	$skip              = array( 'wp-content', 'wp-includes/version.php' );
 	$check_is_writable = array();
 
@@ -1139,6 +1250,11 @@ function update_core( $from, $to ) {
 
 		if ( is_array( $checksums ) ) {
 			foreach ( $checksums as $file => $checksum ) {
+				/*
+				 * Note: str_starts_with() is not used here, as this file is included
+				 * when updating from older WordPress versions, in which case
+				 * the polyfills from wp-includes/compat.php may not be available.
+				 */
 				if ( 'wp-content' === substr( $file, 0, 10 ) ) {
 					continue;
 				}
@@ -1246,6 +1362,11 @@ function update_core( $from, $to ) {
 
 	if ( isset( $checksums ) && is_array( $checksums ) ) {
 		foreach ( $checksums as $file => $checksum ) {
+			/*
+			 * Note: str_starts_with() is not used here, as this file is included
+			 * when updating from older WordPress versions, in which case
+			 * the polyfills from wp-includes/compat.php may not be available.
+			 */
 			if ( 'wp-content' === substr( $file, 0, 10 ) ) {
 				continue;
 			}
@@ -1279,8 +1400,10 @@ function update_core( $from, $to ) {
 			}
 		}
 
-		// If we don't have enough free space, it isn't worth trying again.
-		// Unlikely to be hit due to the check in unzip_file().
+		/*
+		 * If we don't have enough free space, it isn't worth trying again.
+		 * Unlikely to be hit due to the check in unzip_file().
+		 */
 		$available_space = function_exists( 'disk_free_space' ) ? @disk_free_space( ABSPATH ) : false;
 
 		if ( $available_space && $total_size >= $available_space ) {
@@ -1298,15 +1421,21 @@ function update_core( $from, $to ) {
 		}
 	}
 
-	// Custom content directory needs updating now.
-	// Copy languages.
+	/*
+	 * Custom content directory needs updating now.
+	 * Copy languages.
+	 */
 	if ( ! is_wp_error( $result ) && $wp_filesystem->is_dir( $from . $distro . 'wp-content/languages' ) ) {
 		if ( WP_LANG_DIR !== ABSPATH . WPINC . '/languages' || @is_dir( WP_LANG_DIR ) ) {
 			$lang_dir = WP_LANG_DIR;
 		} else {
 			$lang_dir = WP_CONTENT_DIR . '/languages';
 		}
-
+		/*
+		 * Note: str_starts_with() is not used here, as this file is included
+		 * when updating from older WordPress versions, in which case
+		 * the polyfills from wp-includes/compat.php may not be available.
+		 */
 		// Check if the language directory exists first.
 		if ( ! @is_dir( $lang_dir ) && 0 === strpos( $lang_dir, ABSPATH ) ) {
 			// If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
@@ -1337,8 +1466,10 @@ function update_core( $from, $to ) {
 	// Remove maintenance file, we're done with potential site-breaking changes.
 	$wp_filesystem->delete( $maintenance_file );
 
-	// 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users,
-	// preventing installation of Twenty Twelve.
+	/*
+	 * 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users,
+	 * preventing installation of Twenty Twelve.
+	 */
 	if ( '3.5' === $old_wp_version ) {
 		if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' )
 			&& ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )
@@ -1393,10 +1524,13 @@ function update_core( $from, $to ) {
 					$wp_filesystem->mkdir( $dest . $filename, FS_CHMOD_DIR );
 					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename );
 
-					// If a error occurs partway through this final step, keep the error flowing through, but keep process going.
+					/*
+					 * If an error occurs partway through this final step,
+					 * keep the error flowing through, but keep the process going.
+					 */
 					if ( is_wp_error( $_result ) ) {
 						if ( ! is_wp_error( $result ) ) {
-							$result = new WP_Error;
+							$result = new WP_Error();
 						}
 
 						$result->add(
@@ -1437,8 +1571,8 @@ function update_core( $from, $to ) {
 	// Deactivate the REST API plugin if its version is 2.0 Beta 4 or lower.
 	_upgrade_440_force_deactivate_incompatible_plugins();
 
-	// Deactivate the Gutenberg plugin if its version is 11.8 or lower.
-	_upgrade_590_force_deactivate_incompatible_plugins();
+	// Deactivate incompatible plugins.
+	_upgrade_core_deactivate_incompatible_plugins();
 
 	// Upgrade DB with separate request.
 	/** This filter is documented in wp-admin/includes/update-core.php */
@@ -1479,6 +1613,63 @@ function update_core( $from, $to ) {
 	return $wp_version;
 }
 
+/**
+ * Preloads old Requests classes and interfaces.
+ *
+ * This function preloads the old Requests code into memory before the
+ * upgrade process deletes the files. Why? Requests code is loaded into
+ * memory via an autoloader, meaning when a class or interface is needed
+ * If a request is in process, Requests could attempt to access code. If
+ * the file is not there, a fatal error could occur. If the file was
+ * replaced, the new code is not compatible with the old, resulting in
+ * a fatal error. Preloading ensures the code is in memory before the
+ * code is updated.
+ *
+ * @since 6.2.0
+ *
+ * @global array              $_old_requests_files Requests files to be preloaded.
+ * @global WP_Filesystem_Base $wp_filesystem       WordPress filesystem subclass.
+ * @global string             $wp_version          The WordPress version string.
+ *
+ * @param string $to Path to old WordPress installation.
+ */
+function _preload_old_requests_classes_and_interfaces( $to ) {
+	global $_old_requests_files, $wp_filesystem, $wp_version;
+
+	/*
+	 * Requests was introduced in WordPress 4.6.
+	 *
+	 * Skip preloading if the website was previously using
+	 * an earlier version of WordPress.
+	 */
+	if ( version_compare( $wp_version, '4.6', '<' ) ) {
+		return;
+	}
+
+	if ( ! defined( 'REQUESTS_SILENCE_PSR0_DEPRECATIONS' ) ) {
+		define( 'REQUESTS_SILENCE_PSR0_DEPRECATIONS', true );
+	}
+
+	foreach ( $_old_requests_files as $name => $file ) {
+		// Skip files that aren't interfaces or classes.
+		if ( is_int( $name ) ) {
+			continue;
+		}
+
+		// Skip if it's already loaded.
+		if ( class_exists( $name ) || interface_exists( $name ) ) {
+			continue;
+		}
+
+		// Skip if the file is missing.
+		if ( ! $wp_filesystem->is_file( $to . $file ) ) {
+			continue;
+		}
+
+		require_once $to . $file;
+	}
+}
+
 /**
  * Redirect to the About WordPress page after a successful upgrade.
  *
@@ -1601,6 +1792,11 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) {
 	$files     = array();
 
 	if ( file_exists( "{$directory}example.html" )
+		/*
+		 * Note: str_contains() is not used here, as this file is included
+		 * when updating from older WordPress versions, in which case
+		 * the polyfills from wp-includes/compat.php may not be available.
+		 */
 		&& false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' )
 	) {
 		$files[] = "{$directory}example.html";
@@ -1610,7 +1806,13 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) {
 	$dirs = array_filter(
 		$dirs,
 		static function( $dir ) {
-			// Skip any node_modules directories.
+			/*
+			 * Skip any node_modules directories.
+			 *
+			 * Note: str_contains() is not used here, as this file is included
+			 * when updating from older WordPress versions, in which case
+			 * the polyfills from wp-includes/compat.php may not be available.
+			 */
 			return false === strpos( $dir, 'node_modules' );
 		}
 	);
@@ -1637,14 +1839,16 @@ function _upgrade_440_force_deactivate_incompatible_plugins() {
 /**
  * @access private
  * @ignore
- * @since 5.9.0
+ * @since 5.8.0
+ * @since 5.9.0 The minimum compatible version of Gutenberg is 11.9.
+ * @since 6.1.1 The minimum compatible version of Gutenberg is 14.1.
  */
-function _upgrade_590_force_deactivate_incompatible_plugins() {
-	if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '11.9', '<' ) ) {
+function _upgrade_core_deactivate_incompatible_plugins() {
+	if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '14.1', '<' ) ) {
 		$deactivated_gutenberg['gutenberg'] = array(
 			'plugin_name'         => 'Gutenberg',
 			'version_deactivated' => GUTENBERG_VERSION,
-			'version_compatible'  => '11.9',
+			'version_compatible'  => '14.1',
 		);
 		if ( is_plugin_active_for_network( 'gutenberg/gutenberg.php' ) ) {
 			$deactivated_plugins = get_site_option( 'wp_force_deactivated_plugins', array() );
diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php
index 8661af75b59ea..78ca061f2e072 100644
--- a/src/wp-admin/includes/update.php
+++ b/src/wp-admin/includes/update.php
@@ -15,12 +15,15 @@
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
+
 	if ( ! is_array( $updates ) ) {
 		return false;
 	}
+
 	if ( empty( $updates ) ) {
 		return (object) array( 'response' => 'latest' );
 	}
+
 	return $updates[0];
 }
 
@@ -34,13 +37,14 @@ function get_preferred_from_update_core() {
  * @return array|false Array of the update objects on success, false on failure.
  */
 function get_core_updates( $options = array() ) {
-	$options   = array_merge(
+	$options = array_merge(
 		array(
 			'available' => true,
 			'dismissed' => false,
 		),
 		$options
 	);
+
 	$dismissed = get_site_option( 'dismissed_update_core' );
 
 	if ( ! is_array( $dismissed ) ) {
@@ -55,6 +59,7 @@ function get_core_updates( $options = array() ) {
 
 	$updates = $from_api->updates;
 	$result  = array();
+
 	foreach ( $updates as $update ) {
 		if ( 'autoupdate' === $update->response ) {
 			continue;
@@ -72,6 +77,7 @@ function get_core_updates( $options = array() ) {
 			}
 		}
 	}
+
 	return $result;
 }
 
@@ -86,6 +92,7 @@ function get_core_updates( $options = array() ) {
  */
 function find_core_auto_update() {
 	$updates = get_site_transient( 'update_core' );
+
 	if ( ! $updates || empty( $updates->updates ) ) {
 		return false;
 	}
@@ -93,7 +100,8 @@ function find_core_auto_update() {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
 	$auto_update = false;
-	$upgrader    = new WP_Automatic_Updater;
+	$upgrader    = new WP_Automatic_Updater();
+
 	foreach ( $updates->updates as $update ) {
 		if ( 'autoupdate' !== $update->response ) {
 			continue;
@@ -107,6 +115,7 @@ function find_core_auto_update() {
 			$auto_update = $update;
 		}
 	}
+
 	return $auto_update;
 }
 
@@ -124,6 +133,7 @@ function get_core_checksums( $version, $locale ) {
 	$url      = $http_url;
 
 	$ssl = wp_http_supports( array( 'ssl' ) );
+
 	if ( $ssl ) {
 		$url = set_url_scheme( $url, 'https' );
 	}
@@ -133,6 +143,7 @@ function get_core_checksums( $version, $locale ) {
 	);
 
 	$response = wp_remote_get( $url, $options );
+
 	if ( $ssl && is_wp_error( $response ) ) {
 		trigger_error(
 			sprintf(
@@ -142,10 +153,11 @@ function get_core_checksums( $version, $locale ) {
 			) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
 			headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 		);
+
 		$response = wp_remote_get( $http_url, $options );
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+	if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
 		return false;
 	}
 
@@ -170,6 +182,7 @@ function get_core_checksums( $version, $locale ) {
 function dismiss_core_update( $update ) {
 	$dismissed = get_site_option( 'dismissed_update_core' );
 	$dismissed[ $update->current . '|' . $update->locale ] = true;
+
 	return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
@@ -191,6 +204,7 @@ function undismiss_core_update( $version, $locale ) {
 	}
 
 	unset( $dismissed[ $key ] );
+
 	return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
@@ -211,11 +225,13 @@ function find_core_update( $version, $locale ) {
 	}
 
 	$updates = $from_api->updates;
+
 	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale ) {
+		if ( $update->current === $version && $update->locale === $locale ) {
 			return $update;
 		}
 	}
+
 	return false;
 }
 
@@ -234,8 +250,9 @@ function core_update_footer( $msg = '' ) {
 	}
 
 	$cur = get_preferred_from_update_core();
+
 	if ( ! is_object( $cur ) ) {
-		$cur = new stdClass;
+		$cur = new stdClass();
 	}
 
 	if ( ! isset( $cur->current ) ) {
@@ -303,7 +320,7 @@ function update_nag() {
 
 	$version_url = sprintf(
 		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+		esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 		sanitize_title( $cur->current )
 	);
 
@@ -335,6 +352,7 @@ function update_nag() {
  */
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
+
 	if ( current_user_can( 'switch_themes' ) ) {
 		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
 	}
@@ -384,6 +402,7 @@ function get_plugin_updates() {
 	$all_plugins     = get_plugins();
 	$upgrade_plugins = array();
 	$current         = get_site_transient( 'update_plugins' );
+
 	foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
 		if ( isset( $current->response[ $plugin_file ] ) ) {
 			$upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
@@ -405,8 +424,10 @@ function wp_plugin_update_rows() {
 	}
 
 	$plugins = get_site_transient( 'update_plugins' );
+
 	if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
 		$plugins = array_keys( $plugins->response );
+
 		foreach ( $plugins as $plugin_file ) {
 			add_action( "after_plugin_row_{$plugin_file}", 'wp_plugin_update_row', 10, 2 );
 		}
@@ -424,6 +445,7 @@ function wp_plugin_update_rows() {
  */
 function wp_plugin_update_row( $file, $plugin_data ) {
 	$current = get_site_transient( 'update_plugins' );
+
 	if ( ! isset( $current->response[ $file ] ) ) {
 		return false;
 	}
@@ -607,6 +629,7 @@ function get_theme_updates() {
 	}
 
 	$update_themes = array();
+
 	foreach ( $current->response as $stylesheet => $data ) {
 		$update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
 		$update_themes[ $stylesheet ]->update = $data;
@@ -626,6 +649,7 @@ function wp_theme_update_rows() {
 	}
 
 	$themes = get_site_transient( 'update_themes' );
+
 	if ( isset( $themes->response ) && is_array( $themes->response ) ) {
 		$themes = array_keys( $themes->response );
 
@@ -818,13 +842,16 @@ function wp_theme_update_row( $theme_key, $theme ) {
  * @since 2.7.0
  *
  * @global int $upgrading
+ *
  * @return void|false
  */
 function maintenance_nag() {
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 	global $upgrading;
+
 	$nag = isset( $upgrading );
+
 	if ( ! $nag ) {
 		$failed = get_site_option( 'auto_core_update_failed' );
 		/*
@@ -924,7 +951,12 @@ function wp_print_admin_notice_templates() {
 							printf( __( '%s updates failed.' ), '{{ data.errors }}' );
 							?>
 						<# } #>
-						<span class="screen-reader-text"><?php _e( 'Show more details' ); ?></span>
+						<span class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Show more details' );
+							?>
+						</span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				<# } #>
diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php
index 94d9d335f3028..23653d1c2b46c 100644
--- a/src/wp-admin/includes/upgrade.php
+++ b/src/wp-admin/includes/upgrade.php
@@ -351,7 +351,7 @@ function wp_install_defaults( $user_id ) {
 			$privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
 		} else {
 			if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-				include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
+				require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
 			}
 
 			$privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
@@ -440,8 +440,10 @@ function wp_install_defaults( $user_id ) {
 			$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'user_level' ) );
 			$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'capabilities' ) );
 
-			// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
-			// TODO: Get previous_blog_id.
+			/*
+			 * Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
+			 * TODO: Get previous_blog_id.
+			 */
 			if ( ! is_super_admin( $user_id ) && 1 != $user_id ) {
 				$wpdb->delete(
 					$wpdb->usermeta,
@@ -506,13 +508,13 @@ function wp_install_maybe_enable_pretty_permalinks() {
 
 		/*
 		 * Send a request to the site, and check whether
-		 * the 'x-pingback' header is returned as expected.
+		 * the 'X-Pingback' header is returned as expected.
 		 *
 		 * Uses wp_remote_get() instead of wp_remote_head() because web servers
 		 * can block head requests.
 		 */
 		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
-		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
+		$x_pingback_header = wp_remote_retrieve_header( $response, 'X-Pingback' );
 		$pretty_permalinks = $x_pingback_header && get_bloginfo( 'pingback_url' ) === $x_pingback_header;
 
 		if ( $pretty_permalinks ) {
@@ -654,6 +656,8 @@ function wp_upgrade() {
 			update_site_meta( get_current_blog_id(), 'db_last_updated', microtime() );
 		}
 
+		delete_transient( 'wp_core_block_css_files' );
+
 		/**
 		 * Fires after a site is fully upgraded.
 		 *
@@ -832,6 +836,10 @@ function upgrade_all() {
 		upgrade_600();
 	}
 
+	if ( $wp_current_db_version < 55853 ) {
+		upgrade_630();
+	}
+
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
@@ -1638,8 +1646,10 @@ function upgrade_290() {
 	global $wp_current_db_version;
 
 	if ( $wp_current_db_version < 11958 ) {
-		// Previously, setting depth to 1 would redundantly disable threading,
-		// but now 2 is the minimum depth to avoid confusion.
+		/*
+		 * Previously, setting depth to 1 would redundantly disable threading,
+		 * but now 2 is the minimum depth to avoid confusion.
+		 */
 		if ( get_option( 'thread_comments_depth' ) == '1' ) {
 			update_option( 'thread_comments_depth', 2 );
 			update_option( 'thread_comments', 0 );
@@ -1739,6 +1749,7 @@ function upgrade_330() {
 							$_sidebars_widgets[ $index ][ $i ] = $id;
 							continue;
 						}
+
 						$id = sanitize_title( $name );
 						if ( isset( $wp_registered_widgets[ $id ] ) ) {
 							$_sidebars_widgets[ $index ][ $i ] = $id;
@@ -1748,13 +1759,15 @@ function upgrade_330() {
 						$found = false;
 
 						foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-							if ( strtolower( $widget['name'] ) == strtolower( $name ) ) {
+							if ( strtolower( $widget['name'] ) === strtolower( $name ) ) {
 								$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
-								$found                             = true;
+
+								$found = true;
 								break;
-							} elseif ( sanitize_title( $widget['name'] ) == sanitize_title( $name ) ) {
+							} elseif ( sanitize_title( $widget['name'] ) === sanitize_title( $name ) ) {
 								$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
-								$found                             = true;
+
+								$found = true;
 								break;
 							}
 						}
@@ -1835,7 +1848,7 @@ function upgrade_350() {
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) ) {
+			if ( str_contains( $name, '-' ) ) {
 				$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
 			}
 		}
@@ -2290,6 +2303,29 @@ function upgrade_600() {
 	}
 }
 
+/**
+ * Executes changes made in WordPress 6.3.0.
+ *
+ * @ignore
+ * @since 6.3.0
+ *
+ * @global int $wp_current_db_version The old (current) database version.
+ */
+function upgrade_630() {
+	global $wp_current_db_version;
+
+	if ( $wp_current_db_version < 55853 ) {
+		if ( ! is_multisite() ) {
+			// Replace non-autoload option can_compress_scripts with autoload option, see #55270
+			$can_compress_scripts = get_option( 'can_compress_scripts', false );
+			if ( false !== $can_compress_scripts ) {
+				delete_option( 'can_compress_scripts' );
+				add_option( 'can_compress_scripts', $can_compress_scripts, '', 'yes' );
+			}
+		}
+	}
+}
+
 /**
  * Executes network-level upgrade routines.
  *
@@ -2449,7 +2485,7 @@ function upgrade_network() {
 /**
  * Creates a table in the database, if it doesn't already exist.
  *
- * This method checks for an existing database and creates a new one if it's not
+ * This method checks for an existing database table and creates a new one if it's not
  * already present. It doesn't rely on MySQL's "IF NOT EXISTS" statement, but chooses
  * to query all tables first and then run the SQL statement creating the table.
  *
@@ -2617,7 +2653,7 @@ function maybe_convert_table_to_utf8mb4( $table ) {
  */
 function get_alloptions_110() {
 	global $wpdb;
-	$all_options = new stdClass;
+	$all_options = new stdClass();
 	$options     = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
 	if ( $options ) {
 		foreach ( $options as $option ) {
@@ -2739,19 +2775,27 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
 	$iqueries   = array(); // Insertion queries.
 	$for_update = array();
 
-	// Create a tablename index for an array ($cqueries) of queries.
+	// Create a tablename index for an array ($cqueries) of recognized query types.
 	foreach ( $queries as $qry ) {
 		if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
 			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
 			$for_update[ $matches[1] ]            = 'Created table ' . $matches[1];
-		} elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
+			continue;
+		}
+
+		if ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
 			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
+			continue;
+		}
+
+		if ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
+			continue;
+		}
+
+		if ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
 			$iqueries[] = $qry;
-		} else {
-			// Unrecognized query type.
+			continue;
 		}
 	}
 
@@ -3070,16 +3114,20 @@ function dbDelta( $queries = '', $execute = true ) { // phpcs:ignore WordPress.N
 				} elseif ( $index_data['unique'] ) {
 					$index_string .= 'UNIQUE ';
 				}
+
 				if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
 					$index_string .= 'FULLTEXT ';
 				}
+
 				if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
 					$index_string .= 'SPATIAL ';
 				}
+
 				$index_string .= 'KEY ';
 				if ( 'primary' !== $index_name ) {
 					$index_string .= '`' . $index_name . '`';
 				}
+
 				$index_columns = '';
 
 				// For each column in the index.
@@ -3176,8 +3224,9 @@ function make_db_current_silent( $tables = 'all' ) {
  * @return bool
  */
 function make_site_theme_from_oldschool( $theme_name, $template ) {
-	$home_path = get_home_path();
-	$site_dir  = WP_CONTENT_DIR . "/themes/$template";
+	$home_path   = get_home_path();
+	$site_dir    = WP_CONTENT_DIR . "/themes/$template";
+	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
 
 	if ( ! file_exists( "$home_path/index.php" ) ) {
 		return false;
@@ -3204,8 +3253,8 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
 		// Check to make sure it's not a new index.
 		if ( 'index.php' === $oldfile ) {
 			$index = implode( '', file( "$oldpath/$oldfile" ) );
-			if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
-				if ( ! copy( WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile" ) ) {
+			if ( str_contains( $index, 'WP_USE_THEMES' ) ) {
+				if ( ! copy( "$default_dir/$oldfile", "$site_dir/$newfile" ) ) {
 					return false;
 				}
 
@@ -3231,10 +3280,18 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
 				}
 
 				// Update stylesheet references.
-				$line = str_replace( "<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line );
+				$line = str_replace(
+					"<?php echo __get_option('siteurl'); ?>/wp-layout.css",
+					"<?php bloginfo('stylesheet_url'); ?>",
+					$line
+				);
 
 				// Update comments template inclusion.
-				$line = str_replace( "<?php include(ABSPATH . 'wp-comments.php'); ?>", '<?php comments_template(); ?>', $line );
+				$line = str_replace(
+					"<?php include(ABSPATH . 'wp-comments.php'); ?>",
+					'<?php comments_template(); ?>',
+					$line
+				);
 
 				fwrite( $f, "{$line}\n" );
 			}
@@ -3243,7 +3300,13 @@ function make_site_theme_from_oldschool( $theme_name, $template ) {
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option( 'siteurl' ) . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\n" .
+		"Theme Name: $theme_name\n" .
+		'Theme URI: ' . __get_option( 'siteurl' ) . "\n" .
+		"Description: A theme automatically created by the update.\n" .
+		"Version: 1.0\n" .
+		"Author: Moi\n" .
+		"*/\n";
 
 	$stylelines = file_get_contents( "$site_dir/style.css" );
 	if ( $stylelines ) {
@@ -3272,8 +3335,10 @@ function make_site_theme_from_default( $theme_name, $template ) {
 	$site_dir    = WP_CONTENT_DIR . "/themes/$template";
 	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
 
-	// Copy files from the default theme to the site theme.
-	// $files = array( 'index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css' );
+	/*
+	 * Copy files from the default theme to the site theme.
+	 * $files = array( 'index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css' );
+	 */
 
 	$theme_dir = @opendir( $default_dir );
 	if ( $theme_dir ) {
@@ -3281,9 +3346,11 @@ function make_site_theme_from_default( $theme_name, $template ) {
 			if ( is_dir( "$default_dir/$theme_file" ) ) {
 				continue;
 			}
+
 			if ( ! copy( "$default_dir/$theme_file", "$site_dir/$theme_file" ) ) {
 				return;
 			}
+
 			chmod( "$site_dir/$theme_file", 0777 );
 		}
 
@@ -3295,20 +3362,25 @@ function make_site_theme_from_default( $theme_name, $template ) {
 	if ( $stylelines ) {
 		$f = fopen( "$site_dir/style.css", 'w' );
 
+		$headers = array(
+			'Theme Name:'  => $theme_name,
+			'Theme URI:'   => __get_option( 'url' ),
+			'Description:' => 'Your theme.',
+			'Version:'     => '1',
+			'Author:'      => 'You',
+		);
+
 		foreach ( $stylelines as $line ) {
-			if ( strpos( $line, 'Theme Name:' ) !== false ) {
-				$line = 'Theme Name: ' . $theme_name;
-			} elseif ( strpos( $line, 'Theme URI:' ) !== false ) {
-				$line = 'Theme URI: ' . __get_option( 'url' );
-			} elseif ( strpos( $line, 'Description:' ) !== false ) {
-				$line = 'Description: Your theme.';
-			} elseif ( strpos( $line, 'Version:' ) !== false ) {
-				$line = 'Version: 1';
-			} elseif ( strpos( $line, 'Author:' ) !== false ) {
-				$line = 'Author: You';
+			foreach ( $headers as $header => $value ) {
+				if ( str_contains( $line, $header ) ) {
+					$line = $header . ' ' . $value;
+					break;
+				}
 			}
+
 			fwrite( $f, $line . "\n" );
 		}
+
 		fclose( $f );
 	}
 
@@ -3324,9 +3396,11 @@ function make_site_theme_from_default( $theme_name, $template ) {
 			if ( is_dir( "$default_dir/images/$image" ) ) {
 				continue;
 			}
+
 			if ( ! copy( "$default_dir/images/$image", "$site_dir/images/$image" ) ) {
 				return;
 			}
+
 			chmod( "$site_dir/images/$image", 0777 );
 		}
 
diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
index 134da30514716..1d2d919348c79 100644
--- a/src/wp-admin/includes/user.php
+++ b/src/wp-admin/includes/user.php
@@ -29,7 +29,7 @@ function add_user() {
  */
 function edit_user( $user_id = 0 ) {
 	$wp_roles = wp_roles();
-	$user     = new stdClass;
+	$user     = new stdClass();
 	$user_id  = (int) $user_id;
 	if ( $user_id ) {
 		$update           = true;
@@ -119,7 +119,13 @@ function edit_user( $user_id = 0 ) {
 		} elseif ( '' === $locale ) {
 			$locale = 'en_US';
 		} elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
-			$locale = '';
+			if ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
+				if ( ! wp_download_language_pack( $locale ) ) {
+					$locale = '';
+				}
+			} else {
+				$locale = '';
+			}
 		}
 
 		$user->locale = $locale;
@@ -168,12 +174,12 @@ function edit_user( $user_id = 0 ) {
 	}
 
 	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
+	if ( str_contains( wp_unslash( $pass1 ), '\\' ) ) {
 		$errors->add( 'pass', __( '<strong>Error:</strong> Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 	}
 
 	// Checking the password has been typed twice the same.
-	if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
+	if ( ( $update || ! empty( $pass1 ) ) && $pass1 !== $pass2 ) {
 		$errors->add( 'pass', __( '<strong>Error:</strong> Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
 	}
 
@@ -196,14 +202,14 @@ function edit_user( $user_id = 0 ) {
 		$errors->add( 'invalid_username', __( '<strong>Error:</strong> Sorry, that username is not allowed.' ) );
 	}
 
-	/* checking email address */
+	// Checking email address.
 	if ( empty( $user->user_email ) ) {
 		$errors->add( 'empty_email', __( '<strong>Error:</strong> Please enter an email address.' ), array( 'form-field' => 'email' ) );
 	} elseif ( ! is_email( $user->user_email ) ) {
 		$errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ), array( 'form-field' => 'email' ) );
 	} else {
 		$owner_id = email_exists( $user->user_email );
-		if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
+		if ( $owner_id && ( ! $update || ( $owner_id !== $user->ID ) ) ) {
 			$errors->add( 'email_exists', __( '<strong>Error:</strong> This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
 		}
 	}
@@ -318,18 +324,21 @@ function get_users_drafts( $user_id ) {
 }
 
 /**
- * Remove user and optionally reassign posts and links to another user.
+ * Delete user and optionally reassign posts and links to another user.
+ *
+ * Note that on a Multisite installation the user only gets removed from the site
+ * and does not get deleted from the database.
  *
- * If the $reassign parameter is not assigned to a User ID, then all posts will
- * be deleted of that user. The action {@see 'delete_user'} that is passed the User ID
+ * If the `$reassign` parameter is not assigned to a user ID, then all posts will
+ * be deleted of that user. The action {@see 'delete_user'} that is passed the user ID
  * being deleted will be run after the posts are either reassigned or deleted.
- * The user meta will also be deleted that are for that User ID.
+ * The user meta will also be deleted that are for that user ID.
  *
  * @since 2.0.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $id User ID.
+ * @param int $id       User ID.
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */
@@ -355,7 +364,10 @@ function wp_delete_user( $id, $reassign = null ) {
 	}
 
 	/**
-	 * Fires immediately before a user is deleted from the database.
+	 * Fires immediately before a user is deleted from the site.
+	 *
+	 * Note that on a Multisite installation the user only gets removed from the site
+	 * and does not get deleted from the database.
 	 *
 	 * @since 2.0.0
 	 * @since 5.5.0 Added the `$user` parameter.
@@ -434,7 +446,11 @@ function wp_delete_user( $id, $reassign = null ) {
 	clean_user_cache( $user );
 
 	/**
-	 * Fires immediately after a user is deleted from the database.
+	 * Fires immediately after a user is deleted from the site.
+	 *
+	 * Note that on a Multisite installation the user may not have been deleted from
+	 * the database depending on whether `wp_delete_user()` or `wpmu_delete_user()`
+	 * was called.
 	 *
 	 * @since 2.9.0
 	 * @since 5.5.0 Added the `$user` parameter.
@@ -479,7 +495,7 @@ function default_password_nag_handler( $errors = false ) {
 
 	// get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
 	if ( 'hide' === get_user_setting( 'default_password_nag' )
-		|| isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag']
+		|| isset( $_GET['default_password_nag'] ) && '0' === $_GET['default_password_nag']
 	) {
 		delete_user_setting( 'default_password_nag' );
 		update_user_meta( $user_ID, 'default_password_nag', false );
@@ -501,7 +517,7 @@ function default_password_nag_edit_user( $user_ID, $old_data ) {
 	$new_data = get_userdata( $user_ID );
 
 	// Remove the nag if the password has been changed.
-	if ( $new_data->user_pass != $old_data->user_pass ) {
+	if ( $new_data->user_pass !== $old_data->user_pass ) {
 		delete_user_setting( 'default_password_nag' );
 		update_user_meta( $user_ID, 'default_password_nag', false );
 	}
@@ -519,15 +535,28 @@ function default_password_nag() {
 	if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
 		return;
 	}
-
-	echo '<div class="error default-password-nag">';
-	echo '<p>';
-	echo '<strong>' . __( 'Notice:' ) . '</strong> ';
-	_e( 'You&rsquo;re using the auto-generated password for your account. Would you like to change it?' );
-	echo '</p><p>';
-	printf( '<a href="%s">' . __( 'Yes, take me to my profile page' ) . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __( 'No thanks, do not remind me again' ) . '</a>', '?default_password_nag=0' );
-	echo '</p></div>';
+	?>
+	<div class="error default-password-nag">
+		<p>
+			<strong><?php _e( 'Notice:' ); ?></strong>
+			<?php _e( 'You are using the auto-generated password for your account. Would you like to change it?' ); ?>
+		</p>
+		<p>
+		<?php
+		printf(
+			'<a href="%1$s">%2$s</a> | ',
+			esc_url( get_edit_profile_url() . '#password' ),
+			__( 'Yes, take me to my profile page' )
+		);
+		printf(
+			'<a href="%1$s" id="default-password-nag-no">%2$s</a>',
+			'?default_password_nag=0',
+			__( 'No thanks, do not remind me again' )
+		);
+		?>
+		</p>
+	</div>
+	<?php
 }
 
 /**
@@ -606,6 +635,7 @@ function admin_created_user_email( $text ) {
  * Checks if the Authorize Application Password request is valid.
  *
  * @since 5.6.0
+ * @since 6.2.0 Allow insecure HTTP connections for the local environment.
  *
  * @param array   $request {
  *     The array of request data. All arguments are optional and may be empty.
@@ -619,12 +649,13 @@ function admin_created_user_email( $text ) {
  * @return true|WP_Error True if the request is valid, a WP_Error object contains errors if not.
  */
 function wp_is_authorize_application_password_request_valid( $request, $user ) {
-	$error = new WP_Error();
+	$error    = new WP_Error();
+	$is_local = 'local' === wp_get_environment_type();
 
 	if ( ! empty( $request['success_url'] ) ) {
 		$scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME );
 
-		if ( 'http' === $scheme ) {
+		if ( 'http' === $scheme && ! $is_local ) {
 			$error->add(
 				'invalid_redirect_scheme',
 				__( 'The success URL must be served over a secure connection.' )
@@ -635,7 +666,7 @@ function wp_is_authorize_application_password_request_valid( $request, $user ) {
 	if ( ! empty( $request['reject_url'] ) ) {
 		$scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME );
 
-		if ( 'http' === $scheme ) {
+		if ( 'http' === $scheme && ! $is_local ) {
 			$error->add(
 				'invalid_redirect_scheme',
 				__( 'The rejection URL must be served over a secure connection.' )
diff --git a/src/wp-admin/includes/widgets.php b/src/wp-admin/includes/widgets.php
index a5d65a7513a38..93979b6a25de5 100644
--- a/src/wp-admin/includes/widgets.php
+++ b/src/wp-admin/includes/widgets.php
@@ -67,6 +67,8 @@ function wp_list_widgets() {
  * @since 3.1.0
  * @access private
  *
+ * @param array $a First array.
+ * @param array $b Second array.
  * @return int
  */
 function _sort_name_callback( $a, $b ) {
@@ -245,13 +247,13 @@ function wp_widget_control( $sidebar_args ) {
 		<button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
 			<span class="screen-reader-text edit">
 				<?php
-				/* translators: %s: Widget title. */
+				/* translators: Hidden accessibility text. %s: Widget title. */
 				printf( __( 'Edit widget: %s' ), $widget_title );
 				?>
 			</span>
 			<span class="screen-reader-text add">
 				<?php
-				/* translators: %s: Widget title. */
+				/* translators: Hidden accessibility text. %s: Widget title. */
 				printf( __( 'Add widget: %s' ), $widget_title );
 				?>
 			</span>
diff --git a/src/wp-admin/install-helper.php b/src/wp-admin/install-helper.php
index 733321c13ee76..d9aaaba58f932 100644
--- a/src/wp-admin/install-helper.php
+++ b/src/wp-admin/install-helper.php
@@ -1,28 +1,30 @@
 <?php
 /**
- * Plugins may load this file to gain access to special helper functions for
- * plugin installation. This file is not included by WordPress and it is
+ * Plugins may load this file to gain access to special helper functions
+ * for plugin installation. This file is not included by WordPress and it is
  * recommended, to prevent fatal errors, that this file is included using
  * require_once.
  *
  * These functions are not optimized for speed, but they should only be used
  * once in a while, so speed shouldn't be a concern. If it is and you are
- * needing to use these functions a lot, you might experience time outs. If you
- * do, then it is advised to just write the SQL code yourself.
+ * needing to use these functions a lot, you might experience timeouts.
+ * If you do, then it is advised to just write the SQL code yourself.
  *
  *     check_column( 'wp_links', 'link_description', 'mediumtext' );
+ *
  *     if ( check_column( $wpdb->comments, 'comment_author', 'tinytext' ) ) {
  *         echo "ok\n";
  *     }
  *
- *     $error_count = 0;
- *     $tablename = $wpdb->links;
  *     // Check the column.
  *     if ( ! check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) {
  *         $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
  *         $q = $wpdb->query( $ddl );
  *     }
  *
+ *     $error_count = 0;
+ *     $tablename   = $wpdb->links;
+ *
  *     if ( check_column( $wpdb->links, 'link_description', 'varchar( 255 )' ) ) {
  *         $res .= $tablename . ' - ok <br />';
  *     } else {
@@ -59,9 +61,10 @@ function maybe_create_table( $table_name, $create_ddl ) {
 		}
 
 		// Didn't find it, so try to create it.
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query.
 		$wpdb->query( $create_ddl );
 
-		// We cannot directly tell that whether this succeeded!
+		// We cannot directly tell whether this succeeded!
 		foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
 			if ( $table === $table_name ) {
 				return true;
@@ -88,6 +91,7 @@ function maybe_create_table( $table_name, $create_ddl ) {
 	function maybe_add_column( $table_name, $column_name, $create_ddl ) {
 		global $wpdb;
 
+		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names.
 		foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
 			if ( $column === $column_name ) {
 				return true;
@@ -95,9 +99,11 @@ function maybe_add_column( $table_name, $column_name, $create_ddl ) {
 		}
 
 		// Didn't find it, so try to create it.
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query.
 		$wpdb->query( $create_ddl );
 
-		// We cannot directly tell that whether this succeeded!
+		// We cannot directly tell whether this succeeded!
+		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names.
 		foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
 			if ( $column === $column_name ) {
 				return true;
@@ -123,13 +129,16 @@ function maybe_add_column( $table_name, $column_name, $create_ddl ) {
 function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
 	global $wpdb;
 
+	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names.
 	foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
 		if ( $column === $column_name ) {
 
 			// Found it, so try to drop it.
+			// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- No applicable variables for this query.
 			$wpdb->query( $drop_ddl );
 
-			// We cannot directly tell that whether this succeeded!
+			// We cannot directly tell whether this succeeded!
+			// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names.
 			foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
 				if ( $column === $column_name ) {
 					return false;
@@ -147,16 +156,16 @@ function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
  *
  * Uses the SQL DESC for retrieving the table info for the column. It will help
  * understand the parameters, if you do more research on what column information
- * is returned by the SQL statement. Pass in null to skip checking that
- * criteria.
+ * is returned by the SQL statement. Pass in null to skip checking that criteria.
+ *
+ * Column names returned from DESC table are case sensitive and are as listed:
  *
- * Column names returned from DESC table are case sensitive and are listed:
- *      Field
- *      Type
- *      Null
- *      Key
- *      Default
- *      Extra
+ *  - Field
+ *  - Type
+ *  - Null
+ *  - Key
+ *  - Default
+ *  - Extra
  *
  * @since 1.0.0
  *
@@ -174,7 +183,9 @@ function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
 function check_column( $table_name, $col_name, $col_type, $is_null = null, $key = null, $default_value = null, $extra = null ) {
 	global $wpdb;
 
-	$diffs   = 0;
+	$diffs = 0;
+
+	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Cannot be prepared. Fetches columns for table names.
 	$results = $wpdb->get_results( "DESC $table_name" );
 
 	foreach ( $results as $row ) {
diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 3edc3230cdfaa..971392d07647c 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -123,8 +123,8 @@ function display_setup_form( $error = null ) {
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
 				?>
-				<input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
-				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
+				<input name="user_name" type="text" id="user_login" size="25" aria-describedby="user-name-desc" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
+				<p id="user-name-desc"><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
 				<?php
 			}
 			?>
@@ -140,14 +140,16 @@ function display_setup_form( $error = null ) {
 			<td>
 				<div class="wp-pwd">
 					<?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
-					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="new-password" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<div class="password-input-wrapper">
+						<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="new-password" spellcheck="false" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result admin-password-desc" />
+						<div id="pass-strength-result" aria-live="polite"></div>
+					</div>
 					<button type="button" class="button wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 						<span class="dashicons dashicons-hidden"></span>
 						<span class="text"><?php _e( 'Hide' ); ?></span>
 					</button>
-					<div id="pass-strength-result" aria-live="polite"></div>
 				</div>
-				<p><span class="description important hide-if-no-js">
+				<p id="admin-password-desc"><span class="description important hide-if-no-js">
 				<strong><?php _e( 'Important:' ); ?></strong>
 				<?php /* translators: The non-breaking space prevents 1Password from thinking the text "log in" should trigger a password save prompt. */ ?>
 				<?php _e( 'You will need this password to log&nbsp;in. Please store it in a secure location.' ); ?></span></p>
@@ -160,7 +162,7 @@ function display_setup_form( $error = null ) {
 				</label>
 			</th>
 			<td>
-				<input name="admin_password2" type="password" id="pass2" autocomplete="new-password" />
+				<input type="password" name="admin_password2" id="pass2" autocomplete="new-password" spellcheck="false" />
 			</td>
 		</tr>
 		<tr class="pw-weak">
@@ -175,30 +177,38 @@ function display_setup_form( $error = null ) {
 		<?php endif; ?>
 		<tr>
 			<th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
-			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
-			<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
+			<td><input name="admin_email" type="email" id="admin_email" size="25" aria-describedby="admin-email-desc" value="<?php echo esc_attr( $admin_email ); ?>" />
+			<p id="admin-email-desc"><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
 		</tr>
 		<tr>
 			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?></th>
 			<td>
 				<fieldset>
-					<legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </span></legend>
+					<legend class="screen-reader-text"><span>
+						<?php
+						has_action( 'blog_privacy_selector' )
+							/* translators: Hidden accessibility text. */
+							? _e( 'Site visibility' )
+							/* translators: Hidden accessibility text. */
+							: _e( 'Search engine visibility' );
+						?>
+					</span></legend>
 					<?php
 					if ( has_action( 'blog_privacy_selector' ) ) {
 						?>
 						<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( 1, $blog_public ); ?> />
 						<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br />
-						<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
+						<input id="blog-norobots" type="radio" name="blog_public"  aria-describedby="public-desc" value="0" <?php checked( 0, $blog_public ); ?> />
 						<label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-						<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
+						<p id="public-desc" class="description"><?php _e( 'Note: Discouraging search engines does not block access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
 						<?php
 						/** This action is documented in wp-admin/options-reading.php */
 						do_action( 'blog_privacy_selector' );
 					} else {
 						?>
-						<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
+						<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" aria-describedby="privacy-desc" value="0" <?php checked( 0, $blog_public ); ?> />
 						<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-						<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
+						<p id="privacy-desc" class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
 					<?php } ?>
 				</fieldset>
 			</td>
@@ -216,7 +226,7 @@ function display_setup_form( $error = null ) {
 	die(
 		'<h1>' . __( 'Already Installed' ) . '</h1>' .
 		'<p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p>' .
-		'<p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p>' .
+		'<p class="step"><a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log In' ) . '</a></p>' .
 		'</body></html>'
 	);
 }
@@ -236,7 +246,7 @@ function display_setup_form( $error = null ) {
 
 $version_url = sprintf(
 	/* translators: %s: WordPress version. */
-	esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+	esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 	sanitize_title( $wp_version )
 );
 
@@ -435,7 +445,7 @@ function display_setup_form( $error = null ) {
 	</tr>
 </table>
 
-<p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
+<p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
 
 			<?php
 		}
diff --git a/src/wp-admin/link-manager.php b/src/wp-admin/link-manager.php
index 47f035477611a..5f56ac7983bd9 100644
--- a/src/wp-admin/link-manager.php
+++ b/src/wp-admin/link-manager.php
@@ -77,7 +77,7 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Links_Screen">Documentation on Managing Links</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
diff --git a/src/wp-admin/link-parse-opml.php b/src/wp-admin/link-parse-opml.php
index c573db6f609bf..c0f02bd92d3e6 100644
--- a/src/wp-admin/link-parse-opml.php
+++ b/src/wp-admin/link-parse-opml.php
@@ -16,7 +16,9 @@
 global $opml;
 
 /**
- * XML callback function for the start of a new XML tag.
+ * Starts a new XML tag.
+ *
+ * Callback function for xml_set_element_handler().
  *
  * @since 0.71
  * @access private
@@ -60,7 +62,9 @@ function startElement( $parser, $tag_name, $attrs ) { // phpcs:ignore WordPress.
 }
 
 /**
- * XML callback function that is called at the end of a XML tag.
+ * Ends a new XML tag.
+ *
+ * Callback function for xml_set_element_handler().
  *
  * @since 0.71
  * @access private
diff --git a/src/wp-admin/load-styles.php b/src/wp-admin/load-styles.php
index ea3aab5b74a6e..fe4a4ee66e451 100644
--- a/src/wp-admin/load-styles.php
+++ b/src/wp-admin/load-styles.php
@@ -73,7 +73,8 @@
 
 	$content = get_file( $path ) . "\n";
 
-	if ( strpos( $style->src, '/' . WPINC . '/css/' ) === 0 ) {
+	// Note: str_starts_with() is not used here, as wp-includes/compat.php is not loaded in this file.
+	if ( 0 === strpos( $style->src, '/' . WPINC . '/css/' ) ) {
 		$content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
 		$content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
 		$content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content );
diff --git a/src/wp-admin/maint/repair.php b/src/wp-admin/maint/repair.php
index 2399f766bebb9..554e466d76f3e 100644
--- a/src/wp-admin/maint/repair.php
+++ b/src/wp-admin/maint/repair.php
@@ -27,7 +27,10 @@
 
 if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 
-	echo '<h1 class="screen-reader-text">' . __( 'Allow automatic database repair' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Allow automatic database repair' ) .
+	'</h1>';
 
 	echo '<p>';
 	printf(
@@ -73,27 +76,27 @@
 
 	if ( $duplicated_keys || $missing_key ) {
 
-		echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
+		echo '<h2 class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Check secret keys' ) .
+		'</h2>';
 
 		/* translators: 1: wp-config.php, 2: Secret key service URL. */
 		echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
 	}
 } elseif ( isset( $_GET['repair'] ) ) {
 
-	echo '<h1 class="screen-reader-text">' . __( 'Database repair results' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Database repair results' ) .
+	'</h1>';
 
-	$optimize = 2 == $_GET['repair'];
+	$optimize = '2' === $_GET['repair'];
 	$okay     = true;
 	$problems = array();
 
 	$tables = $wpdb->tables();
 
-	// Sitecategories may not exist if global terms are disabled.
-	$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->sitecategories ) );
-	if ( is_multisite() && ! $wpdb->get_var( $query ) ) {
-		unset( $tables['sitecategories'] );
-	}
-
 	/**
 	 * Filters additional database tables to repair.
 	 *
@@ -168,7 +171,10 @@
 	}
 } else {
 
-	echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
+	echo '<h1 class="screen-reader-text">' .
+		/* translators: Hidden accessibility text. */
+		__( 'WordPress database repair' ) .
+	'</h1>';
 
 	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' === $_GET['referrer'] ) {
 		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php
index 94fa50ff3dcaf..fa50644d2d2cd 100644
--- a/src/wp-admin/media-new.php
+++ b/src/wp-admin/media-new.php
@@ -58,8 +58,8 @@
 );
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/media-add-new-screen/">Documentation on Uploading Media Files</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/media-add-new-screen/">Documentation on Uploading Media Files</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php
index 62399a2a3a3aa..5b7ac353c694b 100644
--- a/src/wp-admin/media.php
+++ b/src/wp-admin/media.php
@@ -2,11 +2,14 @@
 /**
  * Media management action handler.
  *
+ * This file is deprecated, use 'wp-admin/upload.php' instead.
+ *
+ * @deprecated 6.3.0
  * @package WordPress
  * @subpackage Administration
  */
 
-/** Load WordPress Administration Bootstrap */
+/** Load WordPress Administration Bootstrap. */
 require_once __DIR__ . '/admin.php';
 
 $parent_file  = 'upload.php';
@@ -16,163 +19,17 @@
 
 switch ( $action ) {
 	case 'editattachment':
-		$attachment_id = (int) $_POST['attachment_id'];
-		check_admin_referer( 'media-form' );
-
-		if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this attachment.' ) );
-		}
-
-		$errors = media_upload_form_handler();
-
-		if ( empty( $errors ) ) {
-			$location = 'media.php';
-			$referer  = wp_get_original_referer();
-			if ( $referer ) {
-				if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) === $attachment_id ) ) {
-					$location = $referer;
-				}
-			}
-			if ( false !== strpos( $location, 'upload.php' ) ) {
-				$location = remove_query_arg( 'message', $location );
-				$location = add_query_arg( 'posted', $attachment_id, $location );
-			} elseif ( false !== strpos( $location, 'media.php' ) ) {
-				$location = add_query_arg( 'message', 'updated', $location );
-			}
-			wp_redirect( $location );
-			exit;
-		}
-
-		// No break.
 	case 'edit':
-		// Used in the HTML title tag.
-		$title = __( 'Edit Media' );
-
-		if ( empty( $errors ) ) {
-			$errors = null;
-		}
-
 		if ( empty( $_GET['attachment_id'] ) ) {
-			wp_redirect( admin_url( 'upload.php' ) );
+			wp_redirect( admin_url( 'upload.php?error=deprecated' ) );
 			exit;
 		}
 		$att_id = (int) $_GET['attachment_id'];
 
-		if ( ! current_user_can( 'edit_post', $att_id ) ) {
-			wp_die( __( 'Sorry, you are not allowed to edit this attachment.' ) );
-		}
-
-		$att = get_post( $att_id );
-
-		if ( empty( $att->ID ) ) {
-			wp_die( __( 'You attempted to edit an attachment that does not exist. Perhaps it was deleted?' ) );
-		}
-		if ( 'attachment' !== $att->post_type ) {
-			wp_die( __( 'You attempted to edit an item that is not an attachment. Please go back and try again.' ) );
-		}
-		if ( 'trash' === $att->post_status ) {
-			wp_die( __( 'You cannot edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
-		}
-
-		add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
-
-		wp_enqueue_script( 'wp-ajax-response' );
-		wp_enqueue_script( 'image-edit' );
-		wp_enqueue_style( 'imgareaselect' );
-
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => 'overview',
-				'title'   => __( 'Overview' ),
-				'content' =>
-					'<p>' . __( 'This screen allows you to edit fields for metadata in a file within the media library.' ) . '</p>' .
-					'<p>' . __( 'For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.' ) . '</p>' .
-					'<p>' . __( 'Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.' ) . '</p>' .
-					'<p>' . __( 'Remember to click Update Media to save metadata entered or changed.' ) . '</p>',
-			)
-		);
-
-		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/article/edit-media/">Documentation on Edit Media</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
-		);
-
-		require_once ABSPATH . 'wp-admin/admin-header.php';
-
-		$parent_file = 'upload.php';
-		$message     = '';
-		$class       = '';
-		if ( isset( $_GET['message'] ) ) {
-			switch ( $_GET['message'] ) {
-				case 'updated':
-					$message = __( 'Media file updated.' );
-					$class   = 'updated';
-					break;
-			}
-		}
-		if ( $message ) {
-			echo "<div id='message' class='$class'><p>$message</p></div>\n";
-		}
-
-		?>
-
-	<div class="wrap">
-	<h1 class="wp-heading-inline">
-		<?php
-		echo esc_html( $title );
-		?>
-</h1>
-
-		<?php
-		if ( current_user_can( 'upload_files' ) ) {
-			?>
-	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a>
-<?php } ?>
-
-	<hr class="wp-header-end">
-
-	<form method="post" class="media-upload-form" id="media-single-form">
-	<p class="submit" style="padding-bottom: 0;">
-		<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
-	</p>
-
-	<div class="media-single">
-	<div id="media-item-<?php echo $att_id; ?>" class="media-item">
-		<?php
-		echo get_media_item(
-			$att_id,
-			array(
-				'toggle'     => false,
-				'send'       => false,
-				'delete'     => false,
-				'show_title' => false,
-				'errors'     => ! empty( $errors[ $att_id ] ) ? $errors[ $att_id ] : null,
-			)
-		);
-		?>
-	</div>
-	</div>
-
-		<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
-	<input type="hidden" name="post_id" id="post_id" value="<?php echo isset( $post_id ) ? esc_attr( $post_id ) : ''; ?>" />
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $att_id ); ?>" />
-	<input type="hidden" name="action" value="editattachment" />
-		<?php wp_original_referer_field( true, 'previous' ); ?>
-		<?php wp_nonce_field( 'media-form' ); ?>
-
-	</form>
-
-	</div>
-
-		<?php
-
-		require_once ABSPATH . 'wp-admin/admin-footer.php';
-
+		wp_redirect( admin_url( "upload.php?item={$att_id}&error=deprecated" ) );
 		exit;
 
 	default:
-		wp_redirect( admin_url( 'upload.php' ) );
+		wp_redirect( admin_url( 'upload.php?error=deprecated' ) );
 		exit;
-
 }
diff --git a/src/wp-admin/menu-header.php b/src/wp-admin/menu-header.php
index ee90d23152787..9b38e6f77d9d0 100644
--- a/src/wp-admin/menu-header.php
+++ b/src/wp-admin/menu-header.php
@@ -112,7 +112,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 		$img_style = '';
 		$img_class = ' dashicons-before';
 
-		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+		if ( str_contains( $class, 'wp-menu-separator' ) ) {
 			$is_separator = true;
 		}
 
@@ -127,12 +127,12 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 			if ( 'none' === $item[6] || 'div' === $item[6] ) {
 				$img = '<br />';
-			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+			} elseif ( str_starts_with( $item[6], 'data:image/svg+xml;base64,' ) ) {
 				$img = '<br />';
 				// The value is base64-encoded data, so esc_attr() is used here instead of esc_url().
 				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
 				$img_class = ' svg';
-			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+			} elseif ( str_starts_with( $item[6], 'dashicons-' ) ) {
 				$img       = '<br />';
 				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
 			}
@@ -226,8 +226,10 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 						$class[]          = 'current';
 						$aria_attributes .= ' aria-current="page"';
 					}
-					// If plugin_page is set the parent must either match the current page or not physically exist.
-					// This allows plugin pages with the same hook to exist under different parents.
+					/*
+					 * If plugin_page is set the parent must either match the current page or not physically exist.
+					 * This allows plugin pages with the same hook to exist under different parents.
+					 */
 				} elseif (
 					( ! isset( $plugin_page ) && $self === $sub_item[2] )
 					|| ( isset( $plugin_page ) && $plugin_page === $sub_item[2]
diff --git a/src/wp-admin/menu.php b/src/wp-admin/menu.php
index 05da5f213a9e1..17317f9daa24b 100644
--- a/src/wp-admin/menu.php
+++ b/src/wp-admin/menu.php
@@ -130,7 +130,7 @@
 	$menu_icon = 'dashicons-admin-post';
 	if ( is_string( $ptype_obj->menu_icon ) ) {
 		// Special handling for data:image/svg+xml and Dashicons.
-		if ( 0 === strpos( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || 0 === strpos( $ptype_obj->menu_icon, 'dashicons-' ) ) {
+		if ( str_starts_with( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || str_starts_with( $ptype_obj->menu_icon, 'dashicons-' ) ) {
 			$menu_icon = $ptype_obj->menu_icon;
 		} else {
 			$menu_icon = esc_url( $ptype_obj->menu_icon );
@@ -203,22 +203,14 @@
 	$submenu['themes.php'][5] = array( sprintf( __( 'Themes %s' ), $count ), $appearance_cap, 'themes.php' );
 
 if ( wp_is_block_theme() ) {
-	$submenu['themes.php'][6] = array(
-		sprintf(
-			/* translators: %s: "beta" label */
-			__( 'Editor %s' ),
-			'<span class="awaiting-mod">' . __( 'beta' ) . '</span>'
-		),
-		'edit_theme_options',
-		'site-editor.php',
-	);
+	$submenu['themes.php'][6] = array( _x( 'Editor', 'site editor menu item' ), 'edit_theme_options', 'site-editor.php' );
 }
 
 if ( ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ) {
 	$submenu['themes.php'][6] = array(
 		__( 'Template Parts' ),
 		'edit_theme_options',
-		'site-editor.php?postType=wp_template_part',
+		'site-editor.php?path=/wp_template_part/all',
 	);
 }
 
@@ -238,12 +230,12 @@
 
 if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize' ) ) {
 	$customize_header_url      = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-	$submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+	$submenu['themes.php'][15] = array( _x( 'Header', 'custom image header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
 }
 
 if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize' ) ) {
 	$customize_background_url  = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-	$submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+	$submenu['themes.php'][20] = array( _x( 'Background', 'custom background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
 }
 
 unset( $customize_url );
diff --git a/src/wp-admin/ms-delete-site.php b/src/wp-admin/ms-delete-site.php
index 77246a4db7bea..be66975f567f0 100644
--- a/src/wp-admin/ms-delete-site.php
+++ b/src/wp-admin/ms-delete-site.php
@@ -65,11 +65,10 @@
 be asked to confirm again so only click this link if you are absolutely certain:
 ###URL_DELETE###
 
-If you delete your site, please consider opening a new site here
-some time in the future! (But remember your current site and username
-are gone forever.)
+If you delete your site, please consider opening a new site here some time in
+the future! (But remember that your current site and username are gone forever.)
 
-Thanks for using the site,
+Thank you for using the site,
 All at ###SITENAME###
 ###SITEURL###"
 	);
diff --git a/src/wp-admin/my-sites.php b/src/wp-admin/my-sites.php
index bd6dca670b30d..51dc1bdd264b0 100644
--- a/src/wp-admin/my-sites.php
+++ b/src/wp-admin/my-sites.php
@@ -50,14 +50,22 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen">Documentation on My Sites</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
-if ( $updated ) { ?>
-	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'Settings saved.' ); ?></strong></p></div>
-<?php } ?>
+if ( $updated ) {
+	wp_admin_notice(
+		'<strong>' . __( 'Settings saved.' ) . '</strong>',
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
+}
+?>
 
 <div class="wrap">
 <h1 class="wp-heading-inline">
@@ -74,9 +82,15 @@
 }
 
 if ( empty( $blogs ) ) :
-	echo '<p>';
-	_e( 'You must be a member of at least one site to use this page.' );
-	echo '</p>';
+	wp_admin_notice(
+		'<strong>' . __( 'You must be a member of at least one site to use this page.' ) . '</strong>',
+		array(
+			'type'        => 'error',
+			'dismissible' => true,
+		)
+	);
+	?>
+	<?php
 else :
 	?>
 
@@ -96,7 +110,7 @@
 	<ul class="my-sites striped">
 	<?php
 	/**
-	 * Enable the Global Settings section on the My Sites screen.
+	 * Filters the settings HTML markup in the Global Settings section on the My Sites screen.
 	 *
 	 * By default, the Global Settings section is hidden. Passing a non-empty
 	 * string to this filter will enable the section, and allow new settings
diff --git a/src/wp-admin/nav-menus.php b/src/wp-admin/nav-menus.php
index e95bb68a90d77..3c535c9dbb1f0 100644
--- a/src/wp-admin/nav-menus.php
+++ b/src/wp-admin/nav-menus.php
@@ -28,6 +28,9 @@
 	);
 }
 
+// Used in the HTML title tag.
+$title = __( 'Menus' );
+
 wp_enqueue_script( 'nav-menu' );
 
 if ( wp_is_mobile() ) {
@@ -117,6 +120,10 @@
 						if ( ! is_wp_error( $parent_object ) ) {
 							$parent_data                        = (array) $parent_object;
 							$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
+
+							// Reset invalid `menu_item_parent`.
+							$menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
 							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 						}
 
@@ -126,6 +133,10 @@
 						$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
 
 						$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
+
+						// Reset invalid `menu_item_parent`.
+						$menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
 						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 
 						wp_update_post( $menu_item_data );
@@ -137,6 +148,10 @@
 					&& in_array( (int) $menu_item_data['menu_item_parent'], $orders_to_dbids, true )
 				) {
 					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
+
+					// Reset invalid `menu_item_parent`.
+					$menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
 					update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 				}
 			}
@@ -247,6 +262,10 @@
 					) {
 						// Just make it a child of the previous; keep the order.
 						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ];
+
+						// Reset invalid `menu_item_parent`.
+						$menu_item_data = _wp_reset_invalid_menu_item_parent( $menu_item_data );
+
 						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 						wp_update_post( $menu_item_data );
 					}
@@ -667,8 +686,8 @@ function wp_nav_menu_max_depth( $classes ) {
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-menus-screen/">Documentation on Menus</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-menus-screen/">Documentation on Menus</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // Get the admin header.
@@ -789,7 +808,12 @@ function wp_nav_menu_max_depth( $classes ) {
 									);
 									?>
 									">
-										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
+										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text">
+											<?php
+											/* translators: Hidden accessibility text. */
+											_e( 'Edit selected menu' );
+											?>
+										</span>
 									</a>
 								</span>
 								<?php endif; ?>
@@ -835,7 +859,12 @@ function wp_nav_menu_max_depth( $classes ) {
 		<?php if ( $menu_count < 1 ) : ?>
 		<span class="first-menu-message">
 			<?php _e( 'Create your first menu below.' ); ?>
-			<span class="screen-reader-text"><?php _e( 'Fill in the Menu Name and click the Create Menu button to create your first menu.' ); ?></span>
+			<span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Fill in the Menu Name and click the Create Menu button to create your first menu.' );
+				?>
+			</span>
 		</span><!-- /first-menu-message -->
 		<?php elseif ( $menu_count < 2 ) : ?>
 		<span class="add-edit-menu-action">
@@ -854,7 +883,12 @@ function wp_nav_menu_max_depth( $classes ) {
 				)
 			);
 			?>
-			<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
+			<span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Click the Save Menu button to save your changes.' );
+				?>
+			</span>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
 			<form method="get" action="<?php echo esc_url( admin_url( 'nav-menus.php' ) ); ?>">
@@ -919,7 +953,12 @@ function wp_nav_menu_max_depth( $classes ) {
 					)
 				);
 				?>
-				<span class="screen-reader-text"><?php _e( 'Click the Save Menu button to save your changes.' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Click the Save Menu button to save your changes.' );
+					?>
+				</span>
 			</span><!-- /add-new-menu-action -->
 		</form>
 			<?php
@@ -1040,7 +1079,7 @@ function wp_nav_menu_max_depth( $classes ) {
 										<input type="checkbox" id="bulk-select-switcher-bottom" name="bulk-select-switcher-top" class="bulk-select-switcher">
 										<span class="bulk-select-button-label"><?php _e( 'Bulk Select' ); ?></span>
 									</label>
-									<input type="button" class="deletion menu-items-delete disabled" value="<?php _e( 'Remove Selected Items' ); ?>">
+									<input type="button" class="deletion menu-items-delete disabled" value="<?php esc_attr_e( 'Remove Selected Items' ); ?>">
 									<div id="pending-menu-items-to-delete">
 										<p><?php _e( 'List of menu items selected for deletion:' ); ?></p>
 										<ul></ul>
@@ -1110,7 +1149,10 @@ function wp_nav_menu_max_depth( $classes ) {
 						</div><!-- /#post-body-content -->
 					</div><!-- /#post-body -->
 					<div id="nav-menu-footer">
-						<div class="major-publishing-actions wp-clearfix">
+						<div class="major-publishing-actions">
+							<div class="publishing-action">
+								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
+							</div><!-- END .publishing-action -->
 							<?php if ( $menu_count > 0 ) : ?>
 
 								<?php if ( $add_new_screen ) : ?>
@@ -1139,9 +1181,6 @@ function wp_nav_menu_max_depth( $classes ) {
 								<?php endif; ?>
 
 							<?php endif; ?>
-							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'primary large menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
-							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- /#nav-menu-footer -->
 				</div><!-- /.menu-edit -->
diff --git a/src/wp-admin/network.php b/src/wp-admin/network.php
index a358d0e980d85..40c5ffc5bf02a 100644
--- a/src/wp-admin/network.php
+++ b/src/wp-admin/network.php
@@ -65,8 +65,8 @@
 	'<p>' . __( 'Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.' ) . '</p>' .
 	'<p>' . __( 'The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.' ) . '</p>' .
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/create-a-network/">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-network-screen/">Documentation on the Network Screen</a>' ) . '</p>';
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/create-a-network/">Documentation on Creating a Network</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-network-screen/">Documentation on the Network Screen</a>' ) . '</p>';
 
 get_current_screen()->add_help_tab(
 	array(
@@ -78,9 +78,9 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/create-a-network/">Documentation on Creating a Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-network-screen/">Documentation on the Network Screen</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/create-a-network/">Documentation on Creating a Network</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-network-screen/">Documentation on the Network Screen</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
diff --git a/src/wp-admin/network/contribute.php b/src/wp-admin/network/contribute.php
new file mode 100644
index 0000000000000..45e6f65047e82
--- /dev/null
+++ b/src/wp-admin/network/contribute.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Network Contribute administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 6.3.0
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once __DIR__ . '/admin.php';
+
+require ABSPATH . 'wp-admin/contribute.php';
diff --git a/src/wp-admin/network/index.php b/src/wp-admin/network/index.php
index 29363780a41fa..b51fc4e560949 100644
--- a/src/wp-admin/network/index.php
+++ b/src/wp-admin/network/index.php
@@ -53,8 +53,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin/">Documentation on the Network Admin</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin/">Documentation on the Network Admin</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
 );
 
 wp_dashboard_setup();
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
index d162be751bcf2..7dff74d4adb8c 100644
--- a/src/wp-admin/network/settings.php
+++ b/src/wp-admin/network/settings.php
@@ -53,7 +53,7 @@
 			'<p>' . __( 'Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.' ) . '</p>' .
 			'<p>' . __( 'New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.' ) . '</p>' .
 			'<p>' . __( 'Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).' ) . '</p>' .
-			'<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
+			'<p>' . __( 'You can set the language, and WordPress will automatically download and install the translation files (available if your filesystem is writable).' ) . '</p>' .
 			'<p>' . __( 'Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.' ) . '</p>' .
 			'<p>' . __( 'Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.' ) . '</p>',
 	)
@@ -61,8 +61,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-settings-screen/">Documentation on Network Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin-settings-screen/">Documentation on Network Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 if ( $_POST ) {
@@ -138,8 +138,14 @@
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
 if ( isset( $_GET['updated'] ) ) {
-	?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ); ?></p></div>
-	<?php
+	wp_admin_notice(
+		__( 'Settings saved.' ),
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 }
 ?>
 
@@ -166,24 +172,28 @@
 					<?php
 					$new_admin_email = get_site_option( 'new_admin_email' );
 					if ( $new_admin_email && get_site_option( 'admin_email' ) !== $new_admin_email ) :
-						?>
-						<div class="updated inline">
-						<p>
-						<?php
-							printf(
-								/* translators: %s: New network admin email. */
-								__( 'There is a pending change of the network admin email to %s.' ),
-								'<code>' . esc_html( $new_admin_email ) . '</code>'
-							);
-							printf(
-								' <a href="%1$s">%2$s</a>',
-								esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
-								__( 'Cancel' )
-							);
-						?>
-						</p>
-						</div>
-					<?php endif; ?>
+						$notice_message = sprintf(
+							/* translators: %s: New network admin email. */
+							__( 'There is a pending change of the network admin email to %s.' ),
+							'<code>' . esc_html( $new_admin_email ) . '</code>'
+						);
+
+						$notice_message .= sprintf(
+							' <a href="%1$s">%2$s</a>',
+							esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
+							__( 'Cancel' )
+						);
+
+						wp_admin_notice(
+							$notice_message,
+							array(
+								'type'               => 'warning',
+								'dismissible'        => true,
+								'additional_classes' => array( 'inline' ),
+							)
+						);
+					endif;
+					?>
 				</td>
 			</tr>
 		</table>
@@ -199,7 +209,12 @@
 				?>
 				<td>
 					<fieldset>
-					<legend class="screen-reader-text"><?php _e( 'New registrations settings' ); ?></legend>
+					<legend class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'New registrations settings' );
+						?>
+					</legend>
 					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none' ); ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user' ); ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
 					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog' ); ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
@@ -400,7 +415,10 @@
 						?>
 					</label><br />
 					<p class="screen-reader-text" id="blog-upload-space-desc">
-						<?php _e( 'Size in megabytes' ); ?>
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Size in megabytes' );
+						?>
 					</p>
 				</td>
 			</tr>
@@ -426,7 +444,10 @@
 						);
 						?>
 					<p class="screen-reader-text" id="fileupload-maxk-desc">
-						<?php _e( 'Size in kilobytes' ); ?>
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Size in kilobytes' );
+						?>
 					</p>
 				</td>
 			</tr>
@@ -493,7 +514,10 @@
 					<th scope="row"><?php _e( 'Enable administration menus' ); ?></th>
 					<td>
 						<?php
-						echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable menus' ) . '</legend>';
+						echo '<fieldset><legend class="screen-reader-text">' .
+							/* translators: Hidden accessibility text. */
+							__( 'Enable menus' ) .
+						'</legend>';
 
 						foreach ( (array) $menu_items as $key => $val ) {
 							echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[ $key ] ) ? checked( $menu_perms[ $key ], '1', false ) : '' ) . ' /> ' . esc_html( $val ) . '</label><br/>';
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
index 894ebf048f70d..defcc26e44060 100644
--- a/src/wp-admin/network/site-info.php
+++ b/src/wp-admin/network/site-info.php
@@ -146,8 +146,14 @@
 );
 
 if ( ! empty( $messages ) ) {
+	$notice_args = array(
+		'type'        => 'success',
+		'dismissible' => true,
+		'id'          => 'message',
+	);
+
 	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+		wp_admin_notice( $msg, $notice_args );
 	}
 }
 ?>
@@ -194,7 +200,12 @@
 			<th scope="row"><?php _e( 'Attributes' ); ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
+			<legend class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Set site attributes' );
+				?>
+			</legend>
 			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
 				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( (int) $details->$field_key, array( 0, 1 ), true ) ); ?> />
 				<?php echo $field_label; ?></label><br />
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
index 0314d02af81d5..4bdd559e7d052 100644
--- a/src/wp-admin/network/site-new.php
+++ b/src/wp-admin/network/site-new.php
@@ -29,8 +29,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
 );
 
 if ( isset( $_REQUEST['action'] ) && 'add-site' === $_REQUEST['action'] ) {
@@ -83,6 +83,10 @@
 		}
 	}
 
+	if ( empty( $title ) ) {
+		wp_die( __( 'Missing site title.' ) );
+	}
+
 	if ( empty( $domain ) ) {
 		wp_die( __( 'Missing or invalid site address.' ) );
 	}
@@ -188,8 +192,14 @@
 <h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
+	$notice_args = array(
+		'type'        => 'success',
+		'dismissible' => true,
+		'id'          => 'message',
+	);
+
 	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+		wp_admin_notice( $msg, $notice_args );
 	}
 }
 ?>
diff --git a/src/wp-admin/network/site-settings.php b/src/wp-admin/network/site-settings.php
index b669a5103f7e0..adfc95cfa9d70 100644
--- a/src/wp-admin/network/site-settings.php
+++ b/src/wp-admin/network/site-settings.php
@@ -104,8 +104,14 @@
 );
 
 if ( ! empty( $messages ) ) {
+	$notice_args = array(
+		'type'        => 'success',
+		'dismissible' => true,
+		'id'          => 'message',
+	);
+
 	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+		wp_admin_notice( $msg, $notice_args );
 	}
 }
 ?>
@@ -143,17 +149,17 @@
 				}
 			}
 
-			if ( strpos( $option->option_value, "\n" ) !== false ) {
+			if ( str_contains( $option->option_value, "\n" ) ) {
 				?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo ucwords( str_replace( '_', ' ', $option->option_name ) ); ?></label></th>
+					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>" class="code"><?php echo esc_html( $option->option_name ); ?></label></th>
 					<td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ); ?>]" id="<?php echo esc_attr( $option->option_name ); ?>"<?php disabled( $disabled ); ?>><?php echo esc_textarea( $option->option_value ); ?></textarea></td>
 				</tr>
 				<?php
 			} else {
 				?>
 				<tr class="form-field">
-					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo esc_html( ucwords( str_replace( '_', ' ', $option->option_name ) ) ); ?></label></th>
+					<th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>" class="code"><?php echo esc_html( $option->option_name ); ?></label></th>
 					<?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ), true ) ) { ?>
 					<td><code><?php echo esc_html( $option->option_value ); ?></code></td>
 					<?php } else { ?>
diff --git a/src/wp-admin/network/site-themes.php b/src/wp-admin/network/site-themes.php
index 55d996104547e..79fe4d5f0576b 100644
--- a/src/wp-admin/network/site-themes.php
+++ b/src/wp-admin/network/site-themes.php
@@ -173,7 +173,8 @@
 $parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
-require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
 
 <div class="wrap">
 <h1 id="edit-site"><?php echo $title; ?></h1>
@@ -195,7 +196,15 @@
 		/* translators: %s: Number of themes. */
 		$message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
+
+	wp_admin_notice(
+		sprintf( $message, number_format_i18n( $enabled ) ),
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 } elseif ( isset( $_GET['disabled'] ) ) {
 	$disabled = absint( $_GET['disabled'] );
 	if ( 1 === $disabled ) {
@@ -204,9 +213,24 @@
 		/* translators: %s: Number of themes. */
 		$message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
+
+	wp_admin_notice(
+		sprintf( $message, number_format_i18n( $disabled ) ),
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 } elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
-	echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
+	wp_admin_notice(
+		__( 'No theme selected.' ),
+		array(
+			'type'        => 'error',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 }
 ?>
 
diff --git a/src/wp-admin/network/site-users.php b/src/wp-admin/network/site-users.php
index 54d8f5bd3536f..78af65b9ed7a8 100644
--- a/src/wp-admin/network/site-users.php
+++ b/src/wp-admin/network/site-users.php
@@ -213,7 +213,8 @@
 	wp_enqueue_script( 'user-suggest' );
 }
 
-require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
 
 <script type="text/javascript">
 var current_site_id = <?php echo absint( $id ); ?>;
@@ -233,41 +234,57 @@
 );
 
 if ( isset( $_GET['update'] ) ) :
+	$message = '';
+	$type    = 'error';
+
 	switch ( $_GET['update'] ) {
 		case 'adduser':
-			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
+			$type    = 'success';
+			$message = __( 'User added.' );
 			break;
 		case 'err_add_member':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+			$message = __( 'User is already a member of this site.' );
 			break;
 		case 'err_add_fail':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
+			$message = __( 'User could not be added to this site.' );
 			break;
 		case 'err_add_notfound':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+			$message = __( 'Enter the username of an existing user.' );
 			break;
 		case 'promote':
-			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+			$type    = 'success';
+			$message = __( 'Changed roles.' );
 			break;
 		case 'err_promote':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+			$message = __( 'Select a user to change role.' );
 			break;
 		case 'remove':
-			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+			$type    = 'success';
+			$message = __( 'User removed from this site.' );
 			break;
 		case 'err_remove':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+			$message = __( 'Select a user to remove.' );
 			break;
 		case 'newuser':
-			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
+			$type    = 'success';
+			$message = __( 'User created.' );
 			break;
 		case 'err_new':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+			$message = __( 'Enter the username and email.' );
 			break;
 		case 'err_new_dup':
-			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+			$message = __( 'Duplicated username or email address.' );
 			break;
 	}
+
+	wp_admin_notice(
+		$message,
+		array(
+			'type'        => $type,
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 endif;
 ?>
 
diff --git a/src/wp-admin/network/sites.php b/src/wp-admin/network/sites.php
index 2aa2dbff55086..7ba3ec55ff0da 100644
--- a/src/wp-admin/network/sites.php
+++ b/src/wp-admin/network/sites.php
@@ -43,8 +43,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin-sites-screen/">Documentation on Site Management</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -102,7 +102,7 @@
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( get_network()->site_id == $id ) {
+		if ( is_main_site( $id ) ) {
 			wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
 		}
 
@@ -142,7 +142,7 @@
 			}
 
 			$updated_action = 'not_deleted';
-			if ( '0' != $id && get_network()->site_id != $id && current_user_can( 'delete_site', $id ) ) {
+			if ( 0 !== $id && ! is_main_site( $id ) && current_user_can( 'delete_site', $id ) ) {
 				wpmu_delete_blog( $id, true );
 				$updated_action = 'delete';
 			}
@@ -154,7 +154,7 @@
 			foreach ( (array) $_POST['site_ids'] as $site_id ) {
 				$site_id = (int) $site_id;
 
-				if ( get_network()->site_id == $site_id ) {
+				if ( is_main_site( $site_id ) ) {
 					continue;
 				}
 
@@ -181,8 +181,10 @@
 			if ( isset( $_POST['action'] ) && isset( $_POST['allblogs'] ) ) {
 				$doaction = $_POST['action'];
 
-				foreach ( (array) $_POST['allblogs'] as $key => $val ) {
-					if ( '0' != $val && get_network()->site_id != $val ) {
+				foreach ( (array) $_POST['allblogs'] as $site_id ) {
+					$site_id = (int) $site_id;
+
+					if ( 0 !== $site_id && ! is_main_site( $site_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
 								require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -197,12 +199,14 @@
 										<ul class="ul-disc">
 											<?php
 											foreach ( $_POST['allblogs'] as $site_id ) :
+												$site_id = (int) $site_id;
+
 												$site         = get_site( $site_id );
 												$site_address = untrailingslashit( $site->domain . $site->path );
 												?>
 												<li>
 													<?php echo $site_address; ?>
-													<input type="hidden" name="site_ids[]" value="<?php echo (int) $site_id; ?>" />
+													<input type="hidden" name="site_ids[]" value="<?php echo esc_attr( $site_id ); ?>" />
 												</li>
 											<?php endforeach; ?>
 										</ul>
@@ -217,7 +221,7 @@
 							case 'spam':
 							case 'notspam':
 								$updated_action = ( 'spam' === $doaction ) ? 'all_spam' : 'all_notspam';
-								update_blog_status( $val, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
+								update_blog_status( $site_id, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
 								break;
 						}
 					} else {
@@ -354,7 +358,14 @@
 	}
 
 	if ( ! empty( $msg ) ) {
-		$msg = '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+		$msg = wp_get_admin_notice(
+			$msg,
+			array(
+				'type'        => 'success',
+				'dismissible' => true,
+				'id'          => 'message',
+			)
+		);
 	}
 }
 
diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php
index 09c15001f5ef8..9e45c331cfb05 100644
--- a/src/wp-admin/network/themes.php
+++ b/src/wp-admin/network/themes.php
@@ -39,7 +39,7 @@
 		case 'enable':
 			check_admin_referer( 'enable-theme_' . $_GET['theme'] );
 			WP_Theme::network_enable_theme( $_GET['theme'] );
-			if ( false === strpos( $referer, '/network/themes.php' ) ) {
+			if ( ! str_contains( $referer, '/network/themes.php' ) ) {
 				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
 			} else {
 				wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
@@ -316,14 +316,14 @@
 		)
 	);
 
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-themes-auto-updates/">Documentation on Auto-updates</a>' ) . '</p>';
 }
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen">Documentation on Network Themes</a>' ) . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -367,57 +367,82 @@
 <hr class="wp-header-end">
 
 <?php
+$message = '';
+$type    = 'success';
+
 if ( isset( $_GET['enabled'] ) ) {
 	$enabled = absint( $_GET['enabled'] );
 	if ( 1 === $enabled ) {
 		$message = __( 'Theme enabled.' );
 	} else {
-		/* translators: %s: Number of themes. */
-		$message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+		$message = sprintf(
+			/* translators: %s: Number of themes. */
+			_n( '%s theme enabled.', '%s themes enabled.', $enabled ),
+			number_format_i18n( $enabled )
+		);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['disabled'] ) ) {
 	$disabled = absint( $_GET['disabled'] );
 	if ( 1 === $disabled ) {
 		$message = __( 'Theme disabled.' );
 	} else {
-		/* translators: %s: Number of themes. */
-		$message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+		$message = sprintf(
+			/* translators: %s: Number of themes. */
+			_n( '%s theme disabled.', '%s themes disabled.', $disabled ),
+			number_format_i18n( $disabled )
+		);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['deleted'] ) ) {
 	$deleted = absint( $_GET['deleted'] );
 	if ( 1 === $deleted ) {
 		$message = __( 'Theme deleted.' );
 	} else {
-		/* translators: %s: Number of themes. */
-		$message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+		$message = sprintf(
+			/* translators: %s: Number of themes. */
+			_n( '%s theme deleted.', '%s themes deleted.', $deleted ),
+			number_format_i18n( $deleted )
+		);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
 } elseif ( isset( $_GET['enabled-auto-update'] ) ) {
 	$enabled = absint( $_GET['enabled-auto-update'] );
 	if ( 1 === $enabled ) {
 		$message = __( 'Theme will be auto-updated.' );
 	} else {
-		/* translators: %s: Number of themes. */
-		$message = _n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled );
+		$message = sprintf(
+			/* translators: %s: Number of themes. */
+			_n( '%s theme will be auto-updated.', '%s themes will be auto-updated.', $enabled ),
+			number_format_i18n( $enabled )
+		);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['disabled-auto-update'] ) ) {
 	$disabled = absint( $_GET['disabled-auto-update'] );
 	if ( 1 === $disabled ) {
 		$message = __( 'Theme will no longer be auto-updated.' );
 	} else {
-		/* translators: %s: Number of themes. */
-		$message = _n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled );
+		$message = sprintf(
+			/* translators: %s: Number of themes. */
+			_n( '%s theme will no longer be auto-updated.', '%s themes will no longer be auto-updated.', $disabled ),
+			number_format_i18n( $disabled )
+		);
 	}
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['error'] ) && 'none' === $_GET['error'] ) {
-	echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
+	$message = __( 'No theme selected.' );
+	$type    = 'error';
 } elseif ( isset( $_GET['error'] ) && 'main' === $_GET['error'] ) {
-	echo '<div class="error notice is-dismissible"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
+	$message = __( 'You cannot delete a theme while it is active on the main site.' );
+	$type    = 'error';
 }
 
+if ( '' !== $message ) {
+	wp_admin_notice(
+		$message,
+		array(
+			'type'        => $type,
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
+}
 ?>
 
 <form method="get">
diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php
index a21764f6e1d71..55cbedd643c5a 100644
--- a/src/wp-admin/network/upgrade.php
+++ b/src/wp-admin/network/upgrade.php
@@ -29,8 +29,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/network-admin-updates-screen/">Documentation on Upgrade Network</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/network-admin-updates-screen/">Documentation on Upgrade Network</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
diff --git a/src/wp-admin/network/user-new.php b/src/wp-admin/network/user-new.php
index c881dff2ac93b..6c9b69bc7c7e9 100644
--- a/src/wp-admin/network/user-new.php
+++ b/src/wp-admin/network/user-new.php
@@ -27,7 +27,7 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
 );
 
 if ( isset( $_REQUEST['action'] ) && 'add-user' === $_REQUEST['action'] ) {
@@ -77,8 +77,8 @@
 	}
 }
 
+$message = '';
 if ( isset( $_GET['update'] ) ) {
-	$messages = array();
 	if ( 'added' === $_GET['update'] ) {
 		$edit_link = '';
 		if ( isset( $_GET['user_id'] ) ) {
@@ -93,8 +93,6 @@
 		if ( $edit_link ) {
 			$message .= sprintf( ' <a href="%s">%s</a>', $edit_link, __( 'Edit user' ) );
 		}
-
-		$messages[] = $message;
 	}
 }
 
@@ -102,41 +100,55 @@
 $title       = __( 'Add New User' );
 $parent_file = 'users.php';
 
-require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
 
 <div class="wrap">
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg ) {
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-	}
+if ( '' !== $message ) {
+	wp_admin_notice(
+		$message,
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 }
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) {
-	?>
-	<div class="error">
-		<?php
-		foreach ( $add_user_errors->get_error_messages() as $message ) {
-			echo "<p>$message</p>";
-		}
-		?>
-	</div>
-<?php } ?>
+	$error_messages = '';
+	foreach ( $add_user_errors->get_error_messages() as $error ) {
+		$error_messages .= "<p>$error</p>";
+	}
+
+	wp_admin_notice(
+		$error_messages,
+		array(
+			'type'           => 'error',
+			'dismissible'    => true,
+			'id'             => 'message',
+			'paragraph_wrap' => false,
+		)
+	);
+}
+?>
 	<form action="<?php echo esc_url( network_admin_url( 'user-new.php?action=add-user' ) ); ?>" id="adduser" method="post" novalidate="novalidate">
-	<table class="form-table" role="presentation">
-		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ); ?></label></th>
-			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
-		</tr>
-		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ); ?></label></th>
-			<td><input type="email" class="regular-text" name="user[email]" id="email" /></td>
-		</tr>
-		<tr class="form-field">
-			<td colspan="2" class="td-full"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
-		</tr>
-	</table>
+		<p><?php echo wp_required_field_message(); ?></p>
+		<table class="form-table" role="presentation">
+			<tr class="form-field form-required">
+				<th scope="row"><label for="username"><?php _e( 'Username' ); ?> <?php echo wp_required_field_indicator(); ?></label></th>
+				<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" required="required" /></td>
+			</tr>
+			<tr class="form-field form-required">
+				<th scope="row"><label for="email"><?php _e( 'Email' ); ?> <?php echo wp_required_field_indicator(); ?></label></th>
+				<td><input type="email" class="regular-text" name="user[email]" id="email" required="required" /></td>
+			</tr>
+			<tr class="form-field">
+				<td colspan="2" class="td-full"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
+			</tr>
+		</table>
 	<?php
 	/**
 	 * Fires at the end of the new user form in network admin.
diff --git a/src/wp-admin/network/users.php b/src/wp-admin/network/users.php
index eae9b6b143e73..a1f89e1946b79 100644
--- a/src/wp-admin/network/users.php
+++ b/src/wp-admin/network/users.php
@@ -94,7 +94,7 @@
 								$blogs        = get_blogs_of_user( $user_id, true );
 
 								foreach ( (array) $blogs as $details ) {
-									if ( get_network()->site_id != $details->userblog_id ) { // Main blog is not a spam!
+									if ( ! is_main_site( $details->userblog_id ) ) { // Main site is not a spam!
 										update_blog_status( $details->userblog_id, 'spam', '1' );
 									}
 								}
@@ -240,7 +240,7 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -253,30 +253,34 @@
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
 
-if ( isset( $_REQUEST['updated'] ) && 'true' == $_REQUEST['updated'] && ! empty( $_REQUEST['action'] ) ) {
-	?>
-	<div id="message" class="updated notice is-dismissible"><p>
-		<?php
-		switch ( $_REQUEST['action'] ) {
-			case 'delete':
-				_e( 'User deleted.' );
-				break;
-			case 'all_spam':
-				_e( 'Users marked as spam.' );
-				break;
-			case 'all_notspam':
-				_e( 'Users removed from spam.' );
-				break;
-			case 'all_delete':
-				_e( 'Users deleted.' );
-				break;
-			case 'add':
-				_e( 'User added.' );
-				break;
-		}
-		?>
-	</p></div>
-	<?php
+if ( isset( $_REQUEST['updated'] ) && 'true' === $_REQUEST['updated'] && ! empty( $_REQUEST['action'] ) ) {
+	$message = '';
+	switch ( $_REQUEST['action'] ) {
+		case 'delete':
+			$message = __( 'User deleted.' );
+			break;
+		case 'all_spam':
+			$message = __( 'Users marked as spam.' );
+			break;
+		case 'all_notspam':
+			$message = __( 'Users removed from spam.' );
+			break;
+		case 'all_delete':
+			$message = __( 'Users deleted.' );
+			break;
+		case 'add':
+			$message = __( 'User added.' );
+			break;
+	}
+
+	wp_admin_notice(
+		$message,
+		array(
+			'type'        => 'success',
+			'dismissible' => true,
+			'id'          => 'message',
+		)
+	);
 }
 ?>
 <div class="wrap">
diff --git a/src/wp-admin/options-discussion.php b/src/wp-admin/options-discussion.php
index b83d822f2fedd..19e3c45dc80c1 100644
--- a/src/wp-admin/options-discussion.php
+++ b/src/wp-admin/options-discussion.php
@@ -29,8 +29,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-discussion-screen/">Documentation on Discussion Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-discussion-screen/">Documentation on Discussion Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -45,7 +45,12 @@
 <table class="form-table" role="presentation">
 <tr>
 <th scope="row"><?php _e( 'Default post settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default post settings' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Default post settings' );
+	?>
+</span></legend>
 <label for="default_pingback_flag">
 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
 <?php _e( 'Attempt to notify any blogs linked to from the post' ); ?></label>
@@ -63,7 +68,12 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Other comment settings' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Other comment settings' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Other comment settings' );
+	?>
+</span></legend>
 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked( '1', get_option( 'require_name_email' ) ); ?> /> <?php _e( 'Comment author must fill out name and email' ); ?></label>
 <br />
 <label for="comment_registration">
@@ -71,7 +81,8 @@
 <?php _e( 'Users must be registered and logged in to comment' ); ?>
 <?php
 if ( ! get_option( 'users_can_register' ) && is_multisite() ) {
-	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );}
+	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );
+}
 ?>
 </label>
 <br />
@@ -165,7 +176,12 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Email me whenever' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Email me whenever' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Email me whenever' );
+	?>
+</span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
 <?php _e( 'Anyone posts a comment' ); ?> </label>
@@ -177,7 +193,12 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Before a comment appears' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Before a comment appears' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Before a comment appears' );
+	?>
+</span></legend>
 <label for="comment_moderation">
 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
 <?php _e( 'Comment must be manually approved' ); ?> </label>
@@ -187,7 +208,12 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Comment Moderation' );
+	?>
+</span></legend>
 <p><label for="comment_max_links">
 <?php
 printf(
@@ -206,7 +232,12 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'Disallowed Comment Keys' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Disallowed Comment Keys' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Disallowed Comment Keys' );
+	?>
+</span></legend>
 <p><label for="disallowed_keys"><?php _e( 'When a comment contains any of these words in its content, author name, URL, email, IP address, or browser&#8217;s user agent string, it will be put in the Trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="disallowed_keys" rows="10" cols="50" id="disallowed_keys" class="large-text code"><?php echo esc_textarea( get_option( 'disallowed_keys' ) ); ?></textarea>
@@ -242,7 +273,12 @@
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
 <th scope="row"><?php _e( 'Maximum Rating' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Maximum Rating' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Maximum Rating' );
+	?>
+</span></legend>
 
 <?php
 $ratings = array(
@@ -265,7 +301,12 @@
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
 <th scope="row"><?php _e( 'Default Avatar' ); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default Avatar' ); ?></span></legend>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Default Avatar' );
+	?>
+</span></legend>
 
 <p>
 <?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.' ); ?><br />
@@ -280,6 +321,7 @@
 	'wavatar'          => __( 'Wavatar (Generated)' ),
 	'monsterid'        => __( 'MonsterID (Generated)' ),
 	'retro'            => __( 'Retro (Generated)' ),
+	'robohash'         => __( 'RoboHash (Generated)' ),
 );
 /**
  * Filters the default avatars.
diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
index ba9b155303f69..c79851badc1cd 100644
--- a/src/wp-admin/options-general.php
+++ b/src/wp-admin/options-general.php
@@ -25,14 +25,25 @@
 add_action( 'admin_head', 'options_general_add_js' );
 
 $options_help = '<p>' . __( 'The fields on this screen determine some of the basics of your site setup.' ) . '</p>' .
-	'<p>' . __( 'Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.' ) . '</p>';
+	'<p>' . __( 'Most themes show the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. Many themes also show the tagline.' ) . '</p>';
 
 if ( ! is_multisite() ) {
-	$options_help .= '<p>' . __( 'The WordPress URL and the site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.' ) . '</p>' .
-		'<p>' . __( 'If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.' ) . '</p>';
+	$options_help .= '<p>' . __( 'Two terms you will want to know are the WordPress URL and the site URL. The WordPress URL is where the core WordPress installation files are, and the site URL is the address a visitor uses in the browser to go to your site.' ) . '</p>' .
+		'<p>' . sprintf(
+			/* translators: %s: Documentation URL. */
+			__( 'Though the terms refer to two different concepts, in practice, they can be the same address or different. For example, you can have the core WordPress installation files in the root directory (<code>https://example.com</code>), in which case the two URLs would be the same. Or the <a href="%s">WordPress files can be in a subdirectory</a> (<code>https://example.com/wordpress</code>). In that case, the WordPress URL and the site URL would be different.' ),
+			__( 'https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/' )
+		) . '</p>' .
+		'<p>' . sprintf(
+			/* translators: 1: http://, 2: https:// */
+			__( 'Both WordPress URL and site URL can start with either %1$s or %2$s. A URL starting with %2$s requires an SSL certificate, so be sure that you have one before changing to %2$s. With %2$s, a padlock will appear next to the address in the browser address bar. Both %2$s and the padlock signal that your site meets some basic security requirements, which can build trust with your visitors and with search engines.' ),
+			'<code>http://</code>',
+			'<code>https://</code>'
+		) . '</p>' .
+		'<p>' . __( 'If you want site visitors to be able to register themselves, check the membership box. If you want the site administrator to register every new user, leave the box unchecked. In either case, you can set a default user role for all new users.' ) . '</p>';
 }
 
-$options_help .= '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
+$options_help .= '<p>' . __( 'You can set the language, and WordPress will automatically download and install the translation files (available if your filesystem is writable).' ) . '</p>' .
 	'<p>' . __( 'UTC means Coordinated Universal Time.' ) . '</p>' .
 	'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
 
@@ -46,8 +57,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-general-screen/">Documentation on General Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-general-screen/">Documentation on General Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -67,17 +78,23 @@
 </tr>
 
 <?php
-/* translators: Site tagline. */
-$sample_tagline = __( 'Just another WordPress site' );
-if ( is_multisite() ) {
+if ( ! is_multisite() ) {
+	/* translators: Site tagline. */
+	$sample_tagline = __( 'Just another WordPress site' );
+} else {
 	/* translators: %s: Network title. */
 	$sample_tagline = sprintf( __( 'Just another %s site' ), get_network()->site_name );
 }
+$tagline_description = sprintf(
+	/* translators: %s: Site tagline example. */
+	__( 'In a few words, explain what this site is about. Example: &#8220;%s.&#8221;' ),
+	$sample_tagline
+);
 ?>
 <tr>
 <th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" placeholder="<?php echo $sample_tagline; ?>" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
+<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" />
+<p class="description" id="tagline-description"><?php echo $tagline_description; ?></p></td>
 </tr>
 
 <?php
@@ -106,7 +123,7 @@
 		printf(
 			/* translators: %s: Documentation URL. */
 			__( 'Enter the same address here unless you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
-			__( 'https://wordpress.org/support/article/giving-wordpress-its-own-directory/' )
+			__( 'https://wordpress.org/documentation/article/giving-wordpress-its-own-directory/' )
 		);
 		?>
 </p>
@@ -148,7 +165,12 @@
 
 <tr>
 <th scope="row"><?php _e( 'Membership' ); ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
+<td> <fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Membership' );
+	?>
+</span></legend><label for="users_can_register">
 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
 	<?php _e( 'Anyone can register' ); ?></label>
 </fieldset></td>
@@ -214,7 +236,7 @@
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos( $tzstring, 'Etc/GMT' ) ) {
+if ( str_contains( $tzstring, 'Etc/GMT' ) ) {
 	$tzstring = '';
 }
 
@@ -314,7 +336,12 @@
 <tr>
 <th scope="row"><?php _e( 'Date Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Date Format' ); ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span>
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Date Format' );
+		?>
+	</span></legend>
 <?php
 	/**
 	 * Filters the default date formats.
@@ -339,8 +366,14 @@
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></span></label>' .
-		'<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
+	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' .
+			/* translators: Hidden accessibility text. */
+			__( 'enter a custom date format in the following field' ) .
+		'</span></span></label>' .
+		'<label for="date_format_custom" class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Custom date format:' ) .
+		'</label>' .
 		'<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" />' .
 		'<br />' .
 		'<p><strong>' . __( 'Preview:' ) . '</strong> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
@@ -352,7 +385,12 @@
 <tr>
 <th scope="row"><?php _e( 'Time Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Time Format' ); ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span>
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Time Format' );
+		?>
+	</span></legend>
 <?php
 	/**
 	 * Filters the default time formats.
@@ -376,14 +414,20 @@
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
-	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></span></label>' .
-		'<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
+	echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' .
+			/* translators: Hidden accessibility text. */
+			__( 'enter a custom time format in the following field' ) .
+		'</span></span></label>' .
+		'<label for="time_format_custom" class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Custom time format:' ) .
+		'</label>' .
 		'<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" />' .
 		'<br />' .
 		'<p><strong>' . __( 'Preview:' ) . '</strong> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
 		"<span class='spinner'></span>\n" . '</p>';
 
-	echo "\t<p class='date-time-doc'>" . __( '<a href="https://wordpress.org/support/article/formatting-date-and-time/">Documentation on date and time formatting</a>.' ) . "</p>\n";
+	echo "\t<p class='date-time-doc'>" . __( '<a href="https://wordpress.org/documentation/article/customize-date-and-time-format/">Documentation on date and time formatting</a>.' ) . "</p>\n";
 ?>
 	</fieldset>
 </td>
diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
index 79f4389e886db..ce814c9d3891e 100644
--- a/src/wp-admin/options-media.php
+++ b/src/wp-admin/options-media.php
@@ -38,8 +38,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-media-screen/">Documentation on Media Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-media-screen/">Documentation on Media Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -58,7 +58,12 @@
 <table class="form-table" role="presentation">
 <tr>
 <th scope="row"><?php _e( 'Thumbnail size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Thumbnail size' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Thumbnail size' );
+	?>
+</span></legend>
 <label for="thumbnail_size_w"><?php _e( 'Width' ); ?></label>
 <input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option( 'thumbnail_size_w' ); ?>" class="small-text" />
 <br />
@@ -72,7 +77,12 @@
 
 <tr>
 <th scope="row"><?php _e( 'Medium size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Medium size' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Medium size' );
+	?>
+</span></legend>
 <label for="medium_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="medium_size_w" type="number" step="1" min="0" id="medium_size_w" value="<?php form_option( 'medium_size_w' ); ?>" class="small-text" />
 <br />
@@ -83,7 +93,12 @@
 
 <tr>
 <th scope="row"><?php _e( 'Large size' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Large size' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Large size' );
+	?>
+</span></legend>
 <label for="large_size_w"><?php _e( 'Max Width' ); ?></label>
 <input name="large_size_w" type="number" step="1" min="0" id="large_size_w" value="<?php form_option( 'large_size_w' ); ?>" class="small-text" />
 <br />
diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php
index e3eeb83c421fe..379dc8a0f5c65 100644
--- a/src/wp-admin/options-permalink.php
+++ b/src/wp-admin/options-permalink.php
@@ -57,14 +57,14 @@
 );
 
 $help_sidebar_content = '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/using-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>';
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/customize-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>';
 
 if ( $is_nginx ) {
-	$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/article/nginx/">Documentation on Nginx configuration</a>.' ) . '</p>';
+	$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/documentation/article/nginx/">Documentation on Nginx configuration</a>.' ) . '</p>';
 }
 
-$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>';
+$help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>';
 
 get_current_screen()->set_help_sidebar( $help_sidebar_content );
 unset( $help_sidebar_content );
@@ -87,7 +87,7 @@
  * base prefix, WordPress core can no longer account for the possible collision.
  */
 if ( is_multisite() && ! is_subdomain_install() && is_main_site()
-	&& 0 === strpos( $permalink_structure, '/blog/' )
+	&& str_starts_with( $permalink_structure, '/blog/' )
 ) {
 	$blog_prefix = '/blog';
 }
@@ -224,14 +224,14 @@
 printf(
 	/* translators: %s: Documentation URL. */
 	__( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="%s">number of tags are available</a>, and here are some examples to get you started.' ),
-	__( 'https://wordpress.org/support/article/using-permalinks/' )
+	__( 'https://wordpress.org/documentation/article/customize-permalinks/' )
 );
 ?>
 </p>
 
 <?php
 if ( is_multisite() && ! is_subdomain_install() && is_main_site()
-	&& 0 === strpos( $permalink_structure, '/blog/' )
+	&& str_starts_with( $permalink_structure, '/blog/' )
 ) {
 	$permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
 	$category_base       = preg_replace( '|^/?blog|', '', $category_base );
@@ -330,18 +330,27 @@
 	<th scope="row"><?php _e( 'Permalink structure' ); ?></th>
 	<td>
 		<fieldset class="structure-selection">
-			<legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
+			<legend class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Permalink structure' );
+				?>
+			</legend>
 			<?php foreach ( $default_structures as $input ) : ?>
 			<div class="row">
-				<input id="permalink-input-<?php echo $input['id']; ?>"
-					name="selection" aria-describedby="permalink-<?php echo $input['id']; ?>"
+				<input id="permalink-input-<?php echo esc_attr( $input['id'] ); ?>"
+					name="selection" aria-describedby="permalink-<?php echo esc_attr( $input['id'] ); ?>"
 					type="radio" value="<?php echo esc_attr( $input['value'] ); ?>"
 					<?php checked( $input['value'], $permalink_structure ); ?>
 				/>
 				<div>
-					<label for="permalink-input-<?php echo $input['id']; ?>"><?php echo $input['label']; ?></label>
+					<label for="permalink-input-<?php echo esc_attr( $input['id'] ); ?>">
+						<?php echo esc_html( $input['label'] ); ?>
+					</label>
 					<p>
-						<code id="permalink-<?php echo $input['id']; ?>"><?php echo $input['example']; ?></code>
+						<code id="permalink-<?php echo esc_attr( $input['id'] ); ?>">
+							<?php echo esc_html( $input['example'] ); ?>
+						</code>
 					</p>
 				</div>
 			</div><!-- .row -->
@@ -356,10 +365,13 @@
 					<label for="custom_selection"><?php _e( 'Custom Structure' ); ?></label>
 					<p>
 						<label for="permalink_structure" class="screen-reader-text">
-							<?php _e( 'Customize permalink structure by selecting available tags' ); ?>
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Customize permalink structure by selecting available tags' );
+							?>
 						</label>
 						<span class="code">
-							<code id="permalink-custom"><?php echo $url_base; ?></code>
+							<code id="permalink-custom"><?php echo esc_url( $url_base ); ?></code>
 							<input name="permalink_structure" id="permalink_structure"
 								type="text" value="<?php echo esc_attr( $permalink_structure ); ?>"
 								aria-describedby="permalink-custom" class="regular-text code"
@@ -381,7 +393,7 @@ class="button button-secondary"
 										data-added="<?php echo esc_attr( sprintf( $tag_added, $tag ) ); ?>"
 										data-removed="<?php echo esc_attr( sprintf( $tag_removed, $tag ) ); ?>"
 										data-used="<?php echo esc_attr( sprintf( $tag_already_used, $tag ) ); ?>">
-										<?php echo '%' . $tag . '%'; ?>
+										<?php echo '%' . esc_html( $tag ) . '%'; ?>
 									</button>
 								</li>
 							<?php endforeach; ?>
@@ -453,7 +465,7 @@ class="button button-secondary"
 					/* translators: 1: web.config, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A, 5: Element code. */
 					__( '<strong>Error:</strong> Your %1$s file is not <a href="%2$s">writable</a>, so updating it automatically was not possible. This is the URL rewrite rule you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this rule inside of the %5$s element in %1$s file.' ),
 					'<code>web.config</code>',
-					__( 'https://wordpress.org/support/article/changing-file-permissions/' ),
+					__( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
 					'<kbd>Ctrl + A</kbd>',
 					'<kbd>⌘ + A</kbd>',
 					'<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>'
@@ -485,7 +497,7 @@ class="button button-secondary"
 				printf(
 					/* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A, 4: ⌘ + A */
 					__( '<strong>Error:</strong> The root directory of your site is not <a href="%1$s">writable</a>, so creating a file automatically was not possible. This is the URL rewrite rule you should have in your %2$s file. Create a new file called %2$s in the root directory of your site. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this code into the %2$s file.' ),
-					__( 'https://wordpress.org/support/article/changing-file-permissions/' ),
+					__( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
 					'<code>web.config</code>',
 					'<kbd>Ctrl + A</kbd>',
 					'<kbd>⌘ + A</kbd>'
@@ -521,7 +533,7 @@ class="button button-secondary"
 				/* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A */
 				__( '<strong>Error:</strong> Your %1$s file is not <a href="%2$s">writable</a>, so updating it automatically was not possible. These are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all.' ),
 				'<code>.htaccess</code>',
-				__( 'https://wordpress.org/support/article/changing-file-permissions/' ),
+				__( 'https://wordpress.org/documentation/article/changing-file-permissions/' ),
 				'<kbd>Ctrl + A</kbd>',
 				'<kbd>⌘ + A</kbd>'
 			);
diff --git a/src/wp-admin/options-privacy.php b/src/wp-admin/options-privacy.php
index 008ea30fcf7e9..5c22d39d5df67 100644
--- a/src/wp-admin/options-privacy.php
+++ b/src/wp-admin/options-privacy.php
@@ -14,10 +14,13 @@
 }
 
 if ( isset( $_GET['tab'] ) && 'policyguide' === $_GET['tab'] ) {
-	require_once dirname( __FILE__ ) . '/privacy-policy-guide.php';
+	require_once __DIR__ . '/privacy-policy-guide.php';
 	return;
 }
 
+// Used in the HTML title tag.
+$title = __( 'Privacy' );
+
 add_filter(
 	'admin_body_class',
 	static function( $body_class ) {
@@ -41,7 +44,7 @@ static function( $body_class ) {
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-privacy-screen/">Documentation on Privacy Settings</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-privacy-screen/">Documentation on Privacy Settings</a>' ) . '</p>'
 );
 
 if ( ! empty( $action ) ) {
@@ -181,16 +184,16 @@ static function( $body_class ) {
 <div class="privacy-settings-body hide-if-no-js">
 	<h2><?php _e( 'Privacy Settings' ); ?></h2>
 	<p>
-		<?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a Privacy Policy.' ); ?>
+		<?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a privacy policy.' ); ?>
 		<?php _e( 'If you already have a Privacy Policy page, please select it below. If not, please create one.' ); ?>
 	</p>
 	<p>
-		<?php _e( 'The new page will include help and suggestions for your Privacy Policy.' ); ?>
-		<?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your Privacy Policy requires, and to keep that information current and accurate.' ); ?>
+		<?php _e( 'The new page will include help and suggestions for your privacy policy.' ); ?>
+		<?php _e( 'However, it is your responsibility to use those resources correctly, to provide the information that your privacy policy requires, and to keep that information current and accurate.' ); ?>
 	</p>
 	<p>
 		<?php _e( 'After your Privacy Policy page is set, you should edit it.' ); ?>
-		<?php _e( 'You should also review your Privacy Policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
+		<?php _e( 'You should also review your privacy policy from time to time, especially after installing or updating any themes or plugins. There may be changes or new suggested information for you to consider adding to your policy.' ); ?>
 	</p>
 	<p>
 		<?php
@@ -227,7 +230,7 @@ static function( $body_class ) {
 		}
 		printf(
 			/* translators: 1: Privacy Policy guide URL, 2: Additional link attributes, 3: Accessibility text. */
-			__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our Privacy Policy guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
+			__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our privacy policy guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
 			esc_url( admin_url( 'options-privacy.php?tab=policyguide' ) ),
 			'',
 			''
@@ -253,7 +256,7 @@ static function( $body_class ) {
 				<label for="create-page">
 				<?php
 				if ( $has_pages ) {
-					_e( 'Create a new Privacy Policy Page' );
+					_e( 'Create a new Privacy Policy page' );
 				} else {
 					_e( 'There are no pages.' );
 				}
diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php
index 929c528a0ea22..0bd1667b74718 100644
--- a/src/wp-admin/options-reading.php
+++ b/src/wp-admin/options-reading.php
@@ -32,7 +32,7 @@
 			'<p>' . sprintf(
 				/* translators: %s: Documentation URL. */
 				__( 'You can also control the display of your content in RSS feeds, including the maximum number of posts to display and whether to show full text or an excerpt. <a href="%s">Learn more about feeds</a>.' ),
-				__( 'https://wordpress.org/support/article/wordpress-feeds/' )
+				__( 'https://wordpress.org/documentation/article/wordpress-feeds/' )
 			) . '</p>' .
 			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
 	)
@@ -50,8 +50,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-reading-screen/">Documentation on Reading Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-reading-screen/">Documentation on Reading Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -85,7 +85,13 @@
 <table class="form-table" role="presentation">
 <tr>
 <th scope="row"><?php _e( 'Your homepage displays' ); ?></th>
-<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Your homepage displays' ); ?></span></legend>
+<td id="front-static-pages"><fieldset>
+	<legend class="screen-reader-text"><span>
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Your homepage displays' );
+		?>
+	</span></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
 		<?php _e( 'Your latest posts' ); ?>
@@ -159,7 +165,13 @@
 </tr>
 <tr>
 <th scope="row"><?php _e( 'For each post in a feed, include' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each post in a feed, include' ); ?> </span></legend>
+<td><fieldset>
+	<legend class="screen-reader-text"><span>
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'For each post in a feed, include' );
+		?>
+	</span></legend>
 	<p>
 		<label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
 		<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Excerpt' ); ?></label>
@@ -169,7 +181,7 @@
 		printf(
 			/* translators: %s: Documentation URL. */
 			__( 'Your theme determines how content is displayed in browsers. <a href="%s">Learn more about feeds</a>.' ),
-			__( 'https://wordpress.org/support/article/wordpress-feeds/' )
+			__( 'https://wordpress.org/documentation/article/wordpress-feeds/' )
 		);
 		?>
 	</p>
@@ -178,7 +190,16 @@
 
 <tr class="option-site-visibility">
 <th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site visibility' ) : _e( 'Search engine visibility' ); ?> </span></legend>
+<td><fieldset>
+	<legend class="screen-reader-text"><span>
+		<?php
+		has_action( 'blog_privacy_selector' )
+			/* translators: Hidden accessibility text. */
+			? _e( 'Site visibility' )
+			/* translators: Hidden accessibility text. */
+			: _e( 'Search engine visibility' );
+		?>
+	</span></legend>
 <?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
 	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( '1', get_option( 'blog_public' ) ); ?> />
 	<label for="blog-public"><?php _e( 'Allow search engines to index this site' ); ?></label><br />
diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php
index e33c1df4f93de..b65f19ebf996b 100644
--- a/src/wp-admin/options-writing.php
+++ b/src/wp-admin/options-writing.php
@@ -50,10 +50,12 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/settings-writing-screen/">Documentation on Writing Settings</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/settings-writing-screen/">Documentation on Writing Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
+wp_enqueue_script( 'user-profile' );
+
 require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
 
@@ -67,7 +69,12 @@
 <?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
 <th scope="row"><?php _e( 'Formatting' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Formatting' ); ?></span></legend>
+<td><fieldset><legend class="screen-reader-text"><span>
+	<?php
+	/* translators: Hidden accessibility text. */
+	_e( 'Formatting' );
+	?>
+</span></legend>
 <label for="use_smilies">
 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked( '1', get_option( 'use_smilies' ) ); ?> />
 	<?php _e( 'Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display' ); ?></label><br />
@@ -163,11 +170,21 @@
 <th scope="row"><label for="mailserver_login"><?php _e( 'Login Name' ); ?></label></th>
 <td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option( 'mailserver_login' ); ?>" class="regular-text ltr" /></td>
 </tr>
-<tr>
-<th scope="row"><label for="mailserver_pass"><?php _e( 'Password' ); ?></label></th>
-<td>
-<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option( 'mailserver_pass' ); ?>" class="regular-text ltr" />
-</td>
+<tr class="mailserver-pass-wrap">
+	<th scope="row">
+		<label for="mailserver_pass">
+			<?php _e( 'Password' ); ?>
+		</label>
+	</th>
+	<td>
+		<input type="hidden" value=" " /><!-- #24364 workaround -->
+		<span class="wp-pwd">
+			<input type="text" name="mailserver_pass" id="mailserver_pass" class="regular-text ltr" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( get_option( 'mailserver_pass' ) ); ?>" />
+			<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" data-start-masked="1" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+				<span class="dashicons dashicons-visibility" aria-hidden="true"></span>
+			</button>
+		</span>
+	</td>
 </tr>
 <tr>
 <th scope="row"><label for="default_email_category"><?php _e( 'Default Mail Category' ); ?></label></th>
@@ -201,14 +218,14 @@
 	?>
 <h2 class="title"><?php _e( 'Update Services' ); ?></h2>
 
-	<?php if ( 1 == get_option( 'blog_public' ) ) : ?>
+	<?php if ( '1' === get_option( 'blog_public' ) ) : ?>
 
 	<p><label for="ping_sites">
 		<?php
 		printf(
 			/* translators: %s: Documentation URL. */
-			__( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="%s">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ),
-			__( 'https://wordpress.org/support/article/update-services/' )
+			__( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see the <a href="%s">Update Services</a> documentation article. Separate multiple service URLs with line breaks.' ),
+			__( 'https://wordpress.org/documentation/article/update-services/' )
 		);
 		?>
 	</label></p>
@@ -222,7 +239,7 @@
 		printf(
 			/* translators: 1: Documentation URL, 2: URL to Reading Settings screen. */
 			__( 'WordPress is not notifying any <a href="%1$s">Update Services</a> because of your site&#8217;s <a href="%2$s">visibility settings</a>.' ),
-			__( 'https://wordpress.org/support/article/update-services/' ),
+			__( 'https://wordpress.org/documentation/article/update-services/' ),
 			'options-reading.php'
 		);
 		?>
diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
index 400a7b69aedfc..df872f4731c28 100644
--- a/src/wp-admin/options.php
+++ b/src/wp-admin/options.php
@@ -245,7 +245,7 @@
 		wp_die(
 			sprintf(
 				/* translators: %s: The options page name. */
-				__( '<strong>Error:</strong> Options page %s not found in the allowed options list.' ),
+				__( '<strong>Error:</strong> The %s options page is not in the allowed options list.' ),
 				'<code>' . esc_html( $option_page ) . '</code>'
 			)
 		);
@@ -353,7 +353,8 @@
 	exit;
 }
 
-require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+require_once ABSPATH . 'wp-admin/admin-header.php';
+?>
 
 <div class="wrap">
 	<h1><?php esc_html_e( 'All Settings' ); ?></h1>
@@ -399,7 +400,7 @@
 <tr>
 	<th scope="row"><label for="<?php echo $name; ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
 <td>
-	<?php if ( strpos( $value, "\n" ) !== false ) : ?>
+	<?php if ( str_contains( $value, "\n" ) ) : ?>
 		<textarea class="<?php echo $class; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>" cols="30" rows="5"><?php echo esc_textarea( $value ); ?></textarea>
 	<?php else : ?>
 		<input class="regular-text <?php echo $class; ?>" type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $value ); ?>"<?php disabled( $disabled, true ); ?> />
diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index e6804c671b39f..1b0b714c325c9 100644
--- a/src/wp-admin/plugin-editor.php
+++ b/src/wp-admin/plugin-editor.php
@@ -140,9 +140,9 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/plugins-editor-screen/">Documentation on Editing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-editor-screen/">Documentation on Editing Plugins</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://developer.wordpress.org/plugins/">Documentation on Writing Plugins</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 $settings = array(
@@ -162,7 +162,7 @@
 	$content = file_get_contents( $real_file );
 }
 
-if ( '.php' === substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+if ( str_ends_with( $real_file, '.php' ) ) {
 	$functions = wp_doc_link_parse( $content );
 
 	if ( ! empty( $functions ) ) {
@@ -296,7 +296,7 @@
 			printf(
 				/* translators: %s: Documentation URL. */
 				__( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),
-				__( 'https://wordpress.org/support/article/changing-file-permissions/' )
+				__( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
 			);
 			?>
 		</p>
diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php
index 0e1a76c3a6415..571b9a9875ab1 100644
--- a/src/wp-admin/plugin-install.php
+++ b/src/wp-admin/plugin-install.php
@@ -118,8 +118,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/plugins-add-new-screen/">Documentation on Installing Plugins</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-add-new-screen/">Documentation on Installing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index dd8f8679d8555..164467952f059 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -580,14 +580,14 @@
 		)
 	);
 
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-themes-auto-updates/">Documentation on Auto-updates</a>' ) . '</p>';
 }
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/managing-plugins/">Documentation on Managing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/manage-plugins/">Documentation on Managing Plugins</a>' ) . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
diff --git a/src/wp-admin/post.php b/src/wp-admin/post.php
index 95a63dfa272a1..17875cb3e541c 100644
--- a/src/wp-admin/post.php
+++ b/src/wp-admin/post.php
@@ -55,8 +55,8 @@
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-	false !== strpos( $sendback, 'post.php' ) ||
-	false !== strpos( $sendback, 'post-new.php' ) ) {
+	str_contains( $sendback, 'post.php' ) ||
+	str_contains( $sendback, 'post-new.php' ) ) {
 	if ( 'attachment' === $post_type ) {
 		$sendback = admin_url( 'upload.php' );
 	} else {
@@ -97,7 +97,7 @@
 		$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
 
 		// Wrap Quick Draft content in the Paragraph block.
-		if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
+		if ( ! str_contains( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
 			$_POST['content'] = sprintf(
 				'<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
 				str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
diff --git a/src/wp-admin/privacy-policy-guide.php b/src/wp-admin/privacy-policy-guide.php
index 3185d0c8703f8..7e92a4dea6a83 100644
--- a/src/wp-admin/privacy-policy-guide.php
+++ b/src/wp-admin/privacy-policy-guide.php
@@ -14,9 +14,12 @@
 }
 
 if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-	include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
+	require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
 }
 
+// Used in the HTML title tag.
+$title = __( 'Privacy Policy Guide' );
+
 add_filter(
 	'admin_body_class',
 	static function( $body_class ) {
diff --git a/src/wp-admin/privacy.php b/src/wp-admin/privacy.php
index 6ee9cb1fab0fa..646fc113532a7 100644
--- a/src/wp-admin/privacy.php
+++ b/src/wp-admin/privacy.php
@@ -28,18 +28,19 @@
 		<div class="about__header-text">
 			<?php _e( 'We take privacy and transparency very seriously' ); ?>
 		</div>
-
-		<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
-			<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="privacy.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Privacy' ); ?></a>
-		</nav>
 	</div>
 
+	<nav class="about__header-navigation nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
+		<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
+		<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
+		<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+		<a href="privacy.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Privacy' ); ?></a>
+		<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
+	</nav>
+
 	<div class="about__section has-2-columns is-wider-right">
 		<div class="column about__image">
-			<img class="privacy-image" src="<?php echo esc_url( admin_url( 'images/privacy.svg?ver=6.1' ) ); ?>" alt="" />
+			<img class="privacy-image" src="<?php echo esc_url( admin_url( 'images/privacy.svg?ver=6.3' ) ); ?>" alt="" />
 		</div>
 		<div class="column is-vertically-aligned-center">
 			<p><?php _e( 'From time to time, your WordPress site may send data to WordPress.org &#8212; including, but not limited to &#8212; the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
diff --git a/src/wp-admin/revision.php b/src/wp-admin/revision.php
index 62ac5bbda385c..72b8e74ae2a97 100644
--- a/src/wp-admin/revision.php
+++ b/src/wp-admin/revision.php
@@ -104,10 +104,10 @@
 		}
 
 		$post_edit_link = get_edit_post_link();
-		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		$post_title     = '<a href="' . esc_url( $post_edit_link ) . '">' . _draft_or_post_title() . '</a>';
 		/* translators: %s: Post title. */
 		$h1             = sprintf( __( 'Compare Revisions of &#8220;%s&#8221;' ), $post_title );
-		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Go to editor' ) . '</a>';
+		$return_to_post = '<a href="' . esc_url( $post_edit_link ) . '">' . __( '&larr; Go to editor' ) . '</a>';
 		// Used in the HTML title tag.
 		$title = __( 'Revisions' );
 
@@ -154,8 +154,8 @@
 );
 
 $revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/article/revisions/">Revisions Management</a>' ) . '</p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>';
+$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/documentation/article/revisions/">Revisions Management</a>' ) . '</p>';
+$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>';
 
 get_current_screen()->set_help_sidebar( $revisions_sidebar );
 
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
index e2cdc763176cb..ddcb4943c7ba7 100644
--- a/src/wp-admin/setup-config.php
+++ b/src/wp-admin/setup-config.php
@@ -157,7 +157,12 @@ function setup_config_display_header( $body_classes = array() ) {
 			$step_1 .= '&amp;language=' . $loaded_language;
 		}
 		?>
-<h1 class="screen-reader-text"><?php _e( 'Before getting started' ); ?></h1>
+<h1 class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Before getting started' );
+		?>
+</h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, you will need to know the following items.' ); ?></p>
 <ol>
 	<li><?php _e( 'Database name' ); ?></li>
@@ -188,7 +193,7 @@ function setup_config_display_header( $body_classes = array() ) {
 		printf(
 			/* translators: 1: Documentation URL, 2: wp-config.php */
 			__( 'Need more help? <a href="%1$s">Read the support article on %2$s</a>.' ),
-			__( 'https://wordpress.org/support/article/editing-wp-config-php/' ),
+			__( 'https://wordpress.org/documentation/article/editing-wp-config-php/' ),
 			'<code>wp-config.php</code>'
 		);
 		?>
@@ -207,39 +212,52 @@ function setup_config_display_header( $body_classes = array() ) {
 
 		$autofocus = wp_is_mobile() ? '' : ' autofocus';
 		?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ); ?></h1>
+<h1 class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Set up your database connection' );
+		?>
+</h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( 'Below you should enter your database connection details. If you are not sure about these, contact your host.' ); ?></p>
 	<table class="form-table" role="presentation">
 		<tr>
 			<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
-			<td><input name="dbname" id="dbname" type="text" aria-describedby="dbname-desc" size="25" placeholder="wordpress"<?php echo $autofocus; ?>/></td>
-			<td id="dbname-desc"><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
+			<td><input name="dbname" id="dbname" type="text" aria-describedby="dbname-desc" size="25" placeholder="wordpress"<?php echo $autofocus; ?>/>
+			<p id="dbname-desc"><?php _e( 'The name of the database you want to use with WordPress.' ); ?></p></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="uname"><?php _e( 'Username' ); ?></label></th>
-			<td><input name="uname" id="uname" type="text" aria-describedby="uname-desc" size="25" placeholder="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
-			<td id="uname-desc"><?php _e( 'Your database username.' ); ?></td>
+			<td><input name="uname" id="uname" type="text" aria-describedby="uname-desc" size="25" placeholder="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" />
+			<p id="uname-desc"><?php _e( 'Your database username.' ); ?></p></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
-			<td><input name="pwd" id="pwd" type="text" aria-describedby="pwd-desc" size="25" placeholder="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
-			<td id="pwd-desc"><?php _e( 'Your database password.' ); ?></td>
+			<td>
+				<div class="wp-pwd">
+					<input name="pwd" id="pwd" type="password" class="regular-text" data-reveal="1" aria-describedby="pwd-desc" size="25" placeholder="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" spellcheck="false" />
+					<button type="button" class="button pwd-toggle hide-if-no-js" data-toggle="0" data-start-masked="1" aria-label="<?php esc_attr_e( 'Show password' ); ?>">
+						<span class="dashicons dashicons-visibility"></span>
+						<span class="text"><?php _e( 'Show' ); ?></span>
+					</button>
+				</div>
+				<p id="pwd-desc"><?php _e( 'Your database password.' ); ?></p>
+			</td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
-			<td><input name="dbhost" id="dbhost" type="text" aria-describedby="dbhost-desc" size="25" value="localhost" /></td>
-			<td id="dbhost-desc">
+			<td><input name="dbhost" id="dbhost" type="text" aria-describedby="dbhost-desc" size="25" value="localhost" />
+			<p id="dbhost-desc">
 			<?php
 				/* translators: %s: localhost */
 				printf( __( 'You should be able to get this info from your web host, if %s does not work.' ), '<code>localhost</code>' );
 			?>
-			</td>
+			</p></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
-			<td><input name="prefix" id="prefix" type="text" aria-describedby="prefix-desc" value="wp_" size="25" /></td>
-			<td id="prefix-desc"><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
+			<td><input name="prefix" id="prefix" type="text" aria-describedby="prefix-desc" value="wp_" size="25" />
+			<p id="prefix-desc"><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></p></td>
 		</tr>
 	</table>
 		<?php
@@ -250,6 +268,7 @@ function setup_config_display_header( $body_classes = array() ) {
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 		<?php
+		wp_print_scripts( 'password-toggle' );
 		break;
 
 	case 2:
@@ -353,7 +372,7 @@ function setup_config_display_header( $body_classes = array() ) {
 
 		$key = 0;
 		foreach ( $config_file as $line_num => $line ) {
-			if ( '$table_prefix =' === substr( $line, 0, 15 ) ) {
+			if ( str_starts_with( $line, '$table_prefix =' ) ) {
 				$config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
 				continue;
 			}
@@ -461,7 +480,7 @@ function setup_config_display_header( $body_classes = array() ) {
 						/* translators: 1: wp-config.php, 2: Documentation URL. */
 						__( 'You need to make the file %1$s writable before you can save your changes. See <a href="%2$s">Changing File Permissions</a> for more information.' ),
 						'<code>wp-config.php</code>',
-						__( 'https://wordpress.org/support/article/changing-file-permissions/' )
+						__( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
 					);
 				} else {
 					$error_message = sprintf(
@@ -477,7 +496,12 @@ function setup_config_display_header( $body_classes = array() ) {
 
 			if ( false !== $handle ) :
 				?>
-<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ); ?></h1>
+<h1 class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Successful database connection' );
+				?>
+</h1>
 <p><?php _e( 'All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;' ); ?></p>
 
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
diff --git a/src/wp-admin/site-editor.php b/src/wp-admin/site-editor.php
index 64ed4b9c27cad..93b1a9313135f 100644
--- a/src/wp-admin/site-editor.php
+++ b/src/wp-admin/site-editor.php
@@ -20,33 +20,19 @@
 }
 
 if ( ! ( current_theme_supports( 'block-template-parts' ) || wp_is_block_theme() ) ) {
-	wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
+	wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) );
 }
 
-$is_template_part_editor = isset( $_GET['postType'] ) && 'wp_template_part' === sanitize_key( $_GET['postType'] );
+$is_template_part = isset( $_GET['postType'] ) && 'wp_template_part' === sanitize_key( $_GET['postType'] );
+$is_template_part_path = isset( $_GET['path'] ) && 'wp_template_partall' === sanitize_key( $_GET['path'] );
+$is_template_part_editor = $is_template_part || $is_template_part_path;
+
 if ( ! wp_is_block_theme() && ! $is_template_part_editor ) {
 	wp_die( __( 'The theme you are currently using is not compatible with the Site Editor.' ) );
 }
 
-/**
- * Do a server-side redirection if missing `postType` and `postId`
- * query args when visiting Site Editor.
- */
-$home_template = _resolve_home_block_template();
-if ( $home_template && empty( $_GET['postType'] ) && empty( $_GET['postId'] ) ) {
-	if ( ! empty( $_GET['styles'] ) ) {
-		$home_template['styles'] = sanitize_key( $_GET['styles'] );
-	}
-	$redirect_url = add_query_arg(
-		$home_template,
-		admin_url( 'site-editor.php' )
-	);
-	wp_safe_redirect( $redirect_url );
-	exit;
-}
-
 // Used in the HTML title tag.
-$title       = __( 'Editor (beta)' );
+$title       = _x( 'Editor', 'site editor title tag' );
 $parent_file = 'themes.php';
 
 // Flag that we're loading the block editor.
@@ -74,19 +60,10 @@ static function( $classes ) {
 	'styles'                    => get_block_editor_theme_styles(),
 	'defaultTemplateTypes'      => $indexed_template_types,
 	'defaultTemplatePartAreas'  => get_allowed_block_template_part_areas(),
-	'supportsLayout'            => WP_Theme_JSON_Resolver::theme_has_support(),
+	'supportsLayout'            => wp_theme_has_theme_json(),
 	'supportsTemplatePartsMode' => ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ),
-	'__unstableHomeTemplate'    => $home_template,
 );
 
-/**
- * Home template resolution is not needed when block template parts are supported.
- * Set the value to `true` to satisfy the editor initialization guard clause.
- */
-if ( $custom_settings['supportsTemplatePartsMode'] ) {
-	$custom_settings['__unstableHomeTemplate'] = true;
-}
-
 // Add additional back-compat patterns registered by `current_screen` et al.
 $custom_settings['__experimentalAdditionalBlockPatterns']          = WP_Block_Patterns_Registry::get_instance()->get_all_registered( true );
 $custom_settings['__experimentalAdditionalBlockPatternCategories'] = WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered( true );
@@ -101,8 +78,13 @@ static function( $classes ) {
 }
 
 $active_global_styles_id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
-$active_theme            = wp_get_theme()->get_stylesheet();
-$preload_paths           = array(
+$active_theme            = get_stylesheet();
+
+$navigation_rest_route = rest_get_route_for_post_type_items(
+	'wp_navigation'
+);
+
+$preload_paths = array(
 	array( '/wp/v2/media', 'OPTIONS' ),
 	'/wp/v2/types?context=view',
 	'/wp/v2/types/wp_template?context=edit',
@@ -113,6 +95,22 @@ static function( $classes ) {
 	'/wp/v2/global-styles/' . $active_global_styles_id . '?context=edit',
 	'/wp/v2/global-styles/' . $active_global_styles_id,
 	'/wp/v2/global-styles/themes/' . $active_theme,
+	array( $navigation_rest_route, 'OPTIONS' ),
+	array(
+		add_query_arg(
+			array(
+				'context'   => 'edit',
+				'per_page'  => 100,
+				'order'     => 'desc',
+				'orderby'   => 'date',
+				// array indices are required to avoid query being encoded and not matching in cache.
+				'status[0]' => 'publish',
+				'status[1]' => 'draft',
+			),
+			$navigation_rest_route
+		),
+		'GET',
+	),
 );
 
 block_editor_rest_api_preload( $preload_paths, $block_editor_context );
@@ -146,7 +144,7 @@ static function( $classes ) {
 wp_enqueue_media();
 
 if (
-	current_theme_supports( 'wp-block-styles' ) ||
+	current_theme_supports( 'wp-block-styles' ) &&
 	( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
 ) {
 	wp_enqueue_style( 'wp-block-library-theme' );
@@ -158,7 +156,28 @@ static function( $classes ) {
 require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
 
-<div id="site-editor" class="edit-site"></div>
+<div class="edit-site" id="site-editor">
+	<?php // JavaScript is disabled. ?>
+	<div class="wrap hide-if-js site-editor-no-js">
+		<h1 class="wp-heading-inline"><?php _e( 'Edit site' ); ?></h1>
+		<div class="notice notice-error">
+			<p>
+				<?php
+					/**
+					 * Filters the message displayed in the site editor interface when JavaScript is
+					 * not enabled in the browser.
+					 *
+					 * @since 6.3.0
+					 *
+					 * @param string  $message The message being displayed.
+					 * @param WP_Post $post    The post being edited.
+					 */
+					echo apply_filters( 'site_editor_no_javascript_message', __( 'The site editor requires JavaScript. Please enable JavaScript in your browser settings.' ), $post );
+				?>
+			</p>
+		</div>
+	</div>
+</div>
 
 <?php
 
diff --git a/src/wp-admin/site-health.php b/src/wp-admin/site-health.php
index 90c354ed38c7c..dac787748daaa 100644
--- a/src/wp-admin/site-health.php
+++ b/src/wp-admin/site-health.php
@@ -19,7 +19,7 @@
 );
 
 /**
- * An associative array of extra tabs for the Site Health navigation bar.
+ * Filters the extra tabs for the Site Health navigation bar.
  *
  * Add a custom page to the Site Health screen, based on a tab slug and label.
  * The label you provide will also be used as part of the site title.
@@ -87,7 +87,7 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/site-health-screen/">Documentation on Site Health tool</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/site-health-screen/">Documentation on Site Health tool</a>' ) . '</p>'
 );
 
 // Start by checking if this is a special request checking for the existence of certain filters.
@@ -160,7 +160,12 @@
 		<?php if ( count( $tabs ) > 4 ) : ?>
 			<button type="button" class="health-check-tab health-check-offscreen-nav-wrapper" aria-haspopup="true">
 				<span class="dashicons dashicons-ellipsis"></span>
-				<span class="screen-reader-text"><?php _e( 'Toggle extra menu items' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Toggle extra menu items' );
+					?>
+				</span>
 
 				<div class="health-check-offscreen-nav">
 					<?php
@@ -193,7 +198,7 @@
 <?php
 if ( isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ) {
 	/**
-	 * Output content of a custom Site Health tab.
+	 * Fires when outputting the content of a custom Site Health tab.
 	 *
 	 * This action fires right after the Site Health header, and users are still subject to
 	 * the capability checks for the Site Health page to view any custom tabs and their contents.
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 863a5093c5cfc..07de6269a7db0 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -50,10 +50,10 @@
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://developer.wordpress.org/themes/">Documentation on Theme Development</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-editor-screen/">Documentation on Editing Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/editing-files/">Documentation on Editing Files</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-theme-file-editor-screen/">Documentation on Editing Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/editing-files/">Documentation on Editing Files</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://developer.wordpress.org/themes/basics/template-tags/">Documentation on Template Tags</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
@@ -161,7 +161,7 @@
 	$f       = fopen( $file, 'r' );
 	$content = fread( $f, filesize( $file ) );
 
-	if ( '.php' === substr( $file, strrpos( $file, '.' ) ) ) {
+	if ( str_ends_with( $file, '.php' ) ) {
 		$functions = wp_doc_link_parse( $content );
 
 		if ( ! empty( $functions ) ) {
@@ -221,7 +221,8 @@
 	<?php
 	echo $theme->display( 'Name' );
 	if ( $description ) {
-		echo ': ' . $description;}
+		echo ': ' . $description;
+	}
 	?>
 </h2>
 </div>
@@ -325,7 +326,7 @@
 					printf(
 						/* translators: %s: Documentation URL. */
 						__( 'You need to make this file writable before you can save your changes. See <a href="%s">Changing File Permissions</a> for more information.' ),
-						__( 'https://wordpress.org/support/article/changing-file-permissions/' )
+						__( 'https://wordpress.org/documentation/article/changing-file-permissions/' )
 					);
 					?>
 				</p>
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index e07b299901adc..52172b97b9a7d 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -70,7 +70,7 @@
 			'noThemesFound'       => __( 'No themes found. Try a different search.' ),
 			'collapseSidebar'     => __( 'Collapse Sidebar' ),
 			'expandSidebar'       => __( 'Expand Sidebar' ),
-			/* translators: Accessibility text. */
+			/* translators: Hidden accessibility text. */
 			'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
 		),
 		'installedThemes' => array_keys( $installed_themes ),
@@ -153,9 +153,9 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-themes-screen/#install-themes">Documentation on Adding New Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/block-themes/">Documentation on Block Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-themes-screen/#install-themes">Documentation on Adding New Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/block-themes/">Documentation on Block Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
@@ -191,7 +191,12 @@
 	<?php install_themes_upload(); ?>
 	</div>
 
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Filter themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Filter themes list' );
+		?>
+	</h2>
 
 	<div class="wp-filter hide-if-no-js">
 		<div class="filter-count">
@@ -263,7 +268,12 @@
 			</div>
 		</div>
 	</div>
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Themes list' );
+		?>
+	</h2>
 	<div class="theme-browser content-filterable"></div>
 	<div class="theme-install-overlay wp-full-overlay expanded"></div>
 
@@ -440,9 +450,24 @@
 <script id="tmpl-theme-preview" type="text/template">
 	<div class="wp-full-overlay-sidebar">
 		<div class="wp-full-overlay-header">
-			<button class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-			<button class="previous-theme"><span class="screen-reader-text"><?php _e( 'Previous theme' ); ?></span></button>
-			<button class="next-theme"><span class="screen-reader-text"><?php _e( 'Next theme' ); ?></span></button>
+			<button class="close-full-overlay"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Close' );
+				?>
+			</span></button>
+			<button class="previous-theme"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Previous theme' );
+				?>
+			</span></button>
+			<button class="next-theme"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Next theme' );
+				?>
+			</span></button>
 			<# if ( data.installed ) { #>
 				<# if ( data.compatible_wp && data.compatible_php ) { #>
 					<?php
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index 6dcc909252f26..351fe93dbd975 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -199,15 +199,15 @@
 		)
 	);
 
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-themes-auto-updates/">Documentation on Auto-updates</a>' ) . '</p>';
 } // End if 'update_themes' && 'wp_is_auto_update_enabled_for_type'.
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/using-themes/">Documentation on Using Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-themes-screen/">Documentation on Managing Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/work-with-themes/">Documentation on Using Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-themes-screen/">Documentation on Managing Themes</a>' ) . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 if ( current_user_can( 'switch_themes' ) ) {
@@ -555,7 +555,8 @@
 			?>
 			<a class="button activate" href="<?php echo $theme['actions']['activate']; ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
 			<?php
-			if ( ! $theme['blockTheme'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			// Only classic themes require the "customize" capability.
+			if ( current_user_can( 'edit_theme_options' ) && ( $theme['blockTheme'] || current_user_can( 'customize' ) ) ) {
 				/* translators: %s: Theme name. */
 				$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
 				?>
@@ -914,13 +915,11 @@ function wp_theme_auto_update_setting_template() {
 					$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
 					?>
 					<a class="button activate" href="{{{ data.actions.activate }}}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
-					<# if ( ! data.blockTheme ) { #>
-						<?php
-						/* translators: %s: Theme name. */
-						$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
-						?>
-						<a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
-					<# } #>
+					<?php
+					/* translators: %s: Theme name. */
+					$live_preview_aria_label = sprintf( _x( 'Live Preview %s', 'theme' ), '{{ data.name }}' );
+					?>
+					<a aria-label="<?php echo esc_attr( $live_preview_aria_label ); ?>" class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
 				<# } else { #>
 					<?php
 					/* translators: %s: Theme name. */
@@ -940,9 +939,24 @@ function wp_theme_auto_update_setting_template() {
 	<div class="theme-backdrop"></div>
 	<div class="theme-wrap wp-clearfix" role="document">
 		<div class="theme-header">
-			<button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-			<button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-			<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+			<button class="left dashicons dashicons-no"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Show previous theme' );
+				?>
+			</span></button>
+			<button class="right dashicons dashicons-no"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Show next theme' );
+				?>
+			</span></button>
+			<button class="close dashicons dashicons-no"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Close details dialog' );
+				?>
+			</span></button>
 		</div>
 		<div class="theme-about wp-clearfix">
 			<div class="theme-screenshots">
diff --git a/src/wp-admin/tools.php b/src/wp-admin/tools.php
index 8095e4726bf62..d03c64fa61252 100644
--- a/src/wp-admin/tools.php
+++ b/src/wp-admin/tools.php
@@ -53,8 +53,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/tools-screen/">Documentation on Tools</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/tools-screen/">Documentation on Tools</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 require_once ABSPATH . 'wp-admin/admin-header.php';
diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index 4fd65cc165a56..8949f39e33d27 100644
--- a/src/wp-admin/update-core.php
+++ b/src/wp-admin/update-core.php
@@ -91,7 +91,7 @@ function list_core_update( $update ) {
 
 			$version_url = sprintf(
 				/* translators: %s: WordPress version. */
-				esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+				esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 				sanitize_title( $update->current )
 			);
 
@@ -265,8 +265,8 @@ function core_upgrade_preamble() {
 		printf(
 			/* translators: 1: Documentation on WordPress backups, 2: Documentation on updating WordPress. */
 			__( '<strong>Important:</strong> Before updating, please <a href="%1$s">back up your database and files</a>. For help with updates, visit the <a href="%2$s">Updating WordPress</a> documentation page.' ),
-			__( 'https://wordpress.org/support/article/wordpress-backups/' ),
-			__( 'https://wordpress.org/support/article/updating-wordpress/' )
+			__( 'https://wordpress.org/documentation/article/wordpress-backups/' ),
+			__( 'https://wordpress.org/documentation/article/updating-wordpress/' )
 		);
 		echo '</p></div>';
 	} elseif ( $is_development_version ) {
@@ -402,7 +402,7 @@ function core_auto_updates_settings() {
 			_e( 'This site is automatically kept up to date with each new version of WordPress.' );
 
 			if ( $can_set_update_option ) {
-				echo '<br>';
+				echo '<br />';
 				printf(
 					'<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-disable">%s</a>',
 					wp_nonce_url( add_query_arg( 'value', 'disable', $action_url ), 'core-major-auto-updates-nonce' ),
@@ -413,7 +413,7 @@ function core_auto_updates_settings() {
 			_e( 'This site is automatically kept up to date with maintenance and security releases of WordPress only.' );
 
 			if ( $can_set_update_option ) {
-				echo '<br>';
+				echo '<br />';
 				printf(
 					'<a href="%s" class="core-auto-update-settings-link core-auto-update-settings-link-enable">%s</a>',
 					wp_nonce_url( add_query_arg( 'value', 'enable', $action_url ), 'core-major-auto-updates-nonce' ),
@@ -535,7 +535,7 @@ function list_plugin_updates() {
 		$compatible_php = is_php_version_compatible( $requires_php );
 
 		if ( ! $compatible_php && current_user_can( 'update_php' ) ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
+			$compat .= '<br />' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
 			$compat .= sprintf(
 				/* translators: %s: URL to Update PHP page. */
 				__( '<a href="%s">Learn more about updating PHP</a>.' ),
@@ -571,13 +571,15 @@ function list_plugin_updates() {
 	<tr>
 		<td class="check-column">
 			<?php if ( $compatible_php ) : ?>
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
-				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+				<label for="<?php echo $checkbox_id; ?>" class="label-covers-full-cell">
+					<span class="screen-reader-text">
 					<?php
-					/* translators: %s: Plugin name. */
+					/* translators: Hidden accessibility text. %s: Plugin name. */
 					printf( __( 'Select %s' ), $plugin_data->Name );
 					?>
+					</span>
 				</label>
+				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
 			<?php endif; ?>
 		</td>
 		<td class="plugin-title"><p>
@@ -591,11 +593,13 @@ function list_plugin_updates() {
 				$plugin_data->update->new_version
 			);
 
-			echo ' ' . $details . $compat . $upgrade_notice;
+			echo ' ' . $details . $compat;
 
 			if ( in_array( $plugin_file, $auto_updates, true ) ) {
 				echo $auto_update_notice;
 			}
+
+			echo $upgrade_notice;
 			?>
 		</p></td>
 	</tr>
@@ -681,7 +685,7 @@ function list_theme_updates() {
 		$compat = '';
 
 		if ( ! $compatible_wp && ! $compatible_php ) {
-			$compat .= '<br>' . __( 'This update does not work with your versions of WordPress and PHP.' ) . '&nbsp;';
+			$compat .= '<br />' . __( 'This update does not work with your versions of WordPress and PHP.' ) . '&nbsp;';
 			if ( current_user_can( 'update_core' ) && current_user_can( 'update_php' ) ) {
 				$compat .= sprintf(
 					/* translators: 1: URL to WordPress Updates screen, 2: URL to Update PHP page. */
@@ -715,7 +719,7 @@ function list_theme_updates() {
 				}
 			}
 		} elseif ( ! $compatible_wp ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of WordPress.' ) . '&nbsp;';
+			$compat .= '<br />' . __( 'This update does not work with your version of WordPress.' ) . '&nbsp;';
 			if ( current_user_can( 'update_core' ) ) {
 				$compat .= sprintf(
 					/* translators: %s: URL to WordPress Updates screen. */
@@ -724,7 +728,7 @@ function list_theme_updates() {
 				);
 			}
 		} elseif ( ! $compatible_php ) {
-			$compat .= '<br>' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
+			$compat .= '<br />' . __( 'This update does not work with your version of PHP.' ) . '&nbsp;';
 			if ( current_user_can( 'update_php' ) ) {
 				$compat .= sprintf(
 					/* translators: %s: URL to Update PHP page. */
@@ -745,13 +749,15 @@ function list_theme_updates() {
 	<tr>
 		<td class="check-column">
 			<?php if ( $compatible_wp && $compatible_php ) : ?>
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
-				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+				<label for="<?php echo $checkbox_id; ?>" class="label-covers-full-cell">
+					<span class="screen-reader-text">
 					<?php
-					/* translators: %s: Theme name. */
+					/* translators: Hidden accessibility text. %s: Theme name. */
 					printf( __( 'Select %s' ), $theme->display( 'Name' ) );
 					?>
+					</span>
 				</label>
+				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $stylesheet ); ?>" />
 			<?php endif; ?>
 		</td>
 		<td class="plugin-title"><p>
@@ -817,7 +823,7 @@ function list_translation_updates() {
 }
 
 /**
- * Upgrade WordPress core display.
+ * Upgrades WordPress core display.
  *
  * @since 2.7.0
  *
@@ -844,8 +850,10 @@ function do_core_upgrade( $reinstall = false ) {
 		return;
 	}
 
-	// Allow relaxed file ownership writes for User-initiated upgrades when the API specifies
-	// that it's safe to do so. This only happens when there are no new files to create.
+	/*
+	 * Allow relaxed file ownership writes for User-initiated upgrades when the API specifies
+	 * that it's safe to do so. This only happens when there are no new files to create.
+	 */
 	$allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files;
 
 	?>
@@ -1008,18 +1016,37 @@ function do_undismiss_core_update() {
 		)
 	);
 
-	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/support/article/plugins-themes-auto-updates/">Learn more: Auto-updates documentation</a>' ) . '</p>';
+	$help_sidebar_autoupdates = '<p>' . __( '<a href="https://wordpress.org/documentation/article/plugins-themes-auto-updates/">Documentation on Auto-updates</a>' ) . '</p>';
+}
+
+$help_sidebar_rollback = '';
+
+if ( current_user_can( 'update_themes' ) || current_user_can( 'update_plugins' ) ) {
+	$rollback_help = '<p>' . __( 'This feature will create a temporary backup of a plugin or theme before it is upgraded. This backup is used to restore the plugin or theme back to its previous state if there is an error during the update process.' ) . '</p>';
+
+	$rollback_help .= '<p>' . __( 'On systems with fewer resources, this may lead to server timeouts or resource limits being reached. If you encounter an issue during the update process, please create a support forum topic and reference <strong>Rollback</strong> in the issue title.' ) . '</p>';
+
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'rollback-plugins-themes',
+			'title'   => __( 'Restore Plugin or Theme' ),
+			'content' => $rollback_help,
+		)
+	);
+
+	$help_sidebar_rollback = '<p>' . __( '<a href="https://wordpress.org/documentation/article/common-wordpress-errors/">Common Errors</a>' ) . '</p>';
 }
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/dashboard-updates-screen/">Documentation on Updating WordPress</a>' ) . '</p>' .
 	$help_sidebar_autoupdates .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>' .
+	$help_sidebar_rollback
 );
 
 if ( 'upgrade-core' === $action ) {
-	// Force a update check when requested.
+	// Force an update check when requested.
 	$force_check = ! empty( $_GET['force-check'] );
 	wp_version_check( array(), $force_check );
 
@@ -1027,17 +1054,25 @@ function do_undismiss_core_update() {
 	?>
 	<div class="wrap">
 	<h1><?php _e( 'WordPress Updates' ); ?></h1>
-	<p><?php _e( 'Here you can find information about updates, set auto-updates and see what plugins or themes need updating.' ); ?></p>
+	<p><?php _e( 'Updates may take several minutes to complete. If there is no feedback after 5 minutes, or if there are errors please refer to the Help section above.' ); ?></p>
 
 	<?php
 	if ( $upgrade_error ) {
-		echo '<div class="error"><p>';
 		if ( 'themes' === $upgrade_error ) {
-			_e( 'Please select one or more themes to update.' );
+			$theme_updates = get_theme_updates();
+			if ( ! empty( $theme_updates ) ) {
+				echo '<div class="error"><p>';
+				_e( 'Please select one or more themes to update.' );
+				echo '</p></div>';
+			}
 		} else {
-			_e( 'Please select one or more plugins to update.' );
+			$plugin_updates = get_plugin_updates();
+			if ( ! empty( $plugin_updates ) ) {
+				echo '<div class="error"><p>';
+				_e( 'Please select one or more plugins to update.' );
+				echo '</p></div>';
+			}
 		}
-		echo '</p></div>';
 	}
 
 	$last_update_check = false;
diff --git a/src/wp-admin/update.php b/src/wp-admin/update.php
index a4a2abf8dbf21..29480c2840a57 100644
--- a/src/wp-admin/update.php
+++ b/src/wp-admin/update.php
@@ -107,7 +107,7 @@
 			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
 		}
 
-		include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // For plugins_api().
+		require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // For plugins_api().
 
 		check_admin_referer( 'install-plugin_' . $plugin );
 		$api = plugins_api(
@@ -258,7 +258,7 @@
 			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
 		}
 
-		include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // For themes_api().
+		require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // For themes_api().
 
 		check_admin_referer( 'install-theme_' . $theme );
 		$api = themes_api(
diff --git a/src/wp-admin/upgrade.php b/src/wp-admin/upgrade.php
index 1b1565aa45f0f..414fbb28d1946 100644
--- a/src/wp-admin/upgrade.php
+++ b/src/wp-admin/upgrade.php
@@ -72,13 +72,13 @@
 
 <h1><?php _e( 'No Update Required' ); ?></h1>
 <p><?php _e( 'Your WordPress database is already up to date!' ); ?></p>
-<p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
+<p class="step"><a class="button button-large" href="<?php echo esc_url( get_option( 'home' ) ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
 	<?php
 elseif ( ! $php_compat || ! $mysql_compat ) :
 	$version_url = sprintf(
 		/* translators: %s: WordPress version. */
-		esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+		esc_url( __( 'https://wordpress.org/documentation/wordpress-version/version-%s/' ) ),
 		sanitize_title( $wp_version )
 	);
 
diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php
index f03cdad8c11d8..29a8c4de8d193 100644
--- a/src/wp-admin/upload.php
+++ b/src/wp-admin/upload.php
@@ -13,6 +13,121 @@
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
 }
 
+$message = '';
+if ( ! empty( $_GET['posted'] ) ) {
+	$message = __( 'Media file updated.' );
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['posted'] );
+}
+
+if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
+	$attached = absint( $_GET['attached'] );
+
+	if ( 1 === $attached ) {
+		$message = __( 'Media file attached.' );
+	} else {
+		$message = sprintf(
+			/* translators: %s: Number of media files. */
+			_n( '%s media file attached.', '%s media files attached.', $attached ),
+			number_format_i18n( $attached )
+		);
+	}
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['detach'], $_GET['attached'] );
+}
+
+if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
+	$detached = absint( $_GET['detach'] );
+
+	if ( 1 === $detached ) {
+		$message = __( 'Media file detached.' );
+	} else {
+		$message = sprintf(
+			/* translators: %s: Number of media files. */
+			_n( '%s media file detached.', '%s media files detached.', $detached ),
+			number_format_i18n( $detached )
+		);
+	}
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['detach'], $_GET['attached'] );
+}
+
+if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
+	$deleted = absint( $_GET['deleted'] );
+
+	if ( 1 === $deleted ) {
+		$message = __( 'Media file permanently deleted.' );
+	} else {
+		$message = sprintf(
+			/* translators: %s: Number of media files. */
+			_n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted ),
+			number_format_i18n( $deleted )
+		);
+	}
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['deleted'] );
+}
+
+if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
+	$trashed = absint( $_GET['trashed'] );
+
+	if ( 1 === $trashed ) {
+		$message = __( 'Media file moved to the Trash.' );
+	} else {
+		$message = sprintf(
+			/* translators: %s: Number of media files. */
+			_n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed ),
+			number_format_i18n( $trashed )
+		);
+	}
+
+	$message .= sprintf(
+		' <a href="%1$s">%2$s</a>',
+		esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ),
+		__( 'Undo' )
+	);
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['trashed'] );
+}
+
+if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
+	$untrashed = absint( $_GET['untrashed'] );
+
+	if ( 1 === $untrashed ) {
+		$message = __( 'Media file restored from the Trash.' );
+	} else {
+		$message = sprintf(
+			/* translators: %s: Number of media files. */
+			_n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed ),
+			number_format_i18n( $untrashed )
+		);
+	}
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
+	unset( $_GET['untrashed'] );
+}
+
+$messages[1] = __( 'Media file updated.' );
+$messages[2] = __( 'Media file permanently deleted.' );
+$messages[3] = __( 'Error saving media file.' );
+$messages[4] = __( 'Media file moved to the Trash.' ) . sprintf(
+	' <a href="%1$s">%2$s</a>',
+	esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ),
+	__( 'Undo' )
+);
+$messages[5] = __( 'Media file restored from the Trash.' );
+
+if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
+	$message = $messages[ $_GET['message'] ];
+
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
+}
+
 $mode  = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
 
@@ -26,7 +141,15 @@
 	wp_enqueue_script( 'media-grid' );
 	wp_enqueue_script( 'media' );
 
-	remove_action( 'admin_head', 'wp_admin_canonical_url' );
+	// Remove the error parameter added by deprecation of wp-admin/media.php.
+	add_filter(
+		'removable_query_args',
+		function() {
+			return array( 'error' );
+		},
+		10,
+		0
+	);
 
 	$q = $_GET;
 	// Let JS handle this.
@@ -72,8 +195,8 @@
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/media-library-screen/">Documentation on Media Library</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/media-library-screen/">Documentation on Media Library</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 	);
 
 	// Used in the HTML title tag.
@@ -95,6 +218,10 @@
 
 		<hr class="wp-header-end">
 
+		<?php if ( ! empty( $message ) ) : ?>
+			<div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
+		<?php endif; ?>
+
 		<div class="error hide-if-js">
 			<p>
 			<?php
@@ -131,11 +258,12 @@
 	} elseif ( isset( $_REQUEST['ids'] ) ) {
 		$post_ids = explode( ',', $_REQUEST['ids'] );
 	}
+	$post_ids = array_map( 'intval', (array) $post_ids );
 
 	$location = 'upload.php';
 	$referer  = wp_get_referer();
 	if ( $referer ) {
-		if ( false !== strpos( $referer, 'upload.php' ) ) {
+		if ( str_contains( $referer, 'upload.php' ) ) {
 			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
 		}
 	}
@@ -153,7 +281,7 @@
 			if ( empty( $post_ids ) ) {
 				break;
 			}
-			foreach ( (array) $post_ids as $post_id ) {
+			foreach ( $post_ids as $post_id ) {
 				if ( ! current_user_can( 'delete_post', $post_id ) ) {
 					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
 				}
@@ -174,7 +302,7 @@
 			if ( empty( $post_ids ) ) {
 				break;
 			}
-			foreach ( (array) $post_ids as $post_id ) {
+			foreach ( $post_ids as $post_id ) {
 				if ( ! current_user_can( 'delete_post', $post_id ) ) {
 					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
 				}
@@ -189,7 +317,7 @@
 			if ( empty( $post_ids ) ) {
 				break;
 			}
-			foreach ( (array) $post_ids as $post_id_del ) {
+			foreach ( $post_ids as $post_id_del ) {
 				if ( ! current_user_can( 'delete_post', $post_id_del ) ) {
 					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
 				}
@@ -244,7 +372,8 @@
 					'<li>' . __( '<strong>Edit</strong> takes you to a simple screen to edit that individual file&#8217;s metadata. You can also reach that screen by clicking on the media file name or thumbnail.' ) . '</li>' .
 					'<li>' . __( '<strong>Delete Permanently</strong> will delete the file from the media library (as well as from any posts to which it is currently attached).' ) . '</li>' .
 					'<li>' . __( '<strong>View</strong> will take you to a public display page for that file.' ) . '</li>' .
-					'<li>' . __( '<strong>Copy URL to clipboard</strong> copies the URL for the media file to your clipboard.' ) . '</li>' .
+					'<li>' . __( '<strong>Copy URL</strong> copies the URL for the media file to your clipboard.' ) . '</li>' .
+					'<li>' . __( '<strong>Download file</strong> downloads the original media file to your device.' ) . '</li>' .
 				'</ul>',
 	)
 );
@@ -259,8 +388,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/media-library-screen/">Documentation on Media Library</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/media-library-screen/">Documentation on Media Library</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -297,89 +426,9 @@
 
 <hr class="wp-header-end">
 
-<?php
-$message = '';
-if ( ! empty( $_GET['posted'] ) ) {
-	$message                = __( 'Media file updated.' );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
-	$attached = absint( $_GET['attached'] );
-	if ( 1 === $attached ) {
-		$message = __( 'Media file attached.' );
-	} else {
-		/* translators: %s: Number of media files. */
-		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
-	}
-	$message                = sprintf( $message, number_format_i18n( $attached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
-	$detached = absint( $_GET['detach'] );
-	if ( 1 === $detached ) {
-		$message = __( 'Media file detached.' );
-	} else {
-		/* translators: %s: Number of media files. */
-		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
-	}
-	$message                = sprintf( $message, number_format_i18n( $detached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
-	$deleted = absint( $_GET['deleted'] );
-	if ( 1 === $deleted ) {
-		$message = __( 'Media file permanently deleted.' );
-	} else {
-		/* translators: %s: Number of media files. */
-		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
-	}
-	$message                = sprintf( $message, number_format_i18n( $deleted ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
-	$trashed = absint( $_GET['trashed'] );
-	if ( 1 === $trashed ) {
-		$message = __( 'Media file moved to the Trash.' );
-	} else {
-		/* translators: %s: Number of media files. */
-		$message = _n( '%s media file moved to the Trash.', '%s media files moved to the Trash.', $trashed );
-	}
-	$message                = sprintf( $message, number_format_i18n( $trashed ) );
-	$message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
-	$untrashed = absint( $_GET['untrashed'] );
-	if ( 1 === $untrashed ) {
-		$message = __( 'Media file restored from the Trash.' );
-	} else {
-		/* translators: %s: Number of media files. */
-		$message = _n( '%s media file restored from the Trash.', '%s media files restored from the Trash.', $untrashed );
-	}
-	$message                = sprintf( $message, number_format_i18n( $untrashed ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
-}
-
-$messages[1] = __( 'Media file updated.' );
-$messages[2] = __( 'Media file permanently deleted.' );
-$messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the Trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media file restored from the Trash.' );
-
-if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message                = $messages[ $_GET['message'] ];
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
-}
-
-if ( ! empty( $message ) ) {
-	?>
+<?php if ( ! empty( $message ) ) : ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
-<?php } ?>
+<?php endif; ?>
 
 <form id="posts-filter" method="get">
 
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 681c7354f8c51..c5468cf93773b 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -9,6 +9,9 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
 
+/** WordPress Translation Installation API */
+require_once ABSPATH . 'wp-admin/includes/translation-install.php';
+
 wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
 
 $user_id      = (int) $user_id;
@@ -71,8 +74,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/users-your-profile-screen/">Documentation on User Profiles</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/users-your-profile-screen/">Documentation on User Profiles</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 $wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
@@ -104,7 +107,7 @@
 if ( IS_PROFILE_PAGE && isset( $_GET['newuseremail'] ) && $current_user->ID ) {
 	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
 	if ( $new_email && hash_equals( $new_email['hash'], $_GET['newuseremail'] ) ) {
-		$user             = new stdClass;
+		$user             = new stdClass();
 		$user->ID         = $current_user->ID;
 		$user->user_email = esc_html( trim( $new_email['newemail'] ) );
 		if ( is_multisite() && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
@@ -208,7 +211,7 @@
 				<?php else : ?>
 					<p><strong><?php _e( 'User updated.' ); ?></strong></p>
 				<?php endif; ?>
-				<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
+				<?php if ( $wp_http_referer && ! str_contains( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
 					<p><a href="<?php echo esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '&larr; Go to Users' ); ?></a></p>
 				<?php endif; ?>
 			</div>
@@ -330,7 +333,7 @@
 								<input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php checked( 'true', $profile_user->comment_shortcuts ); ?> />
 								<?php _e( 'Enable keyboard shortcuts for comment moderation.' ); ?>
 							</label>
-							<?php _e( '<a href="https://wordpress.org/support/article/keyboard-shortcuts/" target="_blank">More information</a>' ); ?>
+							<?php _e( '<a href="https://wordpress.org/documentation/article/keyboard-shortcuts-classic-editor/#keyboard-shortcuts-for-comments">Documentation on Keyboard Shortcuts</a>' ); ?>
 						</td>
 					</tr>
 					<?php endif; ?>
@@ -345,8 +348,11 @@
 						</td>
 					</tr>
 
-					<?php $languages = get_available_languages(); ?>
-					<?php if ( $languages ) : ?>
+					<?php
+					$languages                = get_available_languages();
+					$can_install_translations = current_user_can( 'install_languages' ) && wp_can_install_language_pack();
+					?>
+					<?php if ( $languages || $can_install_translations ) : ?>
 					<tr class="user-language-wrap">
 						<th scope="row">
 							<?php /* translators: The user language selection field label. */ ?>
@@ -368,7 +374,7 @@
 									'id'        => 'locale',
 									'selected'  => $user_locale,
 									'languages' => $languages,
-									'show_available_translations' => false,
+									'show_available_translations' => $can_install_translations,
 									'show_option_site_default' => true,
 								)
 							);
@@ -634,12 +640,13 @@
 							<tr id="password" class="user-pass1-wrap">
 								<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
 								<td>
-									<input class="hidden" value=" " /><!-- #24364 workaround -->
+									<input type="hidden" value=" " /><!-- #24364 workaround -->
 									<button type="button" class="button wp-generate-pw hide-if-no-js" aria-expanded="false"><?php _e( 'Set New Password' ); ?></button>
 									<div class="wp-pwd hide-if-js">
-										<span class="password-input-wrapper">
-											<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="new-password" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
-										</span>
+										<div class="password-input-wrapper">
+											<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="new-password" spellcheck="false" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+											<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
+										</div>
 										<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 											<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
 											<span class="text"><?php _e( 'Hide' ); ?></span>
@@ -648,14 +655,13 @@
 											<span class="dashicons dashicons-no" aria-hidden="true"></span>
 											<span class="text"><?php _e( 'Cancel' ); ?></span>
 										</button>
-										<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 									</div>
 								</td>
 							</tr>
 							<tr class="user-pass2-wrap hide-if-js">
 								<th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
 								<td>
-								<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="new-password" aria-describedby="pass2-desc" />
+								<input type="password" name="pass2" id="pass2" class="regular-text" value="" autocomplete="new-password" spellcheck="false" aria-describedby="pass2-desc" />
 									<?php if ( IS_PROFILE_PAGE ) : ?>
 										<p class="description" id="pass2-desc"><?php _e( 'Type your new password again.' ); ?></p>
 									<?php else : ?>
@@ -675,7 +681,7 @@
 							<?php endif; // End Show Password Fields. ?>
 
 							<?php // Allow admins to send reset password link. ?>
-							<?php if ( ! IS_PROFILE_PAGE ) : ?>
+							<?php if ( ! IS_PROFILE_PAGE && true === wp_is_password_reset_allowed_for_user( $profile_user ) ) : ?>
 								<tr class="user-generate-reset-link-wrap hide-if-no-js">
 									<th><?php _e( 'Password Reset' ); ?></th>
 									<td>
@@ -779,7 +785,7 @@
 									<div class="create-application-password form-wrap">
 										<div class="form-field">
 											<label for="new_application_password_name"><?php _e( 'New Application Password Name' ); ?></label>
-											<input type="text" size="30" id="new_application_password_name" name="new_application_password_name" class="input" aria-required="true" aria-describedby="new_application_password_name_desc" />
+											<input type="text" size="30" id="new_application_password_name" name="new_application_password_name" class="input" aria-required="true" aria-describedby="new_application_password_name_desc" spellcheck="false" />
 											<p class="description" id="new_application_password_name_desc"><?php _e( 'Required to create an Application Password, but not to update the user.' ); ?></p>
 										</div>
 
@@ -911,6 +917,21 @@
 	}
 </script>
 
+<script type="text/javascript">
+	jQuery( function( $ ) {
+		var languageSelect = $( '#locale' );
+		$( 'form' ).on( 'submit', function() {
+			/*
+			 * Don't show a spinner for English and installed languages,
+			 * as there is nothing to download.
+			 */
+			if ( ! languageSelect.find( 'option:selected' ).data( 'installed' ) ) {
+				$( '#submit', this ).after( '<span class="spinner language-install-spinner is-active" />' );
+			}
+		});
+	} );
+</script>
+
 <?php if ( isset( $application_passwords_list_table ) ) : ?>
 	<script type="text/html" id="tmpl-new-application-password">
 		<div class="notice notice-success is-dismissible new-application-password-notice" role="alert" tabindex="-1">
@@ -928,7 +949,12 @@
 			</p>
 			<p><?php _e( 'Be sure to save this in a safe location. You will not be able to retrieve it.' ); ?></p>
 			<button type="button" class="notice-dismiss">
-				<span class="screen-reader-text"><?php _e( 'Dismiss this notice.' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Dismiss this notice.' );
+					?>
+				</span>
 			</button>
 		</div>
 	</script>
diff --git a/src/wp-admin/user-new.php b/src/wp-admin/user-new.php
index 7b0287545f929..901f2b7352ac1 100644
--- a/src/wp-admin/user-new.php
+++ b/src/wp-admin/user-new.php
@@ -34,7 +34,7 @@
 
 	$user_details = null;
 	$user_email   = wp_unslash( $_REQUEST['email'] );
-	if ( false !== strpos( $user_email, '@' ) ) {
+	if ( str_contains( $user_email, '@' ) ) {
 		$user_details = get_user_by( 'email', $user_email );
 	} else {
 		if ( current_user_can( 'manage_network_users' ) ) {
@@ -110,7 +110,7 @@
 			 */
 			do_action( 'invite_user', $user_id, $role, $newuser_key );
 
-			$switched_locale = switch_to_locale( get_user_locale( $user_details ) );
+			$switched_locale = switch_to_user_locale( $user_id );
 
 			if ( '' !== get_option( 'blogname' ) ) {
 				$site_title = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
@@ -298,8 +298,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/users-add-new-screen/">Documentation on Adding New Users</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/users-add-new-screen/">Documentation on Adding New Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 wp_enqueue_script( 'wp-ajax-response' );
@@ -442,8 +442,8 @@
 
 <table class="form-table" role="presentation">
 	<tr class="form-field form-required">
-		<th scope="row"><label for="adduser-email"><?php echo $label; ?></label></th>
-		<td><input name="email" type="<?php echo $type; ?>" id="adduser-email" class="wp-suggest-user" value="" /></td>
+		<th scope="row"><label for="adduser-email"><?php echo esc_html( $label ); ?></label></th>
+		<td><input name="email" type="<?php echo esc_attr( $type ); ?>" id="adduser-email" class="wp-suggest-user" value="" /></td>
 	</tr>
 	<tr class="form-field">
 		<th scope="row"><label for="adduser-role"><?php _e( 'Role' ); ?></label></th>
@@ -566,25 +566,25 @@
 			</label>
 		</th>
 		<td>
-			<input class="hidden" value=" " /><!-- #24364 workaround -->
+			<input type="hidden" value=" " /><!-- #24364 workaround -->
 			<button type="button" class="button wp-generate-pw hide-if-no-js"><?php _e( 'Generate password' ); ?></button>
 			<div class="wp-pwd">
 				<?php $initial_password = wp_generate_password( 24 ); ?>
-				<span class="password-input-wrapper">
-					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="new-password" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-				</span>
+				<div class="password-input-wrapper">
+					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="new-password" spellcheck="false" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
+				</div>
 				<button type="button" class="button wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 					<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
 					<span class="text"><?php _e( 'Hide' ); ?></span>
 				</button>
-				<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 			</div>
 		</td>
 	</tr>
 	<tr class="form-field form-required user-pass2-wrap hide-if-js">
 		<th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
 		<td>
-		<input name="pass2" type="password" id="pass2" autocomplete="new-password" aria-describedby="pass2-desc" />
+		<input type="password" name="pass2" id="pass2" autocomplete="new-password" spellcheck="false" aria-describedby="pass2-desc" />
 		<p class="description" id="pass2-desc"><?php _e( 'Type the password again.' ); ?></p>
 		</td>
 	</tr>
diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
index d0c10a2051d93..2c635c543a951 100644
--- a/src/wp-admin/users.php
+++ b/src/wp-admin/users.php
@@ -60,6 +60,8 @@
 	$help .= '<li>' . __( '<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using bulk actions.' ) . '</li>';
 }
 
+$help .= '<li>' . __( '<strong>View</strong> takes you to a public author archive which lists all the posts published by the user.' ) . '</li>';
+
 if ( current_user_can( 'edit_users' ) ) {
 	$help .= '<li>' . __( '<strong>Send password reset</strong> sends the user an email with a link to set a new password.' ) . '</li>';
 }
@@ -77,9 +79,9 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/users-screen/">Documentation on Managing Users</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/roles-and-capabilities/">Descriptions of Roles and Capabilities</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/users-screen/">Documentation on Managing Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/roles-and-capabilities/">Descriptions of Roles and Capabilities</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content(
@@ -133,18 +135,19 @@
 			$role = '';
 		}
 
-		$userids = $_REQUEST['users'];
-		$update  = 'promote';
-		foreach ( $userids as $id ) {
-			$id = (int) $id;
+		$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$update   = 'promote';
 
+		foreach ( $user_ids as $id ) {
 			if ( ! current_user_can( 'promote_user', $id ) ) {
 				wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
 			}
 
 			// The new role of the current user must also have the promote_users cap or be a multisite super admin.
-			if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )
-			&& ! ( is_multisite() && current_user_can( 'manage_network_users' ) ) ) {
+			if ( $id === $current_user->ID
+				&& ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )
+				&& ! ( is_multisite() && current_user_can( 'manage_network_users' ) )
+			) {
 					$update = 'err_admin_role';
 					continue;
 			}
@@ -177,10 +180,10 @@
 			exit;
 		}
 
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
 
 		if ( empty( $_REQUEST['delete_option'] ) ) {
-			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
+			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $user_ids ) . '&error=true' );
 			$url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
 			wp_redirect( $url );
 			exit;
@@ -193,15 +196,16 @@
 		$update       = 'del';
 		$delete_count = 0;
 
-		foreach ( $userids as $id ) {
+		foreach ( $user_ids as $id ) {
 			if ( ! current_user_can( 'delete_user', $id ) ) {
 				wp_die( __( 'Sorry, you are not allowed to delete that user.' ), 403 );
 			}
 
-			if ( $id == $current_user->ID ) {
+			if ( $id === $current_user->ID ) {
 				$update = 'err_admin_del';
 				continue;
 			}
+
 			switch ( $_REQUEST['delete_option'] ) {
 				case 'delete':
 					wp_delete_user( $id );
@@ -210,6 +214,7 @@
 					wp_delete_user( $id, $_REQUEST['reassign_user'] );
 					break;
 			}
+
 			++$delete_count;
 		}
 
@@ -225,18 +230,21 @@
 
 	case 'resetpassword':
 		check_admin_referer( 'bulk-users' );
+
 		if ( ! current_user_can( 'edit_users' ) ) {
 			$errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to edit users.' ) );
 		}
+
 		if ( empty( $_REQUEST['users'] ) ) {
 			wp_redirect( $redirect );
 			exit();
 		}
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+
+		$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
 
 		$reset_count = 0;
 
-		foreach ( $userids as $id ) {
+		foreach ( $user_ids as $id ) {
 			if ( ! current_user_can( 'edit_user', $id ) ) {
 				wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
 			}
@@ -280,15 +288,15 @@
 		}
 
 		if ( empty( $_REQUEST['users'] ) ) {
-			$userids = array( (int) $_REQUEST['user'] );
+			$user_ids = array( (int) $_REQUEST['user'] );
 		} else {
-			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+			$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
 		}
 
-		$all_userids = $userids;
+		$all_user_ids = $user_ids;
 
-		if ( in_array( $current_user->ID, $userids, true ) ) {
-			$userids = array_diff( $userids, array( $current_user->ID ) );
+		if ( in_array( $current_user->ID, $user_ids, true ) ) {
+			$user_ids = array_diff( $user_ids, array( $current_user->ID ) );
 		}
 
 		/**
@@ -298,14 +306,22 @@
 		 * @since 5.2.0
 		 *
 		 * @param bool  $users_have_additional_content Whether the users have additional content. Default false.
-		 * @param int[] $userids                       Array of IDs for users being deleted.
+		 * @param int[] $user_ids                      Array of IDs for users being deleted.
 		 */
-		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $userids );
-
-		if ( $userids && ! $users_have_content ) {
-			if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+		$users_have_content = (bool) apply_filters( 'users_have_additional_content', false, $user_ids );
+
+		if ( $user_ids && ! $users_have_content ) {
+			if ( $wpdb->get_var(
+				"SELECT ID FROM {$wpdb->posts}
+				WHERE post_author IN( " . implode( ',', $user_ids ) . ' )
+				LIMIT 1'
+			) ) {
 				$users_have_content = true;
-			} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+			} elseif ( $wpdb->get_var(
+				"SELECT link_id FROM {$wpdb->links}
+				WHERE link_owner IN( " . implode( ',', $user_ids ) . ' )
+				LIMIT 1'
+			) ) {
 				$users_have_content = true;
 			}
 		}
@@ -316,88 +332,119 @@
 
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 		?>
-	<form method="post" name="updateusers" id="updateusers">
+		<form method="post" name="updateusers" id="updateusers">
 		<?php wp_nonce_field( 'delete-users' ); ?>
 		<?php echo $referer; ?>
 
-<div class="wrap">
-<h1><?php _e( 'Delete Users' ); ?></h1>
+		<div class="wrap">
+		<h1><?php _e( 'Delete Users' ); ?></h1>
+
 		<?php if ( isset( $_REQUEST['error'] ) ) : ?>
-	<div class="error">
-		<p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
-	</div>
+			<div class="error">
+				<p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+			</div>
 		<?php endif; ?>
 
-		<?php if ( 1 === count( $all_userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+		<?php if ( 1 === count( $all_user_ids ) ) : ?>
+			<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
 		<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+			<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
 		<?php endif; ?>
 
-<ul>
+		<ul>
 		<?php
 		$go_delete = 0;
-		foreach ( $all_userids as $id ) {
+
+		foreach ( $all_user_ids as $id ) {
 			$user = get_userdata( $id );
-			if ( $id == $current_user->ID ) {
-				/* translators: 1: User ID, 2: User login. */
-				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ), $id, $user->user_login ) . "</li>\n";
+
+			if ( $id === $current_user->ID ) {
+				echo '<li>';
+				printf(
+					/* translators: 1: User ID, 2: User login. */
+					__( 'ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>' ),
+					$id,
+					$user->user_login
+				);
+				echo "</li>\n";
 			} else {
-				/* translators: 1: User ID, 2: User login. */
-				echo '<li><input type="hidden" name="users[]" value="' . esc_attr( $id ) . '" />' . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li>';
+				printf(
+					'<input type="hidden" name="users[]" value="%s" />',
+					esc_attr( $id )
+				);
+				printf(
+					/* translators: 1: User ID, 2: User login. */
+					__( 'ID #%1$s: %2$s' ),
+					$id,
+					$user->user_login
+				);
+				echo "</li>\n";
+
 				$go_delete++;
 			}
 		}
 		?>
-	</ul>
+		</ul>
+
 		<?php
 		if ( $go_delete ) :
 
 			if ( ! $users_have_content ) :
 				?>
-			<input type="hidden" name="delete_option" value="delete" />
+				<input type="hidden" name="delete_option" value="delete" />
 			<?php else : ?>
-				<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
-		<?php endif; ?>
-		<ul style="list-style:none;">
-			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-				<?php _e( 'Delete all content.' ); ?></label></li>
-			<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-				<?php
-				echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-				wp_dropdown_users(
-					array(
-						'name'    => 'reassign_user',
-						'exclude' => $userids,
-						'show'    => 'display_name_with_login',
-					)
-				);
-				?>
-			</li>
-		</ul></fieldset>
+				<fieldset>
+				<?php if ( 1 === $go_delete ) : ?>
+					<p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+				<?php else : ?>
+					<p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+				<?php endif; ?>
+
+				<ul style="list-style:none;">
+					<li>
+						<input type="radio" id="delete_option0" name="delete_option" value="delete" />
+						<label for="delete_option0"><?php _e( 'Delete all content.' ); ?></label>
+					</li>
+					<li>
+						<input type="radio" id="delete_option1" name="delete_option" value="reassign" />
+						<label for="delete_option1"><?php _e( 'Attribute all content to:' ); ?></label>
+						<?php
+						wp_dropdown_users(
+							array(
+								'name'    => 'reassign_user',
+								'exclude' => $user_ids,
+								'show'    => 'display_name_with_login',
+							)
+						);
+						?>
+					</li>
+				</ul>
+				</fieldset>
 				<?php
-	endif;
+			endif;
+
 			/**
 			 * Fires at the end of the delete users form prior to the confirm button.
 			 *
 			 * @since 4.0.0
-			 * @since 4.5.0 The `$userids` parameter was added.
+			 * @since 4.5.0 The `$user_ids` parameter was added.
 			 *
 			 * @param WP_User $current_user WP_User object for the current user.
-			 * @param int[]   $userids      Array of IDs for users being deleted.
+			 * @param int[]   $user_ids     Array of IDs for users being deleted.
 			 */
-			do_action( 'delete_user_form', $current_user, $userids );
+			do_action( 'delete_user_form', $current_user, $user_ids );
 			?>
-	<input type="hidden" name="action" value="dodelete" />
+			<input type="hidden" name="action" value="dodelete" />
 			<?php submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
-	<?php endif; ?>
-	</div>
-	</form>
+
+		<?php else : ?>
+
+			<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
+
+		<?php endif; ?>
+		</div><!-- .wrap -->
+		</form><!-- #updateusers -->
 		<?php
 
 		break;
@@ -418,15 +465,15 @@
 			wp_die( __( 'Sorry, you are not allowed to remove users.' ), 403 );
 		}
 
-		$userids = $_REQUEST['users'];
+		$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$update   = 'remove';
 
-		$update = 'remove';
-		foreach ( $userids as $id ) {
-			$id = (int) $id;
+		foreach ( $user_ids as $id ) {
 			if ( ! current_user_can( 'remove_user', $id ) ) {
 				$update = 'err_admin_remove';
 				continue;
 			}
+
 			remove_user_from_blog( $id, $blog_id );
 		}
 
@@ -451,51 +498,74 @@
 		}
 
 		if ( empty( $_REQUEST['users'] ) ) {
-			$userids = array( (int) $_REQUEST['user'] );
+			$user_ids = array( (int) $_REQUEST['user'] );
 		} else {
-			$userids = $_REQUEST['users'];
+			$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
 		}
 
 		require_once ABSPATH . 'wp-admin/admin-header.php';
 		?>
-	<form method="post" name="updateusers" id="updateusers">
+		<form method="post" name="updateusers" id="updateusers">
 		<?php wp_nonce_field( 'remove-users' ); ?>
 		<?php echo $referer; ?>
 
-<div class="wrap">
-<h1><?php _e( 'Remove Users from Site' ); ?></h1>
+		<div class="wrap">
+		<h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-		<?php if ( 1 === count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+		<?php if ( 1 === count( $user_ids ) ) : ?>
+			<p><?php _e( 'You have specified this user for removal:' ); ?></p>
 		<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+			<p><?php _e( 'You have specified these users for removal:' ); ?></p>
 		<?php endif; ?>
 
-<ul>
+		<ul>
 		<?php
 		$go_remove = false;
-		foreach ( $userids as $id ) {
-			$id   = (int) $id;
+
+		foreach ( $user_ids as $id ) {
 			$user = get_userdata( $id );
+
 			if ( ! current_user_can( 'remove_user', $id ) ) {
-				/* translators: 1: User ID, 2: User login. */
-				echo '<li>' . sprintf( __( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li>';
+				printf(
+					/* translators: 1: User ID, 2: User login. */
+					__( 'ID #%1$s: %2$s <strong>Sorry, you are not allowed to remove this user.</strong>' ),
+					$id,
+					$user->user_login
+				);
+				echo "</li>\n";
 			} else {
-				/* translators: 1: User ID, 2: User login. */
-				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf( __( 'ID #%1$s: %2$s' ), $id, $user->user_login ) . "</li>\n";
+				echo '<li>';
+				printf(
+					'<input type="hidden" name="users[]" value="%s" />',
+					esc_attr( $id )
+				);
+				printf(
+					/* translators: 1: User ID, 2: User login. */
+					__( 'ID #%1$s: %2$s' ),
+					$id,
+					$user->user_login
+				);
+				echo "</li>\n";
+
 				$go_remove = true;
 			}
 		}
 		?>
-	</ul>
+		</ul>
+
 		<?php if ( $go_remove ) : ?>
-		<input type="hidden" name="action" value="doremove" />
+
+			<input type="hidden" name="action" value="doremove" />
 			<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
-	<?php else : ?>
-	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
-	<?php endif; ?>
-	</div>
-	</form>
+
+		<?php else : ?>
+
+			<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
+
+		<?php endif; ?>
+		</div><!-- .wrap -->
+		</form><!-- #updateusers -->
 		<?php
 
 		break;
@@ -509,10 +579,10 @@
 		if ( $wp_list_table->current_action() && ! empty( $_REQUEST['users'] ) ) {
 			$screen   = get_current_screen()->id;
 			$sendback = wp_get_referer();
-			$userids  = $_REQUEST['users'];
+			$user_ids = array_map( 'intval', (array) $_REQUEST['users'] );
 
 			/** This action is documented in wp-admin/edit.php */
-			$sendback = apply_filters( "handle_bulk_actions-{$screen}", $sendback, $wp_list_table->current_action(), $userids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
+			$sendback = apply_filters( "handle_bulk_actions-{$screen}", $sendback, $wp_list_table->current_action(), $user_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 			wp_safe_redirect( $sendback );
 			exit;
@@ -520,6 +590,7 @@
 
 		$wp_list_table->prepare_items();
 		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+
 		if ( $pagenum > $total_pages && $total_pages > 0 ) {
 			wp_redirect( add_query_arg( 'paged', $total_pages ) );
 			exit;
@@ -533,7 +604,7 @@
 				case 'del':
 				case 'del_many':
 					$delete_count = isset( $_GET['delete_count'] ) ? (int) $_GET['delete_count'] : 0;
-					if ( 1 == $delete_count ) {
+					if ( 1 === $delete_count ) {
 						$message = __( 'User deleted.' );
 					} else {
 						/* translators: %s: Number of users. */
@@ -547,7 +618,7 @@
 					$user_id = isset( $_GET['id'] ) ? $_GET['id'] : false;
 					if ( $user_id && current_user_can( 'edit_user', $user_id ) ) {
 						$message .= sprintf(
-							' <a href="%s">%s</a>',
+							' <a href="%1$s">%2$s</a>',
 							esc_url(
 								add_query_arg(
 									'wp_http_referer',
@@ -594,17 +665,17 @@
 		?>
 
 		<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-		<div class="error">
-			<ul>
-			<?php
-			foreach ( $errors->get_error_messages() as $err ) {
-				echo "<li>$err</li>\n";
-			}
-			?>
-			</ul>
-		</div>
+			<div class="error">
+				<ul>
+				<?php
+				foreach ( $errors->get_error_messages() as $err ) {
+					echo "<li>$err</li>\n";
+				}
+				?>
+				</ul>
+			</div>
 			<?php
-	endif;
+		endif;
 
 		if ( ! empty( $messages ) ) {
 			foreach ( $messages as $msg ) {
@@ -613,50 +684,55 @@
 		}
 		?>
 
-	<div class="wrap">
-	<h1 class="wp-heading-inline">
-		<?php
-		echo esc_html( $title );
-		?>
-</h1>
+		<div class="wrap">
+		<h1 class="wp-heading-inline">
+			<?php echo esc_html( $title ); ?>
+		</h1>
 
 		<?php
 		if ( current_user_can( 'create_users' ) ) {
-			?>
-	<a href="<?php echo esc_url( admin_url( 'user-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-	<a href="<?php echo esc_url( admin_url( 'user-new.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
-			<?php
-}
-
-if ( strlen( $usersearch ) ) {
-	echo '<span class="subtitle">';
-	printf(
-		/* translators: %s: Search query. */
-		__( 'Search results for: %s' ),
-		'<strong>' . esc_html( $usersearch ) . '</strong>'
-	);
-	echo '</span>';
-}
-?>
+			printf(
+				'<a href="%1$s" class="page-title-action">%2$s</a>',
+				esc_url( admin_url( 'user-new.php' ) ),
+				esc_html_x( 'Add New', 'user' )
+			);
+		} elseif ( is_multisite() && current_user_can( 'promote_users' ) ) {
+			printf(
+				'<a href="%1$s" class="page-title-action">%2$s</a>',
+				esc_url( admin_url( 'user-new.php' ) ),
+				esc_html_x( 'Add Existing', 'user' )
+			);
+		}
+
+		if ( strlen( $usersearch ) ) {
+			echo '<span class="subtitle">';
+			printf(
+				/* translators: %s: Search query. */
+				__( 'Search results for: %s' ),
+				'<strong>' . esc_html( $usersearch ) . '</strong>'
+			);
+			echo '</span>';
+		}
+		?>
 
-<hr class="wp-header-end">
+		<hr class="wp-header-end">
 
 		<?php $wp_list_table->views(); ?>
 
-<form method="get">
+		<form method="get">
 
 		<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
 
 		<?php if ( ! empty( $_REQUEST['role'] ) ) { ?>
-<input type="hidden" name="role" value="<?php echo esc_attr( $_REQUEST['role'] ); ?>" />
-<?php } ?>
+			<input type="hidden" name="role" value="<?php echo esc_attr( $_REQUEST['role'] ); ?>" />
+		<?php } ?>
 
 		<?php $wp_list_table->display(); ?>
-</form>
 
-<div class="clear"></div>
-</div>
+		</form>
+
+		<div class="clear"></div>
+		</div><!-- .wrap -->
 		<?php
 		break;
 
diff --git a/src/wp-admin/widgets-form.php b/src/wp-admin/widgets-form.php
index df4efdba90582..b77f23dbc3aea 100644
--- a/src/wp-admin/widgets-form.php
+++ b/src/wp-admin/widgets-form.php
@@ -68,8 +68,8 @@
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-widgets-screen/">Documentation on Widgets</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+	'<p>' . __( '<a href="https://wordpress.org/documentation/article/appearance-widgets-screen-classic-editor/">Documentation on Widgets</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forums/">Support forums</a>' ) . '</p>'
 );
 
 // These are the widgets grouped by sidebar.
@@ -272,7 +272,8 @@
 	$width = ' style="width:' . max( $control['width'], 350 ) . 'px"';
 	$key   = isset( $_GET['key'] ) ? (int) $_GET['key'] : 0;
 
-	require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
+	require_once ABSPATH . 'wp-admin/admin-header.php';
+	?>
 	<div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
@@ -300,7 +301,7 @@
 	<?php
 	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
 		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' === $sbname || 'orphaned_widgets' === substr( $sbname, 0, 16 ) ) {
+		if ( 'wp_inactive_widgets' === $sbname || str_starts_with( $sbname, 'orphaned_widgets' ) ) {
 			echo '&nbsp;';
 		} else {
 			if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
@@ -332,7 +333,7 @@
 	<div class="widget-control-actions">
 		<div class="alignleft">
 			<?php if ( ! isset( $_GET['addnew'] ) ) : ?>
-				<input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php _e( 'Delete' ); ?>" />
+				<input type="submit" name="removewidget" id="removewidget" class="button-link button-link-delete widget-control-remove" value="<?php esc_attr_e( 'Delete' ); ?>" />
 				<span class="widget-control-close-wrapper">
 					| <a href="widgets.php" class="button-link widget-control-close"><?php _e( 'Cancel' ); ?></a>
 				</span>
@@ -423,7 +424,12 @@
 	<div id="available-widgets" class="widgets-holder-wrap">
 		<div class="sidebar-name">
 			<button type="button" class="handlediv hide-if-no-js" aria-expanded="true">
-				<span class="screen-reader-text"><?php _e( 'Available Widgets' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Available Widgets' );
+					?>
+				</span>
 				<span class="toggle-indicator" aria-hidden="true"></span>
 			</button>
 			<h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
@@ -444,7 +450,7 @@
 
 $theme_sidebars = array();
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+	if ( str_contains( $registered_sidebar['class'], 'inactive-sidebar' ) || str_starts_with( $sidebar, 'orphaned_widgets' ) ) {
 		$wrap_class = 'widgets-holder-wrap';
 		if ( ! empty( $registered_sidebar['class'] ) ) {
 			$wrap_class .= ' ' . $registered_sidebar['class'];
diff --git a/src/wp-comments-post.php b/src/wp-comments-post.php
index e9a758dcfdf21..6042ac1e2f96e 100644
--- a/src/wp-comments-post.php
+++ b/src/wp-comments-post.php
@@ -43,7 +43,7 @@
 $cookies_consent = ( isset( $_POST['wp-comment-cookies-consent'] ) );
 
 /**
- * Perform other actions when comment cookies are set.
+ * Fires after comment cookies are set.
  *
  * @since 3.4.0
  * @since 4.9.6 The `$cookies_consent` parameter was added.
diff --git a/src/wp-content/themes/twentyeleven/author.php b/src/wp-content/themes/twentyeleven/author.php
index 2a53f6c14f0bc..ad2117324f571 100644
--- a/src/wp-content/themes/twentyeleven/author.php
+++ b/src/wp-content/themes/twentyeleven/author.php
@@ -29,7 +29,7 @@
 					<h1 class="page-title author">
 					<?php
 					/* translators: %s: Author display name. */
-					printf( __( 'Author Archives: %s', 'twentyeleven' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+					printf( __( 'Author Archives: %s', 'twentyeleven' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" rel="me">' . get_the_author() . '</a></span>' );
 					?>
 					</h1>
 				</header>
diff --git a/src/wp-content/themes/twentyeleven/blocks.css b/src/wp-content/themes/twentyeleven/blocks.css
index 6d9b02947a390..1a4acd4b72bda 100644
--- a/src/wp-content/themes/twentyeleven/blocks.css
+++ b/src/wp-content/themes/twentyeleven/blocks.css
@@ -275,7 +275,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentyeleven/comments.php b/src/wp-content/themes/twentyeleven/comments.php
index 102899645dd05..0787c43b223d6 100644
--- a/src/wp-content/themes/twentyeleven/comments.php
+++ b/src/wp-content/themes/twentyeleven/comments.php
@@ -31,7 +31,7 @@
 	<?php if ( have_comments() ) : ?>
 		<h2 id="comments-title">
 			<?php
-			if ( 1 === get_comments_number() ) {
+			if ( '1' === get_comments_number() ) {
 				printf(
 					/* translators: %s: The post title. */
 					__( 'One thought on &ldquo;%1$s&rdquo;', 'twentyeleven' ),
diff --git a/src/wp-content/themes/twentyeleven/content-aside.php b/src/wp-content/themes/twentyeleven/content-aside.php
index ddd9b0d4253d5..03dd772249910 100644
--- a/src/wp-content/themes/twentyeleven/content-aside.php
+++ b/src/wp-content/themes/twentyeleven/content-aside.php
@@ -4,7 +4,7 @@
  *
  * Used on index and archive pages.
  *
- * @link https://wordpress.org/support/article/post-formats/
+ * @link https://wordpress.org/documentation/article/post-formats/
  *
  * @package WordPress
  * @subpackage Twenty_Eleven
diff --git a/src/wp-content/themes/twentyeleven/content-gallery.php b/src/wp-content/themes/twentyeleven/content-gallery.php
index bfdf61c9bc547..9ecb7073b112f 100644
--- a/src/wp-content/themes/twentyeleven/content-gallery.php
+++ b/src/wp-content/themes/twentyeleven/content-gallery.php
@@ -4,7 +4,7 @@
  *
  * Used on index and archive pages.
  *
- * @link https://wordpress.org/support/article/post-formats/
+ * @link https://wordpress.org/documentation/article/post-formats/
  *
  * @package WordPress
  * @subpackage Twenty_Eleven
diff --git a/src/wp-content/themes/twentyeleven/content-image.php b/src/wp-content/themes/twentyeleven/content-image.php
index 42c0814e684f9..c404733014900 100644
--- a/src/wp-content/themes/twentyeleven/content-image.php
+++ b/src/wp-content/themes/twentyeleven/content-image.php
@@ -4,7 +4,7 @@
  *
  * Used on index and archive pages.
  *
- * @link https://wordpress.org/support/article/post-formats/
+ * @link https://wordpress.org/documentation/article/post-formats/
  *
  * @package WordPress
  * @subpackage Twenty_Eleven
diff --git a/src/wp-content/themes/twentyeleven/content-link.php b/src/wp-content/themes/twentyeleven/content-link.php
index 78531703ecdb8..2f30a85e3f451 100644
--- a/src/wp-content/themes/twentyeleven/content-link.php
+++ b/src/wp-content/themes/twentyeleven/content-link.php
@@ -4,7 +4,7 @@
  *
  * Used on index and archive pages
  *
- * @link https://wordpress.org/support/article/post-formats/
+ * @link https://wordpress.org/documentation/article/post-formats/
  *
  * @package WordPress
  * @subpackage Twenty_Eleven
diff --git a/src/wp-content/themes/twentyeleven/content-status.php b/src/wp-content/themes/twentyeleven/content-status.php
index 587f10c8542f9..60a1e4d9ba6ac 100644
--- a/src/wp-content/themes/twentyeleven/content-status.php
+++ b/src/wp-content/themes/twentyeleven/content-status.php
@@ -4,7 +4,7 @@
  *
  * Used on index and archive pages
  *
- * @link https://wordpress.org/support/article/post-formats/
+ * @link https://wordpress.org/documentation/article/post-formats/
  *
  * @package WordPress
  * @subpackage Twenty_Eleven
diff --git a/src/wp-content/themes/twentyeleven/functions.php b/src/wp-content/themes/twentyeleven/functions.php
index fffa55c966cf7..f17bf729f38e1 100644
--- a/src/wp-content/themes/twentyeleven/functions.php
+++ b/src/wp-content/themes/twentyeleven/functions.php
@@ -79,8 +79,15 @@ function twentyeleven_setup() {
 		 * If you're building a theme based on Twenty Eleven, use
 		 * a find and replace to change 'twentyeleven' to the name
 		 * of your theme in all the template files.
+		 *
+		 * Manual loading of text domain is not required after the introduction of
+		 * just in time translation loading in WordPress version 4.6.
+		 *
+		 * @ticket 58318
 		 */
-		load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+		if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+			load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+		}
 
 		// This theme styles the visual editor with editor-style.css to match the theme style.
 		add_editor_style();
@@ -297,7 +304,7 @@ function twentyeleven_setup() {
  */
 function twentyeleven_scripts_styles() {
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20220927' );
+	wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20230122' );
 }
 add_action( 'wp_enqueue_scripts', 'twentyeleven_scripts_styles' );
 
@@ -322,7 +329,7 @@ function twentyeleven_header_style() {
 		$text_color = get_header_textcolor();
 
 		// If no custom options for text are set, let's bail.
-		if ( HEADER_TEXTCOLOR == $text_color ) {
+		if ( HEADER_TEXTCOLOR === $text_color ) {
 			return;
 		}
 
@@ -386,7 +393,7 @@ function twentyeleven_admin_header_style() {
 	}
 		<?php
 		// If the user has set a custom color for the text, use that.
-		if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
+		if ( get_header_textcolor() !== HEADER_TEXTCOLOR ) :
 			?>
 	#site-title a,
 	#site-description {
@@ -724,7 +731,7 @@ function twentyeleven_comment( $comment, $args, $depth ) {
 					<?php
 					$avatar_size = 68;
 
-					if ( '0' != $comment->comment_parent ) {
+					if ( '0' !== $comment->comment_parent ) {
 						$avatar_size = 39;
 					}
 
@@ -756,7 +763,7 @@ function twentyeleven_comment( $comment, $args, $depth ) {
 					}
 					?>
 
-					<?php if ( '0' == $comment->comment_approved ) : ?>
+					<?php if ( '0' === $comment->comment_approved ) : ?>
 					<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
 					<br />
 					<?php endif; ?>
diff --git a/src/wp-content/themes/twentyeleven/header.php b/src/wp-content/themes/twentyeleven/header.php
index 3fd479437c4b9..9f1cb96219f4a 100644
--- a/src/wp-content/themes/twentyeleven/header.php
+++ b/src/wp-content/themes/twentyeleven/header.php
@@ -31,10 +31,10 @@
 
 	wp_title( '|', true, 'right' );
 
-	// Add the blog name.
+	// Add the site name.
 	bloginfo( 'name' );
 
-	// Add the blog description for the home/front page.
+	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
 if ( $site_description && ( is_home() || is_front_page() ) ) {
 	echo " | $site_description";
@@ -49,7 +49,7 @@
 ?>
 	</title>
 <link rel="profile" href="https://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20221101" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20230808" />
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <!--[if lt IE 9]>
 <script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0" type="text/javascript"></script>
diff --git a/src/wp-content/themes/twentyeleven/image.php b/src/wp-content/themes/twentyeleven/image.php
index 097ff19cc3986..a727ea147acfc 100644
--- a/src/wp-content/themes/twentyeleven/image.php
+++ b/src/wp-content/themes/twentyeleven/image.php
@@ -70,7 +70,7 @@
 					)
 				);
 				foreach ( $attachments as $k => $attachment ) {
-					if ( $attachment->ID == $post->ID ) {
+					if ( $attachment->ID === $post->ID ) {
 						break;
 					}
 				}
diff --git a/src/wp-content/themes/twentyeleven/inc/theme-options.php b/src/wp-content/themes/twentyeleven/inc/theme-options.php
index bb521d00113b9..c40768bcac6d4 100644
--- a/src/wp-content/themes/twentyeleven/inc/theme-options.php
+++ b/src/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -118,8 +118,8 @@ function twentyeleven_theme_options_help() {
 			'<p>' . __( 'Remember to click "Save Changes" to save any changes you have made to the theme options.', 'twentyeleven' ) . '</p>';
 
 	$sidebar = '<p><strong>' . __( 'For more information:', 'twentyeleven' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/article/appearance-customize-screen/" target="_blank">Documentation on Theme Options</a>', 'twentyeleven' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support</a>', 'twentyeleven' ) . '</p>';
+		'<p>' . __( '<a href="https://wordpress.org/documentation/article/customizer/" target="_blank">Documentation on Theme Customization</a>', 'twentyeleven' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forums/" target="_blank">Support forums</a>', 'twentyeleven' ) . '</p>';
 
 	$screen = get_current_screen();
 
@@ -446,7 +446,7 @@ function twentyeleven_print_link_color_style() {
 	$default_options = twentyeleven_get_default_theme_options();
 
 	// Don't do anything if the current link color is the default.
-	if ( $default_options['link_color'] == $link_color ) {
+	if ( $default_options['link_color'] === $link_color ) {
 		return;
 	}
 	?>
diff --git a/src/wp-content/themes/twentyeleven/readme.txt b/src/wp-content/themes/twentyeleven/readme.txt
index c35f2b8071fbe..f87e67f6ebf3e 100644
--- a/src/wp-content/themes/twentyeleven/readme.txt
+++ b/src/wp-content/themes/twentyeleven/readme.txt
@@ -1,8 +1,9 @@
 === Twenty Eleven ===
 Contributors: wordpressdotorg
-Requires at least: WordPress 3.2
-Tested up to: 6.1
-Stable tag: 4.2
+Requires at least: 3.2
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 4.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, left-sidebar, right-sidebar, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, block-patterns
@@ -22,7 +23,7 @@ For more information about Twenty Eleven please go to https://codex.wordpress.or
 
 == Copyright ==
 
-Twenty Eleven WordPress Theme, Copyright 2011-2022 WordPress.org & Automattic.com
+Twenty Eleven WordPress Theme, Copyright 2011-2023 WordPress.org & Automattic.com
 Twenty Eleven is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -47,6 +48,16 @@ Images
 
 == Changelog ==
 
+= 4.4 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Eleven_Theme_Changelog#Version_4.4
+
+= 4.3 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Eleven_Theme_Changelog#Version_4.3
+
 = 4.2 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentyeleven/showcase.php b/src/wp-content/themes/twentyeleven/showcase.php
index 041054b8ae6be..c867b830d9571 100644
--- a/src/wp-content/themes/twentyeleven/showcase.php
+++ b/src/wp-content/themes/twentyeleven/showcase.php
@@ -16,7 +16,7 @@
  */
 
 // Enqueue showcase script for the slider.
-wp_enqueue_script( 'twentyeleven-showcase', get_template_directory_uri() . '/js/showcase.js', array( 'jquery' ), '20110429' );
+wp_enqueue_script( 'twentyeleven-showcase', get_template_directory_uri() . '/js/showcase.js', array( 'jquery' ), '20211130' );
 
 get_header(); ?>
 
@@ -154,7 +154,7 @@
 							while ( $featured->have_posts() ) :
 								$featured->the_post();
 								$counter_slider++;
-								if ( 1 == $counter_slider ) {
+								if ( 1 === $counter_slider ) {
 									$class = ' class="active"';
 								} else {
 									$class = '';
@@ -163,7 +163,7 @@
 								/* translators: %s: Post title. */
 								$title = sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) );
 								?>
-					<li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( $title ); ?>"<?php echo $class; ?>></a></li>
+					<li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>"<?php echo $class; ?>><span class="feature-slider-tooltip" aria-hidden="true" title="<?php echo esc_attr( $title ); ?>"></span><span class="screen-reader-text"><?php echo esc_html( $title ); ?></span></a></li>
 						<?php endwhile; ?>
 					</ul>
 					</nav>
diff --git a/src/wp-content/themes/twentyeleven/style.css b/src/wp-content/themes/twentyeleven/style.css
index 19fd0881adc2a..b70edcdc1a8a9 100644
--- a/src/wp-content/themes/twentyeleven/style.css
+++ b/src/wp-content/themes/twentyeleven/style.css
@@ -4,8 +4,9 @@ Theme URI: https://wordpress.org/themes/twentyeleven/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.
-Version: 4.2
-Tested up to: 6.1
+Version: 4.4
+Requires at least: 3.2
+Tested up to: 6.3
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -1628,6 +1629,11 @@ section.feature-image.large img {
 	width: 14px;
 	height: 14px;
 }
+.feature-slider a .feature-slider-tooltip {
+	display: block;
+	width: 14px;
+	height: 14px;
+}
 .feature-slider a.active {
 	background: #1982d1;
 	-webkit-box-shadow: inset 1px 1px 5px rgba(0,0,0,0.4), inset 0 0 2px rgba(255,255,255,0.8);
diff --git a/src/wp-content/themes/twentyfifteen/archive.php b/src/wp-content/themes/twentyfifteen/archive.php
index 9942add271689..770cbc5183335 100644
--- a/src/wp-content/themes/twentyfifteen/archive.php
+++ b/src/wp-content/themes/twentyfifteen/archive.php
@@ -50,6 +50,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
 					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata.css b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata.css
new file mode 100644
index 0000000000000..d4ef476448fa5
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata.css
@@ -0,0 +1,77 @@
+/*
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/LICENSE.txt b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/LICENSE.txt
new file mode 100644
index 0000000000000..79721add751bd
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-400-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-400-normal.woff
new file mode 100644
index 0000000000000..77fbd0f2ae9c3
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-700-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-700-normal.woff
new file mode 100644
index 0000000000000..2b72630d5144b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-400-normal.woff2
new file mode 100644
index 0000000000000..6119e5971bfa1
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-700-normal.woff2
new file mode 100644
index 0000000000000..010da61ec4562
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..50cb547f74653
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..8a20d54f18d01
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..ab70f18a843f1
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..a8140081e44d7
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/inconsolata/inconsolata-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-inconsolata.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-inconsolata.css
new file mode 100644
index 0000000000000..f1b45f25d0cb4
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-inconsolata.css
@@ -0,0 +1,465 @@
+/*
+Noto Sans
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-sans-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif-plus-inconsolata.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif-plus-inconsolata.css
new file mode 100644
index 0000000000000..fa1bd755ba54b
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif-plus-inconsolata.css
@@ -0,0 +1,805 @@
+/*
+Noto Sans
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Noto Serif
+Copyright 2012 Google Inc. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-sans-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif.css
new file mode 100644
index 0000000000000..1c3ba22240954
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans-plus-noto-serif.css
@@ -0,0 +1,729 @@
+/*
+Noto Sans
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Noto Serif
+Copyright 2012 Google Inc. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-sans-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans.css
new file mode 100644
index 0000000000000..61dcc255fae66
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans.css
@@ -0,0 +1,389 @@
+/*
+Noto Sans
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-sans-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-devanagari-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-greek-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-400-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-sans/noto-sans-latin-400-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-400-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-normal */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-normal.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-normal.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-sans-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-sans-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-cyrillic-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-sans-devanagari-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-devanagari-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0900-097F, U+1CD0-1CF6, U+1CF8-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FB;
+}
+
+/* noto-sans-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-sans-greek-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-greek-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-sans-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-vietnamese-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-sans-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-ext-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-sans-latin-700-italic */
+@font-face {
+	font-family: 'Noto Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-sans/noto-sans-latin-700-italic.woff2?ver=27') format('woff2'),
+		url('./noto-sans/noto-sans-all-700-italic.woff?ver=27') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/LICENSE.txt b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/LICENSE.txt
new file mode 100644
index 0000000000000..86c1338ee9d11
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-italic.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-italic.woff
new file mode 100644
index 0000000000000..f3d75308e1e90
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-normal.woff
new file mode 100644
index 0000000000000..82037057ef36e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-italic.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-italic.woff
new file mode 100644
index 0000000000000..27620393805f5
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-normal.woff
new file mode 100644
index 0000000000000..e923e5eb4c980
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-italic.woff2
new file mode 100644
index 0000000000000..9f2d8b642b7f6
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..fa2b3d27646a0
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-italic.woff2
new file mode 100644
index 0000000000000..472e0699545ad
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..67a283c3f0f78
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-italic.woff2
new file mode 100644
index 0000000000000..833a29737ff1d
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..16ca7029120c7
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-italic.woff2
new file mode 100644
index 0000000000000..99c6bfb0bfb96
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..6443f1e732468
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-italic.woff2
new file mode 100644
index 0000000000000..a3e102dd4eb64
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-normal.woff2
new file mode 100644
index 0000000000000..7b574776578e2
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-italic.woff2
new file mode 100644
index 0000000000000..2eef1df8c135e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-normal.woff2
new file mode 100644
index 0000000000000..81ca278c7e586
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-devanagari-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-italic.woff2
new file mode 100644
index 0000000000000..718918eae9199
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-normal.woff2
new file mode 100644
index 0000000000000..dc799402634ca
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-italic.woff2
new file mode 100644
index 0000000000000..fa506d7cffb25
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-normal.woff2
new file mode 100644
index 0000000000000..d0c1862eeb97c
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-italic.woff2
new file mode 100644
index 0000000000000..a3519c3882d1e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-normal.woff2
new file mode 100644
index 0000000000000..b0a863e919a95
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-italic.woff2
new file mode 100644
index 0000000000000..a91d0234937ef
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-normal.woff2
new file mode 100644
index 0000000000000..d14a3531ed692
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-greek-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-italic.woff2
new file mode 100644
index 0000000000000..4fe4de1f7156c
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-normal.woff2
new file mode 100644
index 0000000000000..b84370d5f5ba4
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-italic.woff2
new file mode 100644
index 0000000000000..c86f24a70763b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-normal.woff2
new file mode 100644
index 0000000000000..e805a0097b945
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..0c9c73a403630
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..598333956feed
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..46b295d758271
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..bef751ae095bd
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..6438f99e9f11f
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..28c615d7c0e2e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-italic.woff2
new file mode 100644
index 0000000000000..95d2e6f966f8b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..f9f0bbda822bf
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-sans/noto-sans-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif-plus-inconsolata.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif-plus-inconsolata.css
new file mode 100644
index 0000000000000..ee9fa4a89f81a
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif-plus-inconsolata.css
@@ -0,0 +1,417 @@
+/*
+Noto Serif
+Copyright 2012 Google Inc. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-serif-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-700-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./inconsolata/inconsolata-latin-700-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-700-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif.css b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif.css
new file mode 100644
index 0000000000000..ea3b5f53da3dc
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif.css
@@ -0,0 +1,341 @@
+/*
+Noto Serif
+Copyright 2012 Google Inc. All Rights Reserved.
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* noto-serif-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-italic */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-400-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./noto-serif/noto-serif-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* noto-serif-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* noto-serif-cyrillic-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* noto-serif-greek-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* noto-serif-greek-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* noto-serif-vietnamese-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* noto-serif-latin-ext-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* noto-serif-latin-700-normal */
+@font-face {
+	font-family: 'Noto Serif';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./noto-serif/noto-serif-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./noto-serif/noto-serif-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/LICENSE.txt b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/LICENSE.txt
new file mode 100644
index 0000000000000..cb2a761695d1c
--- /dev/null
+++ b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2012 Google Inc. All Rights Reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-italic.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-italic.woff
new file mode 100644
index 0000000000000..6b81b46cb0c4b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-normal.woff
new file mode 100644
index 0000000000000..f356db512ac7d
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-italic.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-italic.woff
new file mode 100644
index 0000000000000..ad8486e230f5e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-normal.woff b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-normal.woff
new file mode 100644
index 0000000000000..4224d83557042
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-italic.woff2
new file mode 100644
index 0000000000000..9cdbe6d665b05
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..86bd4a064474f
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-italic.woff2
new file mode 100644
index 0000000000000..4604e089c57c4
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..64d0590df5020
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-italic.woff2
new file mode 100644
index 0000000000000..fadb44270dc3b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..a0745a0c95d30
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-italic.woff2
new file mode 100644
index 0000000000000..63c45c0cb471f
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..3a7cdbb63e921
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-italic.woff2
new file mode 100644
index 0000000000000..fd4a286c917a8
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-normal.woff2
new file mode 100644
index 0000000000000..7c9166233bcff
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-italic.woff2
new file mode 100644
index 0000000000000..cb193d85950f2
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-normal.woff2
new file mode 100644
index 0000000000000..d347f36d75c69
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-italic.woff2
new file mode 100644
index 0000000000000..eaa13ad5a90ad
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-normal.woff2
new file mode 100644
index 0000000000000..47ae05802655e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-italic.woff2
new file mode 100644
index 0000000000000..0f520a2f30515
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-normal.woff2
new file mode 100644
index 0000000000000..0a379c7d85128
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-greek-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-italic.woff2
new file mode 100644
index 0000000000000..fe63a96d42f2b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-normal.woff2
new file mode 100644
index 0000000000000..4eff76f28c3f4
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-italic.woff2
new file mode 100644
index 0000000000000..443a1dd25c99b
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-normal.woff2
new file mode 100644
index 0000000000000..ea687bc786a8f
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..22121832e4aeb
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..1bbf9d491178e
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..91da17d6157fa
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..34b3f6453eed6
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..f8fe7dd6c0826
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..50b22cfd893ca
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-italic.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-italic.woff2
new file mode 100644
index 0000000000000..d2e0c37431938
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..cf7c80f2cf583
Binary files /dev/null and b/src/wp-content/themes/twentyfifteen/assets/fonts/noto-serif/noto-serif-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfifteen/content-link.php b/src/wp-content/themes/twentyfifteen/content-link.php
index 60f3b768656cb..d6e49d5121699 100644
--- a/src/wp-content/themes/twentyfifteen/content-link.php
+++ b/src/wp-content/themes/twentyfifteen/content-link.php
@@ -40,6 +40,7 @@
 					'after'       => '</div>',
 					'link_before' => '<span>',
 					'link_after'  => '</span>',
+					/* translators: Hidden accessibility text. */
 					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
diff --git a/src/wp-content/themes/twentyfifteen/content-page.php b/src/wp-content/themes/twentyfifteen/content-page.php
index 9651518e141ae..8932b442dcea0 100644
--- a/src/wp-content/themes/twentyfifteen/content-page.php
+++ b/src/wp-content/themes/twentyfifteen/content-page.php
@@ -27,6 +27,7 @@
 					'after'       => '</div>',
 					'link_before' => '<span>',
 					'link_after'  => '</span>',
+					/* translators: Hidden accessibility text. */
 					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
diff --git a/src/wp-content/themes/twentyfifteen/content.php b/src/wp-content/themes/twentyfifteen/content.php
index 8be7cf8c24091..3438228ef9b6c 100644
--- a/src/wp-content/themes/twentyfifteen/content.php
+++ b/src/wp-content/themes/twentyfifteen/content.php
@@ -42,6 +42,7 @@
 					'after'       => '</div>',
 					'link_before' => '<span>',
 					'link_after'  => '</span>',
+					/* translators: Hidden accessibility text. */
 					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
diff --git a/src/wp-content/themes/twentyfifteen/css/blocks.css b/src/wp-content/themes/twentyfifteen/css/blocks.css
index be2d8ffef6655..5967ea52e9f30 100644
--- a/src/wp-content/themes/twentyfifteen/css/blocks.css
+++ b/src/wp-content/themes/twentyfifteen/css/blocks.css
@@ -395,6 +395,11 @@ p.has-drop-cap:not(:focus)::first-letter {
 	vertical-align: baseline;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .is-style-outline .wp-block-button__link {
 	border: 2px solid;
 }
@@ -472,7 +477,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentyfifteen/css/editor-blocks.css b/src/wp-content/themes/twentyfifteen/css/editor-blocks.css
index 72e20fb75d19f..71afab38b7a14 100644
--- a/src/wp-content/themes/twentyfifteen/css/editor-blocks.css
+++ b/src/wp-content/themes/twentyfifteen/css/editor-blocks.css
@@ -759,6 +759,11 @@ p.has-drop-cap:not(:focus)::first-letter {
 	color: #fff;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .is-style-outline .wp-block-button__link {
 	color: #333;
 }
@@ -804,7 +809,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentyfifteen/functions.php b/src/wp-content/themes/twentyfifteen/functions.php
index 72201c2ce873e..87149cee44532 100644
--- a/src/wp-content/themes/twentyfifteen/functions.php
+++ b/src/wp-content/themes/twentyfifteen/functions.php
@@ -57,9 +57,17 @@ function twentyfifteen_setup() {
 		 * Make theme available for translation.
 		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
 		 * If you're building a theme based on twentyfifteen, use a find and replace
-		 * to change 'twentyfifteen' to the name of your theme in all the template files
+		 * to change 'twentyfifteen' to the name of your theme in all the template files.
+		 *
+		 * Manual loading of text domain is not required after the introduction of
+		 * just in time translation loading in WordPress version 4.6.
+		 *
+		 * @ticket 58318
 		 */
-		load_theme_textdomain( 'twentyfifteen' );
+
+		if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+			load_theme_textdomain( 'twentyfifteen' );
+		}
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );
@@ -109,7 +117,7 @@ function twentyfifteen_setup() {
 		/*
 		 * Enable support for Post Formats.
 		 *
-		 * See: https://wordpress.org/support/article/post-formats/
+		 * See: https://wordpress.org/documentation/article/post-formats/
 		 */
 		add_theme_support(
 			'post-formats',
@@ -170,9 +178,15 @@ function twentyfifteen_setup() {
 
 		/*
 		 * This theme styles the visual editor to resemble the theme style,
-		 * specifically font, colors, icons, and column width.
+		 * specifically font, colors, icons, and column width. When fonts are
+		 * self-hosted, the theme directory needs to be removed first.
 		 */
-		add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+		$font_stylesheet = str_replace(
+			array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+			'',
+			twentyfifteen_fonts_url()
+		);
+		add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', $font_stylesheet ) );
 
 		// Load regular editor styles into the new block-based editor.
 		add_theme_support( 'editor-styles' );
@@ -347,23 +361,23 @@ function twentyfifteen_widgets_init() {
 
 if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
 	/**
-	 * Register Google fonts for Twenty Fifteen.
+	 * Register fonts for Twenty Fifteen.
 	 *
 	 * @since Twenty Fifteen 1.0
+	 * @since Twenty Fifteen 3.4 Replaced Google URL with self-hosted fonts.
 	 *
-	 * @return string Google fonts URL for the theme.
+	 * @return string Fonts URL for the theme.
 	 */
 	function twentyfifteen_fonts_url() {
 		$fonts_url = '';
 		$fonts     = array();
-		$subsets   = 'latin,latin-ext';
 
 		/*
 		 * translators: If there are characters in your language that are not supported
 		 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
-			$fonts[] = 'Noto Sans:400italic,700italic,400,700';
+			$fonts[] = 'noto-sans';
 		}
 
 		/*
@@ -371,7 +385,7 @@ function twentyfifteen_fonts_url() {
 		 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
-			$fonts[] = 'Noto Serif:400italic,700italic,400,700';
+			$fonts[] = 'noto-serif';
 		}
 
 		/*
@@ -379,34 +393,11 @@ function twentyfifteen_fonts_url() {
 		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
-			$fonts[] = 'Inconsolata:400,700';
-		}
-
-		/*
-		 * translators: To add an additional character subset specific to your language,
-		 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
-		 */
-		$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
-
-		if ( 'cyrillic' === $subset ) {
-			$subsets .= ',cyrillic,cyrillic-ext';
-		} elseif ( 'greek' === $subset ) {
-			$subsets .= ',greek,greek-ext';
-		} elseif ( 'devanagari' === $subset ) {
-			$subsets .= ',devanagari';
-		} elseif ( 'vietnamese' === $subset ) {
-			$subsets .= ',vietnamese';
+			$fonts[] = 'inconsolata';
 		}
 
 		if ( $fonts ) {
-			$fonts_url = add_query_arg(
-				array(
-					'family'  => urlencode( implode( '|', $fonts ) ),
-					'subset'  => urlencode( $subsets ),
-					'display' => urlencode( 'fallback' ),
-				),
-				'https://fonts.googleapis.com/css'
-			);
+			$fonts_url = get_template_directory_uri() . '/assets/fonts/' . implode( '-plus-', $fonts ) . '.css';
 		}
 
 		return $fonts_url;
@@ -432,26 +423,28 @@ function twentyfifteen_javascript_detection() {
  */
 function twentyfifteen_scripts() {
 	// Add custom fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyfifteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), $font_version );
 
 	// Add Genericons, used in the main stylesheet.
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '20201026' );
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), '20220914' );
+	wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), '20230623' );
 
-	// Load the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20220908' );
+	// Register the Internet Explorer specific stylesheet.
+	wp_register_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20220908' );
 	wp_style_add_data( 'twentyfifteen-ie', 'conditional', 'lt IE 9' );
 
-	// Load the Internet Explorer 7 specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), '20141210' );
+	// Register the Internet Explorer 7 specific stylesheet.
+	wp_register_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), '20141210' );
 	wp_style_add_data( 'twentyfifteen-ie7', 'conditional', 'lt IE 8' );
 
-	wp_enqueue_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20141028', true );
+	// Skip-link fix is no longer enqueued by default.
+	wp_register_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', true );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
@@ -466,7 +459,9 @@ function twentyfifteen_scripts() {
 		'twentyfifteen-script',
 		'screenReaderText',
 		array(
+			/* translators: Hidden accessibility text. */
 			'expand'   => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
+			/* translators: Hidden accessibility text. */
 			'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
 		)
 	);
@@ -480,9 +475,10 @@ function twentyfifteen_scripts() {
  */
 function twentyfifteen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20220908' );
+	wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20230623' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyfifteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyfifteen_block_editor_styles' );
 
@@ -491,6 +487,7 @@ function twentyfifteen_block_editor_styles() {
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Fifteen 1.7
+ * @deprecated Twenty Fifteen 3.4 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array   $urls          URLs to print for resource hints.
  * @param string  $relation_type The relation type the URLs are printed.
@@ -510,7 +507,7 @@ function twentyfifteen_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentyfifteen_resource_hints', 10, 2 );
 
 /**
  * Add featured image as background image to post navigation elements.
diff --git a/src/wp-content/themes/twentyfifteen/header.php b/src/wp-content/themes/twentyfifteen/header.php
index b6d75352162bd..a92b12b80ffe0 100644
--- a/src/wp-content/themes/twentyfifteen/header.php
+++ b/src/wp-content/themes/twentyfifteen/header.php
@@ -15,16 +15,18 @@
 	<meta name="viewport" content="width=device-width">
 	<link rel="profile" href="https://gmpg.org/xfn/11">
 	<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
-	<!--[if lt IE 9]>
-	<script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0"></script>
-	<![endif]-->
 	<?php wp_head(); ?>
 </head>
 
 <body <?php body_class(); ?>>
 <?php wp_body_open(); ?>
 <div id="page" class="hfeed site">
-	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentyfifteen' ); ?></a>
+	<a class="skip-link screen-reader-text" href="#content">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Skip to content', 'twentyfifteen' );
+		?>
+	</a>
 
 	<div id="sidebar" class="sidebar">
 		<header id="masthead" class="site-header">
diff --git a/src/wp-content/themes/twentyfifteen/image.php b/src/wp-content/themes/twentyfifteen/image.php
index e226a4c6e9c17..6e1de9e405a1e 100644
--- a/src/wp-content/themes/twentyfifteen/image.php
+++ b/src/wp-content/themes/twentyfifteen/image.php
@@ -62,6 +62,7 @@
 								'after'       => '</div>',
 								'link_before' => '<span>',
 								'link_after'  => '</span>',
+								/* translators: Hidden accessibility text. */
 								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
 								'separator'   => '<span class="screen-reader-text">, </span>',
 							)
diff --git a/src/wp-content/themes/twentyfifteen/inc/custom-header.php b/src/wp-content/themes/twentyfifteen/inc/custom-header.php
index a09bb6b4454e2..0cee09a4414bd 100644
--- a/src/wp-content/themes/twentyfifteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyfifteen/inc/custom-header.php
@@ -272,23 +272,19 @@ function twentyfifteen_sidebar_text_color_css() {
 
 		.site-title a:hover,
 		.site-title a:focus {
-			color: %1$s; /* Fallback for IE7 and IE8 */
 			color: %2$s;
 		}
 
 		.secondary-toggle {
-			border-color: %1$s; /* Fallback for IE7 and IE8 */
 			border-color: %3$s;
 		}
 
 		.secondary-toggle:hover,
 		.secondary-toggle:focus {
-			border-color: %1$s; /* Fallback for IE7 and IE8 */
 			border-color: %4$s;
 		}
 
 		.site-title a {
-			outline-color: %1$s; /* Fallback for IE7 and IE8 */
 			outline-color: %4$s;
 		}
 
diff --git a/src/wp-content/themes/twentyfifteen/inc/customizer.php b/src/wp-content/themes/twentyfifteen/inc/customizer.php
index b4c33bceb06c9..8701c4908aa7d 100644
--- a/src/wp-content/themes/twentyfifteen/inc/customizer.php
+++ b/src/wp-content/themes/twentyfifteen/inc/customizer.php
@@ -516,7 +516,6 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	.widget_calendar tbody a:focus,
 	.page-links a:hover,
 	.page-links a:focus {
-		background-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		background-color: {$colors['secondary_textcolor']};
 	}
 
@@ -558,7 +557,6 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	.comment-list .reply a,
 	.widecolumn label,
 	.widecolumn .mu_register label {
-		color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		color: {$colors['secondary_textcolor']};
 	}
 
@@ -566,7 +564,6 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	blockquote,
 	.logged-in-as a:hover,
 	.comment-author a:hover {
-		border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		border-color: {$colors['secondary_textcolor']};
 	}
 
@@ -574,7 +571,6 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	hr,
 	.dropdown-toggle:hover,
 	.dropdown-toggle:focus {
-		background-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		background-color: {$colors['border_color']};
 	}
 
@@ -610,7 +606,6 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	.comment-list .trackback,
 	.comment-list .reply a,
 	.no-comments {
-		border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		border-color: {$colors['border_color']};
 	}
 
@@ -618,13 +613,11 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 	a:focus,
 	button:focus,
 	input:focus {
-		outline-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		outline-color: {$colors['border_focus_color']};
 	}
 
 	input:focus,
 	textarea:focus {
-		border-color: {$colors['textcolor']}; /* Fallback for IE7 and IE8 */
 		border-color: {$colors['border_focus_color']};
 	}
 
@@ -646,19 +639,16 @@ function twentyfifteen_get_color_scheme_css( $colors ) {
 
 	/* Sidebar Border Color */
 	.secondary-toggle {
-		border-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
 		border-color: {$colors['sidebar_border_color']};
 	}
 
 	/* Sidebar Border Focus Color */
 	.secondary-toggle:hover,
 	.secondary-toggle:focus {
-		border-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
 		border-color: {$colors['sidebar_border_focus_color']};
 	}
 
 	.site-title a {
-		outline-color: {$colors['sidebar_textcolor']}; /* Fallback for IE7 and IE8 */
 		outline-color: {$colors['sidebar_border_focus_color']};
 	}
 
diff --git a/src/wp-content/themes/twentyfifteen/inc/template-tags.php b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
index aa3609ee513b8..475423dd68960 100644
--- a/src/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -20,7 +20,12 @@ function twentyfifteen_comment_nav() {
 		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 			?>
 		<nav class="navigation comment-navigation">
-		<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
+		<h2 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Comment navigation', 'twentyfifteen' );
+			?>
+		</h2>
 		<div class="nav-links">
 			<?php
 			$prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) );
@@ -55,7 +60,11 @@ function twentyfifteen_entry_meta() {
 		if ( current_theme_supports( 'post-formats', $format ) ) {
 			printf(
 				'<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
+				sprintf(
+					'<span class="screen-reader-text">%s </span>',
+					/* translators: Hidden accessibility text. */
+					_x( 'Format', 'Used before post format.', 'twentyfifteen' )
+				),
 				esc_url( get_post_format_link( $format ) ),
 				get_post_format_string( $format )
 			);
@@ -78,6 +87,7 @@ function twentyfifteen_entry_meta() {
 
 			printf(
 				'<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+				/* translators: Hidden accessibility text. */
 				_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
 				esc_url( get_permalink() ),
 				$time_string
@@ -88,6 +98,7 @@ function twentyfifteen_entry_meta() {
 			if ( is_singular() || is_multi_author() ) {
 				printf(
 					'<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
+					/* translators: Hidden accessibility text. */
 					_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
 					esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
 					get_the_author()
@@ -98,6 +109,7 @@ function twentyfifteen_entry_meta() {
 			if ( $categories_list && twentyfifteen_categorized_blog() ) {
 				printf(
 					'<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					/* translators: Hidden accessibility text. */
 					_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
 					$categories_list
 				);
@@ -107,6 +119,7 @@ function twentyfifteen_entry_meta() {
 			if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 				printf(
 					'<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					/* translators: Hidden accessibility text. */
 					_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
 					$tags_list
 				);
@@ -119,6 +132,7 @@ function twentyfifteen_entry_meta() {
 
 			printf(
 				'<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+				/* translators: Hidden accessibility text. */
 				_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
 				esc_url( wp_get_attachment_url() ),
 				$metadata['width'],
diff --git a/src/wp-content/themes/twentyfifteen/index.php b/src/wp-content/themes/twentyfifteen/index.php
index a3ffee150c357..6d01ea6f3b70d 100644
--- a/src/wp-content/themes/twentyfifteen/index.php
+++ b/src/wp-content/themes/twentyfifteen/index.php
@@ -47,6 +47,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
 					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentyfifteen/js/html5.js b/src/wp-content/themes/twentyfifteen/js/html5.js
index 412fe5641cf6c..f8ee9b2960456 100644
--- a/src/wp-content/themes/twentyfifteen/js/html5.js
+++ b/src/wp-content/themes/twentyfifteen/js/html5.js
@@ -6,4 +6,4 @@
 a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
 c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
 "undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
\ No newline at end of file
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/src/wp-content/themes/twentyfifteen/js/skip-link-focus-fix.js b/src/wp-content/themes/twentyfifteen/js/skip-link-focus-fix.js
index 5e1a48a101dd6..e7808bc9209ab 100644
--- a/src/wp-content/themes/twentyfifteen/js/skip-link-focus-fix.js
+++ b/src/wp-content/themes/twentyfifteen/js/skip-link-focus-fix.js
@@ -1,21 +1,27 @@
 /**
- * Makes "skip to content" link work correctly in IE9, Chrome, and Opera
- * for better accessibility.
+ * File skip-link-focus-fix.js.
  *
- * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
+ * Helps with accessibility for keyboard only users.
+ *
+ * Learn more: https://git.io/vWdr2
  */
 
 ( function() {
-	var ua = navigator.userAgent.toLowerCase();
-
-	if ( ( ua.indexOf( 'webkit' ) > -1 || ua.indexOf( 'opera' ) > -1 || ua.indexOf( 'msie' ) > -1 ) &&
-		document.getElementById && window.addEventListener ) {
+	var isIe = /(trident|msie)/i.test( navigator.userAgent );
 
+	if ( isIe && document.getElementById && window.addEventListener ) {
 		window.addEventListener( 'hashchange', function() {
-			var element = document.getElementById( location.hash.substring( 1 ) );
+			var id = location.hash.substring( 1 ),
+				element;
+
+			if ( ! ( /^[A-z0-9_-]+$/.test( id ) ) ) {
+				return;
+			}
+
+			element = document.getElementById( id );
 
 			if ( element ) {
-				if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.nodeName ) ) {
+				if ( ! ( /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) ) {
 					element.tabIndex = -1;
 				}
 
diff --git a/src/wp-content/themes/twentyfifteen/readme.txt b/src/wp-content/themes/twentyfifteen/readme.txt
index 9afa1455788c1..c744535a7ff2d 100644
--- a/src/wp-content/themes/twentyfifteen/readme.txt
+++ b/src/wp-content/themes/twentyfifteen/readme.txt
@@ -1,8 +1,9 @@
 === Twenty Fifteen ===
 Contributors: wordpressdotorg
-Requires at least: WordPress 4.1
-Tested up to: 6.1
-Version: 3.3
+Requires at least: 4.1
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Version: 3.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, two-columns, left-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-logo, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
@@ -18,19 +19,19 @@ Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty
 * Post Formats
 * The GPL v2.0 or later license. :) Use it to make something cool.
 
-For more information about Twenty Fifteen please go to https://wordpress.org/support/article/twenty-fifteen/.
+For more information about Twenty Fifteen please go to https://wordpress.org/documentation/article/twenty-fifteen/.
 
 == Installation ==
 
 1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
 2. Type in Twenty Fifteen in the search form and press the 'Enter' key on your keyboard.
 3. Click on the 'Activate' button to use your new theme right away.
-4. Go to https://wordpress.org/support/article/twenty-fifteen/ for a guide on how to customize this theme.
+4. Go to https://wordpress.org/documentation/article/twenty-fifteen/ for a guide on how to customize this theme.
 5. Navigate to Appearance > Customize in your admin panel and customize to taste.
 
 == Copyright ==
 
-Twenty Fifteen WordPress Theme, Copyright 2014-2022 WordPress.org & Automattic.com
+Twenty Fifteen WordPress Theme, Copyright 2014-2023 WordPress.org & Automattic.com
 Twenty Fifteen is distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -53,6 +54,21 @@ Genericons icon font, Copyright 2013-2017 Automattic.com
 License: GNU GPL, Version 2 (or later)
 Source: http://www.genericons.com
 
+Noto Sans Font
+Copyright 2015-2021 Google LLC. All Rights Reserved.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/noto-sans
+
+Noto Serif Font
+Copyright 2012 Google Inc. All Rights Reserved.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/noto-serif
+
+Inconsolata Font
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/inconsolata
+
 Block Pattern Images
 License: CC0
 Source: https://stocksnap.io/photo/purple-yellow-ACF0693B9C
@@ -61,6 +77,16 @@ Source: https://stocksnap.io/photo/purple-yellow-ACF0693B9C
 
 == Changelog ==
 
+= 3.5 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_3.5
+
+= 3.4 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Fifteen_Theme_Changelog#Version_3.4
+
 = 3.3 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentyfifteen/search.php b/src/wp-content/themes/twentyfifteen/search.php
index dc1206e8951f5..18355d351e426 100644
--- a/src/wp-content/themes/twentyfifteen/search.php
+++ b/src/wp-content/themes/twentyfifteen/search.php
@@ -45,6 +45,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
 					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentyfifteen/single.php b/src/wp-content/themes/twentyfifteen/single.php
index be1476e5fcd10..9cf77a8afa505 100644
--- a/src/wp-content/themes/twentyfifteen/single.php
+++ b/src/wp-content/themes/twentyfifteen/single.php
@@ -33,9 +33,11 @@
 			the_post_navigation(
 				array(
 					'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
+						/* translators: Hidden accessibility text. */
 						'<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
 						'<span class="post-title">%title</span>',
 					'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
+						/* translators: Hidden accessibility text. */
 						'<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
 						'<span class="post-title">%title</span>',
 				)
diff --git a/src/wp-content/themes/twentyfifteen/style.css b/src/wp-content/themes/twentyfifteen/style.css
index 6beb2e5dcf2fe..687cf10f071f3 100644
--- a/src/wp-content/themes/twentyfifteen/style.css
+++ b/src/wp-content/themes/twentyfifteen/style.css
@@ -4,8 +4,9 @@ Theme URI: https://wordpress.org/themes/twentyfifteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Our 2015 default theme is clean, blog-focused, and designed for clarity. Twenty Fifteen's simple, straightforward typography is readable on a wide variety of screen sizes, and suitable for multiple languages. We designed it using a mobile-first approach, meaning your content takes center-stage, regardless of whether your visitors arrive by smartphone, tablet, laptop, or desktop computer.
-Version: 3.3
-Tested up to: 6.1
+Version: 3.5
+Requires at least: 4.1
+Tested up to: 6.3
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/src/wp-content/themes/twentyfourteen/comments.php b/src/wp-content/themes/twentyfourteen/comments.php
index c40f12400b121..fdeaf767a5512 100644
--- a/src/wp-content/themes/twentyfourteen/comments.php
+++ b/src/wp-content/themes/twentyfourteen/comments.php
@@ -47,7 +47,12 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 	<nav id="comment-nav-above" class="navigation comment-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Comment navigation', 'twentyfourteen' );
+			?>
+		</h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
 		<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyfourteen' ) ); ?></div>
 	</nav><!-- #comment-nav-above -->
@@ -67,7 +72,12 @@
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 	<nav id="comment-nav-below" class="navigation comment-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Comment navigation', 'twentyfourteen' );
+			?>
+		</h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyfourteen' ) ); ?></div>
 		<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyfourteen' ) ); ?></div>
 	</nav><!-- #comment-nav-below -->
diff --git a/src/wp-content/themes/twentyfourteen/css/blocks.css b/src/wp-content/themes/twentyfourteen/css/blocks.css
index 31691c97723f9..67d205aa2848f 100644
--- a/src/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/src/wp-content/themes/twentyfourteen/css/blocks.css
@@ -142,7 +142,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	color: #fff;
 	font-size: 12px;
 	font-weight: 700;
-	line-height: 15px;
+	line-height: 1.25;
 	padding: 10px 30px 11px;
 	text-transform: uppercase;
 	vertical-align: bottom;
@@ -157,6 +157,11 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-color: #55d737;
 }
 
+.widget .wp-block-file .wp-block-file__button,
+.widget .wp-block-file .wp-block-file__button:hover {
+	color: #fff;
+}
+
 /*--------------------------------------------------------------
 3.0 Blocks - Formatting
 --------------------------------------------------------------*/
@@ -187,6 +192,15 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-transform: none;
 }
 
+.wp-block-pullquote.has-text-color blockquote,
+.wp-block-pullquote.has-background blockquote,
+.has-background .wp-block-pullquote blockquote,
+.wp-block-pullquote.has-text-color cite,
+.has-background .wp-block-pullquote cite,
+.has-text-color .wp-block-pullquote__citation {
+	color: inherit;
+}
+
 .wp-block-pullquote.alignleft {
 	margin-right: 1em;
 }
@@ -226,13 +240,18 @@ p.has-drop-cap:not(:focus)::first-letter {
 .wp-block-button .wp-block-button__link {
 	font-size: 12px;
 	font-weight: 700;
-	line-height: 15px;
+	line-height: 1.25;
 	padding: 10px 30px 11px;
 	text-decoration: none;
 	text-transform: uppercase;
 	vertical-align: bottom;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .wp-block-button__link {
 	background-color: #24890d;
 	color: #fff;
@@ -254,6 +273,11 @@ p.has-drop-cap:not(:focus)::first-letter {
 	background-color: #55d737;
 }
 
+.widget a.wp-block-button__link:not(.has-text-color),
+.widget a.wp-block-button__link:not(.has-text-color):hover {
+	color: #fff;
+}
+
 /* Separator */
 
 .wp-block-separator {
@@ -261,7 +285,8 @@ p.has-drop-cap:not(:focus)::first-letter {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentyfourteen/css/editor-blocks.css b/src/wp-content/themes/twentyfourteen/css/editor-blocks.css
index e611e16bb4009..39f55255b19a7 100644
--- a/src/wp-content/themes/twentyfourteen/css/editor-blocks.css
+++ b/src/wp-content/themes/twentyfourteen/css/editor-blocks.css
@@ -336,7 +336,7 @@ p.has-drop-cap:not(:focus)::first-letter {
 	color: #fff;
 	font-size: 12px;
 	font-weight: 700;
-	line-height: normal;
+	line-height: 1.25;
 	padding: 10px 30px 11px;
 	text-transform: uppercase;
 	vertical-align: bottom;
@@ -364,10 +364,13 @@ p.has-drop-cap:not(:focus)::first-letter {
 /* Pullquote */
 
 .wp-block-pullquote {
-	border: 0;
 	margin: 0;
 }
 
+.editor-styles-wrapper .wp-block-pullquote {
+	border: 0;
+}
+
 .wp-block-pullquote .wp-block-pullquote__citation {
 	color: #2b2b2b;
 	font-size: 16px;
@@ -376,6 +379,15 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-transform: none;
 }
 
+.wp-block-pullquote.has-text-color blockquote,
+.wp-block-pullquote.has-background blockquote,
+.has-background .wp-block-pullquote blockquote,
+.wp-block-pullquote.has-text-color cite,
+.has-background .wp-block-pullquote cite,
+.has-text-color .wp-block-pullquote__citation {
+	color: inherit;
+}
+
 .wp-block-pullquote.alignleft blockquote > .editor-rich-text p,
 .wp-block-pullquote.alignright blockquote > .editor-rich-text p {
 	font-size: 20px;
@@ -406,11 +418,17 @@ p.has-drop-cap:not(:focus)::first-letter {
 .wp-block-button .wp-block-button__link {
 	font-size: 12px;
 	font-weight: 700;
+	line-height: 1.25;
 	padding: 10px 30px 11px;
 	text-transform: uppercase;
 	vertical-align: bottom;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .wp-block-button__link {
 	background-color: #24890d;
 	color: #fff;
diff --git a/src/wp-content/themes/twentyfourteen/fonts/font-lato.css b/src/wp-content/themes/twentyfourteen/fonts/font-lato.css
new file mode 100644
index 0000000000000..5aa20d742a4da
--- /dev/null
+++ b/src/wp-content/themes/twentyfourteen/fonts/font-lato.css
@@ -0,0 +1,174 @@
+/*
+Lato
+Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato".
+Licensed under the SIL Open Font License, Version 1.1.
+https://opensource.org/licenses/OFL-1.1
+*/
+
+/* lato-latin-ext-300-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./lato/lato-latin-ext-300-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-300-normal.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-300-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./lato/lato-latin-300-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-300-normal.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-300-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./lato/lato-latin-ext-300-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-300-italic.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-300-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./lato/lato-latin-300-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-300-italic.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-400-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./lato/lato-latin-ext-400-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-400-normal.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-400-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./lato/lato-latin-400-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-400-normal.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-400-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./lato/lato-latin-ext-400-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-400-italic.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-400-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./lato/lato-latin-400-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-400-italic.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-700-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./lato/lato-latin-ext-700-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-700-normal.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-700-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./lato/lato-latin-700-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-700-normal.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-700-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./lato/lato-latin-ext-700-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-700-italic.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-700-italic */
+@font-face {
+	font-family: 'Lato';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./lato/lato-latin-700-italic.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-700-italic.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* lato-latin-ext-900-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./lato/lato-latin-ext-900-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-900-normal.woff?ver=23') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* lato-latin-900-normal */
+@font-face {
+	font-family: 'Lato';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./lato/lato-latin-900-normal.woff2?ver=23') format('woff2'),
+		url('./lato/lato-all-900-normal.woff?ver=23') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/LICENSE.txt b/src/wp-content/themes/twentyfourteen/fonts/lato/LICENSE.txt
new file mode 100644
index 0000000000000..d0b1be0081689
--- /dev/null
+++ b/src/wp-content/themes/twentyfourteen/fonts/lato/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-italic.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-italic.woff
new file mode 100644
index 0000000000000..3bf3c69cb4024
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-italic.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-normal.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-normal.woff
new file mode 100644
index 0000000000000..bfbb9356f86be
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-300-normal.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-italic.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-italic.woff
new file mode 100644
index 0000000000000..4761cdd43f53f
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-normal.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-normal.woff
new file mode 100644
index 0000000000000..eac7dd1ca4806
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-italic.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-italic.woff
new file mode 100644
index 0000000000000..79d5a0aeb1bca
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-normal.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-normal.woff
new file mode 100644
index 0000000000000..ac9382a811495
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-900-normal.woff b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-900-normal.woff
new file mode 100644
index 0000000000000..64aeddd8d531f
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-all-900-normal.woff differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-italic.woff2
new file mode 100644
index 0000000000000..394b5cf6439e5
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-normal.woff2
new file mode 100644
index 0000000000000..aad98a3390430
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-italic.woff2
new file mode 100644
index 0000000000000..851630ff85699
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-normal.woff2
new file mode 100644
index 0000000000000..ff60934dd0ea9
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-italic.woff2
new file mode 100644
index 0000000000000..38df58bff44c1
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-normal.woff2
new file mode 100644
index 0000000000000..11de83feaf0fb
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-900-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-900-normal.woff2
new file mode 100644
index 0000000000000..72a9bc3041b39
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-italic.woff2
new file mode 100644
index 0000000000000..f17999bd2fed6
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-normal.woff2
new file mode 100644
index 0000000000000..486d3ecf0a975
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..15be816ab23cf
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..edb9fa6f49236
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..f59e721c38b5a
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..2c8aaa866eee8
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-900-normal.woff2 b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-900-normal.woff2
new file mode 100644
index 0000000000000..6833c7f3d5726
Binary files /dev/null and b/src/wp-content/themes/twentyfourteen/fonts/lato/lato-latin-ext-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index 100a7f88db57e..33d39bb02d3ae 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -64,11 +64,26 @@ function twentyfourteen_setup() {
 		 * If you're building a theme based on Twenty Fourteen, use a find and
 		 * replace to change 'twentyfourteen' to the name of your theme in all
 		 * template files.
+		 *
+		 * Manual loading of text domain is not required after the introduction of
+		 * just in time translation loading in WordPress version 4.6.
+		 *
+		 * @ticket 58318
 		 */
-		load_theme_textdomain( 'twentyfourteen' );
+		if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+			load_theme_textdomain( 'twentyfourteen' );
+		}
 
-		// This theme styles the visual editor to resemble the theme style.
-		add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
+		/*
+		 * This theme styles the visual editor to resemble the theme style.
+		 * When fonts are self-hosted, the theme directory needs to be removed first.
+		 */
+		$font_stylesheet = str_replace(
+			array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+			'',
+			twentyfourteen_font_url()
+		);
+		add_editor_style( array( 'css/editor-style.css', $font_stylesheet, 'genericons/genericons.css' ) );
 
 		// Load regular editor styles into the new block-based editor.
 		add_theme_support( 'editor-styles' );
@@ -152,7 +167,7 @@ function twentyfourteen_setup() {
 
 		/*
 		 * Enable support for Post Formats.
-		 * See https://wordpress.org/support/article/post-formats/
+		 * See https://wordpress.org/documentation/article/post-formats/
 		 */
 		add_theme_support(
 			'post-formats',
@@ -293,30 +308,28 @@ function twentyfourteen_widgets_init() {
 }
 add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
 
-/**
- * Register Lato Google font for Twenty Fourteen.
- *
- * @since Twenty Fourteen 1.0
- *
- * @return string
- */
-function twentyfourteen_font_url() {
-	$font_url = '';
-	/*
-	 * translators: If there are characters in your language that are not supported
-	 * by Lato, translate this to 'off'. Do not translate into your own language.
+if ( ! function_exists( 'twentyfourteen_font_url' ) ) :
+	/**
+	 * Register Lato font for Twenty Fourteen.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 * @since Twenty Fourteen 3.6 Replaced Google URL with self-hosted fonts.
+	 *
+	 * @return string
 	 */
-	if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
-		$query_args = array(
-			'family'  => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
-			'subset'  => urlencode( 'latin,latin-ext' ),
-			'display' => urlencode( 'fallback' ),
-		);
-		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-	}
+	function twentyfourteen_font_url() {
+		$font_url = '';
+		/*
+		 * translators: If there are characters in your language that are not supported
+		 * by Lato, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Lato font: on or off', 'twentyfourteen' ) ) {
+			$font_url = get_template_directory_uri() . '/fonts/font-lato.css';
+		}
 
-	return $font_url;
-}
+		return $font_url;
+	}
+endif;
 
 /**
  * Enqueue scripts and styles for the front end.
@@ -325,16 +338,17 @@ function twentyfourteen_font_url() {
  */
 function twentyfourteen_scripts() {
 	// Add Lato font, used in the main stylesheet.
-	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyfourteen_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), $font_version );
 
 	// Add Genericons font, used in the main stylesheet.
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' );
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), '20210622' );
+	wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), '20230630' );
 
 	// Load the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20140711' );
@@ -364,17 +378,18 @@ function twentyfourteen_scripts() {
 		);
 	}
 
-	wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20210122', true );
+	wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', true );
 }
 add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' );
 
 /**
- * Enqueue Google fonts style to admin screen for custom header display.
+ * Enqueue font stylesheet to admin screen for custom header display.
  *
  * @since Twenty Fourteen 1.0
  */
 function twentyfourteen_admin_fonts() {
-	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyfourteen_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyfourteen-lato', twentyfourteen_font_url(), array(), $font_version );
 }
 add_action( 'admin_print_scripts-appearance_page_custom-header', 'twentyfourteen_admin_fonts' );
 
@@ -382,6 +397,7 @@ function twentyfourteen_admin_fonts() {
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Fourteen 1.9
+ * @deprecated Twenty Fourteen 3.6 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array   $urls          URLs to print for resource hints.
  * @param string  $relation_type The relation type the URLs are printed.
@@ -401,7 +417,7 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
 
 /**
  * Enqueue styles for the block-based editor.
@@ -410,9 +426,10 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
  */
 function twentyfourteen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyfourteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20210216' );
+	wp_enqueue_style( 'twentyfourteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20230623' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentyfourteen-fonts', twentyfourteen_font_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyfourteen_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyfourteen-fonts', twentyfourteen_font_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyfourteen_block_editor_styles' );
 
@@ -461,7 +478,7 @@ function twentyfourteen_the_attached_image() {
 		// If there is more than 1 attachment in a gallery...
 		if ( count( $attachment_ids ) > 1 ) {
 			foreach ( $attachment_ids as $idx => $attachment_id ) {
-				if ( $attachment_id == $post->ID ) {
+				if ( $attachment_id === $post->ID ) {
 					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
 					break;
 				}
@@ -711,6 +728,8 @@ function twentyfourteen_widget_tag_cloud_args( $args ) {
  *
  * Enables installing Twenty Fourteen in WordPress versions before 4.0.0 when the
  * `is_customize_preview` function was introduced.
+ *
+ * @global WP_Customize_Manager $wp_customize Customizer object.
  */
 if ( ! function_exists( 'is_customize_preview' ) ) :
 	function is_customize_preview() {
diff --git a/src/wp-content/themes/twentyfourteen/header.php b/src/wp-content/themes/twentyfourteen/header.php
index 34cdf48a8e934..ad3e128b0c063 100644
--- a/src/wp-content/themes/twentyfourteen/header.php
+++ b/src/wp-content/themes/twentyfourteen/header.php
@@ -46,12 +46,22 @@
 			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 
 			<div class="search-toggle">
-				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
+				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search', 'twentyfourteen' );
+					?>
+				</a>
 			</div>
 
 			<nav id="primary-navigation" class="site-navigation primary-navigation">
 				<button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
-				<a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a>
+				<a class="screen-reader-text skip-link" href="#content">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Skip to content', 'twentyfourteen' );
+					?>
+				</a>
 				<?php
 				wp_nav_menu(
 					array(
diff --git a/src/wp-content/themes/twentyfourteen/inc/custom-header.php b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
index dc34e0244e7da..d6692dbb4104a 100644
--- a/src/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -82,7 +82,7 @@ function twentyfourteen_header_style() {
 		}
 			<?php
 			// If the user has set a custom color for the text, use that.
-		elseif ( get_theme_support( 'custom-header', 'default-text-color' ) != $text_color ) :
+		elseif ( get_theme_support( 'custom-header', 'default-text-color' ) !== $text_color ) :
 			?>
 		.site-title a {
 			color: #<?php echo esc_attr( $text_color ); ?>;
diff --git a/src/wp-content/themes/twentyfourteen/inc/featured-content.php b/src/wp-content/themes/twentyfourteen/inc/featured-content.php
index da8b76f715a04..b8be4e6ff61e3 100644
--- a/src/wp-content/themes/twentyfourteen/inc/featured-content.php
+++ b/src/wp-content/themes/twentyfourteen/inc/featured-content.php
@@ -262,7 +262,7 @@ public static function pre_get_posts( $query ) {
 	public static function delete_post_tag( $tag_id ) {
 		$settings = self::get_setting();
 
-		if ( empty( $settings['tag-id'] ) || $tag_id != $settings['tag-id'] ) {
+		if ( empty( $settings['tag-id'] ) || $tag_id !== $settings['tag-id'] ) {
 			return;
 		}
 
@@ -434,7 +434,7 @@ public static function customize_register( $wp_customize ) {
 	 * @since Twenty Fourteen 1.0
 	 */
 	public static function enqueue_scripts() {
-		wp_enqueue_script( 'featured-content-suggest', get_template_directory_uri() . '/js/featured-content-admin.js', array( 'jquery', 'suggest' ), '20131205', true );
+		wp_enqueue_script( 'featured-content-suggest', get_template_directory_uri() . '/js/featured-content-admin.js', array( 'jquery', 'suggest' ), '20211130', true );
 	}
 
 	/**
diff --git a/src/wp-content/themes/twentyfourteen/inc/template-tags.php b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
index 114b099f24456..7e488840899dc 100644
--- a/src/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -57,7 +57,12 @@ function twentyfourteen_paging_nav() {
 
 			?>
 		<nav class="navigation paging-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Posts navigation', 'twentyfourteen' );
+			?>
+		</h1>
 		<div class="pagination loop-pagination">
 			<?php echo $links; ?>
 		</div><!-- .pagination -->
@@ -84,7 +89,12 @@ function twentyfourteen_post_nav() {
 
 		?>
 		<nav class="navigation post-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Post navigation', 'twentyfourteen' );
+			?>
+		</h1>
 		<div class="nav-links">
 			<?php
 			if ( is_attachment() ) :
diff --git a/src/wp-content/themes/twentyfourteen/js/functions.js b/src/wp-content/themes/twentyfourteen/js/functions.js
index 557cc9f87b3ba..d9588ee48dd4e 100644
--- a/src/wp-content/themes/twentyfourteen/js/functions.js
+++ b/src/wp-content/themes/twentyfourteen/js/functions.js
@@ -1,8 +1,8 @@
 /**
  * Theme functions file.
  *
- * Contains handlers for navigation, accessibility, header sizing
- * footer widgets and Featured Content slider
+ * Contains handlers for navigation, accessibility, header sizing,
+ * footer widgets and Featured Content slider.
  *
  */
 ( function( $ ) {
@@ -38,33 +38,6 @@
 		} );
 	} )();
 
-	/*
-	 * Makes "skip to content" link work correctly in IE9 and Chrome for better
-	 * accessibility.
-	 *
-	 * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
-	 */
-	_window.on( 'hashchange.twentyfourteen', function() {
-		var hash = location.hash.substring( 1 ), element;
-
-		if ( ! hash ) {
-			return;
-		}
-
-		element = document.getElementById( hash );
-
-		if ( element ) {
-			if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) {
-				element.tabIndex = -1;
-			}
-
-			element.focus();
-
-			// Repositions the window on jump-to-anchor to account for header height.
-			window.scrollBy( 0, -80 );
-		}
-	} );
-
 	$( function() {
 		// Search toggle.
 		$( '.search-toggle' ).on( 'click.twentyfourteen', function( event ) {
diff --git a/src/wp-content/themes/twentyfourteen/readme.txt b/src/wp-content/themes/twentyfourteen/readme.txt
index 2ac7c1a1af9f7..16fd67eea5327 100644
--- a/src/wp-content/themes/twentyfourteen/readme.txt
+++ b/src/wp-content/themes/twentyfourteen/readme.txt
@@ -1,8 +1,9 @@
 === Twenty Fourteen ===
 Contributors: wordpressdotorg
-Requires at least: WordPress 3.6
-Tested up to: 6.1
-Stable tag: 3.5
+Requires at least: 3.6
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 3.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, news, two-columns, three-columns, left-sidebar, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, accessibility-ready, block-patterns
@@ -22,7 +23,7 @@ For more information about Twenty Fourteen please go to https://codex.wordpress.
 
 == Copyright ==
 
-Twenty Fourteen WordPress Theme, Copyright 2013-2022 WordPress.org & Automattic.com
+Twenty Fourteen WordPress Theme, Copyright 2013-2023 WordPress.org & Automattic.com
 Twenty Fourteen is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -48,6 +49,11 @@ Genericons icon font, Copyright 2013-2017 Automattic.com
 License: GNU GPL, Version 2 (or later)
 Source: http://www.genericons.com
 
+Lato Font
+Copyright (c) 2010-2011 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato".
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/lato
+
 Photos from Stocksnap, used in block patterns.
 License: CC0
 Source: https://stocksnap.io/photo/fog-mountain-ZKN6UKFKEO
@@ -58,6 +64,16 @@ Source: https://stocksnap.io/photo/fog-mountain-ZKN6UKFKEO
 
 == Changelog ==
 
+= 3.7 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_3.7
+
+= 3.6 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Fourteen_Theme_Changelog#Version_3.6
+
 = 3.5 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index dcab55fc67250..c5a8c85450897 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -4,8 +4,9 @@ Theme URI: https://wordpress.org/themes/twentyfourteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: In 2014, our default theme lets you create a responsive magazine website with a sleek, modern design. Feature your favorite homepage content in either a grid or a slider. Use the three widget areas to customize your website, and change your content's layout with a full-width page template and a contributor page to show off your authors. Creating a magazine website with WordPress has never been easier.
-Version: 3.5
-Tested up to: 6.1
+Version: 3.7
+Requires at least: 3.6
+Tested up to: 6.3
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php b/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
index 3e02cf542f32f..3ab2c4bf29955 100644
--- a/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
+++ b/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-walker-comment.php
@@ -36,7 +36,7 @@ protected function html5_comment( $comment, $depth, $args ) {
 						$comment_author_url = get_comment_author_url( $comment );
 						$comment_author     = get_comment_author( $comment );
 						$avatar             = get_avatar( $comment, $args['avatar_size'] );
-						if ( 0 != $args['avatar_size'] ) {
+						if ( 0 !== (int) $args['avatar_size'] ) {
 							if ( empty( $comment_author_url ) ) {
 								echo $avatar;
 							} else {
@@ -78,10 +78,9 @@ protected function html5_comment( $comment, $depth, $args ) {
 						$comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentynineteen' ), get_comment_date( '', $comment ), get_comment_time() );
 
 						printf(
-							'<a href="%s"><time datetime="%s" title="%s">%s</time></a>',
+							'<a href="%s"><time datetime="%s">%s</time></a>',
 							esc_url( get_comment_link( $comment, $args ) ),
 							get_comment_time( 'c' ),
-							esc_attr( $comment_timestamp ),
 							$comment_timestamp
 						);
 
@@ -99,7 +98,7 @@ protected function html5_comment( $comment, $depth, $args ) {
 					}
 					?>
 
-					<?php if ( '0' == $comment->comment_approved ) : ?>
+					<?php if ( '0' === $comment->comment_approved ) : ?>
 					<p class="comment-awaiting-moderation"><?php echo $moderation_note; ?></p>
 					<?php endif; ?>
 
diff --git a/src/wp-content/themes/twentynineteen/comments.php b/src/wp-content/themes/twentynineteen/comments.php
index 9ef3fd6accfd7..3cd17688241a7 100644
--- a/src/wp-content/themes/twentynineteen/comments.php
+++ b/src/wp-content/themes/twentynineteen/comments.php
@@ -35,7 +35,7 @@
 				_e( 'Leave a comment', 'twentynineteen' );
 			}
 		} else {
-			if ( '1' == $discussion->responses ) {
+			if ( '1' === (string) $discussion->responses ) {
 				/* translators: %s: Post title. */
 				printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentynineteen' ), get_the_title() );
 			} else {
@@ -87,13 +87,22 @@
 
 		// Show comment navigation.
 		if ( have_comments() ) :
-			$prev_icon     = twentynineteen_get_icon_svg( 'chevron_left', 22 );
-			$next_icon     = twentynineteen_get_icon_svg( 'chevron_right', 22 );
-			$comments_text = __( 'Comments', 'twentynineteen' );
+			$prev_icon = twentynineteen_get_icon_svg( 'chevron_left', 22 );
+			$next_icon = twentynineteen_get_icon_svg( 'chevron_right', 22 );
 			the_comments_navigation(
 				array(
-					'prev_text' => sprintf( '%s <span class="nav-prev-text"><span class="primary-text">%s</span> <span class="secondary-text">%s</span></span>', $prev_icon, __( 'Previous', 'twentynineteen' ), __( 'Comments', 'twentynineteen' ) ),
-					'next_text' => sprintf( '<span class="nav-next-text"><span class="primary-text">%s</span> <span class="secondary-text">%s</span></span> %s', __( 'Next', 'twentynineteen' ), __( 'Comments', 'twentynineteen' ), $next_icon ),
+					'prev_text' => sprintf(
+						'%1$s <span class="nav-prev-text">%2$s</span>',
+						$prev_icon,
+						/* translators: Comments navigation link text. The secondary-text element is hidden on small screens. */
+						__( '<span class="primary-text">Previous</span> <span class="secondary-text">Comments</span>', 'twentynineteen' )
+					),
+					'next_text' => sprintf(
+						'<span class="nav-next-text">%1$s</span> %2$s',
+						/* translators: Comments navigation link text. The secondary-text element is hidden on small screens. */
+						__( '<span class="primary-text">Next</span> <span class="secondary-text">Comments</span>', 'twentynineteen' ),
+						$next_icon
+					),
 				)
 			);
 		endif;
diff --git a/src/wp-content/themes/twentynineteen/functions.php b/src/wp-content/themes/twentynineteen/functions.php
index 98c4108577a42..6aaa5ac7e9d7c 100644
--- a/src/wp-content/themes/twentynineteen/functions.php
+++ b/src/wp-content/themes/twentynineteen/functions.php
@@ -26,13 +26,6 @@
 	 * as indicating support for post thumbnails.
 	 */
 	function twentynineteen_setup() {
-		/*
-		 * Make theme available for translation.
-		 * Translations can be filed in the /languages/ directory.
-		 * If you're building a theme based on Twenty Nineteen, use a find and replace
-		 * to change 'twentynineteen' to the name of your theme in all the template files.
-		 */
-		load_theme_textdomain( 'twentynineteen', get_template_directory() . '/languages' );
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );
@@ -267,7 +260,7 @@ function twentynineteen_scripts() {
 
 	if ( has_nav_menu( 'menu-1' ) ) {
 		wp_enqueue_script( 'twentynineteen-priority-menu', get_theme_file_uri( '/js/priority-menu.js' ), array(), '20200129', true );
-		wp_enqueue_script( 'twentynineteen-touch-navigation', get_theme_file_uri( '/js/touch-keyboard-navigation.js' ), array(), '20221101', true );
+		wp_enqueue_script( 'twentynineteen-touch-navigation', get_theme_file_uri( '/js/touch-keyboard-navigation.js' ), array(), '20230621', true );
 	}
 
 	wp_enqueue_style( 'twentynineteen-print-style', get_template_directory_uri() . '/print.css', array(), wp_get_theme()->get( 'Version' ), 'print' );
@@ -284,6 +277,9 @@ function twentynineteen_scripts() {
  * This does not enqueue the script because it is tiny and because it is only for IE11,
  * thus it does not warrant having an entire dedicated blocking script being loaded.
  *
+ * @since Twenty Nineteen 1.0
+ * @deprecated Twenty Nineteen 2.6 Removed from wp_print_footer_scripts action.
+ *
  * @link https://git.io/vWdr2
  */
 function twentynineteen_skip_link_focus_fix() {
@@ -294,14 +290,13 @@ function twentynineteen_skip_link_focus_fix() {
 	</script>
 	<?php
 }
-add_action( 'wp_print_footer_scripts', 'twentynineteen_skip_link_focus_fix' );
 
 /**
  * Enqueue supplemental block editor styles.
  */
 function twentynineteen_editor_customizer_styles() {
 
-	wp_enqueue_style( 'twentynineteen-editor-customizer-styles', get_theme_file_uri( '/style-editor-customizer.css' ), false, '1.1', 'all' );
+	wp_enqueue_style( 'twentynineteen-editor-customizer-styles', get_theme_file_uri( '/style-editor-customizer.css' ), false, '2.1', 'all' );
 
 	if ( 'custom' === get_theme_mod( 'primary_color' ) ) {
 		// Include color patterns.
diff --git a/src/wp-content/themes/twentynineteen/header.php b/src/wp-content/themes/twentynineteen/header.php
index ad7b12f415965..11b6c0998e468 100644
--- a/src/wp-content/themes/twentynineteen/header.php
+++ b/src/wp-content/themes/twentynineteen/header.php
@@ -22,7 +22,12 @@
 <body <?php body_class(); ?>>
 <?php wp_body_open(); ?>
 <div id="page" class="site">
-	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentynineteen' ); ?></a>
+	<a class="skip-link screen-reader-text" href="#content">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Skip to content', 'twentynineteen' );
+		?>
+	</a>
 
 		<header id="masthead" class="<?php echo is_singular() && twentynineteen_can_show_post_thumbnail() ? 'site-header featured-image' : 'site-header'; ?>">
 
diff --git a/src/wp-content/themes/twentynineteen/image.php b/src/wp-content/themes/twentynineteen/image.php
index 0f1152a556eda..a3580b4e668f3 100644
--- a/src/wp-content/themes/twentynineteen/image.php
+++ b/src/wp-content/themes/twentynineteen/image.php
@@ -53,6 +53,7 @@
 								'after'       => '</div>',
 								'link_before' => '<span>',
 								'link_after'  => '</span>',
+								/* translators: Hidden accessibility text. */
 								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentynineteen' ) . ' </span>%',
 								'separator'   => '<span class="screen-reader-text">, </span>',
 							)
@@ -67,6 +68,7 @@
 					if ( $metadata ) {
 						printf(
 							'<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s &times; %4$s</a></span>',
+							/* translators: Hidden accessibility text. */
 							_x( 'Full size', 'Used before full size attachment link.', 'twentynineteen' ),
 							esc_url( wp_get_attachment_url() ),
 							absint( $metadata['width'] ),
diff --git a/src/wp-content/themes/twentynineteen/inc/icon-functions.php b/src/wp-content/themes/twentynineteen/inc/icon-functions.php
index 76dba55094fb8..900bcb665f57b 100644
--- a/src/wp-content/themes/twentynineteen/inc/icon-functions.php
+++ b/src/wp-content/themes/twentynineteen/inc/icon-functions.php
@@ -40,7 +40,7 @@ function twentynineteen_get_social_link_svg( $uri, $size = 24 ) {
 function twentynineteen_nav_menu_social_icons( $item_output, $item, $depth, $args ) {
 	// Change SVG icon inside social links menu if there is supported URL.
 	if ( 'social' === $args->theme_location ) {
-		$svg = twentynineteen_get_social_link_svg( $item->url, 26 );
+		$svg = twentynineteen_get_social_link_svg( $item->url, 32 );
 		if ( empty( $svg ) ) {
 			$svg = twentynineteen_get_icon_svg( 'link' );
 		}
diff --git a/src/wp-content/themes/twentynineteen/inc/template-functions.php b/src/wp-content/themes/twentynineteen/inc/template-functions.php
index 6c5a96714e05a..536fbd3ee427f 100644
--- a/src/wp-content/themes/twentynineteen/inc/template-functions.php
+++ b/src/wp-content/themes/twentynineteen/inc/template-functions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Functions which enhance the theme by hooking into WordPress
+ * Functions which enhance the theme by hooking into WordPress.
  *
  * @package WordPress
  * @subpackage Twenty_Nineteen
@@ -34,17 +34,19 @@ function twentynineteen_body_classes( $classes ) {
 
 /**
  * Adds custom class to the array of posts classes.
+ *
+ * @param array $classes A list of existing post class values.
+ * @return array The filtered post class list.
  */
-function twentynineteen_post_classes( $classes, $css_class, $post_id ) {
+function twentynineteen_post_classes( $classes ) {
 	$classes[] = 'entry';
 
 	return $classes;
 }
-add_filter( 'post_class', 'twentynineteen_post_classes', 10, 3 );
-
+add_filter( 'post_class', 'twentynineteen_post_classes' );
 
 /**
- * Add a pingback url auto-discovery header for single posts, pages, or attachments.
+ * Adds a pingback url auto-discovery header for single posts, pages, or attachments.
  */
 function twentynineteen_pingback_header() {
 	if ( is_singular() && pings_open() ) {
@@ -96,7 +98,7 @@ function twentynineteen_get_the_archive_title() {
 add_filter( 'get_the_archive_title', 'twentynineteen_get_the_archive_title' );
 
 /**
- * Add custom 'sizes' attribute to responsive image functionality for post thumbnails.
+ * Adds custom 'sizes' attribute to responsive image functionality for post thumbnails.
  *
  * @origin Twenty Nineteen 1.0
  *
@@ -116,13 +118,13 @@ function twentynineteen_post_thumbnail_sizes_attr( $attr ) {
 
 	return $attr;
 }
-add_filter( 'wp_get_attachment_image_attributes', 'twentynineteen_post_thumbnail_sizes_attr', 10, 1 );
+add_filter( 'wp_get_attachment_image_attributes', 'twentynineteen_post_thumbnail_sizes_attr' );
 
 /**
- * Add an extra menu to our nav for our priority+ navigation to use
+ * Adds an extra menu to our nav for our priority+ navigation to use.
  *
- * @param string $nav_menu  Nav menu.
- * @param object $args      Nav menu args.
+ * @param string $nav_menu Nav menu.
+ * @param object $args     Nav menu args.
  * @return string More link for hidden menu items.
  */
 function twentynineteen_add_ellipses_to_nav( $nav_menu, $args ) {
@@ -156,14 +158,25 @@ function twentynineteen_add_ellipses_to_nav( $nav_menu, $args ) {
 add_filter( 'wp_nav_menu', 'twentynineteen_add_ellipses_to_nav', 10, 2 );
 
 /**
- * WCAG 2.0 Attributes for Dropdown Menus
+ * Handles WCAG 2.0 attributes for dropdown menus.
  *
- * Adjustments to menu attributes tot support WCAG 2.0 recommendations
+ * Adjustments to menu attributes to support WCAG 2.0 recommendations
  * for flyout and dropdown menus.
  *
  * @ref https://www.w3.org/WAI/tutorials/menus/flyout/
+ * @param array   $atts {
+ *     The HTML attributes applied to the menu item's `<a>` element, empty strings are ignored.
+ *
+ *     @type string $title        Title attribute.
+ *     @type string $target       Target attribute.
+ *     @type string $rel          The rel attribute.
+ *     @type string $href         The href attribute.
+ *     @type string $aria-current The aria-current attribute.
+ * }
+ * @param WP_Post $item The current menu item object.
+ * @return string[] Modified attributes.
  */
-function twentynineteen_nav_menu_link_attributes( $atts, $item, $args, $depth ) {
+function twentynineteen_nav_menu_link_attributes( $atts, $item ) {
 
 	// Add [aria-haspopup] and [aria-expanded] to menu items that have children.
 	$item_has_children = in_array( 'menu-item-has-children', $item->classes, true );
@@ -174,10 +187,10 @@ function twentynineteen_nav_menu_link_attributes( $atts, $item, $args, $depth )
 
 	return $atts;
 }
-add_filter( 'nav_menu_link_attributes', 'twentynineteen_nav_menu_link_attributes', 10, 4 );
+add_filter( 'nav_menu_link_attributes', 'twentynineteen_nav_menu_link_attributes', 10, 2 );
 
 /**
- * Create a nav menu item to be displayed on mobile to navigate from submenu back to the parent.
+ * Creates a nav menu item to be displayed on mobile to navigate from submenu back to the parent.
  *
  * This duplicates each parent nav menu item and makes it the first child of itself.
  *
@@ -210,3 +223,20 @@ function twentynineteen_add_mobile_parent_nav_menu_items( $sorted_menu_items, $a
 	return $amended_menu_items;
 }
 add_filter( 'wp_nav_menu_objects', 'twentynineteen_add_mobile_parent_nav_menu_items', 10, 2 );
+
+/**
+ * Adds a fragment identifier (to the content) to paginated links.
+ *
+ * @since Twenty Nineteen 2.6
+ *
+ * @param string $link The page number HTML output.
+ * @param int    $i    Page number for paginated posts' page links.
+ * @return string Formatted output in HTML.
+ */
+function twentynineteen_link_pages_link( $link, $i ) {
+	if ( $i > 1 && preg_match( '/href="([^"]*)"/', $link, $matches ) ) {
+		$link = str_replace( $matches[1], $matches[1] . '#content', $link );
+	}
+	return $link;
+}
+add_filter( 'wp_link_pages_link', 'twentynineteen_link_pages_link', 10, 2 );
diff --git a/src/wp-content/themes/twentynineteen/inc/template-tags.php b/src/wp-content/themes/twentynineteen/inc/template-tags.php
index 582ee1f364db0..9ed434f97b3b3 100644
--- a/src/wp-content/themes/twentynineteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentynineteen/inc/template-tags.php
@@ -43,6 +43,7 @@ function twentynineteen_posted_by() {
 			/* translators: 1: SVG icon. 2: Post author, only visible to screen readers. 3: Author link. */
 			'<span class="byline">%1$s<span class="screen-reader-text">%2$s</span><span class="author vcard"><a class="url fn n" href="%3$s">%4$s</a></span></span>',
 			twentynineteen_get_icon_svg( 'person', 16 ),
+			/* translators: Hidden accessibility text. */
 			__( 'Posted by', 'twentynineteen' ),
 			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
 			esc_html( get_the_author() )
@@ -88,6 +89,7 @@ function twentynineteen_entry_footer() {
 					/* translators: 1: SVG icon. 2: Posted in label, only visible to screen readers. 3: List of categories. */
 					'<span class="cat-links">%1$s<span class="screen-reader-text">%2$s</span>%3$s</span>',
 					twentynineteen_get_icon_svg( 'archive', 16 ),
+					/* translators: Hidden accessibility text. */
 					__( 'Posted in', 'twentynineteen' ),
 					$categories_list
 				); // WPCS: XSS OK.
@@ -99,6 +101,7 @@ function twentynineteen_entry_footer() {
 					/* translators: 1: SVG icon. 2: Posted in label, only visible to screen readers. 3: List of tags. */
 					'<span class="tags-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
 					twentynineteen_get_icon_svg( 'tag', 16 ),
+					/* translators: Hidden accessibility text. */
 					__( 'Tags:', 'twentynineteen' ),
 					$tags_list
 				); // WPCS: XSS OK.
diff --git a/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js b/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js
index c8d1dd02e671e..0d6a427ecbbe4 100644
--- a/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js
+++ b/src/wp-content/themes/twentynineteen/js/touch-keyboard-navigation.js
@@ -274,7 +274,7 @@
 
 		document.addEventListener('focus', function(event) {
 
-			if ( event.target.matches('.main-navigation > div > ul > li a') ) {
+			if ( event.target !== window.document && event.target.matches( '.main-navigation > div > ul > li a' ) ) {
 
 				// Remove Focused elements in sibling div.
 				var currentDiv        = getCurrentParent( event.target, 'div', '.main-navigation' );
diff --git a/src/wp-content/themes/twentynineteen/package-lock.json b/src/wp-content/themes/twentynineteen/package-lock.json
index 741f284d93a7e..dc7f429b829aa 100644
--- a/src/wp-content/themes/twentynineteen/package-lock.json
+++ b/src/wp-content/themes/twentynineteen/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "twentynineteen",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -37,45 +37,54 @@
       "dev": true
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
-      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.4",
+        "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
-      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
-      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.4",
+        "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
     "@npmcli/fs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
-      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
+      "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
       "dev": true,
       "requires": {
-        "@gar/promisify": "^1.0.1",
+        "@gar/promisify": "^1.1.3",
         "semver": "^7.3.5"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -84,9 +93,9 @@
       }
     },
     "@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
+      "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
       "dev": true,
       "requires": {
         "mkdirp": "^1.0.4",
@@ -94,9 +103,9 @@
       }
     },
     "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true
     },
     "@types/minimist": {
@@ -112,9 +121,9 @@
       "dev": true
     },
     "@wordpress/browserslist-config": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.1.0.tgz",
-      "integrity": "sha512-rfIHuzamXWL4ZBVmYrlOlqs+8wRzjiAcx0wjgCZ4/+8I9U0SNPgYbjrx6nL48XVbTNA+1GL6XIgdx1g/kHHwoQ==",
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.11.0.tgz",
+      "integrity": "sha512-jpJoyiF0FRk5qnTqRJt5ysmtxyjwhtgUh9Xi5t/VN/JdJiFZk5/EnRQYClzmoaKO/XqocvhDpmVieuN6MXhYWQ==",
       "dev": true
     },
     "abbrev": {
@@ -153,18 +162,6 @@
         "indent-string": "^4.0.0"
       }
     },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
     "ansi-regex": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
@@ -181,9 +178,9 @@
       }
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -206,109 +203,38 @@
         "readable-stream": "^3.6.0"
       }
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
       "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
       "dev": true
     },
-    "asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true
-    },
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA==",
       "dev": true
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
-    },
     "autoprefixer": {
-      "version": "10.4.12",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-      "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+      "version": "10.4.13",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
       "dev": true,
       "requires": {
         "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001407",
+        "caniuse-lite": "^1.0.30001426",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
         "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-          "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-          "dev": true
-        }
       }
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "binary-extensions": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
@@ -347,55 +273,64 @@
       }
     },
     "cacache": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "version": "16.1.3",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
+      "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
       "dev": true,
       "requires": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
+        "@npmcli/fs": "^2.1.0",
+        "@npmcli/move-file": "^2.0.0",
         "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
+        "fs-minipass": "^2.1.0",
+        "glob": "^8.0.1",
         "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
         "minipass-collect": "^1.0.2",
         "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
+        "minipass-pipeline": "^1.2.4",
+        "mkdirp": "^1.0.4",
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
-      }
-    },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "requires": {
-        "callsites": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "requires": {
-        "caller-callsite": "^2.0.0"
+        "ssri": "^9.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^2.0.0"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "glob": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+          "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "minimatch": {
+          "version": "5.1.6",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+          "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        }
       }
     },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true
-    },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -414,15 +349,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001410",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
-      "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "version": "1.0.30001449",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz",
+      "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==",
       "dev": true
     },
     "chalk": {
@@ -437,19 +366,19 @@
       }
     },
     "chokidar": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
-      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.1.2",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.4.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chokidar-cli": {
@@ -573,15 +502,6 @@
       "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
       "dev": true
     },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -595,35 +515,11 @@
       "dev": true
     },
     "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1"
-          }
-        }
-      }
-    },
     "cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -637,14 +533,11 @@
         "which": "^1.2.9"
       }
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
+    "cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
     },
     "debug": {
       "version": "4.3.4",
@@ -662,9 +555,9 @@
       "dev": true
     },
     "decamelize-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-      "integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
       "dev": true,
       "requires": {
         "decamelize": "^1.1.0",
@@ -688,12 +581,6 @@
         "object-keys": "^1.0.12"
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "dev": true
-    },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -707,9 +594,9 @@
       "dev": true
     },
     "dependency-graph": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz",
-      "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
+      "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
       "dev": true
     },
     "dir-glob": {
@@ -719,30 +606,12 @@
       "dev": true,
       "requires": {
         "path-type": "^4.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        }
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
       }
     },
     "electron-to-chromium": {
-      "version": "1.4.258",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
-      "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A==",
+      "version": "1.4.284",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
+      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
       "dev": true
     },
     "emoji-regex": {
@@ -819,62 +688,23 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.12",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
-      },
-      "dependencies": {
-        "picomatch": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-          "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-          "dev": true
-        }
+        "micromatch": "^4.0.4"
       }
     },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -898,23 +728,6 @@
         "locate-path": "^3.0.0"
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
     "fraction.js": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -922,12 +735,11 @@
       "dev": true
     },
     "fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
+      "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
       "dev": true,
       "requires": {
-        "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
         "universalify": "^2.0.0"
@@ -949,9 +761,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true
     },
@@ -1015,15 +827,6 @@
       "integrity": "sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -1059,17 +862,24 @@
       }
     },
     "globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
+      "version": "13.1.3",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+      "integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
       "dev": true,
       "requires": {
-        "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
+        "fast-glob": "^3.2.11",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
+      "dependencies": {
+        "slash": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+          "dev": true
+        }
       }
     },
     "globule": {
@@ -1105,22 +915,6 @@
       "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
       "dev": true
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
@@ -1161,33 +955,22 @@
       "dev": true
     },
     "http-cache-semantics": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
+      "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
       "dev": true
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
       "requires": {
-        "@tootallnate/once": "1",
+        "@tootallnate/once": "2",
         "agent-base": "6",
         "debug": "4"
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -1218,39 +1001,11 @@
       }
     },
     "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -1313,9 +1068,9 @@
       "dev": true
     },
     "is-core-module": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-      "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -1327,12 +1082,6 @@
       "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
       "dev": true
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1390,12 +1139,6 @@
         "has-symbols": "^1.0.0"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -1408,12 +1151,6 @@
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-      "dev": true
-    },
     "js-base64": {
       "version": "2.6.4",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
@@ -1426,22 +1163,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-      "dev": true
-    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -1454,24 +1175,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-      "dev": true
-    },
     "jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
@@ -1482,24 +1185,18 @@
         "universalify": "^2.0.0"
       }
     },
-    "jsprim": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
-      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      }
-    },
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
+    "lilconfig": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
+      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
+      "dev": true
+    },
     "lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -1534,46 +1231,34 @@
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=",
       "dev": true
     },
-    "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1"
-      }
-    },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.1.tgz",
+      "integrity": "sha512-8/HcIENyQnfUTCDizRu9rrDyG6XG/21M4X7/YEGZeD76ZJilFPAUVb/2zysFf7VVO1LEjCDFyHp8pMMvozIrvg==",
+      "dev": true
     },
     "make-fetch-happen": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
-      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
+      "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "^4.1.3",
-        "cacache": "^15.2.0",
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^16.1.0",
         "http-cache-semantics": "^4.1.0",
-        "http-proxy-agent": "^4.0.1",
+        "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
         "is-lambda": "^1.0.1",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.3",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
         "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.3.2",
+        "minipass-fetch": "^2.0.3",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
-        "negotiator": "^0.6.2",
+        "negotiator": "^0.6.3",
         "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^6.0.0",
-        "ssri": "^8.0.0"
+        "socks-proxy-agent": "^7.0.0",
+        "ssri": "^9.0.0"
       }
     },
     "map-obj": {
@@ -1617,6 +1302,15 @@
             "lru-cache": "^6.0.0"
           }
         },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "normalize-package-data": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
@@ -1630,9 +1324,9 @@
           }
         },
         "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -1653,38 +1347,23 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "dependencies": {
         "picomatch": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-          "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
           "dev": true
         }
       }
     },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -1712,9 +1391,9 @@
       }
     },
     "minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
@@ -1730,15 +1409,15 @@
       }
     },
     "minipass-fetch": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
-      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
+      "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
       "dev": true,
       "requires": {
-        "encoding": "^0.1.12",
-        "minipass": "^3.1.0",
+        "encoding": "^0.1.13",
+        "minipass": "^3.1.6",
         "minipass-sized": "^1.0.3",
-        "minizlib": "^2.0.0"
+        "minizlib": "^2.1.2"
       }
     },
     "minipass-flush": {
@@ -1791,9 +1470,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
-      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
+      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
       "dev": true
     },
     "nanoid": {
@@ -1832,31 +1511,165 @@
         "which": "^2.0.2"
       },
       "dependencies": {
+        "@npmcli/fs": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+          "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+          "dev": true,
+          "requires": {
+            "@gar/promisify": "^1.0.1",
+            "semver": "^7.3.5"
+          }
+        },
+        "@npmcli/move-file": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+          "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+          "dev": true,
+          "requires": {
+            "mkdirp": "^1.0.4",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "@tootallnate/once": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+          "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+          "dev": true
+        },
+        "cacache": {
+          "version": "15.3.0",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+          "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+          "dev": true,
+          "requires": {
+            "@npmcli/fs": "^1.0.0",
+            "@npmcli/move-file": "^1.0.1",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.1",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^1.0.3",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^8.0.1",
+            "tar": "^6.0.2",
+            "unique-filename": "^1.1.1"
+          }
+        },
         "graceful-fs": {
           "version": "4.2.10",
           "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
           "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
           "dev": true
         },
-        "npmlog": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-          "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "make-fetch-happen": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+          "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+          "dev": true,
+          "requires": {
+            "agentkeepalive": "^4.1.3",
+            "cacache": "^15.2.0",
+            "http-cache-semantics": "^4.1.0",
+            "http-proxy-agent": "^4.0.1",
+            "https-proxy-agent": "^5.0.0",
+            "is-lambda": "^1.0.1",
+            "lru-cache": "^6.0.0",
+            "minipass": "^3.1.3",
+            "minipass-collect": "^1.0.2",
+            "minipass-fetch": "^1.3.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.4",
+            "negotiator": "^0.6.2",
+            "promise-retry": "^2.0.1",
+            "socks-proxy-agent": "^6.0.0",
+            "ssri": "^8.0.0"
+          }
+        },
+        "minipass-fetch": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+          "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+          "dev": true,
+          "requires": {
+            "encoding": "^0.1.12",
+            "minipass": "^3.1.0",
+            "minipass-sized": "^1.0.3",
+            "minizlib": "^2.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.8",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+          "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
           "dev": true,
           "requires": {
-            "are-we-there-yet": "^3.0.0",
-            "console-control-strings": "^1.1.0",
-            "gauge": "^4.0.3",
-            "set-blocking": "^2.0.0"
+            "agent-base": "^6.0.2",
+            "debug": "^4.3.3",
+            "socks": "^2.6.2"
           }
         },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+        "ssri": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+          "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "minipass": "^3.1.1"
+          }
+        },
+        "unique-filename": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+          "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+          "dev": true,
+          "requires": {
+            "unique-slug": "^2.0.0"
+          }
+        },
+        "unique-slug": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+          "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+          "dev": true,
+          "requires": {
+            "imurmurhash": "^0.1.4"
           }
         },
         "which": {
@@ -1871,15 +1684,15 @@
       }
     },
     "node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.8.tgz",
+      "integrity": "sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==",
       "dev": true
     },
     "node-sass": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-7.0.3.tgz",
-      "integrity": "sha512-8MIlsY/4dXUkJDYht9pIWBhMil3uHmE8b/AdJPjmFn1nBx9X9BASzfzmsCy0uCCb8eqI3SYYzVPDswWqSx7gjw==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-8.0.0.tgz",
+      "integrity": "sha512-jPzqCF2/e6JXw6r3VxfIqYc8tKQdkj5Z/BDATYyG6FL6b/LuYBNFGFVhus0mthcWifHm/JzBpKAd+3eXsWeK/A==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -1889,14 +1702,13 @@
         "get-stdin": "^4.0.1",
         "glob": "^7.0.3",
         "lodash": "^4.17.15",
+        "make-fetch-happen": "^10.0.4",
         "meow": "^9.0.0",
-        "nan": "^2.13.2",
+        "nan": "^2.17.0",
         "node-gyp": "^8.4.1",
-        "npmlog": "^5.0.0",
-        "request": "^2.88.0",
         "sass-graph": "^4.0.1",
         "stdout-stream": "^1.4.0",
-        "true-case-path": "^1.0.2"
+        "true-case-path": "^2.2.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2098,73 +1910,17 @@
       }
     },
     "npmlog": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-      "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "^2.0.0",
+        "are-we-there-yet": "^3.0.0",
         "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
+        "gauge": "^4.0.3",
         "set-blocking": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-          "dev": true
-        },
-        "are-we-there-yet": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-          "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-          "dev": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "gauge": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-          "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-          "dev": true,
-          "requires": {
-            "aproba": "^1.0.3 || ^2.0.0",
-            "color-support": "^1.1.2",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.1",
-            "object-assign": "^4.1.1",
-            "signal-exit": "^3.0.0",
-            "string-width": "^4.2.3",
-            "strip-ansi": "^6.0.1",
-            "wide-align": "^1.1.2"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.1"
-          }
-        }
       }
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true
-    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -2249,16 +2005,16 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
     "picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
       "dev": true
     },
     "picomatch": {
@@ -2276,43 +2032,44 @@
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true
     },
     "postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+      "version": "8.4.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
       "dev": true,
       "requires": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-cli": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.2.tgz",
-      "integrity": "sha512-3mlEmN1v2NVuosMWZM2tP8bgZn7rO5PYxRRrXtdSyL5KipcgBDjJ9ct8/LKxImMCJJi3x5nYhCGFJOkGyEqXBQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.1.0.tgz",
+      "integrity": "sha512-Zu7PLORkE9YwNdvOeOVKPmWghprOtjFQU3srMUGbdz3pHJiFh7yZ4geiZFMkjMfB0mtTFR3h8RemR62rPkbOPA==",
       "dev": true,
       "requires": {
-        "chalk": "^4.0.0",
         "chokidar": "^3.3.0",
-        "dependency-graph": "^0.9.0",
-        "fs-extra": "^9.0.0",
-        "get-stdin": "^8.0.0",
-        "globby": "^11.0.0",
-        "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "postcss-reporter": "^6.0.0",
+        "dependency-graph": "^0.11.0",
+        "fs-extra": "^11.0.0",
+        "get-stdin": "^9.0.0",
+        "globby": "^13.0.0",
+        "picocolors": "^1.0.0",
+        "postcss-load-config": "^4.0.0",
+        "postcss-reporter": "^7.0.0",
         "pretty-hrtime": "^1.0.3",
         "read-cache": "^1.0.0",
-        "yargs": "^15.0.2"
+        "slash": "^5.0.0",
+        "yargs": "^17.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "ansi-styles": {
@@ -2324,25 +2081,15 @@
             "color-convert": "^2.0.1"
           }
         },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
         "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
           "dev": true,
           "requires": {
             "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
+            "strip-ansi": "^6.0.1",
+            "wrap-ansi": "^7.0.0"
           }
         },
         "color-convert": {
@@ -2360,97 +2107,25 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
         "get-stdin": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-          "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "version": "9.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+          "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
         "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ansi-regex": "^5.0.1"
           }
         },
         "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.0.0",
@@ -2458,66 +2133,72 @@
             "strip-ansi": "^6.0.0"
           }
         },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
+        },
         "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+          "version": "17.6.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+          "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
           "dev": true,
           "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
+            "cliui": "^8.0.1",
+            "escalade": "^3.1.1",
+            "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.2"
+            "string-width": "^4.2.3",
+            "y18n": "^5.0.5",
+            "yargs-parser": "^21.1.1"
           }
         },
         "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
+          "version": "21.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+          "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+          "dev": true
         }
       }
     },
     "postcss-focus-within": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-4.0.0.tgz",
-      "integrity": "sha512-fO+5/StoHEswmdDQ7V3rhlx4i1cUOjQItae3scu8Nki5h35/fvr8J1vakFnSN4gZ7zzthflpedVsMZPDXNzxaA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-7.0.2.tgz",
+      "integrity": "sha512-AHAJ89UQBcqBvFgQJE9XasGuwMNkKsGj4D/f9Uk60jFmEBHpAL14DrnSk3Rj+SwZTr/WUG+mh+Rvf8fid/346w==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.27"
+        "postcss-selector-parser": "^6.0.10"
       }
     },
     "postcss-load-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
-      "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz",
+      "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^5.0.0",
-        "import-cwd": "^2.0.0"
+        "lilconfig": "^2.0.5",
+        "yaml": "^2.1.1"
       }
     },
     "postcss-reporter": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz",
-      "integrity": "sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz",
+      "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.1",
-        "lodash": "^4.17.11",
-        "log-symbols": "^2.2.0",
-        "postcss": "^7.0.7"
+        "picocolors": "^1.0.0",
+        "thenby": "^1.3.4"
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+      "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       }
     },
     "postcss-value-parser": {
@@ -2529,7 +2210,7 @@
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
       "dev": true
     },
     "process-nextick-args": {
@@ -2554,24 +2235,6 @@
         "retry": "^0.12.0"
       }
     },
-    "psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-      "dev": true
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-      "dev": true
-    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -2587,7 +2250,7 @@
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
       "dev": true,
       "requires": {
         "pify": "^2.3.0"
@@ -2667,9 +2330,9 @@
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+      "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -2678,18 +2341,18 @@
       }
     },
     "readdirp": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       },
       "dependencies": {
         "picomatch": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
           "dev": true
         }
       }
@@ -2704,34 +2367,6 @@
         "strip-indent": "^3.0.0"
       }
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -2753,12 +2388,6 @@
         "path-parse": "^1.0.6"
       }
     },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
     "retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -2830,7 +2459,8 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "sass-graph": {
       "version": "4.0.1",
@@ -2860,13 +2490,13 @@
           }
         },
         "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+          "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
           "dev": true,
           "requires": {
             "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
+            "strip-ansi": "^6.0.1",
             "wrap-ansi": "^7.0.0"
           }
         },
@@ -2912,18 +2542,18 @@
           "dev": true
         },
         "yargs": {
-          "version": "17.5.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-          "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+          "version": "17.7.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+          "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
+            "cliui": "^8.0.1",
             "escalade": "^3.1.1",
             "get-caller-file": "^2.0.5",
             "require-directory": "^2.1.1",
             "string-width": "^4.2.3",
             "y18n": "^5.0.5",
-            "yargs-parser": "^21.0.0"
+            "yargs-parser": "^21.1.1"
           }
         },
         "yargs-parser": {
@@ -2942,14 +2572,6 @@
       "requires": {
         "js-base64": "^2.4.9",
         "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-          "dev": true
-        }
       }
     },
     "semver": {
@@ -2992,9 +2614,9 @@
       "dev": true
     },
     "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz",
+      "integrity": "sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==",
       "dev": true
     },
     "smart-buffer": {
@@ -3004,9 +2626,9 @@
       "dev": true
     },
     "socks": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
-      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
+      "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
       "dev": true,
       "requires": {
         "ip": "^2.0.0",
@@ -3014,9 +2636,9 @@
       }
     },
     "socks-proxy-agent": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
-      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+      "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
       "dev": true,
       "requires": {
         "agent-base": "^6.0.2",
@@ -3025,9 +2647,9 @@
       }
     },
     "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true
     },
     "source-map-js": {
@@ -3068,33 +2690,10 @@
       "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
       "dev": true
     },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
     "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
+      "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
       "dev": true,
       "requires": {
         "minipass": "^3.1.1"
@@ -3110,9 +2709,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "version": "2.3.8",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -3235,19 +2834,33 @@
       }
     },
     "tar": {
-      "version": "6.1.11",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^3.0.0",
+        "minipass": "^4.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "minipass": {
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz",
+          "integrity": "sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==",
+          "dev": true
+        }
       }
     },
+    "thenby": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz",
+      "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
+      "dev": true
+    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -3257,16 +2870,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
     "trim-newlines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
@@ -3274,27 +2877,9 @@
       "dev": true
     },
     "true-case-path": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.2"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz",
+      "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==",
       "dev": true
     },
     "type-fest": {
@@ -3304,18 +2889,18 @@
       "dev": true
     },
     "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
+      "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
       "dev": true,
       "requires": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "^3.0.0"
       }
     },
     "unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
+      "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
       "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4"
@@ -3328,30 +2913,13 @@
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
-      "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
       "dev": true,
       "requires": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-          "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-          "dev": true
-        }
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
       }
     },
     "util-deprecate": {
@@ -3360,12 +2928,6 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@@ -3376,17 +2938,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -3453,6 +3004,12 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "yaml": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
+      "integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
+      "dev": true
+    },
     "yargs": {
       "version": "13.3.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
diff --git a/src/wp-content/themes/twentynineteen/package.json b/src/wp-content/themes/twentynineteen/package.json
index ea87b55ccae44..1c60fc1f0cbdc 100644
--- a/src/wp-content/themes/twentynineteen/package.json
+++ b/src/wp-content/themes/twentynineteen/package.json
@@ -1,19 +1,20 @@
 {
   "name": "twentynineteen",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "Default WP Theme",
   "bugs": {
     "url": "https://core.trac.wordpress.org/"
   },
   "homepage": "https://wordpress.org/themes/twentynineteen/",
   "devDependencies": {
-    "@wordpress/browserslist-config": "^5.1.0",
-    "autoprefixer": "^10.4.12",
+    "@wordpress/browserslist-config": "^5.9.0",
+    "autoprefixer": "^10.4.13",
     "chokidar-cli": "^3.0.0",
-    "node-sass": "^7.0.3",
+    "node-sass": "^8.0.0",
     "npm-run-all": "^4.1.5",
-    "postcss-cli": "^7.1.2",
-    "postcss-focus-within": "^4.0.0",
+    "postcss": "^8.4.21",
+    "postcss-cli": "^10.1.0",
+    "postcss-focus-within": "^7.0.2",
     "rtlcss": "^4.0.0"
   },
   "rtlcssConfig": {
@@ -23,7 +24,8 @@
       "clean": true,
       "greedy": false,
       "processUrls": false,
-      "stringMap": []
+      "stringMap": [],
+      "disablePolyfillReadyClass": true
     },
     "plugins": [],
     "map": false
diff --git a/src/wp-content/themes/twentynineteen/postcss.config.js b/src/wp-content/themes/twentynineteen/postcss.config.js
index 354d911430aae..ff4a27544dc88 100644
--- a/src/wp-content/themes/twentynineteen/postcss.config.js
+++ b/src/wp-content/themes/twentynineteen/postcss.config.js
@@ -8,6 +8,8 @@ module.exports = {
 
 module.exports = {
     plugins: [
-        postcssFocusWithin(/* pluginOptions */)
+        postcssFocusWithin({
+            disablePolyfillReadyClass: true
+        })
     ]
 };
diff --git a/src/wp-content/themes/twentynineteen/readme.txt b/src/wp-content/themes/twentynineteen/readme.txt
index d715fc373196e..68fbe944e09e0 100644
--- a/src/wp-content/themes/twentynineteen/readme.txt
+++ b/src/wp-content/themes/twentynineteen/readme.txt
@@ -1,9 +1,10 @@
 === Twenty Nineteen ===
 Contributors: wordpressdotorg
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
+Tags: one-column, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
 Requires at least: 4.9.6
-Tested up to: 6.1
-Stable tag: 2.4
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 2.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -12,19 +13,19 @@ Our 2019 default theme is designed to show off the power of the block editor.
 == Description ==
 Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.
 
-For more information about Twenty Nineteen please go to https://wordpress.org/support/article/twenty-nineteen/.
+For more information about Twenty Nineteen please go to https://wordpress.org/documentation/article/twenty-nineteen/.
 
 == Installation ==
 
 1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
 2. Type in Twenty Nineteen in the search form and press the 'Enter' key on your keyboard.
 3. Click on the 'Activate' button to use your new theme right away.
-4. Go to https://wordpress.org/support/article/twenty-nineteen/ for a guide on how to customize this theme.
+4. Go to https://wordpress.org/documentation/article/twenty-nineteen/ for a guide on how to customize this theme.
 5. Navigate to Appearance > Customize in your admin panel and customize to taste.
 
 == Copyright ==
 
-Twenty Nineteen WordPress Theme, Copyright 2018-2022 WordPress.org
+Twenty Nineteen WordPress Theme, Copyright 2018-2023 WordPress.org
 Twenty Nineteen is distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -39,6 +40,16 @@ GNU General Public License for more details.
 
 == Changelog ==
 
+= 2.6 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Nineteen_Theme_Changelog#Version_2.6
+
+= 2.5 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Nineteen_Theme_Changelog#Version_2.5
+
 = 2.4 =
 * Released: November 1, 2022
 
@@ -116,7 +127,7 @@ Initial release
 
 == Resources ==
 * normalize.css, © 2012-2018 Nicolas Gallagher and Jonathan Neal, MIT
-* Underscores, © 2012-2022 Automattic, Inc., GNU GPL v2 or later
+* Underscores, © 2012-2023 Automattic, Inc., GNU GPL v2 or later
 * Bundled block pattern images:
 	* Abstract Background by HD Wallpapers, CC0. https://stocksnap.io/photo/abstract-background-0SRRVNMKBX
 	* Abstract Waves by HD Wallpapers, CC0. https://stocksnap.io/photo/abstract-waves-0KREGLTZQ3
diff --git a/src/wp-content/themes/twentynineteen/sass/elements/_elements.scss b/src/wp-content/themes/twentynineteen/sass/elements/_elements.scss
index edc11cdf91eb3..d3120526b627a 100644
--- a/src/wp-content/themes/twentynineteen/sass/elements/_elements.scss
+++ b/src/wp-content/themes/twentynineteen/sass/elements/_elements.scss
@@ -16,10 +16,6 @@ html {
 	box-sizing: inherit;
 }
 
-body {
-	background-color: $color__background-body;
-}
-
 a {
 	@include link-transition;
 	color: $color__link;
diff --git a/src/wp-content/themes/twentynineteen/sass/typography/_typography.scss b/src/wp-content/themes/twentynineteen/sass/typography/_typography.scss
index 055b7a63d4c83..84438b2efaf9f 100644
--- a/src/wp-content/themes/twentynineteen/sass/typography/_typography.scss
+++ b/src/wp-content/themes/twentynineteen/sass/typography/_typography.scss
@@ -6,6 +6,7 @@ html {
 body {
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
+	background-color: $color__background-body;
 	color: $color__text-main;
 	@include font-family( $font__body );
 	font-weight: 400;
diff --git a/src/wp-content/themes/twentynineteen/single.php b/src/wp-content/themes/twentynineteen/single.php
index a2d7eac00e272..14a8ac5b54b8f 100644
--- a/src/wp-content/themes/twentynineteen/single.php
+++ b/src/wp-content/themes/twentynineteen/single.php
@@ -36,9 +36,11 @@
 					the_post_navigation(
 						array(
 							'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next Post', 'twentynineteen' ) . '</span> ' .
+								/* translators: Hidden accessibility text. */
 								'<span class="screen-reader-text">' . __( 'Next post:', 'twentynineteen' ) . '</span> <br/>' .
 								'<span class="post-title">%title</span>',
 							'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous Post', 'twentynineteen' ) . '</span> ' .
+								/* translators: Hidden accessibility text. */
 								'<span class="screen-reader-text">' . __( 'Previous post:', 'twentynineteen' ) . '</span> <br/>' .
 								'<span class="post-title">%title</span>',
 						)
diff --git a/src/wp-content/themes/twentynineteen/style-editor.css b/src/wp-content/themes/twentynineteen/style-editor.css
index 1e0bd6939013b..3a4ce4a6e6ae8 100644
--- a/src/wp-content/themes/twentynineteen/style-editor.css
+++ b/src/wp-content/themes/twentynineteen/style-editor.css
@@ -1276,6 +1276,31 @@ figcaption,
   padding-left: calc(2 * 1rem);
 }
 
+.wp-block-separator.has-primary-background-color {
+  color: #0073aa;
+  background-color: #0073aa;
+}
+
+.wp-block-separator.has-secondary-background-color {
+  color: #005177;
+  background-color: #005177;
+}
+
+.wp-block-separator.has-dark-gray-background-color {
+  color: #111;
+  background-color: #111;
+}
+
+.wp-block-separator.has-light-gray-background-color {
+  color: #767676;
+  background-color: #767676;
+}
+
+.wp-block-separator.has-white-background-color {
+  color: #fff;
+  background-color: #fff;
+}
+
 /* Remove duplicate rule-line when a separator
  * is followed by an H1, or H2 */
 .wp-block[data-type="core/separator"] + .wp-block[data-type="core/heading"] h1:before,
diff --git a/src/wp-content/themes/twentynineteen/style-editor.scss b/src/wp-content/themes/twentynineteen/style-editor.scss
index 8359aacacb39b..7b0df5f0af0f0 100644
--- a/src/wp-content/themes/twentynineteen/style-editor.scss
+++ b/src/wp-content/themes/twentynineteen/style-editor.scss
@@ -651,6 +651,31 @@ figcaption,
 		letter-spacing: calc(2 * #{$size__spacing-unit});
 		padding-left: calc(2 * #{$size__spacing-unit});
 	}
+
+	&.has-primary-background-color {
+		color: $color__link;
+		background-color: $color__link;
+	}
+
+	&.has-secondary-background-color {
+		color: $color__border-link-hover;
+		background-color: $color__border-link-hover;
+	}
+
+	&.has-dark-gray-background-color {
+		color: $color__text-main;
+		background-color: $color__text-main;
+	}
+
+	&.has-light-gray-background-color {
+		color: $color__text-light;
+		background-color: $color__text-light;
+	}
+
+	&.has-white-background-color {
+		color: #fff;
+		background-color: #fff;
+	}
 }
 
 /* Remove duplicate rule-line when a separator
diff --git a/src/wp-content/themes/twentynineteen/style-rtl.css b/src/wp-content/themes/twentynineteen/style-rtl.css
index 85a1dddf13f29..25a5df5f18c08 100644
--- a/src/wp-content/themes/twentynineteen/style-rtl.css
+++ b/src/wp-content/themes/twentynineteen/style-rtl.css
@@ -5,14 +5,14 @@ Theme URI: https://wordpress.org/themes/twentynineteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.
-Tested up to: 6.1
+Tested up to: 6.3
 Requires at least: 4.9.6
 Requires PHP: 5.2.4
-Version: 2.4
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentynineteen
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
+Tags: one-column, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -2219,6 +2219,7 @@ html {
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  background-color: #fff;
   color: #111;
   font-family: "NonBreakingSpaceOverride", "Hoefler Text", Garamond, "Times New Roman", serif;
   font-weight: 400;
@@ -2493,10 +2494,6 @@ html {
   box-sizing: inherit;
 }
 
-body {
-  background-color: #fff;
-}
-
 a {
   transition: color 110ms ease-in-out;
   color: #0073aa;
diff --git a/src/wp-content/themes/twentynineteen/style.css b/src/wp-content/themes/twentynineteen/style.css
index 42e966189ae4a..3deb24fbd0e56 100644
--- a/src/wp-content/themes/twentynineteen/style.css
+++ b/src/wp-content/themes/twentynineteen/style.css
@@ -5,14 +5,14 @@ Theme URI: https://wordpress.org/themes/twentynineteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.
-Tested up to: 6.1
+Tested up to: 6.3
 Requires at least: 4.9.6
 Requires PHP: 5.2.4
-Version: 2.4
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentynineteen
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
+Tags: one-column, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
@@ -2219,6 +2219,7 @@ html {
 body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  background-color: #fff;
   color: #111;
   font-family: "NonBreakingSpaceOverride", "Hoefler Text", Garamond, "Times New Roman", serif;
   font-weight: 400;
@@ -2493,10 +2494,6 @@ html {
   box-sizing: inherit;
 }
 
-body {
-  background-color: #fff;
-}
-
 a {
   transition: color 110ms ease-in-out;
   color: #0073aa;
diff --git a/src/wp-content/themes/twentynineteen/style.scss b/src/wp-content/themes/twentynineteen/style.scss
index 67fb852eeb60a..898a8e9feff6d 100644
--- a/src/wp-content/themes/twentynineteen/style.scss
+++ b/src/wp-content/themes/twentynineteen/style.scss
@@ -4,14 +4,14 @@ Theme URI: https://wordpress.org/themes/twentynineteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.
-Tested up to: 6.1
+Tested up to: 6.3
 Requires at least: 4.9.6
 Requires PHP: 5.2.4
-Version: 2.4
+Version: 2.6
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentynineteen
-Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
+Tags: one-column, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, threaded-comments, translation-ready, block-patterns
 
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
diff --git a/src/wp-content/themes/twentyseventeen/archive.php b/src/wp-content/themes/twentyseventeen/archive.php
index 05737b24c20b6..8afccde627b57 100644
--- a/src/wp-content/themes/twentyseventeen/archive.php
+++ b/src/wp-content/themes/twentyseventeen/archive.php
@@ -46,8 +46,11 @@
 
 			the_posts_pagination(
 				array(
+					/* translators: Hidden accessibility text. */
 					'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+					/* translators: Hidden accessibility text. */
 					'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css b/src/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
index 69bd59492a90b..4b785b6b48cad 100644
--- a/src/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
+++ b/src/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
@@ -391,7 +391,7 @@ html[lang="th"] .edit-post-visual-editor * {
 	padding: 0;
 }
 
-.edit-post-visual-editor ul:not(.wp-block-gallery),
+.edit-post-visual-editor ul:not(.wp-block-gallery, .wp-block-post-template),
 .editor-block-list__block ul:not(.wp-block-gallery),
 .block-library-list ul {
 	list-style: disc;
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/font-libre-franklin.css b/src/wp-content/themes/twentyseventeen/assets/fonts/font-libre-franklin.css
new file mode 100644
index 0000000000000..1ea1ae57860a1
--- /dev/null
+++ b/src/wp-content/themes/twentyseventeen/assets/fonts/font-libre-franklin.css
@@ -0,0 +1,293 @@
+/*
+Libre Franklin
+Copyright 2020 The LibreFranklin Project Authors (https://github.com/impallari/Libre-Franklin)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* libre-franklin-vietnamese-300-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-300-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-normal.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-300-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-300-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-normal.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-300-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-latin-300-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-normal.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-300-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-300-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-italic.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-300-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-300-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-italic.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-300-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./libre-franklin/libre-franklin-latin-300-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-300-italic.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-400-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-400-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-normal.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-400-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-400-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-normal.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-400-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-latin-400-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-normal.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-400-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-400-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-italic.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-400-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-400-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-italic.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-400-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./libre-franklin/libre-franklin-latin-400-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-400-italic.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-600-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-600-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-normal.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-600-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-600-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-normal.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-600-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-latin-600-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-normal.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-600-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-600-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-italic.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-600-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-600-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-italic.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-600-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 600;
+	src:
+		url('./libre-franklin/libre-franklin-latin-600-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-600-italic.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-800-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-800-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-normal.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-800-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-800-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-normal.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-800-normal */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-latin-800-normal.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-normal.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* libre-franklin-vietnamese-800-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-vietnamese-800-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-italic.woff?ver=13') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* libre-franklin-latin-ext-800-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-latin-ext-800-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-italic.woff?ver=13') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* libre-franklin-latin-800-italic */
+@font-face {
+	font-family: 'Libre Franklin';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 800;
+	src:
+		url('./libre-franklin/libre-franklin-latin-800-italic.woff2?ver=13') format('woff2'),
+		url('./libre-franklin/libre-franklin-all-800-italic.woff?ver=13') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/LICENSE.txt b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/LICENSE.txt
new file mode 100644
index 0000000000000..8ebded2f2457e
--- /dev/null
+++ b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2020 The LibreFranklin Project Authors (https://github.com/impallari/Libre-Franklin)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-italic.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-italic.woff
new file mode 100644
index 0000000000000..2f95fef864010
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-italic.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-normal.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-normal.woff
new file mode 100644
index 0000000000000..e353e12a048b5
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-300-normal.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-italic.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-italic.woff
new file mode 100644
index 0000000000000..b26e1ee042caa
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-normal.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-normal.woff
new file mode 100644
index 0000000000000..dc8b33884c423
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-italic.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-italic.woff
new file mode 100644
index 0000000000000..3df366ca863d3
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-italic.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-normal.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-normal.woff
new file mode 100644
index 0000000000000..eb90fbb48f0c5
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-600-normal.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-italic.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-italic.woff
new file mode 100644
index 0000000000000..f193595aff8f9
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-italic.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-normal.woff b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-normal.woff
new file mode 100644
index 0000000000000..6aff79015dc00
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-all-800-normal.woff differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-italic.woff2
new file mode 100644
index 0000000000000..df4e8e748f9b4
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-normal.woff2
new file mode 100644
index 0000000000000..f222fdf0fe8fa
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-italic.woff2
new file mode 100644
index 0000000000000..2c679d2273fa7
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-normal.woff2
new file mode 100644
index 0000000000000..982f904f0210a
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-italic.woff2
new file mode 100644
index 0000000000000..b194dc0d8041c
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-normal.woff2
new file mode 100644
index 0000000000000..3b1817970d906
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-600-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-italic.woff2
new file mode 100644
index 0000000000000..32d8140e0d638
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-normal.woff2
new file mode 100644
index 0000000000000..0e418e2bf1c62
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-800-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-italic.woff2
new file mode 100644
index 0000000000000..0d949e19fbea4
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-normal.woff2
new file mode 100644
index 0000000000000..38fe815de0776
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..4582bd011e606
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..e24c1102cb0fd
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-italic.woff2
new file mode 100644
index 0000000000000..110f308f24efe
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-normal.woff2
new file mode 100644
index 0000000000000..364842dde72ae
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-600-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-italic.woff2
new file mode 100644
index 0000000000000..01b66425eb3f5
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-normal.woff2
new file mode 100644
index 0000000000000..66d1294fbdb6c
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-latin-ext-800-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-italic.woff2
new file mode 100644
index 0000000000000..1d11aa76b1440
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-normal.woff2
new file mode 100644
index 0000000000000..22468f29e505d
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..4ad4d8ae80635
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..4597f736b6201
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-italic.woff2
new file mode 100644
index 0000000000000..efe12cd02d6e0
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-normal.woff2
new file mode 100644
index 0000000000000..3819f3b7feac0
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-600-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-italic.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-italic.woff2
new file mode 100644
index 0000000000000..aed97215fc75d
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-italic.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-normal.woff2 b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-normal.woff2
new file mode 100644
index 0000000000000..23742325ea4d5
Binary files /dev/null and b/src/wp-content/themes/twentyseventeen/assets/fonts/libre-franklin/libre-franklin-vietnamese-800-normal.woff2 differ
diff --git a/src/wp-content/themes/twentyseventeen/assets/js/html5.js b/src/wp-content/themes/twentyseventeen/assets/js/html5.js
index 9c1f049556e95..45ea723dd5820 100644
--- a/src/wp-content/themes/twentyseventeen/assets/js/html5.js
+++ b/src/wp-content/themes/twentyseventeen/assets/js/html5.js
@@ -323,4 +323,4 @@
     module.exports = html5;
   }
 
-}(typeof window !== "undefined" ? window : this, document));
\ No newline at end of file
+}(typeof window !== "undefined" ? window : this, document));
diff --git a/src/wp-content/themes/twentyseventeen/comments.php b/src/wp-content/themes/twentyseventeen/comments.php
index f979992005b40..a5ee2a54531bb 100644
--- a/src/wp-content/themes/twentyseventeen/comments.php
+++ b/src/wp-content/themes/twentyseventeen/comments.php
@@ -68,7 +68,9 @@
 		<?php
 		the_comments_pagination(
 			array(
+				/* translators: Hidden accessibility text. */
 				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous', 'twentyseventeen' ) . '</span>',
+				/* translators: Hidden accessibility text. */
 				'next_text' => '<span class="screen-reader-text">' . __( 'Next', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
 			)
 		);
diff --git a/src/wp-content/themes/twentyseventeen/front-page.php b/src/wp-content/themes/twentyseventeen/front-page.php
index ceeb10037c20f..bf490b7e40d25 100644
--- a/src/wp-content/themes/twentyseventeen/front-page.php
+++ b/src/wp-content/themes/twentyseventeen/front-page.php
@@ -38,6 +38,8 @@
 			 *
 			 * @since Twenty Seventeen 1.0
 			 *
+			 * @global int|string $twentyseventeencounter Front page section counter.
+			 *
 			 * @param int $num_sections Number of front page sections.
 			 */
 			$num_sections = apply_filters( 'twentyseventeen_front_page_sections', 4 );
diff --git a/src/wp-content/themes/twentyseventeen/functions.php b/src/wp-content/themes/twentyseventeen/functions.php
index 285917cc54e82..83964158b16e9 100644
--- a/src/wp-content/themes/twentyseventeen/functions.php
+++ b/src/wp-content/themes/twentyseventeen/functions.php
@@ -25,13 +25,6 @@
  * as indicating support for post thumbnails.
  */
 function twentyseventeen_setup() {
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyseventeen
-	 * If you're building a theme based on Twenty Seventeen, use a find and replace
-	 * to change 'twentyseventeen' to the name of your theme in all the template files.
-	 */
-	load_theme_textdomain( 'twentyseventeen' );
 
 	// Add default posts and comments RSS feed links to head.
 	add_theme_support( 'automatic-feed-links' );
@@ -91,7 +84,7 @@ function twentyseventeen_setup() {
 	/*
 	 * Enable support for Post Formats.
 	 *
-	 * See: https://wordpress.org/support/article/post-formats/
+	 * See: https://wordpress.org/documentation/article/post-formats/
 	 */
 	add_theme_support(
 		'post-formats',
@@ -121,9 +114,15 @@ function twentyseventeen_setup() {
 
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, and column width.
-	  */
-	add_editor_style( array( 'assets/css/editor-style.css', twentyseventeen_fonts_url() ) );
+	 * specifically font, colors, and column width. When fonts are
+	 * self-hosted, the theme directory needs to be removed first.
+	 */
+	$font_stylesheet = str_replace(
+		array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+		'',
+		twentyseventeen_fonts_url()
+	);
+	add_editor_style( array( 'assets/css/editor-style.css', $font_stylesheet ) );
 
 	// Load regular editor styles into the new block-based editor.
 	add_theme_support( 'editor-styles' );
@@ -283,39 +282,37 @@ function twentyseventeen_content_width() {
 }
 add_action( 'template_redirect', 'twentyseventeen_content_width', 0 );
 
-/**
- * Register custom fonts.
- */
-function twentyseventeen_fonts_url() {
-	$fonts_url = '';
-
-	/*
-	 * translators: If there are characters in your language that are not supported
-	 * by Libre Franklin, translate this to 'off'. Do not translate into your own language.
+if ( ! function_exists( 'twentyseventeen_fonts_url' ) ) :
+	/**
+	 * Register custom fonts.
+	 *
+	 * @since Twenty Seventeen 1.0
+	 * @since Twenty Seventeen 3.2 Replaced Google URL with self-hosted fonts.
+	 *
+	 * @return string Fonts URL for the theme.
 	 */
-	$libre_franklin = _x( 'on', 'Libre Franklin font: on or off', 'twentyseventeen' );
-
-	if ( 'off' !== $libre_franklin ) {
-		$font_families = array();
+	function twentyseventeen_fonts_url() {
+		$fonts_url = '';
 
-		$font_families[] = 'Libre Franklin:300,300i,400,400i,600,600i,800,800i';
+		/*
+		 * translators: If there are characters in your language that are not supported
+		 * by Libre Franklin, translate this to 'off'. Do not translate into your own language.
+		 */
+		$libre_franklin = _x( 'on', 'Libre Franklin font: on or off', 'twentyseventeen' );
 
-		$query_args = array(
-			'family'  => urlencode( implode( '|', $font_families ) ),
-			'subset'  => urlencode( 'latin,latin-ext' ),
-			'display' => urlencode( 'fallback' ),
-		);
+		if ( 'off' !== $libre_franklin ) {
+			$fonts_url = get_template_directory_uri() . '/assets/fonts/font-libre-franklin.css';
+		}
 
-		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		return esc_url_raw( $fonts_url );
 	}
-
-	return esc_url_raw( $fonts_url );
-}
+endif;
 
 /**
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Seventeen 1.0
+ * @deprecated Twenty Seventeen 3.2 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array  $urls          URLs to print for resource hints.
  * @param string $relation_type The relation type the URLs are printed.
@@ -331,7 +328,7 @@ function twentyseventeen_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentyseventeen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentyseventeen_resource_hints', 10, 2 );
 
 /**
  * Register widget area.
@@ -451,10 +448,11 @@ function twentyseventeen_colors_css_wrap() {
  */
 function twentyseventeen_scripts() {
 	// Add custom fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyseventeen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), $font_version );
 
 	// Theme stylesheet.
-	wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
 	wp_enqueue_style( 'twentyseventeen-block-style', get_theme_file_uri( '/assets/css/blocks.css' ), array( 'twentyseventeen-style' ), '20220912' );
@@ -464,21 +462,24 @@ function twentyseventeen_scripts() {
 		wp_enqueue_style( 'twentyseventeen-colors-dark', get_theme_file_uri( '/assets/css/colors-dark.css' ), array( 'twentyseventeen-style' ), '20191025' );
 	}
 
-	// Load the Internet Explorer 9 specific stylesheet, to fix display issues in the Customizer.
+	// Register the Internet Explorer 9 specific stylesheet, to fix display issues in the Customizer.
 	if ( is_customize_preview() ) {
-		wp_enqueue_style( 'twentyseventeen-ie9', get_theme_file_uri( '/assets/css/ie9.css' ), array( 'twentyseventeen-style' ), '20161202' );
+		wp_register_style( 'twentyseventeen-ie9', get_theme_file_uri( '/assets/css/ie9.css' ), array( 'twentyseventeen-style' ), '20161202' );
 		wp_style_add_data( 'twentyseventeen-ie9', 'conditional', 'IE 9' );
 	}
 
-	// Load the Internet Explorer 8 specific stylesheet.
-	wp_enqueue_style( 'twentyseventeen-ie8', get_theme_file_uri( '/assets/css/ie8.css' ), array( 'twentyseventeen-style' ), '20161202' );
+	// Register the Internet Explorer 8 specific stylesheet.
+	wp_register_style( 'twentyseventeen-ie8', get_theme_file_uri( '/assets/css/ie8.css' ), array( 'twentyseventeen-style' ), '20161202' );
 	wp_style_add_data( 'twentyseventeen-ie8', 'conditional', 'lt IE 9' );
 
-	// Load the html5 shiv.
-	wp_enqueue_script( 'html5', get_theme_file_uri( '/assets/js/html5.js' ), array(), '20161020' );
+	// Register the html5 shiv.
+	wp_register_script( 'html5', get_theme_file_uri( '/assets/js/html5.js' ), array(), '20161020' );
 	wp_script_add_data( 'html5', 'conditional', 'lt IE 9' );
 
-	wp_enqueue_script( 'twentyseventeen-skip-link-focus-fix', get_theme_file_uri( '/assets/js/skip-link-focus-fix.js' ), array(), '20161114', true );
+	// Skip-link fix is no longer enqueued by default.
+	wp_register_script( 'twentyseventeen-skip-link-focus-fix', get_theme_file_uri( '/assets/js/skip-link-focus-fix.js' ), array(), '20161114', true );
+
+	wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '20211130', true );
 
 	$twentyseventeen_l10n = array(
 		'quote' => twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ),
@@ -496,12 +497,10 @@ function twentyseventeen_scripts() {
 		);
 	}
 
-	wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '20211130', true );
+	wp_localize_script( 'twentyseventeen-global', 'twentyseventeenScreenReaderText', $twentyseventeen_l10n );
 
 	wp_enqueue_script( 'jquery-scrollto', get_theme_file_uri( '/assets/js/jquery.scrollTo.js' ), array( 'jquery' ), '2.1.3', true );
 
-	wp_localize_script( 'twentyseventeen-skip-link-focus-fix', 'twentyseventeenScreenReaderText', $twentyseventeen_l10n );
-
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
 	}
@@ -515,9 +514,10 @@ function twentyseventeen_scripts() {
  */
 function twentyseventeen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20220912' );
+	wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '20230614' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentyseventeen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyseventeen_block_editor_styles' );
 
diff --git a/src/wp-content/themes/twentyseventeen/header.php b/src/wp-content/themes/twentyseventeen/header.php
index 5a8e88879fcd3..2fd53739a63fa 100644
--- a/src/wp-content/themes/twentyseventeen/header.php
+++ b/src/wp-content/themes/twentyseventeen/header.php
@@ -25,7 +25,12 @@
 <body <?php body_class(); ?>>
 <?php wp_body_open(); ?>
 <div id="page" class="site">
-	<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentyseventeen' ); ?></a>
+	<a class="skip-link screen-reader-text" href="#content">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Skip to content', 'twentyseventeen' );
+		?>
+	</a>
 
 	<header id="masthead" class="site-header">
 
diff --git a/src/wp-content/themes/twentyseventeen/inc/custom-header.php b/src/wp-content/themes/twentyseventeen/inc/custom-header.php
index 24678dcd024d9..33aa87c7b4ea8 100644
--- a/src/wp-content/themes/twentyseventeen/inc/custom-header.php
+++ b/src/wp-content/themes/twentyseventeen/inc/custom-header.php
@@ -124,7 +124,9 @@ function twentyseventeen_header_style() {
  * @return array The filtered video settings.
  */
 function twentyseventeen_video_controls( $settings ) {
-	$settings['l10n']['play']  = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
+	/* translators: Hidden accessibility text. */
+	$settings['l10n']['play'] = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
+	/* translators: Hidden accessibility text. */
 	$settings['l10n']['pause'] = '<span class="screen-reader-text">' . __( 'Pause background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'pause' ) );
 	return $settings;
 }
diff --git a/src/wp-content/themes/twentyseventeen/inc/customizer.php b/src/wp-content/themes/twentyseventeen/inc/customizer.php
index 635212cf27379..43863d0dc90dc 100644
--- a/src/wp-content/themes/twentyseventeen/inc/customizer.php
+++ b/src/wp-content/themes/twentyseventeen/inc/customizer.php
@@ -144,7 +144,7 @@ function twentyseventeen_customize_register( $wp_customize ) {
 				'section'         => 'theme_options',
 				'type'            => 'dropdown-pages',
 				'allow_addition'  => true,
-				'active_callback' => 'twentyseventeen_is_static_front_page',
+				'active_callback' => 'twentyseventeen_is_frontpage',
 			)
 		);
 
@@ -221,9 +221,16 @@ function twentyseventeen_customize_partial_blogdescription() {
 
 /**
  * Return whether we're previewing the front page and it's a static page.
+ *
+ * This function is an alias for twentyseventeen_is_frontpage().
+ *
+ * @since Twenty Seventeen 1.0
+ * @since Twenty Seventeen 3.3 Converted function to an alias.
+ *
+ * @return bool Whether the current page is the front page and static.
  */
 function twentyseventeen_is_static_front_page() {
-	return ( is_front_page() && ! is_home() );
+	return twentyseventeen_is_frontpage();
 }
 
 /**
diff --git a/src/wp-content/themes/twentyseventeen/inc/icon-functions.php b/src/wp-content/themes/twentyseventeen/inc/icon-functions.php
index 82a1ebedcc2e0..b25428fb1dd00 100644
--- a/src/wp-content/themes/twentyseventeen/inc/icon-functions.php
+++ b/src/wp-content/themes/twentyseventeen/inc/icon-functions.php
@@ -130,7 +130,7 @@ function twentyseventeen_nav_menu_social_icons( $item_output, $item, $depth, $ar
 	// Change SVG icon inside social links menu if there is supported URL.
 	if ( 'social' === $args->theme_location ) {
 		foreach ( $social_icons as $attr => $value ) {
-			if ( false !== strpos( $item_output, $attr ) ) {
+			if ( str_contains( $item_output, $attr ) ) {
 				$item_output = str_replace( $args->link_after, '</span>' . twentyseventeen_get_svg( array( 'icon' => esc_attr( $value ) ) ), $item_output );
 			}
 		}
diff --git a/src/wp-content/themes/twentyseventeen/inc/template-functions.php b/src/wp-content/themes/twentyseventeen/inc/template-functions.php
index 8ccc393b074ad..2c2e9504cced5 100644
--- a/src/wp-content/themes/twentyseventeen/inc/template-functions.php
+++ b/src/wp-content/themes/twentyseventeen/inc/template-functions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Additional features to allow styling of the templates
+ * Additional features to allow styling of the templates.
  *
  * @package WordPress
  * @subpackage Twenty_Seventeen
@@ -67,9 +67,11 @@ function twentyseventeen_body_classes( $classes ) {
 add_filter( 'body_class', 'twentyseventeen_body_classes' );
 
 /**
- * Count our number of active panels.
+ * Counts the number of our active panels.
  *
- * Primarily used to see if we have any panels active, duh.
+ * Primarily used to see if we have any panels active.
+ *
+ * @return int The number of active panels.
  */
 function twentyseventeen_panel_count() {
 
@@ -95,7 +97,9 @@ function twentyseventeen_panel_count() {
 }
 
 /**
- * Checks to see if we're on the front page or not.
+ * Checks to see if we are on the front page or not.
+ *
+ * @return bool Whether we are on the front page or not.
  */
 function twentyseventeen_is_frontpage() {
 	return ( is_front_page() && ! is_home() );
diff --git a/src/wp-content/themes/twentyseventeen/inc/template-tags.php b/src/wp-content/themes/twentyseventeen/inc/template-tags.php
index fcbdae1785507..cd0afb7e3e403 100644
--- a/src/wp-content/themes/twentyseventeen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyseventeen/inc/template-tags.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Custom template tags for this theme
+ * Custom template tags for this theme.
  *
  * Eventually, some of the functionality here could be replaced by core features.
  *
@@ -70,7 +70,7 @@ function twentyseventeen_entry_footer() {
 		// Get Tags for posts.
 		$tags_list = get_the_tag_list( '', $separate_meta );
 
-		// We don't want to output .entry-footer if it will be empty, so make sure its not.
+		// We don't want to output .entry-footer if it will be empty, so make sure it is not.
 		if ( ( ( twentyseventeen_categorized_blog() && $categories_list ) || $tags_list ) || get_edit_post_link() ) {
 
 			echo '<footer class="entry-footer">';
@@ -81,11 +81,19 @@ function twentyseventeen_entry_footer() {
 
 					// Make sure there's more than one category before displaying.
 					if ( $categories_list && twentyseventeen_categorized_blog() ) {
-						echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
+						echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) .
+							/* translators: Hidden accessibility text. */
+							'<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' .
+							$categories_list .
+						'</span>';
 					}
 
 					if ( $tags_list && ! is_wp_error( $tags_list ) ) {
-						echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
+						echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) .
+							/* translators: Hidden accessibility text. */
+							'<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' .
+							$tags_list .
+						'</span>';
 					}
 
 					echo '</span>';
@@ -104,7 +112,7 @@ function twentyseventeen_entry_footer() {
 	/**
 	 * Returns an accessibility-friendly link to edit a post or page.
 	 *
-	 * This also gives us a little context about what exactly we're editing
+	 * This also gives a little context about what exactly we're editing
 	 * (post or page?) so that users understand a bit more where they are in terms
 	 * of the template hierarchy and their content. Helpful when/if the single-page
 	 * layout with multiple posts/pages shown gets confusing.
@@ -123,13 +131,16 @@ function twentyseventeen_edit_link() {
 endif;
 
 /**
- * Display a front page section.
+ * Displays a front page section.
+ *
+ * @global int|string $twentyseventeencounter Front page section counter.
+ * @global WP_Post    $post                   Global post object.
  *
  * @param WP_Customize_Partial $partial Partial associated with a selective refresh request.
- * @param int                  $id Front page section to display.
+ * @param int                  $id      Front page section to display.
  */
 function twentyseventeen_front_page_section( $partial = null, $id = 0 ) {
-	if ( is_a( $partial, 'WP_Customize_Partial' ) ) {
+	if ( $partial instanceof WP_Customize_Partial ) {
 		// Find out the ID and set it up during a selective refresh.
 		global $twentyseventeencounter;
 
@@ -194,7 +205,7 @@ function twentyseventeen_categorized_blog() {
 
 
 /**
- * Flush out the transients used in twentyseventeen_categorized_blog.
+ * Flushes out the transients used in twentyseventeen_categorized_blog.
  */
 function twentyseventeen_category_transient_flusher() {
 	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
@@ -208,7 +219,7 @@ function twentyseventeen_category_transient_flusher() {
 
 if ( ! function_exists( 'wp_body_open' ) ) :
 	/**
-	 * Fire the wp_body_open action.
+	 * Fires the wp_body_open action.
 	 *
 	 * Added for backward compatibility to support pre-5.2.0 WordPress versions.
 	 *
@@ -216,7 +227,7 @@ function twentyseventeen_category_transient_flusher() {
 	 */
 	function wp_body_open() {
 		/**
-		 * Triggered after the opening <body> tag.
+		 * Fires after the opening <body> tag.
 		 *
 		 * @since Twenty Seventeen 2.2
 		 */
diff --git a/src/wp-content/themes/twentyseventeen/index.php b/src/wp-content/themes/twentyseventeen/index.php
index 21964295f1ce2..dcdc1983bdeb8 100644
--- a/src/wp-content/themes/twentyseventeen/index.php
+++ b/src/wp-content/themes/twentyseventeen/index.php
@@ -50,8 +50,11 @@
 
 				the_posts_pagination(
 					array(
+						/* translators: Hidden accessibility text. */
 						'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+						/* translators: Hidden accessibility text. */
 						'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+						/* translators: Hidden accessibility text. */
 						'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
 					)
 				);
diff --git a/src/wp-content/themes/twentyseventeen/readme.txt b/src/wp-content/themes/twentyseventeen/readme.txt
index 129cc5d6d3f06..fff8c09b46d7f 100644
--- a/src/wp-content/themes/twentyseventeen/readme.txt
+++ b/src/wp-content/themes/twentyseventeen/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Seventeen ===
 Contributors: wordpressdotorg
-Tested up to: 6.1
-Version: 3.1
+Requires at least: 4.7
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Version: 3.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-ready, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, block-patterns
@@ -10,19 +12,19 @@ Tags: one-column, two-columns, right-sidebar, flexible-header, accessibility-rea
 
 Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
 
-For more information about Twenty Seventeen please go to https://wordpress.org/support/article/twenty-seventeen/.
+For more information about Twenty Seventeen please go to https://wordpress.org/documentation/article/twenty-seventeen/.
 
 == Installation ==
 
 1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
 2. Type in Twenty Seventeen in the search form and press the 'Enter' key on your keyboard.
 3. Click on the 'Activate' button to use your new theme right away.
-4. Go to https://wordpress.org/support/article/twenty-seventeen/ for a guide on how to customize this theme.
+4. Go to https://wordpress.org/documentation/article/twenty-seventeen/ for a guide on how to customize this theme.
 5. Navigate to Appearance > Customize in your admin panel and customize to taste.
 
 == Copyright ==
 
-Twenty Seventeen WordPress Theme, Copyright 2016-2022 WordPress.org
+Twenty Seventeen WordPress Theme, Copyright 2016-2023 WordPress.org
 Twenty Seventeen is distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -53,6 +55,11 @@ Font Awesome icons, Copyright Dave Gandy
 License: SIL Open Font License, version 1.1.
 Source: http://fontawesome.io/
 
+Libre Franklin Font
+Copyright 2020 The LibreFranklin Project Authors (https://github.com/impallari/Libre-Franklin)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/libre-franklin
+
 Bundled header image, Copyright Alvin Engler
 License: CC0 1.0 Universal (CC0 1.0)
 Source: https://unsplash.com/@englr?photo=bIhpiQA009k
@@ -68,6 +75,16 @@ Source: https://stocksnap.io/photo/striped-fabric-9CBVWF2CDU
 
 == Changelog ==
 
+= 3.3 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Seventeen_Theme_Changelog#Version_3.3
+
+= 3.2 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Seventeen_Theme_Changelog#Version_3.2
+
 = 3.1 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentyseventeen/search.php b/src/wp-content/themes/twentyseventeen/search.php
index 248e387ff5423..5bf77c009cf6d 100644
--- a/src/wp-content/themes/twentyseventeen/search.php
+++ b/src/wp-content/themes/twentyseventeen/search.php
@@ -47,8 +47,11 @@
 
 			the_posts_pagination(
 				array(
+					/* translators: Hidden accessibility text. */
 					'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+					/* translators: Hidden accessibility text. */
 					'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentyseventeen/searchform.php b/src/wp-content/themes/twentyseventeen/searchform.php
index ce487e39e94a1..7dd83b579ed88 100644
--- a/src/wp-content/themes/twentyseventeen/searchform.php
+++ b/src/wp-content/themes/twentyseventeen/searchform.php
@@ -14,8 +14,18 @@
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label for="<?php echo $unique_id; ?>">
-		<span class="screen-reader-text"><?php echo _x( 'Search for:', 'label', 'twentyseventeen' ); ?></span>
+		<span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			echo _x( 'Search for:', 'label', 'twentyseventeen' );
+			?>
+		</span>
 	</label>
 	<input type="search" id="<?php echo $unique_id; ?>" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentyseventeen' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
-	<button type="submit" class="search-submit"><?php echo twentyseventeen_get_svg( array( 'icon' => 'search' ) ); ?><span class="screen-reader-text"><?php echo _x( 'Search', 'submit button', 'twentyseventeen' ); ?></span></button>
+	<button type="submit" class="search-submit"><?php echo twentyseventeen_get_svg( array( 'icon' => 'search' ) ); ?><span class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		echo _x( 'Search', 'submit button', 'twentyseventeen' );
+		?>
+	</span></button>
 </form>
diff --git a/src/wp-content/themes/twentyseventeen/single.php b/src/wp-content/themes/twentyseventeen/single.php
index 9f8bcf0a76f6f..7fe1bc64891d5 100644
--- a/src/wp-content/themes/twentyseventeen/single.php
+++ b/src/wp-content/themes/twentyseventeen/single.php
@@ -30,7 +30,9 @@
 
 				the_post_navigation(
 					array(
+						/* translators: Hidden accessibility text. */
 						'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
+						/* translators: Hidden accessibility text. */
 						'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
 					)
 				);
diff --git a/src/wp-content/themes/twentyseventeen/style.css b/src/wp-content/themes/twentyseventeen/style.css
index 8a1bb68375cf8..072d8f17508a4 100644
--- a/src/wp-content/themes/twentyseventeen/style.css
+++ b/src/wp-content/themes/twentyseventeen/style.css
@@ -4,8 +4,8 @@ Theme URI: https://wordpress.org/themes/twentyseventeen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Seventeen brings your site to life with header video and immersive featured images. With a focus on business sites, it features multiple sections on the front page as well as widgets, navigation and social menus, a logo, and more. Personalize its asymmetrical grid with a custom color scheme and showcase your multimedia content with post formats. Our default theme for 2017 works great in many languages, for any abilities, and on any device.
-Version: 3.1
-Tested up to: 6.1
+Version: 3.3
+Tested up to: 6.3
 Requires at least: 4.7
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
@@ -597,11 +597,11 @@ html[lang="azb"] button,
 html[lang="azb"] input,
 html[lang="azb"] select,
 html[lang="azb"] textarea,
-html[lang="fa-IR"] body,
-html[lang="fa-IR"] button,
-html[lang="fa-IR"] input,
-html[lang="fa-IR"] select,
-html[lang="fa-IR"] textarea,
+html[lang^="fa-"] body,
+html[lang^="fa-"] button,
+html[lang^="fa-"] input,
+html[lang^="fa-"] select,
+html[lang^="fa-"] textarea,
 html[lang="haz"] body,
 html[lang="haz"] button,
 html[lang="haz"] input,
@@ -638,12 +638,12 @@ html[lang="azb"] h3,
 html[lang="azb"] h4,
 html[lang="azb"] h5,
 html[lang="azb"] h6,
-html[lang="fa-IR"] h1,
-html[lang="fa-IR"] h2,
-html[lang="fa-IR"] h3,
-html[lang="fa-IR"] h4,
-html[lang="fa-IR"] h5,
-html[lang="fa-IR"] h6,
+html[lang^="fa-"] h1,
+html[lang^="fa-"] h2,
+html[lang^="fa-"] h3,
+html[lang^="fa-"] h4,
+html[lang^="fa-"] h5,
+html[lang^="fa-"] h6,
 html[lang="haz"] h1,
 html[lang="haz"] h2,
 html[lang="haz"] h3,
@@ -897,8 +897,10 @@ html[lang="th"] textarea {
 html[lang="ar"] *,
 html[lang="ary"] *,
 html[lang="azb"] *,
+html[lang^="fa-"] *,
 html[lang="haz"] *,
 html[lang="ps"] *,
+html[lang="ur"] *,
 html[lang^="zh-"] *,
 html[lang="bg-BG"] *,
 html[lang="ru-RU"] *,
@@ -1684,7 +1686,6 @@ body:not(.title-tagline-hidden) .site-branding-text {
 	background: -moz-linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 75%, rgba(0, 0, 0, 0.3) 100%); /* FF3.6-15 */
 	background: -webkit-linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 75%, rgba(0, 0, 0, 0.3) 100%); /* Chrome10-25,Safari5.1-6 */
 	background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 75%, rgba(0, 0, 0, 0.3) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000", endColorstr="#4d000000", GradientType=0); /* IE6-9 */
 	bottom: 0;
 	content: "";
 	display: block;
@@ -1810,7 +1811,6 @@ body:not(.has-header-image):not(.has-header-video) .custom-header-media {
 	background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.3)));
 	background: -webkit-linear-gradient(to top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 100%);
 	background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.3) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#00000000", endColorstr="#4d000000", GradientType=0); /* IE6-9 */
 	bottom: 0;
 	content: "";
 	left: 0;
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php b/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
index d605a5e0f4f57..b78898253fab0 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php
@@ -31,7 +31,12 @@
 		</div><!-- .site-branding-text -->
 
 		<?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && ! has_nav_menu( 'top' ) ) : ?>
-		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>
+		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Scroll down to content', 'twentyseventeen' );
+			?>
+		</span></a>
 	<?php endif; ?>
 
 	</div><!-- .wrap -->
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php b/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
index d7c2f4c118210..487a90bb988a5 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
@@ -28,6 +28,11 @@
 	?>
 
 	<?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
-		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>
+		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Scroll down to content', 'twentyseventeen' );
+			?>
+		</span></a>
 	<?php endif; ?>
 </nav><!-- #site-navigation -->
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php b/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
index eea60e6c7c1d8..d50ce9f66acfb 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
@@ -46,7 +46,7 @@
 		$audio   = false;
 
 		// Only get audio from the content if a playlist isn't present.
-	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+	if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
 		$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
 	}
 
diff --git a/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php b/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
index fd7865db92658..a5c387e767450 100644
--- a/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
+++ b/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
@@ -46,7 +46,7 @@
 		$video   = false;
 
 		// Only get video from the content if a playlist isn't present.
-	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+	if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
 		$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
 	}
 	?>
diff --git a/src/wp-content/themes/twentysixteen/archive.php b/src/wp-content/themes/twentysixteen/archive.php
index d332049273020..0e2ce6b02654a 100644
--- a/src/wp-content/themes/twentysixteen/archive.php
+++ b/src/wp-content/themes/twentysixteen/archive.php
@@ -51,6 +51,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
 					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentysixteen/css/blocks.css b/src/wp-content/themes/twentysixteen/css/blocks.css
index d46805450163a..47a13e04d9d12 100644
--- a/src/wp-content/themes/twentysixteen/css/blocks.css
+++ b/src/wp-content/themes/twentysixteen/css/blocks.css
@@ -58,6 +58,12 @@ p.has-drop-cap:not(:focus)::first-letter {
 		margin-left: 0;
 		margin-right: -40%;
 	}
+
+	body:not(.search-results) article:not(.type-page) .wp-block-gallery .wp-block-image img.below-entry-meta,
+	body:not(.search-results) article:not(.type-page) .wp-block-gallery .wp-block-image figcaption.below-entry-meta {
+		margin: 0;
+		max-width: 100%;
+	}
 }
 
 /* Gallery */
@@ -88,6 +94,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	line-height: 1.75;
 }
 
+.wp-block-quote.has-text-color cite {
+	color: inherit;
+}
+
 .wp-block-quote cite:before {
 	content: "\2014\00a0";
 }
@@ -246,6 +256,11 @@ p.has-drop-cap:not(:focus)::first-letter {
 	text-transform: uppercase;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .wp-block-button__link {
 	background: #1a1a1a;
 	color: #fff;
@@ -289,7 +304,8 @@ hr.wp-block-separator {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentysixteen/css/editor-blocks.css b/src/wp-content/themes/twentysixteen/css/editor-blocks.css
index 85db767261602..0eef6016c3ec5 100644
--- a/src/wp-content/themes/twentysixteen/css/editor-blocks.css
+++ b/src/wp-content/themes/twentysixteen/css/editor-blocks.css
@@ -248,6 +248,11 @@ Description: Used to style blocks in the editor.
 	padding: 0;
 }
 
+.editor-styles-wrapper ol.has-background,
+.editor-styles-wrapper ul.has-background {
+	padding: 1.25em 2.375em;
+}
+
 /* Quotes */
 
 .rtl .editor-block-list__block blockquote {
@@ -320,6 +325,10 @@ Description: Used to style blocks in the editor.
 	line-height: 1.75;
 }
 
+.wp-block-quote.has-text-color .wp-block-quote__citation {
+	color: inherit;
+}
+
 .wp-block-quote__citation:before {
 	content: "\2014\00a0";
 }
@@ -555,6 +564,11 @@ Description: Used to style blocks in the editor.
 	text-transform: uppercase;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .wp-block-button__link {
 	background: #1a1a1a;
 	color: #fff;
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata.css b/src/wp-content/themes/twentysixteen/fonts/inconsolata.css
new file mode 100644
index 0000000000000..2e40dec909922
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/inconsolata.css
@@ -0,0 +1,41 @@
+/*
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata/LICENSE.txt b/src/wp-content/themes/twentysixteen/fonts/inconsolata/LICENSE.txt
new file mode 100644
index 0000000000000..79721add751bd
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/inconsolata/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-all-400-normal.woff b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-all-400-normal.woff
new file mode 100644
index 0000000000000..77fbd0f2ae9c3
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-400-normal.woff2
new file mode 100644
index 0000000000000..6119e5971bfa1
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..50cb547f74653
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..ab70f18a843f1
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/inconsolata/inconsolata-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-inconsolata.css b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-inconsolata.css
new file mode 100644
index 0000000000000..946bff702a83a
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-inconsolata.css
@@ -0,0 +1,405 @@
+/*
+Merriweather
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* merriweather-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat-plus-inconsolata.css b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat-plus-inconsolata.css
new file mode 100644
index 0000000000000..338bffd2ea9a6
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat-plus-inconsolata.css
@@ -0,0 +1,529 @@
+/*
+Merriweather
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Montserrat
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* merriweather-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-vietnamese-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-vietnamese-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat.css b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat.css
new file mode 100644
index 0000000000000..96a555a926ffe
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/merriweather-plus-montserrat.css
@@ -0,0 +1,489 @@
+/*
+Merriweather
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Montserrat
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* merriweather-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-vietnamese-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-vietnamese-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather.css b/src/wp-content/themes/twentysixteen/fonts/merriweather.css
new file mode 100644
index 0000000000000..a78603f134ce4
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/merriweather.css
@@ -0,0 +1,365 @@
+/*
+Merriweather
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* merriweather-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-normal */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-normal.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-normal.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-cyrillic-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-vietnamese-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-ext-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-400-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./merriweather/merriweather-latin-400-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-400-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-cyrillic-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-vietnamese-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-ext-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-700-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./merriweather/merriweather-latin-700-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-700-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* merriweather-cyrillic-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* merriweather-cyrillic-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-cyrillic-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* merriweather-vietnamese-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-vietnamese-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* merriweather-latin-ext-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-ext-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* merriweather-latin-900-italic */
+@font-face {
+	font-family: 'Merriweather';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 900;
+	src:
+		url('./merriweather/merriweather-latin-900-italic.woff2?ver=30') format('woff2'),
+		url('./merriweather/merriweather-all-900-italic.woff?ver=30') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/LICENSE.txt b/src/wp-content/themes/twentysixteen/fonts/merriweather/LICENSE.txt
new file mode 100644
index 0000000000000..a7ce180950f42
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/merriweather/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-italic.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-italic.woff
new file mode 100644
index 0000000000000..2df936dc7dcf1
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-normal.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-normal.woff
new file mode 100644
index 0000000000000..0090103fa6a80
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-italic.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-italic.woff
new file mode 100644
index 0000000000000..b3249db0f6ae0
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-normal.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-normal.woff
new file mode 100644
index 0000000000000..ec832adddc4eb
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-italic.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-italic.woff
new file mode 100644
index 0000000000000..502d22e306e57
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-italic.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-normal.woff b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-normal.woff
new file mode 100644
index 0000000000000..b0a1e08ff934d
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-all-900-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-italic.woff2
new file mode 100644
index 0000000000000..ae7da0a6f0fe2
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..807c31d68e9d7
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-italic.woff2
new file mode 100644
index 0000000000000..6c5b344f0d1b8
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..0050186d70666
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-italic.woff2
new file mode 100644
index 0000000000000..70a6e07ae84dc
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-normal.woff2
new file mode 100644
index 0000000000000..01ccf851d8ca1
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-italic.woff2
new file mode 100644
index 0000000000000..d3ec576024147
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..49c00d52f3c71
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-italic.woff2
new file mode 100644
index 0000000000000..89d4d19f35a96
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..1a4d41b3b2ba4
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-italic.woff2
new file mode 100644
index 0000000000000..d0fe62065a27e
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-normal.woff2
new file mode 100644
index 0000000000000..82028c945d72b
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-cyrillic-ext-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-italic.woff2
new file mode 100644
index 0000000000000..38bfa01eb55e4
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-normal.woff2
new file mode 100644
index 0000000000000..6515c26fd0f55
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-italic.woff2
new file mode 100644
index 0000000000000..20481352c100c
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-normal.woff2
new file mode 100644
index 0000000000000..a6919a9da3c16
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-italic.woff2
new file mode 100644
index 0000000000000..d7cdeaa4fe51d
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-normal.woff2
new file mode 100644
index 0000000000000..4e3aec9297fea
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..bc826aefc1508
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..374703658196a
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..4efb9a012200a
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..568643c546fad
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-italic.woff2
new file mode 100644
index 0000000000000..83258cbafcb3e
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-normal.woff2
new file mode 100644
index 0000000000000..86d57207ea53e
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-latin-ext-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..40291118ccea6
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..7f87ba2f855de
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-italic.woff2
new file mode 100644
index 0000000000000..4cb4c33cdc609
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..7dda0ca9f2d95
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-italic.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-italic.woff2
new file mode 100644
index 0000000000000..4172d4dbf016d
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-italic.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-normal.woff2
new file mode 100644
index 0000000000000..b5270295e2371
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/merriweather/merriweather-vietnamese-900-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat-plus-inconsolata.css b/src/wp-content/themes/twentysixteen/fonts/montserrat-plus-inconsolata.css
new file mode 100644
index 0000000000000..4f6dba25f3f48
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/montserrat-plus-inconsolata.css
@@ -0,0 +1,165 @@
+/*
+Montserrat
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+
+Inconsolata
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* montserrat-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-vietnamese-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-vietnamese-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* inconsolata-vietnamese-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-vietnamese-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* inconsolata-latin-ext-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-ext-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* inconsolata-latin-400-normal */
+@font-face {
+	font-family: 'Inconsolata';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./inconsolata/inconsolata-latin-400-normal.woff2?ver=31') format('woff2'),
+		url('./inconsolata/inconsolata-all-400-normal.woff?ver=31') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat.css b/src/wp-content/themes/twentysixteen/fonts/montserrat.css
new file mode 100644
index 0000000000000..ada936d61eab9
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/montserrat.css
@@ -0,0 +1,125 @@
+/*
+Montserrat
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* montserrat-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-cyrillic-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-vietnamese-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-ext-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-400-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./montserrat/montserrat-latin-400-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-400-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* montserrat-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* montserrat-cyrillic-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-cyrillic-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* montserrat-vietnamese-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-vietnamese-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* montserrat-latin-ext-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-ext-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* montserrat-latin-700-normal */
+@font-face {
+	font-family: 'Montserrat';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./montserrat/montserrat-latin-700-normal.woff2?ver=25') format('woff2'),
+		url('./montserrat/montserrat-all-700-normal.woff?ver=25') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/LICENSE.txt b/src/wp-content/themes/twentysixteen/fonts/montserrat/LICENSE.txt
new file mode 100644
index 0000000000000..0aff25d1d6cb1
--- /dev/null
+++ b/src/wp-content/themes/twentysixteen/fonts/montserrat/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-400-normal.woff b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-400-normal.woff
new file mode 100644
index 0000000000000..1851360a29f96
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-700-normal.woff b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-700-normal.woff
new file mode 100644
index 0000000000000..987c3a57c30d8
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..c47c0715aa910
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..a2ed7b30ff1c5
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..5b89693ca3f37
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..561a68a25c1d4
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-400-normal.woff2
new file mode 100644
index 0000000000000..e04ffc269b54e
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-700-normal.woff2
new file mode 100644
index 0000000000000..a7e1118fa179a
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..1b3eec1dc5718
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..430f7b02426a8
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..cbd8d2cd31565
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..ec3615294d0cb
Binary files /dev/null and b/src/wp-content/themes/twentysixteen/fonts/montserrat/montserrat-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentysixteen/functions.php b/src/wp-content/themes/twentysixteen/functions.php
index b6edc6ed682b0..82e9ee9a31db3 100644
--- a/src/wp-content/themes/twentysixteen/functions.php
+++ b/src/wp-content/themes/twentysixteen/functions.php
@@ -49,9 +49,16 @@ function twentysixteen_setup() {
 		 * Make theme available for translation.
 		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
 		 * If you're building a theme based on Twenty Sixteen, use a find and replace
-		 * to change 'twentysixteen' to the name of your theme in all the template files
+		 * to change 'twentysixteen' to the name of your theme in all the template files.
+		 *
+		 * Manual loading of text domain is not required after the introduction of
+		 * just in time translation loading in WordPress version 4.6.
+		 *
+		 * @ticket 58318
 		 */
-		load_theme_textdomain( 'twentysixteen' );
+		if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+			load_theme_textdomain( 'twentysixteen' );
+		}
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );
@@ -115,7 +122,7 @@ function twentysixteen_setup() {
 		/*
 		 * Enable support for Post Formats.
 		 *
-		 * See: https://wordpress.org/support/article/post-formats/
+		 * See: https://wordpress.org/documentation/article/post-formats/
 		 */
 		add_theme_support(
 			'post-formats',
@@ -134,9 +141,15 @@ function twentysixteen_setup() {
 
 		/*
 		 * This theme styles the visual editor to resemble the theme style,
-		 * specifically font, colors, icons, and column width.
+		 * specifically font, colors, icons, and column width. When fonts are
+		 * self-hosted, the theme directory needs to be removed first.
 		 */
-		add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
+		$font_stylesheet = str_replace(
+			array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+			'',
+			twentysixteen_fonts_url()
+		);
+		add_editor_style( array( 'css/editor-style.css', $font_stylesheet ) );
 
 		// Load regular editor styles into the new block-based editor.
 		add_theme_support( 'editor-styles' );
@@ -241,6 +254,7 @@ function twentysixteen_content_width() {
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Sixteen 1.6
+ * @deprecated Twenty Sixteen 2.9 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array  $urls          URLs to print for resource hints.
  * @param string $relation_type The relation type the URLs are printed.
@@ -256,7 +270,7 @@ function twentysixteen_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentysixteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentysixteen_resource_hints', 10, 2 );
 
 /**
  * Registers a widget area.
@@ -306,25 +320,25 @@ function twentysixteen_widgets_init() {
 
 if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
 	/**
-	 * Register Google fonts for Twenty Sixteen.
+	 * Register fonts for Twenty Sixteen.
 	 *
 	 * Create your own twentysixteen_fonts_url() function to override in a child theme.
 	 *
 	 * @since Twenty Sixteen 1.0
+	 * @since Twenty Sixteen 2.9 Replaced Google URL with self-hosted fonts.
 	 *
-	 * @return string Google fonts URL for the theme.
+	 * @return string Fonts URL for the theme.
 	 */
 	function twentysixteen_fonts_url() {
 		$fonts_url = '';
 		$fonts     = array();
-		$subsets   = 'latin,latin-ext';
 
 		/*
 		 * translators: If there are characters in your language that are not supported
 		 * by Merriweather, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
-			$fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
+			$fonts[] = 'merriweather';
 		}
 
 		/*
@@ -332,7 +346,7 @@ function twentysixteen_fonts_url() {
 		 * by Montserrat, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
-			$fonts[] = 'Montserrat:400,700';
+			$fonts[] = 'montserrat';
 		}
 
 		/*
@@ -340,18 +354,11 @@ function twentysixteen_fonts_url() {
 		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
 		 */
 		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
-			$fonts[] = 'Inconsolata:400';
+			$fonts[] = 'inconsolata';
 		}
 
 		if ( $fonts ) {
-			$fonts_url = add_query_arg(
-				array(
-					'family'  => urlencode( implode( '|', $fonts ) ),
-					'subset'  => urlencode( $subsets ),
-					'display' => urlencode( 'fallback' ),
-				),
-				'https://fonts.googleapis.com/css'
-			);
+			$fonts_url = get_template_directory_uri() . '/fonts/' . implode( '-plus-', $fonts ) . '.css';
 		}
 
 		return $fonts_url;
@@ -377,16 +384,17 @@ function twentysixteen_javascript_detection() {
  */
 function twentysixteen_scripts() {
 	// Add custom fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentysixteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), $font_version );
 
 	// Add Genericons, used in the main stylesheet.
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '20201208' );
 
 	// Theme stylesheet.
-	wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), '20221004' );
+	wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), '20230628' );
 
 	// Load the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentysixteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentysixteen-style' ), '20170530' );
@@ -404,7 +412,8 @@ function twentysixteen_scripts() {
 	wp_enqueue_script( 'twentysixteen-html5', get_template_directory_uri() . '/js/html5.js', array(), '3.7.3' );
 	wp_script_add_data( 'twentysixteen-html5', 'conditional', 'lt IE 9' );
 
-	wp_enqueue_script( 'twentysixteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20170530', true );
+	// Skip-link fix is no longer enqueued by default.
+	wp_register_script( 'twentysixteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', true );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
@@ -414,7 +423,7 @@ function twentysixteen_scripts() {
 		wp_enqueue_script( 'twentysixteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20170530' );
 	}
 
-	wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20211130', true );
+	wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230629', true );
 
 	wp_localize_script(
 		'twentysixteen-script',
@@ -434,9 +443,10 @@ function twentysixteen_scripts() {
  */
 function twentysixteen_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20221004' );
+	wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20230628' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentysixteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentysixteen_block_editor_styles' );
 
diff --git a/src/wp-content/themes/twentysixteen/header.php b/src/wp-content/themes/twentysixteen/header.php
index 6bfc7006d1c98..2ad0f66c676b5 100644
--- a/src/wp-content/themes/twentysixteen/header.php
+++ b/src/wp-content/themes/twentysixteen/header.php
@@ -25,7 +25,12 @@
 <?php wp_body_open(); ?>
 <div id="page" class="site">
 	<div class="site-inner">
-		<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'twentysixteen' ); ?></a>
+		<a class="skip-link screen-reader-text" href="#content">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Skip to content', 'twentysixteen' );
+			?>
+		</a>
 
 		<header id="masthead" class="site-header">
 			<div class="site-header-main">
diff --git a/src/wp-content/themes/twentysixteen/image.php b/src/wp-content/themes/twentysixteen/image.php
index d20273a7c2751..db7f574205a36 100644
--- a/src/wp-content/themes/twentysixteen/image.php
+++ b/src/wp-content/themes/twentysixteen/image.php
@@ -59,6 +59,7 @@
 								'after'       => '</div>',
 								'link_before' => '<span>',
 								'link_after'  => '</span>',
+								/* translators: Hidden accessibility text. */
 								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
 								'separator'   => '<span class="screen-reader-text">, </span>',
 							)
@@ -74,6 +75,7 @@
 						if ( $metadata ) {
 							printf(
 								'<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+								/* translators: Hidden accessibility text. */
 								esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentysixteen' ),
 								esc_url( wp_get_attachment_url() ),
 								absint( $metadata['width'] ),
diff --git a/src/wp-content/themes/twentysixteen/inc/template-tags.php b/src/wp-content/themes/twentysixteen/inc/template-tags.php
index e8c692ba8aab7..a55799812faf2 100644
--- a/src/wp-content/themes/twentysixteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentysixteen/inc/template-tags.php
@@ -23,6 +23,7 @@ function twentysixteen_entry_meta() {
 			printf(
 				'<span class="byline"><span class="author vcard">%1$s<span class="screen-reader-text">%2$s </span> <a class="url fn n" href="%3$s">%4$s</a></span></span>',
 				get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ),
+				/* translators: Hidden accessibility text. */
 				_x( 'Author', 'Used before post author name.', 'twentysixteen' ),
 				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
 				get_the_author()
@@ -37,7 +38,11 @@ function twentysixteen_entry_meta() {
 		if ( current_theme_supports( 'post-formats', $format ) ) {
 			printf(
 				'<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ),
+				sprintf(
+					'<span class="screen-reader-text">%s </span>',
+					/* translators: Hidden accessibility text. */
+					_x( 'Format', 'Used before post format.', 'twentysixteen' )
+				),
 				esc_url( get_post_format_link( $format ) ),
 				get_post_format_string( $format )
 			);
@@ -81,6 +86,7 @@ function twentysixteen_entry_date() {
 
 		printf(
 			'<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+			/* translators: Hidden accessibility text. */
 			_x( 'Posted on', 'Used before publish date.', 'twentysixteen' ),
 			esc_url( get_permalink() ),
 			$time_string
@@ -101,6 +107,7 @@ function twentysixteen_entry_taxonomies() {
 		if ( $categories_list && twentysixteen_categorized_blog() ) {
 			printf(
 				'<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				/* translators: Hidden accessibility text. */
 				_x( 'Categories', 'Used before category names.', 'twentysixteen' ),
 				$categories_list
 			);
@@ -110,6 +117,7 @@ function twentysixteen_entry_taxonomies() {
 		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 			printf(
 				'<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				/* translators: Hidden accessibility text. */
 				_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
 				$tags_list
 			);
diff --git a/src/wp-content/themes/twentysixteen/index.php b/src/wp-content/themes/twentysixteen/index.php
index 87efb51b60b53..96dc414eec7ee 100644
--- a/src/wp-content/themes/twentysixteen/index.php
+++ b/src/wp-content/themes/twentysixteen/index.php
@@ -48,6 +48,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
 					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentysixteen/js/functions.js b/src/wp-content/themes/twentysixteen/js/functions.js
index 4c3b97d0329f7..12e2ed0ca17fe 100644
--- a/src/wp-content/themes/twentysixteen/js/functions.js
+++ b/src/wp-content/themes/twentysixteen/js/functions.js
@@ -94,7 +94,7 @@
 					}
 				} );
 			} else {
-				siteNavigation.find( '.menu-item-has-children > a' ).unbind( 'touchstart.twentysixteen' );
+				siteNavigation.find( '.menu-item-has-children > a' ).off( 'touchstart.twentysixteen' );
 			}
 		}
 
diff --git a/src/wp-content/themes/twentysixteen/js/skip-link-focus-fix.js b/src/wp-content/themes/twentysixteen/js/skip-link-focus-fix.js
index ae8a5da10ae09..c84152edc0b6f 100644
--- a/src/wp-content/themes/twentysixteen/js/skip-link-focus-fix.js
+++ b/src/wp-content/themes/twentysixteen/js/skip-link-focus-fix.js
@@ -1,16 +1,15 @@
 /**
- * Makes "skip to content" link work correctly in IE9, Chrome, and Opera
- * for better accessibility.
+ * File skip-link-focus-fix.js.
  *
- * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
+ * Helps with accessibility for keyboard only users.
+ *
+ * Learn more: https://git.io/vWdr2
  */
 
- ( function() {
-	var isWebkit = navigator.userAgent.toLowerCase().indexOf( 'webkit' ) > -1,
-		isOpera  = navigator.userAgent.toLowerCase().indexOf( 'opera' )  > -1,
-		isIE     = navigator.userAgent.toLowerCase().indexOf( 'msie' )   > -1;
+( function() {
+	var isIe = /(trident|msie)/i.test( navigator.userAgent );
 
-	if ( ( isWebkit || isOpera || isIE ) && document.getElementById && window.addEventListener ) {
+	if ( isIe && document.getElementById && window.addEventListener ) {
 		window.addEventListener( 'hashchange', function() {
 			var id = location.hash.substring( 1 ),
 				element;
diff --git a/src/wp-content/themes/twentysixteen/readme.txt b/src/wp-content/themes/twentysixteen/readme.txt
index 64467cd7df383..3374507576be9 100644
--- a/src/wp-content/themes/twentysixteen/readme.txt
+++ b/src/wp-content/themes/twentysixteen/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Sixteen ===
 Contributors: wordpressdotorg
-Tested up to: 6.1
-Version: 2.8
+Requires at least: 4.4
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Version: 3.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: one-column, two-columns, right-sidebar, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, microformats, post-formats, rtl-language-support, sticky-post, threaded-comments, translation-ready, blog, block-patterns
@@ -16,19 +18,19 @@ Twenty Sixteen is a modernized take on an ever-popular WordPress layout — the
 * Post Formats
 * The GPL v2.0 or later license. :) Use it to make something cool.
 
-For more information about Twenty Sixteen please go to https://wordpress.org/support/article/twenty-sixteen/.
+For more information about Twenty Sixteen please go to https://wordpress.org/documentation/article/twenty-sixteen/.
 
 == Installation ==
 
 1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
 2. Type in Twenty Sixteen in the search form and press the 'Enter' key on your keyboard.
 3. Click on the 'Activate' button to use your new theme right away.
-4. Go to https://wordpress.org/support/article/twenty-sixteen/ for a guide on how to customize this theme.
+4. Go to https://wordpress.org/documentation/article/twenty-sixteen/ for a guide on how to customize this theme.
 5. Navigate to Appearance > Customize in your admin panel and customize to taste.
 
 == Copyright ==
 
-Twenty Sixteen WordPress Theme, Copyright 2014-2022 WordPress.org
+Twenty Sixteen WordPress Theme, Copyright 2014-2023 WordPress.org
 Twenty Sixteen is distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -51,10 +53,35 @@ Genericons icon font, Copyright 2013-2017 Automattic.com
 License: GNU GPL, Version 2 (or later)
 Source: http://www.genericons.com
 
+Merriweather Font
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/merriweather
+
+Montserrat Font
+Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/montserrat
+
+Inconsolata Font
+Copyright 2006 The Inconsolata Project Authors (https://github.com/cyrealtype/Inconsolata)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/inconsolata
+
 Image used in screenshot.png: A photo by Austin Schmid (https://unsplash.com/schmidy/), licensed under Creative Commons Zero(http://creativecommons.org/publicdomain/zero/1.0/)
 
 == Changelog ==
 
+= 3.0 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Sixteen_Theme_Changelog#Version_3.0
+
+= 2.9 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Sixteen_Theme_Changelog#Version_2.9
+
 = 2.8 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentysixteen/search.php b/src/wp-content/themes/twentysixteen/search.php
index f83758e3e97d2..afc4a90623829 100644
--- a/src/wp-content/themes/twentysixteen/search.php
+++ b/src/wp-content/themes/twentysixteen/search.php
@@ -43,6 +43,7 @@
 				array(
 					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
 					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					/* translators: Hidden accessibility text. */
 					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
 				)
 			);
diff --git a/src/wp-content/themes/twentysixteen/searchform.php b/src/wp-content/themes/twentysixteen/searchform.php
index c2f83af84f017..1b6749c74e26c 100644
--- a/src/wp-content/themes/twentysixteen/searchform.php
+++ b/src/wp-content/themes/twentysixteen/searchform.php
@@ -10,8 +10,18 @@
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label>
-		<span class="screen-reader-text"><?php echo _x( 'Search for:', 'label', 'twentysixteen' ); ?></span>
+		<span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			echo _x( 'Search for:', 'label', 'twentysixteen' );
+			?>
+		</span>
 		<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentysixteen' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
 	</label>
-	<button type="submit" class="search-submit"><span class="screen-reader-text"><?php echo _x( 'Search', 'submit button', 'twentysixteen' ); ?></span></button>
+	<button type="submit" class="search-submit"><span class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		echo _x( 'Search', 'submit button', 'twentysixteen' );
+		?>
+	</span></button>
 </form>
diff --git a/src/wp-content/themes/twentysixteen/single.php b/src/wp-content/themes/twentysixteen/single.php
index dcf1094131e4f..1b33e51f7e503 100644
--- a/src/wp-content/themes/twentysixteen/single.php
+++ b/src/wp-content/themes/twentysixteen/single.php
@@ -36,9 +36,11 @@
 				the_post_navigation(
 					array(
 						'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentysixteen' ) . '</span> ' .
+							/* translators: Hidden accessibility text. */
 							'<span class="screen-reader-text">' . __( 'Next post:', 'twentysixteen' ) . '</span> ' .
 							'<span class="post-title">%title</span>',
 						'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentysixteen' ) . '</span> ' .
+							/* translators: Hidden accessibility text. */
 							'<span class="screen-reader-text">' . __( 'Previous post:', 'twentysixteen' ) . '</span> ' .
 							'<span class="post-title">%title</span>',
 					)
diff --git a/src/wp-content/themes/twentysixteen/style.css b/src/wp-content/themes/twentysixteen/style.css
index fc58afaf84a5b..6ccf8cafc029d 100644
--- a/src/wp-content/themes/twentysixteen/style.css
+++ b/src/wp-content/themes/twentysixteen/style.css
@@ -4,8 +4,8 @@ Theme URI: https://wordpress.org/themes/twentysixteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Sixteen is a modernized take on an ever-popular WordPress layout — the horizontal masthead with an optional right sidebar that works perfectly for blogs and websites. It has custom color options with beautiful default color schemes, a harmonious fluid grid using a mobile-first approach, and impeccable polish in every detail. Twenty Sixteen will make your WordPress look beautiful everywhere.
-Version: 2.8
-Tested up to: 6.1
+Version: 3.0
+Tested up to: 6.3
 Requires at least: 4.4
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
@@ -3614,6 +3614,7 @@ p > video {
 		max-width: 140%;
 	}
 
+	body:not(.search-results) article:not(.type-page) .gallery-item img.below-entry-meta,
 	body:not(.search-results) article:not(.type-page) figure.below-entry-meta img.below-entry-meta,
 	body:not(.search-results) article:not(.type-page) table figure.below-entry-meta,
 	body:not(.search-results) article:not(.type-page) table img.below-entry-meta {
diff --git a/src/wp-content/themes/twentysixteen/template-parts/content-page.php b/src/wp-content/themes/twentysixteen/template-parts/content-page.php
index 123ecc5de4b95..989d2e65c63b7 100644
--- a/src/wp-content/themes/twentysixteen/template-parts/content-page.php
+++ b/src/wp-content/themes/twentysixteen/template-parts/content-page.php
@@ -25,6 +25,7 @@
 				'after'       => '</div>',
 				'link_before' => '<span>',
 				'link_after'  => '</span>',
+				/* translators: Hidden accessibility text. */
 				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
 				'separator'   => '<span class="screen-reader-text">, </span>',
 			)
diff --git a/src/wp-content/themes/twentysixteen/template-parts/content-single.php b/src/wp-content/themes/twentysixteen/template-parts/content-single.php
index d466affabf885..3386bae6d2921 100644
--- a/src/wp-content/themes/twentysixteen/template-parts/content-single.php
+++ b/src/wp-content/themes/twentysixteen/template-parts/content-single.php
@@ -27,6 +27,7 @@
 					'after'       => '</div>',
 					'link_before' => '<span>',
 					'link_after'  => '</span>',
+					/* translators: Hidden accessibility text. */
 					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
diff --git a/src/wp-content/themes/twentysixteen/template-parts/content.php b/src/wp-content/themes/twentysixteen/template-parts/content.php
index 1f34fc2560659..bd2ee145c4f32 100644
--- a/src/wp-content/themes/twentysixteen/template-parts/content.php
+++ b/src/wp-content/themes/twentysixteen/template-parts/content.php
@@ -37,6 +37,7 @@
 					'after'       => '</div>',
 					'link_before' => '<span>',
 					'link_after'  => '</span>',
+					/* translators: Hidden accessibility text. */
 					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
 					'separator'   => '<span class="screen-reader-text">, </span>',
 				)
diff --git a/src/wp-content/themes/twentyten/author.php b/src/wp-content/themes/twentyten/author.php
index 8fdd6a4632c23..469d7b07cfbbe 100644
--- a/src/wp-content/themes/twentyten/author.php
+++ b/src/wp-content/themes/twentyten/author.php
@@ -29,7 +29,7 @@
 				<h1 class="page-title author">
 				<?php
 				/* translators: %s: Author display name. */
-				printf( __( 'Author Archives: %s', 'twentyten' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+				printf( __( 'Author Archives: %s', 'twentyten' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" rel="me">' . get_the_author() . '</a></span>' );
 				?>
 				</h1>
 
diff --git a/src/wp-content/themes/twentyten/blocks.css b/src/wp-content/themes/twentyten/blocks.css
index 3f9995347b966..fb53e7be63ec8 100644
--- a/src/wp-content/themes/twentyten/blocks.css
+++ b/src/wp-content/themes/twentyten/blocks.css
@@ -124,8 +124,13 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Pullquote */
 
+.wp-block-pullquote {
+	font-size: 1em;
+}
+
 .wp-block-pullquote p {
 	font-size: 1.5em;
+	line-height: 1.3;
 }
 
 .wp-block-pullquote__citation,
@@ -205,7 +210,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 --------------------------------------------------------------*/
 
 .has-blue-color,
-.has-blue-color:visited {
+.has-blue-color:visited,
+#content .has-blue-color,
+#content .has-blue-color:visited {
 	color: #0066cc;
 }
 
@@ -215,7 +222,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 .has-black-color,
-.has-black-color:visited {
+.has-black-color:visited,
+#content .has-black-color,
+#content .has-black-color:visited {
 	color: #000;
 }
 
@@ -225,7 +234,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 .has-medium-gray-color,
-.has-medium-gray-color:visited {
+.has-medium-gray-color:visited,
+#content .has-medium-gray-color,
+#content .has-medium-gray-color:visited {
 	color: #666;
 }
 
@@ -235,7 +246,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 .has-light-gray-color,
-.has-light-gray-color:visited {
+.has-light-gray-color:visited,
+#content .has-light-gray-color,
+#content .has-light-gray-color:visited {
 	color: #f1f1f1;
 }
 
@@ -245,7 +258,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 }
 
 .has-white-color,
-.has-white-color:visited {
+.has-white-color:visited,
+#content .has-white-color,
+#content .has-white-color:visited {
 	color: #fff;
 }
 
diff --git a/src/wp-content/themes/twentyten/comments.php b/src/wp-content/themes/twentyten/comments.php
index 31425239d01f6..64bf700b8db0a 100644
--- a/src/wp-content/themes/twentyten/comments.php
+++ b/src/wp-content/themes/twentyten/comments.php
@@ -34,7 +34,7 @@
 <?php if ( have_comments() ) : ?>
 			<h3 id="comments-title">
 			<?php
-			if ( 1 === get_comments_number() ) {
+			if ( '1' === get_comments_number() ) {
 				printf(
 					/* translators: %s: The post title. */
 					__( 'One Response to %s', 'twentyten' ),
diff --git a/src/wp-content/themes/twentyten/editor-blocks.css b/src/wp-content/themes/twentyten/editor-blocks.css
index 3baf3bb5fdb7a..86b2f5f8756a1 100644
--- a/src/wp-content/themes/twentyten/editor-blocks.css
+++ b/src/wp-content/themes/twentyten/editor-blocks.css
@@ -261,9 +261,14 @@ p.has-drop-cap:not(:focus)::first-letter {
 
 /* Pullquote */
 
+.wp-block-pullquote {
+	font-size: 1em;
+}
+
 .wp-block-pullquote blockquote > p.rich-text,
 .wp-block-pullquote blockquote > .editor-rich-text p {
 	font-size: 1.5em;
+	line-height: 1.3;
 }
 
 .wp-block-pullquote .wp-block-pullquote__citation {
@@ -368,3 +373,9 @@ p.has-drop-cap:not(:focus)::first-letter {
 :root .editor-styles-wrapper .has-white-background-color:visited {
 	background-color: #fff;
 }
+
+/* Inserter Icon */
+
+.editor-styles-wrapper .block-editor-inserter path {
+	color: #fff;
+}
diff --git a/src/wp-content/themes/twentyten/footer.php b/src/wp-content/themes/twentyten/footer.php
index 07f5d118e2cb2..4fb89116ada2c 100644
--- a/src/wp-content/themes/twentyten/footer.php
+++ b/src/wp-content/themes/twentyten/footer.php
@@ -24,7 +24,7 @@
 ?>
 
 			<div id="site-info">
-				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
+				<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
 					<?php bloginfo( 'name' ); ?>
 				</a>
 				<?php
diff --git a/src/wp-content/themes/twentyten/functions.php b/src/wp-content/themes/twentyten/functions.php
index 7e55972549394..36e20c442c325 100644
--- a/src/wp-content/themes/twentyten/functions.php
+++ b/src/wp-content/themes/twentyten/functions.php
@@ -128,8 +128,15 @@ function twentyten_setup() {
 		/*
 		 * Make theme available for translation.
 		 * Translations can be filed in the /languages/ directory.
+		 *
+		 * Manual loading of text domain is not required after the introduction of
+		 * just in time translation loading in WordPress version 4.6.
+		 *
+		 * @ticket 58318
 		 */
-		load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+		if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+			load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+		}
 
 		// This theme uses wp_nav_menu() in one location.
 		register_nav_menus(
@@ -439,7 +446,7 @@ function twentyten_comment( $comment, $args, $depth ) {
 				}
 				?>
 
-				<?php if ( '0' == $comment->comment_approved ) : ?>
+				<?php if ( '0' === $comment->comment_approved ) : ?>
 			<em class="comment-awaiting-moderation"><?php echo $moderation_note; ?></em>
 			<br />
 			<?php endif; ?>
@@ -724,7 +731,7 @@ function twentyten_widget_tag_cloud_args( $args ) {
  */
 function twentyten_scripts_styles() {
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentyten-block-style', get_template_directory_uri() . '/blocks.css', array(), '20190704' );
+	wp_enqueue_style( 'twentyten-block-style', get_template_directory_uri() . '/blocks.css', array(), '20230627' );
 }
 add_action( 'wp_enqueue_scripts', 'twentyten_scripts_styles' );
 
@@ -735,7 +742,7 @@ function twentyten_scripts_styles() {
  */
 function twentyten_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentyten-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20221011' );
+	wp_enqueue_style( 'twentyten-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20230627' );
 }
 add_action( 'enqueue_block_editor_assets', 'twentyten_block_editor_styles' );
 
diff --git a/src/wp-content/themes/twentyten/header.php b/src/wp-content/themes/twentyten/header.php
index 9155b2ecaa92e..7a47057fef20f 100644
--- a/src/wp-content/themes/twentyten/header.php
+++ b/src/wp-content/themes/twentyten/header.php
@@ -21,10 +21,10 @@
 
 	wp_title( '|', true, 'right' );
 
-	// Add the blog name.
+	// Add the site name.
 	bloginfo( 'name' );
 
-	// Add the blog description for the home/front page.
+	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
 if ( $site_description && ( is_home() || is_front_page() ) ) {
 	echo " | $site_description";
@@ -39,7 +39,7 @@
 ?>
 	</title>
 <link rel="profile" href="https://gmpg.org/xfn/11" />
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20221101" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo esc_url( get_stylesheet_uri() ); ?>?ver=20230808" />
 <link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
 <?php
 	/*
@@ -69,7 +69,7 @@
 				<?php $heading_tag = ( is_home() || is_front_page() ) ? 'h1' : 'div'; ?>
 				<<?php echo $heading_tag; ?> id="site-title">
 					<span>
-						<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
+						<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
 					</span>
 				</<?php echo $heading_tag; ?>>
 				<div id="site-description"><?php bloginfo( 'description' ); ?></div>
@@ -112,7 +112,7 @@
 
 			<div id="access" role="navigation">
 				<?php // Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. ?>
-				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
+				<div class="skip-link screen-reader-text"><a href="#content"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
 				<?php
 				/*
 				 * Our navigation menu. If one isn't filled out, wp_nav_menu() falls back to wp_page_menu().
diff --git a/src/wp-content/themes/twentyten/loop-attachment.php b/src/wp-content/themes/twentyten/loop-attachment.php
index b886c019e80af..007b5aa036f9d 100644
--- a/src/wp-content/themes/twentyten/loop-attachment.php
+++ b/src/wp-content/themes/twentyten/loop-attachment.php
@@ -100,7 +100,7 @@
 				)
 			);
 			foreach ( $attachments as $k => $attachment ) {
-				if ( $attachment->ID == $post->ID ) {
+				if ( $attachment->ID === $post->ID ) {
 					break;
 				}
 			}
@@ -154,7 +154,8 @@
 						<div class="entry-caption">
 						<?php
 						if ( ! empty( $post->post_excerpt ) ) {
-							the_excerpt();}
+							the_excerpt();
+						}
 						?>
 </div>
 
diff --git a/src/wp-content/themes/twentyten/readme.txt b/src/wp-content/themes/twentyten/readme.txt
index 780acfcbd9be4..b6b910a0152e0 100644
--- a/src/wp-content/themes/twentyten/readme.txt
+++ b/src/wp-content/themes/twentyten/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Ten ===
 Contributors: wordpressdotorg
-Tested up to: 6.1
-Stable tag: 3.7
+Requires at least: 3.0
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 3.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, two-columns, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu, flexible-header, featured-images, footer-widgets, featured-image-header, block-patterns
@@ -21,7 +23,7 @@ For more information about Twenty Ten theme please go to https://codex.wordpress
 
 == Copyright ==
 
-Twenty Ten WordPress Theme, Copyright 2010-2022 WordPress.org & Automattic.com
+Twenty Ten WordPress Theme, Copyright 2010-2023 WordPress.org & Automattic.com
 Twenty Ten is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -42,6 +44,16 @@ Images
 
 == Changelog ==
 
+= 3.9 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Ten_Theme_Changelog#Version_3.9
+
+= 3.8 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Ten_Theme_Changelog#Version_3.8
+
 = 3.7 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentyten/style.css b/src/wp-content/themes/twentyten/style.css
index 2b6fbad101f9d..9a1c53d0120ea 100644
--- a/src/wp-content/themes/twentyten/style.css
+++ b/src/wp-content/themes/twentyten/style.css
@@ -4,8 +4,8 @@ Theme URI: https://wordpress.org/themes/twentyten/
 Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar.
 Author: the WordPress team
 Author URI: https://wordpress.org/
-Version: 3.7
-Tested up to: 6.1
+Version: 3.9
+Tested up to: 6.3
 Requires at least: 3.0
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
diff --git a/src/wp-content/themes/twentythirteen/author.php b/src/wp-content/themes/twentythirteen/author.php
index 1b18c999669c5..35372082745cc 100644
--- a/src/wp-content/themes/twentythirteen/author.php
+++ b/src/wp-content/themes/twentythirteen/author.php
@@ -31,7 +31,7 @@
 				<h1 class="archive-title">
 				<?php
 				/* translators: %s: Author display name. */
-				printf( __( 'All posts by %s', 'twentythirteen' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+				printf( __( 'All posts by %s', 'twentythirteen' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" rel="me">' . get_the_author() . '</a></span>' );
 				?>
 				</h1>
 			</header><!-- .archive-header -->
diff --git a/src/wp-content/themes/twentythirteen/comments.php b/src/wp-content/themes/twentythirteen/comments.php
index fd782097fc930..15d0968256635 100644
--- a/src/wp-content/themes/twentythirteen/comments.php
+++ b/src/wp-content/themes/twentythirteen/comments.php
@@ -23,7 +23,7 @@
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-			if ( 1 === get_comments_number() ) {
+			if ( '1' === get_comments_number() ) {
 				printf(
 					/* translators: %s: The post title. */
 					_x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentythirteen' ),
@@ -57,7 +57,12 @@
 		if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
 			?>
 		<nav class="navigation comment-navigation">
-		<h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text section-heading">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Comment navigation', 'twentythirteen' );
+			?>
+		</h1>
 		<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
 		<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
 		</nav><!-- .comment-navigation -->
diff --git a/src/wp-content/themes/twentythirteen/css/blocks.css b/src/wp-content/themes/twentythirteen/css/blocks.css
index 3b0f3fdfeafad..092b335d00c23 100644
--- a/src/wp-content/themes/twentythirteen/css/blocks.css
+++ b/src/wp-content/themes/twentythirteen/css/blocks.css
@@ -271,7 +271,6 @@ body:not(.sidebar) .wp-block-cover > .wp-block-cover__inner-container > * {
 /* Table */
 
 .wp-block-table {
-	border-bottom: 1px solid #ededed;
 	border-collapse: collapse;
 	border-spacing: 0;
 	font-size: 14px;
@@ -423,7 +422,8 @@ body:not(.sidebar) .wp-block-table.alignfull {
 	max-width: 100px;
 }
 
-.wp-block-separator.is-style-wide {
+.wp-block-separator.is-style-wide,
+.wp-block-separator.is-style-dots {
 	max-width: 100%;
 }
 
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter.css b/src/wp-content/themes/twentythirteen/fonts/bitter.css
new file mode 100644
index 0000000000000..5ef6f76fc1d01
--- /dev/null
+++ b/src/wp-content/themes/twentythirteen/fonts/bitter.css
@@ -0,0 +1,125 @@
+/*
+Bitter
+Copyright 2011 The Bitter Project Authors (https://github.com/solmatas/BitterPro)
+SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+*/
+
+/* bitter-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-cyrillic-ext-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* bitter-cyrillic-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-cyrillic-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* bitter-vietnamese-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-vietnamese-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* bitter-latin-ext-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-latin-ext-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* bitter-latin-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-latin-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* bitter-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-cyrillic-ext-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* bitter-cyrillic-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-cyrillic-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* bitter-vietnamese-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-vietnamese-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* bitter-latin-ext-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-latin-ext-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* bitter-latin-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-latin-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/LICENSE.txt b/src/wp-content/themes/twentythirteen/fonts/bitter/LICENSE.txt
new file mode 100644
index 0000000000000..92af556360d0b
--- /dev/null
+++ b/src/wp-content/themes/twentythirteen/fonts/bitter/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2011 The Bitter Project Authors (https://github.com/solmatas/BitterPro)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-400-normal.woff b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-400-normal.woff
new file mode 100644
index 0000000000000..b25405baa80c2
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-700-normal.woff b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-700-normal.woff
new file mode 100644
index 0000000000000..6a9172cf2238c
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..e47d0dcb5cfdf
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..9b11f96af4c02
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..8a8d72ded9ea3
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..23358824a7535
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-400-normal.woff2
new file mode 100644
index 0000000000000..b9dd36dc1843c
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-700-normal.woff2
new file mode 100644
index 0000000000000..08115ec299dd2
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..09b91b0fe5809
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..188cb873b8804
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..f8ac29ce02b74
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..b9999a0199cec
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/bitter/bitter-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro-plus-bitter.css b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro-plus-bitter.css
new file mode 100644
index 0000000000000..3d0d1953b4073
--- /dev/null
+++ b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro-plus-bitter.css
@@ -0,0 +1,633 @@
+/*
+Source Sans Pro
+Copyright 2010 - 2018 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.
+SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+
+Bitter
+Copyright 2011 The Bitter Project Authors (https://github.com/solmatas/BitterPro)
+SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+*/
+
+/* source-sans-pro-cyrillic-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* bitter-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-cyrillic-ext-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* bitter-cyrillic-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-cyrillic-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* bitter-vietnamese-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-vietnamese-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* bitter-latin-ext-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-latin-ext-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* bitter-latin-400-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./bitter/bitter-latin-400-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-400-normal.woff?ver=32') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* bitter-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-cyrillic-ext-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* bitter-cyrillic-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-cyrillic-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* bitter-vietnamese-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-vietnamese-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* bitter-latin-ext-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-latin-ext-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* bitter-latin-700-normal */
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./bitter/bitter-latin-700-normal.woff2?ver=32') format('woff2'),
+		url('./bitter/bitter-all-700-normal.woff?ver=32') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro.css b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro.css
new file mode 100644
index 0000000000000..8cf569f57fe22
--- /dev/null
+++ b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro.css
@@ -0,0 +1,509 @@
+/*
+Source Sans Pro
+Copyright 2010 - 2018 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.
+SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+*/
+
+/* source-sans-pro-cyrillic-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-300-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-300-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-400-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-400-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-700-normal */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-700-normal.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-normal.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-300-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 300;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-300-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-300-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-400-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-400-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-400-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* source-sans-pro-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* source-sans-pro-cyrillic-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-cyrillic-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* source-sans-pro-greek-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* source-sans-pro-greek-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-greek-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* source-sans-pro-vietnamese-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-vietnamese-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* source-sans-pro-latin-ext-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-ext-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* source-sans-pro-latin-700-italic */
+@font-face {
+	font-family: 'Source Sans Pro';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./source-sans-pro/source-sans-pro-latin-700-italic.woff2?ver=21') format('woff2'),
+		url('./source-sans-pro/source-sans-pro-all-700-italic.woff?ver=21') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/LICENSE.txt b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/LICENSE.txt
new file mode 100644
index 0000000000000..9c4bb97aba409
--- /dev/null
+++ b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/LICENSE.txt
@@ -0,0 +1,93 @@
+© 2010 - 2018 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-italic.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-italic.woff
new file mode 100644
index 0000000000000..72d360085a3e6
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-italic.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-normal.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-normal.woff
new file mode 100644
index 0000000000000..e239b66ca3f55
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-300-normal.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-italic.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-italic.woff
new file mode 100644
index 0000000000000..cd65bfdb680a6
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-normal.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-normal.woff
new file mode 100644
index 0000000000000..cfcf43e0a7a82
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-italic.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-italic.woff
new file mode 100644
index 0000000000000..88af357143502
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-normal.woff b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-normal.woff
new file mode 100644
index 0000000000000..0cd0d7e51ef36
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-italic.woff2
new file mode 100644
index 0000000000000..4e14ab3a558cf
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-normal.woff2
new file mode 100644
index 0000000000000..0336e33d3414e
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-italic.woff2
new file mode 100644
index 0000000000000..180e76d94de8a
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..70f01fcbfe292
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-italic.woff2
new file mode 100644
index 0000000000000..96139c097a0eb
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..4d09160aeebff
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-italic.woff2
new file mode 100644
index 0000000000000..edae9e96ed4a8
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-normal.woff2
new file mode 100644
index 0000000000000..fa70af3a980fd
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-italic.woff2
new file mode 100644
index 0000000000000..7b21aa84a2578
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..5c9f701b2d193
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-italic.woff2
new file mode 100644
index 0000000000000..ec2c5f7efe276
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..b5e72d1206dce
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-italic.woff2
new file mode 100644
index 0000000000000..270f673570f76
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-normal.woff2
new file mode 100644
index 0000000000000..51260e3f43506
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-italic.woff2
new file mode 100644
index 0000000000000..6a8b92a336491
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-normal.woff2
new file mode 100644
index 0000000000000..33145f94248fa
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-italic.woff2
new file mode 100644
index 0000000000000..d097885400a72
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-normal.woff2
new file mode 100644
index 0000000000000..d0a493f5615ee
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-italic.woff2
new file mode 100644
index 0000000000000..4e14ab3a558cf
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-normal.woff2
new file mode 100644
index 0000000000000..47872fbcbed67
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-italic.woff2
new file mode 100644
index 0000000000000..180e76d94de8a
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-normal.woff2
new file mode 100644
index 0000000000000..69d26d8055a4c
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-italic.woff2
new file mode 100644
index 0000000000000..96139c097a0eb
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-normal.woff2
new file mode 100644
index 0000000000000..d62d6fcf998cb
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-greek-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-italic.woff2
new file mode 100644
index 0000000000000..a8e1fff22a7f3
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-normal.woff2
new file mode 100644
index 0000000000000..fed32a93357b8
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-italic.woff2
new file mode 100644
index 0000000000000..9448cd526e701
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-normal.woff2
new file mode 100644
index 0000000000000..e49928e8297a9
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-italic.woff2
new file mode 100644
index 0000000000000..b413356f73ba0
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-normal.woff2
new file mode 100644
index 0000000000000..cd6bfd0f4b5e5
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-italic.woff2
new file mode 100644
index 0000000000000..8fd07bcab20b5
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-normal.woff2
new file mode 100644
index 0000000000000..27005775162f9
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..0770522791180
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..f5d32d83ef3f2
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..5ac389644d7ca
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..6c0d4e3b744eb
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-italic.woff2
new file mode 100644
index 0000000000000..c5990b3cfb859
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-normal.woff2
new file mode 100644
index 0000000000000..7ae0d63c62d77
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-300-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..99f289532bb9d
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..ed1f90d05ce6d
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-italic.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-italic.woff2
new file mode 100644
index 0000000000000..04f9648d80bf5
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..09ce38a0d6a1b
Binary files /dev/null and b/src/wp-content/themes/twentythirteen/fonts/source-sans-pro/source-sans-pro-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentythirteen/functions.php b/src/wp-content/themes/twentythirteen/functions.php
index 927319814a4f1..33ec533128def 100644
--- a/src/wp-content/themes/twentythirteen/functions.php
+++ b/src/wp-content/themes/twentythirteen/functions.php
@@ -75,14 +75,27 @@ function twentythirteen_setup() {
 	 * If you're building a theme based on Twenty Thirteen, use a find and
 	 * replace to change 'twentythirteen' to the name of your theme in all
 	 * template files.
+	 *
+	 * Manual loading of text domain is not required after the introduction of
+	 * just in time translation loading in WordPress version 4.6.
+	 *
+	 * @ticket 58318
 	 */
-	load_theme_textdomain( 'twentythirteen' );
+	if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+		load_theme_textdomain( 'twentythirteen' );
+	}
 
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, icons, and column width.
+	 * specifically font, colors, icons, and column width. When fonts are
+	 * self-hosted, the theme directory needs to be removed first.
 	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentythirteen_fonts_url() ) );
+	$font_stylesheet = str_replace(
+		array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+		'',
+		twentythirteen_fonts_url()
+	);
+	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', $font_stylesheet ) );
 
 	// Load regular editor styles into the new block-based editor.
 	add_theme_support( 'editor-styles' );
@@ -208,7 +221,7 @@ function twentythirteen_setup() {
 
 	/*
 	 * This theme supports all available post formats by default.
-	 * See https://wordpress.org/support/article/post-formats/
+	 * See https://wordpress.org/documentation/article/post-formats/
 	 */
 	add_theme_support(
 		'post-formats',
@@ -243,52 +256,50 @@ function twentythirteen_setup() {
 }
 add_action( 'after_setup_theme', 'twentythirteen_setup' );
 
-/**
- * Return the Google font stylesheet URL, if available.
- *
- * The use of Source Sans Pro and Bitter by default is localized. For languages
- * that use characters not supported by the font, the font can be disabled.
- *
- * @since Twenty Thirteen 1.0
- *
- * @return string Font stylesheet or empty string if disabled.
- */
-function twentythirteen_fonts_url() {
-	$fonts_url = '';
-
-	/*
-	 * translators: If there are characters in your language that are not supported
-	 * by Source Sans Pro, translate this to 'off'. Do not translate into your own language.
+if ( ! function_exists( 'twentythirteen_fonts_url' ) ) :
+	/**
+	 * Return the font stylesheet URL, if available.
+	 *
+	 * The use of Source Sans Pro and Bitter by default is localized. For languages
+	 * that use characters not supported by the font, the font can be disabled.
+	 *
+	 * @since Twenty Thirteen 1.0
+	 * @since Twenty Thirteen 3.8 Replaced Google URL with self-hosted fonts.
+	 *
+	 * @return string Font stylesheet or empty string if disabled.
 	 */
-	$source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
+	function twentythirteen_fonts_url() {
+		$fonts_url = '';
 
-	/*
-	 * translators: If there are characters in your language that are not supported
-	 * by Bitter, translate this to 'off'. Do not translate into your own language.
-	 */
-	$bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
+		/*
+		 * translators: If there are characters in your language that are not supported
+		 * by Source Sans Pro, translate this to 'off'. Do not translate into your own language.
+		 */
+		$source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
 
-	if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
-		$font_families = array();
+		/*
+		 * translators: If there are characters in your language that are not supported
+		 * by Bitter, translate this to 'off'. Do not translate into your own language.
+		 */
+		$bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
 
-		if ( 'off' !== $source_sans_pro ) {
-			$font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
-		}
+		if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
+			$font_families = array();
+
+			if ( 'off' !== $source_sans_pro ) {
+				$font_families[] = 'source-sans-pro';
+			}
 
-		if ( 'off' !== $bitter ) {
-			$font_families[] = 'Bitter:400,700';
+			if ( 'off' !== $bitter ) {
+				$font_families[] = 'bitter';
+			}
+
+			$fonts_url = get_template_directory_uri() . '/fonts/' . implode( '-plus-', $font_families ) . '.css';
 		}
 
-		$query_args = array(
-			'family'  => urlencode( implode( '|', $font_families ) ),
-			'subset'  => urlencode( 'latin,latin-ext' ),
-			'display' => urlencode( 'fallback' ),
-		);
-		$fonts_url  = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		return $fonts_url;
 	}
-
-	return $fonts_url;
-}
+endif;
 
 /**
  * Enqueue scripts and styles for the front end.
@@ -310,22 +321,23 @@ function twentythirteen_scripts_styles() {
 	}
 
 	// Loads JavaScript file with functionality specific to Twenty Thirteen.
-	wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20210122', true );
+	wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', true );
 
 	// Add Source Sans Pro and Bitter fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentythirteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), $font_version );
 
 	// Add Genericons font, used in the main stylesheet.
 	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.0.3' );
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentythirteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentythirteen-style' ), '20210622' );
+	wp_enqueue_style( 'twentythirteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentythirteen-style' ), '20230621' );
 
-	// Loads the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '20150214' );
+	// Registers the Internet Explorer specific stylesheet.
+	wp_register_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '20150214' );
 	wp_style_add_data( 'twentythirteen-ie', 'conditional', 'lt IE 9' );
 }
 add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' );
@@ -334,6 +346,7 @@ function twentythirteen_scripts_styles() {
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Thirteen 2.1
+ * @deprecated Twenty Thirteen 3.8 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array   $urls          URLs to print for resource hints.
  * @param string  $relation_type The relation type the URLs are printed.
@@ -353,7 +366,7 @@ function twentythirteen_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
 
 /**
  * Enqueue styles for the block-based editor.
@@ -364,7 +377,8 @@ function twentythirteen_block_editor_styles() {
 	// Block styles.
 	wp_enqueue_style( 'twentythirteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20210621' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentythirteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentythirteen_block_editor_styles' );
 
@@ -376,6 +390,9 @@ function twentythirteen_block_editor_styles() {
  *
  * @since Twenty Thirteen 1.0
  *
+ * @global int $paged WordPress archive pagination page count.
+ * @global int $page  WordPress paginated post page count.
+ *
  * @param string $title Default title text for current view.
  * @param string $sep   Optional separator.
  * @return string The filtered title.
@@ -467,7 +484,12 @@ function twentythirteen_paging_nav() {
 		}
 		?>
 		<nav class="navigation paging-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Posts navigation', 'twentythirteen' );
+			?>
+		</h1>
 		<div class="nav-links">
 
 			<?php if ( get_next_posts_link() ) : ?>
@@ -489,6 +511,8 @@ function twentythirteen_paging_nav() {
 	 * Display navigation to next/previous post when applicable.
 	 *
 	 * @since Twenty Thirteen 1.0
+	 *
+	 * @global WP_Post $post Global post object.
 	 */
 	function twentythirteen_post_nav() {
 		global $post;
@@ -502,7 +526,12 @@ function twentythirteen_post_nav() {
 		}
 		?>
 		<nav class="navigation post-navigation">
-		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
+		<h1 class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Post navigation', 'twentythirteen' );
+			?>
+		</h1>
 		<div class="nav-links">
 
 			<?php previous_post_link( '%link', _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'twentythirteen' ) ); ?>
@@ -633,7 +662,7 @@ function twentythirteen_the_attached_image() {
 		// If there is more than 1 attachment in a gallery...
 		if ( count( $attachment_ids ) > 1 ) {
 			foreach ( $attachment_ids as $idx => $attachment_id ) {
-				if ( $attachment_id == $post->ID ) {
+				if ( $attachment_id === $post->ID ) {
 					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
 					break;
 				}
@@ -732,6 +761,8 @@ function twentythirteen_body_class( $classes ) {
  * Adjust content_width value for video post formats and attachment templates.
  *
  * @since Twenty Thirteen 1.0
+ *
+ * @global int $content_width Content width.
  */
 function twentythirteen_content_width() {
 	global $content_width;
diff --git a/src/wp-content/themes/twentythirteen/header.php b/src/wp-content/themes/twentythirteen/header.php
index 1ea956399a3bf..db2e19c89cbdb 100644
--- a/src/wp-content/themes/twentythirteen/header.php
+++ b/src/wp-content/themes/twentythirteen/header.php
@@ -9,24 +9,13 @@
  * @since Twenty Thirteen 1.0
  */
 ?><!DOCTYPE html>
-<!--[if IE 7]>
-<html class="ie ie7" <?php language_attributes(); ?>>
-<![endif]-->
-<!--[if IE 8]>
-<html class="ie ie8" <?php language_attributes(); ?>>
-<![endif]-->
-<!--[if !(IE 7) & !(IE 8)]><!-->
 <html <?php language_attributes(); ?>>
-<!--<![endif]-->
 <head>
 	<meta charset="<?php bloginfo( 'charset' ); ?>">
 	<meta name="viewport" content="width=device-width">
 	<title><?php wp_title( '|', true, 'right' ); ?></title>
 	<link rel="profile" href="https://gmpg.org/xfn/11">
 	<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
-	<!--[if lt IE 9]>
-	<script src="<?php echo esc_url( get_template_directory_uri() ); ?>/js/html5.js?ver=3.7.0"></script>
-	<![endif]-->
 	<?php wp_head(); ?>
 </head>
 
@@ -34,7 +23,7 @@
 	<?php wp_body_open(); ?>
 	<div id="page" class="hfeed site">
 		<header id="masthead" class="site-header">
-			<a class="home-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
+			<a class="home-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
 				<h1 class="site-title"><?php bloginfo( 'name' ); ?></h1>
 				<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
 			</a>
@@ -42,7 +31,12 @@
 			<div id="navbar" class="navbar">
 				<nav id="site-navigation" class="navigation main-navigation">
 					<button class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></button>
-					<a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
+					<a class="screen-reader-text skip-link" href="#content">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Skip to content', 'twentythirteen' );
+						?>
+					</a>
 					<?php
 					wp_nav_menu(
 						array(
diff --git a/src/wp-content/themes/twentythirteen/image.php b/src/wp-content/themes/twentythirteen/image.php
index 886eb225bf4ba..26ca20a094429 100644
--- a/src/wp-content/themes/twentythirteen/image.php
+++ b/src/wp-content/themes/twentythirteen/image.php
@@ -30,7 +30,7 @@
 					$published_text = __( 'Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Go to %4$s" rel="gallery">%5$s</a>', 'twentythirteen' );
 					$published_text = '<span class="attachment-meta">' . $published_text . '</span>';
 					$post_title     = get_the_title( $post->post_parent );
-					if ( empty( $post_title ) || 0 == $post->post_parent ) {
+					if ( empty( $post_title ) || 0 === $post->post_parent ) {
 						$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
 					}
 
diff --git a/src/wp-content/themes/twentythirteen/inc/custom-header.php b/src/wp-content/themes/twentythirteen/inc/custom-header.php
index 7bbb50ec35d7a..b87eaa058f830 100644
--- a/src/wp-content/themes/twentythirteen/inc/custom-header.php
+++ b/src/wp-content/themes/twentythirteen/inc/custom-header.php
@@ -90,7 +90,7 @@ function twentythirteen_header_style() {
 	$text_color   = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && get_theme_support( 'custom-header', 'default-text-color' ) == $text_color ) {
+	if ( empty( $header_image ) && get_theme_support( 'custom-header', 'default-text-color' ) === $text_color ) {
 		return;
 	}
 
@@ -136,7 +136,7 @@ function twentythirteen_header_style() {
 		endif;
 
 		// If the user has set a custom color for the text, use that.
-		elseif ( get_theme_support( 'custom-header', 'default-text-color' ) != $text_color ) :
+		elseif ( get_theme_support( 'custom-header', 'default-text-color' ) !== $text_color ) :
 			?>
 		.site-title,
 		.site-description {
diff --git a/src/wp-content/themes/twentythirteen/js/functions.js b/src/wp-content/themes/twentythirteen/js/functions.js
index 4b1102ebe9efe..8287fc8a59b87 100644
--- a/src/wp-content/themes/twentythirteen/js/functions.js
+++ b/src/wp-content/themes/twentythirteen/js/functions.js
@@ -100,24 +100,6 @@
 			onResizeARIA();
 	} );
 
-	/**
-	 * Makes "skip to content" link work correctly in IE9 and Chrome for better
-	 * accessibility.
-	 *
-	 * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
-	 */
-	_window.on( 'hashchange.twentythirteen', function() {
-		var element = document.getElementById( location.hash.substring( 1 ) );
-
-		if ( element ) {
-			if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) {
-				element.tabIndex = -1;
-			}
-
-			element.focus();
-		}
-	} );
-
 	/**
 	 * Arranges footer widgets vertically.
 	 */
diff --git a/src/wp-content/themes/twentythirteen/js/html5.js b/src/wp-content/themes/twentythirteen/js/html5.js
index 6168aacd5ed78..448cebd79e723 100644
--- a/src/wp-content/themes/twentythirteen/js/html5.js
+++ b/src/wp-content/themes/twentythirteen/js/html5.js
@@ -5,4 +5,4 @@
 a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
 c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
 "undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
\ No newline at end of file
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/src/wp-content/themes/twentythirteen/readme.txt b/src/wp-content/themes/twentythirteen/readme.txt
index b4c8b0ffb665a..23fc5813de5db 100644
--- a/src/wp-content/themes/twentythirteen/readme.txt
+++ b/src/wp-content/themes/twentythirteen/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Thirteen ===
 Contributors: wordpressdotorg
-Tested up to: 6.1
-Stable tag: 3.7
+Requires at least: 3.6
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 3.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-header, custom-menu, editor-style, featured-images, footer-widgets, microformats, post-formats, rtl-language-support, sticky-post, translation-ready, accessibility-ready, block-patterns
@@ -21,7 +23,7 @@ For more information about Twenty Thirteen please go to https://codex.wordpress.
 
 == Copyright ==
 
-Twenty Thirteen WordPress Theme, Copyright 2013-2022 WordPress.org & Automattic.com
+Twenty Thirteen WordPress Theme, Copyright 2013-2023 WordPress.org & Automattic.com
 Twenty Thirteen is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -44,6 +46,16 @@ Genericons icon font, Copyright 2013-2017 Automattic.com
 License: GNU GPL, Version 2 (or later)
 Source: http://www.genericons.com
 
+Bitter Font
+Copyright 2011 The Bitter Project Authors (https://github.com/solmatas/BitterPro)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/bitter
+
+Source Sans Pro Font
+© 2010 - 2018 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’.
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/source-sans-pro
+
 Images
 Cylinder Interior: https://www.flickr.com/photos/nasacommons/14052998066/in/album-72157644439092941/. Rick Guidice, NASA Ames Research Center.
 Bernal Cutaway: https://www.flickr.com/photos/nasacommons/14052996976/in/album-72157644439092941/ Don Davis, NASA Ames Research Center.
@@ -52,6 +64,16 @@ Toroidal Colony: https://www.flickr.com/photos/nasacommons/13889485757/in/album-
 
 == Changelog ==
 
+= 3.9 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_3.9
+
+= 3.8 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Thirteen_Theme_Changelog#Version_3.8
+
 = 3.7 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentythirteen/style.css b/src/wp-content/themes/twentythirteen/style.css
index 4ec5cf98f3881..ff75ebeed66db 100644
--- a/src/wp-content/themes/twentythirteen/style.css
+++ b/src/wp-content/themes/twentythirteen/style.css
@@ -4,8 +4,8 @@ Theme URI: https://wordpress.org/themes/twentythirteen/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small.
-Version: 3.7
-Tested up to: 6.1
+Version: 3.9
+Tested up to: 6.3
 Requires at least: 3.6
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
diff --git a/src/wp-content/themes/twentytwelve/author.php b/src/wp-content/themes/twentytwelve/author.php
index 8b3b22e266310..b0b7a57314dc5 100644
--- a/src/wp-content/themes/twentytwelve/author.php
+++ b/src/wp-content/themes/twentytwelve/author.php
@@ -33,7 +33,7 @@
 				<h1 class="archive-title">
 				<?php
 				/* translators: Author display name. */
-				printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' );
+				printf( __( 'Author Archives: %s', 'twentytwelve' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" rel="me">' . get_the_author() . '</a></span>' );
 				?>
 				</h1>
 			</header><!-- .archive-header -->
diff --git a/src/wp-content/themes/twentytwelve/comments.php b/src/wp-content/themes/twentytwelve/comments.php
index 4fea7d574a6e8..a7aa3f21a5161 100644
--- a/src/wp-content/themes/twentytwelve/comments.php
+++ b/src/wp-content/themes/twentytwelve/comments.php
@@ -29,7 +29,7 @@
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?php
-			if ( 1 === get_comments_number() ) {
+			if ( '1' === get_comments_number() ) {
 				printf(
 					/* translators: %s: The post title. */
 					__( 'One thought on &ldquo;%s&rdquo;', 'twentytwelve' ),
diff --git a/src/wp-content/themes/twentytwelve/css/blocks.css b/src/wp-content/themes/twentytwelve/css/blocks.css
index a88ffcbfe1862..d69ef621c6d65 100644
--- a/src/wp-content/themes/twentytwelve/css/blocks.css
+++ b/src/wp-content/themes/twentytwelve/css/blocks.css
@@ -232,6 +232,10 @@ pre.wp-block-code {
 	text-transform: uppercase;
 }
 
+.has-text-color th {
+	color: inherit;
+}
+
 .wp-block-table td {
 	border: 0;
 	border-top: 1px solid #ededed;
diff --git a/src/wp-content/themes/twentytwelve/css/editor-blocks.css b/src/wp-content/themes/twentytwelve/css/editor-blocks.css
index 29eb1f7ede596..39a4d87af482a 100644
--- a/src/wp-content/themes/twentytwelve/css/editor-blocks.css
+++ b/src/wp-content/themes/twentytwelve/css/editor-blocks.css
@@ -311,6 +311,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	width: 100%;
 }
 
+.editor-styles-wrapper .has-text-color th {
+	color: inherit;
+}
+
 .editor-block-list__block .wp-block-table th {
 	border: 0;
 	font-size: 11px;
diff --git a/src/wp-content/themes/twentytwelve/editor-style.css b/src/wp-content/themes/twentytwelve/editor-style.css
index 24e9b24f63e38..d3934a9151dfa 100644
--- a/src/wp-content/themes/twentytwelve/editor-style.css
+++ b/src/wp-content/themes/twentytwelve/editor-style.css
@@ -278,7 +278,7 @@ tr th {
 }
 td {
 	border-top: 1px solid #ededed !important;
-	color: #757575;
+	color: inherit;
 	font-size: inherit;
 	font-weight: normal;
 	padding: 6px 10px 6px 0;
diff --git a/src/wp-content/themes/twentytwelve/fonts/font-open-sans.css b/src/wp-content/themes/twentytwelve/fonts/font-open-sans.css
new file mode 100644
index 0000000000000..27c31d0a84441
--- /dev/null
+++ b/src/wp-content/themes/twentytwelve/fonts/font-open-sans.css
@@ -0,0 +1,389 @@
+/*
+Open Sans
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
+SIL Open Font License, Version 1.1 (https://opensource.org/licenses/OFL-1.1)
+*/
+
+/* open-sans-cyrillic-ext-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-cyrillic-ext-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* open-sans-cyrillic-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-cyrillic-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* open-sans-greek-ext-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-greek-ext-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* open-sans-greek-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-greek-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* open-sans-hebrew-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-hebrew-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+
+/* open-sans-vietnamese-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-vietnamese-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* open-sans-latin-ext-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-latin-ext-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* open-sans-latin-400-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-latin-400-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-italic.woff?ver=34') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* open-sans-cyrillic-ext-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-cyrillic-ext-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* open-sans-cyrillic-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-cyrillic-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* open-sans-greek-ext-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-greek-ext-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* open-sans-greek-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-greek-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* open-sans-hebrew-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-hebrew-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+
+/* open-sans-vietnamese-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-vietnamese-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* open-sans-latin-ext-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-latin-ext-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* open-sans-latin-400-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 400;
+	src:
+		url('./open-sans/open-sans-latin-400-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-400-normal.woff?ver=34') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* open-sans-cyrillic-ext-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-cyrillic-ext-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* open-sans-cyrillic-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-cyrillic-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* open-sans-greek-ext-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-greek-ext-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* open-sans-greek-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-greek-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* open-sans-hebrew-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-hebrew-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+
+/* open-sans-vietnamese-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-vietnamese-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* open-sans-latin-ext-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-latin-ext-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* open-sans-latin-700-italic */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: italic;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-latin-700-italic.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-italic.woff?ver=34') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* open-sans-cyrillic-ext-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-cyrillic-ext-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* open-sans-cyrillic-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-cyrillic-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* open-sans-greek-ext-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-greek-ext-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+1F00-1FFF;
+}
+
+/* open-sans-greek-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-greek-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0370-03FF;
+}
+
+/* open-sans-hebrew-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-hebrew-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0590-05FF, U+200C-2010, U+20AA, U+25CC, U+FB1D-FB4F;
+}
+
+/* open-sans-vietnamese-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-vietnamese-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+
+/* open-sans-latin-ext-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-latin-ext-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* open-sans-latin-700-normal */
+@font-face {
+	font-family: 'Open Sans';
+	font-style: normal;
+	font-display: fallback;
+	font-weight: 700;
+	src:
+		url('./open-sans/open-sans-latin-700-normal.woff2?ver=34') format('woff2'),
+		url('./open-sans/open-sans-all-700-normal.woff?ver=34') format('woff');
+	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/LICENSE.txt b/src/wp-content/themes/twentytwelve/fonts/open-sans/LICENSE.txt
new file mode 100644
index 0000000000000..d5e5ab592f4e9
--- /dev/null
+++ b/src/wp-content/themes/twentytwelve/fonts/open-sans/LICENSE.txt
@@ -0,0 +1,93 @@
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-italic.woff b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-italic.woff
new file mode 100644
index 0000000000000..7b91f730c657e
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-italic.woff differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-normal.woff b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-normal.woff
new file mode 100644
index 0000000000000..9bc5d1eede824
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-400-normal.woff differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-italic.woff b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-italic.woff
new file mode 100644
index 0000000000000..e9cf9d65407ed
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-italic.woff differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-normal.woff b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-normal.woff
new file mode 100644
index 0000000000000..fd9eb374f42da
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-all-700-normal.woff differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-italic.woff2
new file mode 100644
index 0000000000000..c100a25460328
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-normal.woff2
new file mode 100644
index 0000000000000..6bc81f45b26e5
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-italic.woff2
new file mode 100644
index 0000000000000..c6c37f36bdfd5
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-normal.woff2
new file mode 100644
index 0000000000000..26f70ab0464be
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-italic.woff2
new file mode 100644
index 0000000000000..577fee15aba3c
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-normal.woff2
new file mode 100644
index 0000000000000..e1d9435cc0a1a
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-italic.woff2
new file mode 100644
index 0000000000000..3b262f7250c24
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-normal.woff2
new file mode 100644
index 0000000000000..8925e52154231
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-cyrillic-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-italic.woff2
new file mode 100644
index 0000000000000..79cdbb390395d
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-normal.woff2
new file mode 100644
index 0000000000000..ce49b50c03738
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-italic.woff2
new file mode 100644
index 0000000000000..4eb925d7e8c36
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-normal.woff2
new file mode 100644
index 0000000000000..25f9dbd1e89d6
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-italic.woff2
new file mode 100644
index 0000000000000..44ba3eb1feb3b
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-normal.woff2
new file mode 100644
index 0000000000000..75bfc5515cc71
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-italic.woff2
new file mode 100644
index 0000000000000..e0d50d5c7925d
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-normal.woff2
new file mode 100644
index 0000000000000..cae462c3eb945
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-greek-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-italic.woff2
new file mode 100644
index 0000000000000..90462db92bd41
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-normal.woff2
new file mode 100644
index 0000000000000..c8694ce8a71d4
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-italic.woff2
new file mode 100644
index 0000000000000..74dd53ef7d87e
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-normal.woff2
new file mode 100644
index 0000000000000..44e869bbf9458
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-hebrew-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-italic.woff2
new file mode 100644
index 0000000000000..8da39ae4c515d
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-normal.woff2
new file mode 100644
index 0000000000000..15339ea9ccdd3
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-italic.woff2
new file mode 100644
index 0000000000000..603f7c8a5404b
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-normal.woff2
new file mode 100644
index 0000000000000..e832c2a07c92e
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-italic.woff2
new file mode 100644
index 0000000000000..7123b8cacd6cd
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-normal.woff2
new file mode 100644
index 0000000000000..0bc7ce746d66f
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-italic.woff2
new file mode 100644
index 0000000000000..6ba3c0f0ac75f
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-normal.woff2
new file mode 100644
index 0000000000000..b553788a65526
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-latin-ext-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-italic.woff2
new file mode 100644
index 0000000000000..de5608e919467
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-normal.woff2
new file mode 100644
index 0000000000000..8f59cae0a0723
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-400-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-italic.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-italic.woff2
new file mode 100644
index 0000000000000..63ec9ac5b100d
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-italic.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-normal.woff2 b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-normal.woff2
new file mode 100644
index 0000000000000..b994dc7841489
Binary files /dev/null and b/src/wp-content/themes/twentytwelve/fonts/open-sans/open-sans-vietnamese-700-normal.woff2 differ
diff --git a/src/wp-content/themes/twentytwelve/functions.php b/src/wp-content/themes/twentytwelve/functions.php
index 4ecca30d2a26d..a4b83afbaf89f 100644
--- a/src/wp-content/themes/twentytwelve/functions.php
+++ b/src/wp-content/themes/twentytwelve/functions.php
@@ -51,8 +51,15 @@ function twentytwelve_setup() {
 	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentytwelve
 	 * If you're building a theme based on Twenty Twelve, use a find and replace
 	 * to change 'twentytwelve' to the name of your theme in all the template files.
+	 *
+	 * Manual loading of text domain is not required after the introduction of
+	 * just in time translation loading in WordPress version 4.6.
+	 *
+	 * @ticket 58318
 	 */
-	load_theme_textdomain( 'twentytwelve' );
+	if ( version_compare( $GLOBALS['wp_version'], '4.6', '<' ) ) {
+		load_theme_textdomain( 'twentytwelve' );
+	}
 
 	// This theme styles the visual editor with editor-style.css to match the theme style.
 	add_editor_style();
@@ -137,50 +144,32 @@ function twentytwelve_setup() {
  */
 require get_template_directory() . '/inc/block-patterns.php';
 
-/**
- * Return the Google font stylesheet URL if available.
- *
- * The use of Open Sans by default is localized. For languages that use
- * characters not supported by the font, the font can be disabled.
- *
- * @since Twenty Twelve 1.2
- *
- * @return string Font stylesheet or empty string if disabled.
- */
-function twentytwelve_get_font_url() {
-	$font_url = '';
-
-	/*
-	 * translators: If there are characters in your language that are not supported
-	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
+if ( ! function_exists( 'twentytwelve_get_font_url' ) ) :
+	/**
+	 * Return the font stylesheet URL if available.
+	 *
+	 * The use of Open Sans by default is localized. For languages that use
+	 * characters not supported by the font, the font can be disabled.
+	 *
+	 * @since Twenty Twelve 1.2
+	 * @since Twenty Twelve 3.9 Replaced Google URL with self-hosted font.
+	 *
+	 * @return string Font stylesheet or empty string if disabled.
 	 */
-	if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
-		$subsets = 'latin,latin-ext';
+	function twentytwelve_get_font_url() {
+		$font_url = '';
 
 		/*
-		 * translators: To add an additional Open Sans character subset specific to your language,
-		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
-		 */
-		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
-
-		if ( 'cyrillic' === $subset ) {
-			$subsets .= ',cyrillic,cyrillic-ext';
-		} elseif ( 'greek' === $subset ) {
-			$subsets .= ',greek,greek-ext';
-		} elseif ( 'vietnamese' === $subset ) {
-			$subsets .= ',vietnamese';
+		* translators: If there are characters in your language that are not supported
+		* by Open Sans, translate this to 'off'. Do not translate into your own language.
+		*/
+		if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
+			$font_url = get_template_directory_uri() . '/fonts/font-open-sans.css';
 		}
 
-		$query_args = array(
-			'family'  => urlencode( 'Open Sans:400italic,700italic,400,700' ),
-			'subset'  => urlencode( $subsets ),
-			'display' => urlencode( 'fallback' ),
-		);
-		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		return $font_url;
 	}
-
-	return $font_url;
-}
+endif;
 
 /**
  * Enqueue scripts and styles for front end.
@@ -203,14 +192,15 @@ function twentytwelve_scripts_styles() {
 
 	$font_url = twentytwelve_get_font_url();
 	if ( ! empty( $font_url ) ) {
-		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+		$font_version = ( 0 === strpos( (string) twentytwelve_get_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), $font_version );
 	}
 
 	// Loads our main stylesheet.
-	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), '20221101' );
+	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), '20230808' );
 
 	// Theme block stylesheet.
-	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20190406' );
+	wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20230213' );
 
 	// Loads the Internet Explorer specific stylesheet.
 	wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20150214' );
@@ -225,9 +215,10 @@ function twentytwelve_scripts_styles() {
  */
 function twentytwelve_block_editor_styles() {
 	// Block styles.
-	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20200713' );
+	wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20230213' );
 	// Add custom fonts.
-	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
+	$font_version = ( 0 === strpos( (string) twentytwelve_get_font_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+	wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentytwelve_block_editor_styles' );
 
@@ -235,6 +226,7 @@ function twentytwelve_block_editor_styles() {
  * Add preconnect for Google Fonts.
  *
  * @since Twenty Twelve 2.2
+ * @deprecated Twenty Twelve 3.9 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array   $urls          URLs to print for resource hints.
  * @param string  $relation_type The relation type the URLs are printed.
@@ -254,14 +246,14 @@ function twentytwelve_resource_hints( $urls, $relation_type ) {
 
 	return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
 
 /**
- * Filter TinyMCE CSS path to include Google Fonts.
+ * Filter TinyMCE CSS path to include hosted fonts.
  *
  * Adds additional stylesheets to the TinyMCE editor if needed.
  *
- * @uses twentytwelve_get_font_url() To get the Google Font stylesheet URL.
+ * @uses twentytwelve_get_font_url() To get the font stylesheet URL.
  *
  * @since Twenty Twelve 1.2
  *
@@ -428,6 +420,8 @@ function twentytwelve_content_nav( $html_id ) {
 	 * Used as a callback by wp_list_comments() for displaying the comments.
 	 *
 	 * @since Twenty Twelve 1.0
+	 *
+	 * @global WP_Post $post Global post object.
 	 */
 	function twentytwelve_comment( $comment, $args, $depth ) {
 		$GLOBALS['comment'] = $comment;
@@ -474,7 +468,7 @@ function twentytwelve_comment( $comment, $args, $depth ) {
 				}
 				?>
 
-				<?php if ( '0' == $comment->comment_approved ) : ?>
+				<?php if ( '0' === $comment->comment_approved ) : ?>
 				<p class="comment-awaiting-moderation"><?php echo $moderation_note; ?></p>
 				<?php endif; ?>
 
diff --git a/src/wp-content/themes/twentytwelve/header.php b/src/wp-content/themes/twentytwelve/header.php
index fcb5f898750a6..0d4cf9441a47d 100644
--- a/src/wp-content/themes/twentytwelve/header.php
+++ b/src/wp-content/themes/twentytwelve/header.php
@@ -36,13 +36,13 @@
 <div id="page" class="hfeed site">
 	<header id="masthead" class="site-header">
 		<hgroup>
-			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 			<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
 		</hgroup>
 
 		<nav id="site-navigation" class="main-navigation">
 			<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
-			<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
+			<a class="assistive-text" href="#content"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
 			<?php
 			wp_nav_menu(
 				array(
diff --git a/src/wp-content/themes/twentytwelve/image.php b/src/wp-content/themes/twentytwelve/image.php
index 8958092c87221..ffdde2c00d23a 100644
--- a/src/wp-content/themes/twentytwelve/image.php
+++ b/src/wp-content/themes/twentytwelve/image.php
@@ -70,7 +70,7 @@
 				)
 			);
 			foreach ( $attachments as $k => $attachment ) :
-				if ( $attachment->ID == $post->ID ) {
+				if ( $attachment->ID === $post->ID ) {
 					break;
 				}
 			endforeach;
diff --git a/src/wp-content/themes/twentytwelve/inc/custom-header.php b/src/wp-content/themes/twentytwelve/inc/custom-header.php
index 693883ca7a4b3..84b3556c244aa 100644
--- a/src/wp-content/themes/twentytwelve/inc/custom-header.php
+++ b/src/wp-content/themes/twentytwelve/inc/custom-header.php
@@ -71,7 +71,7 @@ function twentytwelve_header_style() {
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( get_theme_support( 'custom-header', 'default-text-color' ) == $text_color ) {
+	if ( get_theme_support( 'custom-header', 'default-text-color' ) === $text_color ) {
 		return;
 	}
 
diff --git a/src/wp-content/themes/twentytwelve/readme.txt b/src/wp-content/themes/twentytwelve/readme.txt
index 6878b6fd4278d..fdd9cf76aab59 100644
--- a/src/wp-content/themes/twentytwelve/readme.txt
+++ b/src/wp-content/themes/twentytwelve/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Twelve ===
 Contributors: wordpressdotorg
-Tested up to: 6.1
-Stable tag: 3.8
+Requires at least: 3.5
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 4.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: blog, one-column, two-columns, right-sidebar, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, footer-widgets, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready, block-patterns
@@ -21,7 +23,7 @@ For more information about Twenty Twelve please go to https://codex.wordpress.or
 
 == Copyright ==
 
-Twenty Twelve WordPress Theme, Copyright 2012-2022 WordPress.org & Automattic.com
+Twenty Twelve WordPress Theme, Copyright 2012-2023 WordPress.org & Automattic.com
 Twenty Twelve is Distributed under the terms of the GNU GPL
 
 This program is free software: you can redistribute it and/or modify
@@ -40,12 +42,27 @@ HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas
 Licenses: MIT/GPL2
 Source: https://github.com/aFarkas/html5shiv
 
+Open Sans Font
+Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
+License: SIL Open Font License, 1.1, https://opensource.org/licenses/OFL-1.1
+Source: https://fontsource.org/fonts/open-sans
+
 "Fall Leaf Photo" by Tim Sullivan. CC0. https://stocksnap.io/photo/fall-leaf-ZBK0NLVP2B
 "Fall Leaf Photo" by Tim Sullivan. CC0. https://stocksnap.io/photo/fall-leaf-EEGO4GCPQD
 "Autumn City Photo" by Oleg Prokopenko. CC0. https://stocksnap.io/photo/autumn-city-PZP8EWR5MR
 
 == Changelog ==
 
+= 4.0 =
+* Released: August 8, 2023
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_4.0
+
+= 3.9 =
+* Released: March 28, 2023
+
+https://codex.wordpress.org/Twenty_Twelve_Theme_Changelog#Version_3.9
+
 = 3.8 =
 * Released: November 1, 2022
 
diff --git a/src/wp-content/themes/twentytwelve/style.css b/src/wp-content/themes/twentytwelve/style.css
index 75e3d28c46c65..17fdaabed526c 100644
--- a/src/wp-content/themes/twentytwelve/style.css
+++ b/src/wp-content/themes/twentytwelve/style.css
@@ -4,8 +4,8 @@ Theme URI: https://wordpress.org/themes/twentytwelve/
 Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 3.8
-Tested up to: 6.1
+Version: 4.0
+Tested up to: 6.3
 Requires at least: 3.5
 Requires PHP: 5.2.4
 License: GNU General Public License v2 or later
diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
index 2c3192b00fcd1..fcc5246aff2cf 100644
--- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
+++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
@@ -458,6 +458,11 @@ Inter variable font. Usage:
 	padding-right: 0;
 }
 
+.editor-styles-wrapper ul.wp-block-latest-posts {
+	margin-right: auto;
+	margin-left: auto;
+}
+
 .editor-styles-wrapper ul.wp-block-categories__list ul {
 	margin: 0;
 }
@@ -683,10 +688,17 @@ hr.wp-block-separator.is-style-dots::before {
 	font-style: normal;
 }
 
+.editor-styles-wrapper .wp-block-quote.has-text-color cite,
+.editor-styles-wrapper .wp-block-quote.has-background cite,
+.editor-styles-wrapper .has-background .wp-block-quote cite {
+	color: inherit;
+}
+
 .editor-styles-wrapper .wp-block-quote p {
 	color: inherit;
 	font-weight: 400;
 	margin: 0 0 20px 0;
+	letter-spacing: inherit;
 }
 
 .editor-styles-wrapper .wp-block-quote.is-style-large {
@@ -883,6 +895,12 @@ hr.wp-block-separator.is-style-dots::before {
 	text-transform: none;
 }
 
+.editor-styles-wrapper .wp-block-pullquote.has-text-color cite,
+.editor-styles-wrapper .wp-block-pullquote.has-background cite,
+.editor-styles-wrapper .has-background .wp-block-pullquote cite {
+	color: inherit;
+}
+
 /* STYLE: SOLID COLOR */
 
 .editor-styles-wrapper .wp-block-pullquote.is-style-solid-color {
@@ -933,6 +951,11 @@ hr.wp-block-separator.is-style-dots::before {
 	text-transform: uppercase;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .editor-styles-wrapper .wp-block-button .wp-block-button__link.mce-content-body {
 	line-height: 1.1;
 }
@@ -964,7 +987,7 @@ hr.wp-block-separator.is-style-dots::before {
 
 .editor-styles-wrapper .wp-block-latest-comments {
 	font-family: inherit;
-	margin-right: 0;
+	margin-right: auto;
 }
 
 .editor-styles-wrapper .wp-block-latest-comments li.wp-block-latest-comments__comment {
diff --git a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css
index 18e83281076db..ffe0b803343de 100644
--- a/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css
+++ b/src/wp-content/themes/twentytwenty/assets/css/editor-style-block.css
@@ -462,6 +462,11 @@ Inter variable font. Usage:
 	padding-left: 0;
 }
 
+.editor-styles-wrapper ul.wp-block-latest-posts {
+	margin-left: auto;
+	margin-right: auto;
+}
+
 .editor-styles-wrapper ul.wp-block-categories__list ul {
 	margin: 0;
 }
@@ -687,10 +692,17 @@ hr.wp-block-separator.is-style-dots::before {
 	font-style: normal;
 }
 
+.editor-styles-wrapper .wp-block-quote.has-text-color cite,
+.editor-styles-wrapper .wp-block-quote.has-background cite,
+.editor-styles-wrapper .has-background .wp-block-quote cite {
+	color: inherit;
+}
+
 .editor-styles-wrapper .wp-block-quote p {
 	color: inherit;
 	font-weight: 400;
 	margin: 0 0 20px 0;
+	letter-spacing: inherit;
 }
 
 .editor-styles-wrapper .wp-block-quote.is-style-large {
@@ -887,6 +899,12 @@ hr.wp-block-separator.is-style-dots::before {
 	text-transform: none;
 }
 
+.editor-styles-wrapper .wp-block-pullquote.has-text-color cite,
+.editor-styles-wrapper .wp-block-pullquote.has-background cite,
+.editor-styles-wrapper .has-background .wp-block-pullquote cite {
+	color: inherit;
+}
+
 /* STYLE: SOLID COLOR */
 
 .editor-styles-wrapper .wp-block-pullquote.is-style-solid-color {
@@ -937,6 +955,11 @@ hr.wp-block-separator.is-style-dots::before {
 	text-transform: uppercase;
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 .editor-styles-wrapper .wp-block-button .wp-block-button__link.mce-content-body {
 	line-height: 1.1;
 }
@@ -968,7 +991,7 @@ hr.wp-block-separator.is-style-dots::before {
 
 .editor-styles-wrapper .wp-block-latest-comments {
 	font-family: inherit;
-	margin-left: 0;
+	margin-left: auto;
 }
 
 .editor-styles-wrapper .wp-block-latest-comments li.wp-block-latest-comments__comment {
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
index e5a7f0dc74cfc..9be7acafe6a03 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php
@@ -25,7 +25,7 @@ class TwentyTwenty_Non_Latin_Languages {
 		 * @since Twenty Twenty 1.0
 		 *
 		 * @param string $type Whether to return CSS for the "front-end", "block-editor", or "classic-editor".
-		 * @return void
+		 * @return string|null Custom CSS, or null if not applicable.
 		 */
 		public static function get_non_latin_css( $type = 'front-end' ) {
 
@@ -105,7 +105,7 @@ public static function get_non_latin_css( $type = 'front-end' ) {
 
 			// Return if the selected language has no fallback fonts.
 			if ( empty( $font_family[ $locale ] ) ) {
-				return;
+				return null;
 			}
 
 			/**
@@ -126,7 +126,7 @@ public static function get_non_latin_css( $type = 'front-end' ) {
 
 			// Return if the specified type doesn't exist.
 			if ( empty( $elements[ $type ] ) ) {
-				return;
+				return null;
 			}
 
 			// Return the specified styles.
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
index 714b3a14542d2..0e576f0af6651 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php
@@ -214,6 +214,18 @@ public static function get_social_link_svg( $uri ) {
 			'mail'      => array(
 				'mailto:',
 			),
+			'mastodon'  => array(
+				'mastodon.social',
+				'pawoo.net',
+				'mstdn.jp',
+				'mastodon.cloud',
+				'mastodon.online',
+				'counter.social',
+				'mstdn.social',
+				'mas.to',
+				'mastodon.world',
+				'gc2.jp',
+			),
 			'pocket'    => array(
 				'getpocket.com',
 			),
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php
index bf348dcd336d8..eb2ec8efe55a6 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-comment.php
@@ -57,6 +57,7 @@ protected function html5_comment( $comment, $depth, $args ) {
 							printf(
 								'<span class="fn">%1$s</span><span class="screen-reader-text says">%2$s</span>',
 								esc_html( $comment_author ),
+								/* translators: Hidden accessibility text. */
 								__( 'says:', 'twentytwenty' )
 							);
 
@@ -72,10 +73,9 @@ protected function html5_comment( $comment, $depth, $args ) {
 							$comment_timestamp = sprintf( __( '%1$s at %2$s', 'twentytwenty' ), get_comment_date( '', $comment ), get_comment_time() );
 
 							printf(
-								'<a href="%s"><time datetime="%s" title="%s">%s</time></a>',
+								'<a href="%s"><time datetime="%s">%s</time></a>',
 								esc_url( get_comment_link( $comment, $args ) ),
 								get_comment_time( 'c' ),
-								esc_attr( $comment_timestamp ),
 								esc_html( $comment_timestamp )
 							);
 
diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
index eb927ec938e54..74ff332eed9b7 100644
--- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
+++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
@@ -38,10 +38,8 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 
 			if ( isset( $args['item_spacing'] ) && 'preserve' === $args['item_spacing'] ) {
 				$t = "\t";
-				$n = "\n";
 			} else {
 				$t = '';
-				$n = '';
 			}
 			if ( $depth ) {
 				$indent = str_repeat( $t, $depth );
@@ -112,7 +110,10 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 					$toggle_duration      = twentytwenty_toggle_duration();
 
 					// Add the sub menu toggle.
-					$args['list_item_after'] .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
+					$args['list_item_after'] .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' .
+						/* translators: Hidden accessibility text. */
+						__( 'Show sub menu', 'twentytwenty' ) .
+					'</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
 
 				}
 
diff --git a/src/wp-content/themes/twentytwenty/comments.php b/src/wp-content/themes/twentytwenty/comments.php
index 2bee32644def8..c4ef803cba583 100644
--- a/src/wp-content/themes/twentytwenty/comments.php
+++ b/src/wp-content/themes/twentytwenty/comments.php
@@ -23,7 +23,7 @@
 	<div class="comments" id="comments">
 
 		<?php
-		$comments_number = absint( get_comments_number() );
+		$comments_number = get_comments_number();
 		?>
 
 		<div class="comments-header section-inner small max-percentage">
@@ -32,7 +32,7 @@
 			<?php
 			if ( ! have_comments() ) {
 				_e( 'Leave a comment', 'twentytwenty' );
-			} elseif ( 1 === $comments_number ) {
+			} elseif ( '1' === $comments_number ) {
 				/* translators: %s: Post title. */
 				printf( _x( 'One reply on &ldquo;%s&rdquo;', 'comments title', 'twentytwenty' ), get_the_title() );
 			} else {
@@ -80,7 +80,7 @@
 				$pagination_classes = '';
 
 				// If we're only showing the "Next" link, add a class indicating so.
-				if ( false === strpos( $comment_pagination, 'prev page-numbers' ) ) {
+				if ( ! str_contains( $comment_pagination, 'prev page-numbers' ) ) {
 					$pagination_classes = ' only-next';
 				}
 				?>
diff --git a/src/wp-content/themes/twentytwenty/functions.php b/src/wp-content/themes/twentytwenty/functions.php
index c8944e03c1e14..be61189ea24d2 100644
--- a/src/wp-content/themes/twentytwenty/functions.php
+++ b/src/wp-content/themes/twentytwenty/functions.php
@@ -111,14 +111,6 @@ function twentytwenty_theme_support() {
 		)
 	);
 
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed in the /languages/ directory.
-	 * If you're building a theme based on Twenty Twenty, use a find and replace
-	 * to change 'twentytwenty' to the name of your theme in all the template files.
-	 */
-	load_theme_textdomain( 'twentytwenty' );
-
 	// Add support for full and wide align images.
 	add_theme_support( 'align-wide' );
 
@@ -196,7 +188,10 @@ function twentytwenty_register_styles() {
 	wp_style_add_data( 'twentytwenty-style', 'rtl', 'replace' );
 
 	// Add output of Customizer settings as inline style.
-	wp_add_inline_style( 'twentytwenty-style', twentytwenty_get_customizer_css( 'front-end' ) );
+	$customizer_css = twentytwenty_get_customizer_css( 'front-end' );
+	if ( $customizer_css ) {
+		wp_add_inline_style( 'twentytwenty-style', $customizer_css );
+	}
 
 	// Add print CSS.
 	wp_enqueue_style( 'twentytwenty-print-style', get_template_directory_uri() . '/print.css', null, $theme_version, 'print' );
@@ -232,6 +227,7 @@ function twentytwenty_register_scripts() {
  * thus it does not warrant having an entire dedicated blocking script being loaded.
  *
  * @since Twenty Twenty 1.0
+ * @deprecated Twenty Twenty 2.3 Removed from wp_print_footer_scripts action.
  *
  * @link https://git.io/vWdr2
  */
@@ -243,7 +239,6 @@ function twentytwenty_skip_link_focus_fix() {
 	</script>
 	<?php
 }
-add_action( 'wp_print_footer_scripts', 'twentytwenty_skip_link_focus_fix' );
 
 /**
  * Enqueue non-latin language styles.
@@ -321,7 +316,7 @@ function twentytwenty_get_custom_logo( $html ) {
 			);
 
 			// Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists.
-			if ( strpos( $html, ' style=' ) === false ) {
+			if ( ! str_contains( $html, ' style=' ) ) {
 				$search[]  = '/(src=)/';
 				$replace[] = "style=\"height: {$logo_height}px;\" src=";
 			} else {
@@ -359,7 +354,10 @@ function wp_body_open() {
  * @since Twenty Twenty 1.0
  */
 function twentytwenty_skip_link() {
-	echo '<a class="skip-link screen-reader-text" href="#site-content">' . __( 'Skip to the content', 'twentytwenty' ) . '</a>';
+	echo '<a class="skip-link screen-reader-text" href="#site-content">' .
+		/* translators: Hidden accessibility text. */
+		__( 'Skip to the content', 'twentytwenty' ) .
+	'</a>';
 }
 
 add_action( 'wp_body_open', 'twentytwenty_skip_link', 5 );
@@ -421,10 +419,16 @@ function twentytwenty_block_editor_styles() {
 	wp_style_add_data( 'twentytwenty-block-editor-styles', 'rtl', 'replace' );
 
 	// Add inline style from the Customizer.
-	wp_add_inline_style( 'twentytwenty-block-editor-styles', twentytwenty_get_customizer_css( 'block-editor' ) );
+	$customizer_css = twentytwenty_get_customizer_css( 'block-editor' );
+	if ( $customizer_css ) {
+		wp_add_inline_style( 'twentytwenty-block-editor-styles', $customizer_css );
+	}
 
 	// Add inline style for non-latin fonts.
-	wp_add_inline_style( 'twentytwenty-block-editor-styles', TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'block-editor' ) );
+	$custom_css = TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'block-editor' );
+	if ( $custom_css ) {
+		wp_add_inline_style( 'twentytwenty-block-editor-styles', $custom_css );
+	}
 
 	// Enqueue the editor script.
 	wp_enqueue_script( 'twentytwenty-block-editor-script', get_theme_file_uri( '/assets/js/editor-script-block.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
@@ -462,6 +466,10 @@ function twentytwenty_add_classic_editor_customizer_styles( $mce_init ) {
 
 	$styles = twentytwenty_get_customizer_css( 'classic-editor' );
 
+	if ( ! $styles ) {
+		return $mce_init;
+	}
+
 	if ( ! isset( $mce_init['content_style'] ) ) {
 		$mce_init['content_style'] = $styles . ' ';
 	} else {
@@ -754,7 +762,7 @@ function twentytwenty_get_elements_array() {
 		),
 		'header-footer' => array(
 			'accent'     => array(
-				'color'            => array( 'body:not(.overlay-header) .primary-menu > li > a', 'body:not(.overlay-header) .primary-menu > li > .icon', '.modal-menu a', '.footer-menu a, .footer-widgets a', '#site-footer .wp-block-button.is-style-outline', '.wp-block-pullquote:before', '.singular:not(.overlay-header) .entry-header a', '.archive-header a', '.header-footer-group .color-accent', '.header-footer-group .color-accent-hover:hover' ),
+				'color'            => array( 'body:not(.overlay-header) .primary-menu > li > a', 'body:not(.overlay-header) .primary-menu > li > .icon', '.modal-menu a', '.footer-menu a, .footer-widgets a:where(:not(.wp-block-button__link))', '#site-footer .wp-block-button.is-style-outline', '.wp-block-pullquote:before', '.singular:not(.overlay-header) .entry-header a', '.archive-header a', '.header-footer-group .color-accent', '.header-footer-group .color-accent-hover:hover' ),
 				'background-color' => array( '.social-icons a', '#site-footer button:not(.toggle)', '#site-footer .button', '#site-footer .faux-button', '#site-footer .wp-block-button__link', '#site-footer .wp-block-file__button', '#site-footer input[type="button"]', '#site-footer input[type="reset"]', '#site-footer input[type="submit"]' ),
 			),
 			'background' => array(
diff --git a/src/wp-content/themes/twentytwenty/inc/template-tags.php b/src/wp-content/themes/twentytwenty/inc/template-tags.php
index 858ecc1631b52..d91ffd344a9cb 100644
--- a/src/wp-content/themes/twentytwenty/inc/template-tags.php
+++ b/src/wp-content/themes/twentytwenty/inc/template-tags.php
@@ -329,7 +329,6 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 		// Make sure we don't output an empty container.
 		$has_meta = false;
 
-		global $post;
 		$the_post = get_post( $post_id );
 		setup_postdata( $the_post );
 
@@ -365,7 +364,12 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 					?>
 					<li class="post-author meta-wrapper">
 						<span class="meta-icon">
-							<span class="screen-reader-text"><?php _e( 'Post author', 'twentytwenty' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Post author', 'twentytwenty' );
+								?>
+							</span>
 							<?php twentytwenty_the_theme_svg( 'user' ); ?>
 						</span>
 						<span class="meta-text">
@@ -389,7 +393,12 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 					?>
 					<li class="post-date meta-wrapper">
 						<span class="meta-icon">
-							<span class="screen-reader-text"><?php _e( 'Post date', 'twentytwenty' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Post date', 'twentytwenty' );
+								?>
+							</span>
 							<?php twentytwenty_the_theme_svg( 'calendar' ); ?>
 						</span>
 						<span class="meta-text">
@@ -407,7 +416,12 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 					?>
 					<li class="post-categories meta-wrapper">
 						<span class="meta-icon">
-							<span class="screen-reader-text"><?php _e( 'Categories', 'twentytwenty' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Categories', 'twentytwenty' );
+								?>
+							</span>
 							<?php twentytwenty_the_theme_svg( 'folder' ); ?>
 						</span>
 						<span class="meta-text">
@@ -425,7 +439,12 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
 					?>
 					<li class="post-tags meta-wrapper">
 						<span class="meta-icon">
-							<span class="screen-reader-text"><?php _e( 'Tags', 'twentytwenty' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Tags', 'twentytwenty' );
+								?>
+							</span>
 							<?php twentytwenty_the_theme_svg( 'tag' ); ?>
 						</span>
 						<span class="meta-text">
@@ -523,10 +542,9 @@ function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' )
  * @param WP_Post  $page         Page data object.
  * @param int      $depth        Depth of page, used for padding.
  * @param array    $args         An array of arguments.
- * @param int      $current_page ID of the current page.
  * @return array CSS class names.
  */
-function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $depth, $args, $current_page ) {
+function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $depth, $args ) {
 
 	// Only apply to wp_list_pages() calls with match_menu_classes set to true.
 	$match_menu_classes = isset( $args['match_menu_classes'] );
@@ -549,7 +567,7 @@ function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $dep
 
 }
 
-add_filter( 'page_css_class', 'twentytwenty_filter_wp_list_pages_item_classes', 10, 5 );
+add_filter( 'page_css_class', 'twentytwenty_filter_wp_list_pages_item_classes', 10, 4 );
 
 /**
  * Adds a Sub Nav Toggle to the Expanded Menu and Mobile Menu.
@@ -558,10 +576,9 @@ function twentytwenty_filter_wp_list_pages_item_classes( $css_class, $page, $dep
  *
  * @param stdClass $args  An object of wp_nav_menu() arguments.
  * @param WP_Post  $item  Menu item data object.
- * @param int      $depth Depth of menu item. Used for padding.
  * @return stdClass An object of wp_nav_menu() arguments.
  */
-function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
+function twentytwenty_add_sub_toggles_to_main_menu( $args, $item ) {
 
 	// Add sub menu toggles to the Expanded Menu with toggles.
 	if ( isset( $args->show_toggles ) && $args->show_toggles ) {
@@ -577,7 +594,10 @@ function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
 			$toggle_duration      = twentytwenty_toggle_duration();
 
 			// Add the sub menu toggle.
-			$args->after .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
+			$args->after .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' .
+				/* translators: Hidden accessibility text. */
+				__( 'Show sub menu', 'twentytwenty' ) .
+			'</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
 
 		}
 
@@ -597,7 +617,7 @@ function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
 
 }
 
-add_filter( 'nav_menu_item_args', 'twentytwenty_add_sub_toggles_to_main_menu', 10, 3 );
+add_filter( 'nav_menu_item_args', 'twentytwenty_add_sub_toggles_to_main_menu', 10, 2 );
 
 /**
  * Displays SVG icons in social links menu.
@@ -651,6 +671,8 @@ function twentytwenty_no_js_class() {
  *
  * @since Twenty Twenty 1.0
  *
+ * @global WP_Post $post Global post object.
+ *
  * @param array $classes Classes added to the body tag.
  * @return array Classes added to the body tag.
  */
diff --git a/src/wp-content/themes/twentytwenty/index.php b/src/wp-content/themes/twentytwenty/index.php
index 2efda3596f72b..0c73e812e3adf 100644
--- a/src/wp-content/themes/twentytwenty/index.php
+++ b/src/wp-content/themes/twentytwenty/index.php
@@ -25,6 +25,9 @@
 	$archive_subtitle = '';
 
 	if ( is_search() ) {
+		/**
+		 * @global WP_Query $wp_query WordPress Query object.
+		 */
 		global $wp_query;
 
 		$archive_title = sprintf(
diff --git a/src/wp-content/themes/twentytwenty/package-lock.json b/src/wp-content/themes/twentytwenty/package-lock.json
index 2f85bd47330ed..eda16ad6bf3cb 100644
--- a/src/wp-content/themes/twentytwenty/package-lock.json
+++ b/src/wp-content/themes/twentytwenty/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "twentytwenty",
-	"version": "2.1.0",
+	"version": "2.3.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -24,31 +24,31 @@
 			}
 		},
 		"@babel/compat-data": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
-			"integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==",
+			"version": "7.20.14",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
+			"integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
 			"dev": true
 		},
 		"@babel/core": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz",
-			"integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==",
+			"version": "7.20.12",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
+			"integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
 			"dev": true,
 			"requires": {
 				"@ampproject/remapping": "^2.1.0",
 				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helpers": "^7.19.0",
-				"@babel/parser": "^7.19.1",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0",
+				"@babel/generator": "^7.20.7",
+				"@babel/helper-compilation-targets": "^7.20.7",
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helpers": "^7.20.7",
+				"@babel/parser": "^7.20.7",
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.20.12",
+				"@babel/types": "^7.20.7",
 				"convert-source-map": "^1.7.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
-				"json5": "^2.2.1",
+				"json5": "^2.2.2",
 				"semver": "^6.3.0"
 			}
 		},
@@ -64,12 +64,12 @@
 			}
 		},
 		"@babel/generator": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
-			"integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
+			"version": "7.20.14",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
+			"integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.19.0",
+				"@babel/types": "^7.20.7",
 				"@jridgewell/gen-mapping": "^0.3.2",
 				"jsesc": "^2.5.1"
 			},
@@ -107,40 +107,42 @@
 			}
 		},
 		"@babel/helper-compilation-targets": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
-			"integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz",
+			"integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.19.1",
+				"@babel/compat-data": "^7.20.5",
 				"@babel/helper-validator-option": "^7.18.6",
 				"browserslist": "^4.21.3",
+				"lru-cache": "^5.1.1",
 				"semver": "^6.3.0"
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+			"version": "7.20.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz",
+			"integrity": "sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-function-name": "^7.19.0",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
+				"@babel/helper-member-expression-to-functions": "^7.20.7",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-replace-supers": "^7.18.9",
+				"@babel/helper-replace-supers": "^7.20.7",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
 				"@babel/helper-split-export-declaration": "^7.18.6"
 			}
 		},
 		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-			"integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz",
+			"integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"regexpu-core": "^5.1.0"
+				"regexpu-core": "^5.2.1"
 			}
 		},
 		"@babel/helper-define-polyfill-provider": {
@@ -192,12 +194,12 @@
 			}
 		},
 		"@babel/helper-member-expression-to-functions": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-			"integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz",
+			"integrity": "sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.18.9"
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/helper-module-imports": {
@@ -210,19 +212,19 @@
 			}
 		},
 		"@babel/helper-module-transforms": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
-			"integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
+			"integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
+				"@babel/helper-simple-access": "^7.20.2",
 				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/helper-validator-identifier": "^7.19.1",
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.20.10",
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/helper-optimise-call-expression": {
@@ -235,9 +237,9 @@
 			}
 		},
 		"@babel/helper-plugin-utils": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-			"integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+			"integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
 			"dev": true
 		},
 		"@babel/helper-remap-async-to-generator": {
@@ -253,34 +255,35 @@
 			}
 		},
 		"@babel/helper-replace-supers": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-			"integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
+			"integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-member-expression-to-functions": "^7.18.9",
+				"@babel/helper-member-expression-to-functions": "^7.20.7",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/traverse": "^7.19.1",
-				"@babel/types": "^7.19.0"
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.20.7",
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/helper-simple-access": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
-			"integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+			"integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.18.6"
+				"@babel/types": "^7.20.2"
 			}
 		},
 		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-			"integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+			"integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.18.9"
+				"@babel/types": "^7.20.0"
 			}
 		},
 		"@babel/helper-split-export-declaration": {
@@ -293,9 +296,9 @@
 			}
 		},
 		"@babel/helper-string-parser": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
-			"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+			"version": "7.19.4",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+			"integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
 			"dev": true
 		},
 		"@babel/helper-validator-identifier": {
@@ -311,26 +314,26 @@
 			"dev": true
 		},
 		"@babel/helper-wrap-function": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-			"integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
+			"integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-function-name": "^7.19.0",
 				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/traverse": "^7.20.5",
+				"@babel/types": "^7.20.5"
 			}
 		},
 		"@babel/helpers": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
-			"integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
+			"integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.18.10",
-				"@babel/traverse": "^7.19.0",
-				"@babel/types": "^7.19.0"
+				"@babel/template": "^7.20.7",
+				"@babel/traverse": "^7.20.13",
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/highlight": {
@@ -358,9 +361,9 @@
 			}
 		},
 		"@babel/parser": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
-			"integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==",
+			"version": "7.20.15",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
+			"integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
 			"dev": true
 		},
 		"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
@@ -373,24 +376,24 @@
 			}
 		},
 		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
+			"integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-				"@babel/plugin-proposal-optional-chaining": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+				"@babel/plugin-proposal-optional-chaining": "^7.20.7"
 			}
 		},
 		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-			"integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+			"integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-environment-visitor": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-remap-async-to-generator": "^7.18.9",
 				"@babel/plugin-syntax-async-generators": "^7.8.4"
 			}
@@ -406,13 +409,13 @@
 			}
 		},
 		"@babel/plugin-proposal-class-static-block": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-			"integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz",
+			"integrity": "sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/helper-create-class-features-plugin": "^7.20.7",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-class-static-block": "^7.14.5"
 			}
 		},
@@ -447,12 +450,12 @@
 			}
 		},
 		"@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-			"integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
+			"integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
 			}
 		},
@@ -477,16 +480,16 @@
 			}
 		},
 		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
-			"integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+			"integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.18.8",
-				"@babel/helper-compilation-targets": "^7.18.9",
-				"@babel/helper-plugin-utils": "^7.18.9",
+				"@babel/compat-data": "^7.20.5",
+				"@babel/helper-compilation-targets": "^7.20.7",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.18.8"
+				"@babel/plugin-transform-parameters": "^7.20.7"
 			}
 		},
 		"@babel/plugin-proposal-optional-catch-binding": {
@@ -500,13 +503,13 @@
 			}
 		},
 		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-			"integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz",
+			"integrity": "sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
 				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
 			}
 		},
@@ -521,14 +524,14 @@
 			}
 		},
 		"@babel/plugin-proposal-private-property-in-object": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-			"integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz",
+			"integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-create-class-features-plugin": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
+				"@babel/helper-create-class-features-plugin": "^7.20.5",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
 			}
 		},
@@ -597,12 +600,12 @@
 			}
 		},
 		"@babel/plugin-syntax-import-assertions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-			"integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
+			"integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.19.0"
 			}
 		},
 		"@babel/plugin-syntax-import-meta": {
@@ -705,32 +708,32 @@
 			}
 		},
 		"@babel/plugin-syntax-typescript": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
-			"integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
+			"integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.19.0"
 			}
 		},
 		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-			"integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz",
+			"integrity": "sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-			"integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
+			"integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-remap-async-to-generator": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-remap-async-to-generator": "^7.18.9"
 			}
 		},
 		"@babel/plugin-transform-block-scoped-functions": {
@@ -743,47 +746,48 @@
 			}
 		},
 		"@babel/plugin-transform-block-scoping": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz",
-			"integrity": "sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==",
+			"version": "7.20.15",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.15.tgz",
+			"integrity": "sha512-Vv4DMZ6MiNOhu/LdaZsT/bsLRxgL94d269Mv4R/9sp6+Mp++X/JqypZYypJXLlM4mlL352/Egzbzr98iABH1CA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-classes": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-			"integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz",
+			"integrity": "sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
-				"@babel/helper-compilation-targets": "^7.19.0",
+				"@babel/helper-compilation-targets": "^7.20.7",
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-function-name": "^7.19.0",
 				"@babel/helper-optimise-call-expression": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-replace-supers": "^7.18.9",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-replace-supers": "^7.20.7",
 				"@babel/helper-split-export-declaration": "^7.18.6",
 				"globals": "^11.1.0"
 			}
 		},
 		"@babel/plugin-transform-computed-properties": {
-			"version": "7.18.9",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-			"integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz",
+			"integrity": "sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/template": "^7.20.7"
 			}
 		},
 		"@babel/plugin-transform-destructuring": {
-			"version": "7.18.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
-			"integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz",
+			"integrity": "sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-dotall-regex": {
@@ -854,39 +858,36 @@
 			}
 		},
 		"@babel/plugin-transform-modules-amd": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
-			"integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
+			"integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
-			"integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz",
+			"integrity": "sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"@babel/helper-simple-access": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-simple-access": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
-			"integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
+			"version": "7.20.11",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
+			"integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-hoist-variables": "^7.18.6",
-				"@babel/helper-module-transforms": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-validator-identifier": "^7.18.6",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-module-transforms": "^7.20.11",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-validator-identifier": "^7.19.1"
 			}
 		},
 		"@babel/plugin-transform-modules-umd": {
@@ -900,13 +901,13 @@
 			}
 		},
 		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-			"integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
+			"integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0"
+				"@babel/helper-create-regexp-features-plugin": "^7.20.5",
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-new-target": {
@@ -929,12 +930,12 @@
 			}
 		},
 		"@babel/plugin-transform-parameters": {
-			"version": "7.18.8",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-			"integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz",
+			"integrity": "sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6"
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-property-literals": {
@@ -947,12 +948,12 @@
 			}
 		},
 		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.18.12",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
-			"integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz",
+			"integrity": "sha512-KS/G8YI8uwMGKErLFOHS/ekhqdHhpEloxs43NecQHVgo2QuQSyJhGIY1fL8UGl9wy5ItVwwoUL4YxVqsplGq2g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2"
 			}
 		},
 		"@babel/plugin-transform-react-display-name": {
@@ -965,16 +966,16 @@
 			}
 		},
 		"@babel/plugin-transform-react-jsx": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
-			"integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz",
+			"integrity": "sha512-MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.18.6",
 				"@babel/helper-module-imports": "^7.18.6",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/plugin-syntax-jsx": "^7.18.6",
-				"@babel/types": "^7.19.0"
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/plugin-transform-react-jsx-development": {
@@ -997,13 +998,13 @@
 			}
 		},
 		"@babel/plugin-transform-regenerator": {
-			"version": "7.18.6",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-			"integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz",
+			"integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.18.6",
-				"regenerator-transform": "^0.15.0"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"regenerator-transform": "^0.15.1"
 			}
 		},
 		"@babel/plugin-transform-reserved-words": {
@@ -1016,9 +1017,9 @@
 			}
 		},
 		"@babel/plugin-transform-runtime": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz",
-			"integrity": "sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA==",
+			"version": "7.19.6",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
+			"integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
 			"dev": true,
 			"requires": {
 				"@babel/helper-module-imports": "^7.18.6",
@@ -1039,13 +1040,13 @@
 			}
 		},
 		"@babel/plugin-transform-spread": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-			"integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
+			"integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
 			}
 		},
 		"@babel/plugin-transform-sticky-regex": {
@@ -1076,14 +1077,14 @@
 			}
 		},
 		"@babel/plugin-transform-typescript": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz",
-			"integrity": "sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==",
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz",
+			"integrity": "sha512-O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.19.0",
-				"@babel/helper-plugin-utils": "^7.19.0",
-				"@babel/plugin-syntax-typescript": "^7.18.6"
+				"@babel/helper-create-class-features-plugin": "^7.20.12",
+				"@babel/helper-plugin-utils": "^7.20.2",
+				"@babel/plugin-syntax-typescript": "^7.20.0"
 			}
 		},
 		"@babel/plugin-transform-unicode-escapes": {
@@ -1106,18 +1107,18 @@
 			}
 		},
 		"@babel/preset-env": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
-			"integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
+			"version": "7.20.2",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz",
+			"integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.19.1",
-				"@babel/helper-compilation-targets": "^7.19.1",
-				"@babel/helper-plugin-utils": "^7.19.0",
+				"@babel/compat-data": "^7.20.1",
+				"@babel/helper-compilation-targets": "^7.20.0",
+				"@babel/helper-plugin-utils": "^7.20.2",
 				"@babel/helper-validator-option": "^7.18.6",
 				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
 				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-				"@babel/plugin-proposal-async-generator-functions": "^7.19.1",
+				"@babel/plugin-proposal-async-generator-functions": "^7.20.1",
 				"@babel/plugin-proposal-class-properties": "^7.18.6",
 				"@babel/plugin-proposal-class-static-block": "^7.18.6",
 				"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1126,7 +1127,7 @@
 				"@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
 				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
 				"@babel/plugin-proposal-numeric-separator": "^7.18.6",
-				"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+				"@babel/plugin-proposal-object-rest-spread": "^7.20.2",
 				"@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
 				"@babel/plugin-proposal-optional-chaining": "^7.18.9",
 				"@babel/plugin-proposal-private-methods": "^7.18.6",
@@ -1137,7 +1138,7 @@
 				"@babel/plugin-syntax-class-static-block": "^7.14.5",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.18.6",
+				"@babel/plugin-syntax-import-assertions": "^7.20.0",
 				"@babel/plugin-syntax-json-strings": "^7.8.3",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
 				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1150,10 +1151,10 @@
 				"@babel/plugin-transform-arrow-functions": "^7.18.6",
 				"@babel/plugin-transform-async-to-generator": "^7.18.6",
 				"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-				"@babel/plugin-transform-block-scoping": "^7.18.9",
-				"@babel/plugin-transform-classes": "^7.19.0",
+				"@babel/plugin-transform-block-scoping": "^7.20.2",
+				"@babel/plugin-transform-classes": "^7.20.2",
 				"@babel/plugin-transform-computed-properties": "^7.18.9",
-				"@babel/plugin-transform-destructuring": "^7.18.13",
+				"@babel/plugin-transform-destructuring": "^7.20.2",
 				"@babel/plugin-transform-dotall-regex": "^7.18.6",
 				"@babel/plugin-transform-duplicate-keys": "^7.18.9",
 				"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -1161,14 +1162,14 @@
 				"@babel/plugin-transform-function-name": "^7.18.9",
 				"@babel/plugin-transform-literals": "^7.18.9",
 				"@babel/plugin-transform-member-expression-literals": "^7.18.6",
-				"@babel/plugin-transform-modules-amd": "^7.18.6",
-				"@babel/plugin-transform-modules-commonjs": "^7.18.6",
-				"@babel/plugin-transform-modules-systemjs": "^7.19.0",
+				"@babel/plugin-transform-modules-amd": "^7.19.6",
+				"@babel/plugin-transform-modules-commonjs": "^7.19.6",
+				"@babel/plugin-transform-modules-systemjs": "^7.19.6",
 				"@babel/plugin-transform-modules-umd": "^7.18.6",
 				"@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
 				"@babel/plugin-transform-new-target": "^7.18.6",
 				"@babel/plugin-transform-object-super": "^7.18.6",
-				"@babel/plugin-transform-parameters": "^7.18.8",
+				"@babel/plugin-transform-parameters": "^7.20.1",
 				"@babel/plugin-transform-property-literals": "^7.18.6",
 				"@babel/plugin-transform-regenerator": "^7.18.6",
 				"@babel/plugin-transform-reserved-words": "^7.18.6",
@@ -1180,7 +1181,7 @@
 				"@babel/plugin-transform-unicode-escapes": "^7.18.10",
 				"@babel/plugin-transform-unicode-regex": "^7.18.6",
 				"@babel/preset-modules": "^0.1.5",
-				"@babel/types": "^7.19.0",
+				"@babel/types": "^7.20.2",
 				"babel-plugin-polyfill-corejs2": "^0.3.3",
 				"babel-plugin-polyfill-corejs3": "^0.6.0",
 				"babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -1227,61 +1228,51 @@
 			}
 		},
 		"@babel/runtime": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
-			"integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
-			"dev": true,
-			"requires": {
-				"regenerator-runtime": "^0.13.4"
-			}
-		},
-		"@babel/runtime-corejs3": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz",
-			"integrity": "sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==",
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz",
+			"integrity": "sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==",
 			"dev": true,
 			"requires": {
-				"core-js-pure": "^3.25.1",
-				"regenerator-runtime": "^0.13.4"
+				"regenerator-runtime": "^0.13.11"
 			}
 		},
 		"@babel/template": {
-			"version": "7.18.10",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-			"integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+			"integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.18.6",
-				"@babel/parser": "^7.18.10",
-				"@babel/types": "^7.18.10"
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7"
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.19.1",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
-			"integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
+			"version": "7.20.13",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
+			"integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
 			"dev": true,
 			"requires": {
 				"@babel/code-frame": "^7.18.6",
-				"@babel/generator": "^7.19.0",
+				"@babel/generator": "^7.20.7",
 				"@babel/helper-environment-visitor": "^7.18.9",
 				"@babel/helper-function-name": "^7.19.0",
 				"@babel/helper-hoist-variables": "^7.18.6",
 				"@babel/helper-split-export-declaration": "^7.18.6",
-				"@babel/parser": "^7.19.1",
-				"@babel/types": "^7.19.0",
+				"@babel/parser": "^7.20.13",
+				"@babel/types": "^7.20.7",
 				"debug": "^4.1.0",
 				"globals": "^11.1.0"
 			}
 		},
 		"@babel/types": {
-			"version": "7.19.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
-			"integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
+			"version": "7.20.7",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
+			"integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-string-parser": "^7.18.10",
-				"@babel/helper-validator-identifier": "^7.18.6",
+				"@babel/helper-string-parser": "^7.19.4",
+				"@babel/helper-validator-identifier": "^7.19.1",
 				"to-fast-properties": "^2.0.0"
 			}
 		},
@@ -1292,9 +1283,9 @@
 			"dev": true
 		},
 		"@csstools/selector-specificity": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-			"integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz",
+			"integrity": "sha512-jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw==",
 			"dev": true
 		},
 		"@discoveryjs/json-ext": {
@@ -1304,26 +1295,26 @@
 			"dev": true
 		},
 		"@es-joy/jsdoccomment": {
-			"version": "0.20.1",
-			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.20.1.tgz",
-			"integrity": "sha512-oeJK41dcdqkvdZy/HctKklJNkt/jh+av3PZARrZEl+fs/8HaHeeYoAvEwOV0u5I6bArTF17JEsTZMY359e/nfQ==",
+			"version": "0.36.1",
+			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.36.1.tgz",
+			"integrity": "sha512-922xqFsTpHs6D0BUiG4toiyPOMc8/jafnWKxz1KWgS4XzKPy2qXf1Pe6UFuNSCQqt6tOuhAWXBNuuyUhJmw9Vg==",
 			"dev": true,
 			"requires": {
-				"comment-parser": "1.3.0",
+				"comment-parser": "1.3.1",
 				"esquery": "^1.4.0",
-				"jsdoc-type-pratt-parser": "~2.2.3"
+				"jsdoc-type-pratt-parser": "~3.1.0"
 			}
 		},
 		"@eslint/eslintrc": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-			"integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+			"integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
 			"dev": true,
 			"requires": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
 				"espree": "^9.4.0",
-				"globals": "^13.15.0",
+				"globals": "^13.19.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
 				"js-yaml": "^4.1.0",
@@ -1338,9 +1329,9 @@
 					"dev": true
 				},
 				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+					"version": "13.20.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+					"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
@@ -1373,22 +1364,16 @@
 			}
 		},
 		"@humanwhocodes/config-array": {
-			"version": "0.10.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
-			"integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
+			"version": "0.11.8",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+			"integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
 			"dev": true,
 			"requires": {
 				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"minimatch": "^3.0.5"
 			}
 		},
-		"@humanwhocodes/gitignore-to-minimatch": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-			"integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-			"dev": true
-		},
 		"@humanwhocodes/module-importer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1749,13 +1734,13 @@
 			"dev": true
 		},
 		"@jridgewell/trace-mapping": {
-			"version": "0.3.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
-			"integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
+			"version": "0.3.17",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+			"integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
 			"dev": true,
 			"requires": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
+				"@jridgewell/resolve-uri": "3.1.0",
+				"@jridgewell/sourcemap-codec": "1.4.14"
 			}
 		},
 		"@leichtgewicht/ip-codec": {
@@ -1800,18 +1785,18 @@
 			}
 		},
 		"@pmmmwh/react-refresh-webpack-plugin": {
-			"version": "0.5.7",
-			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.7.tgz",
-			"integrity": "sha512-bcKCAzF0DV2IIROp9ZHkRJa6O4jy7NlnHdWL3GmcUxYWNjLXkK5kfELELwEfSP5hXPfVL/qOGMAROuMQb9GG8Q==",
+			"version": "0.5.10",
+			"resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.10.tgz",
+			"integrity": "sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==",
 			"dev": true,
 			"requires": {
 				"ansi-html-community": "^0.0.8",
 				"common-path-prefix": "^3.0.0",
-				"core-js-pure": "^3.8.1",
+				"core-js-pure": "^3.23.3",
 				"error-stack-parser": "^2.0.6",
 				"find-up": "^5.0.0",
 				"html-entities": "^2.1.0",
-				"loader-utils": "^2.0.0",
+				"loader-utils": "^2.0.4",
 				"schema-utils": "^3.0.0",
 				"source-map": "^0.7.3"
 			}
@@ -1832,9 +1817,9 @@
 			}
 		},
 		"@sideway/formula": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
-			"integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+			"integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
 			"dev": true
 		},
 		"@sideway/pinpoint": {
@@ -1844,9 +1829,9 @@
 			"dev": true
 		},
 		"@sinonjs/commons": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+			"version": "1.8.6",
+			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+			"integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
 			"dev": true,
 			"requires": {
 				"type-detect": "4.0.8"
@@ -1862,106 +1847,108 @@
 			}
 		},
 		"@svgr/babel-plugin-add-jsx-attribute": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.3.1.tgz",
-			"integrity": "sha512-jDBKArXYO1u0B1dmd2Nf8Oy6aTF5vLDfLoO9Oon/GLkqZ/NiggYWZA+a2HpUMH4ITwNqS3z43k8LWApB8S583w==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.5.1.tgz",
+			"integrity": "sha512-9PYGcXrAxitycIjRmZB+Q0JaN07GZIWaTBIGQzfaZv+qr1n8X1XUEJ5rZ/vx6OVD9RRYlrNnXWExQXcmZeD/BQ==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-remove-jsx-attribute": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.3.1.tgz",
-			"integrity": "sha512-dQzyJ4prwjcFd929T43Z8vSYiTlTu8eafV40Z2gO7zy/SV5GT+ogxRJRBIKWomPBOiaVXFg3jY4S5hyEN3IBjQ==",
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.5.0.tgz",
+			"integrity": "sha512-8zYdkym7qNyfXpWvu4yq46k41pyNM9SOstoWhKlm+IfdCE1DdnRKeMUPsWIEO/DEkaWxJ8T9esNdG3QwQ93jBA==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-remove-jsx-empty-expression": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.3.1.tgz",
-			"integrity": "sha512-HBOUc1XwSU67fU26V5Sfb8MQsT0HvUyxru7d0oBJ4rA2s4HW3PhyAPC7fV/mdsSGpAvOdd8Wpvkjsr0fWPUO7A==",
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.5.0.tgz",
+			"integrity": "sha512-NFdxMq3xA42Kb1UbzCVxplUc0iqSyM9X8kopImvFnB+uSDdzIHOdbs1op8ofAvVRtbg4oZiyRl3fTYeKcOe9Iw==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-replace-jsx-attribute-value": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.3.1.tgz",
-			"integrity": "sha512-C12e6aN4BXAolRrI601gPn5MDFCRHO7C4TM8Kks+rDtl8eEq+NN1sak0eAzJu363x3TmHXdZn7+Efd2nr9I5dA==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.5.1.tgz",
+			"integrity": "sha512-8DPaVVE3fd5JKuIC29dqyMB54sA6mfgki2H2+swh+zNJoynC8pMPzOkidqHOSc6Wj032fhl8Z0TVn1GiPpAiJg==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-svg-dynamic-title": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.3.1.tgz",
-			"integrity": "sha512-6NU55Mmh3M5u2CfCCt6TX29/pPneutrkJnnDCHbKZnjukZmmgUAZLtZ2g6ZoSPdarowaQmAiBRgAHqHmG0vuqA==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.5.1.tgz",
+			"integrity": "sha512-FwOEi0Il72iAzlkaHrlemVurgSQRDFbk0OC8dSvD5fSBPHltNh7JtLsxmZUhjYBZo2PpcU/RJvvi6Q0l7O7ogw==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-svg-em-dimensions": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.3.1.tgz",
-			"integrity": "sha512-HV1NGHYTTe1vCNKlBgq/gKuCSfaRlKcHIADn7P8w8U3Zvujdw1rmusutghJ1pZJV7pDt3Gt8ws+SVrqHnBO/Qw==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.5.1.tgz",
+			"integrity": "sha512-gWGsiwjb4tw+ITOJ86ndY/DZZ6cuXMNE/SjcDRg+HLuCmwpcjOktwRF9WgAiycTqJD/QXqL2f8IzE2Rzh7aVXA==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-transform-react-native-svg": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.3.1.tgz",
-			"integrity": "sha512-2wZhSHvTolFNeKDAN/ZmIeSz2O9JSw72XD+o2bNp2QAaWqa8KGpn5Yk5WHso6xqfSAiRzAE+GXlsrBO4UP9LLw==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.5.1.tgz",
+			"integrity": "sha512-2jT3nTayyYP7kI6aGutkyfJ7UMGtuguD72OjeGLwVNyfPRBD8zQthlvL+fAbAKk5n9ZNcvFkp/b1lZ7VsYqVJg==",
 			"dev": true
 		},
 		"@svgr/babel-plugin-transform-svg-component": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.3.1.tgz",
-			"integrity": "sha512-cZ8Tr6ZAWNUFfDeCKn/pGi976iWSkS8ijmEYKosP+6ktdZ7lW9HVLHojyusPw3w0j8PI4VBeWAXAmi/2G7owxw==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.5.1.tgz",
+			"integrity": "sha512-a1p6LF5Jt33O3rZoVRBqdxL350oge54iZWHNI6LJB5tQ7EelvD/Mb1mfBiZNAan0dt4i3VArkFRjA4iObuNykQ==",
 			"dev": true
 		},
 		"@svgr/babel-preset": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.3.1.tgz",
-			"integrity": "sha512-tQtWtzuMMQ3opH7je+MpwfuRA1Hf3cKdSgTtAYwOBDfmhabP7rcTfBi3E7V3MuwJNy/Y02/7/RutvwS1W4Qv9g==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-6.5.1.tgz",
+			"integrity": "sha512-6127fvO/FF2oi5EzSQOAjo1LE3OtNVh11R+/8FXa+mHx1ptAaS4cknIjnUA7e6j6fwGGJ17NzaTJFUwOV2zwCw==",
 			"dev": true,
 			"requires": {
-				"@svgr/babel-plugin-add-jsx-attribute": "^6.3.1",
-				"@svgr/babel-plugin-remove-jsx-attribute": "^6.3.1",
-				"@svgr/babel-plugin-remove-jsx-empty-expression": "^6.3.1",
-				"@svgr/babel-plugin-replace-jsx-attribute-value": "^6.3.1",
-				"@svgr/babel-plugin-svg-dynamic-title": "^6.3.1",
-				"@svgr/babel-plugin-svg-em-dimensions": "^6.3.1",
-				"@svgr/babel-plugin-transform-react-native-svg": "^6.3.1",
-				"@svgr/babel-plugin-transform-svg-component": "^6.3.1"
+				"@svgr/babel-plugin-add-jsx-attribute": "^6.5.1",
+				"@svgr/babel-plugin-remove-jsx-attribute": "*",
+				"@svgr/babel-plugin-remove-jsx-empty-expression": "*",
+				"@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.1",
+				"@svgr/babel-plugin-svg-dynamic-title": "^6.5.1",
+				"@svgr/babel-plugin-svg-em-dimensions": "^6.5.1",
+				"@svgr/babel-plugin-transform-react-native-svg": "^6.5.1",
+				"@svgr/babel-plugin-transform-svg-component": "^6.5.1"
 			}
 		},
 		"@svgr/core": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.3.1.tgz",
-			"integrity": "sha512-Sm3/7OdXbQreemf9aO25keerZSbnKMpGEfmH90EyYpj1e8wMD4TuwJIb3THDSgRMWk1kYJfSRulELBy4gVgZUA==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/core/-/core-6.5.1.tgz",
+			"integrity": "sha512-/xdLSWxK5QkqG524ONSjvg3V/FkNyCv538OIBdQqPNaAta3AsXj/Bd2FbvR87yMbXO2hFSWiAe/Q6IkVPDw+mw==",
 			"dev": true,
 			"requires": {
-				"@svgr/plugin-jsx": "^6.3.1",
+				"@babel/core": "^7.19.6",
+				"@svgr/babel-preset": "^6.5.1",
+				"@svgr/plugin-jsx": "^6.5.1",
 				"camelcase": "^6.2.0",
 				"cosmiconfig": "^7.0.1"
 			}
 		},
 		"@svgr/hast-util-to-babel-ast": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.3.1.tgz",
-			"integrity": "sha512-NgyCbiTQIwe3wHe/VWOUjyxmpUmsrBjdoIxKpXt3Nqc3TN30BpJG22OxBvVzsAh9jqep0w0/h8Ywvdk3D9niNQ==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.5.1.tgz",
+			"integrity": "sha512-1hnUxxjd83EAxbL4a0JDJoD3Dao3hmjvyvyEV8PzWmLK3B9m9NPlW7GKjFyoWE8nM7HnXzPcmmSyOW8yOddSXw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.18.4",
-				"entities": "^4.3.0"
+				"@babel/types": "^7.20.0",
+				"entities": "^4.4.0"
 			}
 		},
 		"@svgr/plugin-jsx": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.3.1.tgz",
-			"integrity": "sha512-r9+0mYG3hD4nNtUgsTXWGYJomv/bNd7kC16zvsM70I/bGeoCi/3lhTmYqeN6ChWX317OtQCSZZbH4wq9WwoXbw==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-6.5.1.tgz",
+			"integrity": "sha512-+UdQxI3jgtSjCykNSlEMuy1jSRQlGC7pqBCPvkG/2dATdWo082zHTTK3uhnAju2/6XpE6B5mZ3z4Z8Ns01S8Gw==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.18.5",
-				"@svgr/babel-preset": "^6.3.1",
-				"@svgr/hast-util-to-babel-ast": "^6.3.1",
+				"@babel/core": "^7.19.6",
+				"@svgr/babel-preset": "^6.5.1",
+				"@svgr/hast-util-to-babel-ast": "^6.5.1",
 				"svg-parser": "^2.0.4"
 			}
 		},
 		"@svgr/plugin-svgo": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.3.1.tgz",
-			"integrity": "sha512-yJIjTDKPYqzFVjmsbH5EdIwEsmKxjxdXSGJVLeUgwZOZPAkNQmD1v7LDbOdOKbR44FG8465Du+zWPdbYGnbMbw==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-6.5.1.tgz",
+			"integrity": "sha512-omvZKf8ixP9z6GWgwbtmP9qQMPX4ODXi+wzbVZgomNFsUIlHA1sf4fThdwTWSsZGgvGAG6yE+b/F5gWUkcZ/iQ==",
 			"dev": true,
 			"requires": {
 				"cosmiconfig": "^7.0.1",
@@ -1970,19 +1957,19 @@
 			}
 		},
 		"@svgr/webpack": {
-			"version": "6.3.1",
-			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.3.1.tgz",
-			"integrity": "sha512-eODxwIUShLxSMaRjzJtrj9wg89D75JLczvWg9SaB5W+OtVTkiC1vdGd8+t+pf5fTlBOy4RRXAq7x1E3DUl3D0A==",
+			"version": "6.5.1",
+			"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-6.5.1.tgz",
+			"integrity": "sha512-cQ/AsnBkXPkEK8cLbv4Dm7JGXq2XrumKnL1dRpJD9rIO2fTIlJI9a1uCciYG1F2aUsox/hJQyNGbt3soDxSRkA==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.18.5",
-				"@babel/plugin-transform-react-constant-elements": "^7.17.12",
-				"@babel/preset-env": "^7.18.2",
-				"@babel/preset-react": "^7.17.12",
-				"@babel/preset-typescript": "^7.17.12",
-				"@svgr/core": "^6.3.1",
-				"@svgr/plugin-jsx": "^6.3.1",
-				"@svgr/plugin-svgo": "^6.3.1"
+				"@babel/core": "^7.19.6",
+				"@babel/plugin-transform-react-constant-elements": "^7.18.12",
+				"@babel/preset-env": "^7.19.4",
+				"@babel/preset-react": "^7.18.6",
+				"@babel/preset-typescript": "^7.18.6",
+				"@svgr/core": "^6.5.1",
+				"@svgr/plugin-jsx": "^6.5.1",
+				"@svgr/plugin-svgo": "^6.5.1"
 			}
 		},
 		"@tootallnate/once": {
@@ -1998,13 +1985,13 @@
 			"dev": true
 		},
 		"@types/babel__core": {
-			"version": "7.1.19",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-			"integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
+			"version": "7.20.0",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz",
+			"integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==",
 			"dev": true,
 			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
+				"@babel/parser": "^7.20.7",
+				"@babel/types": "^7.20.7",
 				"@types/babel__generator": "*",
 				"@types/babel__template": "*",
 				"@types/babel__traverse": "*"
@@ -2030,9 +2017,9 @@
 			}
 		},
 		"@types/babel__traverse": {
-			"version": "7.18.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.1.tgz",
-			"integrity": "sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==",
+			"version": "7.18.3",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz",
+			"integrity": "sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==",
 			"dev": true,
 			"requires": {
 				"@babel/types": "^7.3.0"
@@ -2057,15 +2044,6 @@
 				"@types/node": "*"
 			}
 		},
-		"@types/cheerio": {
-			"version": "0.22.31",
-			"resolved": "https://registry.npmjs.org/@types/cheerio/-/cheerio-0.22.31.tgz",
-			"integrity": "sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==",
-			"dev": true,
-			"requires": {
-				"@types/node": "*"
-			}
-		},
 		"@types/connect": {
 			"version": "3.4.35",
 			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
@@ -2086,9 +2064,9 @@
 			}
 		},
 		"@types/eslint": {
-			"version": "8.4.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
-			"integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
+			"version": "8.21.0",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.0.tgz",
+			"integrity": "sha512-35EhHNOXgxnUgh4XCJsGhE7zdlDhYDN/aMG6UbkByCFFNgQ7b3U+uVoqBpicFydR8JEfgdjCF7SJ7MiJfzuiTA==",
 			"dev": true,
 			"requires": {
 				"@types/estree": "*",
@@ -2112,21 +2090,21 @@
 			"dev": true
 		},
 		"@types/express": {
-			"version": "4.17.14",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-			"integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+			"version": "4.17.17",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.17.tgz",
+			"integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
 			"dev": true,
 			"requires": {
 				"@types/body-parser": "*",
-				"@types/express-serve-static-core": "^4.17.18",
+				"@types/express-serve-static-core": "^4.17.33",
 				"@types/qs": "*",
 				"@types/serve-static": "*"
 			}
 		},
 		"@types/express-serve-static-core": {
-			"version": "4.17.31",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-			"integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+			"version": "4.17.33",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz",
+			"integrity": "sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*",
@@ -2145,9 +2123,9 @@
 			}
 		},
 		"@types/graceful-fs": {
-			"version": "4.1.5",
-			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-			"integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+			"version": "4.1.6",
+			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
+			"integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*"
@@ -2217,9 +2195,9 @@
 			"dev": true
 		},
 		"@types/node": {
-			"version": "18.7.18",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
-			"integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==",
+			"version": "18.11.19",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz",
+			"integrity": "sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==",
 			"dev": true
 		},
 		"@types/normalize-package-data": {
@@ -2235,9 +2213,9 @@
 			"dev": true
 		},
 		"@types/prettier": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
-			"integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==",
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz",
+			"integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==",
 			"dev": true
 		},
 		"@types/prop-types": {
@@ -2259,9 +2237,9 @@
 			"dev": true
 		},
 		"@types/react": {
-			"version": "17.0.50",
-			"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.50.tgz",
-			"integrity": "sha512-ZCBHzpDb5skMnc1zFXAXnL3l1FAdi+xZvwxK+PkglMmBrwjpp9nKaWuEvrGnSifCJmBFGxZOOFuwC6KH/s0NuA==",
+			"version": "18.0.27",
+			"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.27.tgz",
+			"integrity": "sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==",
 			"dev": true,
 			"requires": {
 				"@types/prop-types": "*",
@@ -2270,12 +2248,12 @@
 			}
 		},
 		"@types/react-dom": {
-			"version": "17.0.17",
-			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.17.tgz",
-			"integrity": "sha512-VjnqEmqGnasQKV0CWLevqMTXBYG9GbwuE6x3VetERLh0cq2LTptFE73MrQi2S7GkKXCf2GgwItB/melLnxfnsg==",
+			"version": "18.0.10",
+			"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz",
+			"integrity": "sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg==",
 			"dev": true,
 			"requires": {
-				"@types/react": "^17"
+				"@types/react": "*"
 			}
 		},
 		"@types/retry": {
@@ -2290,6 +2268,12 @@
 			"integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
 			"dev": true
 		},
+		"@types/semver": {
+			"version": "7.3.13",
+			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+			"integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
+			"dev": true
+		},
 		"@types/serve-index": {
 			"version": "1.9.1",
 			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
@@ -2337,9 +2321,9 @@
 			"dev": true
 		},
 		"@types/uglify-js": {
-			"version": "3.17.0",
-			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.0.tgz",
-			"integrity": "sha512-3HO6rm0y+/cqvOyA8xcYLweF0TKXlAxmQASjbOi49Co51A1N4nR4bEwBgRoD9kNM+rqFGArjKr654SLp2CoGmQ==",
+			"version": "3.17.1",
+			"resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.17.1.tgz",
+			"integrity": "sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==",
 			"dev": true,
 			"requires": {
 				"source-map": "^0.6.1"
@@ -2354,9 +2338,9 @@
 			}
 		},
 		"@types/webpack": {
-			"version": "4.41.32",
-			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz",
-			"integrity": "sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==",
+			"version": "4.41.33",
+			"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.33.tgz",
+			"integrity": "sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*",
@@ -2387,18 +2371,18 @@
 			}
 		},
 		"@types/ws": {
-			"version": "8.5.3",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-			"integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+			"version": "8.5.4",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz",
+			"integrity": "sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==",
 			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
 		},
 		"@types/yargs": {
-			"version": "16.0.4",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-			"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+			"version": "16.0.5",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz",
+			"integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==",
 			"dev": true,
 			"requires": {
 				"@types/yargs-parser": "*"
@@ -2421,89 +2405,97 @@
 			}
 		},
 		"@typescript-eslint/eslint-plugin": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
-			"integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz",
+			"integrity": "sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/scope-manager": "5.38.0",
-				"@typescript-eslint/type-utils": "5.38.0",
-				"@typescript-eslint/utils": "5.38.0",
+				"@typescript-eslint/scope-manager": "5.50.0",
+				"@typescript-eslint/type-utils": "5.50.0",
+				"@typescript-eslint/utils": "5.50.0",
 				"debug": "^4.3.4",
+				"grapheme-splitter": "^1.0.4",
 				"ignore": "^5.2.0",
+				"natural-compare-lite": "^1.4.0",
 				"regexpp": "^3.2.0",
 				"semver": "^7.3.7",
 				"tsutils": "^3.21.0"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
-		"@typescript-eslint/experimental-utils": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.0.tgz",
-			"integrity": "sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==",
-			"dev": true,
-			"requires": {
-				"@typescript-eslint/utils": "5.38.0"
-			}
-		},
 		"@typescript-eslint/parser": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
-			"integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.50.0.tgz",
+			"integrity": "sha512-KCcSyNaogUDftK2G9RXfQyOCt51uB5yqC6pkUYqhYh8Kgt+DwR5M0EwEAxGPy/+DH6hnmKeGsNhiZRQxjH71uQ==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/scope-manager": "5.38.0",
-				"@typescript-eslint/types": "5.38.0",
-				"@typescript-eslint/typescript-estree": "5.38.0",
+				"@typescript-eslint/scope-manager": "5.50.0",
+				"@typescript-eslint/types": "5.50.0",
+				"@typescript-eslint/typescript-estree": "5.50.0",
 				"debug": "^4.3.4"
 			}
 		},
 		"@typescript-eslint/scope-manager": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
-			"integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz",
+			"integrity": "sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "5.38.0",
-				"@typescript-eslint/visitor-keys": "5.38.0"
+				"@typescript-eslint/types": "5.50.0",
+				"@typescript-eslint/visitor-keys": "5.50.0"
 			}
 		},
 		"@typescript-eslint/type-utils": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
-			"integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz",
+			"integrity": "sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/typescript-estree": "5.38.0",
-				"@typescript-eslint/utils": "5.38.0",
+				"@typescript-eslint/typescript-estree": "5.50.0",
+				"@typescript-eslint/utils": "5.50.0",
 				"debug": "^4.3.4",
 				"tsutils": "^3.21.0"
 			}
 		},
 		"@typescript-eslint/types": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
-			"integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.50.0.tgz",
+			"integrity": "sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==",
 			"dev": true
 		},
 		"@typescript-eslint/typescript-estree": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
-			"integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz",
+			"integrity": "sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "5.38.0",
-				"@typescript-eslint/visitor-keys": "5.38.0",
+				"@typescript-eslint/types": "5.50.0",
+				"@typescript-eslint/visitor-keys": "5.50.0",
 				"debug": "^4.3.4",
 				"globby": "^11.1.0",
 				"is-glob": "^4.0.3",
@@ -2511,38 +2503,81 @@
 				"tsutils": "^3.21.0"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
 		"@typescript-eslint/utils": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
-			"integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.50.0.tgz",
+			"integrity": "sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==",
 			"dev": true,
 			"requires": {
 				"@types/json-schema": "^7.0.9",
-				"@typescript-eslint/scope-manager": "5.38.0",
-				"@typescript-eslint/types": "5.38.0",
-				"@typescript-eslint/typescript-estree": "5.38.0",
+				"@types/semver": "^7.3.12",
+				"@typescript-eslint/scope-manager": "5.50.0",
+				"@typescript-eslint/types": "5.50.0",
+				"@typescript-eslint/typescript-estree": "5.50.0",
 				"eslint-scope": "^5.1.1",
-				"eslint-utils": "^3.0.0"
+				"eslint-utils": "^3.0.0",
+				"semver": "^7.3.7"
+			},
+			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
+				"semver": {
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
+				}
 			}
 		},
 		"@typescript-eslint/visitor-keys": {
-			"version": "5.38.0",
-			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
-			"integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
+			"version": "5.50.0",
+			"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz",
+			"integrity": "sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/types": "5.38.0",
+				"@typescript-eslint/types": "5.50.0",
 				"eslint-visitor-keys": "^3.3.0"
 			},
 			"dependencies": {
@@ -2721,50 +2756,16 @@
 			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
 			"dev": true
 		},
-		"@wojtekmaj/enzyme-adapter-react-17": {
-			"version": "0.6.7",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.7.tgz",
-			"integrity": "sha512-B+byiwi/T1bx5hcj9wc0fUL5Hlb5giSXJzcnEfJVl2j6dGV2NJfcxDBYX0WWwIxlzNiFz8kAvlkFWI2y/nscZQ==",
-			"dev": true,
-			"requires": {
-				"@wojtekmaj/enzyme-adapter-utils": "^0.1.4",
-				"enzyme-shallow-equal": "^1.0.0",
-				"has": "^1.0.0",
-				"prop-types": "^15.7.0",
-				"react-is": "^17.0.0",
-				"react-test-renderer": "^17.0.0"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
-			}
-		},
-		"@wojtekmaj/enzyme-adapter-utils": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-utils/-/enzyme-adapter-utils-0.1.4.tgz",
-			"integrity": "sha512-ARGIQSIIv3oBia1m5Ihn1VU0FGmft6KPe39SBKTb8p7LSXO23YI4kNtc4M/cKoIY7P+IYdrZcgMObvedyjoSQA==",
-			"dev": true,
-			"requires": {
-				"function.prototype.name": "^1.1.0",
-				"has": "^1.0.0",
-				"object.fromentries": "^2.0.0",
-				"prop-types": "^15.7.0"
-			}
-		},
 		"@wordpress/babel-plugin-import-jsx-pragma": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-4.1.0.tgz",
-			"integrity": "sha512-q6MEKJ7AYv/bVWqrUAkfsvn/FVGtLmPzQi1BQdpBYLKMdJnzQElDMDyfA4+N1S2dsLCL01U8dwzUBUGRWLSg9w==",
+			"version": "4.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-4.9.0.tgz",
+			"integrity": "sha512-ejG0lyO8UmMsCydNLfHM2mX6s1IoCtIJ0mHoQ/AKtzetr9PbJRIdQgpIA876zXW46wd0WJE3V+kjEZPDzeEvDA==",
 			"dev": true
 		},
 		"@wordpress/babel-preset-default": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.2.0.tgz",
-			"integrity": "sha512-bzff677XuxAffaami7EEx2VyDrTbkO6Wjem3uutJ0pqGrleT6PeNoRUF0L0TKE+g5qhwIFCvVAqawXrYvK+JEQ==",
+			"version": "7.10.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/babel-preset-default/-/babel-preset-default-7.10.0.tgz",
+			"integrity": "sha512-4psTNav+VcxZAkWnHfq6ePFSDDGOvmc2p0KjHygi03NCZgWBy3cnlRr/Vy736ZQ7CM98YLsYYKBG/3sWdk3n2A==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.16.0",
@@ -2773,30 +2774,30 @@
 				"@babel/preset-env": "^7.16.0",
 				"@babel/preset-typescript": "^7.16.0",
 				"@babel/runtime": "^7.16.0",
-				"@wordpress/babel-plugin-import-jsx-pragma": "^4.1.0",
-				"@wordpress/browserslist-config": "^5.1.0",
-				"@wordpress/element": "^4.16.0",
-				"@wordpress/warning": "^2.18.0",
+				"@wordpress/babel-plugin-import-jsx-pragma": "^4.9.0",
+				"@wordpress/browserslist-config": "^5.9.0",
+				"@wordpress/element": "^5.3.0",
+				"@wordpress/warning": "^2.26.0",
 				"browserslist": "^4.17.6",
 				"core-js": "^3.19.1"
 			}
 		},
 		"@wordpress/base-styles": {
-			"version": "4.9.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.9.0.tgz",
-			"integrity": "sha512-tYQ3IcsZxZeEZ2A6UnKCA3TgYekjKlmtt+zy3nKNX/z8qIpZ0hhLD161exUogkYoNqkDP5FVL0iGVx9Cw0mVWg==",
+			"version": "4.17.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/base-styles/-/base-styles-4.17.0.tgz",
+			"integrity": "sha512-QDdW5PzPNzSOAudlkeMIuwlGxmQSmnJAulD11f4d/OPwfU+KMk3hYr6QS3nzFghlT6IDwcwwlNE6BgoN772G4A==",
 			"dev": true
 		},
 		"@wordpress/browserslist-config": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.1.0.tgz",
-			"integrity": "sha512-rfIHuzamXWL4ZBVmYrlOlqs+8wRzjiAcx0wjgCZ4/+8I9U0SNPgYbjrx6nL48XVbTNA+1GL6XIgdx1g/kHHwoQ==",
+			"version": "5.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.9.0.tgz",
+			"integrity": "sha512-VC1QK741SRfrfsq2SdWHlkuDo7ZSXD7LFbK0dU6lOnuUt3f01HTU05NfcrC6uWCaoMP87MPDCQVaWTygNSFirQ==",
 			"dev": true
 		},
 		"@wordpress/dependency-extraction-webpack-plugin": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-4.1.0.tgz",
-			"integrity": "sha512-dzoi6/5oz13TLmQupsjmOzboNvdM5pbooP7g/Vao8BcyW8FatIMtbNeFaTFvE2NM8ejZqoJEFWOzWXqgLRVjgA==",
+			"version": "4.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/dependency-extraction-webpack-plugin/-/dependency-extraction-webpack-plugin-4.9.0.tgz",
+			"integrity": "sha512-p8pN330wQ6WEZhkt3Jva/fVc/79J4LpZi8TpH0X+770YKrhI429YZIenFriQiM72iaWK3Q+gaYziM4bndP+s8w==",
 			"dev": true,
 			"requires": {
 				"json2php": "^0.0.5",
@@ -2804,46 +2805,46 @@
 			}
 		},
 		"@wordpress/element": {
-			"version": "4.16.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-4.16.0.tgz",
-			"integrity": "sha512-A+zgURU1Gy0KVsQPXxts32OSWequdio7L4WnTw4ynJaLwvkL6HpGCOalXz/dTt4go4wIQPGtYfDobQQzbyMUUA==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/element/-/element-5.3.0.tgz",
+			"integrity": "sha512-sgBrPm9suYx9sAtMLnfqgJem54Vew+BvVRpQoKQjpoXAKklGKSr52xOERek2TZQuZl/hMCCdvScrLIIW96UNAw==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.16.0",
-				"@types/react": "^17.0.37",
-				"@types/react-dom": "^17.0.11",
-				"@wordpress/escape-html": "^2.18.0",
+				"@types/react": "^18.0.21",
+				"@types/react-dom": "^18.0.6",
+				"@wordpress/escape-html": "^2.26.0",
 				"change-case": "^4.1.2",
 				"is-plain-object": "^5.0.0",
-				"react": "^17.0.2",
-				"react-dom": "^17.0.2"
+				"react": "^18.2.0",
+				"react-dom": "^18.2.0"
 			}
 		},
 		"@wordpress/escape-html": {
-			"version": "2.18.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.18.0.tgz",
-			"integrity": "sha512-fE4D+uuBRniU1unEzT7ogRfXB/fIOxL5UMIAmpd7bJeNrEjwHO/rZIOrxoa38GogDuK/taVSkRab9+DyUgl4jg==",
+			"version": "2.26.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/escape-html/-/escape-html-2.26.0.tgz",
+			"integrity": "sha512-uWumpNH4hnmeepTw9K3gC5LmoZECom5L1P6HuZXYXyld8eU5L9p/JdvAPOwLmjffHyJO3hiB2JqYd+nKElbtrw==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.16.0"
 			}
 		},
 		"@wordpress/eslint-plugin": {
-			"version": "13.2.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-13.2.0.tgz",
-			"integrity": "sha512-/DyNAqHQXdZT2P8pDdzMqNRrjYX3y5Wxz/R4DmngnSpoxXu4z3sK8gkzrEieDP9Z5o2OOYnBYgYAyV39ot3svA==",
+			"version": "13.10.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/eslint-plugin/-/eslint-plugin-13.10.0.tgz",
+			"integrity": "sha512-FW3JryRMeUpdhbBi6n4bKPHoYUqwSZI/7jjmvObiUlr8uJfXRFRXfgYOCP8BiVjMyGDBpiMs95Fyf1QbQ79Img==",
 			"dev": true,
 			"requires": {
 				"@babel/eslint-parser": "^7.16.0",
 				"@typescript-eslint/eslint-plugin": "^5.3.0",
 				"@typescript-eslint/parser": "^5.3.0",
-				"@wordpress/babel-preset-default": "^7.2.0",
-				"@wordpress/prettier-config": "^2.1.0",
+				"@wordpress/babel-preset-default": "^7.10.0",
+				"@wordpress/prettier-config": "^2.9.0",
 				"cosmiconfig": "^7.0.0",
 				"eslint-config-prettier": "^8.3.0",
 				"eslint-plugin-import": "^2.25.2",
-				"eslint-plugin-jest": "^25.2.3",
-				"eslint-plugin-jsdoc": "^37.0.3",
+				"eslint-plugin-jest": "^27.2.1",
+				"eslint-plugin-jsdoc": "^39.6.9",
 				"eslint-plugin-jsx-a11y": "^6.5.1",
 				"eslint-plugin-prettier": "^3.3.0",
 				"eslint-plugin-react": "^7.27.0",
@@ -2853,9 +2854,9 @@
 			},
 			"dependencies": {
 				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+					"version": "13.20.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+					"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
@@ -2864,9 +2865,9 @@
 			}
 		},
 		"@wordpress/jest-console": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-6.1.0.tgz",
-			"integrity": "sha512-yCJPslJd+Bcuzx+dVzdn4k0k2k5VTDMG70fUOUfFCEFBHpudvvaomRd6LbFrQjZN6EHB77KzcvLfN7XwCmbT8Q==",
+			"version": "6.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-console/-/jest-console-6.9.0.tgz",
+			"integrity": "sha512-ppIbCF9WTF7Pg6zhAlUI1fa3kQFqv4ME9jhJrRMMHL3fkqKMSsR9RdP0auxPWd0/BvA98zS3KgaR7Zpq8CWgPQ==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.16.0",
@@ -2874,58 +2875,55 @@
 			}
 		},
 		"@wordpress/jest-preset-default": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-9.1.0.tgz",
-			"integrity": "sha512-K8QwvAgpD8oW10ERejKyqxXCE43+QF3LmUlpDHBhRaMZsZGmcLAZBa1cOm7rcfeQ4jkg9uYv30Qp/NI30I3C5A==",
+			"version": "10.7.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/jest-preset-default/-/jest-preset-default-10.7.0.tgz",
+			"integrity": "sha512-rMf+HS75o06+teQTBkEH4R7RobaIwG4HoVvLnfuSan0EnkyqcXadQ1tyFNKPT8rA6nB/wJn649dibE1+UMSUpw==",
 			"dev": true,
 			"requires": {
-				"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
-				"@wordpress/jest-console": "^6.1.0",
-				"babel-jest": "^27.4.5",
-				"enzyme": "^3.11.0",
-				"enzyme-to-json": "^3.4.4"
+				"@wordpress/jest-console": "^6.9.0",
+				"babel-jest": "^27.4.5"
 			}
 		},
 		"@wordpress/npm-package-json-lint-config": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.3.0.tgz",
-			"integrity": "sha512-BQ+HP7HU4v/M0K5F1LF1ytz6LSqA456rfu7jlkrNMu6DNeJvUokdBN5JklaETSF+Ye4XmNysEY5bTi2HcJth5g==",
+			"version": "4.11.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.11.0.tgz",
+			"integrity": "sha512-xqc/RH/djM3qNB0OEip8Jj81AsKKf4fQGoKkE6XVeTcpBwbNRyswj5uBHCmgBbN/OjEoXBxDokchg8P1IGHLpQ==",
 			"dev": true
 		},
 		"@wordpress/postcss-plugins-preset": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-4.2.0.tgz",
-			"integrity": "sha512-61g3h2d20OpwtZETYLHCXm7qvZ9hBfTHANd6+6t8486xY5W+aCq5II3xZI+3/kBcvlp9GqmYMzaGWEXBAo7ClQ==",
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/postcss-plugins-preset/-/postcss-plugins-preset-4.10.0.tgz",
+			"integrity": "sha512-hurPICllpkAPlXbRkye7vsj4W+4LdhJhNoloSzgE9c7gWXmrlBFqk71G+6JrODmj2M9SIxBfth7Myn7VUfr2kQ==",
 			"dev": true,
 			"requires": {
-				"@wordpress/base-styles": "^4.9.0",
+				"@wordpress/base-styles": "^4.17.0",
 				"autoprefixer": "^10.2.5"
 			}
 		},
 		"@wordpress/prettier-config": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-2.1.0.tgz",
-			"integrity": "sha512-pHjl4FeBRpcNdE59wzusvSJ3J+sMWhJHg3RrrYzLNdjnlpUtPq6jN/pY9upyQI3PZ/x+Z80mvbwU6d6MlmGxGg==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/prettier-config/-/prettier-config-2.9.0.tgz",
+			"integrity": "sha512-Y6Huuwr0XzVAREsALqQ+Il2SI5da0uTiysNd6Rq4hFPvjolsiFKCZYdniow6VpTXm5iVMGdKQIOoC3awSyTAXA==",
 			"dev": true
 		},
 		"@wordpress/scripts": {
-			"version": "24.2.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-24.2.0.tgz",
-			"integrity": "sha512-4vnafjA/3r9tz8POV5YhqOJwhG6qWI9SOO+gkSCc/Ydli4oHxVZzQKGBnmEFtZ966Q4wd1xJJe/zYgtLIJsxAg==",
+			"version": "24.6.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/scripts/-/scripts-24.6.0.tgz",
+			"integrity": "sha512-IbJkihQsjaZz03qyTPcjRF2FWiVVcCm90eL/QutO9cSmZbqfAT1hwNSZIEakiy7GK553k4JirV0eDuMfi4IcWA==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.16.0",
 				"@pmmmwh/react-refresh-webpack-plugin": "^0.5.2",
 				"@svgr/webpack": "^6.2.1",
-				"@wordpress/babel-preset-default": "^7.2.0",
-				"@wordpress/browserslist-config": "^5.1.0",
-				"@wordpress/dependency-extraction-webpack-plugin": "^4.1.0",
-				"@wordpress/eslint-plugin": "^13.2.0",
-				"@wordpress/jest-preset-default": "^9.1.0",
-				"@wordpress/npm-package-json-lint-config": "^4.3.0",
-				"@wordpress/postcss-plugins-preset": "^4.2.0",
-				"@wordpress/prettier-config": "^2.1.0",
-				"@wordpress/stylelint-config": "^21.1.0",
+				"@wordpress/babel-preset-default": "^7.6.0",
+				"@wordpress/browserslist-config": "^5.5.0",
+				"@wordpress/dependency-extraction-webpack-plugin": "^4.5.0",
+				"@wordpress/eslint-plugin": "^13.6.0",
+				"@wordpress/jest-preset-default": "^10.3.0",
+				"@wordpress/npm-package-json-lint-config": "^4.7.0",
+				"@wordpress/postcss-plugins-preset": "^4.6.0",
+				"@wordpress/prettier-config": "^2.5.0",
+				"@wordpress/stylelint-config": "^21.5.0",
 				"adm-zip": "^0.5.9",
 				"babel-jest": "^27.4.5",
 				"babel-loader": "^8.2.3",
@@ -2980,9 +2978,9 @@
 			}
 		},
 		"@wordpress/stylelint-config": {
-			"version": "21.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-21.1.0.tgz",
-			"integrity": "sha512-nL7YTlLibtDwGX6D0hqfw/cd4gF90QXQFvFZ/cdr9Xv5ZDs717O5OjyxLK+8HW8KrHoldjHyPSxPZ/zD9WSJhg==",
+			"version": "21.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/stylelint-config/-/stylelint-config-21.9.0.tgz",
+			"integrity": "sha512-o5TMSX4ww3glf8A6byHnfwodMVB95dH0KoQ4nm5T9KMtsBYNd87HdM9WkVGVsFGb7oZlpL1ydREmlhsQh8sKYw==",
 			"dev": true,
 			"requires": {
 				"stylelint-config-recommended": "^6.0.0",
@@ -2990,9 +2988,9 @@
 			}
 		},
 		"@wordpress/warning": {
-			"version": "2.18.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.18.0.tgz",
-			"integrity": "sha512-XkequT4cNjXTmlHU0Tte3eLV5bURQ35KO+3/WxQS0ED7pMePeT1o2ver40KleyUgssjUDP52/LdwCIyIFp4NJg==",
+			"version": "2.26.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/warning/-/warning-2.26.0.tgz",
+			"integrity": "sha512-nGupksgetlQAzF2E0rAHH17v+uKDarBGto9UduUIsiivYqJdJ/x2f3HopxPrGRDqEjOkPXoywQb9haNMU2zVmg==",
 			"dev": true
 		},
 		"@xtuc/ieee754": {
@@ -3024,9 +3022,9 @@
 			}
 		},
 		"acorn": {
-			"version": "8.8.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-			"integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true
 		},
 		"acorn-globals": {
@@ -3066,9 +3064,9 @@
 			"dev": true
 		},
 		"adm-zip": {
-			"version": "0.5.9",
-			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
-			"integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
+			"version": "0.5.10",
+			"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz",
+			"integrity": "sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
 			"dev": true
 		},
 		"agent-base": {
@@ -3108,9 +3106,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -3191,13 +3189,12 @@
 			}
 		},
 		"aria-query": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-			"integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+			"integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.10.2",
-				"@babel/runtime-corejs3": "^7.10.2"
+				"deep-equal": "^2.0.5"
 			}
 		},
 		"arr-union": {
@@ -3213,15 +3210,15 @@
 			"dev": true
 		},
 		"array-includes": {
-			"version": "3.1.5",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-			"integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+			"version": "3.1.6",
+			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+			"integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5",
-				"get-intrinsic": "^1.1.1",
+				"es-abstract": "^1.20.4",
+				"get-intrinsic": "^1.1.3",
 				"is-string": "^1.0.7"
 			}
 		},
@@ -3237,41 +3234,41 @@
 			"integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
 			"dev": true
 		},
-		"array.prototype.filter": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.1.tgz",
-			"integrity": "sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==",
+		"array.prototype.flat": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+			"integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.0",
-				"es-array-method-boxes-properly": "^1.0.0",
-				"is-string": "^1.0.7"
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"es-shim-unscopables": "^1.0.0"
 			}
 		},
-		"array.prototype.flat": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-			"integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+		"array.prototype.flatmap": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+			"integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
 				"es-shim-unscopables": "^1.0.0"
 			}
 		},
-		"array.prototype.flatmap": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-			"integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
+		"array.prototype.tosorted": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
+			"integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.2",
-				"es-shim-unscopables": "^1.0.0"
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"es-shim-unscopables": "^1.0.0",
+				"get-intrinsic": "^1.1.3"
 			}
 		},
 		"arrify": {
@@ -3299,55 +3296,37 @@
 			"dev": true
 		},
 		"autoprefixer": {
-			"version": "10.4.12",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-			"integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+			"version": "10.4.13",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+			"integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
 			"dev": true,
 			"requires": {
 				"browserslist": "^4.21.4",
-				"caniuse-lite": "^1.0.30001407",
+				"caniuse-lite": "^1.0.30001426",
 				"fraction.js": "^4.2.0",
 				"normalize-range": "^0.1.2",
 				"picocolors": "^1.0.0",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"dependencies": {
-				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-					"dev": true,
-					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
-					}
-				},
 				"caniuse-lite": {
-					"version": "1.0.30001410",
-					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
-					"integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==",
-					"dev": true
-				},
-				"electron-to-chromium": {
-					"version": "1.4.258",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
-					"integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A==",
-					"dev": true
-				},
-				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+					"version": "1.0.30001450",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
+					"integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
 					"dev": true
 				}
 			}
 		},
+		"available-typed-arrays": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+			"integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+			"dev": true
+		},
 		"axe-core": {
-			"version": "4.4.3",
-			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
-			"integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==",
+			"version": "4.6.3",
+			"resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz",
+			"integrity": "sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==",
 			"dev": true
 		},
 		"axios": {
@@ -3360,10 +3339,13 @@
 			}
 		},
 		"axobject-query": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-			"integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==",
-			"dev": true
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
+			"integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+			"dev": true,
+			"requires": {
+				"deep-equal": "^2.0.5"
+			}
 		},
 		"babel-jest": {
 			"version": "27.5.1",
@@ -3382,9 +3364,9 @@
 			}
 		},
 		"babel-loader": {
-			"version": "8.2.5",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-			"integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+			"version": "8.3.0",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
+			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
 			"dev": true,
 			"requires": {
 				"find-cache-dir": "^3.3.1",
@@ -3406,15 +3388,6 @@
 				}
 			}
 		},
-		"babel-plugin-dynamic-import-node": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
-			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
-			"dev": true,
-			"requires": {
-				"object.assign": "^4.1.0"
-			}
-		},
 		"babel-plugin-istanbul": {
 			"version": "6.1.1",
 			"resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -3542,9 +3515,9 @@
 			}
 		},
 		"body-parser": {
-			"version": "1.20.0",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-			"integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+			"version": "1.20.1",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
 			"dev": true,
 			"requires": {
 				"bytes": "3.1.2",
@@ -3555,7 +3528,7 @@
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.10.3",
+				"qs": "6.11.0",
 				"raw-body": "2.5.1",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
@@ -3585,9 +3558,9 @@
 			}
 		},
 		"bonjour-service": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-			"integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz",
+			"integrity": "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q==",
 			"dev": true,
 			"requires": {
 				"array-flatten": "^2.1.2",
@@ -3898,114 +3871,6 @@
 				}
 			}
 		},
-		"cheerio": {
-			"version": "1.0.0-rc.12",
-			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-			"integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-			"dev": true,
-			"requires": {
-				"cheerio-select": "^2.1.0",
-				"dom-serializer": "^2.0.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1",
-				"htmlparser2": "^8.0.1",
-				"parse5": "^7.0.0",
-				"parse5-htmlparser2-tree-adapter": "^7.0.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				}
-			}
-		},
-		"cheerio-select": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-			"integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-			"dev": true,
-			"requires": {
-				"boolbase": "^1.0.0",
-				"css-select": "^5.1.0",
-				"css-what": "^6.1.0",
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.3",
-				"domutils": "^3.0.1"
-			},
-			"dependencies": {
-				"css-select": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-					"integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-					"dev": true,
-					"requires": {
-						"boolbase": "^1.0.0",
-						"css-what": "^6.1.0",
-						"domhandler": "^5.0.2",
-						"domutils": "^3.0.1",
-						"nth-check": "^2.0.1"
-					}
-				},
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				}
-			}
-		},
 		"chokidar": {
 			"version": "3.5.3",
 			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -4035,9 +3900,9 @@
 			"dev": true
 		},
 		"ci-info": {
-			"version": "3.4.0",
-			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz",
-			"integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug==",
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
+			"integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
 			"dev": true
 		},
 		"cjs-module-lexer": {
@@ -4146,9 +4011,9 @@
 			"dev": true
 		},
 		"comment-parser": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz",
-			"integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+			"integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
 			"dev": true
 		},
 		"common-path-prefix": {
@@ -4201,6 +4066,12 @@
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 					"dev": true
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
 				}
 			}
 		},
@@ -4211,9 +4082,9 @@
 			"dev": true
 		},
 		"concurrently": {
-			"version": "7.4.0",
-			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.4.0.tgz",
-			"integrity": "sha512-M6AfrueDt/GEna/Vg9BqQ+93yuvzkSKmoTixnwEJkH0LlcGrRC2eCmjeG1tLLHIYfpYJABokqSGyMcXjm96AFA==",
+			"version": "7.6.0",
+			"resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.6.0.tgz",
+			"integrity": "sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw==",
 			"dev": true,
 			"requires": {
 				"chalk": "^4.1.0",
@@ -4227,41 +4098,17 @@
 				"yargs": "^17.3.1"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
 				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+					"version": "8.0.1",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 					"dev": true,
 					"requires": {
 						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
+						"strip-ansi": "^6.0.1",
 						"wrap-ansi": "^7.0.0"
 					}
 				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
 				"has-flag": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4277,36 +4124,19 @@
 						"has-flag": "^4.0.0"
 					}
 				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-					"dev": true
-				},
 				"yargs": {
-					"version": "17.5.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-					"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+					"version": "17.6.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+					"integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
 					"dev": true,
 					"requires": {
-						"cliui": "^7.0.2",
+						"cliui": "^8.0.1",
 						"escalade": "^3.1.1",
 						"get-caller-file": "^2.0.5",
 						"require-directory": "^2.1.1",
 						"string-width": "^4.2.3",
 						"y18n": "^5.0.5",
-						"yargs-parser": "^21.0.0"
+						"yargs-parser": "^21.1.1"
 					}
 				},
 				"yargs-parser": {
@@ -4341,30 +4171,19 @@
 			"dev": true,
 			"requires": {
 				"safe-buffer": "5.2.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				}
 			}
 		},
 		"content-type": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-			"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+			"integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
 			"dev": true
 		},
 		"convert-source-map": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-			"integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-			"dev": true,
-			"requires": {
-				"safe-buffer": "~5.1.1"
-			}
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+			"integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+			"dev": true
 		},
 		"cookie": {
 			"version": "0.5.0",
@@ -4393,9 +4212,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -4469,24 +4288,24 @@
 			}
 		},
 		"core-js": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
-			"integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A==",
+			"version": "3.27.2",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz",
+			"integrity": "sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==",
 			"dev": true
 		},
 		"core-js-compat": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
-			"integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
+			"version": "3.27.2",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz",
+			"integrity": "sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg==",
 			"dev": true,
 			"requires": {
 				"browserslist": "^4.21.4"
 			}
 		},
 		"core-js-pure": {
-			"version": "3.25.2",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz",
-			"integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==",
+			"version": "3.27.2",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.2.tgz",
+			"integrity": "sha512-Cf2jqAbXgWH3VVzjyaaFkY1EBazxugUepGymDoeteyYr9ByX51kD2jdHZlsEF/xnJMyN3Prua7mQuzwMg6Zc9A==",
 			"dev": true
 		},
 		"core-util-is": {
@@ -4496,9 +4315,9 @@
 			"dev": true
 		},
 		"cosmiconfig": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-			"integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+			"integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
 			"dev": true,
 			"requires": {
 				"@types/parse-json": "^4.0.0",
@@ -4559,29 +4378,44 @@
 			"dev": true
 		},
 		"css-loader": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-			"integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
+			"version": "6.7.3",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz",
+			"integrity": "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==",
 			"dev": true,
 			"requires": {
 				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.7",
+				"postcss": "^8.4.19",
 				"postcss-modules-extract-imports": "^3.0.0",
 				"postcss-modules-local-by-default": "^4.0.0",
 				"postcss-modules-scope": "^3.0.0",
 				"postcss-modules-values": "^4.0.0",
 				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.5"
+				"semver": "^7.3.8"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
@@ -4629,36 +4463,36 @@
 			"dev": true
 		},
 		"cssnano": {
-			"version": "5.1.13",
-			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
-			"integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
+			"version": "5.1.14",
+			"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz",
+			"integrity": "sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==",
 			"dev": true,
 			"requires": {
-				"cssnano-preset-default": "^5.2.12",
+				"cssnano-preset-default": "^5.2.13",
 				"lilconfig": "^2.0.3",
 				"yaml": "^1.10.2"
 			}
 		},
 		"cssnano-preset-default": {
-			"version": "5.2.12",
-			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz",
-			"integrity": "sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==",
+			"version": "5.2.13",
+			"resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz",
+			"integrity": "sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==",
 			"dev": true,
 			"requires": {
-				"css-declaration-sorter": "^6.3.0",
+				"css-declaration-sorter": "^6.3.1",
 				"cssnano-utils": "^3.1.0",
 				"postcss-calc": "^8.2.3",
 				"postcss-colormin": "^5.3.0",
-				"postcss-convert-values": "^5.1.2",
+				"postcss-convert-values": "^5.1.3",
 				"postcss-discard-comments": "^5.1.2",
 				"postcss-discard-duplicates": "^5.1.0",
 				"postcss-discard-empty": "^5.1.1",
 				"postcss-discard-overridden": "^5.1.0",
-				"postcss-merge-longhand": "^5.1.6",
-				"postcss-merge-rules": "^5.1.2",
+				"postcss-merge-longhand": "^5.1.7",
+				"postcss-merge-rules": "^5.1.3",
 				"postcss-minify-font-values": "^5.1.0",
 				"postcss-minify-gradients": "^5.1.1",
-				"postcss-minify-params": "^5.1.3",
+				"postcss-minify-params": "^5.1.4",
 				"postcss-minify-selectors": "^5.2.1",
 				"postcss-normalize-charset": "^5.1.0",
 				"postcss-normalize-display-values": "^5.1.0",
@@ -4666,11 +4500,11 @@
 				"postcss-normalize-repeat-style": "^5.1.1",
 				"postcss-normalize-string": "^5.1.0",
 				"postcss-normalize-timing-functions": "^5.1.0",
-				"postcss-normalize-unicode": "^5.1.0",
+				"postcss-normalize-unicode": "^5.1.1",
 				"postcss-normalize-url": "^5.1.0",
 				"postcss-normalize-whitespace": "^5.1.1",
 				"postcss-ordered-values": "^5.1.3",
-				"postcss-reduce-initial": "^5.1.0",
+				"postcss-reduce-initial": "^5.1.1",
 				"postcss-reduce-transforms": "^5.1.0",
 				"postcss-svgo": "^5.1.0",
 				"postcss-unique-selectors": "^5.1.1"
@@ -4769,9 +4603,9 @@
 			"dev": true
 		},
 		"decamelize-keys": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-			"integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
+			"integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
 			"dev": true,
 			"requires": {
 				"decamelize": "^1.1.0",
@@ -4786,18 +4620,43 @@
 				}
 			}
 		},
-		"decimal.js": {
-			"version": "10.4.1",
-			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.1.tgz",
-			"integrity": "sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw==",
-			"dev": true
-		},
-		"dedent": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-			"integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
-			"dev": true
-		},
+		"decimal.js": {
+			"version": "10.4.3",
+			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+			"integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+			"dev": true
+		},
+		"dedent": {
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+			"integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+			"dev": true
+		},
+		"deep-equal": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz",
+			"integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"es-get-iterator": "^1.1.2",
+				"get-intrinsic": "^1.1.3",
+				"is-arguments": "^1.1.1",
+				"is-array-buffer": "^3.0.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"is-shared-array-buffer": "^1.0.2",
+				"isarray": "^2.0.5",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"object.assign": "^4.1.4",
+				"regexp.prototype.flags": "^1.4.3",
+				"side-channel": "^1.0.4",
+				"which-boxed-primitive": "^1.0.2",
+				"which-collection": "^1.0.1",
+				"which-typed-array": "^1.1.9"
+			}
+		},
 		"deep-extend": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -4811,9 +4670,9 @@
 			"dev": true
 		},
 		"deepmerge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-			"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz",
+			"integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==",
 			"dev": true
 		},
 		"default-gateway": {
@@ -4945,12 +4804,6 @@
 				"path-type": "^4.0.0"
 			}
 		},
-		"discontinuous-range": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-			"integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
-			"dev": true
-		},
 		"dns-equal": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
@@ -5099,9 +4952,9 @@
 			}
 		},
 		"enhanced-resolve": {
-			"version": "5.10.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-			"integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+			"version": "5.12.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+			"integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.2.4",
@@ -5120,57 +4973,6 @@
 			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
 			"dev": true
 		},
-		"enzyme": {
-			"version": "3.11.0",
-			"resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
-			"integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
-			"dev": true,
-			"requires": {
-				"array.prototype.flat": "^1.2.3",
-				"cheerio": "^1.0.0-rc.3",
-				"enzyme-shallow-equal": "^1.0.1",
-				"function.prototype.name": "^1.1.2",
-				"has": "^1.0.3",
-				"html-element-map": "^1.2.0",
-				"is-boolean-object": "^1.0.1",
-				"is-callable": "^1.1.5",
-				"is-number-object": "^1.0.4",
-				"is-regex": "^1.0.5",
-				"is-string": "^1.0.5",
-				"is-subset": "^0.1.1",
-				"lodash.escape": "^4.0.1",
-				"lodash.isequal": "^4.5.0",
-				"object-inspect": "^1.7.0",
-				"object-is": "^1.0.2",
-				"object.assign": "^4.1.0",
-				"object.entries": "^1.1.1",
-				"object.values": "^1.1.1",
-				"raf": "^3.4.1",
-				"rst-selector-parser": "^2.2.3",
-				"string.prototype.trim": "^1.2.1"
-			}
-		},
-		"enzyme-shallow-equal": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz",
-			"integrity": "sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==",
-			"dev": true,
-			"requires": {
-				"has": "^1.0.3",
-				"object-is": "^1.1.2"
-			}
-		},
-		"enzyme-to-json": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/enzyme-to-json/-/enzyme-to-json-3.6.2.tgz",
-			"integrity": "sha512-Ynm6Z6R6iwQ0g2g1YToz6DWhxVnt8Dy1ijR2zynRKxTyBGA8rCDXU3rs2Qc4OKvUvc2Qoe1bcFK6bnPs20TrTg==",
-			"dev": true,
-			"requires": {
-				"@types/cheerio": "^0.22.22",
-				"lodash": "^4.17.21",
-				"react-is": "^16.12.0"
-			}
-		},
 		"error-ex": {
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -5190,42 +4992,62 @@
 			}
 		},
 		"es-abstract": {
-			"version": "1.20.3",
-			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
-			"integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
+			"version": "1.21.1",
+			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz",
+			"integrity": "sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==",
 			"dev": true,
 			"requires": {
+				"available-typed-arrays": "^1.0.5",
 				"call-bind": "^1.0.2",
+				"es-set-tostringtag": "^2.0.1",
 				"es-to-primitive": "^1.2.1",
 				"function-bind": "^1.1.1",
 				"function.prototype.name": "^1.1.5",
 				"get-intrinsic": "^1.1.3",
 				"get-symbol-description": "^1.0.0",
+				"globalthis": "^1.0.3",
+				"gopd": "^1.0.1",
 				"has": "^1.0.3",
 				"has-property-descriptors": "^1.0.0",
+				"has-proto": "^1.0.1",
 				"has-symbols": "^1.0.3",
-				"internal-slot": "^1.0.3",
-				"is-callable": "^1.2.6",
+				"internal-slot": "^1.0.4",
+				"is-array-buffer": "^3.0.1",
+				"is-callable": "^1.2.7",
 				"is-negative-zero": "^2.0.2",
 				"is-regex": "^1.1.4",
 				"is-shared-array-buffer": "^1.0.2",
 				"is-string": "^1.0.7",
+				"is-typed-array": "^1.1.10",
 				"is-weakref": "^1.0.2",
 				"object-inspect": "^1.12.2",
 				"object-keys": "^1.1.1",
 				"object.assign": "^4.1.4",
 				"regexp.prototype.flags": "^1.4.3",
 				"safe-regex-test": "^1.0.0",
-				"string.prototype.trimend": "^1.0.5",
-				"string.prototype.trimstart": "^1.0.5",
-				"unbox-primitive": "^1.0.2"
+				"string.prototype.trimend": "^1.0.6",
+				"string.prototype.trimstart": "^1.0.6",
+				"typed-array-length": "^1.0.4",
+				"unbox-primitive": "^1.0.2",
+				"which-typed-array": "^1.1.9"
 			}
 		},
-		"es-array-method-boxes-properly": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-			"integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
-			"dev": true
+		"es-get-iterator": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+			"integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.1.3",
+				"has-symbols": "^1.0.3",
+				"is-arguments": "^1.1.1",
+				"is-map": "^2.0.2",
+				"is-set": "^2.0.2",
+				"is-string": "^1.0.7",
+				"isarray": "^2.0.5",
+				"stop-iteration-iterator": "^1.0.0"
+			}
 		},
 		"es-module-lexer": {
 			"version": "0.9.3",
@@ -5233,6 +5055,17 @@
 			"integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
 			"dev": true
 		},
+		"es-set-tostringtag": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+			"integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+			"dev": true,
+			"requires": {
+				"get-intrinsic": "^1.1.3",
+				"has": "^1.0.3",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
 		"es-shim-unscopables": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
@@ -5339,15 +5172,15 @@
 			}
 		},
 		"eslint": {
-			"version": "8.23.1",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-			"integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+			"version": "8.33.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
+			"integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
 			"dev": true,
 			"requires": {
-				"@eslint/eslintrc": "^1.3.2",
-				"@humanwhocodes/config-array": "^0.10.4",
-				"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+				"@eslint/eslintrc": "^1.4.1",
+				"@humanwhocodes/config-array": "^0.11.8",
 				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
@@ -5363,14 +5196,14 @@
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
-				"globby": "^11.1.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
 				"grapheme-splitter": "^1.0.4",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
 				"js-sdsl": "^4.1.4",
 				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
@@ -5449,14 +5282,20 @@
 					}
 				},
 				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+					"version": "13.20.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+					"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
 					}
 				},
+				"is-path-inside": {
+					"version": "3.0.3",
+					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+					"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+					"dev": true
+				},
 				"js-yaml": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -5493,19 +5332,20 @@
 			}
 		},
 		"eslint-config-prettier": {
-			"version": "8.5.0",
-			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
-			"integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+			"version": "8.6.0",
+			"resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
+			"integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
 			"dev": true
 		},
 		"eslint-import-resolver-node": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-			"integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
+			"integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
 			"dev": true,
 			"requires": {
 				"debug": "^3.2.7",
-				"resolve": "^1.20.0"
+				"is-core-module": "^2.11.0",
+				"resolve": "^1.22.1"
 			},
 			"dependencies": {
 				"debug": {
@@ -5540,65 +5380,60 @@
 			}
 		},
 		"eslint-plugin-import": {
-			"version": "2.26.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-			"integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+			"version": "2.27.5",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz",
+			"integrity": "sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==",
 			"dev": true,
 			"requires": {
-				"array-includes": "^3.1.4",
-				"array.prototype.flat": "^1.2.5",
-				"debug": "^2.6.9",
+				"array-includes": "^3.1.6",
+				"array.prototype.flat": "^1.3.1",
+				"array.prototype.flatmap": "^1.3.1",
+				"debug": "^3.2.7",
 				"doctrine": "^2.1.0",
-				"eslint-import-resolver-node": "^0.3.6",
-				"eslint-module-utils": "^2.7.3",
+				"eslint-import-resolver-node": "^0.3.7",
+				"eslint-module-utils": "^2.7.4",
 				"has": "^1.0.3",
-				"is-core-module": "^2.8.1",
+				"is-core-module": "^2.11.0",
 				"is-glob": "^4.0.3",
 				"minimatch": "^3.1.2",
-				"object.values": "^1.1.5",
-				"resolve": "^1.22.0",
+				"object.values": "^1.1.6",
+				"resolve": "^1.22.1",
+				"semver": "^6.3.0",
 				"tsconfig-paths": "^3.14.1"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "2.6.9",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-					"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+					"version": "3.2.7",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+					"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
 					"dev": true,
 					"requires": {
-						"ms": "2.0.0"
+						"ms": "^2.1.1"
 					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-					"dev": true
 				}
 			}
 		},
 		"eslint-plugin-jest": {
-			"version": "25.7.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-			"integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
+			"version": "27.2.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.2.1.tgz",
+			"integrity": "sha512-l067Uxx7ZT8cO9NJuf+eJHvt6bqJyz2Z29wykyEdz/OtmcELQl2MQGQLX8J94O1cSJWAwUSEvCjwjA7KEK3Hmg==",
 			"dev": true,
 			"requires": {
-				"@typescript-eslint/experimental-utils": "^5.0.0"
+				"@typescript-eslint/utils": "^5.10.0"
 			}
 		},
 		"eslint-plugin-jsdoc": {
-			"version": "37.9.7",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.9.7.tgz",
-			"integrity": "sha512-8alON8yYcStY94o0HycU2zkLKQdcS+qhhOUNQpfONHHwvI99afbmfpYuPqf6PbLz5pLZldG3Te5I0RbAiTN42g==",
+			"version": "39.8.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.8.0.tgz",
+			"integrity": "sha512-ZwGmk0jJoJD/NILeDRBKrpq/PCgddUdATjeU5JGTqTzKsOWfeaHOnaAwZjuOh7T8EB4hSoZ/9pR4+Qns2ldQVg==",
 			"dev": true,
 			"requires": {
-				"@es-joy/jsdoccomment": "~0.20.1",
-				"comment-parser": "1.3.0",
-				"debug": "^4.3.3",
+				"@es-joy/jsdoccomment": "~0.36.1",
+				"comment-parser": "1.3.1",
+				"debug": "^4.3.4",
 				"escape-string-regexp": "^4.0.0",
 				"esquery": "^1.4.0",
-				"regextras": "^0.8.0",
-				"semver": "^7.3.5",
+				"semver": "^7.3.8",
 				"spdx-expression-parse": "^3.0.1"
 			},
 			"dependencies": {
@@ -5608,35 +5443,53 @@
 					"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 					"dev": true
 				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
 		"eslint-plugin-jsx-a11y": {
-			"version": "6.6.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
-			"integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
+			"integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.18.9",
-				"aria-query": "^4.2.2",
-				"array-includes": "^3.1.5",
+				"@babel/runtime": "^7.20.7",
+				"aria-query": "^5.1.3",
+				"array-includes": "^3.1.6",
+				"array.prototype.flatmap": "^1.3.1",
 				"ast-types-flow": "^0.0.7",
-				"axe-core": "^4.4.3",
-				"axobject-query": "^2.2.0",
+				"axe-core": "^4.6.2",
+				"axobject-query": "^3.1.1",
 				"damerau-levenshtein": "^1.0.8",
 				"emoji-regex": "^9.2.2",
 				"has": "^1.0.3",
-				"jsx-ast-utils": "^3.3.2",
-				"language-tags": "^1.0.5",
+				"jsx-ast-utils": "^3.3.3",
+				"language-tags": "=1.0.5",
 				"minimatch": "^3.1.2",
+				"object.entries": "^1.1.6",
+				"object.fromentries": "^2.0.6",
 				"semver": "^6.3.0"
 			}
 		},
@@ -5650,25 +5503,26 @@
 			}
 		},
 		"eslint-plugin-react": {
-			"version": "7.31.8",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz",
-			"integrity": "sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==",
+			"version": "7.32.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz",
+			"integrity": "sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==",
 			"dev": true,
 			"requires": {
-				"array-includes": "^3.1.5",
-				"array.prototype.flatmap": "^1.3.0",
+				"array-includes": "^3.1.6",
+				"array.prototype.flatmap": "^1.3.1",
+				"array.prototype.tosorted": "^1.1.1",
 				"doctrine": "^2.1.0",
 				"estraverse": "^5.3.0",
 				"jsx-ast-utils": "^2.4.1 || ^3.0.0",
 				"minimatch": "^3.1.2",
-				"object.entries": "^1.1.5",
-				"object.fromentries": "^2.0.5",
-				"object.hasown": "^1.1.1",
-				"object.values": "^1.1.5",
+				"object.entries": "^1.1.6",
+				"object.fromentries": "^2.0.6",
+				"object.hasown": "^1.1.2",
+				"object.values": "^1.1.6",
 				"prop-types": "^15.8.1",
-				"resolve": "^2.0.0-next.3",
+				"resolve": "^2.0.0-next.4",
 				"semver": "^6.3.0",
-				"string.prototype.matchall": "^4.0.7"
+				"string.prototype.matchall": "^4.0.8"
 			},
 			"dependencies": {
 				"estraverse": {
@@ -5722,9 +5576,9 @@
 			"dev": true
 		},
 		"espree": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-			"integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+			"version": "9.4.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+			"integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
 			"dev": true,
 			"requires": {
 				"acorn": "^8.8.0",
@@ -5898,14 +5752,14 @@
 			"dev": true
 		},
 		"express": {
-			"version": "4.18.1",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-			"integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+			"version": "4.18.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
 			"dev": true,
 			"requires": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.0",
+				"body-parser": "1.20.1",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
 				"cookie": "0.5.0",
@@ -5924,7 +5778,7 @@
 				"parseurl": "~1.3.3",
 				"path-to-regexp": "0.1.7",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.10.3",
+				"qs": "6.11.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
 				"send": "0.18.0",
@@ -5956,12 +5810,6 @@
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 					"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
 					"dev": true
-				},
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
 				}
 			}
 		},
@@ -6232,6 +6080,15 @@
 			"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
 			"dev": true
 		},
+		"for-each": {
+			"version": "0.3.3",
+			"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+			"integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+			"dev": true,
+			"requires": {
+				"is-callable": "^1.1.3"
+			}
+		},
 		"for-in": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -6289,9 +6146,9 @@
 			"dev": true
 		},
 		"fs-extra": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
+			"integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.2.0",
@@ -6363,9 +6220,9 @@
 			"dev": true
 		},
 		"get-intrinsic": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-			"integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+			"integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
 			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
@@ -6458,6 +6315,15 @@
 			"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
 			"dev": true
 		},
+		"globalthis": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+			"integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+			"dev": true,
+			"requires": {
+				"define-properties": "^1.1.3"
+			}
+		},
 		"globby": {
 			"version": "11.1.0",
 			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -6478,6 +6344,15 @@
 			"integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
 			"dev": true
 		},
+		"gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+			"dev": true,
+			"requires": {
+				"get-intrinsic": "^1.1.3"
+			}
+		},
 		"graceful-fs": {
 			"version": "4.2.10",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -6541,6 +6416,12 @@
 				"get-intrinsic": "^1.1.1"
 			}
 		},
+		"has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+			"dev": true
+		},
 		"has-symbols": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -6593,6 +6474,12 @@
 				"wbuf": "^1.1.0"
 			},
 			"dependencies": {
+				"isarray": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+					"dev": true
+				},
 				"readable-stream": {
 					"version": "2.3.7",
 					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -6608,6 +6495,12 @@
 						"util-deprecate": "~1.0.1"
 					}
 				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
+				},
 				"string_decoder": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -6619,16 +6512,6 @@
 				}
 			}
 		},
-		"html-element-map": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
-			"integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
-			"dev": true,
-			"requires": {
-				"array.prototype.filter": "^1.0.0",
-				"call-bind": "^1.0.2"
-			}
-		},
 		"html-encoding-sniffer": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -6656,51 +6539,6 @@
 			"integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
 			"dev": true
 		},
-		"htmlparser2": {
-			"version": "8.0.1",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz",
-			"integrity": "sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==",
-			"dev": true,
-			"requires": {
-				"domelementtype": "^2.3.0",
-				"domhandler": "^5.0.2",
-				"domutils": "^3.0.1",
-				"entities": "^4.3.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-					"integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.2",
-						"entities": "^4.2.0"
-					}
-				},
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				},
-				"domutils": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",
-					"integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^2.0.0",
-						"domelementtype": "^2.3.0",
-						"domhandler": "^5.0.1"
-					}
-				}
-			}
-		},
 		"http-deceiver": {
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -6814,9 +6652,9 @@
 			}
 		},
 		"immutable": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-			"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz",
+			"integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==",
 			"dev": true
 		},
 		"import-fresh": {
@@ -6880,12 +6718,12 @@
 			"dev": true
 		},
 		"internal-slot": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz",
+			"integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==",
 			"dev": true,
 			"requires": {
-				"get-intrinsic": "^1.1.0",
+				"get-intrinsic": "^1.1.3",
 				"has": "^1.0.3",
 				"side-channel": "^1.0.4"
 			}
@@ -6903,11 +6741,32 @@
 			"dev": true
 		},
 		"irregular-plurals": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz",
-			"integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==",
+			"version": "3.4.0",
+			"resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.0.tgz",
+			"integrity": "sha512-YXxECO/W6N9aMBVKMKKZ8TXESgq7EFrp3emCGGUcrYY1cgJIeZjoB75MTu8qi+NAKntS9NwPU8VdcQ3r6E6aWQ==",
 			"dev": true
 		},
+		"is-arguments": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
+		"is-array-buffer": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz",
+			"integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.1.3",
+				"is-typed-array": "^1.1.10"
+			}
+		},
 		"is-arrayish": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -6949,15 +6808,15 @@
 			"dev": true
 		},
 		"is-callable": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
-			"integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+			"integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
 			"dev": true
 		},
 		"is-core-module": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
-			"integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+			"integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
 			"dev": true,
 			"requires": {
 				"has": "^1.0.3"
@@ -7011,6 +6870,12 @@
 				"is-extglob": "^2.1.1"
 			}
 		},
+		"is-map": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
+			"integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
+			"dev": true
+		},
 		"is-negative-zero": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
@@ -7084,6 +6949,12 @@
 				"has-tostringtag": "^1.0.0"
 			}
 		},
+		"is-set": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
+			"integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
+			"dev": true
+		},
 		"is-shared-array-buffer": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
@@ -7108,12 +6979,6 @@
 				"has-tostringtag": "^1.0.0"
 			}
 		},
-		"is-subset": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-			"integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==",
-			"dev": true
-		},
 		"is-symbol": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
@@ -7123,6 +6988,19 @@
 				"has-symbols": "^1.0.2"
 			}
 		},
+		"is-typed-array": {
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+			"integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
+			"dev": true,
+			"requires": {
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
 		"is-typedarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -7135,6 +7013,12 @@
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true
 		},
+		"is-weakmap": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
+			"integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
+			"dev": true
+		},
 		"is-weakref": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
@@ -7144,6 +7028,16 @@
 				"call-bind": "^1.0.2"
 			}
 		},
+		"is-weakset": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
+			"integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"get-intrinsic": "^1.1.1"
+			}
+		},
 		"is-windows": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
@@ -7160,9 +7054,9 @@
 			}
 		},
 		"isarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-			"integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
 			"dev": true
 		},
 		"isexe": {
@@ -7184,9 +7078,9 @@
 			"dev": true
 		},
 		"istanbul-lib-instrument": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
-			"integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+			"integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.12.3",
@@ -7357,16 +7251,16 @@
 			}
 		},
 		"jest-dev-server": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.1.1.tgz",
-			"integrity": "sha512-z5LnaGDvlIkdMv/rppSO4+rq+GyQKf1xI9oiBxf9/2EBeN2hxRaWiMvaLNDnHPZj2PAhBXsycrKslDDoZO2Xtw==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-6.2.0.tgz",
+			"integrity": "sha512-ZWh8CuvxwjhYfvw4tGeftziqIvw/26R6AG3OTgNTQeXul8aZz48RQjDpnlDwnWX53jxJJl9fcigqIdSU5lYZuw==",
 			"dev": true,
 			"requires": {
 				"chalk": "^4.1.2",
 				"cwd": "^0.10.0",
 				"find-process": "^1.4.7",
 				"prompts": "^2.4.2",
-				"spawnd": "^6.0.2",
+				"spawnd": "^6.2.0",
 				"tree-kill": "^1.2.2",
 				"wait-on": "^6.0.1"
 			}
@@ -7536,9 +7430,9 @@
 			}
 		},
 		"jest-pnp-resolver": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-			"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+			"integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
 			"dev": true
 		},
 		"jest-regex-util": {
@@ -7683,14 +7577,29 @@
 				"semver": "^7.3.2"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
@@ -7766,9 +7675,9 @@
 			}
 		},
 		"joi": {
-			"version": "17.6.1",
-			"resolved": "https://registry.npmjs.org/joi/-/joi-17.6.1.tgz",
-			"integrity": "sha512-Hl7/iBklIX345OCM1TiFSCZRVaAOLDGlWCp0Df2vWYgBgjkezaR7Kvm3joBciBHQjZj5sxXs859r6eqsRSlG8w==",
+			"version": "17.7.0",
+			"resolved": "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz",
+			"integrity": "sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==",
 			"dev": true,
 			"requires": {
 				"@hapi/hoek": "^9.0.0",
@@ -7779,9 +7688,9 @@
 			}
 		},
 		"js-sdsl": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-			"integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+			"integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
 			"dev": true
 		},
 		"js-tokens": {
@@ -7801,9 +7710,9 @@
 			}
 		},
 		"jsdoc-type-pratt-parser": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz",
-			"integrity": "sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
+			"integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
 			"dev": true
 		},
 		"jsdom": {
@@ -7839,14 +7748,6 @@
 				"whatwg-url": "^8.5.0",
 				"ws": "^7.4.6",
 				"xml-name-validator": "^3.0.0"
-			},
-			"dependencies": {
-				"parse5": {
-					"version": "6.0.1",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-					"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-					"dev": true
-				}
 			}
 		},
 		"jsesc": {
@@ -7880,9 +7781,9 @@
 			"dev": true
 		},
 		"json5": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-			"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+			"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 			"dev": true
 		},
 		"jsonc-parser": {
@@ -7935,15 +7836,15 @@
 			"dev": true
 		},
 		"klona": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-			"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+			"integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
 			"dev": true
 		},
 		"known-css-properties": {
-			"version": "0.25.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
-			"integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
+			"version": "0.26.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz",
+			"integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==",
 			"dev": true
 		},
 		"language-subtag-registry": {
@@ -8011,9 +7912,9 @@
 			"dev": true
 		},
 		"loader-utils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-			"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+			"integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
 			"dev": true,
 			"requires": {
 				"big.js": "^5.2.2",
@@ -8042,24 +7943,6 @@
 			"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
 			"dev": true
 		},
-		"lodash.escape": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-			"integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==",
-			"dev": true
-		},
-		"lodash.flattendeep": {
-			"version": "4.4.0",
-			"resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-			"integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
-			"dev": true
-		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-			"dev": true
-		},
 		"lodash.memoize": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -8113,12 +7996,12 @@
 			}
 		},
 		"lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+			"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 			"dev": true,
 			"requires": {
-				"yallist": "^4.0.0"
+				"yallist": "^3.0.2"
 			}
 		},
 		"make-dir": {
@@ -8268,9 +8151,9 @@
 			"dev": true
 		},
 		"memfs": {
-			"version": "3.4.7",
-			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-			"integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
+			"version": "3.4.13",
+			"resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.13.tgz",
+			"integrity": "sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==",
 			"dev": true,
 			"requires": {
 				"fs-monkey": "^1.0.3"
@@ -8398,18 +8281,18 @@
 			"dev": true
 		},
 		"mini-css-extract-plugin": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-			"integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+			"version": "2.7.2",
+			"resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz",
+			"integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==",
 			"dev": true,
 			"requires": {
 				"schema-utils": "^4.0.0"
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -8463,9 +8346,9 @@
 			}
 		},
 		"minimist": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+			"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
 			"dev": true
 		},
 		"minimist-options": {
@@ -8517,12 +8400,6 @@
 			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
 			"dev": true
 		},
-		"moo": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
-			"integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
-			"dev": true
-		},
 		"mrmime": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
@@ -8548,34 +8425,20 @@
 		"nanoid": {
 			"version": "3.3.4",
 			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
-			"dev": true
-		},
-		"natural-compare": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-			"dev": true
-		},
-		"nearley": {
-			"version": "2.20.1",
-			"resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
-			"integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
-			"dev": true,
-			"requires": {
-				"commander": "^2.19.0",
-				"moo": "^0.5.0",
-				"railroad-diagrams": "^1.0.0",
-				"randexp": "0.4.6"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "2.20.3",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-					"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-					"dev": true
-				}
-			}
+			"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+			"dev": true
+		},
+		"natural-compare": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+			"integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+			"dev": true
+		},
+		"natural-compare-lite": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+			"integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+			"dev": true
 		},
 		"negotiator": {
 			"version": "0.6.3",
@@ -8679,7 +8542,7 @@
 		"normalize-range": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-			"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+			"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
 			"dev": true
 		},
 		"normalize-url": {
@@ -8726,14 +8589,29 @@
 				"strip-json-comments": "^3.1.1"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
@@ -8786,9 +8664,9 @@
 			"dev": true
 		},
 		"object-inspect": {
-			"version": "1.12.2",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+			"version": "1.12.3",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+			"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
 			"dev": true
 		},
 		"object-is": {
@@ -8820,46 +8698,46 @@
 			}
 		},
 		"object.entries": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-			"integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
+			"integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"object.fromentries": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-			"integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
+			"integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"object.hasown": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-			"integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
+			"integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
 			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"object.values": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-			"integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
+			"integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1"
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"obuf": {
@@ -9016,34 +8894,10 @@
 			"dev": true
 		},
 		"parse5": {
-			"version": "7.1.1",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.1.tgz",
-			"integrity": "sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==",
-			"dev": true,
-			"requires": {
-				"entities": "^4.4.0"
-			}
-		},
-		"parse5-htmlparser2-tree-adapter": {
-			"version": "7.0.0",
-			"resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-			"integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-			"dev": true,
-			"requires": {
-				"domhandler": "^5.0.2",
-				"parse5": "^7.0.0"
-			},
-			"dependencies": {
-				"domhandler": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-					"integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.3.0"
-					}
-				}
-			}
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+			"dev": true
 		},
 		"parseurl": {
 			"version": "1.3.3",
@@ -9119,12 +8973,6 @@
 			"integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
 			"dev": true
 		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-			"dev": true
-		},
 		"picocolors": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -9222,9 +9070,9 @@
 			}
 		},
 		"postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+			"version": "8.4.21",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+			"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
 			"dev": true,
 			"requires": {
 				"nanoid": "^3.3.4",
@@ -9243,14 +9091,14 @@
 			}
 		},
 		"postcss-cli": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.0.0.tgz",
-			"integrity": "sha512-Wjy/00wBBEgQqnSToznxLWDnATznokFGXsHtF/3G8glRZpz5KYlfHcBW/VMJmWAeF2x49zjgy4izjM3/Wx1dKA==",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.1.0.tgz",
+			"integrity": "sha512-Zu7PLORkE9YwNdvOeOVKPmWghprOtjFQU3srMUGbdz3pHJiFh7yZ4geiZFMkjMfB0mtTFR3h8RemR62rPkbOPA==",
 			"dev": true,
 			"requires": {
 				"chokidar": "^3.3.0",
 				"dependency-graph": "^0.11.0",
-				"fs-extra": "^10.0.0",
+				"fs-extra": "^11.0.0",
 				"get-stdin": "^9.0.0",
 				"globby": "^13.0.0",
 				"picocolors": "^1.0.0",
@@ -9258,55 +9106,25 @@
 				"postcss-reporter": "^7.0.0",
 				"pretty-hrtime": "^1.0.3",
 				"read-cache": "^1.0.0",
-				"slash": "^4.0.0",
+				"slash": "^5.0.0",
 				"yargs": "^17.0.0"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "4.3.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^2.0.1"
-					}
-				},
 				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+					"version": "8.0.1",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 					"dev": true,
 					"requires": {
 						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
+						"strip-ansi": "^6.0.1",
 						"wrap-ansi": "^7.0.0"
 					}
 				},
-				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-					"dev": true,
-					"requires": {
-						"color-name": "~1.1.4"
-					}
-				},
-				"color-name": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true
-				},
-				"get-stdin": {
-					"version": "9.0.0",
-					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
-					"integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
-					"dev": true
-				},
 				"globby": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
-					"integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
+					"version": "13.1.3",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+					"integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
 					"dev": true,
 					"requires": {
 						"dir-glob": "^3.0.1",
@@ -9314,50 +9132,41 @@
 						"ignore": "^5.2.0",
 						"merge2": "^1.4.1",
 						"slash": "^4.0.0"
+					},
+					"dependencies": {
+						"slash": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+							"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+							"dev": true
+						}
 					}
 				},
 				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-					"dev": true
-				},
-				"wrap-ansi": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-					"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^4.0.0",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^6.0.0"
-					}
-				},
-				"y18n": {
-					"version": "5.0.8",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-					"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz",
+					"integrity": "sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==",
 					"dev": true
 				},
 				"yargs": {
-					"version": "17.5.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-					"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+					"version": "17.6.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+					"integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
 					"dev": true,
 					"requires": {
-						"cliui": "^7.0.2",
+						"cliui": "^8.0.1",
 						"escalade": "^3.1.1",
 						"get-caller-file": "^2.0.5",
 						"require-directory": "^2.1.1",
 						"string-width": "^4.2.3",
 						"y18n": "^5.0.5",
-						"yargs-parser": "^21.0.0"
+						"yargs-parser": "^21.1.1"
 					}
 				},
 				"yargs-parser": {
-					"version": "21.0.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-					"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+					"version": "21.1.1",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
 					"dev": true
 				}
 			}
@@ -9375,12 +9184,12 @@
 			}
 		},
 		"postcss-convert-values": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz",
-			"integrity": "sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==",
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+			"integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.20.3",
+				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
 			}
 		},
@@ -9419,9 +9228,9 @@
 			},
 			"dependencies": {
 				"yaml": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-					"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
+					"integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
 					"dev": true
 				}
 			}
@@ -9437,14 +9246,29 @@
 				"semver": "^7.3.5"
 			},
 			"dependencies": {
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
@@ -9455,22 +9279,22 @@
 			"dev": true
 		},
 		"postcss-merge-longhand": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz",
-			"integrity": "sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==",
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+			"integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
 			"dev": true,
 			"requires": {
 				"postcss-value-parser": "^4.2.0",
-				"stylehacks": "^5.1.0"
+				"stylehacks": "^5.1.1"
 			}
 		},
 		"postcss-merge-rules": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz",
-			"integrity": "sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==",
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz",
+			"integrity": "sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
 				"cssnano-utils": "^3.1.0",
 				"postcss-selector-parser": "^6.0.5"
@@ -9497,12 +9321,12 @@
 			}
 		},
 		"postcss-minify-params": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz",
-			"integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==",
+			"version": "5.1.4",
+			"resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+			"integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"cssnano-utils": "^3.1.0",
 				"postcss-value-parser": "^4.2.0"
 			}
@@ -9603,12 +9427,12 @@
 			}
 		},
 		"postcss-normalize-unicode": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-			"integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+			"integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"postcss-value-parser": "^4.2.0"
 			}
 		},
@@ -9642,12 +9466,12 @@
 			}
 		},
 		"postcss-reduce-initial": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-			"integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz",
+			"integrity": "sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0"
 			}
 		},
@@ -9683,15 +9507,15 @@
 			"dev": true
 		},
 		"postcss-scss": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.5.tgz",
-			"integrity": "sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==",
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
+			"integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
 			"dev": true
 		},
 		"postcss-selector-parser": {
-			"version": "6.0.10",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-			"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+			"version": "6.0.11",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+			"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
 			"dev": true,
 			"requires": {
 				"cssesc": "^3.0.0",
@@ -9849,9 +9673,9 @@
 			}
 		},
 		"punycode": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
 			"dev": true
 		},
 		"puppeteer-core": {
@@ -9892,9 +9716,9 @@
 			}
 		},
 		"qs": {
-			"version": "6.10.3",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-			"integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+			"version": "6.11.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
 			"dev": true,
 			"requires": {
 				"side-channel": "^1.0.4"
@@ -9918,31 +9742,6 @@
 			"integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
 			"dev": true
 		},
-		"raf": {
-			"version": "3.4.1",
-			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-			"dev": true,
-			"requires": {
-				"performance-now": "^2.1.0"
-			}
-		},
-		"railroad-diagrams": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-			"integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
-			"dev": true
-		},
-		"randexp": {
-			"version": "0.4.6",
-			"resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
-			"integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
-			"dev": true,
-			"requires": {
-				"discontinuous-range": "1.0.0",
-				"ret": "~0.1.10"
-			}
-		},
 		"randombytes": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -9979,24 +9778,22 @@
 			}
 		},
 		"react": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
-			"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
+			"integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
 			"dev": true,
 			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+				"loose-envify": "^1.1.0"
 			}
 		},
 		"react-dom": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz",
-			"integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==",
+			"version": "18.2.0",
+			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
+			"integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
 			"dev": true,
 			"requires": {
 				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"scheduler": "^0.20.2"
+				"scheduler": "^0.23.0"
 			}
 		},
 		"react-is": {
@@ -10011,36 +9808,6 @@
 			"integrity": "sha512-PgidR3wST3dDYKr6b4pJoqQFpPGNKDSCDx4cZoshjXipw3LzO7mG1My2pwEzz2JVkF+inx3xRpDeQLFQGH/hsQ==",
 			"dev": true
 		},
-		"react-shallow-renderer": {
-			"version": "16.15.0",
-			"resolved": "https://registry.npmjs.org/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz",
-			"integrity": "sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==",
-			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"react-is": "^16.12.0 || ^17.0.0 || ^18.0.0"
-			}
-		},
-		"react-test-renderer": {
-			"version": "17.0.2",
-			"resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-17.0.2.tgz",
-			"integrity": "sha512-yaQ9cB89c17PUb0x6UfWRs7kQCorVdHlutU1boVPEsB8IDZH6n9tHxMacc3y0JoXOJUsZb/t/Mb8FUWMKaM7iQ==",
-			"dev": true,
-			"requires": {
-				"object-assign": "^4.1.1",
-				"react-is": "^17.0.2",
-				"react-shallow-renderer": "^16.13.1",
-				"scheduler": "^0.20.2"
-			},
-			"dependencies": {
-				"react-is": {
-					"version": "17.0.2",
-					"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-					"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-					"dev": true
-				}
-			}
-		},
 		"read-cache": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -10189,15 +9956,15 @@
 			}
 		},
 		"regenerator-runtime": {
-			"version": "0.13.9",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+			"version": "0.13.11",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+			"integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
 			"dev": true
 		},
 		"regenerator-transform": {
-			"version": "0.15.0",
-			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-			"integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+			"version": "0.15.1",
+			"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+			"integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
 			"dev": true,
 			"requires": {
 				"@babel/runtime": "^7.8.4"
@@ -10221,9 +9988,9 @@
 			"dev": true
 		},
 		"regexpu-core": {
-			"version": "5.2.1",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-			"integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz",
+			"integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==",
 			"dev": true,
 			"requires": {
 				"regenerate": "^1.4.2",
@@ -10231,15 +9998,9 @@
 				"regjsgen": "^0.7.1",
 				"regjsparser": "^0.9.1",
 				"unicode-match-property-ecmascript": "^2.0.0",
-				"unicode-match-property-value-ecmascript": "^2.0.0"
+				"unicode-match-property-value-ecmascript": "^2.1.0"
 			}
 		},
-		"regextras": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz",
-			"integrity": "sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==",
-			"dev": true
-		},
 		"regjsgen": {
 			"version": "0.7.1",
 			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
@@ -10341,15 +10102,9 @@
 			"dev": true
 		},
 		"resolve.exports": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-			"integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-			"dev": true
-		},
-		"ret": {
-			"version": "0.1.15",
-			"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-			"integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz",
+			"integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
 			"dev": true
 		},
 		"retry": {
@@ -10373,16 +10128,6 @@
 				"glob": "^7.1.3"
 			}
 		},
-		"rst-selector-parser": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
-			"integrity": "sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==",
-			"dev": true,
-			"requires": {
-				"lodash.flattendeep": "^4.4.0",
-				"nearley": "^2.7.10"
-			}
-		},
 		"rtlcss": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.0.0.tgz",
@@ -10442,9 +10187,9 @@
 			}
 		},
 		"safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+			"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
 			"dev": true
 		},
 		"safe-regex-test": {
@@ -10465,9 +10210,9 @@
 			"dev": true
 		},
 		"sass": {
-			"version": "1.55.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz",
-			"integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==",
+			"version": "1.58.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
+			"integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
 			"dev": true,
 			"requires": {
 				"chokidar": ">=3.0.0 <4.0.0",
@@ -10495,13 +10240,12 @@
 			}
 		},
 		"scheduler": {
-			"version": "0.20.2",
-			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz",
-			"integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==",
+			"version": "0.23.0",
+			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
+			"integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
 			"dev": true,
 			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+				"loose-envify": "^1.1.0"
 			}
 		},
 		"schema-utils": {
@@ -10594,9 +10338,9 @@
 			}
 		},
 		"serialize-javascript": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-			"integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+			"version": "6.0.1",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
 			"dev": true,
 			"requires": {
 				"randombytes": "^2.1.0"
@@ -10733,9 +10477,9 @@
 			"dev": true
 		},
 		"shell-quote": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
-			"integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz",
+			"integrity": "sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==",
 			"dev": true
 		},
 		"side-channel": {
@@ -10849,9 +10593,9 @@
 			"dev": true
 		},
 		"source-map-loader": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-			"integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+			"integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
 			"dev": true,
 			"requires": {
 				"abab": "^2.0.5",
@@ -10895,13 +10639,13 @@
 			"dev": true
 		},
 		"spawnd": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.0.2.tgz",
-			"integrity": "sha512-+YJtx0dvy2wt304MrHD//tASc84zinBUYU1jacPBzrjhZUd7RsDo25krxr4HUHAQzEQFuMAs4/p+yLYU5ciZ1w==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/spawnd/-/spawnd-6.2.0.tgz",
+			"integrity": "sha512-qX/I4lQy4KgVEcNle0kuc4FxFWHISzBhZW1YemPfwmrmQjyZmfTK/OhBKkhrD2ooAaFZEm1maEBLE6/6enwt+g==",
 			"dev": true,
 			"requires": {
 				"exit": "^0.1.2",
-				"signal-exit": "^3.0.6",
+				"signal-exit": "^3.0.7",
 				"tree-kill": "^1.2.2"
 			}
 		},
@@ -10977,9 +10721,9 @@
 			"dev": true
 		},
 		"stack-utils": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-			"integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+			"integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
 			"dev": true,
 			"requires": {
 				"escape-string-regexp": "^2.0.0"
@@ -11005,6 +10749,15 @@
 			"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
 			"dev": true
 		},
+		"stop-iteration-iterator": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+			"integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+			"dev": true,
+			"requires": {
+				"internal-slot": "^1.0.4"
+			}
+		},
 		"string-length": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -11035,52 +10788,41 @@
 			}
 		},
 		"string.prototype.matchall": {
-			"version": "4.0.7",
-			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-			"integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
+			"integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.19.1",
-				"get-intrinsic": "^1.1.1",
+				"define-properties": "^1.1.4",
+				"es-abstract": "^1.20.4",
+				"get-intrinsic": "^1.1.3",
 				"has-symbols": "^1.0.3",
 				"internal-slot": "^1.0.3",
-				"regexp.prototype.flags": "^1.4.1",
+				"regexp.prototype.flags": "^1.4.3",
 				"side-channel": "^1.0.4"
 			}
 		},
-		"string.prototype.trim": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.6.tgz",
-			"integrity": "sha512-8lMR2m+U0VJTPp6JjvJTtGyc4FIGq9CdRt7O9p6T0e6K4vjU+OP+SQJpbe/SBmRcCUIvNUnjsbmY6lnMp8MhsQ==",
-			"dev": true,
-			"requires": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
-			}
-		},
 		"string.prototype.trimend": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-			"integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+			"integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"string.prototype.trimstart": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-			"integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+			"integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
 			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.4",
-				"es-abstract": "^1.19.5"
+				"es-abstract": "^1.20.4"
 			}
 		},
 		"string_decoder": {
@@ -11090,14 +10832,6 @@
 			"dev": true,
 			"requires": {
 				"safe-buffer": "~5.2.0"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-					"dev": true
-				}
 			}
 		},
 		"strip-ansi": {
@@ -11152,25 +10886,25 @@
 			"dev": true
 		},
 		"stylehacks": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-			"integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+			"integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"postcss-selector-parser": "^6.0.4"
 			}
 		},
 		"stylelint": {
-			"version": "14.12.1",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.12.1.tgz",
-			"integrity": "sha512-ZEM4TuksChMBfuPadQsHUkbOoRySAT9QMfDvvYxdAchOJl0p+csTMBXOu6ORAAxKhwBmxqJiep8V88bXfNs3EQ==",
+			"version": "14.16.1",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz",
+			"integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==",
 			"dev": true,
 			"requires": {
 				"@csstools/selector-specificity": "^2.0.2",
 				"balanced-match": "^2.0.0",
 				"colord": "^2.9.3",
-				"cosmiconfig": "^7.0.1",
+				"cosmiconfig": "^7.1.0",
 				"css-functions-list": "^3.1.0",
 				"debug": "^4.3.4",
 				"fast-glob": "^3.2.12",
@@ -11180,21 +10914,21 @@
 				"globby": "^11.1.0",
 				"globjoin": "^0.1.4",
 				"html-tags": "^3.2.0",
-				"ignore": "^5.2.0",
+				"ignore": "^5.2.1",
 				"import-lazy": "^4.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-plain-object": "^5.0.0",
-				"known-css-properties": "^0.25.0",
+				"known-css-properties": "^0.26.0",
 				"mathml-tag-names": "^2.1.3",
 				"meow": "^9.0.0",
 				"micromatch": "^4.0.5",
 				"normalize-path": "^3.0.0",
 				"picocolors": "^1.0.0",
-				"postcss": "^8.4.16",
+				"postcss": "^8.4.19",
 				"postcss-media-query-parser": "^0.2.3",
 				"postcss-resolve-nested-selector": "^0.1.1",
 				"postcss-safe-parser": "^6.0.0",
-				"postcss-selector-parser": "^6.0.10",
+				"postcss-selector-parser": "^6.0.11",
 				"postcss-value-parser": "^4.2.0",
 				"resolve-from": "^5.0.0",
 				"string-width": "^4.2.3",
@@ -11202,7 +10936,7 @@
 				"style-search": "^0.1.0",
 				"supports-hyperlinks": "^2.3.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.8.0",
+				"table": "^6.8.1",
 				"v8-compile-cache": "^2.3.0",
 				"write-file-atomic": "^4.0.2"
 			},
@@ -11255,12 +10989,27 @@
 						"lru-cache": "^6.0.0"
 					}
 				},
+				"ignore": {
+					"version": "5.2.4",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+					"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+					"dev": true
+				},
 				"kind-of": {
 					"version": "6.0.3",
 					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
 					"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
 					"dev": true
 				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"meow": {
 					"version": "9.0.0",
 					"resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
@@ -11300,9 +11049,9 @@
 					"dev": true
 				},
 				"semver": {
-					"version": "7.3.7",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-					"integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+					"version": "7.3.8",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+					"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
 					"dev": true,
 					"requires": {
 						"lru-cache": "^6.0.0"
@@ -11323,6 +11072,12 @@
 						"imurmurhash": "^0.1.4",
 						"signal-exit": "^3.0.7"
 					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+					"dev": true
 				}
 			}
 		},
@@ -11438,9 +11193,9 @@
 			"dev": true
 		},
 		"table": {
-			"version": "6.8.0",
-			"resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
-			"integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+			"version": "6.8.1",
+			"resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
+			"integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
 			"dev": true,
 			"requires": {
 				"ajv": "^8.0.1",
@@ -11451,9 +11206,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -11512,9 +11267,9 @@
 			}
 		},
 		"terser": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
-			"integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
+			"version": "5.16.3",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz",
+			"integrity": "sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==",
 			"dev": true,
 			"requires": {
 				"@jridgewell/source-map": "^0.3.2",
@@ -11568,9 +11323,9 @@
 			"dev": true
 		},
 		"throat": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-			"integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
+			"integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
 			"dev": true
 		},
 		"through": {
@@ -11673,9 +11428,9 @@
 			},
 			"dependencies": {
 				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+					"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 					"dev": true,
 					"requires": {
 						"minimist": "^1.2.0"
@@ -11684,9 +11439,9 @@
 			}
 		},
 		"tslib": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-			"integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+			"integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
 			"dev": true
 		},
 		"tsutils": {
@@ -11737,6 +11492,17 @@
 				"mime-types": "~2.1.24"
 			}
 		},
+		"typed-array-length": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+			"integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"is-typed-array": "^1.1.9"
+			}
+		},
 		"typedarray-to-buffer": {
 			"version": "3.1.5",
 			"resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
@@ -11791,9 +11557,9 @@
 			}
 		},
 		"unicode-match-property-value-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
 			"dev": true
 		},
 		"unicode-property-aliases-ecmascript": {
@@ -11989,9 +11755,9 @@
 			"dev": true
 		},
 		"webpack": {
-			"version": "5.74.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-			"integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+			"version": "5.75.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz",
+			"integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==",
 			"dev": true,
 			"requires": {
 				"@types/eslint-scope": "^3.7.3",
@@ -12021,9 +11787,9 @@
 			}
 		},
 		"webpack-bundle-analyzer": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.6.1.tgz",
-			"integrity": "sha512-oKz9Oz9j3rUciLNfpGFjOb49/jEpXNmWdVH8Ls//zNcnLlQdTGXQQMsBbb/gR7Zl8WNLxVCq+0Hqbx3zv6twBw==",
+			"version": "4.7.0",
+			"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
+			"integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
 			"dev": true,
 			"requires": {
 				"acorn": "^8.0.4",
@@ -12116,9 +11882,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -12194,9 +11960,9 @@
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "8.11.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-					"integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+					"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -12242,9 +12008,9 @@
 					}
 				},
 				"ws": {
-					"version": "8.9.0",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
-					"integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
+					"version": "8.12.0",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+					"integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
 					"dev": true
 				}
 			}
@@ -12367,6 +12133,32 @@
 				"is-symbol": "^1.0.3"
 			}
 		},
+		"which-collection": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
+			"integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
+			"dev": true,
+			"requires": {
+				"is-map": "^2.0.1",
+				"is-set": "^2.0.1",
+				"is-weakmap": "^2.0.1",
+				"is-weakset": "^2.0.1"
+			}
+		},
+		"which-typed-array": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+			"integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
+			"dev": true,
+			"requires": {
+				"available-typed-arrays": "^1.0.5",
+				"call-bind": "^1.0.2",
+				"for-each": "^0.3.3",
+				"gopd": "^1.0.1",
+				"has-tostringtag": "^1.0.0",
+				"is-typed-array": "^1.1.10"
+			}
+		},
 		"wildcard": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
@@ -12459,9 +12251,9 @@
 			"dev": true
 		},
 		"yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
 			"dev": true
 		},
 		"yaml": {
diff --git a/src/wp-content/themes/twentytwenty/package.json b/src/wp-content/themes/twentytwenty/package.json
index ffc842bae701c..67a578136a158 100644
--- a/src/wp-content/themes/twentytwenty/package.json
+++ b/src/wp-content/themes/twentytwenty/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "twentytwenty",
-	"version": "2.1.0",
+	"version": "2.3.0",
 	"description": "Default WP Theme",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -14,12 +14,12 @@
 		"url": "https://core.trac.wordpress.org/"
 	},
 	"devDependencies": {
-		"@wordpress/browserslist-config": "^5.1.0",
-		"@wordpress/scripts": "^24.2.0",
-		"autoprefixer": "^10.4.12",
-		"concurrently": "^7.4.0",
-		"postcss": "^8.4.16",
-		"postcss-cli": "^10.0.0",
+		"@wordpress/browserslist-config": "^5.9.0",
+		"@wordpress/scripts": "^24.6.0",
+		"autoprefixer": "^10.4.13",
+		"concurrently": "^7.6.0",
+		"postcss": "^8.4.21",
+		"postcss-cli": "^10.1.0",
 		"rtlcss": "^4.0.0",
 		"stylelint-a11y": "^1.2.3"
 	},
diff --git a/src/wp-content/themes/twentytwenty/readme.txt b/src/wp-content/themes/twentytwenty/readme.txt
index b32dbe18b30bc..0bec8ad9c6c14 100644
--- a/src/wp-content/themes/twentytwenty/readme.txt
+++ b/src/wp-content/themes/twentytwenty/readme.txt
@@ -1,7 +1,9 @@
 === Twenty Twenty ===
 Contributors: the WordPress team
-Tested up to: 6.1
-Stable tag: 2.1
+Requires at least: 4.7
+Tested up to: 6.3
+Requires PHP: 5.2.4
+Stable tag: 2.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -22,60 +24,70 @@ you pick, ensuring a high, accessible color contrast for your visitors.
 
 == Changelog ==
 
+= 2.3 =
+* Released: August 8, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_2.3
+
+= 2.2 =
+* Released: March 28, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_2.2
+
 = 2.1 =
 * Released: November 1, 2022
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_2.1
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_2.1
 
 = 2.0 =
 * Released: May 24, 2022
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_2.0
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_2.0
 
 = 1.9 =
 * Released: January 25, 2022
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.9
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.9
 
 = 1.8 =
 * Released: July 20, 2021
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.8
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.8
 
 = 1.7 =
 * Released: March 9, 2021
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.7
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.7
 
 = 1.6 =
 * Released: December 8, 2020
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.6
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.6
 
 = 1.5 =
 * Released: August 11, 2020
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.5
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.5
 
 = 1.4 =
 * Released: June 10, 2020
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.4
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.4
 
 = 1.3 =
 * Released: May 14, 2020
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.3
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.3
 
 = 1.2 =
 * Released: March 31, 2020
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.2
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.2
 
 = 1.1 =
 * Released: December 12, 2019
 
-https://wordpress.org/support/article/twenty-twenty-changelog/#Version_1.1
+https://wordpress.org/documentation/article/twenty-twenty-changelog/#Version_1.1
 
 = 1.0 =
 * Released: November 12, 2019
@@ -84,7 +96,7 @@ Initial release
 
 == Copyright ==
 
-Twenty Twenty WordPress Theme, Copyright 2019-2022 WordPress.org
+Twenty Twenty WordPress Theme, Copyright 2019-2023 WordPress.org
 Twenty Twenty is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
@@ -133,7 +145,7 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Source: WordPress Social Link Block (See wp-includes\blocks\social-link.php)
 
 Code from Twenty Nineteen
-Copyright (c) 2018-2022 WordPress.org
+Copyright (c) 2018-2023 WordPress.org
 License: GPLv2
 Source: https://wordpress.org/themes/twentynineteen/
 Included as part of the following classes and functions:
@@ -143,11 +155,11 @@ Included as part of the following classes and functions:
 - twentytwenty_nav_menu_social_icons()
 
 Code from Twenty Seventeen
-Copyright (c) 2016-2022 WordPress.org
+Copyright (c) 2016-2023 WordPress.org
 License: GPLv2
 Source: https://wordpress.org/themes/twentyseventeen/
 Included as part of the following classes and functions:
 - twentytwenty_unique_id()
 
 Underscores
-https://underscores.me/, (C) 2012-2022 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html)
+https://underscores.me/, (C) 2012-2023 Automattic, Inc., [GPLv2 or later](https://www.gnu.org/licenses/gpl-2.0.html)
diff --git a/src/wp-content/themes/twentytwenty/searchform.php b/src/wp-content/themes/twentytwenty/searchform.php
index 428a513b5c9ff..38f956c5ae5a5 100644
--- a/src/wp-content/themes/twentytwenty/searchform.php
+++ b/src/wp-content/themes/twentytwenty/searchform.php
@@ -25,7 +25,12 @@
 ?>
 <form role="search" <?php echo $twentytwenty_aria_label; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Escaped above. ?> method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label for="<?php echo esc_attr( $twentytwenty_unique_id ); ?>">
-		<span class="screen-reader-text"><?php _e( 'Search for:', 'twentytwenty' ); // phpcs:ignore: WordPress.Security.EscapeOutput.UnsafePrintingFunction -- core trusts translations ?></span>
+		<span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Search for:', 'twentytwenty' ); // phpcs:ignore: WordPress.Security.EscapeOutput.UnsafePrintingFunction -- core trusts translations
+			?>
+		</span>
 		<input type="search" id="<?php echo esc_attr( $twentytwenty_unique_id ); ?>" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentytwenty' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
 	</label>
 	<input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'twentytwenty' ); ?>" />
diff --git a/src/wp-content/themes/twentytwenty/style-rtl.css b/src/wp-content/themes/twentytwenty/style-rtl.css
index f64549e516ca4..141dec6ce257b 100644
--- a/src/wp-content/themes/twentytwenty/style-rtl.css
+++ b/src/wp-content/themes/twentytwenty/style-rtl.css
@@ -1,8 +1,8 @@
 /*
 Theme Name: Twenty Twenty
 Text Domain: twentytwenty
-Version: 2.1
-Tested up to: 6.1
+Version: 2.3
+Tested up to: 6.3
 Requires at least: 4.7
 Requires PHP: 5.2.4
 Description: Our default theme for 2020 is designed to take full advantage of the flexibility of the block editor. Organizations and businesses have the ability to create dynamic landing pages with endless layouts using the group and column blocks. The centered content column and fine-tuned typography also makes it perfect for traditional blogs. Complete editor styles give you a good idea of what your content will look like, even before you publish. You can give your site a personal touch by changing the background colors and the accent color in the Customizer. The colors of all elements on your site are automatically calculated based on the colors you pick, ensuring a high, accessible color contrast for your visitors.
@@ -2925,6 +2925,11 @@ h2.entry-title {
 	list-style: none;
 }
 
+ol.wp-block-latest-comments {
+	margin-right: auto;
+	margin-left: auto;
+}
+
 .entry-content .wp-block-archives > li,
 .entry-content .wp-block-categories > li,
 .entry-content .wp-block-latest-posts > li,
@@ -3023,6 +3028,11 @@ h2.entry-title {
 	padding: calc(1.1em - 0.2rem) calc(1.44em - 0.2rem);
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 /* Block: Columns ---------------------------- */
 
 .wp-block-columns.alignfull,
@@ -3241,6 +3251,12 @@ figure.wp-block-gallery.alignfull {
 	margin-top: 1.2rem;
 }
 
+.wp-block-pullquote.has-text-color cite,
+.wp-block-pullquote.has-background cite,
+.has-background .wp-block-pullquote cite {
+	color: inherit;
+}
+
 .wp-block-pullquote.alignleft p,
 .wp-block-pullquote.alignright p {
 	font-size: 2.8rem;
@@ -3359,6 +3375,12 @@ figure.wp-block-table.is-style-stripes {
 	text-align: inherit;
 }
 
+.wp-block-quote.has-text-color cite,
+.wp-block-quote.has-background cite,
+.has-background .wp-block-quote cite {
+	color: inherit;
+}
+
 .wp-block-quote[style="text-align:center"] {
 	border-width: 0;
 	padding: 0;
diff --git a/src/wp-content/themes/twentytwenty/style.css b/src/wp-content/themes/twentytwenty/style.css
index c2ac1eac0643a..416f1dd255361 100644
--- a/src/wp-content/themes/twentytwenty/style.css
+++ b/src/wp-content/themes/twentytwenty/style.css
@@ -1,8 +1,8 @@
 /*
 Theme Name: Twenty Twenty
 Text Domain: twentytwenty
-Version: 2.1
-Tested up to: 6.1
+Version: 2.3
+Tested up to: 6.3
 Requires at least: 4.7
 Requires PHP: 5.2.4
 Description: Our default theme for 2020 is designed to take full advantage of the flexibility of the block editor. Organizations and businesses have the ability to create dynamic landing pages with endless layouts using the group and column blocks. The centered content column and fine-tuned typography also makes it perfect for traditional blogs. Complete editor styles give you a good idea of what your content will look like, even before you publish. You can give your site a personal touch by changing the background colors and the accent color in the Customizer. The colors of all elements on your site are automatically calculated based on the colors you pick, ensuring a high, accessible color contrast for your visitors.
@@ -2945,6 +2945,11 @@ h2.entry-title {
 	list-style: none;
 }
 
+ol.wp-block-latest-comments {
+	margin-left: auto;
+	margin-right: auto;
+}
+
 .entry-content .wp-block-archives > li,
 .entry-content .wp-block-categories > li,
 .entry-content .wp-block-latest-posts > li,
@@ -3043,6 +3048,11 @@ h2.entry-title {
 	padding: calc(1.1em - 0.2rem) calc(1.44em - 0.2rem);
 }
 
+.wp-block-buttons[style*="text-transform"] .wp-block-button__link,
+.wp-block-button[style*="text-transform"] .wp-block-button__link {
+	text-transform: inherit;
+}
+
 /* Block: Columns ---------------------------- */
 
 .wp-block-columns.alignfull,
@@ -3261,6 +3271,12 @@ figure.wp-block-gallery.alignfull {
 	margin-top: 1.2rem;
 }
 
+.wp-block-pullquote.has-text-color cite,
+.wp-block-pullquote.has-background cite,
+.has-background .wp-block-pullquote cite {
+	color: inherit;
+}
+
 .wp-block-pullquote.alignleft p,
 .wp-block-pullquote.alignright p {
 	font-size: 2.8rem;
@@ -3379,6 +3395,12 @@ figure.wp-block-table.is-style-stripes {
 	text-align: inherit;
 }
 
+.wp-block-quote.has-text-color cite,
+.wp-block-quote.has-background cite,
+.has-background .wp-block-quote cite {
+	color: inherit;
+}
+
 .wp-block-quote[style="text-align:center"] {
 	border-width: 0;
 	padding: 0;
diff --git a/src/wp-content/themes/twentytwenty/template-parts/content-cover.php b/src/wp-content/themes/twentytwenty/template-parts/content-cover.php
index 7bcb8761f3c17..151507ea7c907 100644
--- a/src/wp-content/themes/twentytwenty/template-parts/content-cover.php
+++ b/src/wp-content/themes/twentytwenty/template-parts/content-cover.php
@@ -67,7 +67,12 @@
 								?>
 
 								<div class="entry-categories">
-									<span class="screen-reader-text"><?php _e( 'Categories', 'twentytwenty' ); ?></span>
+									<span class="screen-reader-text">
+										<?php
+										/* translators: Hidden accessibility text. */
+										_e( 'Categories', 'twentytwenty' );
+										?>
+									</span>
 									<div class="entry-categories-inner">
 										<?php the_category( ' ' ); ?>
 									</div><!-- .entry-categories-inner -->
@@ -85,7 +90,12 @@
 
 									<a href="#post-inner" class="to-the-content fill-children-current-color">
 										<?php twentytwenty_the_theme_svg( 'arrow-down' ); ?>
-										<div class="screen-reader-text"><?php _e( 'Scroll Down', 'twentytwenty' ); ?></div>
+										<div class="screen-reader-text">
+											<?php
+											/* translators: Hidden accessibility text. */
+											_e( 'Scroll Down', 'twentytwenty' );
+											?>
+										</div>
 									</a><!-- .to-the-content -->
 
 								</div><!-- .to-the-content-wrapper -->
diff --git a/src/wp-content/themes/twentytwenty/template-parts/entry-header.php b/src/wp-content/themes/twentytwenty/template-parts/entry-header.php
index 830e263a83b77..e8059ec780c09 100644
--- a/src/wp-content/themes/twentytwenty/template-parts/entry-header.php
+++ b/src/wp-content/themes/twentytwenty/template-parts/entry-header.php
@@ -33,7 +33,12 @@
 			?>
 
 			<div class="entry-categories">
-				<span class="screen-reader-text"><?php _e( 'Categories', 'twentytwenty' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Categories', 'twentytwenty' );
+					?>
+				</span>
 				<div class="entry-categories-inner">
 					<?php the_category( ' ' ); ?>
 				</div><!-- .entry-categories-inner -->
diff --git a/src/wp-content/themes/twentytwenty/template-parts/modal-search.php b/src/wp-content/themes/twentytwenty/template-parts/modal-search.php
index cf8d4dc6a7c9d..2819adc6bb979 100644
--- a/src/wp-content/themes/twentytwenty/template-parts/modal-search.php
+++ b/src/wp-content/themes/twentytwenty/template-parts/modal-search.php
@@ -23,7 +23,12 @@
 			?>
 
 			<button class="toggle search-untoggle close-search-toggle fill-children-current-color" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
-				<span class="screen-reader-text"><?php _e( 'Close search', 'twentytwenty' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Close search', 'twentytwenty' );
+					?>
+				</span>
 				<?php twentytwenty_the_theme_svg( 'cross' ); ?>
 			</button><!-- .search-toggle -->
 
diff --git a/src/wp-content/themes/twentytwenty/template-parts/pagination.php b/src/wp-content/themes/twentytwenty/template-parts/pagination.php
index 8973447ad66bd..036b6fd6f480b 100644
--- a/src/wp-content/themes/twentytwenty/template-parts/pagination.php
+++ b/src/wp-content/themes/twentytwenty/template-parts/pagination.php
@@ -37,12 +37,12 @@
 );
 
 // If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place.
-if ( strpos( $posts_pagination, 'prev page-numbers' ) === false ) {
+if ( ! str_contains( $posts_pagination, 'prev page-numbers' ) ) {
 	$posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination );
 }
 
 // If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place.
-if ( strpos( $posts_pagination, 'next page-numbers' ) === false ) {
+if ( ! str_contains( $posts_pagination, 'next page-numbers' ) ) {
 	$posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination );
 }
 
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
index c0b3dd9b935ec..6aecd8de6f439 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
+++ b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css
@@ -119,6 +119,11 @@
 	}
 }
 
+b,
+strong {
+	font-weight: 700;
+}
+
 blockquote {
 	padding: 0;
 	position: relative;
@@ -863,19 +868,6 @@ a:hover {
 	color: #fff;
 }
 
-.wp-block-group {
-	display: block;
-	clear: both;
-	display: flow-root;
-}
-
-.wp-block-group:before,
-.wp-block-group:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
 .wp-block-group.has-background {
 	padding: 30px;
 }
@@ -1461,13 +1453,13 @@ dt {
 	border: 3px solid #28303d;
 }
 
-.wp-block-navigation .wp-block-navigation__container {
-	background: #d1e4dd;
-	padding: 0;
+.wp-block-navigation [data-block] {
+	margin-top: revert;
+	margin-bottom: revert;
 }
 
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: 13px;
+.wp-block-navigation .wp-block-navigation__container {
+	background: #d1e4dd;
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
@@ -1515,6 +1507,11 @@ pre.wp-block-preformatted {
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: normal;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	letter-spacing: normal;
+	line-height: 1.3;
 }
 
 .wp-block-pullquote blockquote::before {
@@ -1529,20 +1526,14 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-pullquote p {
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	font-size: 2rem;
-	font-style: normal;
-	font-weight: 700;
-	letter-spacing: normal;
-	line-height: 1.3;
+	font-family: inherit;
+	font-size: inherit;
+	font-style: inherit;
+	font-weight: inherit;
+	letter-spacing: inherit;
+	line-height: inherit;
 	margin: 0;
 }
-@media only screen and (min-width: 652px) {
-
-	.wp-block-pullquote p {
-		font-size: 2rem;
-	}
-}
 
 .wp-block-pullquote a {
 	color: currentColor;
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map
index a511be105b8ea..0f0528c9bb0a8 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map
+++ b/src/wp-content/themes/twentytwentyone/assets/css/ie-editor.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style-editor.css","../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;;EAAA;ACAA,cAAA;AAKA;EAEC,gBAAA;EAIA,cAAA;EAYA,gBAAA;EAKA,aAAA;EA4BA,wBAAA;EASA,WAAA,EAeA,oDAAA,EACA,aAAA,EAEA,kCAAA,EACA,kCAAA;EAEA,YAAA;EAMA,cAAA;EAGA,UAAA;EAYA,gBAAA;EAKA,YAAA;EAmBA,UAAA;EAUA,WAAA;EAkBA,oBAAA;EAkBA,eAAA;EAQA,WAAA;EAOA,sBAAA;EAyBA,iBAAA;EAKA,YAAA;EAMA,qBAAA;AF/BD;AGrMA;;EAAA;AAIA;;EAAA;AA4EA;;EAAA;AA8BA;;EAAA;AAGA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AH4ID;AGtOE;EAuFF;EACC;EH8ID;AAdA;AGpLE;EAmDF;EACC;EH8ID;AARA;;AGjIA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AH4ID;;AG5OE;EA6FF;EACC;EH8ID;AApBA;;AGpLE;EAyDF;EACC;EH8ID;AAdA;;AG9NE;EA2GD;IACC,eAAA;IACA,WAAA;IACA,iBAAA;IACA,kBAAA;EHqIA;AACF;AI/QA;EACC,UAAA;EACA,kBAAA;EACA,wBAAA;AJiRD;AI/QC;EACC,gBAAA;EACA,mBAAA;AJiRF;AI/QE;EACC,aAAA;AJiRH;AI9QE;EACC,gBAAA;AJgRH;AI5QC;EACC,sBAAA;EACA,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;AJ8QF;AI3QC;EAEC,mBAAA;EAGA,sBAAA;AJ6QF;AI1QC;EAGC,qBAAA;AJ0QF;AIxQE;EACC,mBAAA;EACA,kBAAA;EACA,cAAA;AJ0QH;AIvQE;EAEC,eAAA;EACA,sBAAA;AJ0QH;AItQC;EACC,mBAAA;AJwQF;AIrQC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,WAAA;AJuQF;AIpQC;EAGC,cAAA;EACA,eAAA;EACA,kBAAA;AJsQF;AGxTE;ECpBF;IA0EE,kBAAA;EJsQA;EIpQA;IACC,OAAA;EJsQD;AACF;;AKpVA;EACC,YAAA;EAEA,sBAAA;ALuVD;;AKpVA,0BAAA;;AAKA,uDAAA;AACA;;;;EAIC,eAAA;ALuVD;;AKpVA,mBAAA;AACA;EAIC,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;ALuVD;AKrVC;;;;;;;EAEC,gBAAA;AL4VF;;AKxVA,cAAA;AACA;;;EAGC,YAAA;EACA,gBAAA;EACA,aAAA;EACA,UAAA;AL2VD;;AMvYA;EAEC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AN0YD;;AMrZA;EAEC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AN0YD;;AOrZA;;;;EAAA;AAKA;EACC,eAAA;EACA,cAAA;EACA,0BAAA;EACA,6BAAA;APwZD;;AOrZA;EACC,6BAAA;EACA,8BAAA;APwZD;;AOrZA;EAEC,+CAAA;EACA,8BAAA;EAEA,kDAAA;EACA,8BAAA;EACA,oCAAA;APsZD;AOnZC;EACC,gBAAA;EACA,WAAA;EACA,qBAAA;APqZF;AOnZE;EACC,WAAA;APqZH;AOhZC;EACC,8BAAA;EACA,WAAA;APkZF;AOhZE;EACC,WAAA;APkZH;AO9YC;EAEC,+CAAA;EACA,8BAAA;EACA,oBAAA;AP+YF;AO7YE;EACC,cAAA;EACA,yBAAA;AP+YH;AO3YC;EACC,gBAAA;AP6YF;AO1YC;EACC,2BAAA;AP4YF;;AQ5cA;ECsBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AT8bD;ASxbE;EACC,cAAA;AT0bH;ASvbG;EACC,cAAA;ATybJ;ASvbI;EACC,cAAA;ATybL;ASnbE;EACC,yBAAA;ATqbH;ASlbG;EACC,yBAAA;ATobJ;AS9aC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;AT+aF;AS3aC;EACC,oBAAA;EACA,gCAAA;AT6aF;ASzaC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AT2aF;;AQpfA;;EAAA;AAYG;EACC,cAAA;AR8eJ;AQ3eI;EACC,cAAA;AR6eL;AQ3eK;EACC,cAAA;AR6eN;AQveG;EACC,yBAAA;ARyeJ;AQteI;EACC,yBAAA;ARweL;AQleE;;EAEC,qCAAA;EACA,wCAAA;EACA,yBAAA;ARoeH;AQheE;EACC,uBAAA;EACA,gBAAA;ARkeH;AQxdG;EAGC,0BAAA;ARwdJ;AQpdG;EACC,cAAA;ARsdJ;AQndI;EACC,cAAA;ARqdL;AQ/cI;EACC,cAAA;ARidL;AQ5cG;EACC,6BAAA;AR8cJ;AQzcE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;AR0cH;AQ/cE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;AR0cH;AQxcG;EACC,oCAAA;EACA,yBAAA;AR2cJ;AQ7cG;EACC,oCAAA;EACA,yBAAA;AR2cJ;AQxcG;EACC,yBAAA;AR2cJ;AQ5cG;EACC,yBAAA;AR2cJ;AQtcE;EACC,uBAAA;EACA,gBAAA;ARwcH;AQncC;EACC,gBAAA;ARqcF;;AQjcA;;EAEC,mBAAA;ARocD;;AUhkBA;EACC,2BAAA;EACA,gBAAA;AVmkBD;;AUhkBA;EACC,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,oBAAA;EACA,aAAA;EACA,mBAAA;AVmkBD;;AW9kBA;EAOC,sBAAA;EACA,iBAAA;EACA,mBAAA;EACA,sBAAA;AX4kBD;AWnlBC;;EACC,WAAA;AXslBF;AW9kBC;;EACC,aAAA;EACA,gBAAA;AXilBF;AS1gBC;;EACC,aAAA;AT6gBF;ASzgBC;;EACC,gBAAA;AT4gBF;ASxgBC;;;EAEC,gBAAA;AT2gBF;AWnlBE;;;;;;;;;;;;;;;EACC,mBAAA;AXsmBH;AWnmBE;EACC,cAAA;AX4mBH;AWrmBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AW/mBE;EAIC,WAAA;AX2mBH;AWtmBC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,UAAA;EACA,mBAAA;AXymBF;AE5aA;ESlMC;EACC;EX6mBF;AApcA;AW1KC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,UAAA;EACA,mBAAA;AXymBF;AE5aA;ESlMC;EACC;EX6mBF;AApcA;AWnKE;;EACC,gBAAA;AX0mBH;AWvmBE;;EACC,kBAAA;AX0mBH;AWvmBE;;EACC,iBAAA;AX0mBH;AWrmBC;EACC,yBAAA;AXwmBF;AWpmBC;;EACC,uBAAA;AXumBF;;AY9qBC;EACC,WAAA;AZirBF;AY9qBC;;EAGC,kBAAA;AZ+qBF;ASnmBC;EACC,aAAA;ATqmBF;ASjmBC;EACC,gBAAA;ATmmBF;AS/lBC;EAEC,gBAAA;ATgmBF;AG/oBE;EShCC;IACC,kBAAA;IACA,gBAAA;IACA,UAAA;EZkrBF;EYpqBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EYjrBG;IACC,yBAAA;IACA,aAAA;EZ+qBJ;EY1qBE;IAEC,kBAAA;EZ4qBH;EY9qBE;IAEC,kBAAA;EZ4qBH;EYzqBE;IACC,aAAA;EZ2qBH;AACF;AYpqBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;AY9qBE;EAOC,kBAAA;EACA,mBAAA;AZsqBH;;AapuBC;EACC,0BAAA;EACA,4BAAA;EACA,8BAAA;AbuuBF;AaruBE;EACC,0BAAA;EACA,6BAAA;AbuuBH;AanuBC;EJSA,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;EIdC,qBAAA;Ab4uBF;ASxtBE;EACC,cAAA;AT0tBH;ASvtBG;EACC,cAAA;ATytBJ;ASvtBI;EACC,cAAA;ATytBL;ASntBE;EACC,yBAAA;ATqtBH;ASltBG;EACC,yBAAA;ATotBJ;AS9sBC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;AT+sBF;AS3sBC;EACC,oBAAA;EACA,gCAAA;AT6sBF;ASzsBC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AT2sBF;AatwBE;EACC,uBAAA;EACA,gBAAA;AbwwBH;;Ac3xBC;EACC,gBAAA;Ad8xBF;Ac5xBE;EACC,WAAA;Ad8xBH;;AepyBA;EAIC,cAAA;EACA,WAAA;EAEA,kBAAA;AfmyBD;AejyBC;EAEC,WAAA;EACA,cAAA;EACA,WAAA;AfkyBF;Ae9xBC;EACC,aAAA;AfgyBF;Ae9xBE;EACC,aAAA;EACA,gBAAA;AfgyBH;Ae3xBC;EACC,yBAAA;EACA,aAAA;Af6xBF;Ae3xBE;EACC,4BAAA;EACA,wBAAA;EACA,kBAAA;Af6xBH;AS1uBC;EACC,aAAA;AT4uBF;ASxuBC;EACC,gBAAA;AT0uBF;AStuBC;EAEC,gBAAA;ATuuBF;;Ae/xBA;EACC,SAAA;EACA,WAAA;AfkyBD;;AgB70BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhBg1BD;AgB90BC;EACC,gBAAA;AhBi2BF;AgB91BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;AgBl3BC;EACC,gBAAA;AhBi3BF;;AgB72BA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEpqBA;EcjNA;EAGC;EhBk3BD;AA5rBA;;AgBzLA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEpqBA;EcjNA;EAGC;EhBk3BD;AA5rBA;;AgBzLA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEpqBA;EcjNA;EAGC;EhBk3BD;AA5rBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AE5qBA;EczMA;EAGC;EhBk3BD;AApsBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AE5qBA;EczMA;EAGC;EhBk3BD;AApsBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AE5qBA;EczMA;EAGC;EhBk3BD;AApsBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEprBA;EcjMA;EAGC;EhBk3BD;AA5sBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEprBA;EcjMA;EAGC;EhBk3BD;AA5sBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AEprBA;EcjMA;EAGC;EhBk3BD;AA5sBA;;AgBjKA;EAGC,iBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AgB72BA;EAGC,mBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AgB72BA;EAGC,eAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhBg3BD;;AiB/7BA;EAEC,cAAA;EACA,gBAAA;EACA,aAAA;AjBi8BD;;AkBr8BA,gDAAA;AAEA;;EAEC,kBAAA;AlBu8BD;;AkBp8BA;EACC,cAAA;AlBu8BD;;AkBp8BA,iBAAA;AAEA;EAEC,yBAAA;AlBs8BD;;AkBn8BA;EACC,aAAA;AlBs8BD;;AmBz9BA;EACC,eAAA;AnBg+BD;AmB79BC;EACC,gBAAA;EACA,mBAAA;AnB+9BF;AmB79BE;EACC,aAAA;AnB+9BH;AmB59BE;EACC,gBAAA;AnB89BH;AmB19BC;EACC,qBAAA;EACA,sBAAA;AnB49BF;AmB19BE;EACC,mBAAA;AnB49BH;AmB19BG;EACC,gBAAA;AnB49BJ;AmBv9BC;EACC,gBAAA;EACA,mBAAA;AnBy9BF;AmBv9BE;EACC,aAAA;AnBy9BH;AmBt9BE;EACC,gBAAA;AnBw9BH;AmBn9BC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;AnBq9BF;AEvxBA;EiBpMC;EAGC;EnBw9BF;AA/yBA;AmBlKC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;AnBm9BF;AmB/8BC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;AnBi9BF;AmB/8BE;EAEC,mBAAA;AnBg9BH;AmB38BC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;AnB68BF;AmBz8BC;EACC,6BAAA;EACA,gCAAA;AnB28BF;AmBz8BE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;AnB28BH;AmBh9BE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;AnB28BH;AmBz8BG;;EACC,iBAAA;EACA,mBAAA;AnB48BJ;AmBx8BE;EAEC,oCAAA;EACA,gCAAA;AnBy8BH;AmBv8BG;EACC,SAAA;EACA,iBAAA;EACA,mBAAA;AnBy8BJ;AmBv8BI;EACC,oBAAA;AnBy8BL;AmBn8BG;EAEE;IACC,UAAA;EnBo8BJ;EmBr8BG;IACC,UAAA;EnBu8BJ;EmBx8BG;IACC,UAAA;EnB08BJ;EmB38BG;IACC,UAAA;EnB68BJ;EmB98BG;IACC,UAAA;EnBg9BJ;AACF;AmBx8BE;EACC,yBAAA;EACA,kBAAA;AnB08BH;AmBx8BG;EACC,oBAAA;EACA,mBAAA;AnB08BJ;AmBt8BE;EACC,gBAAA;EACA,mBAAA;AnBw8BH;;AoBplCA;EACC,qBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;ApBulCD;AoBrlCC;EACC,cAAA;ApBulCF;AoBplCC;EACC,iBAAA;ApBslCF;AoBnlCC;EACC,cAAA;ApBqlCF;AoBllCC;EACC,cAAA;ApBolCF;AoBjlCC;EACC,iBAAA;ApBmlCF;AoBhlCC;EACC,iBAAA;ApBklCF;AoB/kCC;EACC,gBAAA;ApBilCF;AoB9kCC;EACC,iBAAA;ApBglCF;;AoB5kCA;EACC,cAAA;ApB+kCD;;AqBvnCA;EAEC,gIAAA;EACA,cAAA;EACA,kBAAA;ArB0nCD;AqBvnCC;;EACC,2BAAA;EACA,UAAA;EACA,kBAAA;ArB0nCF;AqBvnCC;;EACC,2BAAA;EACA,UAAA;EACA,iBAAA;ArB0nCF;;AqBpnCC;;EAEC,SAAA;ArBunCF;;AqBnnCA;EACC,gIAAA;EACA,iBAAA;ArBsnCD;;AsBlpCC;EACC,aAAA;EACA,gBAAA;AtBqpCF;ASpkCC;EACC,aAAA;ATskCF;ASlkCC;EACC,gBAAA;ATokCF;AShkCC;EAEC,gBAAA;ATikCF;AsBzpCC;EACC,aAAA;AtB2pCF;AsBvpCC;EACC,yBAAA;AtBypCF;;AuBtqCC;EACC,mBAAA;EACA,UAAA;AvByqCF;AuBpqCE;EACC,aAAA;AvBsqCH;AuBnqCE;EACC,gIAAA;EACA,kBAAA;EACA,mBAAA;AvBqqCH;AuB/pCE;EACC,4CAAA;AvBiqCH;AuBvpCI;EAEC,cAAA;AvBwpCL;AuB1pCI;EAEC,cAAA;AvBwpCL;AuBnpCE;EACC,mBAAA;AvBqpCH;;AwB9rCA;EACC,gBAAA;AxBisCD;AwB/rCC;EACC,aAAA;AxBisCF;;AyBrsCA;EACC,gBAAA;EACA,2BAAA;EACA,eAAA;AzBwsCD;;A0B3sCA;EACC,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,0BAAA;EACA,uBAAA;EACA,mBAAA;EACA,0BAAA;EACA,kBAAA;A1B8sCD;A0B5sCC;EACC,mBAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,OAAA;EACA,eAAA;EACA,gBAAA;EACA,cAAA;A1B8sCF;A0B3sCC;EACC,gIAAA;EACA,eAAA;EACA,kBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;EACA,SAAA;A1B6sCF;AEz/BA;EwB3NC;EAEC;E1BktCF;AAjhCA;A0BzLC;EACC,mBAAA;A1B4sCF;A0BzsCC;EAGC,eAAA;EACA,kBAAA;EACA,oBAAA;A1B2sCF;A0BvsCC;EACC,gBAAA;A1BysCF;A0BtsCC;EACC,iBAAA;EACA,kBAAA;EACA,aAAA;EACA,iBAAA;EACA,mBAAA;EACA,qBAAA;A1BwsCF;A0BtsCE;EARD;IASE,cAAA;E1BysCD;AACF;A0BvsCE;EACC,gBAAA;A1BysCH;A0BtsCE;EAEC,kBAAA;EACA,mBAAA;EACA,kBAAA;A1BusCH;A0BpsCE;EACC,SAAA;EACA,eAAA;A1BssCH;A0BpsCG;EACC,eAAA;A1BssCJ;AEliCA;EwBrKG;EACC;E1BssCJ;AA1jCA;A0BxIE;;;EAGC,mBAAA;A1BosCH;;A0B1rCE;EACC,eAAA;A1B6rCH;;A0BrrCC;EACC,aAAA;A1ByrCF;;A0B1rCC;EACC,aAAA;A1ByrCF;;A2B9xCC;EACC,aAAA;A3BiyCF;AG1wCE;EwBxBD;IAIE,aAAA;E3BkyCD;AACF;;A4BzyCA;EACC,kBAAA;EACA,iBAAA;EACA,2BAAA;A5B4yCD;A4B1yCC;EACC,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;A5B4yCF;A4BzyCC;EACC,mBAAA;A5B2yCF;A4BxyCC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,WAAA;A5B0yCF;A4BvyCC;EACC,mBAAA;EACA,eAAA;EACA,kBAAA;A5ByyCF;A4BvyCE;EAIC,mBAAA;A5BsyCH;A4BlyCC;EACC,2BAAA;EACA,gBAAA;EACA,kBAAA;A5BoyCF;A4BjyCE;EACC,aAAA;A5BmyCH;A4B/xCE;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;A5BiyCH;A4B7xCC;EACC,iBAAA;A5B+xCF;A4B7xCE;EACC,aAAA;A5B+xCH;A4B3xCC;EAEC,eAAA;EAEA,qDAAA;EACA,gBAAA;EACA,mBAAA;A5B2xCF;A4BzxCE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;A5B2xCH;AEvnCA;E0BvKE;EACC;E5B6xCH;AA/oCA;A4B/IE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;A5B2xCH;AEvnCA;E0BvKE;EACC;E5B6xCH;AA/oCA;A4BzIE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;A5B0xCH;AE5nCA;E0BjKE;EACC;E5B4xCH;AAppCA;A4BzIE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;A5B0xCH;AE5nCA;E0BjKE;EACC;E5B4xCH;AAppCA;A4BhIG;EACC,aAAA;A5BsxCJ;A4BlxCG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;A5BoxCJ;AEtoCA;E0BnJG;EAEC;E5BuxCJ;AA9pCA;A4B3HG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;A5BoxCJ;AEtoCA;E0BnJG;EAEC;E5BuxCJ;AA9pCA;AGpME;EyB6CD;IAsCE,kBAAA;E5BmxCD;E4BjxCC;IACC,OAAA;E5BmxCF;E4BhxCC;IACC,eAAA;IACA,mBAAA;E5BkxCF;E4BhxCE;IACC,QAAA;E5BkxCH;AACF;AGj3CE;EyBpBF;IAyHE,kBAAA;E5BgxCA;E4B9wCA;IACC,OAAA;E5BgxCD;E4B7wCA;IACC,eAAA;IACA,mBAAA;E5B+wCD;E4B7wCC;IACC,QAAA;E5B+wCF;E4B3wCA;IACC,eAAA;IACA,gBAAA;E5B6wCD;AACF;AG93CE;EyB1BF;IA+IE,iBAAA;E5B6wCA;E4B3wCA;IACC,kBAAA;E5B6wCD;AACF;;A6Bh6CA;EACC,eAAA;A7Bm6CD;A6Bj6CC;EACC,gBAAA;A7Bm6CF;A6B/5CC;EACC,gBAAA;EACA,mBAAA;A7Bi6CF;A6B/5CE;EACC,aAAA;A7Bi6CH;A6B95CE;EACC,gBAAA;A7Bg6CH;A6B15CE;EACC,mBAAA;A7B45CH;A6B15CG;EACC,gBAAA;A7B45CJ;A6Bv5CE;EAUC,gBAAA;A7Bg5CH;A6B54CC;EACC,gBAAA;EACA,mBAAA;A7B84CF;A6B54CE;EACC,aAAA;A7B84CH;A6B34CE;EACC,gBAAA;A7B64CH;A6Bx4CC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;A7B04CF;AE5tCA;E2BpLC;EAGC;E7B64CF;AApvCA;A6BlJC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;A7Bw4CF;A6Bp4CC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;A7Bs4CF;A6Bp4CE;EAEC,mBAAA;A7Bq4CH;A6Bh4CC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;A7Bk4CF;A6B93CC;EACC,kBAAA;EACA,mBAAA;A7Bg4CF;A6B93CE;EAEC,eAAA;EACA,gBAAA;A7B+3CH;;A8Bx+CA;EACC,6BAAA;A9B2+CD;;AGl9CE;E2B1BF;EACC;E9B2+CD;AA1vCA;;AGpLE;E2B9DF;EACC;E9B2+CD;AApvCA;A8BrPC;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;A9B2+CF;A8Bx+CC;EAEC,yBAAA;EACA,gBAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;A9B0+CF;A8Bx+CE;EACC,oCAAA;A9B2+CH;A8Bx+CE;EACC,gCAAA;A9B2+CH;A8Bv+CC;ErBPA,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;EqBCC,gBAAA;EACA,cAAA;A9Bi/CF;AS7+CE;EACC,cAAA;AT++CH;AS5+CG;EACC,cAAA;AT8+CJ;AS5+CI;EACC,cAAA;AT8+CL;ASx+CE;EACC,yBAAA;AT0+CH;ASv+CG;EACC,yBAAA;ATy+CJ;ASn+CC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;ATo+CF;ASh+CC;EACC,oBAAA;EACA,gCAAA;ATk+CF;AS99CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;ATg+CF;A8B5gDE;EACC,iBAAA;EACA,gBAAA;A9B8gDH;A8B5gDG;EACC,WAAA;EACA,YAAA;A9B8gDJ;A8BvgDG;EACC,oCAAA;EACA,yBAAA;A9BygDJ;A8B3gDG;EACC,oCAAA;EACA,yBAAA;A9BygDJ;A8BtgDG;EACC,yBAAA;A9BwgDJ;A8BzgDG;EACC,yBAAA;A9BwgDJ;A8BngDE;EACC,uBAAA;EACA,gBAAA;A9BqgDH;A8B//CE;EACC,YAAA;A9BigDH;A8B9/CE;EACC,YAAA;A9BggDH;A8Bx/CI;EACC,cAAA;A9B0/CL;A8B3/CI;EACC,cAAA;A9B0/CL;A8Bv/CI;EACC,cAAA;A9By/CL;A8Bv/CK;EACC,yBAAA;EACA,WAAA;A9By/CN;A8B3/CK;EACC,yBAAA;EACA,WAAA;A9By/CN;A8Bn/CE;EAEC,kBAAA;A9Bo/CH;;A8B/+CA;EACC,kBAAA;A9Bk/CD;;A8B3+CE;EACC,uBAAA;A9B8+CH;;A+B5lDA;EAEC,gCAAA;EACA,WAAA;EACA,UAAA;A/B+lDD;A+B7lDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+B7lDC;EACC,6BAAA;A/BgmDF;AGllDE;E4BfD;EACC;E/BgmDF;AA13CA;AGpLE;E4BnDD;EACC;E/BgmDF;AAp3CA;A+B7OC;EACC,6BAAA;A/BgmDF;AGllDE;E4BfD;EACC;E/BgmDF;AA13CA;AGpLE;E4BnDD;EACC;E/BgmDF;AAp3CA;A+BzOC;;;EAEC,kBAAA;A/BgmDF;A+B7lDC;EACC,wBAAA;A/BgmDF;A+B7lDC;;EACC,mBAAA;A/BgmDF;A+B9lDE;;;EAEC,wCAAA;A/BimDH;A+B/lDG;;;EACC,8BAAA;A/BmmDJ;A+B/lDE;EACC,cAAA;A/BkmDH;A+BnmDE;EACC,cAAA;A/BkmDH;A+B9lDC;;;;;EAIC,0BAAA;A/BimDF;;AgC3oDC;EACC,aAAA;EACA,gBAAA;AhC8oDF;AgCzoDE;EACC,cAAA;AhC2oDH;AgCxoDE;EACC,gBAAA;AhC0oDH;;AiCtpDC;;;;EAEC,kBAAA;AjC2pDF;AiCxpDC;EACC,gIAAA;AjC2pDF;AiCxpDC;EAEC,aAAA;AjC4pDF;AiCzpDC;EAKC,cAAA;AjC4pDF;AiCzpDC;EACC,qBAAA;AjC4pDF;AiC1pDE;;;;EAEC,eAAA;AjC8pDH;AiC3pDE;EACC,yBAAA;AjC8pDH;AiC/pDE;EACC,yBAAA;AjC8pDH;AiC3pDE;EACC,0CAAA;AjC8pDH;AiC/pDE;EACC,0CAAA;AjC8pDH;;AiCvpDC;;EAEC,uBAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;EACA,sBAAA;AjC0pDF;AiCvpDC;EACC,iBAAA;AjCypDF;AiCtpDC;;EAEC,mBAAA;EACA,iBAAA;AjCwpDF;AiCrpDC;EACC,iBAAA;EACA,gBAAA;EACA,mBAAA;EACA,mBAAA;AjCupDF;;AiCnpDA;EACC,gBAAA;EACA,gBAAA;AjCspDD;AiCppDC;EACC,WAAA;EACA,sBAAA;AjCspDF;AiCppDE;EACC,kBAAA;AjCspDH;AiClpDC;EACC,YAAA;AjCopDF;;AkCxuDC;EACC,kBAAA;AlC2uDF;;AmC9uDA;EACC,UAAA;EACA,mBAAA;AnCivDD;;AoChvDC;EAEC,eAAA;ApCmvDF;;AoCrvDC;EAEC,eAAA;ApCmvDF;AoChvDC;EAEC,mBAAA;ApCkvDF;AoCpvDC;EAEC,mBAAA;ApCkvDF;AoC/uDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoC9uDC;EAEC,iBAAA;EACA,gBAAA;ApCgvDF;AoCnvDC;EAEC,iBAAA;EACA,gBAAA;ApCgvDF;AoC7uDC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoCrLC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApC4uDF;AEriDA;EkC7MC;EAEC;EpCgvDF;AA7jDA;AoCrLC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApC4uDF;AEriDA;EkC7MC;EAEC;EpCgvDF;AA7jDA;AoC5KC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApCyuDF;AE3iDA;EkCpMC;EAEC;EpC6uDF;AAnkDA;AoC5KC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApCyuDF;AE3iDA;EkCpMC;EAEC;EpC6uDF;AAnkDA;;AqCxNA;;;CAAA;AAMA;EACC,gCAAA;EACA,oBAAA;EACA,mBAAA;EACA,6BAAA;ArC4xDD;AG5wDE;EkCpBF;EAIC;ErC4xDD;AApjDA;AGpLE;EkCxDF;EAIC;ErC4xDD;AA9iDA;AqC5OC;EACC,cAAA;EACA,gIAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;ArC4xDF;AE7jDA;EmCpOC;EAGC;ErC8xDF;AArlDA;;AqClMA;EACC,gIAAA;EACA,kBAAA;ArC0xDD;;AqCtxDA;EACC,cAAA;ArCyxDD;;AqCtxDA;EACC,cAAA;ArCyxDD;;AqCvwDA;EACC,yBAAA;EACA,cAAA;ArCqxDD;;AqClxDA;EACC,yBAAA;EACA,cAAA;ArCqxDD;;AqClxDA;EAEC,cAAA;ArCqxDD;;AqClxDA;EAEC,cAAA;ArCqxDD;;AqCjxDA;EACC,gBAAA;EACA,mBAAA;ArCoxDD;;AqChxDA;EAIC,6BAAA;ArCgxDD;;AGx0DE;EkCoDF;EAIC;ErCgxDD;AAhnDA;;AGpLE;EkCgBF;EAIC;ErCgxDD;AA1mDA;AqCnKC;EAEC,6BAAA;ArC8wDF;AG30DE;EkC2DD;EAEC;ErC8wDF;AAnnDA;AGpLE;EkCuBD;EAEC;ErC8wDF;AA7mDA;AqCnKC;EAEC,6BAAA;ArC8wDF;AG30DE;EkC2DD;EAEC;ErC8wDF;AAnnDA;AGpLE;EkCuBD;EAEC;ErC8wDF;AA7mDA;AqC9JC;EAEC,eAAA;ArC4wDF;;AqCxwDA;EACC,SAAA;EACA,kBAAA;ArC2wDD;;AqCxwDA;EACC,SAAA;EACA,iBAAA;ArC2wDD;;AqCvwDA;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,yBAAA;EACA,kBAAA;EACA,WAAA;EACA,uBAAA;EACA,eAAA;ArC0wDD;;AE7oDA;EmCrIA;EAQC;ErC0wDD;AArqDA;;AqClGA;EAEC;IACC,gBAAA;IACA,kBAAA;ErCywDA;EqCtwDD;IACC,gBAAA;IACA,iBAAA;ErCwwDA;AACF;AqCpwDA;EACC,YAAA;ArCswDD;;AqClwDA;EACC,SAAA;ArCqwDD;;AsC/4DA;EAEC,gBAAA;AtCk5DD;;AsC/4DA;EAJC,gIAAA;AtC85DD;;AsC15DA;EAGC,yBAAA;EAEA,kBAAA;EACA,mBAAA;EACA,kCAAA;EACA,mCAAA;AtCk5DD;;AsC94DA;EAVC,cAAA;AtC45DD;AsC/4DC;EACC,6BAAA;AtCi5DF;AsC94DC;EACC,0BAAA;EACA,qBAAA;AtCg5DF;;AsCx4DC;EAEC,cAAA;AtC04DF;;AsCt4DA;;EAEC,eAAA;AtCy4DD;;AuCj7DA;EAMC,WAAA;AvC+6DD;AuCn7DC;EAEC,WAAA;AvCq7DF;;AuCh7DA;EAMC,cAAA;AvC86DD;AuCl7DC;EAEC,cAAA;AvCo7DF;;AuC/6DA;EAMC,cAAA;AvC66DD;AuCj7DC;EAEC,cAAA;AvCm7DF;;AuC96DA;EAMC,cAAA;AvC46DD;AuCh7DC;EAEC,cAAA;AvCk7DF;;AuC76DA;EAMC,cAAA;AvC26DD;AuC/6DC;EAEC,cAAA;AvCi7DF;;AuC56DA;EAMC,cAAA;AvC06DD;AuC96DC;EAEC,cAAA;AvCg7DF;;AuC36DA;EAMC,cAAA;AvCy6DD;AuC76DC;EAEC,cAAA;AvC+6DF;;AuC16DA;EAMC,cAAA;AvCw6DD;AuC56DC;EAEC,cAAA;AvC86DF;;AuCz6DA;EAMC,cAAA;AvCu6DD;AuC36DC;EAEC,cAAA;AvC66DF;;AuCx6DA;EAMC,WAAA;AvCs6DD;AuC16DC;EAEC,WAAA;AvC46DF;;AuCp6DC;;;;;;;;EAQC,mBAAA;AvCu6DF;;AuCn6DA;EAMC,sBAAA;AvCi6DD;AuCr6DC;EAEC,sBAAA;AvCu6DF;;AuCl6DA;EAMC,yBAAA;AvCg6DD;AuCp6DC;EAEC,yBAAA;AvCs6DF;;AuCj6DA;EAMC,yBAAA;AvC+5DD;AuCn6DC;EAEC,yBAAA;AvCq6DF;;AuCh6DA;EAMC,yBAAA;AvC85DD;AuCl6DC;EAEC,yBAAA;AvCo6DF;;AuC/5DA;EAMC,yBAAA;AvC65DD;AuCj6DC;EAEC,yBAAA;AvCm6DF;;AuC95DA;EAMC,yBAAA;AvC45DD;AuCh6DC;EAEC,yBAAA;AvCk6DF;;AuC75DA;EAMC,yBAAA;AvC25DD;AuC/5DC;EAEC,yBAAA;AvCi6DF;;AuC55DA;EAMC,yBAAA;AvC05DD;AuC95DC;EAEC,yBAAA;AvCg6DF;;AuC35DA;EAMC,yBAAA;AvCy5DD;AuC75DC;EAEC,yBAAA;AvC+5DF;;AuC15DA;EAMC,yBAAA;AvCw5DD;AuC55DC;EAEC,yBAAA;AvC85DF;;AuCz5DA;EAMC,sBAAA;AvCu5DD;AuC35DC;EAEC,sBAAA;AvC65DF;;AuCt5DC;EAGG,WAAA;AvCu5DJ;;AuC15DC;EAGG,WAAA;AvCu5DJ;;AuC15DC;EAGG,WAAA;AvCu5DJ;AuCp5DE;EAMC;AvCk5DH;AuCx5DE;EAMC;AvCk5DH;AuCx5DE;EAMC;AvCk5DH;AuC94DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuC14DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;;AuCl4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD","file":"ie-editor.css"}
\ No newline at end of file
+{"version":3,"sources":["style-editor.css","../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;;EAAA;ACAA,cAAA;AAKA;EAEC,gBAAA;EAIA,cAAA;EAYA,gBAAA;EAKA,aAAA;EA4BA,wBAAA;EASA,WAAA,EAeA,oDAAA,EACA,aAAA,EAEA,kCAAA,EACA,kCAAA;EAEA,YAAA;EAMA,cAAA;EAGA,UAAA;EAYA,gBAAA;EAKA,YAAA;EAmBA,UAAA;EAUA,WAAA;EAkBA,oBAAA;EAkBA,eAAA;EAQA,WAAA;EAOA,sBAAA;EAyBA,iBAAA;EAKA,YAAA;EAMA,qBAAA;AF/BD;AGrMA;;EAAA;AAIA;;EAAA;AA4EA;;EAAA;AA8BA;;EAAA;AAGA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AH4ID;AGtOE;EAuFF;EACC;EH8ID;AAdA;AGpLE;EAmDF;EACC;EH8ID;AARA;;AGjIA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AH4ID;;AG5OE;EA6FF;EACC;EH8ID;AApBA;;AGpLE;EAyDF;EACC;EH8ID;AAdA;;AG9NE;EA2GD;IACC,eAAA;IACA,WAAA;IACA,iBAAA;IACA,kBAAA;EHqIA;AACF;ACnQA;;EAEI,gBAAA;ADqQJ;;AInRA;EACC,UAAA;EACA,kBAAA;EACA,wBAAA;AJsRD;AIpRC;EACC,gBAAA;EACA,mBAAA;AJsRF;AIpRE;EACC,aAAA;AJsRH;AInRE;EACC,gBAAA;AJqRH;AIjRC;EACC,sBAAA;EACA,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;AJmRF;AIhRC;EAEC,mBAAA;EAGA,sBAAA;AJkRF;AI/QC;EAGC,qBAAA;AJ+QF;AI7QE;EACC,mBAAA;EACA,kBAAA;EACA,cAAA;AJ+QH;AI5QE;EAEC,eAAA;EACA,sBAAA;AJ+QH;AI3QC;EACC,mBAAA;AJ6QF;AI1QC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,WAAA;AJ4QF;AIzQC;EAGC,cAAA;EACA,eAAA;EACA,kBAAA;AJ2QF;AG7TE;ECpBF;IA0EE,kBAAA;EJ2QA;EIzQA;IACC,OAAA;EJ2QD;AACF;;AKzVA;EACC,YAAA;EAEA,sBAAA;AL4VD;;AKzVA,0BAAA;;AAKA,uDAAA;AACA;;;;EAIC,eAAA;AL4VD;;AKzVA,mBAAA;AACA;EAIC,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;AL4VD;AK1VC;;;;;;;EAEC,gBAAA;ALiWF;;AK7VA,cAAA;AACA;;;EAGC,YAAA;EACA,gBAAA;EACA,aAAA;EACA,UAAA;ALgWD;;AM5YA;EAEC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AN+YD;;AM1ZA;EAEC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AN+YD;;AO1ZA;;;;EAAA;AAKA;EACC,eAAA;EACA,cAAA;EACA,0BAAA;EACA,6BAAA;AP6ZD;;AO1ZA;EACC,6BAAA;EACA,8BAAA;AP6ZD;;AO1ZA;EAEC,+CAAA;EACA,8BAAA;EAEA,kDAAA;EACA,8BAAA;EACA,oCAAA;AP2ZD;AOxZC;EACC,gBAAA;EACA,WAAA;EACA,qBAAA;AP0ZF;AOxZE;EACC,WAAA;AP0ZH;AOrZC;EACC,8BAAA;EACA,WAAA;APuZF;AOrZE;EACC,WAAA;APuZH;AOnZC;EAEC,+CAAA;EACA,8BAAA;EACA,oBAAA;APoZF;AOlZE;EACC,cAAA;EACA,yBAAA;APoZH;AOhZC;EACC,gBAAA;APkZF;AO/YC;EACC,2BAAA;APiZF;;AQjdA;ECsBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;ATmcD;AS7bE;EACC,cAAA;AT+bH;AS5bG;EACC,cAAA;AT8bJ;AS5bI;EACC,cAAA;AT8bL;ASxbE;EACC,yBAAA;AT0bH;ASvbG;EACC,yBAAA;ATybJ;ASnbC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;ATobF;AShbC;EACC,oBAAA;EACA,gCAAA;ATkbF;AS9aC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;ATgbF;;AQzfA;;EAAA;AAYG;EACC,cAAA;ARmfJ;AQhfI;EACC,cAAA;ARkfL;AQhfK;EACC,cAAA;ARkfN;AQ5eG;EACC,yBAAA;AR8eJ;AQ3eI;EACC,yBAAA;AR6eL;AQveE;;EAEC,qCAAA;EACA,wCAAA;EACA,yBAAA;ARyeH;AQreE;EACC,uBAAA;EACA,gBAAA;ARueH;AQ7dG;EAGC,0BAAA;AR6dJ;AQzdG;EACC,cAAA;AR2dJ;AQxdI;EACC,cAAA;AR0dL;AQpdI;EACC,cAAA;ARsdL;AQjdG;EACC,6BAAA;ARmdJ;AQ9cE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;AR+cH;AQpdE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;AR+cH;AQ7cG;EACC,oCAAA;EACA,yBAAA;ARgdJ;AQldG;EACC,oCAAA;EACA,yBAAA;ARgdJ;AQ7cG;EACC,yBAAA;ARgdJ;AQjdG;EACC,yBAAA;ARgdJ;AQ3cE;EACC,uBAAA;EACA,gBAAA;AR6cH;AQxcC;EACC,gBAAA;AR0cF;;AQtcA;;EAEC,mBAAA;ARycD;;AUrkBA;EACC,2BAAA;EACA,gBAAA;AVwkBD;;AUrkBA;EACC,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,oBAAA;EACA,aAAA;EACA,mBAAA;AVwkBD;;AWnlBA;EAOC,sBAAA;EACA,iBAAA;EACA,mBAAA;EACA,sBAAA;AXilBD;AWxlBC;;EACC,WAAA;AX2lBF;AWnlBC;;EACC,aAAA;EACA,gBAAA;AXslBF;AS/gBC;;EACC,aAAA;ATkhBF;AS9gBC;;EACC,gBAAA;ATihBF;AS7gBC;;;EAEC,gBAAA;ATghBF;AWxlBE;;;;;;;;;;;;;;;EACC,mBAAA;AX2mBH;AWxmBE;EACC,cAAA;AXinBH;AW1mBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AWpnBE;EAIC,WAAA;AXgnBH;AW3mBC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,UAAA;EACA,mBAAA;AX8mBF;AEjbA;ESlMC;EACC;EXknBF;AAzcA;AW1KC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,UAAA;EACA,mBAAA;AX8mBF;AEjbA;ESlMC;EACC;EXknBF;AAzcA;AWnKE;;EACC,gBAAA;AX+mBH;AW5mBE;;EACC,kBAAA;AX+mBH;AW5mBE;;EACC,iBAAA;AX+mBH;AW1mBC;EACC,yBAAA;AX6mBF;AWzmBC;;EACC,uBAAA;AX4mBF;;AYnrBC;EACC,WAAA;AZsrBF;AYnrBC;;EAGC,kBAAA;AZorBF;ASxmBC;EACC,aAAA;AT0mBF;AStmBC;EACC,gBAAA;ATwmBF;ASpmBC;EAEC,gBAAA;ATqmBF;AGppBE;EShCC;IACC,kBAAA;IACA,gBAAA;IACA,UAAA;EZurBF;EYzqBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EYtrBG;IACC,yBAAA;IACA,aAAA;EZorBJ;EY/qBE;IAEC,kBAAA;EZirBH;EYnrBE;IAEC,kBAAA;EZirBH;EY9qBE;IACC,aAAA;EZgrBH;AACF;AYzqBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;AYnrBE;EAOC,kBAAA;EACA,mBAAA;AZ2qBH;;AazuBC;EACC,0BAAA;EACA,4BAAA;EACA,8BAAA;Ab4uBF;Aa1uBE;EACC,0BAAA;EACA,6BAAA;Ab4uBH;AaxuBC;EJSA,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;EIdC,qBAAA;AbivBF;AS7tBE;EACC,cAAA;AT+tBH;AS5tBG;EACC,cAAA;AT8tBJ;AS5tBI;EACC,cAAA;AT8tBL;ASxtBE;EACC,yBAAA;AT0tBH;ASvtBG;EACC,yBAAA;ATytBJ;ASntBC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;ATotBF;AShtBC;EACC,oBAAA;EACA,gCAAA;ATktBF;AS9sBC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;ATgtBF;Aa3wBE;EACC,uBAAA;EACA,gBAAA;Ab6wBH;;AchyBC;EACC,gBAAA;AdmyBF;AcjyBE;EACC,WAAA;AdmyBH;;AevyBC;EACC,aAAA;Af0yBF;AexyBE;EACC,aAAA;EACA,gBAAA;Af0yBH;AeryBC;EACC,yBAAA;EACA,aAAA;AfuyBF;AeryBE;EACC,4BAAA;EACA,wBAAA;EACA,kBAAA;AfuyBH;ASruBC;EACC,aAAA;ATuuBF;ASnuBC;EACC,gBAAA;ATquBF;ASjuBC;EAEC,gBAAA;ATkuBF;;AezyBA;EACC,SAAA;EACA,WAAA;Af4yBD;;AgBx0BA;EAkBC,WAAA;EACA,gIAAA;EACA,mBAAA;AhB20BD;AgBz0BC;EACC,gBAAA;AhB41BF;AgBz1BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;AgB72BC;EACC,gBAAA;AhB42BF;;AgBx2BA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/pBA;EcjNA;EAGC;EhB62BD;AAvrBA;;AgBzLA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/pBA;EcjNA;EAGC;EhB62BD;AAvrBA;;AgBzLA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/pBA;EcjNA;EAGC;EhB62BD;AAvrBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AEvqBA;EczMA;EAGC;EhB62BD;AA/rBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AEvqBA;EczMA;EAGC;EhB62BD;AA/rBA;;AgBjLA;EAGC,kBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AEvqBA;EczMA;EAGC;EhB62BD;AA/rBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/qBA;EcjMA;EAGC;EhB62BD;AAvsBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/qBA;EcjMA;EAGC;EhB62BD;AAvsBA;;AgBzKA;EAGC,eAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AE/qBA;EcjMA;EAGC;EhB62BD;AAvsBA;;AgBjKA;EAGC,iBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AgBx2BA;EAGC,mBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AgBx2BA;EAGC,eAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AhB22BD;;AiB17BA;EAEC,cAAA;EACA,gBAAA;EACA,aAAA;AjB47BD;;AkBh8BA,gDAAA;AAEA;;EAEC,kBAAA;AlBk8BD;;AkB/7BA;EACC,cAAA;AlBk8BD;;AkB/7BA,iBAAA;AAEA;EAEC,yBAAA;AlBi8BD;;AkB97BA;EACC,aAAA;AlBi8BD;;AmBp9BA;EACC,eAAA;AnB29BD;AmBx9BC;EACC,gBAAA;EACA,mBAAA;AnB09BF;AmBx9BE;EACC,aAAA;AnB09BH;AmBv9BE;EACC,gBAAA;AnBy9BH;AmBr9BC;EACC,qBAAA;EACA,sBAAA;AnBu9BF;AmBr9BE;EACC,mBAAA;AnBu9BH;AmBr9BG;EACC,gBAAA;AnBu9BJ;AmBl9BC;EACC,gBAAA;EACA,mBAAA;AnBo9BF;AmBl9BE;EACC,aAAA;AnBo9BH;AmBj9BE;EACC,gBAAA;AnBm9BH;AmB98BC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;AnBg9BF;AElxBA;EiBpMC;EAGC;EnBm9BF;AA1yBA;AmBlKC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;AnB88BF;AmB18BC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;AnB48BF;AmB18BE;EAEC,mBAAA;AnB28BH;AmBt8BC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;AnBw8BF;AmBp8BC;EACC,6BAAA;EACA,gCAAA;AnBs8BF;AmBp8BE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;AnBs8BH;AmB38BE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;AnBs8BH;AmBp8BG;;EACC,iBAAA;EACA,mBAAA;AnBu8BJ;AmBn8BE;EAEC,oCAAA;EACA,gCAAA;AnBo8BH;AmBl8BG;EACC,SAAA;EACA,iBAAA;EACA,mBAAA;AnBo8BJ;AmBl8BI;EACC,oBAAA;AnBo8BL;AmB97BG;EAEE;IACC,UAAA;EnB+7BJ;EmBh8BG;IACC,UAAA;EnBk8BJ;EmBn8BG;IACC,UAAA;EnBq8BJ;EmBt8BG;IACC,UAAA;EnBw8BJ;EmBz8BG;IACC,UAAA;EnB28BJ;AACF;AmBn8BE;EACC,yBAAA;EACA,kBAAA;AnBq8BH;AmBn8BG;EACC,oBAAA;EACA,mBAAA;AnBq8BJ;AmBj8BE;EACC,gBAAA;EACA,mBAAA;AnBm8BH;;AoB/kCA;EACC,qBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;ApBklCD;AoBhlCC;EACC,cAAA;ApBklCF;AoB/kCC;EACC,iBAAA;ApBilCF;AoB9kCC;EACC,cAAA;ApBglCF;AoB7kCC;EACC,cAAA;ApB+kCF;AoB5kCC;EACC,iBAAA;ApB8kCF;AoB3kCC;EACC,iBAAA;ApB6kCF;AoB1kCC;EACC,gBAAA;ApB4kCF;AoBzkCC;EACC,iBAAA;ApB2kCF;;AoBvkCA;EACC,cAAA;ApB0kCD;;AqBlnCA;EAEC,gIAAA;EACA,cAAA;EACA,kBAAA;ArBqnCD;AqBlnCC;;EACC,2BAAA;EACA,UAAA;EACA,kBAAA;ArBqnCF;AqBlnCC;;EACC,2BAAA;EACA,UAAA;EACA,iBAAA;ArBqnCF;;AqB/mCC;;EAEC,SAAA;ArBknCF;;AqB9mCA;EACC,gIAAA;EACA,iBAAA;ArBinCD;;AsB7oCC;EACC,aAAA;EACA,gBAAA;AtBgpCF;AS/jCC;EACC,aAAA;ATikCF;AS7jCC;EACC,gBAAA;AT+jCF;AS3jCC;EAEC,gBAAA;AT4jCF;AsBppCC;EACC,aAAA;AtBspCF;AsBlpCC;EACC,yBAAA;AtBopCF;;AuBjqCC;EACC,kBAAA;EACA,qBAAA;AvBoqCF;AuBjqCC;EACC,mBAAA;AvBmqCF;AuB9pCE;EACC,gIAAA;EACA,kBAAA;EACA,mBAAA;AvBgqCH;AuB1pCE;EACC,4CAAA;AvB4pCH;AuBlpCI;EAEC,cAAA;AvBmpCL;AuBrpCI;EAEC,cAAA;AvBmpCL;AuB9oCE;EACC,mBAAA;AvBgpCH;;AwBzrCA;EACC,gBAAA;AxB4rCD;AwB1rCC;EACC,aAAA;AxB4rCF;;AyBhsCA;EACC,gBAAA;EACA,2BAAA;EACA,eAAA;AzBmsCD;;A0BtsCA;EACC,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,0BAAA;EACA,uBAAA;EACA,mBAAA;EACA,0BAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,gIAAA;EACA,sBAAA;EACA,gBAAA;A1BysCD;A0BvsCC;EACC,mBAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,OAAA;EACA,eAAA;EACA,gBAAA;EACA,cAAA;A1BysCF;A0BtsCC;EACC,oBAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EACA,uBAAA;EACA,oBAAA;EACA,SAAA;A1BwsCF;A0BrsCC;EACC,mBAAA;A1BusCF;A0BpsCC;EAGC,eAAA;EACA,kBAAA;EACA,oBAAA;A1BssCF;A0BlsCC;EACC,gBAAA;A1BosCF;A0BjsCC;EACC,iBAAA;EACA,kBAAA;EACA,aAAA;EACA,iBAAA;EACA,mBAAA;EACA,qBAAA;A1BmsCF;A0BjsCE;EARD;IASE,cAAA;E1BosCD;AACF;A0BlsCE;EACC,gBAAA;A1BosCH;A0BjsCE;EAEC,kBAAA;EACA,mBAAA;EACA,kBAAA;A1BksCH;A0B/rCE;EACC,SAAA;EACA,eAAA;A1BisCH;A0B/rCG;EACC,eAAA;A1BisCJ;AEliCA;EwBhKG;EACC;E1BisCJ;AA1jCA;A0BnIE;;;EAGC,mBAAA;A1B+rCH;;A0BrrCE;EACC,eAAA;A1BwrCH;;A0BhrCC;EACC,aAAA;A1BorCF;;A0BrrCC;EACC,aAAA;A1BorCF;;A2B9xCC;EACC,aAAA;A3BiyCF;AG1wCE;EwBxBD;IAIE,aAAA;E3BkyCD;AACF;;A4BzyCA;EACC,kBAAA;EACA,iBAAA;EACA,2BAAA;A5B4yCD;A4B1yCC;EACC,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;A5B4yCF;A4BzyCC;EACC,mBAAA;A5B2yCF;A4BxyCC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,WAAA;A5B0yCF;A4BvyCC;EACC,mBAAA;EACA,eAAA;EACA,kBAAA;A5ByyCF;A4BvyCE;EAIC,mBAAA;A5BsyCH;A4BlyCC;EACC,2BAAA;EACA,gBAAA;EACA,kBAAA;A5BoyCF;A4BjyCE;EACC,aAAA;A5BmyCH;A4B/xCE;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;A5BiyCH;A4B7xCC;EACC,iBAAA;A5B+xCF;A4B7xCE;EACC,aAAA;A5B+xCH;A4B3xCC;EAEC,eAAA;EAEA,qDAAA;EACA,gBAAA;EACA,mBAAA;A5B2xCF;A4BzxCE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;A5B2xCH;AEvnCA;E0BvKE;EACC;E5B6xCH;AA/oCA;A4B/IE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;A5B2xCH;AEvnCA;E0BvKE;EACC;E5B6xCH;AA/oCA;A4BzIE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;A5B0xCH;AE5nCA;E0BjKE;EACC;E5B4xCH;AAppCA;A4BzIE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;A5B0xCH;AE5nCA;E0BjKE;EACC;E5B4xCH;AAppCA;A4BhIG;EACC,aAAA;A5BsxCJ;A4BlxCG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;A5BoxCJ;AEtoCA;E0BnJG;EAEC;E5BuxCJ;AA9pCA;A4B3HG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;A5BoxCJ;AEtoCA;E0BnJG;EAEC;E5BuxCJ;AA9pCA;AGpME;EyB6CD;IAsCE,kBAAA;E5BmxCD;E4BjxCC;IACC,OAAA;E5BmxCF;E4BhxCC;IACC,eAAA;IACA,mBAAA;E5BkxCF;E4BhxCE;IACC,QAAA;E5BkxCH;AACF;AGj3CE;EyBpBF;IAyHE,kBAAA;E5BgxCA;E4B9wCA;IACC,OAAA;E5BgxCD;E4B7wCA;IACC,eAAA;IACA,mBAAA;E5B+wCD;E4B7wCC;IACC,QAAA;E5B+wCF;E4B3wCA;IACC,eAAA;IACA,gBAAA;E5B6wCD;AACF;AG93CE;EyB1BF;IA+IE,iBAAA;E5B6wCA;E4B3wCA;IACC,kBAAA;E5B6wCD;AACF;;A6Bh6CA;EACC,eAAA;A7Bm6CD;A6Bj6CC;EACC,gBAAA;A7Bm6CF;A6B/5CC;EACC,gBAAA;EACA,mBAAA;A7Bi6CF;A6B/5CE;EACC,aAAA;A7Bi6CH;A6B95CE;EACC,gBAAA;A7Bg6CH;A6B15CE;EACC,mBAAA;A7B45CH;A6B15CG;EACC,gBAAA;A7B45CJ;A6Bv5CE;EAUC,gBAAA;A7Bg5CH;A6B54CC;EACC,gBAAA;EACA,mBAAA;A7B84CF;A6B54CE;EACC,aAAA;A7B84CH;A6B34CE;EACC,gBAAA;A7B64CH;A6Bx4CC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;A7B04CF;AE5tCA;E2BpLC;EAGC;E7B64CF;AApvCA;A6BlJC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;A7Bw4CF;A6Bp4CC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;A7Bs4CF;A6Bp4CE;EAEC,mBAAA;A7Bq4CH;A6Bh4CC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;A7Bk4CF;A6B93CC;EACC,kBAAA;EACA,mBAAA;A7Bg4CF;A6B93CE;EAEC,eAAA;EACA,gBAAA;A7B+3CH;;A8Bx+CA;EACC,6BAAA;A9B2+CD;;AGl9CE;E2B1BF;EACC;E9B2+CD;AA1vCA;;AGpLE;E2B9DF;EACC;E9B2+CD;AApvCA;A8BrPC;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;A9B2+CF;A8Bx+CC;EAEC,yBAAA;EACA,gBAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;A9B0+CF;A8Bx+CE;EACC,oCAAA;A9B2+CH;A8Bx+CE;EACC,gCAAA;A9B2+CH;A8Bv+CC;ErBPA,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;EqBCC,gBAAA;EACA,cAAA;A9Bi/CF;AS7+CE;EACC,cAAA;AT++CH;AS5+CG;EACC,cAAA;AT8+CJ;AS5+CI;EACC,cAAA;AT8+CL;ASx+CE;EACC,yBAAA;AT0+CH;ASv+CG;EACC,yBAAA;ATy+CJ;ASn+CC;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;ATo+CF;ASh+CC;EACC,oBAAA;EACA,gCAAA;ATk+CF;AS99CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;ATg+CF;A8B5gDE;EACC,iBAAA;EACA,gBAAA;A9B8gDH;A8B5gDG;EACC,WAAA;EACA,YAAA;A9B8gDJ;A8BvgDG;EACC,oCAAA;EACA,yBAAA;A9BygDJ;A8B3gDG;EACC,oCAAA;EACA,yBAAA;A9BygDJ;A8BtgDG;EACC,yBAAA;A9BwgDJ;A8BzgDG;EACC,yBAAA;A9BwgDJ;A8BngDE;EACC,uBAAA;EACA,gBAAA;A9BqgDH;A8B//CE;EACC,YAAA;A9BigDH;A8B9/CE;EACC,YAAA;A9BggDH;A8Bx/CI;EACC,cAAA;A9B0/CL;A8B3/CI;EACC,cAAA;A9B0/CL;A8Bv/CI;EACC,cAAA;A9By/CL;A8Bv/CK;EACC,yBAAA;EACA,WAAA;A9By/CN;A8B3/CK;EACC,yBAAA;EACA,WAAA;A9By/CN;A8Bn/CE;EAEC,kBAAA;A9Bo/CH;;A8B/+CA;EACC,kBAAA;A9Bk/CD;;A8B3+CE;EACC,uBAAA;A9B8+CH;;A+B5lDA;EAEC,gCAAA;EACA,WAAA;EACA,UAAA;A/B+lDD;A+B7lDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+BlmDC;EAEC,2BAAA;A/BgmDF;A+B7lDC;EACC,6BAAA;A/BgmDF;AGllDE;E4BfD;EACC;E/BgmDF;AA13CA;AGpLE;E4BnDD;EACC;E/BgmDF;AAp3CA;A+B7OC;EACC,6BAAA;A/BgmDF;AGllDE;E4BfD;EACC;E/BgmDF;AA13CA;AGpLE;E4BnDD;EACC;E/BgmDF;AAp3CA;A+BzOC;;;EAEC,kBAAA;A/BgmDF;A+B7lDC;EACC,wBAAA;A/BgmDF;A+B7lDC;;EACC,mBAAA;A/BgmDF;A+B9lDE;;;EAEC,wCAAA;A/BimDH;A+B/lDG;;;EACC,8BAAA;A/BmmDJ;A+B/lDE;EACC,cAAA;A/BkmDH;A+BnmDE;EACC,cAAA;A/BkmDH;A+B9lDC;;;;;EAIC,0BAAA;A/BimDF;;AgC3oDC;EACC,aAAA;EACA,gBAAA;AhC8oDF;AgCzoDE;EACC,cAAA;AhC2oDH;AgCxoDE;EACC,gBAAA;AhC0oDH;;AiCtpDC;;;;EAEC,kBAAA;AjC2pDF;AiCxpDC;EACC,gIAAA;AjC2pDF;AiCxpDC;EAEC,aAAA;AjC4pDF;AiCzpDC;EAKC,cAAA;AjC4pDF;AiCzpDC;EACC,qBAAA;AjC4pDF;AiC1pDE;;;;EAEC,eAAA;AjC8pDH;AiC3pDE;EACC,yBAAA;AjC8pDH;AiC/pDE;EACC,yBAAA;AjC8pDH;AiC3pDE;EACC,0CAAA;AjC8pDH;AiC/pDE;EACC,0CAAA;AjC8pDH;;AiCvpDC;;EAEC,uBAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;EACA,sBAAA;AjC0pDF;AiCvpDC;EACC,iBAAA;AjCypDF;AiCtpDC;;EAEC,mBAAA;EACA,iBAAA;AjCwpDF;AiCrpDC;EACC,iBAAA;EACA,gBAAA;EACA,mBAAA;EACA,mBAAA;AjCupDF;;AiCnpDA;EACC,gBAAA;EACA,gBAAA;AjCspDD;AiCppDC;EACC,WAAA;EACA,sBAAA;AjCspDF;AiCppDE;EACC,kBAAA;AjCspDH;AiClpDC;EACC,YAAA;AjCopDF;;AkCxuDC;EACC,kBAAA;AlC2uDF;;AmC9uDA;EACC,UAAA;EACA,mBAAA;AnCivDD;;AoChvDC;EAEC,eAAA;ApCmvDF;;AoCrvDC;EAEC,eAAA;ApCmvDF;AoChvDC;EAEC,mBAAA;ApCkvDF;AoCpvDC;EAEC,mBAAA;ApCkvDF;AoC/uDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoCtvDC;EAKC,kBAAA;ApCivDF;AoC9uDC;EAEC,iBAAA;EACA,gBAAA;ApCgvDF;AoCnvDC;EAEC,iBAAA;EACA,gBAAA;ApCgvDF;AoC7uDC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoC7LC;EAIC,iBAAA;EACA,gBAAA;ApC+uDF;AE/hDA;EkCrNC;EAIC;EpCgvDF;AAvjDA;AoCrLC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApC4uDF;AEriDA;EkC7MC;EAEC;EpCgvDF;AA7jDA;AoCrLC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApC4uDF;AEriDA;EkC7MC;EAEC;EpCgvDF;AA7jDA;AoC5KC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApCyuDF;AE3iDA;EkCpMC;EAEC;EpC6uDF;AAnkDA;AoC5KC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;ApCyuDF;AE3iDA;EkCpMC;EAEC;EpC6uDF;AAnkDA;;AqCxNA;;;CAAA;AAMA;EACC,gCAAA;EACA,oBAAA;EACA,mBAAA;EACA,6BAAA;ArC4xDD;AG5wDE;EkCpBF;EAIC;ErC4xDD;AApjDA;AGpLE;EkCxDF;EAIC;ErC4xDD;AA9iDA;AqC5OC;EACC,cAAA;EACA,gIAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;ArC4xDF;AE7jDA;EmCpOC;EAGC;ErC8xDF;AArlDA;;AqClMA;EACC,gIAAA;EACA,kBAAA;ArC0xDD;;AqCtxDA;EACC,cAAA;ArCyxDD;;AqCtxDA;EACC,cAAA;ArCyxDD;;AqCvwDA;EACC,yBAAA;EACA,cAAA;ArCqxDD;;AqClxDA;EACC,yBAAA;EACA,cAAA;ArCqxDD;;AqClxDA;EAEC,cAAA;ArCqxDD;;AqClxDA;EAEC,cAAA;ArCqxDD;;AqCjxDA;EACC,gBAAA;EACA,mBAAA;ArCoxDD;;AqChxDA;EAIC,6BAAA;ArCgxDD;;AGx0DE;EkCoDF;EAIC;ErCgxDD;AAhnDA;;AGpLE;EkCgBF;EAIC;ErCgxDD;AA1mDA;AqCnKC;EAEC,6BAAA;ArC8wDF;AG30DE;EkC2DD;EAEC;ErC8wDF;AAnnDA;AGpLE;EkCuBD;EAEC;ErC8wDF;AA7mDA;AqCnKC;EAEC,6BAAA;ArC8wDF;AG30DE;EkC2DD;EAEC;ErC8wDF;AAnnDA;AGpLE;EkCuBD;EAEC;ErC8wDF;AA7mDA;AqC9JC;EAEC,eAAA;ArC4wDF;;AqCxwDA;EACC,SAAA;EACA,kBAAA;ArC2wDD;;AqCxwDA;EACC,SAAA;EACA,iBAAA;ArC2wDD;;AqCvwDA;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,yBAAA;EACA,kBAAA;EACA,WAAA;EACA,uBAAA;EACA,eAAA;ArC0wDD;;AE7oDA;EmCrIA;EAQC;ErC0wDD;AArqDA;;AqClGA;EAEC;IACC,gBAAA;IACA,kBAAA;ErCywDA;EqCtwDD;IACC,gBAAA;IACA,iBAAA;ErCwwDA;AACF;AqCpwDA;EACC,YAAA;ArCswDD;;AqClwDA;EACC,SAAA;ArCqwDD;;AsC/4DA;EAEC,gBAAA;AtCk5DD;;AsC/4DA;EAJC,gIAAA;AtC85DD;;AsC15DA;EAGC,yBAAA;EAEA,kBAAA;EACA,mBAAA;EACA,kCAAA;EACA,mCAAA;AtCk5DD;;AsC94DA;EAVC,cAAA;AtC45DD;AsC/4DC;EACC,6BAAA;AtCi5DF;AsC94DC;EACC,0BAAA;EACA,qBAAA;AtCg5DF;;AsCx4DC;EAEC,cAAA;AtC04DF;;AsCt4DA;;EAEC,eAAA;AtCy4DD;;AuCj7DA;EAMC,WAAA;AvC+6DD;AuCn7DC;EAEC,WAAA;AvCq7DF;;AuCh7DA;EAMC,cAAA;AvC86DD;AuCl7DC;EAEC,cAAA;AvCo7DF;;AuC/6DA;EAMC,cAAA;AvC66DD;AuCj7DC;EAEC,cAAA;AvCm7DF;;AuC96DA;EAMC,cAAA;AvC46DD;AuCh7DC;EAEC,cAAA;AvCk7DF;;AuC76DA;EAMC,cAAA;AvC26DD;AuC/6DC;EAEC,cAAA;AvCi7DF;;AuC56DA;EAMC,cAAA;AvC06DD;AuC96DC;EAEC,cAAA;AvCg7DF;;AuC36DA;EAMC,cAAA;AvCy6DD;AuC76DC;EAEC,cAAA;AvC+6DF;;AuC16DA;EAMC,cAAA;AvCw6DD;AuC56DC;EAEC,cAAA;AvC86DF;;AuCz6DA;EAMC,cAAA;AvCu6DD;AuC36DC;EAEC,cAAA;AvC66DF;;AuCx6DA;EAMC,WAAA;AvCs6DD;AuC16DC;EAEC,WAAA;AvC46DF;;AuCp6DC;;;;;;;;EAQC,mBAAA;AvCu6DF;;AuCn6DA;EAMC,sBAAA;AvCi6DD;AuCr6DC;EAEC,sBAAA;AvCu6DF;;AuCl6DA;EAMC,yBAAA;AvCg6DD;AuCp6DC;EAEC,yBAAA;AvCs6DF;;AuCj6DA;EAMC,yBAAA;AvC+5DD;AuCn6DC;EAEC,yBAAA;AvCq6DF;;AuCh6DA;EAMC,yBAAA;AvC85DD;AuCl6DC;EAEC,yBAAA;AvCo6DF;;AuC/5DA;EAMC,yBAAA;AvC65DD;AuCj6DC;EAEC,yBAAA;AvCm6DF;;AuC95DA;EAMC,yBAAA;AvC45DD;AuCh6DC;EAEC,yBAAA;AvCk6DF;;AuC75DA;EAMC,yBAAA;AvC25DD;AuC/5DC;EAEC,yBAAA;AvCi6DF;;AuC55DA;EAMC,yBAAA;AvC05DD;AuC95DC;EAEC,yBAAA;AvCg6DF;;AuC35DA;EAMC,yBAAA;AvCy5DD;AuC75DC;EAEC,yBAAA;AvC+5DF;;AuC15DA;EAMC,yBAAA;AvCw5DD;AuC55DC;EAEC,yBAAA;AvC85DF;;AuCz5DA;EAMC,sBAAA;AvCu5DD;AuC35DC;EAEC,sBAAA;AvC65DF;;AuCt5DC;EAGG,WAAA;AvCu5DJ;;AuC15DC;EAGG,WAAA;AvCu5DJ;;AuC15DC;EAGG,WAAA;AvCu5DJ;AuCp5DE;EAMC;AvCk5DH;AuCx5DE;EAMC;AvCk5DH;AuCx5DE;EAMC;AvCk5DH;AuC94DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuCp5DC;EAOG,cAAA;AvC64DJ;AuC14DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;AuC94DE;EAMC;AvCw4DH;;AuCl4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD;;AuCr4DA;EACC,qDAAA;AvCw4DD","file":"ie-editor.css"}
\ No newline at end of file
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie.css b/src/wp-content/themes/twentytwentyone/assets/css/ie.css
index 53aabc38f43df..3d8d605610616 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/ie.css
+++ b/src/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -7,9 +7,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog.
 Requires at least: 5.3
-Tested up to: 6.0
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.7
+Version: 1.9
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
@@ -3538,14 +3538,6 @@ dd {
 	border: 3px solid #28303d;
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: 13px;
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
 	font-size: 1.25rem;
@@ -3563,7 +3555,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	left: 0;
-	margin-left: 13px;
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -3571,22 +3562,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: 7px 13px;
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: #d1e4dd;
 	margin: 0;
@@ -3676,6 +3655,11 @@ pre.wp-block-preformatted {
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: normal;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+	letter-spacing: normal;
+	line-height: 1.3;
 
 	/**
    * Block Options
@@ -3694,20 +3678,14 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-pullquote p {
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-	font-size: 2rem;
-	font-style: normal;
-	font-weight: 700;
-	letter-spacing: normal;
-	line-height: 1.3;
+	font-family: inherit;
+	font-size: inherit;
+	font-style: inherit;
+	font-weight: inherit;
+	letter-spacing: inherit;
+	line-height: inherit;
 	margin: 0;
 }
-@media only screen and (min-width: 652px) {
-
-	.wp-block-pullquote p {
-		font-size: 2rem;
-	}
-}
 
 .wp-block-pullquote a {
 	color: currentColor;
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map b/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map
index 91b18a49f99d0..7d75030ec1e58 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map
+++ b/src/wp-content/themes/twentytwentyone/assets/css/ie.css.map
@@ -1 +1 @@
-{"version":3,"sources":["../../style.css","../../assets/sass/01-settings/file-header.scss","../../assets/sass/style.scss","../../assets/sass/01-settings/global.scss","../../assets/sass/03-generic/normalize.scss","../../assets/sass/03-generic/breakpoints.scss","../../assets/sass/03-generic/vertical-margins.scss","../../assets/sass/03-generic/reset.scss","../../assets/sass/03-generic/clearings.scss","../../assets/sass/04-elements/blockquote.scss","../../assets/sass/04-elements/forms.scss","../../assets/sass/04-elements/media.scss","../../assets/sass/04-elements/misc.scss","../../assets/sass/04-elements/links.scss","../../assets/sass/05-blocks/audio/_style.scss","../../assets/sass/05-blocks/button/_style.scss","../../assets/sass/02-tools/mixins.scss","../../assets/sass/05-blocks/code/_style.scss","../../assets/sass/05-blocks/columns/_style.scss","../../assets/sass/05-blocks/cover/_style.scss","../../assets/sass/05-blocks/file/_style.scss","../../assets/sass/05-blocks/gallery/_style.scss","../../assets/sass/05-blocks/group/_style.scss","../../assets/sass/05-blocks/heading/_style.scss","../../assets/sass/05-blocks/image/_style.scss","../../assets/sass/05-blocks/latest-comments/_style.scss","../../assets/sass/05-blocks/latest-posts/_style.scss","../../assets/sass/05-blocks/legacy/_style.scss","../../assets/sass/05-blocks/list/_style.scss","../../assets/sass/05-blocks/media-text/_style.scss","../../assets/sass/05-blocks/navigation/_style.scss","../../assets/sass/05-blocks/paragraph/_style.scss","../../assets/sass/05-blocks/preformatted/_style.scss","../../assets/sass/05-blocks/pullquote/_style.scss","../../assets/sass/05-blocks/query-loop/_style.scss","../../assets/sass/05-blocks/quote/_style.scss","../../assets/sass/05-blocks/rss/_style.scss","../../assets/sass/05-blocks/search/_style.scss","../../assets/sass/05-blocks/separator/_style.scss","../../assets/sass/05-blocks/social-icons/_style.scss","../../assets/sass/05-blocks/table/_style.scss","../../assets/sass/05-blocks/tag-clould/_style.scss","../../assets/sass/05-blocks/verse/_style.scss","../../assets/sass/05-blocks/video/_style.scss","../../assets/sass/05-blocks/utilities/_font-sizes.scss","../../assets/sass/05-blocks/utilities/_style.scss","../../assets/sass/06-components/header.scss","../../assets/sass/06-components/footer.scss","../../assets/sass/06-components/single.scss","../../assets/sass/06-components/posts-and-pages.scss","../../assets/sass/06-components/entry.scss","../../assets/sass/06-components/archives.scss","../../assets/sass/06-components/404.scss","../../assets/sass/06-components/search.scss","../../assets/sass/06-components/comments.scss","../../assets/sass/06-components/navigation.scss","../../assets/sass/06-components/footer-navigation.scss","../../assets/sass/06-components/pagination.scss","../../assets/sass/06-components/widgets.scss","../../assets/sass/07-utilities/a11y.scss","../../assets/sass/07-utilities/color-palette.scss","../../assets/sass/07-utilities/measure.scss","../../assets/sass/07-utilities/ie.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;;;;;;;;;;;;;;;;;CAAA;ACEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;AA4EA,wCAAA;AC9EA,cAAA;AAKA;EAEC,gBAAA;EAIA,cAAA;EAYA,gBAAA;EAKA,aAAA;EA4BA,wBAAA;EASA,WAAA,EAeA,oDAAA,EACA,aAAA,EAEA,kCAAA,EACA,kCAAA;EAEA,YAAA;EAMA,cAAA;EAGA,UAAA;EAYA,gBAAA;EAKA,YAAA;EAmBA,UAAA;EAUA,WAAA;EAkBA,oBAAA;EAkBA,eAAA;EAQA,WAAA;EAOA,sBAAA;EAyBA,iBAAA;EAKA,YAAA;EAMA,qBAAA;AH2DD;AI/RA,2EAAA;AAEA;+EAAA;AAGA;;;EAAA;AAKA;EACC,iBAAA,EAAA,MAAA;EACA,8BAAA,EAAA,MAAA;AJiTD;;AI9SA;+EAAA;AAGA;;EAAA;AAIA;EACC,SAAA;AJ+SD;;AI5SA;;EAAA;AAIA;EACC,cAAA;AJ8SD;;AI3SA;;;EAAA;AAKA;EACC,cAAA;EACA,gBAAA;AJ6SD;;AI1SA;+EAAA;AAGA;;;EAAA;AAKA;EACC,uBAAA,EAAA,MAAA;EACA,SAAA,EAAA,MAAA;EACA,iBAAA,EAAA,MAAA;AJ2SD;;AIxSA;;;EAAA;AAKA;EACC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;AJ0SD;;AIvSA;+EAAA;AAGA;;EAAA;AAIA;EACC,6BAAA;EACA,8BAAA;AJwSD;;AIrSA;;;EAAA;AAKA;EACC,mBAAA,EAAA,MAAA;EACA,0BAAA,EAAA,MAAA;EACA,6BAAA,EAAA,MAAA;AJuSD;;AIpSA;;EAAA;AAIA;;EAEC,mBAAA;AJsSD;;AInSA;;;EAAA;AAKA;;;EAGC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;AJqSD;;AIlSA;;EAAA;AAIA;EACC,cAAA;AJoSD;;AIjSA;;;EAAA;AAKA;;EAEC,cAAA;EACA,cAAA;EACA,kBAAA;EACA,wBAAA;AJmSD;;AIhSA;EACC,eAAA;AJmSD;;AIhSA;EACC,WAAA;AJmSD;;AIhSA;+EAAA;AAGA;;EAAA;AAIA;EACC,kBAAA;AJiSD;;AI9RA;+EAAA;AAGA;;;EAAA;AAKA;;;;;EAKC,oBAAA,EAAA,MAAA;EACA,eAAA,EAAA,MAAA;EACA,iBAAA,EAAA,MAAA;EACA,SAAA,EAAA,MAAA;AJ+RD;;AI5RA;;;EAAA;AAKA;QACQ,MAAA;EACP,iBAAA;AJ8RD;;AI3RA;;;EAAA;AAKA;SACS,MAAA;EACR,oBAAA;AJ6RD;;AI1RA;;EAAA;AAIA;;;;EAIC,0BAAA;AJ4RD;;AIzRA;;EAAA;AAIA;;;;EAIC,kBAAA;EACA,UAAA;AJ2RD;;AIxRA;;EAAA;AAIA;;;;EAIC,8BAAA;AJ0RD;;AIvRA;;EAAA;AAIA;EACC,8BAAA;AJyRD;;AItRA;;;;;EAAA;AAOA;EACC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;EACA,eAAA,EAAA,MAAA;EACA,UAAA,EAAA,MAAA;EACA,mBAAA,EAAA,MAAA;AJwRD;;AIrRA;;EAAA;AAIA;EACC,wBAAA;AJuRD;;AIpRA;;EAAA;AAIA;EACC,cAAA;AJsRD;;AInRA;;;EAAA;AAKA;;EAEC,sBAAA,EAAA,MAAA;EACA,UAAA,EAAA,MAAA;AJqRD;;AIlRA;;EAAA;AAIA;;EAEC,YAAA;AJoRD;;AIjRA;;;EAAA;AAKA;EACC,6BAAA,EAAA,MAAA;EACA,oBAAA,EAAA,MAAA;AJmRD;;AIhRA;;EAAA;AAIA;EACC,wBAAA;AJkRD;;AI/QA;;;EAAA;AAKA;EACC,0BAAA,EAAA,MAAA;EACA,aAAA,EAAA,MAAA;AJiRD;;AI9QA;+EAAA;AAGA;;EAAA;AAIA;EACC,cAAA;AJ+QD;;AI5QA;;EAAA;AAIA;EACC,kBAAA;AJ8QD;;AI3QA;+EAAA;AAGA;;EAAA;AAIA;EACC,aAAA;AJ4QD;;AIzQA;;EAAA;AAIA;EACC,aAAA;AJ2QD;;AKvmBA;;EAAA;AAIA;;EAAA;AA4EA;;EAAA;AA8BA;;EAAA;AAGA;EACC,6BAAA;AL+hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AK3gBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKliBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKliBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKroBE;EA2GD;IACC,eAAA;IACA,WAAA;IACA,iBAAA;IACA,kBAAA;EL8hBA;AACF;AK3hBA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;;AK9mBE;EAqJD;IAEC,aAAA;IACA,iEAAA;IAEA,aAAA;IACA,kBAAA;ELigBA;EK5pBA;IAqJD;IAGC;ILogBA;EApDF;EKpkBE;IAiHD;IAGC;ILogBA;EA9CF;AA+CA;AK7pBE;EAyKD;IAEC,aAAA;IACA,iBAAA;IAEA,aAAA;IACA,kEAAA;ELqfA;EKpqBA;IAyKD;IAMC;ILqfA;EA5DF;EKpkBE;IAqID;IAMC;ILqfA;EAtDF;AAuDA;AM/rBA;;;;;;;EAAA;AASA;;;EAAA;AAIA;EAIC,iBAAA;EACA,oBAAA;EACA,iBAAA;EACA,kBAAA;ANgsBD;;AM7rBA;EACC,iBAAA;EACA,oBAAA;ANgsBD;AK/rBE;ECHF;IAKE,oBAAA;ENisBA;AACF;;AM9rBA;;;EAAA;AAIA;EACC,gBAAA;EACA,mBAAA;ANisBD;AM/rBC;EACC,aAAA;ANisBF;AM9rBC;EACC,gBAAA;ANgsBF;;AM5rBA;;EAAA;AAOA;;EAAA;AAOA;;EAAA;AAQA;;;EAAA;AAIA;EAKC,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;ANkrBD;;AM/qBA;;;EAAA;AAIA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AKzvBE;ECgEF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;AACF;AMrrBC;;;;;;EACC,aAAA;AN4rBF;AMzrBC;;;;;;EACC,gBAAA;ANgsBF;;AM5rBA;EAEC,gBAAA;EACA,mBAAA;AN+rBD;;AMlsBA;EAEC,gBAAA;EACA,mBAAA;AN+rBD;AK1xBE;ECwFF;IAME,gBAAA;IACA,mBAAA;ENisBA;EMxsBF;IAME,gBAAA;IACA,mBAAA;ENisBA;AACF;;AM9rBA;;;EAAA;AAKA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AM9rBC;;;;;EACC,aAAA;ANosBF;AMjsBC;;;;;EACC,gBAAA;ANusBF;;AMlsBA;;;EAAA;AAIA;EAeC,2DAAA;ANurBD;AMpsBC;EAKC,aAAA;ANksBF;AM/rBC;EAEC,gBAAA;ANgsBF;AM5rBC;EAEC,gBAAA;AN6rBF;AM/rBC;EAEC,gBAAA;AN6rBF;;AOv2BA;;EAAA;AAIA;;;;;;;;;;;;;;;;;;;;;;;;EAwBC,UAAA;EACA,SAAA;EACA,kCAAA;EACA,mCAAA;APy2BD;;AOt2BA;;;;EAAA;AAMA;EAEC,6CAAA;EACA,sBAAA;EAGA,gIAAA;EACA,gBAAA;APq2BD;;AOl2BA;;EAAA;AAKC;EAGC,mBAAA;APi2BF;;AO51BA;EACC,kBAAA;EACA,mBAAA;EACA,cAAA;EACA,gBAAA;EACA,yBAAA;AP+1BD;;AQn6BA;;;;;;;;;;;;EAYC,WAAA;EACA,cAAA;EACA,mBAAA;AR06BD;;AQv6BA;;;;;;EAMC,WAAA;AR06BD;;AEt2BA,yHAAA;AO3FA;EACC,UAAA;EACA,kBAAA;EACA,wBAAA;ATq8BD;ASn8BC;EACC,gBAAA;EACA,mBAAA;ATq8BF;ASn8BE;EACC,aAAA;ATq8BH;ASl8BE;EACC,gBAAA;ATo8BH;ASh8BC;EACC,sBAAA;EACA,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;ATk8BF;AS/7BC;EAEC,mBAAA;EAGA,sBAAA;ATi8BF;AS97BC;EAGC,qBAAA;AT87BF;AS57BE;EACC,mBAAA;EACA,kBAAA;EACA,cAAA;AT87BH;AS37BE;EAEC,eAAA;EACA,sBAAA;AT87BH;AS17BC;EACC,mBAAA;AT47BF;ASz7BC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,WAAA;AT27BF;ASx7BC;EAGC,cAAA;EACA,eAAA;EACA,kBAAA;AT07BF;AK5+BE;EIpBF;IA0EE,kBAAA;ET07BA;ESx7BA;IACC,OAAA;ET07BD;AACF;;AUxgCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;AUxgCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AUrhCC;;;;;;;;;;;;;;;EACC,YAAA;AVqiCF;AUliCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;;AU3iCC;EACC,oBAAA;AV8iCF;AU5iCE;EACC,sBAAA;AV8iCH;;AUziCA;EACC,YAAA;EACA,YAAA;AV4iCD;;AUziCA;;EAGC,aAAA;EACA,cAAA;AV2iCD;;AUxiCA;EACC,yBAAA;EACA,cAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AV2iCD;AUziCC;EACC,mBAAA;EACA,2BAAA;AV2iCF;AUxiCC;EACC,oMAAA;EACA,uCAAA;AV0iCF;;AUtiCA;EACC,WAAA;AVyiCD;;AUtiCA;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;AVyiCD;;AUtiCA;;;;CAAA;AAKA;EAEC;IAEC,wBAAA;IACA,qBAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,yBAAA;IACA,gBAAA;EVwiCA;EUhjCD;IAEC,wBAAA;IACA,qBAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,yBAAA;IACA,gBAAA;EVwiCA;EUtiCA;;IACC,YAAA;EVyiCD;EUtiCA;IACC,oCAAA;EVyiCD;EU1iCA;IACC,oCAAA;EVyiCD;EUniCA;IACC,mBAAA;IACA,2BAAA;EVqiCD;EUliCA;IACC,WAAA;IACA,UAAA;IACA,cAAA;IACA,SAAA;IACA,QAAA;IACA,kBAAA;IACA,UAAA;IACA,YAAA;IACA,yBAAA;IACA,aAAA;IACA,cAAA;IACA,wBAAA;EVoiCD;EUjiCA;IACC,cAAA;EVmiCD;EUjiCC;IACC,UAAA;EVmiCF;EU9hCD;IACC,kBAAA;EVgiCA;EU9hCA;IACC,mBAAA;IACA,2BAAA;EVgiCD;EU7hCA;IACC,WAAA;IACA,UAAA;IACA,cAAA;IACA,SAAA;IACA,QAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,kBAAA;IACA,mBAAA;EV+hCD;EU5hCA;IACC,yBAAA;EV8hCD;EU5hCC;IACC,UAAA;EV8hCF;EU1hCC;IACC,mBAAA;IACA,2BAAA;EV4hCF;AACF;AUvhCA;EAEC,qBAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;AVyhCD;AU9hCA;EAEC,qBAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;AVyhCD;;AUthCA;;CAAA;AAGA;EAEC;IACC,wBAAA,EAAA,uDAAA;IACA,WAAA,EAAA,4CAAA;IACA,WAAA;IACA,mBAAA;IACA,kBAAA;IACA,oBAAA;EVwhCA;EUthCA;IACC,YAAA;EVwhCD;EUphCD;IACC,wBAAA;IACA,yBAAA;IACA,YAAA;IACA,WAAA;IACA,kBAAA;IACA,mBAAA;IACA,eAAA;EVshCA;EUnhCD;IACC,yBAAA;IACA,YAAA;IACA,WAAA;IACA,kBAAA;IACA,mBAAA;IACA,eAAA;IACA,sBAAA;EVqhCA;AACF;AUlhCA;EACC,WAAA;EACA,WAAA;EACA,kBAAA;EACA,oBAAA;EACA,qBAAA;EACA,uBAAA;EACA,kBAAA;EACA,eAAA;AVohCD;;AUjhCA;EACC,mBAAA;EACA,kBAAA;AVohCD;;AUjhCA;EACC,mBAAA;EACA,kBAAA;AVohCD;;AUjhCA;EACC,yBAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;EACA,mBAAA;EACA,eAAA;AVohCD;;AUjhCA;EACC,aAAA;EACA,qBAAA;EACA,aAAA;AVohCD;AUlhCC;EACC,iBAAA;AVohCF;AU/gCE;EACC,sBAAA;AVihCH;AU9gCE;EACC,mBAAA;AVghCH;AU7gCE;EAEC,gBAAA;AV8gCH;AU3gCE;EAEC,mBAAA;EACA,eAAA;EACA,mBAAA;AV4gCH;AUhhCE;EAEC,mBAAA;EACA,eAAA;EACA,mBAAA;AV4gCH;;AUvgCA;EACC,UAAA;AV0gCD;;AUvgCA;EACC,iBAAA;AV0gCD;;AUvgCA;EACC,aAAA;EACA,eAAA;AV0gCD;AUxgCC;EACC,WAAA;EACA,gBAAA;AV0gCF;AUvgCC;EACC,YAAA;EACA,gBAAA;EACA,kBAAA;AVygCF;AUtgCC;EACC,gBAAA;AVwgCF;AKryCE;EK4RD;IAGE,iBAAA;EV0gCD;AACF;;AWh1CA;EACC,YAAA;EAEA,sBAAA;AXm1CD;;AWh1CA,0BAAA;;AAKA,uDAAA;AACA;;;;EAIC,eAAA;AXm1CD;;AWh1CA,mBAAA;AACA;EAIC,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;AXm1CD;AWj1CC;;;;;;;EAEC,gBAAA;AXw1CF;;AWp1CA,cAAA;AACA;;;EAGC,YAAA;EACA,gBAAA;EACA,aAAA;EACA,UAAA;AXu1CD;;AYn4CA,2EAAA;AACA;;EAEC,gBAAA;AZs4CD;;AYn4CA;;;;EAIC,kBAAA;AZs4CD;;AYn4CA;EACC,gBAAA;EACA,gBAAA;AZs4CD;;Aar5CA;;;;EAAA;AAKA;EACC,eAAA;EACA,cAAA;EACA,0BAAA;EACA,6BAAA;Abw5CD;;Aar5CA;EACC,6BAAA;EACA,8BAAA;Abw5CD;;Aar5CA;EAEC,+CAAA;EACA,8BAAA;EAEA,kDAAA;EACA,8BAAA;EACA,oCAAA;Abs5CD;Aan5CC;EACC,gBAAA;EACA,WAAA;EACA,qBAAA;Abq5CF;Aan5CE;EACC,WAAA;Abq5CH;Aah5CC;EACC,8BAAA;EACA,WAAA;Abk5CF;Aah5CE;EACC,WAAA;Abk5CH;Aa94CC;EAEC,+CAAA;EACA,8BAAA;EACA,oBAAA;Ab+4CF;Aa74CE;EACC,cAAA;EACA,yBAAA;Ab+4CH;Aa34CC;EACC,gBAAA;Ab64CF;Aa14CC;EACC,2BAAA;Ab44CF;;Aap4CC;EAEC,cAAA;Abs4CF;;AE92CA,4HAAA;AYhGC;EACC,mBAAA;EACA,0BAAA;Adk9CF;;Aet9CA;;EAAA;AAGA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;AgBv8CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgB58CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBl9CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgBp9CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgBz9CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgB39CC;;;;;;;;;;;;;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;AhBw+CF;AgBp+CC;;;;;;;EACC,oBAAA;EACA,gCAAA;AhB4+CF;AgBx+CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;;AehjDA;;EAAA;AAWG;EACC,cAAA;Af2iDJ;AexiDI;EACC,cAAA;Af0iDL;AexiDK;EACC,cAAA;Af0iDN;AepiDG;EACC,yBAAA;AfsiDJ;AeniDI;EACC,yBAAA;AfqiDL;Ae/hDE;;EAEC,qCAAA;EACA,wCAAA;EACA,yBAAA;AfiiDH;AevhDG;EAGC,0BAAA;AfuhDJ;AenhDG;EACC,cAAA;AfqhDJ;AelhDI;EACC,cAAA;AfohDL;Ae9gDI;EACC,cAAA;AfghDL;Ae3gDG;EACC,6BAAA;Af6gDJ;AezgDE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;Af0gDH;Ae/gDE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;Af0gDH;AexgDG;EACC,oCAAA;EACA,yBAAA;Af2gDJ;Ae7gDG;EACC,oCAAA;EACA,yBAAA;Af2gDJ;AexgDG;EACC,yBAAA;Af2gDJ;Ae5gDG;EACC,yBAAA;Af2gDJ;AergDC;EACC,gBAAA;AfugDF;;AengDA;EAEC,mBAAA;EACA,2BAAA;AfsgDD;;AezgDA;EAEC,mBAAA;EACA,2BAAA;AfsgDD;;AiB9nDA;EACC,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,oBAAA;EACA,aAAA;AjBioDD;AiB/nDC;EACC,cAAA;EACA,gBAAA;EACA,gBAAA;EACA,cAAA;AjBioDF;;AkB1oDC;EACC,WAAA;AlB6oDF;AkBxoDE;EACC,gBAAA;EACA,mBAAA;AlB0oDH;AK1nDE;EalBA;IAKE,gBAAA;IACA,mBAAA;ElB2oDF;AACF;AkBzoDG;EACC,aAAA;AlB2oDJ;AkBxoDG;EACC,gBAAA;AlB0oDJ;AkBtoDE;EACC,gBAAA;AlBwoDH;AkBpoDC;EACC,mBAAA;AlBsoDF;AK5oDE;EaKD;IAIE,mBAAA;ElBuoDD;AACF;AK7mDE;Ea/BD;IAQE,gBAAA;ElBwoDD;AACF;AkBroDC;EAEC,6BAAA;AlBsoDF;AKjoDE;EaCE;IACC,kBAAA;IACA,gBAAA;IACA,UAAA;ElBmoDH;EkBrnDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkB3nDG;IAEC,kBAAA;ElB6nDJ;EkB/nDG;IAEC,kBAAA;ElB6nDJ;EkB1nDG;IACC,aAAA;ElB4nDJ;AACF;AkBlnDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;;AmBxtDA;EAYC,sBAAA;EACA,iBAAA;EACA,mBAAA;EACA,sBAAA;EAkBA,sCAAA;EAUA,8DAAA;EA+DA,iBAAA;EAKA,qHAAA;AnBqnDD;AmBjuDC;;EACC,WAAA;AnBouDF;AmBjuDC;;EACC,aAAA;EACA,gBAAA;AnBouDF;AmB5tDC;EAGC,mBAAA;EACA,gBAAA;EACA,mBAAA;AnBiuDF;AmB/tDE;;;;;;EACC,mBAAA;AnBsuDH;AmBnuDE;EACC,cAAA;AnB0uDH;AmBnuDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmBnuDC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,UAAA;AnBsuDF;AGxiDA;EgBpMC;EACC;EnB2uDF;AAt+CA;AmBtQC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,UAAA;AnBsuDF;AGxiDA;EgBpMC;EACC;EnB2uDF;AAt+CA;AmB9PE;;EACC,gBAAA;AnBuuDH;AmBpuDE;;EACC,kBAAA;AnBuuDH;AmBpuDE;;EACC,iBAAA;AnBuuDH;AmBnuDC;EAEC,wBAAA;AnBquDF;AmBnuDE;EACC,gBAAA;EACA,mBAAA;AnBsuDH;AmBxuDE;EACC,gBAAA;EACA,mBAAA;AnBsuDH;AKnxDE;Ec2CA;IAKE,gBAAA;IACA,mBAAA;EnBwuDF;EmB9uDA;IAKE,gBAAA;IACA,mBAAA;EnBwuDF;AACF;AmBtuDG;;EACC,aAAA;AnByuDJ;AmBtuDG;;EACC,gBAAA;AnByuDJ;AmBpuDC;;;EAEC,aAAA;AnBuuDF;AmBruDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmBruDC;;;EAEC,uBAAA;AnBwuDF;AmBpuDC;EACC,yBAAA;AnBuuDF;AmBnuDC;;EACC,uBAAA;AnBsuDF;;AoBp1DC;;;EAGC,gBAAA;ApBu1DF;AoBp1DC;EACC,qBAAA;ApBs1DF;;AqBh2DA;EAEC,cAAA;ArBk2DD;AqBh2DC;EAIC,uBAAA;ArBg2DF;AqB91DE;EACC,SAAA;EAEA,WAAA;EACA,eAAA;ArBg2DH;AqB91DG;EACC,WAAA;ArBi2DJ;AqB/1DI;EACC,6BAAA;EACA,0BAAA;EACA,qBAAA;ArBk2DL;AqBr2DI;EACC,6BAAA;EACA,0BAAA;EACA,qBAAA;ArBk2DL;AqB71DE;;EACC,mBAAA;ArBg2DH;;AsB53DA;EAIC,cAAA;EACA,WAAA;EAEA,kBAAA;AtB23DD;AsBz3DC;EAEC,WAAA;EACA,cAAA;EACA,WAAA;AtB03DF;AsBt3DC;EACC,iBAAA;EACA,kBAAA;AtBw3DF;AsBt3DE;EACC,gBAAA;EACA,mBAAA;AtBw3DH;AKr3DE;EiBLA;IASE,gBAAA;IACA,mBAAA;EtBq3DF;AACF;AsBn3DG;EACC,aAAA;AtBq3DJ;AsBl3DG;EACC,gBAAA;AtBo3DJ;AsB/2DC;EACC,aAAA;AtBi3DF;AKp4DE;EiBkBD;IAIE,aAAA;EtBk3DD;AACF;AsB92DC;EACC,yBAAA;EACA,aAAA;AtBg3DF;AsBz2DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;;AuB96DA;EAYC,WAAA;EACA,gIAAA;EACA,mBAAA;AvBi7DD;AuB/6DC;EACC,gBAAA;AvB47DF;;AuBx7DA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGpuDA;EoB3NA;EAEC;EvB67DD;AAlqDA;;AuB7RA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGpuDA;EoB3NA;EAEC;EvB67DD;AAlqDA;;AuBtRA;EAEC,kBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AG3uDA;EoBpNA;EAEC;EvB67DD;AAzqDA;;AuBtRA;EAEC,kBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AG3uDA;EoBpNA;EAEC;EvB67DD;AAzqDA;;AuB/QA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGlvDA;EoB7MA;EAEC;EvB67DD;AAhrDA;;AuB/QA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGlvDA;EoB7MA;EAEC;EvB67DD;AAhrDA;;AuBxQA;EAEC,iBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AuBx7DA;EAEC,mBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AuBx7DA;EAEC,eAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AwB1/DA;EACC,kBAAA;AxB6/DD;AwB3/DC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;AxB6/DF;AwB1/DC;EACC,iBAAA;AxB4/DF;AwBz/DC;EACC,kBAAA;AxB2/DF;AwBx/DC;EACC,mBAAA;AxB0/DF;;AwBr/DA;;EAEC,aAAA;EACA,gBAAA;AxBw/DD;AwBr/DC;;EACC,aAAA;AxBw/DF;;AwBn/DA;EAEC,yBAAA;AxBs/DD;;AwBn/DA;EACC,aAAA;AxBs/DD;;AKxgEE;EmByBA;;IAGE,cAAA;ExBk/DF;AACF;AKrhEE;EmB+BA;;IAME,cAAA;IACA,eAAA;ExBq/DF;AACF;;AyBhjEA;EACC,eAAA;AzBmjED;AyBjjEC;EACC,mBAAA;EACA,gBAAA;EAEA,2BAAA;EACA,gBAAA;EACA,mBAAA;AzBkjEF;AyBhjEE;EACC,aAAA;AzBkjEH;AyB/iEE;EACC,gBAAA;AzBijEH;AyB7iEC;EACC,gIAAA;AzB+iEF;AyB5iEC;EACC,cAAA;EACA,mBAAA;AzB8iEF;AyB3iEC;EACC,mBAAA;EACA,gBAAA;EACA,SAAA;AzB6iEF;;A0B7kEA;EACC,eAAA;A1BglED;A0B7kEC;EACC,gBAAA;EACA,mBAAA;A1B+kEF;A0B7kEE;EACC,aAAA;A1B+kEH;A0B5kEE;EACC,gBAAA;A1B8kEH;A0B1kEC;EACC,aAAA;EACA,gBAAA;A1B4kEF;A0BzkEC;EACC,qBAAA;EACA,sBAAA;A1B2kEF;A0BzkEE;EACC,mBAAA;A1B2kEH;A0BzkEG;EACC,gBAAA;A1B2kEJ;A0BtkEE;EAUC,gBAAA;A1B+jEH;A0B3jEC;EACC,gBAAA;EACA,mBAAA;A1B6jEF;A0B3jEE;EACC,aAAA;A1B6jEH;A0B1jEE;EACC,gBAAA;A1B4jEH;A0BvjEC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;A1ByjEF;AG94DA;EuBjLC;EAGC;E1B4jEF;AA50DA;A0B1OC;EACC,mBAAA;EACA,gBAAA;A1BwjEF;A0BpjEC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;A1BsjEF;A0BljEC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;A1BojEF;A0BljEE;EAEC,mBAAA;A1BmjEH;A0B9iEC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;A1BgjEF;A0B5iEC;EACC,kBAAA;EACA,mBAAA;A1B8iEF;A0B5iEE;EAEC,eAAA;EACA,gBAAA;A1B6iEH;A0BxiEC;EACC,6BAAA;EACA,gCAAA;A1B0iEF;A0BxiEE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;A1B0iEH;A0B/iEE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;A1B0iEH;A0BxiEG;;EACC,iBAAA;EACA,mBAAA;A1B2iEJ;A0BviEE;EAEC,oCAAA;EACA,gCAAA;A1BwiEH;A0BtiEG;EACC,SAAA;EACA,iBAAA;EACA,mBAAA;A1BwiEJ;A0BtiEI;EACC,oBAAA;A1BwiEL;A0BliEG;EAEE;IACC,UAAA;E1BmiEJ;E0BpiEG;IACC,UAAA;E1BsiEJ;E0BviEG;IACC,UAAA;E1ByiEJ;E0B1iEG;IACC,UAAA;E1B4iEJ;E0B7iEG;IACC,UAAA;E1B+iEJ;AACF;A0BviEE;EACC,yBAAA;EACA,kBAAA;A1ByiEH;A0BviEG;EACC,oBAAA;A1ByiEJ;A0BriEE;EACC,gBAAA;EACA,mBAAA;A1BuiEH;;A2BttEA;EACC,qBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;A3BytED;A2BvtEC;EACC,cAAA;A3BytEF;A2BttEC;EACC,oBAAA;A3BwtEF;A2BrtEC;EACC,cAAA;A3ButEF;A2BptEC;EACC,iBAAA;A3BstEF;A2BntEC;EACC,cAAA;A3BqtEF;A2BltEC;EACC,cAAA;A3BotEF;A2BjtEC;EACC,iBAAA;A3BmtEF;A2BhtEC;EACC,iBAAA;A3BktEF;A2B/sEC;EACC,gBAAA;A3BitEF;A2B9sEC;EACC,iBAAA;A3BgtEF;;A2B5sEA;EACC,cAAA;A3B+sED;;A2B3sEA;EACC,mBAAA;A3B8sED;;A4BnwEA;EAEC,gIAAA;EACA,SAAA;EACA,kBAAA;A5BswED;A4B9vEC;;;EAJC,2BAAA;EACA,UAAA;A5B4wEF;A4BzwEC;;EAEC,iBAAA;A5BuwEF;;A4BlwEA;EACC,qBAAA;A5BqwED;A4BnwEC;EACC,uBAAA;A5BqwEF;;A4BjwEA;EACC,wBAAA;A5BowED;A4BlwEC;EACC,uBAAA;A5BowEF;;A4BhwEA;EACC,gIAAA;EACA,iBAAA;A5BmwED;;A4BhwEA;EACC,SAAA;EACA,kBAAA;A5BmwED;;A6B7yEA;EAqCC;;IAAA;A7B8wED;A6BjzEC;EACC,aAAA;EACA,gBAAA;A7BmzEF;A6BhzEC;EACC,oBAAA;A7BkzEF;A6B/yEC;EACC,aAAA;A7BizEF;AKvxEE;EwB3BD;IAIE,aAAA;E7BkzED;AACF;A6BhzEE;EACC,gBAAA;EACA,mBAAA;A7BkzEH;AK5yEE;EwBRA;IAKE,gBAAA;IACA,mBAAA;E7BmzEF;AACF;A6BjzEG;EACC,aAAA;A7BmzEJ;A6BhzEG;EACC,gBAAA;A7BkzEJ;AKxzEE;EwBeD;IAEE,iBAAA;IACA,oBAAA;E7B2yED;AACF;A6BvyEC;EACC,yBAAA;A7ByyEF;;A8Bz1EC;EACC,UAAA;A9B41EF;A8B11EE;EACC,aAAA;A9B41EH;A8Bz1EE;EACC,gIAAA;EACA,kBAAA;EACA,mBAAA;A9B21EH;A8Bv1EC;EACC,UAAA;A9By1EF;A8Bj1EG;EACC,gBAAA;A9Bm1EJ;A8Bh1EG;EACC,YAAA;EACA,OAAA;EACA,iBAAA;EACA,sBAAA;EACA,UAAA;EACA,UAAA;EACA,iBAAA;EACA,YAAA;A9Bk1EJ;A8B90EK;EACC,qBAAA;EACA,iBAAA;A9Bg1EN;A8B50EI;EACC,aAAA;A9B80EL;A8Bv0EI;EACC,cAAA;EACA,UAAA;EACA,mBAAA;A9By0EL;A8Bl0EG;EACC,mBAAA;EACA,SAAA;EACA,UAAA;EACA,kBAAA;EACA,SAAA;EACA,yBAAA;A9Bo0EJ;A8Bl0EI;EAEC,WAAA;EACA,cAAA;EACA,kBAAA;EACA,QAAA;EACA,UAAA;EACA,UAAA;EACA,mBAAA;EACA,iCAAA;EACA,4BAAA;A9Bm0EL;A8B70EI;EAEC,WAAA;EACA,cAAA;EACA,kBAAA;EACA,QAAA;EACA,UAAA;EACA,UAAA;EACA,mBAAA;EACA,iCAAA;EACA,4BAAA;A9Bm0EL;A8Bh0EI;EACC,SAAA;EACA,iCAAA;A9Bk0EL;A8B1zEE;EACC,mBAAA;A9B4zEH;A8B1zEG;EACC,mBAAA;A9B4zEJ;A8BjzEI;EAEC,cAAA;A9BkzEL;A8BpzEI;EAEC,cAAA;A9BkzEL;A8B/yEI;EACC,0BAAA;EACA,6BAAA;A9BizEL;A8B5yEE;EACC,mBAAA;A9B8yEH;;A+B16EA;EAEC,gBAAA;A/B46ED;A+Bz6EC;EACC,aAAA;A/B26EF;A+Bv6EC;EACC,cAAA;A/By6EF;;AgCp7EA;EACC,gBAAA;EACA,gBAAA;AhCu7ED;;AiCz7EA;EACC,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,0BAAA;EACA,uBAAA;EACA,mBAAA;EACA,0BAAA;EACA,kBAAA;EAqCA;;IAAA;AjC05ED;AiC77EC;EACC,mBAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,OAAA;EACA,eAAA;EACA,gBAAA;EACA,cAAA;AjC+7EF;AiC57EC;EACC,gIAAA;EACA,eAAA;EACA,kBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;EACA,SAAA;AjC87EF;AG1uEA;E8B3NC;EAEC;EjCm8EF;AAxqEA;AiCnRC;EACC,mBAAA;AjC67EF;AiC17EC;EAGC,mBAAA;EACA,cAAA;EACA,eAAA;EACA,kBAAA;EACA,oBAAA;AjC47EF;AiCt7EC;EACC,gBAAA;AjCw7EF;AiCn7EE;;EAEC,kBAAA;AjCq7EH;AiCj7EC;EAEC,6BAAA;AjCk7EF;AKt9EE;E4BkCD;EAEC;EjCk7EF;AA92DA;AKpkBE;E4BFD;EAEC;EjCk7EF;AAx2DA;AiC5kBC;EAEC,6BAAA;AjCk7EF;AKt9EE;E4BkCD;EAEC;EjCk7EF;AA92DA;AKpkBE;E4BFD;EAEC;EjCk7EF;AAx2DA;AiCvkBC;EAEC,eAAA;AjCg7EF;AiCl7EC;EAEC,eAAA;AjCg7EF;AiC76EC;EACC,cAAA;EACA,aAAA;EACA,iBAAA;EACA,mBAAA;EACA,qBAAA;AjC+6EF;AiC76EE;EAPD;IAQE,cAAA;EjCg7ED;AACF;AiC96EE;EACC,gBAAA;AjCg7EH;AiC76EE;EACC,SAAA;EACA,kBAAA;AjC+6EH;AiC76EG;EACC,eAAA;AjC+6EJ;AGzxEA;E8BvJG;EACC;EjC+6EJ;AAvtEA;AiCpNE;;;EAGC,mBAAA;AjC66EH;AiC16EE;EAEC,aAAA;AjC26EH;AiCz6EG;EACC,kBAAA;AjC26EJ;;AkClhFC;EACC,aAAA;AlCqhFF;AK9/EE;E6BxBD;IAIE,aAAA;ElCshFD;AACF;;AmC7hFA;EACC,iBAAA;EAqBA;;IAAA;AnC8gFD;AmCjiFC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,SAAA;AnCmiFF;AmC5hFE;;;;;;;;;EAIC,mBAAA;AnCmiFH;AmC5hFC;EACC,2BAAA;EACA,gBAAA;EACA,kBAAA;AnC8hFF;AmC3hFE;EACC,aAAA;AnC6hFH;AmCzhFE;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;AnC2hFH;AmCvhFC;EACC,iBAAA;AnCyhFF;AmCvhFE;EACC,aAAA;AnCyhFH;AmCrhFC;EAEC,eAAA;EACA,gBAAA;EAEA,qDAAA;EACA,gBAAA;EACA,mBAAA;AnCqhFF;AmCnhFE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;AnCqhFH;AGt2EA;EgClLE;EACC;EnCuhFH;AApyEA;AmCpPE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;AnCqhFH;AGt2EA;EgClLE;EACC;EnCuhFH;AApyEA;AmC9OE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;AnCohFH;AG32EA;EgC5KE;EACC;EnCshFH;AAzyEA;AmC9OE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;AnCohFH;AG32EA;EgC5KE;EACC;EnCshFH;AAzyEA;AmCrOG;EACC,aAAA;AnCghFJ;AmC5gFG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;AnC8gFJ;AGr3EA;EgC9JG;EAEC;EnCihFJ;AAnzEA;AmChOG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;AnC8gFJ;AGr3EA;EgC9JG;EAEC;EnCihFJ;AAnzEA;AmCvNE;EAGC,cAAA;EACA,mBAAA;AnC8gFH;AKzlFE;E8BiCD;IA8CE,kBAAA;EnC8gFD;EmC5gFC;IACC,OAAA;EnC8gFF;EmC3gFC;IACC,eAAA;IACA,mBAAA;EnC6gFF;EmC3gFE;IACC,QAAA;EnC6gFH;EmCzgFC;IACC,eAAA;IACA,gBAAA;EnC2gFF;EmCpgFA;IACC,eAAA;IACA,mBAAA;EnCwgFD;AALF;AK5mFE;E8B2GC;IACC,QAAA;EnCwgFF;EmCpgFA;IACC,eAAA;IACA,gBAAA;EnCsgFD;AACF;;AoC7oFA;EACC,eAAA;ApCgpFD;AoC9oFC;EACC,gBAAA;ApCgpFF;AoC5oFC;EACC,gBAAA;EACA,mBAAA;ApC8oFF;AoC5oFE;EACC,aAAA;ApC8oFH;AoC3oFE;EACC,gBAAA;ApC6oFH;AoCvoFE;EACC,mBAAA;ApCyoFH;AoCvoFG;EACC,gBAAA;ApCyoFJ;AoCpoFE;EAUC,gBAAA;ApC6nFH;AoCznFC;EACC,gBAAA;EACA,mBAAA;ApC2nFF;AoCznFE;EACC,aAAA;ApC2nFH;AoCxnFE;EACC,gBAAA;ApC0nFH;AoCrnFC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;ApCunFF;AGz8EA;EiCpLC;EAGC;EpC0nFF;AAv4EA;AoC5OC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;ApCqnFF;AoCjnFC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;ApCmnFF;AoCjnFE;EAEC,mBAAA;ApCknFH;AoC7mFC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;ApC+mFF;AoC3mFC;EACC,kBAAA;EACA,mBAAA;ApC6mFF;AoC3mFE;EAEC,eAAA;EACA,gBAAA;ApC4mFH;;AqCrtFA;EACC,6BAAA;ArCwtFD;;AK/rFE;EgC1BF;EACC;ErCwtFD;AAvlEA;;AKpkBE;EgC9DF;EACC;ErCwtFD;AAjlEA;AqCnoBE;EACC,uBAAA;ArCstFH;AqCltFC;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;ArCotFF;AqCjtFC;EACC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;ArCmtFF;AqCjtFE;EACC,cAAA;EACA,qBAAA;ArCmtFH;AqChtFE;EACC,gCAAA;ArCktFH;AqC9sFC;EACC,cAAA;EACA,cAAA;ArCgtFF;AqC9sFE;EACC,iBAAA;ArCgtFH;AqC9sFG;EACC,WAAA;EACA,YAAA;EACA,kBAAA;ArCgtFJ;AqCzsFG;EACC,oCAAA;EACA,yBAAA;ArC2sFJ;AqC7sFG;EACC,oCAAA;EACA,yBAAA;ArC2sFJ;AqCxsFG;EACC,yBAAA;ArC0sFJ;AqC3sFG;EACC,yBAAA;ArC0sFJ;AqCnsFE;EACC,sBAAA;EACA,yBAAA;EACA,gBAAA;EACA,YAAA;ArCqsFH;AqCnsFG;EACC,gCAAA;ArCqsFJ;AqClsFG;EACC,cAAA;EACA,eAAA;EACA,kBAAA;ArCosFJ;AqCjsFI;EACC,cAAA;EACA,oBAAA;EACA,2BAAA;ArCmsFL;AqC/rFG;EACC,kBAAA;ArCisFJ;AqC9rFI;EACC,cAAA;ArCgsFL;AqC7rFI;EACC,cAAA;ArC+rFL;AqC7rFK;EACC,yBAAA;EACA,WAAA;ArC+rFN;AqC3rFI;EACC,iBAAA;ArC6rFL;;AqCtrFA;EACC,gBAAA;ArCyrFD;;AsC3yFA;EACC,kBAAA;EAEA,WAAA;EACA,iBAAA;EACA,kBAAA;AtC8yFD;AsC5yFC;EALA,gCAAA;AtCwzFD;AsCnzFC;EAEC,UAAA;EAiBA;;IAAA;AtCgyFF;AsC/yFE;EACC,6BAAA;AtCizFH;AKnyFE;EiCfA;EACC;EtCizFH;AA3rEA;AKpkBE;EiCnDA;EACC;EtCizFH;AArrEA;AsCvnBG;EACC,6BAAA;AtC8yFJ;AKtyFE;EiCTC;EACC;EtC8yFJ;AA9rEA;AKpkBE;EiC7CC;EACC;EtC8yFJ;AAxrEA;AsCnnBG;EACC,eAAA;AtC6yFJ;AsCtyFE;EACC,wBAAA;AtCwyFH;AsCnyFG;EAEC,wCAAA;AtCoyFJ;AsClyFI;EACC,8BAAA;AtCoyFL;AsChyFG;EACC,cAAA;EACA,kBAAA;EACA,wBAAA;EACA,sBAAA;AtCkyFJ;AGlmFA;EmCpMG;EAEC;EtCoyFJ;AAhiFA;AsC9PE;EAIC,0BAAA;AtC6xFH;;AuCn1FC;EACC,cAAA;AvCs1FF;AuCj1FE;EACC,cAAA;AvCm1FH;AuCh1FE;EAEC,gBAAA;AvCi1FH;;AwC/1FA;;EAEC,WAAA;EACA,gBAAA;EACA,yBAAA;AxCk2FD;AwCh2FC;;;;EAEC,kBAAA;AxCo2FF;AwCj2FC;EACC,gIAAA;AxCo2FF;AwCj2FC;EAEC,aAAA;EACA,iBAAA;AxCq2FF;AwCl2FC;EACC,cAAA;EACA,eAAA;AxCq2FF;AwCl2FC;EAKC,cAAA;AxCq2FF;AwCl2FC;EACC,qBAAA;AxCq2FF;AwCn2FE;;;;EAEC,eAAA;AxCu2FH;AwCp2FE;EACC,yBAAA;AxCu2FH;AwCx2FE;EACC,yBAAA;AxCu2FH;AwCp2FE;EACC,0CAAA;AxCu2FH;AwCx2FE;EACC,0CAAA;AxCu2FH;;AwCh2FC;;EAEC,uBAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;EACA,sBAAA;EACA,kBAAA;AxCm2FF;AwCh2FC;EACC,iBAAA;AxCk2FF;AwC/1FC;;EAEC,mBAAA;EACA,iBAAA;AxCi2FF;AwC91FC;EACC,iBAAA;EACA,gBAAA;EACA,mBAAA;EACA,mBAAA;AxCg2FF;;AwC51FA;EACC,gBAAA;EACA,gBAAA;AxC+1FD;AwC71FC;EACC,WAAA;EACA,sBAAA;AxC+1FF;AwC71FE;EACC,kBAAA;AxC+1FH;AwC31FC;EACC,YAAA;AxC61FF;;AyC37FC;EACC,kBAAA;EACA,mBAAA;AzC87FF;;A0Cl8FA;EACC,gIAAA;A1Cq8FD;;A2Cp8FC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;A3Cu8FF;;A2Cn8FA;EACC,gBAAA;EACA,WAAA;EACA,sBAAA;A3Cs8FD;;A4Cj9FC;EAEC,eAAA;A5Co9FF;;A4Ct9FC;EAEC,eAAA;A5Co9FF;A4Cj9FC;EAEC,mBAAA;A5Cm9FF;A4Cr9FC;EAEC,mBAAA;A5Cm9FF;A4Ch9FC;EAKC,kBAAA;A5Ck9FF;A4Cv9FC;EAKC,kBAAA;A5Ck9FF;A4Cv9FC;EAKC,kBAAA;A5Ck9FF;A4Cv9FC;EAKC,kBAAA;A5Ck9FF;A4Cv9FC;EAKC,kBAAA;A5Ck9FF;A4C/8FC;EAEC,iBAAA;EACA,gBAAA;A5Ci9FF;A4Cp9FC;EAEC,iBAAA;EACA,gBAAA;A5Ci9FF;A4C98FC;EAIC,iBAAA;EACA,gBAAA;A5Cg9FF;AGhwFA;EyCrNC;EAIC;E5Ci9FF;AA9rFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cg9FF;AGhwFA;EyCrNC;EAIC;E5Ci9FF;AA9rFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cg9FF;AGhwFA;EyCrNC;EAIC;E5Ci9FF;AA9rFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cg9FF;AGhwFA;EyCrNC;EAIC;E5Ci9FF;AA9rFA;A4C/QC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C68FF;AGtwFA;EyC7MC;EAEC;E5Ci9FF;AApsFA;A4C/QC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C68FF;AGtwFA;EyC7MC;EAEC;E5Ci9FF;AApsFA;A4CtQC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C08FF;AG5wFA;EyCpMC;EAEC;E5C88FF;AA1sFA;A4CtQC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C08FF;AG5wFA;EyCpMC;EAEC;E5C88FF;AA1sFA;;A6ClTA,qBAAA;AAEA;;EAAA;AAQA;;EAAA;AAGA;EAEC,aAAA;EACA,gBAAA;EAEA,aAAA;A7Cu/FD;;A6Cl/FA;EACC,6BAAA;A7Cq/FD;;AKn/FE;EwCHF;EACC;E7Cq/FD;AA34EA;;AKpkBE;EwCvCF;EACC;E7Cq/FD;AAr4EA;;AK9mBE;EwCID;IAEC,aAAA;IACA,WAAA;IAEA,aAAA;IACA,kBAAA;IACA,mBAAA;E7Ci/FA;E6C9+FD;IACC,qEAAA;E7Cg/FA;EK//FA;IwCcD;IACC;I7Cg/FA;EAv5EF;EKpkBE;IwCtBD;IACC;I7Cg/FA;EAj5EF;AAk5EA;A6C7+FA;;EAAA;AAGA;EACC,WAAA;EACA,cAAA;EACA,WAAA;EACA,kBAAA;EACA,iBAAA;EACA,kBAAA;A7C++FD;;A6C5+FA;;EAAA;AAGA;EAEC,aAAA;EACA,mBAAA;A7C8+FD;;A6Cz+FA;EACC,6BAAA;A7C4+FD;;AKvhGE;EwC0CF;EACC;E7C4+FD;AA/6EA;;AKpkBE;EwCMF;EACC;E7C4+FD;AAz6EA;;AK9mBE;EwCiDD;IAEC,aAAA;IACA,YAAA;IAEA,aAAA;IACA,iBAAA;E7Cw+FA;E6Cr+FD;IACC,qEAAA;E7Cu+FA;EKliGA;IwC0DD;IACC;I7Cu+FA;EA17EF;EKpkBE;IwCsBD;IACC;I7Cu+FA;EAp7EF;AAq7EA;A6Cn+FA;;EAEC,aAAA;A7Cq+FD;;A6Cl+FA;;EAAA;;AAYA;;EAAA;AAGA;EACC,WAAA;A7Cg+FD;;A6Ct9FA;EACC,2BAAA;A7Cy9FD;;A6Ct9FA;EACC,yBAAA;A7Cy9FD;;A6Cr9FA;EACC,4BAAA;A7Cw9FD;;A6Cp9FA;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,yBAAA;EACA,kBAAA;EACA,WAAA;EACA,uBAAA;EACA,eAAA;A7Cu9FD;;AGt3FA;E0CzGA;EAQC;E7Cu9FD;AApzFA;;A6ChKA;EACC,WAAA;EACA,cAAA;EACA,WAAA;EACA,iBAAA;A7Cu9FD;;A6Cp9FA;EACC,aAAA;A7Cu9FD;AKvlGE;EwC+HF;IAIE,cAAA;E7Cw9FA;AACF;;AEjhGA,4LAAA;A4CpGA;EAEC,aAAA;EACA,uBAAA;EACA,eAAA;EACA,aAAA;A9CwnGD;A8CtnGC;EACC,mBAAA;A9CwnGF;AKvmGE;EyCzBF;IAYE,iBAAA;E9CwnGA;AACF;AKxkGE;EyC7DF;IAgBE,iBAAA;E9CynGA;AACF;;A8CrnGA;EACC,cAAA;EACA,mBAAA;A9CwnGD;A8CtnGC;EACC,eAAA;EACA,WAAA;EACA,kBAAA;A9CwnGF;AK3nGE;EyCJF;IAWE,qBAAA;IACA,eAAA;E9CwnGA;AACF;;A8CpnGA;EAEC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,sBAAA;EACA,yBAAA;EACA,gBAAA;EACA,kBAAA;A9CsnGD;A8CpnGC;EACC,mBAAA;EACA,mBAAA;A9CsnGF;A8CpnGE;EAGC,mBAAA;A9ConGH;A8CjnGE;EAEC,cAAA;A9CknGH;A8CpnGE;EAEC,cAAA;A9CknGH;AKrpGE;EyCaF;IA4BE,iBAAA;E9CgnGA;AACF;;A8C5mGA;EACC,mBAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;A9C+mGD;;A8C5mGA;EACC,8BAAA;A9C+mGD;;A8C3mGA;EAEC,cAAA;A9C6mGD;A8C3mGC;EACC,WAAA;EACA,oBAAA;EACA,wBAAA;EACA,kBAAA;A9C6mGF;A8C1mGC;EACC,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;EACA,YAAA;EACA,qBAAA;EACA,WAAA;A9C4mGF;AKxrGE;EyCiFA;IACC,gBAAA;IACA,iBAAA;IACA,YAAA;IACA,WAAA;E9C0mGD;AACF;;AKtsGE;EyC0GG;IACC,kBAAA;IACA,iBAAA;IACA,aAAA;IACA,QAAA;E9CgmGJ;E8C9lGI;IACC,aAAA;E9CgmGL;E8C7lGI;IACC,4BAAA;E9C+lGL;E8CzlGC;IACC,uBAAA;E9C2lGF;E8CzlGE;IACC,8BAAA;E9C2lGH;E8CzlGG;IACC,6BAAA;E9C2lGJ;E8CvlGE;IACC,eAAA;E9CylGH;E8CplGG;IACC,aAAA;E9CslGJ;E8CnlGG;IACC,kBAAA;IACA,MAAA;E9CqlGJ;E8CllGG;IACC,kBAAA;IACA,cAAA;IACA,iBAAA;E9ColGJ;E8CllGI;IAGC,kBAAA;IACA,mBAAA;IACA,mBAAA;E9CklGL;E8CvkGE;IACC,eAAA;IACA,6BAAA;E9CykGH;E8CpkGA;IACC,uBAAA;E9CskGD;AACF;A+C5wGA;EACC,cAAA;EACA,oBAAA;A/C8wGD;A+C1wGC;EACC,iBAAA;A/C4wGF;AKhwGE;E0CPA;IACC,gBAAA;E/C0wGD;AACF;;A+CrwGA;EACC,iBAAA;EACA,cAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,6BAAA;A/CwwGD;A+CtwGC;EACC,yBAAA;EACA,iBAAA;A/CwwGF;A+CrwGC;EAEC,gBAAA;A/CuwGF;A+CzwGC;EAEC,gBAAA;A/CuwGF;AK5uGE;E0C1CF;IAmBE,aAAA;IACA,mBAAA;E/CuwGA;E+CrwGA;IACC,kBAAA;E/CuwGD;E+CpwGA;;IAEC,mBAAA;IACA,iBAAA;E/CswGD;E+CnwGA;IACC,iBAAA;E/CqwGD;AACF;A+ClwGC;EACC,cAAA;A/CowGF;A+ClwGE;EAGC,cAAA;A/CkwGH;A+CrwGE;EAGC,cAAA;A/CkwGH;A+CrwGE;EAGC,cAAA;A/CkwGH;A+C/vGE;EACC,cAAA;A/CiwGH;A+C9vGE;EACC,cAAA;A/CgwGH;A+C9vGG;EACC,cAAA;A/CgwGJ;A+C5vGG;EACC,WAAA;A/C8vGJ;;AgD70GA;EACC,gCAAA;EACA,oBAAA;EACA,mBAAA;AhDg1GD;;AgD70GA;EACC,mBAAA;EACA,iBAAA;EACA,gBAAA;AhDg1GD;;AgD70GA;EACC,mBAAA;EACA,oBAAA;EACA,gBAAA;AhDg1GD;;AiD31GA;EACC,mBAAA;AjD81GD;;AiD11GA;EACC,WAAA;AjD61GD;AiD31GC;EACC,qBAAA;EACA,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;AjD61GF;AiD31GE;EACC,cAAA;AjD61GH;;AkDj3GA;EAEC,cAAA;EACA,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,yBAAA;AlDm3GD;;AGzoGA;E+ChPA;EAGC;ElDs3GD;AAvkGA;AkD1SC;EACC,mBAAA;EACA,6BAAA;AlDm3GF;AkDj3GE;EACC,cAAA;AlDm3GH;AkDh3GE;EACC,cAAA;AlDk3GH;AkD/2GE;EACC,mBAAA;AlDi3GH;;AkD52GA;EACC,eAAA;AlD+2GD;;AG1pGA;E+CtNA;EACC;ElD+2GD;AAxlGA;;AkDpRA;EACC,gBAAA;EACA,gBAAA;AlD+2GD;;AkD52GA;;EAAA;AAIA;EAEC,gIAAA;AlD82GD;;AkDz2GC;EACC,qBAAA;AlD42GF;AkDx2GC;EAEC,yBAAA;EACA,0BAAA;AlDy2GF;AkDh2GA;EAEC,cAAA;EACA,WAAA;EACA,WAAA;EACA,eAAA;EACA,cAAA;AlDi2GD;AkD/1GC;EACC,qBAAA;AlDi2GF;AkD91GC;EACC,mBAAA;AlDg2GF;AkD91GE;EAEC,cAAA;AlD+1GH;AkDj2GE;EAEC,cAAA;AlD+1GH;AkD51GE;EACC,mBAAA;AlD81GH;;AkDx1GA;EACC,gBAAA;EACA,iBAAA;EACA,oBAAA;EACA,gCAAA;AlD21GD;;AkDx1GA;EACC,oCAAA;AlD21GD;;AkDx1GA;EACC,iBAAA;EACA,oBAAA;EACA,iBAAA;EACA,iBAAA;EACA,6BAAA;EACA,oCAAA;EACA,aAAA;EACA,qCAAA;EACA,gBAAA;AlD21GD;AkDz1GC;;EAEC,yBAAA;EACA,iBAAA;AlD21GF;AkDx1GC;EACC,mBAAA;AlD01GF;AkDv1GC;;;;EAIC,cAAA;AlDy1GF;AKn8GE;E6CiFF;IA6BE,cAAA;ElDy1GA;EkDv1GA;IACC,cAAA;ElDy1GD;EkDt1GA;;IAEC,gBAAA;ElDw1GD;AACF;;AkDp1GA;;EAAA;AAIA;EAEC,kBAAA;AlDq1GD;AkD90GC;EACC,cAAA;EACA,WAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;AlDg1GF;;AkD50GA;;EAAA;AAIA;EACC,kBAAA;EACA,eAAA;EACA,6BAAA;AlD80GD;AKj+GE;E6CgJF;EAGC;ElD80GD;AAz3FA;AKpkBE;E6C4GF;EAGC;ElD80GD;AAn3FA;AkDzdC;EACC,gBAAA;AlD80GF;AkDx0GE;EACC,qBAAA;EACA,mBAAA;EACA,kBAAA;AlD00GH;AkDv0GE;EACC,qBAAA;EACA,kBAAA;EACA,8BAAA;AlDy0GH;AK9+GE;E6CkKA;EAGC;ElDy0GH;AAt4FA;AKpkBE;E6C8HA;EAGC;ElDy0GH;AAh4FA;AkDncE;EACC,gIAAA;EACA,iBAAA;EACA,eAAA;AlDq0GH;AkDl0GE;EACC,eAAA;EACA,gBAAA;EACA,mBAAA;AlDo0GH;;AmDlhHA;EACC,eAAA;AnDqhHD;;AGtyGA;EgDhPA;EACC;EnDqhHD;AApuGA;;AmD9SA;EAEC,gBAAA;AnDqhHD;;AmDlhHA;EACC,gBAAA;AnDqhHD;;AmDlhHA;EACC,gCAAA;EACA,oBAAA;AnDqhHD;;AmDxgHG;EACC,iBAAA;AnDmhHJ;AmDzgHE;EACC,gBAAA;AnDmhHH;AmD7gHE;;;;;;EAEC,cAAA;AnDmhHH;AmD3gHG;EACC,kBAAA;AnD+gHJ;;AmDzgHA;EACC,gBAAA;EACA,kBAAA;EACA,gBAAA;AnD4gHD;;AG91GA;EgDjLA;EAEC;EnD6gHD;AA5xGA;;AoDlTA;EACC,iBAAA;EACA,mBAAA;ApDilHD;;AqDnlHA;EACC,gBAAA;ArDslHD;;AsDvlHA;;EAAA;AAKC;EACC,gBAAA;EACA,mBAAA;AtDwlHF;AsDtlHE;EACC,aAAA;AtDwlHH;AsDrlHE;EACC,gBAAA;AtDulHH;AsDjlHE;EACC,kBAAA;EACA,kBAAA;EACA,SAAA;AtDmlHH;AsDhlHE;EACC,qBAAA;EACA,kBAAA;AtDklHH;AsD/kHE;EACC,uBAAA;AtDilHH;;AsD3kHA;;EAAA;AAIA;EAEC,kBAAA;EACA,sBAAA;AtD6kHD;AG14GA;EmDtMA;EAEC;EtD8kHD;AAx0GA;AsDxQA;EAEC,kBAAA;EACA,sBAAA;AtD6kHD;AG14GA;EmDtMA;EAEC;EtD8kHD;AAx0GA;;AsDlQA;EACC,aAAA;EACA,8BAAA;AtD6kHD;AsDzkHE;EACC,gIAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,sBAAA;AtD2kHH;;AsDtkHA,8BAAA;AACA;EACC,iBAAA;AtDykHD;;AsDtkHA;;EAAA;AAGA;EACC,eAAA;EACA,gBAAA;AtDykHD;AsDvkHC;EACC,gBAAA;EACA,mBAAA;AtDykHF;;AsDpkHA;EACC,gBAAA;EACA,eAAA;AtDukHD;AsDrkHC;EACC,gBAAA;EACA,mBAAA;AtDukHF;;AKtoHE;EiDoEF;IAGE,mBAAA;EtDqkHA;AACF;;AsDlkHA;;EAAA;AAKC;EACC,gBAAA;EACA,kBAAA;AtDmkHF;AKrpHE;EiDgFD;IAKE,gBAAA;IACA,gBAAA;EtDokHD;AACF;AsDlkHE;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,aAAA;EACA,qBAAA;EACA,sBAAA;AtDokHH;AsD/jHC;EACC,cAAA;EACA,eAAA;EACA,oBAAA;AtDikHF;AsD/jHE;EACC,iBAAA;AtDikHH;AK3qHE;EiD8EF;IAkCE,qBAAA;EtD+jHA;EsD7jHA;IACC,kBAAA;EtD+jHD;AACF;;AsD3jHA;EACC,mBAAA;EACA,gBAAA;AtD8jHD;;AsD3jHA;EACC,cAAA;AtD8jHD;;AsD3jHA;EACC,aAAA;AtD8jHD;;AsD3jHA;EAEC,gIAAA;AtD8jHD;;AsD1jHA;EACC,kBAAA;EACA,mBAAA;AtD6jHD;AsD3jHC;EACC,gBAAA;EACA,mBAAA;AtD6jHF;AsD1jHC;EACC,SAAA;AtD4jHF;;AsDxjHA;EACC,qBAAA;AtD2jHD;;AsDvjHA;EAEC,gBAAA;EACA,mBAAA;AtD0jHD;;AsDvjHA;EACC,gBAAA;AtD0jHD;;AsDvjHA;EACC,gBAAA;EACA,mBAAA;AtD0jHD;AsDxjHC;EACC,aAAA;AtD0jHF;AsDvjHC;EACC,gBAAA;AtDyjHF;AsDvjHE;EACC,mBAAA;AtDyjHH;;AsDpjHA;EACC,gBAAA;AtDujHD;AsDrjHC;EACC,mBAAA;AtDujHF;;AsDnjHA;EACC,aAAA;EACA,eAAA;AtDsjHD;AsDpjHC;EACC,gBAAA;AtDsjHF;AsDnjHC;EACC,mBAAA;AtDqjHF;AsDljHC;;EAEC,WAAA;AtDojHF;AsDjjHC;;EAEC,aAAA;EACA,YAAA;AtDmjHF;AK9wHE;EiDwND;;IAME,gBAAA;EtDqjHD;AACF;AsDljHC;EAEC,eAAA;EACA,mBAAA;AtDojHF;AsDvjHC;EAEC,eAAA;EACA,mBAAA;AtDojHF;;AsDhjHA;EACC,mBAAA;AtDmjHD;AsDjjHC;EACC,aAAA;AtDmjHF;AsDhjHC;EACC,gBAAA;AtDkjHF;AsD/iHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDijHF;AsD1jHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDijHF;AsD1jHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDijHF;AsD1jHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDijHF;AsD1jHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDijHF;AsD9iHC;EACC,aAAA;AtDgjHF;AK3yHE;EiDgQA;IACC,kBAAA;EtD8iHD;EsD3iHA;IAEC,cAAA;EtD4iHD;AACF;;AuDz0HA;EACC,aAAA;EACA,8BAAA;EACA,kBAAA;EACA,QAAA;EACA,iBAAA;EACA,mBAAA;AvD40HD;AKl0HE;EkDhBF;IASE,aAAA;EvD60HA;AACF;AuD10HC;EACC,aAAA;EACA,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;EACA,6BAAA;EACA,YAAA;EACA,cAAA;AvD40HF;AuD10HE;EACC,aAAA;EACA,mBAAA;AvD40HH;AuD10HG;EACC,gBAAA;AvD40HJ;AuDx0HG;EACC,kBAAA;EACA,SAAA;AvD00HJ;AuDv0HG;EACC,aAAA;AvDy0HJ;AuDj0HI;EACC,aAAA;AvDm0HL;AuDh0HI;EACC,aAAA;AvDk0HL;AuDh0HK;EACC,uDAAA;EACA,wBAAA;AvDk0HN;AuD1zHC;EACC,WAAA;EACA,YAAA;EACA,yBAAA;AvD4zHF;AuD1zHE;EACC,gBAAA;AvD4zHH;;AuDvzHA;EACC,kBAAA;EACA,QAAA;EACA,QAAA;EACA,cAAA;EACA,kBAAA;EACA,iBAAA;EACA,aAAA;EACA,gBAAA;AvD0zHD;AuDvzHC;EACC,eAAA;EACA,kBAAA;EACA,UAAA;EACA,MAAA;EACA,QAAA;EACA,SAAA;EACA,OAAA;EAEA,8BAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EACA,yBAAA;EACA,2BAAA;AvDwzHF;AuDtzHE;EAhBD;IAiBE,iCAAA;EvDyzHD;AACF;AKh5HE;EkDqED;IAqBE,aAAA;IACA,YAAA;IACA,kBAAA;IACA,gBAAA;IACA,6BAAA;EvD0zHD;EuDxzHC;IACC,eAAA;IACA,yCAAA;EvD0zHF;EuDvzHC;IACC,SAAA;EvDyzHF;EGxsHD;IoDlHE;IACC;IvDyzHF;EA3oHF;EuD3KG;IACC,0BAAA;EvDwzHF;EG3sHD;IoD9GE;IACC;IvDwzHF;EA9oHF;EuDvKG;IACC,yBAAA;EvDuzHF;AACF;AKt6HE;EkDoHD;IAGE,WAAA;IACA,eAAA;IACA,UAAA;EvDmzHD;AACF;AuDjzHE;EACC,kBAAA;EACA,mBAAA;EACA,UAAA;EACA,wBAAA;AvDmzHH;AKn7HE;EkDuIC;IACC,sCAAA;EvD+yHF;AACF;AKl7HE;EkDoDF;IAoFE,kBAAA;IACA,iBAAA;EvD8yHA;EuD3yHA;IACC,mBAAA;IACA,UAAA;IACA,kBAAA;IACA,UAAA;IACA,6BAAA;IACA,iBAAA;IACA,eAAA;EvD6yHD;EuDzyHA;IACC,aAAA;EvD2yHD;EuDvyHA;IACC,aAAA;EvDyyHD;EuDryHA;IACC,YAAA;EvDuyHD;EuDryHC;IACC,YAAA;EvDuyHF;AACF;AuDlyHC;EACC,aAAA;EACA,2BAAA;EACA,eAAA;EACA,gBAAA;EACA,SAAA;EACA,eAAA;EACA,eAAA;EACA,kBAAA;AvDoyHF;AK79HE;EkDiLD;IAWE,qBAAA;EvDqyHD;EuDnyHC;IACC,eAAA;EvDqyHF;AACF;AuDlyHE;EACC,cAAA;EACA,kBAAA;EACA,WAAA;AvDoyHH;AKp+HE;EkD6LA;IAME,SAAA;IACA,cAAA;EvDqyHF;EuDnyHE;IACC,eAAA;EvDqyHH;AACF;AuDhyHE;EACC,aAAA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,uBAAA;EACA,mBAAA;EACA,uBAAA;EACA,mBAAA;EACA,YAAA;AvDkyHH;AuDhyHG;EACC,0BAAA;AvDkyHJ;AKjgIE;EkDmNA;IAgBE,aAAA;EvDkyHF;AACF;AuDhyHG;;EAEC,YAAA;EACA,aAAA;EACA,mBAAA;AvDkyHJ;AuDhyHI;;EACC,gBAAA;AvDmyHL;AuD/xHG;EACC,aAAA;AvDiyHJ;AuD3xHI;EACC,aAAA;AvD6xHL;AuD1xHI;EACC,aAAA;AvD4xHL;AuDtxHE;EAEC,kBAAA;AvDuxHH;AuDpxHI;EALF;IAMG,yBAAA;EvDuxHH;AACF;AK3hIE;EkD6PA;IAWE,OAAA;IACA,SAAA;IACA,sBAAA;IACA,kBAAA;IACA,SAAA;IACA,gBAAA;IACA,cAAA;EvDuxHF;EuDrxHE;IAEC,WAAA;IACA,cAAA;IACA,kBAAA;IACA,QAAA;IACA,UAAA;IACA,UAAA;IACA,mBAAA;IACA,iCAAA;IACA,4BAAA;EvDsxHH;EuDhyHE;IAEC,WAAA;IACA,cAAA;IACA,kBAAA;IACA,QAAA;IACA,UAAA;IACA,UAAA;IACA,mBAAA;IACA,iCAAA;IACA,4BAAA;EvDsxHH;EuDnxHE;IACC,SAAA;IACA,iCAAA;EvDqxHH;EuDlxHE;IACC,mBAAA;EvDoxHH;EuDjxHE;IAEC,eAAA;IACA,OAAA;IAEA,eAAA;IACA,WAAA;EvDixHH;EuD/wHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvD8wHJ;EuDrxHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvD8wHJ;EuD1wHE;IAEC,eAAA;IACA,QAAA;IAEA,eAAA;IACA,UAAA;EvD0wHH;EuDxwHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvDuwHJ;EuD9wHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvDuwHJ;AACF;AuDhwHC;EACC,cAAA;AvDkwHF;AKnlIE;EkDoVD;IAGE,mBAAA;IACA,kBAAA;EvDgwHD;EuD7vHC;IACC,aAAA;EvD+vHF;EuD7vHE;IACC,kBAAA;IACA,mBAAA;EvD+vHH;EuD7vHG;IACC,iBAAA;EvD+vHJ;AACF;AuDxvHC;EACC,cAAA;EACA,gIAAA;EACA,mBAAA;EACA,mBAAA;EACA,eAAA;EACA,qBAAA;AvD0vHF;AK3mIE;EkD2WD;IASE,cAAA;IACA,gIAAA;IACA,kBAAA;IACA,mBAAA;EvD2vHD;AACF;AuDzvHE;EACC,aAAA;AvD2vHH;AuDxvHE;EAGC,cAAA;AvDwvHH;AuD3vHE;EAGC,cAAA;AvDwvHH;AuD3vHE;EAGC,cAAA;AvDwvHH;AuDrvHE;EACC,0BAAA;EACA,6BAAA;AvDuvHH;AuDpvHE;EACC,kBAAA;EACA,cAAA;EACA,iBAAA;EACA,8BAAA;AvDsvHH;AuDlvHC;;EAEC,0BAAA;EACA,4BAAA;AvDovHF;AuDlvHE;;EACC,0BAAA;EACA,6BAAA;AvDqvHH;AuDhvHC;EACC,SAAA;EACA,UAAA;EACA,gBAAA;EACA,iBAAA;EACA,yBAAA;AvDkvHF;AuDhvHE;EACC,YAAA;AvDkvHH;AKvpIE;EkD4aC;IACC,UAAA;EvD8uHF;AACF;AKlqIE;EkD2bE;IACC,gBAAA;EvD0uHH;AACF;AuDtuHG;EACC,kBAAA;EACA,cAAA;EACA,mBAAA;EACA,kBAAA;AvDwuHJ;AKvqIE;EkD2bC;IAOE,eAAA;IACA,kBAAA;EvDyuHH;AACF;AuDjuHE;EACC,aAAA;AvDmuHH;AKhrIE;EkDkdC;IACC,qBAAA;IACA,YAAA;EvDiuHF;EuD9tHC;IACC,aAAA;EvDguHF;AACF;AuD3tHC;EACC,cAAA;EACA,WAAA;EACA,eAAA;EACA,oBAAA;EACA,gBAAA;AvD6tHF;AuD3tHE;EACC,qBAAA;AvD6tHH;;AKzsIE;EkDofD;IACC,eAAA;IACA,eAAA;IACA,WAAA;EvDytHA;AACF;AuDrtHA;EAEC;IACC,UAAA;EvDstHA;EuDntHD;IACC,UAAA;EvDqtHA;AACF;AwD5uIA;EACC,gBAAA;EACA,mBAAA;EACA,cAAA;EACA,eAAA;EACA,gIAAA;AxD8uID;;AwD3uIA;EACC,aAAA;EACA,uBAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;AxD8uID;AwD5uIC;EACC,eAAA;EAEA,cAAA;AxD6uIF;AwD3uIE;EACC,kBAAA;EACA,cAAA;AxD6uIH;AwD3uIG;EAGC,cAAA;AxD2uIJ;AwD9uIG;EAGC,cAAA;AxD2uIJ;AwD9uIG;EAGC,cAAA;AxD2uIJ;AwDxuIG;EACC,0BAAA;EACA,6BAAA;EACA,8BAAA;EACA,cAAA;AxD0uIJ;AwDnuIK;EACC,aAAA;AxDquIN;AwD9tIK;EACC,UAAA;AxDguIN;AwD1tIE;EACC,sBAAA;EACA,aAAA;AxD4tIH;AwD1tIG;EACC,qBAAA;AxD4tIJ;AwDztIG;EARD;IASE,+BAAA;ExD4tIF;AACF;AwDxtIC;;EAEC,aAAA;AxD0tIF;;AyDnyIA,6BAAA;AAMC;EAFA,cAAA;AzDwyID;AyDtyIC;EAEC,qBAAA;AzDoyIF;AyDlyIE;EACC,cAAA;EACA,0BAAA;EACA,6BAAA;AzDoyIH;AyDjyIE;EACC,cAAA;AzDmyIH;AyDhyIE;EACC,cAAA;AzDkyIH;AyD5xIE;EACC,eAAA;EACA,gBAAA;AzD8xIH;AyD3xIE;;EAEC,aAAA;EACA,sBAAA;AzD6xIH;AyD1xIE;EACC,kBAAA;AzD4xIH;AK7xIE;EoDbD;IAkBE,aAAA;IACA,uBAAA;IACA,eAAA;EzD4xID;EyD1xIC;IAEC,cAAA;IACA,sBAAA;IACA,mBAAA;IACA,2BAAA;EzD4xIF;EyDzxIC;IACC,iBAAA;EzD2xIF;AACF;AyDvxIC;EACC,qBAAA;EACA,kBAAA;EACA,sBAAA;EACA,kBAAA;AzDyxIF;AyDtxIC;EAEC,SAAA;EACA,iBAAA;AzDwxIF;AyDrxIC;EAEC,SAAA;EACA,gBAAA;AzDuxIF;;AyDlxIA;EAEC,iBAAA;AzDoxID;AK1yIE;EoDoBF;IAKE,iBAAA;EzDqxIA;AACF;AyDjxIC;EACC,gBAAA;EACA,cAAA;AzDmxIF;AyDhxIC;EACC,qBAAA;EACA,gIAAA;EACA,iBAAA;EACA,gBAAA;EACA,gBAAA;AzDkxIF;AK1zIE;EoDmCD;IAOE,kBAAA;EzDoxID;AACF;AKn2IE;EoDkFD;IAEE,8BAAA;EzDmxID;AACF;AyDhxIC;EAEC,gBAAA;EACA,mBAAA;AzDkxIF;AyDhxIE;;EACC,aAAA;AzDmxIH;AyDhxIE;;EACC,gBAAA;AzDmxIH;;AyD7wIA;EAGC,6BAAA;EACA,iBAAA;EACA,iBAAA;AzD+wID;AKx1IE;EoDoEF;IAQE,iBAAA;EzDixIA;AACF;AyD5wIC;EACC,iBAAA;AzD+wIF;AyD7wIE;EACC,cAAA;AzDgxIH;AyDjxIE;EACC,cAAA;AzDgxIH;AyD3wIG;EAGC,cAAA;AzDgxIJ;AyDnxIG;EAGC,cAAA;AzDgxIJ;AyDnxIG;EAGC,cAAA;AzDgxIJ;AyDnxIG;EAGC,cAAA;AzDgxIJ;AyDnxIG;EAGC,cAAA;AzDgxIJ;AyDnxIG;EAGC,cAAA;AzDgxIJ;AyD1wIG;EAGC,WAAA;AzD+wIJ;AyDlxIG;EAGC,WAAA;AzD+wIJ;AyDlxIG;EAGC,WAAA;AzD+wIJ;AyDlxIG;EAGC,WAAA;AzD+wIJ;AyDlxIG;EAGC,WAAA;AzD+wIJ;AyDlxIG;EAGC,WAAA;AzD+wIJ;AyD1wIC;EACC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,kBAAA;AzD6wIF;AyDpxIC;EACC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,kBAAA;AzD6wIF;AyD3wIE;;EACC,0BAAA;AzD8wIH;AyD3wIE;;EACC,6BAAA;AzD8wIH;AyD3wIE;;EACC,cAAA;AzD8wIH;AyD3wIE;;EACC,eAAA;AzD8wIH;AyD3wIE;;EACC,iBAAA;AzD8wIH;AyD3wIE;;EACC,kBAAA;AzD8wIH;AK95IE;EoDsJA;;IACC,aAAA;IACA,eAAA;EzD4wID;EyDzwIA;;IACC,aAAA;EzD4wID;EyD1wIC;;;IAEC,qBAAA;IACA,cAAA;EzD6wIF;AACF;AKn9IE;EoD4MA;;IACC,aAAA;EzD2wID;AACF;;AyDtwIA;EACC,iBAAA;EACA,iBAAA;AzDywID;AKp7IE;EoDyKF;IAKE,4BAAA;EzD0wIA;AACF;AyDxwIC;EACC,kBAAA;AzD0wIF;;A0D1/IA;EAEC,iBAAA;EACA,oBAAA;EACA,cAAA;EACA,mBAAA;EACA,gIAAA;A1D4/ID;AKh9IE;EqDlDF;IASE,aAAA;IACA,qCAAA;IACA,gBAAA;E1D6/IA;AACF;AK/7IE;EqD1EF;IAeE,qCAAA;E1D8/IA;AACF;AK1/IE;EqDpBF;IAmBE,gBAAA;E1D+/IA;AACF;A0D3/IE;EACC,gBAAA;EACA,yBAAA;A1D6/IH;A0D1/IE;EACC,gBAAA;A1D4/IH;A0Dx/IC;EACC,WAAA;EACA,cAAA;EACA,WAAA;A1D0/IF;;A0Dp/IC;EAMC,gBAAA;EACA,gBAAA;A1Du/IF;A0Dp/IC;EACC,kBAAA;A1Ds/IF;A0Dn/IC;EACC,mBAAA;A1Dq/IF;A0Dt+IC;EACC,eAAA;A1Di/IF;A0D9+IC;EACC,qBAAA;EACA,UAAA;A1Dg/IF;A0D9+IE;EACC,gBAAA;A1Dg/IH;A0D7+IE;EAEC,iBAAA;A1D8+IH;A0D3+IE;EACC,aAAA;A1D6+IH;A0Dz+IC;EACC,cAAA;EACA,0BAAA;EACA,4BAAA;EACA,mCAAA;A1D2+IF;A0Dz+IE;EAGC,cAAA;A1Dy+IH;A0D5+IE;EAGC,cAAA;A1Dy+IH;A0D5+IE;EAGC,cAAA;A1Dy+IH;A0Dt+IE;EACC,cAAA;EACA,6BAAA;A1Dw+IH;;A0Dl+IA;EACC,aAAA;EACA,eAAA;EACA,YAAA;EACA,6BAAA;A1Dq+ID;;AKlkJE;EqDyFF;EAIC;E1Dq+ID;AA19HA;;AKpkBE;EqDqDF;EAIC;E1Dq+ID;AAp9HA;A0D/gBC;EACC,WAAA;EACA,gBAAA;EACA,gBAAA;A1Dq+IF;A0Dl+IC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;A1Do+IF;A0Dj+IC;EACC,gBAAA;EACA,iBAAA;A1Dm+IF;;A0D79IC;EACC,kBAAA;EACA,wBAAA;EACA,mBAAA;A1Dg+IF;A0D79IC;EACC,cAAA;EACA,mBAAA;A1D+9IF;;A0D39IA;EACC,aAAA;A1D89ID;;AErgJA,0FAAA;AyDpHA;EACC,SAAA;EACA,8BAAA;EACA,6BAAA;EACA,qBAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;EACA,UAAA;EACA,6BAAA;EACA,UAAA;EACA,4BAAA;EACA,kBAAA;A3D6nJD;;A2D1nJA;EACC,yBAAA;EACA,kBAAA;EACA,0CAAA;EACA,qBAAA;EACA,uBAAA;EACA,eAAA;EACA,cAAA;EACA,cAAA;EACA,mBAAA;EACA,gBAAA;EACA,YAAA;EACA,SAAA;EACA,mBAAA;EACA,uBAAA;EACA,qBAAA;EACA,QAAA;EACA,WAAA;EACA,eAAA;A3D6nJD;;A2D1nJA,qDAAA;AACA;EACC,UAAA;A3D6nJD;;A4DjqJA;EAMC,WAAA;A5D+pJD;A4DnqJC;EAEC,WAAA;A5DqqJF;;A4DhqJA;EAMC,cAAA;A5D8pJD;A4DlqJC;EAEC,cAAA;A5DoqJF;;A4D/pJA;EAMC,cAAA;A5D6pJD;A4DjqJC;EAEC,cAAA;A5DmqJF;;A4D9pJA;EAMC,cAAA;A5D4pJD;A4DhqJC;EAEC,cAAA;A5DkqJF;;A4D7pJA;EAMC,cAAA;A5D2pJD;A4D/pJC;EAEC,cAAA;A5DiqJF;;A4D5pJA;EAMC,cAAA;A5D0pJD;A4D9pJC;EAEC,cAAA;A5DgqJF;;A4D3pJA;EAMC,cAAA;A5DypJD;A4D7pJC;EAEC,cAAA;A5D+pJF;;A4D1pJA;EAMC,cAAA;A5DwpJD;A4D5pJC;EAEC,cAAA;A5D8pJF;;A4DzpJA;EAMC,cAAA;A5DupJD;A4D3pJC;EAEC,cAAA;A5D6pJF;;A4DxpJA;EAMC,WAAA;A5DspJD;A4D1pJC;EAEC,WAAA;A5D4pJF;;A4DppJC;;;;;;;;EAQC,mBAAA;A5DupJF;;A4DnpJA;EAMC,sBAAA;A5DipJD;A4DrpJC;EAEC,sBAAA;A5DupJF;;A4DlpJA;EAMC,yBAAA;A5DgpJD;A4DppJC;EAEC,yBAAA;A5DspJF;;A4DjpJA;EAMC,yBAAA;A5D+oJD;A4DnpJC;EAEC,yBAAA;A5DqpJF;;A4DhpJA;EAMC,yBAAA;A5D8oJD;A4DlpJC;EAEC,yBAAA;A5DopJF;;A4D/oJA;EAMC,yBAAA;A5D6oJD;A4DjpJC;EAEC,yBAAA;A5DmpJF;;A4D9oJA;EAMC,yBAAA;A5D4oJD;A4DhpJC;EAEC,yBAAA;A5DkpJF;;A4D7oJA;EAMC,yBAAA;A5D2oJD;A4D/oJC;EAEC,yBAAA;A5DipJF;;A4D5oJA;EAMC,yBAAA;A5D0oJD;A4D9oJC;EAEC,yBAAA;A5DgpJF;;A4D3oJA;EAMC,yBAAA;A5DyoJD;A4D7oJC;EAEC,yBAAA;A5D+oJF;;A4D1oJA;EAMC,yBAAA;A5DwoJD;A4D5oJC;EAEC,yBAAA;A5D8oJF;;A4DzoJA;EAMC,sBAAA;A5DuoJD;A4D3oJC;EAEC,sBAAA;A5D6oJF;;A4DtoJC;EAGG,WAAA;A5DuoJJ;;A4D1oJC;EAGG,WAAA;A5DuoJJ;;A4D1oJC;EAGG,WAAA;A5DuoJJ;A4DpoJE;EAMC;A5DkoJH;A4DxoJE;EAMC;A5DkoJH;A4DxoJE;EAMC;A5DkoJH;A4D9nJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4DpoJC;EAOG,cAAA;A5D6nJJ;A4D1nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;A4D9nJE;EAMC;A5DwnJH;;A4DlnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A4DrnJA;EACC,qDAAA;A5DwnJD;;A6Dx4JA;EAGC,gBAAA;A7D24JD;;A6Dx4JA;;;;;;;;;;;EAWC,eAAA;A7D24JD;;A8D75JC;EACC,WAAA;A9Dg6JF;A8D95JE;;;;;;;;;;;EAWC,WAAA;A9Dg6JH;A8D75JE;;;;EAIC,UAAA;A9D+5JH;A8D55JE;EACC,gBAAA;A9D85JH;AKr6JE;EyDaE;;IAEC,sBAAA;E9D25JH;AACF;A8Dv5JE;EACC,cAAA;A9Dy5JH;A8Dr5JC;EACC,cAAA;A9Du5JF;A8Dp5JC;EACC,eAAA;A9Ds5JF","file":"ie.css"}
\ No newline at end of file
+{"version":3,"sources":["../../style.css","../../assets/sass/01-settings/file-header.scss","../../assets/sass/style.scss","../../assets/sass/01-settings/global.scss","../../assets/sass/03-generic/normalize.scss","../../assets/sass/03-generic/breakpoints.scss","../../assets/sass/03-generic/vertical-margins.scss","../../assets/sass/03-generic/reset.scss","../../assets/sass/03-generic/clearings.scss","../../assets/sass/04-elements/blockquote.scss","../../assets/sass/04-elements/forms.scss","../../assets/sass/04-elements/media.scss","../../assets/sass/04-elements/misc.scss","../../assets/sass/04-elements/links.scss","../../assets/sass/05-blocks/audio/_style.scss","../../assets/sass/05-blocks/button/_style.scss","../../assets/sass/02-tools/mixins.scss","../../assets/sass/05-blocks/code/_style.scss","../../assets/sass/05-blocks/columns/_style.scss","../../assets/sass/05-blocks/cover/_style.scss","../../assets/sass/05-blocks/file/_style.scss","../../assets/sass/05-blocks/gallery/_style.scss","../../assets/sass/05-blocks/group/_style.scss","../../assets/sass/05-blocks/heading/_style.scss","../../assets/sass/05-blocks/image/_style.scss","../../assets/sass/05-blocks/latest-comments/_style.scss","../../assets/sass/05-blocks/latest-posts/_style.scss","../../assets/sass/05-blocks/legacy/_style.scss","../../assets/sass/05-blocks/list/_style.scss","../../assets/sass/05-blocks/media-text/_style.scss","../../assets/sass/05-blocks/navigation/_style.scss","../../assets/sass/05-blocks/paragraph/_style.scss","../../assets/sass/05-blocks/preformatted/_style.scss","../../assets/sass/05-blocks/pullquote/_style.scss","../../assets/sass/05-blocks/query-loop/_style.scss","../../assets/sass/05-blocks/quote/_style.scss","../../assets/sass/05-blocks/rss/_style.scss","../../assets/sass/05-blocks/search/_style.scss","../../assets/sass/05-blocks/separator/_style.scss","../../assets/sass/05-blocks/social-icons/_style.scss","../../assets/sass/05-blocks/table/_style.scss","../../assets/sass/05-blocks/tag-clould/_style.scss","../../assets/sass/05-blocks/verse/_style.scss","../../assets/sass/05-blocks/video/_style.scss","../../assets/sass/05-blocks/utilities/_font-sizes.scss","../../assets/sass/05-blocks/utilities/_style.scss","../../assets/sass/06-components/header.scss","../../assets/sass/06-components/footer.scss","../../assets/sass/06-components/single.scss","../../assets/sass/06-components/posts-and-pages.scss","../../assets/sass/06-components/entry.scss","../../assets/sass/06-components/archives.scss","../../assets/sass/06-components/404.scss","../../assets/sass/06-components/search.scss","../../assets/sass/06-components/comments.scss","../../assets/sass/06-components/navigation.scss","../../assets/sass/06-components/footer-navigation.scss","../../assets/sass/06-components/pagination.scss","../../assets/sass/06-components/widgets.scss","../../assets/sass/07-utilities/a11y.scss","../../assets/sass/07-utilities/color-palette.scss","../../assets/sass/07-utilities/measure.scss","../../assets/sass/07-utilities/ie.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACAhB;;;;;;;;;;;;;;;;;CAAA;ACEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAA;AA4EA,wCAAA;AC9EA,cAAA;AAKA;EAEC,gBAAA;EAIA,cAAA;EAYA,gBAAA;EAKA,aAAA;EA4BA,wBAAA;EASA,WAAA,EAeA,oDAAA,EACA,aAAA,EAEA,kCAAA,EACA,kCAAA;EAEA,YAAA;EAMA,cAAA;EAGA,UAAA;EAYA,gBAAA;EAKA,YAAA;EAmBA,UAAA;EAUA,WAAA;EAkBA,oBAAA;EAkBA,eAAA;EAQA,WAAA;EAOA,sBAAA;EAyBA,iBAAA;EAKA,YAAA;EAMA,qBAAA;AH2DD;AI/RA,2EAAA;AAEA;+EAAA;AAGA;;;EAAA;AAKA;EACC,iBAAA,EAAA,MAAA;EACA,8BAAA,EAAA,MAAA;AJiTD;;AI9SA;+EAAA;AAGA;;EAAA;AAIA;EACC,SAAA;AJ+SD;;AI5SA;;EAAA;AAIA;EACC,cAAA;AJ8SD;;AI3SA;;;EAAA;AAKA;EACC,cAAA;EACA,gBAAA;AJ6SD;;AI1SA;+EAAA;AAGA;;;EAAA;AAKA;EACC,uBAAA,EAAA,MAAA;EACA,SAAA,EAAA,MAAA;EACA,iBAAA,EAAA,MAAA;AJ2SD;;AIxSA;;;EAAA;AAKA;EACC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;AJ0SD;;AIvSA;+EAAA;AAGA;;EAAA;AAIA;EACC,6BAAA;EACA,8BAAA;AJwSD;;AIrSA;;;EAAA;AAKA;EACC,mBAAA,EAAA,MAAA;EACA,0BAAA,EAAA,MAAA;EACA,6BAAA,EAAA,MAAA;AJuSD;;AIpSA;;EAAA;AAIA;;EAEC,mBAAA;AJsSD;;AInSA;;;EAAA;AAKA;;;EAGC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;AJqSD;;AIlSA;;EAAA;AAIA;EACC,cAAA;AJoSD;;AIjSA;;;EAAA;AAKA;;EAEC,cAAA;EACA,cAAA;EACA,kBAAA;EACA,wBAAA;AJmSD;;AIhSA;EACC,eAAA;AJmSD;;AIhSA;EACC,WAAA;AJmSD;;AIhSA;+EAAA;AAGA;;EAAA;AAIA;EACC,kBAAA;AJiSD;;AI9RA;+EAAA;AAGA;;;EAAA;AAKA;;;;;EAKC,oBAAA,EAAA,MAAA;EACA,eAAA,EAAA,MAAA;EACA,iBAAA,EAAA,MAAA;EACA,SAAA,EAAA,MAAA;AJ+RD;;AI5RA;;;EAAA;AAKA;QACQ,MAAA;EACP,iBAAA;AJ8RD;;AI3RA;;;EAAA;AAKA;SACS,MAAA;EACR,oBAAA;AJ6RD;;AI1RA;;EAAA;AAIA;;;;EAIC,0BAAA;AJ4RD;;AIzRA;;EAAA;AAIA;;;;EAIC,kBAAA;EACA,UAAA;AJ2RD;;AIxRA;;EAAA;AAIA;;;;EAIC,8BAAA;AJ0RD;;AIvRA;;EAAA;AAIA;EACC,8BAAA;AJyRD;;AItRA;;;;;EAAA;AAOA;EACC,sBAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;EACA,cAAA,EAAA,MAAA;EACA,eAAA,EAAA,MAAA;EACA,UAAA,EAAA,MAAA;EACA,mBAAA,EAAA,MAAA;AJwRD;;AIrRA;;EAAA;AAIA;EACC,wBAAA;AJuRD;;AIpRA;;EAAA;AAIA;EACC,cAAA;AJsRD;;AInRA;;;EAAA;AAKA;;EAEC,sBAAA,EAAA,MAAA;EACA,UAAA,EAAA,MAAA;AJqRD;;AIlRA;;EAAA;AAIA;;EAEC,YAAA;AJoRD;;AIjRA;;;EAAA;AAKA;EACC,6BAAA,EAAA,MAAA;EACA,oBAAA,EAAA,MAAA;AJmRD;;AIhRA;;EAAA;AAIA;EACC,wBAAA;AJkRD;;AI/QA;;;EAAA;AAKA;EACC,0BAAA,EAAA,MAAA;EACA,aAAA,EAAA,MAAA;AJiRD;;AI9QA;+EAAA;AAGA;;EAAA;AAIA;EACC,cAAA;AJ+QD;;AI5QA;;EAAA;AAIA;EACC,kBAAA;AJ8QD;;AI3QA;+EAAA;AAGA;;EAAA;AAIA;EACC,aAAA;AJ4QD;;AIzQA;;EAAA;AAIA;EACC,aAAA;AJ2QD;;AKvmBA;;EAAA;AAIA;;EAAA;AA4EA;;EAAA;AA8BA;;EAAA;AAGA;EACC,6BAAA;AL+hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;AKvhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL6hBD;AKvnBE;EAuFF;EACC;EL+hBD;AAfA;AKpkBE;EAmDF;EACC;EL+hBD;AATA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;ALgiBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AKjhBA;EACC,6BAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AK9nBE;EA6FF;EACC;ELgiBD;AAtBA;;AKpkBE;EAyDF;EACC;ELgiBD;AAhBA;;AK3gBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKliBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKliBA;EACC,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;AL8hBD;;AKroBE;EA2GD;IACC,eAAA;IACA,WAAA;IACA,iBAAA;IACA,kBAAA;EL8hBA;AACF;AK3hBA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;AK3fA;EACC,iBAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;AL6hBD;AKppBE;EAmHF;EAGC;EL8hBD;AA5CA;AKpkBE;EA+EF;EAGC;EL8hBD;AAtCA;;AK9mBE;EAqJD;IAEC,aAAA;IACA,iEAAA;IAEA,aAAA;IACA,kBAAA;ELigBA;EK5pBA;IAqJD;IAGC;ILogBA;EApDF;EKpkBE;IAiHD;IAGC;ILogBA;EA9CF;AA+CA;AK7pBE;EAyKD;IAEC,aAAA;IACA,iBAAA;IAEA,aAAA;IACA,kEAAA;ELqfA;EKpqBA;IAyKD;IAMC;ILqfA;EA5DF;EKpkBE;IAqID;IAMC;ILqfA;EAtDF;AAuDA;AM/rBA;;;;;;;EAAA;AASA;;;EAAA;AAIA;EAIC,iBAAA;EACA,oBAAA;EACA,iBAAA;EACA,kBAAA;ANgsBD;;AM7rBA;EACC,iBAAA;EACA,oBAAA;ANgsBD;AK/rBE;ECHF;IAKE,oBAAA;ENisBA;AACF;;AM9rBA;;;EAAA;AAIA;EACC,gBAAA;EACA,mBAAA;ANisBD;AM/rBC;EACC,aAAA;ANisBF;AM9rBC;EACC,gBAAA;ANgsBF;;AM5rBA;;EAAA;AAOA;;EAAA;AAOA;;EAAA;AAQA;;;EAAA;AAIA;EAKC,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;ANkrBD;;AM/qBA;;;EAAA;AAIA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AMzrBA;EAOC,gBAAA;EACA,mBAAA;ANirBD;AKzvBE;ECgEF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;EMnsBF;IAWE,gBAAA;IACA,mBAAA;ENurBA;AACF;AMrrBC;;;;;;EACC,aAAA;AN4rBF;AMzrBC;;;;;;EACC,gBAAA;ANgsBF;;AM5rBA;EAEC,gBAAA;EACA,mBAAA;AN+rBD;;AMlsBA;EAEC,gBAAA;EACA,mBAAA;AN+rBD;AK1xBE;ECwFF;IAME,gBAAA;IACA,mBAAA;ENisBA;EMxsBF;IAME,gBAAA;IACA,mBAAA;ENisBA;AACF;;AM9rBA;;;EAAA;AAKA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AMtsBA;EAKC,gBAAA;EACA,mBAAA;ANgsBD;AM9rBC;;;;;EACC,aAAA;ANosBF;AMjsBC;;;;;EACC,gBAAA;ANusBF;;AMlsBA;;;EAAA;AAIA;EAeC,2DAAA;ANurBD;AMpsBC;EAKC,aAAA;ANksBF;AM/rBC;EAEC,gBAAA;ANgsBF;AM5rBC;EAEC,gBAAA;AN6rBF;AM/rBC;EAEC,gBAAA;AN6rBF;;AOv2BA;;EAAA;AAIA;;;;;;;;;;;;;;;;;;;;;;;;EAwBC,UAAA;EACA,SAAA;EACA,kCAAA;EACA,mCAAA;APy2BD;;AOt2BA;;;;EAAA;AAMA;EAEC,6CAAA;EACA,sBAAA;EAGA,gIAAA;EACA,gBAAA;APq2BD;;AOl2BA;;EAAA;AAKC;EAGC,mBAAA;APi2BF;;AO51BA;EACC,kBAAA;EACA,mBAAA;EACA,cAAA;EACA,gBAAA;EACA,yBAAA;AP+1BD;;AQn6BA;;;;;;;;;;;;EAYC,WAAA;EACA,cAAA;EACA,mBAAA;AR06BD;;AQv6BA;;;;;;EAMC,WAAA;AR06BD;;AEt2BA,yHAAA;AO3FA;EACC,UAAA;EACA,kBAAA;EACA,wBAAA;ATq8BD;ASn8BC;EACC,gBAAA;EACA,mBAAA;ATq8BF;ASn8BE;EACC,aAAA;ATq8BH;ASl8BE;EACC,gBAAA;ATo8BH;ASh8BC;EACC,sBAAA;EACA,gIAAA;EACA,kBAAA;EACA,kBAAA;EACA,gBAAA;EACA,gBAAA;ATk8BF;AS/7BC;EAEC,mBAAA;EAGA,sBAAA;ATi8BF;AS97BC;EAGC,qBAAA;AT87BF;AS57BE;EACC,mBAAA;EACA,kBAAA;EACA,cAAA;AT87BH;AS37BE;EAEC,eAAA;EACA,sBAAA;AT87BH;AS17BC;EACC,mBAAA;AT47BF;ASz7BC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,WAAA;AT27BF;ASx7BC;EAGC,cAAA;EACA,eAAA;EACA,kBAAA;AT07BF;AK5+BE;EIpBF;IA0EE,kBAAA;ET07BA;ESx7BA;IACC,OAAA;ET07BD;AACF;;AUxgCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;;AUhiCA;EAeC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,aAAA;EAEA,aAAA;EACA,eAAA;AV0gCD;AUxgCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AU3hCC;EACC,cAAA;EACA,mBAAA;EACA,2BAAA;AVwhCF;AUrhCC;;;;;;;;;;;;;;;EACC,YAAA;AVqiCF;AUliCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;AUnjCC;EACC,oCAAA;AVkjCF;;AU3iCC;EACC,oBAAA;AV8iCF;AU5iCE;EACC,sBAAA;AV8iCH;;AUziCA;EACC,YAAA;EACA,YAAA;AV4iCD;;AUziCA;;EAGC,aAAA;EACA,cAAA;AV2iCD;;AUxiCA;EACC,yBAAA;EACA,cAAA;EACA,qBAAA;EACA,wBAAA;EACA,gBAAA;EACA,gBAAA;EACA,4BAAA;EACA,gLAAA;EACA,uCAAA;AV2iCD;AUziCC;EACC,mBAAA;EACA,2BAAA;AV2iCF;AUxiCC;EACC,oMAAA;EACA,uCAAA;AV0iCF;;AUtiCA;EACC,WAAA;AVyiCD;;AUtiCA;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;AVyiCD;;AUtiCA;;;;CAAA;AAKA;EAEC;IAEC,wBAAA;IACA,qBAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,yBAAA;IACA,gBAAA;EVwiCA;EUhjCD;IAEC,wBAAA;IACA,qBAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,yBAAA;IACA,gBAAA;EVwiCA;EUtiCA;;IACC,YAAA;EVyiCD;EUtiCA;IACC,oCAAA;EVyiCD;EU1iCA;IACC,oCAAA;EVyiCD;EUniCA;IACC,mBAAA;IACA,2BAAA;EVqiCD;EUliCA;IACC,WAAA;IACA,UAAA;IACA,cAAA;IACA,SAAA;IACA,QAAA;IACA,kBAAA;IACA,UAAA;IACA,YAAA;IACA,yBAAA;IACA,aAAA;IACA,cAAA;IACA,wBAAA;EVoiCD;EUjiCA;IACC,cAAA;EVmiCD;EUjiCC;IACC,UAAA;EVmiCF;EU9hCD;IACC,kBAAA;EVgiCA;EU9hCA;IACC,mBAAA;IACA,2BAAA;EVgiCD;EU7hCA;IACC,WAAA;IACA,UAAA;IACA,cAAA;IACA,SAAA;IACA,QAAA;IACA,kBAAA;IACA,WAAA;IACA,YAAA;IACA,kBAAA;IACA,mBAAA;EV+hCD;EU5hCA;IACC,yBAAA;EV8hCD;EU5hCC;IACC,UAAA;EV8hCF;EU1hCC;IACC,mBAAA;IACA,2BAAA;EV4hCF;AACF;AUvhCA;EAEC,qBAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;AVyhCD;AU9hCA;EAEC,qBAAA;EACA,kBAAA;EACA,eAAA;EACA,mBAAA;AVyhCD;;AUthCA;;CAAA;AAGA;EAEC;IACC,wBAAA,EAAA,uDAAA;IACA,WAAA,EAAA,4CAAA;IACA,WAAA;IACA,mBAAA;IACA,kBAAA;IACA,oBAAA;EVwhCA;EUthCA;IACC,YAAA;EVwhCD;EUphCD;IACC,wBAAA;IACA,yBAAA;IACA,YAAA;IACA,WAAA;IACA,kBAAA;IACA,mBAAA;IACA,eAAA;EVshCA;EUnhCD;IACC,yBAAA;IACA,YAAA;IACA,WAAA;IACA,kBAAA;IACA,mBAAA;IACA,eAAA;IACA,sBAAA;EVqhCA;AACF;AUlhCA;EACC,WAAA;EACA,WAAA;EACA,kBAAA;EACA,oBAAA;EACA,qBAAA;EACA,uBAAA;EACA,kBAAA;EACA,eAAA;AVohCD;;AUjhCA;EACC,mBAAA;EACA,kBAAA;AVohCD;;AUjhCA;EACC,mBAAA;EACA,kBAAA;AVohCD;;AUjhCA;EACC,yBAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;EACA,mBAAA;EACA,eAAA;AVohCD;;AUjhCA;EACC,aAAA;EACA,qBAAA;EACA,aAAA;AVohCD;AUlhCC;EACC,iBAAA;AVohCF;AU/gCE;EACC,sBAAA;AVihCH;AU9gCE;EACC,mBAAA;AVghCH;AU7gCE;EAEC,gBAAA;AV8gCH;AU3gCE;EAEC,mBAAA;EACA,eAAA;EACA,mBAAA;AV4gCH;AUhhCE;EAEC,mBAAA;EACA,eAAA;EACA,mBAAA;AV4gCH;;AUvgCA;EACC,UAAA;AV0gCD;;AUvgCA;EACC,iBAAA;AV0gCD;;AUvgCA;EACC,aAAA;EACA,eAAA;AV0gCD;AUxgCC;EACC,WAAA;EACA,gBAAA;AV0gCF;AUvgCC;EACC,YAAA;EACA,gBAAA;EACA,kBAAA;AVygCF;AUtgCC;EACC,gBAAA;AVwgCF;AKryCE;EK4RD;IAGE,iBAAA;EV0gCD;AACF;;AWh1CA;EACC,YAAA;EAEA,sBAAA;AXm1CD;;AWh1CA,0BAAA;;AAKA,uDAAA;AACA;;;;EAIC,eAAA;AXm1CD;;AWh1CA,mBAAA;AACA;EAIC,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;AXm1CD;AWj1CC;;;;;;;EAEC,gBAAA;AXw1CF;;AWp1CA,cAAA;AACA;;;EAGC,YAAA;EACA,gBAAA;EACA,aAAA;EACA,UAAA;AXu1CD;;AYn4CA,2EAAA;AACA;;EAEC,gBAAA;AZs4CD;;AYn4CA;;;;EAIC,kBAAA;AZs4CD;;AYn4CA;EACC,gBAAA;EACA,gBAAA;AZs4CD;;Aar5CA;;;;EAAA;AAKA;EACC,eAAA;EACA,cAAA;EACA,0BAAA;EACA,6BAAA;Abw5CD;;Aar5CA;EACC,6BAAA;EACA,8BAAA;Abw5CD;;Aar5CA;EAEC,+CAAA;EACA,8BAAA;EAEA,kDAAA;EACA,8BAAA;EACA,oCAAA;Abs5CD;Aan5CC;EACC,gBAAA;EACA,WAAA;EACA,qBAAA;Abq5CF;Aan5CE;EACC,WAAA;Abq5CH;Aah5CC;EACC,8BAAA;EACA,WAAA;Abk5CF;Aah5CE;EACC,WAAA;Abk5CH;Aa94CC;EAEC,+CAAA;EACA,8BAAA;EACA,oBAAA;Ab+4CF;Aa74CE;EACC,cAAA;EACA,yBAAA;Ab+4CH;Aa34CC;EACC,gBAAA;Ab64CF;Aa14CC;EACC,2BAAA;Ab44CF;;Aap4CC;EAEC,cAAA;Abs4CF;;AE92CA,4HAAA;AYhGC;EACC,mBAAA;EACA,0BAAA;Adk9CF;;Aet9CA;;EAAA;AAGA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;Aex+CA;ECmBC,6BAAA;EACA,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,gIAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,qBAAA;AhB68CD;AgBv8CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgBh9CE;EACC,cAAA;AhB+8CH;AgB58CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBr9CG;EACC,cAAA;AhBo9CJ;AgBl9CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgB39CI;EACC,cAAA;AhB09CL;AgBp9CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgB79CE;EACC,yBAAA;AhB49CH;AgBz9CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgBl+CG;EACC,yBAAA;AhBi+CJ;AgB39CC;;;;;;;;;;;;;EAEC,6BAAA;EACA,0BAAA;EACA,cAAA;AhBw+CF;AgBp+CC;;;;;;;EACC,oBAAA;EACA,gCAAA;AhB4+CF;AgBx+CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;AgBn/CC;EACC,0CAAA;EACA,sCAAA;EACA,cAAA;AhBg/CF;;AehjDA;;EAAA;AAWG;EACC,cAAA;Af2iDJ;AexiDI;EACC,cAAA;Af0iDL;AexiDK;EACC,cAAA;Af0iDN;AepiDG;EACC,yBAAA;AfsiDJ;AeniDI;EACC,yBAAA;AfqiDL;Ae/hDE;;EAEC,qCAAA;EACA,wCAAA;EACA,yBAAA;AfiiDH;AevhDG;EAGC,0BAAA;AfuhDJ;AenhDG;EACC,cAAA;AfqhDJ;AelhDI;EACC,cAAA;AfohDL;Ae9gDI;EACC,cAAA;AfghDL;Ae3gDG;EACC,6BAAA;Af6gDJ;AezgDE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;Af0gDH;Ae/gDE;EAGC,oCAAA;EACA,oCAAA;EACA,yBAAA;Af0gDH;AexgDG;EACC,oCAAA;EACA,yBAAA;Af2gDJ;Ae7gDG;EACC,oCAAA;EACA,yBAAA;Af2gDJ;AexgDG;EACC,yBAAA;Af2gDJ;Ae5gDG;EACC,yBAAA;Af2gDJ;AergDC;EACC,gBAAA;AfugDF;;AengDA;EAEC,mBAAA;EACA,2BAAA;AfsgDD;;AezgDA;EAEC,mBAAA;EACA,2BAAA;AfsgDD;;AiB9nDA;EACC,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,oBAAA;EACA,aAAA;AjBioDD;AiB/nDC;EACC,cAAA;EACA,gBAAA;EACA,gBAAA;EACA,cAAA;AjBioDF;;AkB1oDC;EACC,WAAA;AlB6oDF;AkBxoDE;EACC,gBAAA;EACA,mBAAA;AlB0oDH;AK1nDE;EalBA;IAKE,gBAAA;IACA,mBAAA;ElB2oDF;AACF;AkBzoDG;EACC,aAAA;AlB2oDJ;AkBxoDG;EACC,gBAAA;AlB0oDJ;AkBtoDE;EACC,gBAAA;AlBwoDH;AkBpoDC;EACC,mBAAA;AlBsoDF;AK5oDE;EaKD;IAIE,mBAAA;ElBuoDD;AACF;AK7mDE;Ea/BD;IAQE,gBAAA;ElBwoDD;AACF;AkBroDC;EAEC,6BAAA;AlBsoDF;AKjoDE;EaCE;IACC,kBAAA;IACA,gBAAA;IACA,UAAA;ElBmoDH;EkBrnDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkBloDI;IACC,yBAAA;IACA,aAAA;ElBgoDL;EkB3nDG;IAEC,kBAAA;ElB6nDJ;EkB/nDG;IAEC,kBAAA;ElB6nDJ;EkB1nDG;IACC,aAAA;ElB4nDJ;AACF;AkBlnDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;AkB5nDG;EAOC,kBAAA;EACA,mBAAA;AlBonDJ;;AmBxtDA;EAYC,sBAAA;EACA,iBAAA;EACA,mBAAA;EACA,sBAAA;EAkBA,sCAAA;EAUA,8DAAA;EA+DA,iBAAA;EAKA,qHAAA;AnBqnDD;AmBjuDC;;EACC,WAAA;AnBouDF;AmBjuDC;;EACC,aAAA;EACA,gBAAA;AnBouDF;AmB5tDC;EAGC,mBAAA;EACA,gBAAA;EACA,mBAAA;AnBiuDF;AmB/tDE;;;;;;EACC,mBAAA;AnBsuDH;AmBnuDE;EACC,cAAA;AnB0uDH;AmBnuDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmB3uDE;EAGC,WAAA;AnBwuDH;AmBnuDC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,UAAA;AnBsuDF;AGxiDA;EgBpMC;EACC;EnB2uDF;AAt+CA;AmBtQC;EACC,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,kBAAA;EACA,mBAAA;EACA,UAAA;AnBsuDF;AGxiDA;EgBpMC;EACC;EnB2uDF;AAt+CA;AmB9PE;;EACC,gBAAA;AnBuuDH;AmBpuDE;;EACC,kBAAA;AnBuuDH;AmBpuDE;;EACC,iBAAA;AnBuuDH;AmBnuDC;EAEC,wBAAA;AnBquDF;AmBnuDE;EACC,gBAAA;EACA,mBAAA;AnBsuDH;AmBxuDE;EACC,gBAAA;EACA,mBAAA;AnBsuDH;AKnxDE;Ec2CA;IAKE,gBAAA;IACA,mBAAA;EnBwuDF;EmB9uDA;IAKE,gBAAA;IACA,mBAAA;EnBwuDF;AACF;AmBtuDG;;EACC,aAAA;AnByuDJ;AmBtuDG;;EACC,gBAAA;AnByuDJ;AmBpuDC;;;EAEC,aAAA;AnBuuDF;AmBruDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmB9uDE;EACC,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;AnByuDH;AmBruDC;;;EAEC,uBAAA;AnBwuDF;AmBpuDC;EACC,yBAAA;AnBuuDF;AmBnuDC;;EACC,uBAAA;AnBsuDF;;AoBp1DC;;;EAGC,gBAAA;ApBu1DF;AoBp1DC;EACC,qBAAA;ApBs1DF;;AqBh2DA;EAEC,cAAA;ArBk2DD;AqBh2DC;EAIC,uBAAA;ArBg2DF;AqB91DE;EACC,SAAA;EAEA,WAAA;EACA,eAAA;ArBg2DH;AqB91DG;EACC,WAAA;ArBi2DJ;AqB/1DI;EACC,6BAAA;EACA,0BAAA;EACA,qBAAA;ArBk2DL;AqBr2DI;EACC,6BAAA;EACA,0BAAA;EACA,qBAAA;ArBk2DL;AqB71DE;;EACC,mBAAA;ArBg2DH;;AsB53DA;EAIC,cAAA;EACA,WAAA;EAEA,kBAAA;AtB23DD;AsBz3DC;EAEC,WAAA;EACA,cAAA;EACA,WAAA;AtB03DF;AsBt3DC;EACC,iBAAA;EACA,kBAAA;AtBw3DF;AsBt3DE;EACC,gBAAA;EACA,mBAAA;AtBw3DH;AKr3DE;EiBLA;IASE,gBAAA;IACA,mBAAA;EtBq3DF;AACF;AsBn3DG;EACC,aAAA;AtBq3DJ;AsBl3DG;EACC,gBAAA;AtBo3DJ;AsB/2DC;EACC,aAAA;AtBi3DF;AKp4DE;EiBkBD;IAIE,aAAA;EtBk3DD;AACF;AsB92DC;EACC,yBAAA;EACA,aAAA;AtBg3DF;AsBz2DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;AsBh3DE;EAEC,4BAAA;EACA,wBAAA;EACA,kBAAA;AtB42DH;;AuB96DA;EAYC,WAAA;EACA,gIAAA;EACA,mBAAA;AvBi7DD;AuB/6DC;EACC,gBAAA;AvB47DF;;AuBx7DA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGpuDA;EoB3NA;EAEC;EvB67DD;AAlqDA;;AuB7RA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGpuDA;EoB3NA;EAEC;EvB67DD;AAlqDA;;AuBtRA;EAEC,kBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AG3uDA;EoBpNA;EAEC;EvB67DD;AAzqDA;;AuBtRA;EAEC,kBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AG3uDA;EoBpNA;EAEC;EvB67DD;AAzqDA;;AuB/QA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGlvDA;EoB7MA;EAEC;EvB67DD;AAhrDA;;AuB/QA;EAEC,eAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AGlvDA;EoB7MA;EAEC;EvB67DD;AAhrDA;;AuBxQA;EAEC,iBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AuBx7DA;EAEC,mBAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AuBx7DA;EAEC,eAAA;EACA,gBAAA;EACA,sBAAA;EACA,gBAAA;AvB27DD;;AwB1/DA;EACC,kBAAA;AxB6/DD;AwB3/DC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;AxB6/DF;AwB1/DC;EACC,iBAAA;AxB4/DF;AwBz/DC;EACC,kBAAA;AxB2/DF;AwBx/DC;EACC,mBAAA;AxB0/DF;;AwBr/DA;;EAEC,aAAA;EACA,gBAAA;AxBw/DD;AwBr/DC;;EACC,aAAA;AxBw/DF;;AwBn/DA;EAEC,yBAAA;AxBs/DD;;AwBn/DA;EACC,aAAA;AxBs/DD;;AKxgEE;EmByBA;;IAGE,cAAA;ExBk/DF;AACF;AKrhEE;EmB+BA;;IAME,cAAA;IACA,eAAA;ExBq/DF;AACF;;AyBhjEA;EACC,eAAA;AzBmjED;AyBjjEC;EACC,mBAAA;EACA,gBAAA;EAEA,2BAAA;EACA,gBAAA;EACA,mBAAA;AzBkjEF;AyBhjEE;EACC,aAAA;AzBkjEH;AyB/iEE;EACC,gBAAA;AzBijEH;AyB7iEC;EACC,gIAAA;AzB+iEF;AyB5iEC;EACC,cAAA;EACA,mBAAA;AzB8iEF;AyB3iEC;EACC,mBAAA;EACA,gBAAA;EACA,SAAA;AzB6iEF;;A0B7kEA;EACC,eAAA;A1BglED;A0B7kEC;EACC,gBAAA;EACA,mBAAA;A1B+kEF;A0B7kEE;EACC,aAAA;A1B+kEH;A0B5kEE;EACC,gBAAA;A1B8kEH;A0B1kEC;EACC,aAAA;EACA,gBAAA;A1B4kEF;A0BzkEC;EACC,qBAAA;EACA,sBAAA;A1B2kEF;A0BzkEE;EACC,mBAAA;A1B2kEH;A0BzkEG;EACC,gBAAA;A1B2kEJ;A0BtkEE;EAUC,gBAAA;A1B+jEH;A0B3jEC;EACC,gBAAA;EACA,mBAAA;A1B6jEF;A0B3jEE;EACC,aAAA;A1B6jEH;A0B1jEE;EACC,gBAAA;A1B4jEH;A0BvjEC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;A1ByjEF;AG94DA;EuBjLC;EAGC;E1B4jEF;AA50DA;A0B1OC;EACC,mBAAA;EACA,gBAAA;A1BwjEF;A0BpjEC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;A1BsjEF;A0BljEC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;A1BojEF;A0BljEE;EAEC,mBAAA;A1BmjEH;A0B9iEC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;A1BgjEF;A0B5iEC;EACC,kBAAA;EACA,mBAAA;A1B8iEF;A0B5iEE;EAEC,eAAA;EACA,gBAAA;A1B6iEH;A0BxiEC;EACC,6BAAA;EACA,gCAAA;A1B0iEF;A0BxiEE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;A1B0iEH;A0B/iEE;EAEC,oBAAA;EACA,gCAAA;EACA,gBAAA;EACA,mBAAA;A1B0iEH;A0BxiEG;;EACC,iBAAA;EACA,mBAAA;A1B2iEJ;A0BviEE;EAEC,oCAAA;EACA,gCAAA;A1BwiEH;A0BtiEG;EACC,SAAA;EACA,iBAAA;EACA,mBAAA;A1BwiEJ;A0BtiEI;EACC,oBAAA;A1BwiEL;A0BliEG;EAEE;IACC,UAAA;E1BmiEJ;E0BpiEG;IACC,UAAA;E1BsiEJ;E0BviEG;IACC,UAAA;E1ByiEJ;E0B1iEG;IACC,UAAA;E1B4iEJ;E0B7iEG;IACC,UAAA;E1B+iEJ;AACF;A0BviEE;EACC,yBAAA;EACA,kBAAA;A1ByiEH;A0BviEG;EACC,oBAAA;A1ByiEJ;A0BriEE;EACC,gBAAA;EACA,mBAAA;A1BuiEH;;A2BttEA;EACC,qBAAA;EACA,kBAAA;EACA,mBAAA;EACA,WAAA;A3BytED;A2BvtEC;EACC,cAAA;A3BytEF;A2BttEC;EACC,oBAAA;A3BwtEF;A2BrtEC;EACC,cAAA;A3ButEF;A2BptEC;EACC,iBAAA;A3BstEF;A2BntEC;EACC,cAAA;A3BqtEF;A2BltEC;EACC,cAAA;A3BotEF;A2BjtEC;EACC,iBAAA;A3BmtEF;A2BhtEC;EACC,iBAAA;A3BktEF;A2B/sEC;EACC,gBAAA;A3BitEF;A2B9sEC;EACC,iBAAA;A3BgtEF;;A2B5sEA;EACC,cAAA;A3B+sED;;A2B3sEA;EACC,mBAAA;A3B8sED;;A4BnwEA;EAEC,gIAAA;EACA,SAAA;EACA,kBAAA;A5BswED;A4B9vEC;;;EAJC,2BAAA;EACA,UAAA;A5B4wEF;A4BzwEC;;EAEC,iBAAA;A5BuwEF;;A4BlwEA;EACC,qBAAA;A5BqwED;A4BnwEC;EACC,uBAAA;A5BqwEF;;A4BjwEA;EACC,wBAAA;A5BowED;A4BlwEC;EACC,uBAAA;A5BowEF;;A4BhwEA;EACC,gIAAA;EACA,iBAAA;A5BmwED;;A4BhwEA;EACC,SAAA;EACA,kBAAA;A5BmwED;;A6B7yEA;EAqCC;;IAAA;A7B8wED;A6BjzEC;EACC,aAAA;EACA,gBAAA;A7BmzEF;A6BhzEC;EACC,oBAAA;A7BkzEF;A6B/yEC;EACC,aAAA;A7BizEF;AKvxEE;EwB3BD;IAIE,aAAA;E7BkzED;AACF;A6BhzEE;EACC,gBAAA;EACA,mBAAA;A7BkzEH;AK5yEE;EwBRA;IAKE,gBAAA;IACA,mBAAA;E7BmzEF;AACF;A6BjzEG;EACC,aAAA;A7BmzEJ;A6BhzEG;EACC,gBAAA;A7BkzEJ;AKxzEE;EwBeD;IAEE,iBAAA;IACA,oBAAA;E7B2yED;AACF;A6BvyEC;EACC,yBAAA;A7ByyEF;;A8Bx1EE;EACC,gIAAA;EACA,kBAAA;EACA,mBAAA;A9B21EH;A8Bv1EC;EACC,UAAA;A9By1EF;A8Bj1EG;EACC,gBAAA;A9Bm1EJ;A8Bh1EG;EACC,YAAA;EACA,OAAA;EACA,sBAAA;EACA,UAAA;EACA,UAAA;EACA,iBAAA;EACA,YAAA;A9Bk1EJ;A8Bh1EI;EACC,aAAA;A9Bk1EL;A8B30EG;EACC,mBAAA;EACA,SAAA;EACA,UAAA;EACA,kBAAA;EACA,SAAA;EACA,yBAAA;A9B60EJ;A8B30EI;EAEC,WAAA;EACA,cAAA;EACA,kBAAA;EACA,QAAA;EACA,UAAA;EACA,UAAA;EACA,mBAAA;EACA,iCAAA;EACA,4BAAA;A9B40EL;A8Bt1EI;EAEC,WAAA;EACA,cAAA;EACA,kBAAA;EACA,QAAA;EACA,UAAA;EACA,UAAA;EACA,mBAAA;EACA,iCAAA;EACA,4BAAA;A9B40EL;A8Bz0EI;EACC,SAAA;EACA,iCAAA;A9B20EL;A8Bn0EE;EACC,mBAAA;A9Bq0EH;A8Bn0EG;EACC,mBAAA;A9Bq0EJ;A8B1zEI;EAEC,cAAA;A9B2zEL;A8B7zEI;EAEC,cAAA;A9B2zEL;A8BxzEI;EACC,0BAAA;EACA,6BAAA;A9B0zEL;A8BrzEE;EACC,mBAAA;A9BuzEH;;A+B15EA;EAEC,gBAAA;A/B45ED;A+Bz5EC;EACC,aAAA;A/B25EF;A+Bv5EC;EACC,cAAA;A/By5EF;;AgCp6EA;EACC,gBAAA;EACA,gBAAA;AhCu6ED;;AiCz6EA;EACC,eAAA;EACA,kBAAA;EACA,iBAAA;EACA,0BAAA;EACA,uBAAA;EACA,mBAAA;EACA,0BAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;EACA,gIAAA;EACA,sBAAA;EACA,gBAAA;EAqCA;;IAAA;AjC04ED;AiC76EC;EACC,mBAAA;EACA,YAAA;EACA,cAAA;EACA,kBAAA;EACA,OAAA;EACA,eAAA;EACA,gBAAA;EACA,cAAA;AjC+6EF;AiC56EC;EACC,oBAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EACA,uBAAA;EACA,oBAAA;EACA,SAAA;AjC86EF;AiC36EC;EACC,mBAAA;AjC66EF;AiC16EC;EAGC,mBAAA;EACA,cAAA;EACA,eAAA;EACA,kBAAA;EACA,oBAAA;AjC46EF;AiCt6EC;EACC,gBAAA;AjCw6EF;AiCn6EE;;EAEC,kBAAA;AjCq6EH;AiCj6EC;EAEC,6BAAA;AjCk6EF;AK38EE;E4BuCD;EAEC;EjCk6EF;AAn2DA;AKpkBE;E4BGD;EAEC;EjCk6EF;AA71DA;AiCvkBC;EAEC,6BAAA;AjCk6EF;AK38EE;E4BuCD;EAEC;EjCk6EF;AAn2DA;AKpkBE;E4BGD;EAEC;EjCk6EF;AA71DA;AiClkBC;EAEC,eAAA;AjCg6EF;AiCl6EC;EAEC,eAAA;AjCg6EF;AiC75EC;EACC,cAAA;EACA,aAAA;EACA,iBAAA;EACA,mBAAA;EACA,qBAAA;AjC+5EF;AiC75EE;EAPD;IAQE,cAAA;EjCg6ED;AACF;AiC95EE;EACC,gBAAA;AjCg6EH;AiC75EE;EACC,SAAA;EACA,kBAAA;AjC+5EH;AiC75EG;EACC,eAAA;AjC+5EJ;AG9wEA;E8BlJG;EACC;EjC+5EJ;AA5sEA;AiC/ME;;;EAGC,mBAAA;AjC65EH;AiC15EE;EAEC,aAAA;AjC25EH;AiCz5EG;EACC,kBAAA;AjC25EJ;;AkCvgFC;EACC,aAAA;AlC0gFF;AKn/EE;E6BxBD;IAIE,aAAA;ElC2gFD;AACF;;AmClhFA;EACC,iBAAA;EAqBA;;IAAA;AnCmgFD;AmCthFC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,SAAA;AnCwhFF;AmCjhFE;;;;;;;;;EAIC,mBAAA;AnCwhFH;AmCjhFC;EACC,2BAAA;EACA,gBAAA;EACA,kBAAA;AnCmhFF;AmChhFE;EACC,aAAA;AnCkhFH;AmC9gFE;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;AnCghFH;AmC5gFC;EACC,iBAAA;AnC8gFF;AmC5gFE;EACC,aAAA;AnC8gFH;AmC1gFC;EAEC,eAAA;EACA,gBAAA;EAEA,qDAAA;EACA,gBAAA;EACA,mBAAA;AnC0gFF;AmCxgFE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;AnC0gFH;AG31EA;EgClLE;EACC;EnC4gFH;AAzxEA;AmCpPE;EACC,kBAAA;EACA,kBAAA;EACA,iBAAA;AnC0gFH;AG31EA;EgClLE;EACC;EnC4gFH;AAzxEA;AmC9OE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;AnCygFH;AGh2EA;EgC5KE;EACC;EnC2gFH;AA9xEA;AmC9OE;EACC,kBAAA;EACA,iBAAA;EACA,WAAA;AnCygFH;AGh2EA;EgC5KE;EACC;EnC2gFH;AA9xEA;AmCrOG;EACC,aAAA;AnCqgFJ;AmCjgFG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;AnCmgFJ;AG12EA;EgC9JG;EAEC;EnCsgFJ;AAxyEA;AmChOG;EACC,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,iBAAA;EACA,kBAAA;AnCmgFJ;AG12EA;EgC9JG;EAEC;EnCsgFJ;AAxyEA;AmCvNE;EAGC,cAAA;EACA,mBAAA;AnCmgFH;AK9kFE;E8BiCD;IA8CE,kBAAA;EnCmgFD;EmCjgFC;IACC,OAAA;EnCmgFF;EmChgFC;IACC,eAAA;IACA,mBAAA;EnCkgFF;EmChgFE;IACC,QAAA;EnCkgFH;EmC9/EC;IACC,eAAA;IACA,gBAAA;EnCggFF;EmCz/EA;IACC,eAAA;IACA,mBAAA;EnC6/ED;AALF;AKjmFE;E8B2GC;IACC,QAAA;EnC6/EF;EmCz/EA;IACC,eAAA;IACA,gBAAA;EnC2/ED;AACF;;AoCloFA;EACC,eAAA;ApCqoFD;AoCnoFC;EACC,gBAAA;ApCqoFF;AoCjoFC;EACC,gBAAA;EACA,mBAAA;ApCmoFF;AoCjoFE;EACC,aAAA;ApCmoFH;AoChoFE;EACC,gBAAA;ApCkoFH;AoC5nFE;EACC,mBAAA;ApC8nFH;AoC5nFG;EACC,gBAAA;ApC8nFJ;AoCznFE;EAUC,gBAAA;ApCknFH;AoC9mFC;EACC,gBAAA;EACA,mBAAA;ApCgnFF;AoC9mFE;EACC,aAAA;ApCgnFH;AoC7mFE;EACC,gBAAA;ApC+mFH;AoC1mFC;EACC,qBAAA;EACA,gIAAA;EACA,eAAA;EACA,mBAAA;EACA,gBAAA;EACA,mBAAA;ApC4mFF;AG97EA;EiCpLC;EAGC;EpC+mFF;AA53EA;AoC5OC;EACC,cAAA;EACA,kBAAA;EACA,gBAAA;ApC0mFF;AoCtmFC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;ApCwmFF;AoCtmFE;EAEC,mBAAA;ApCumFH;AoClmFC;EAEC,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,gBAAA;ApComFF;AoChmFC;EACC,kBAAA;EACA,mBAAA;ApCkmFF;AoChmFE;EAEC,eAAA;EACA,gBAAA;ApCimFH;;AqC1sFA;EACC,6BAAA;ArC6sFD;;AKprFE;EgC1BF;EACC;ErC6sFD;AA5kEA;;AKpkBE;EgC9DF;EACC;ErC6sFD;AAtkEA;AqCnoBE;EACC,uBAAA;ArC2sFH;AqCvsFC;EACC,mBAAA;EACA,gBAAA;EACA,mBAAA;ArCysFF;AqCtsFC;EACC,yBAAA;EACA,gBAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;EACA,kBAAA;EACA,aAAA;ArCwsFF;AqCtsFE;EACC,cAAA;EACA,qBAAA;ArCwsFH;AqCrsFE;EACC,gCAAA;ArCusFH;AqCnsFC;EACC,cAAA;EACA,cAAA;ArCqsFF;AqCnsFE;EACC,iBAAA;ArCqsFH;AqCnsFG;EACC,WAAA;EACA,YAAA;EACA,kBAAA;ArCqsFJ;AqC9rFG;EACC,oCAAA;EACA,yBAAA;ArCgsFJ;AqClsFG;EACC,oCAAA;EACA,yBAAA;ArCgsFJ;AqC7rFG;EACC,yBAAA;ArC+rFJ;AqChsFG;EACC,yBAAA;ArC+rFJ;AqCxrFE;EACC,sBAAA;EACA,yBAAA;EACA,gBAAA;EACA,YAAA;ArC0rFH;AqCxrFG;EACC,gCAAA;ArC0rFJ;AqCvrFG;EACC,cAAA;EACA,eAAA;EACA,kBAAA;ArCyrFJ;AqCtrFI;EACC,cAAA;EACA,oBAAA;EACA,2BAAA;ArCwrFL;AqCprFG;EACC,kBAAA;ArCsrFJ;AqCnrFI;EACC,cAAA;ArCqrFL;AqClrFI;EACC,cAAA;ArCorFL;AqClrFK;EACC,yBAAA;EACA,WAAA;ArCorFN;AqChrFI;EACC,iBAAA;ArCkrFL;;AqC3qFA;EACC,gBAAA;ArC8qFD;;AsChyFA;EACC,kBAAA;EAEA,WAAA;EACA,iBAAA;EACA,kBAAA;AtCmyFD;AsCjyFC;EALA,gCAAA;AtC6yFD;AsCxyFC;EAEC,UAAA;EAiBA;;IAAA;AtCqxFF;AsCpyFE;EACC,6BAAA;AtCsyFH;AKxxFE;EiCfA;EACC;EtCsyFH;AAhrEA;AKpkBE;EiCnDA;EACC;EtCsyFH;AA1qEA;AsCvnBG;EACC,6BAAA;AtCmyFJ;AK3xFE;EiCTC;EACC;EtCmyFJ;AAnrEA;AKpkBE;EiC7CC;EACC;EtCmyFJ;AA7qEA;AsCnnBG;EACC,eAAA;AtCkyFJ;AsC3xFE;EACC,wBAAA;AtC6xFH;AsCxxFG;EAEC,wCAAA;AtCyxFJ;AsCvxFI;EACC,8BAAA;AtCyxFL;AsCrxFG;EACC,cAAA;EACA,kBAAA;EACA,wBAAA;EACA,sBAAA;AtCuxFJ;AGvlFA;EmCpMG;EAEC;EtCyxFJ;AArhFA;AsC9PE;EAIC,0BAAA;AtCkxFH;;AuCx0FC;EACC,cAAA;AvC20FF;AuCt0FE;EACC,cAAA;AvCw0FH;AuCr0FE;EAEC,gBAAA;AvCs0FH;;AwCp1FA;;EAEC,WAAA;EACA,gBAAA;EACA,yBAAA;AxCu1FD;AwCr1FC;;;;EAEC,kBAAA;AxCy1FF;AwCt1FC;EACC,gIAAA;AxCy1FF;AwCt1FC;EAEC,aAAA;EACA,iBAAA;AxC01FF;AwCv1FC;EACC,cAAA;EACA,eAAA;AxC01FF;AwCv1FC;EAKC,cAAA;AxC01FF;AwCv1FC;EACC,qBAAA;AxC01FF;AwCx1FE;;;;EAEC,eAAA;AxC41FH;AwCz1FE;EACC,yBAAA;AxC41FH;AwC71FE;EACC,yBAAA;AxC41FH;AwCz1FE;EACC,0CAAA;AxC41FH;AwC71FE;EACC,0CAAA;AxC41FH;;AwCr1FC;;EAEC,uBAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;EACA,sBAAA;EACA,kBAAA;AxCw1FF;AwCr1FC;EACC,iBAAA;AxCu1FF;AwCp1FC;;EAEC,mBAAA;EACA,iBAAA;AxCs1FF;AwCn1FC;EACC,iBAAA;EACA,gBAAA;EACA,mBAAA;EACA,mBAAA;AxCq1FF;;AwCj1FA;EACC,gBAAA;EACA,gBAAA;AxCo1FD;AwCl1FC;EACC,WAAA;EACA,sBAAA;AxCo1FF;AwCl1FE;EACC,kBAAA;AxCo1FH;AwCh1FC;EACC,YAAA;AxCk1FF;;AyCh7FC;EACC,kBAAA;EACA,mBAAA;AzCm7FF;;A0Cv7FA;EACC,gIAAA;A1C07FD;;A2Cz7FC;EACC,cAAA;EACA,eAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;A3C47FF;;A2Cx7FA;EACC,gBAAA;EACA,WAAA;EACA,sBAAA;A3C27FD;;A4Ct8FC;EAEC,eAAA;A5Cy8FF;;A4C38FC;EAEC,eAAA;A5Cy8FF;A4Ct8FC;EAEC,mBAAA;A5Cw8FF;A4C18FC;EAEC,mBAAA;A5Cw8FF;A4Cr8FC;EAKC,kBAAA;A5Cu8FF;A4C58FC;EAKC,kBAAA;A5Cu8FF;A4C58FC;EAKC,kBAAA;A5Cu8FF;A4C58FC;EAKC,kBAAA;A5Cu8FF;A4C58FC;EAKC,kBAAA;A5Cu8FF;A4Cp8FC;EAEC,iBAAA;EACA,gBAAA;A5Cs8FF;A4Cz8FC;EAEC,iBAAA;EACA,gBAAA;A5Cs8FF;A4Cn8FC;EAIC,iBAAA;EACA,gBAAA;A5Cq8FF;AGrvFA;EyCrNC;EAIC;E5Cs8FF;AAnrFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cq8FF;AGrvFA;EyCrNC;EAIC;E5Cs8FF;AAnrFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cq8FF;AGrvFA;EyCrNC;EAIC;E5Cs8FF;AAnrFA;A4CvRC;EAIC,iBAAA;EACA,gBAAA;A5Cq8FF;AGrvFA;EyCrNC;EAIC;E5Cs8FF;AAnrFA;A4C/QC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5Ck8FF;AG3vFA;EyC7MC;EAEC;E5Cs8FF;AAzrFA;A4C/QC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5Ck8FF;AG3vFA;EyC7MC;EAEC;E5Cs8FF;AAzrFA;A4CtQC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C+7FF;AGjwFA;EyCpMC;EAEC;E5Cm8FF;AA/rFA;A4CtQC;EAEC,eAAA;EACA,gBAAA;EAGA,gBAAA;A5C+7FF;AGjwFA;EyCpMC;EAEC;E5Cm8FF;AA/rFA;;A6ClTA,qBAAA;AAEA;;EAAA;AAQA;;EAAA;AAGA;EAEC,aAAA;EACA,gBAAA;EAEA,aAAA;A7C4+FD;;A6Cv+FA;EACC,6BAAA;A7C0+FD;;AKx+FE;EwCHF;EACC;E7C0+FD;AAh4EA;;AKpkBE;EwCvCF;EACC;E7C0+FD;AA13EA;;AK9mBE;EwCID;IAEC,aAAA;IACA,WAAA;IAEA,aAAA;IACA,kBAAA;IACA,mBAAA;E7Cs+FA;E6Cn+FD;IACC,qEAAA;E7Cq+FA;EKp/FA;IwCcD;IACC;I7Cq+FA;EA54EF;EKpkBE;IwCtBD;IACC;I7Cq+FA;EAt4EF;AAu4EA;A6Cl+FA;;EAAA;AAGA;EACC,WAAA;EACA,cAAA;EACA,WAAA;EACA,kBAAA;EACA,iBAAA;EACA,kBAAA;A7Co+FD;;A6Cj+FA;;EAAA;AAGA;EAEC,aAAA;EACA,mBAAA;A7Cm+FD;;A6C99FA;EACC,6BAAA;A7Ci+FD;;AK5gGE;EwC0CF;EACC;E7Ci+FD;AAp6EA;;AKpkBE;EwCMF;EACC;E7Ci+FD;AA95EA;;AK9mBE;EwCiDD;IAEC,aAAA;IACA,YAAA;IAEA,aAAA;IACA,iBAAA;E7C69FA;E6C19FD;IACC,qEAAA;E7C49FA;EKvhGA;IwC0DD;IACC;I7C49FA;EA/6EF;EKpkBE;IwCsBD;IACC;I7C49FA;EAz6EF;AA06EA;A6Cx9FA;;EAEC,aAAA;A7C09FD;;A6Cv9FA;;EAAA;;AAYA;;EAAA;AAGA;EACC,WAAA;A7Cq9FD;;A6C38FA;EACC,2BAAA;A7C88FD;;A6C38FA;EACC,yBAAA;A7C88FD;;A6C18FA;EACC,4BAAA;A7C68FD;;A6Cz8FA;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,yBAAA;EACA,kBAAA;EACA,WAAA;EACA,uBAAA;EACA,eAAA;A7C48FD;;AG32FA;E0CzGA;EAQC;E7C48FD;AAzyFA;;A6ChKA;EACC,WAAA;EACA,cAAA;EACA,WAAA;EACA,iBAAA;A7C48FD;;A6Cz8FA;EACC,aAAA;A7C48FD;AK5kGE;EwC+HF;IAIE,cAAA;E7C68FA;AACF;;AEtgGA,4LAAA;A4CpGA;EAEC,aAAA;EACA,uBAAA;EACA,eAAA;EACA,aAAA;A9C6mGD;A8C3mGC;EACC,mBAAA;A9C6mGF;AK5lGE;EyCzBF;IAYE,iBAAA;E9C6mGA;AACF;AK7jGE;EyC7DF;IAgBE,iBAAA;E9C8mGA;AACF;;A8C1mGA;EACC,cAAA;EACA,mBAAA;A9C6mGD;A8C3mGC;EACC,eAAA;EACA,WAAA;EACA,kBAAA;A9C6mGF;AKhnGE;EyCJF;IAWE,qBAAA;IACA,eAAA;E9C6mGA;AACF;;A8CzmGA;EAEC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,sBAAA;EACA,yBAAA;EACA,gBAAA;EACA,kBAAA;A9C2mGD;A8CzmGC;EACC,mBAAA;EACA,mBAAA;A9C2mGF;A8CzmGE;EAGC,mBAAA;A9CymGH;A8CtmGE;EAEC,cAAA;A9CumGH;A8CzmGE;EAEC,cAAA;A9CumGH;AK1oGE;EyCaF;IA4BE,iBAAA;E9CqmGA;AACF;;A8CjmGA;EACC,mBAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;A9ComGD;;A8CjmGA;EACC,8BAAA;A9ComGD;;A8ChmGA;EAEC,cAAA;A9CkmGD;A8ChmGC;EACC,WAAA;EACA,oBAAA;EACA,wBAAA;EACA,kBAAA;A9CkmGF;A8C/lGC;EACC,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;EACA,YAAA;EACA,qBAAA;EACA,WAAA;A9CimGF;AK7qGE;EyCiFA;IACC,gBAAA;IACA,iBAAA;IACA,YAAA;IACA,WAAA;E9C+lGD;AACF;;AK3rGE;EyC0GG;IACC,kBAAA;IACA,iBAAA;IACA,aAAA;IACA,QAAA;E9CqlGJ;E8CnlGI;IACC,aAAA;E9CqlGL;E8CllGI;IACC,4BAAA;E9ColGL;E8C9kGC;IACC,uBAAA;E9CglGF;E8C9kGE;IACC,8BAAA;E9CglGH;E8C9kGG;IACC,6BAAA;E9CglGJ;E8C5kGE;IACC,eAAA;E9C8kGH;E8CzkGG;IACC,aAAA;E9C2kGJ;E8CxkGG;IACC,kBAAA;IACA,MAAA;E9C0kGJ;E8CvkGG;IACC,kBAAA;IACA,cAAA;IACA,iBAAA;E9CykGJ;E8CvkGI;IAGC,kBAAA;IACA,mBAAA;IACA,mBAAA;E9CukGL;E8C5jGE;IACC,eAAA;IACA,6BAAA;E9C8jGH;E8CzjGA;IACC,uBAAA;E9C2jGD;AACF;A+CjwGA;EACC,cAAA;EACA,oBAAA;A/CmwGD;A+C/vGC;EACC,iBAAA;A/CiwGF;AKrvGE;E0CPA;IACC,gBAAA;E/C+vGD;AACF;;A+C1vGA;EACC,iBAAA;EACA,cAAA;EACA,gIAAA;EACA,mBAAA;EACA,gBAAA;EACA,6BAAA;A/C6vGD;A+C3vGC;EACC,yBAAA;EACA,iBAAA;A/C6vGF;A+C1vGC;EAEC,gBAAA;A/C4vGF;A+C9vGC;EAEC,gBAAA;A/C4vGF;AKjuGE;E0C1CF;IAmBE,aAAA;IACA,mBAAA;E/C4vGA;E+C1vGA;IACC,kBAAA;E/C4vGD;E+CzvGA;;IAEC,mBAAA;IACA,iBAAA;E/C2vGD;E+CxvGA;IACC,iBAAA;E/C0vGD;AACF;A+CvvGC;EACC,cAAA;A/CyvGF;A+CvvGE;EAGC,cAAA;A/CuvGH;A+C1vGE;EAGC,cAAA;A/CuvGH;A+C1vGE;EAGC,cAAA;A/CuvGH;A+CpvGE;EACC,cAAA;A/CsvGH;A+CnvGE;EACC,cAAA;A/CqvGH;A+CnvGG;EACC,cAAA;A/CqvGJ;A+CjvGG;EACC,WAAA;A/CmvGJ;;AgDl0GA;EACC,gCAAA;EACA,oBAAA;EACA,mBAAA;AhDq0GD;;AgDl0GA;EACC,mBAAA;EACA,iBAAA;EACA,gBAAA;AhDq0GD;;AgDl0GA;EACC,mBAAA;EACA,oBAAA;EACA,gBAAA;AhDq0GD;;AiDh1GA;EACC,mBAAA;AjDm1GD;;AiD/0GA;EACC,WAAA;AjDk1GD;AiDh1GC;EACC,qBAAA;EACA,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;AjDk1GF;AiDh1GE;EACC,cAAA;AjDk1GH;;AkDt2GA;EAEC,cAAA;EACA,kBAAA;EACA,sBAAA;EACA,gBAAA;EACA,yBAAA;AlDw2GD;;AG9nGA;E+ChPA;EAGC;ElD22GD;AA5jGA;AkD1SC;EACC,mBAAA;EACA,6BAAA;AlDw2GF;AkDt2GE;EACC,cAAA;AlDw2GH;AkDr2GE;EACC,cAAA;AlDu2GH;AkDp2GE;EACC,mBAAA;AlDs2GH;;AkDj2GA;EACC,eAAA;AlDo2GD;;AG/oGA;E+CtNA;EACC;ElDo2GD;AA7kGA;;AkDpRA;EACC,gBAAA;EACA,gBAAA;AlDo2GD;;AkDj2GA;;EAAA;AAIA;EAEC,gIAAA;AlDm2GD;;AkD91GC;EACC,qBAAA;AlDi2GF;AkD71GC;EAEC,yBAAA;EACA,0BAAA;AlD81GF;AkDr1GA;EAEC,cAAA;EACA,WAAA;EACA,WAAA;EACA,eAAA;EACA,cAAA;AlDs1GD;AkDp1GC;EACC,qBAAA;AlDs1GF;AkDn1GC;EACC,mBAAA;AlDq1GF;AkDn1GE;EAEC,cAAA;AlDo1GH;AkDt1GE;EAEC,cAAA;AlDo1GH;AkDj1GE;EACC,mBAAA;AlDm1GH;;AkD70GA;EACC,gBAAA;EACA,iBAAA;EACA,oBAAA;EACA,gCAAA;AlDg1GD;;AkD70GA;EACC,oCAAA;AlDg1GD;;AkD70GA;EACC,iBAAA;EACA,oBAAA;EACA,iBAAA;EACA,iBAAA;EACA,6BAAA;EACA,oCAAA;EACA,aAAA;EACA,qCAAA;EACA,gBAAA;AlDg1GD;AkD90GC;;EAEC,yBAAA;EACA,iBAAA;AlDg1GF;AkD70GC;EACC,mBAAA;AlD+0GF;AkD50GC;;;;EAIC,cAAA;AlD80GF;AKx7GE;E6CiFF;IA6BE,cAAA;ElD80GA;EkD50GA;IACC,cAAA;ElD80GD;EkD30GA;;IAEC,gBAAA;ElD60GD;AACF;;AkDz0GA;;EAAA;AAIA;EAEC,kBAAA;AlD00GD;AkDn0GC;EACC,cAAA;EACA,WAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;EACA,gBAAA;AlDq0GF;;AkDj0GA;;EAAA;AAIA;EACC,kBAAA;EACA,eAAA;EACA,6BAAA;AlDm0GD;AKt9GE;E6CgJF;EAGC;ElDm0GD;AA92FA;AKpkBE;E6C4GF;EAGC;ElDm0GD;AAx2FA;AkDzdC;EACC,gBAAA;AlDm0GF;AkD7zGE;EACC,qBAAA;EACA,mBAAA;EACA,kBAAA;AlD+zGH;AkD5zGE;EACC,qBAAA;EACA,kBAAA;EACA,8BAAA;AlD8zGH;AKn+GE;E6CkKA;EAGC;ElD8zGH;AA33FA;AKpkBE;E6C8HA;EAGC;ElD8zGH;AAr3FA;AkDncE;EACC,gIAAA;EACA,iBAAA;EACA,eAAA;AlD0zGH;AkDvzGE;EACC,eAAA;EACA,gBAAA;EACA,mBAAA;AlDyzGH;;AmDvgHA;EACC,eAAA;AnD0gHD;;AG3xGA;EgDhPA;EACC;EnD0gHD;AAztGA;;AmD9SA;EAEC,gBAAA;AnD0gHD;;AmDvgHA;EACC,gBAAA;AnD0gHD;;AmDvgHA;EACC,gCAAA;EACA,oBAAA;AnD0gHD;;AmD7/GG;EACC,iBAAA;AnDwgHJ;AmD9/GE;EACC,gBAAA;AnDwgHH;AmDlgHE;;;;;;EAEC,cAAA;AnDwgHH;AmDhgHG;EACC,kBAAA;AnDogHJ;;AmD9/GA;EACC,gBAAA;EACA,kBAAA;EACA,gBAAA;AnDigHD;;AGn1GA;EgDjLA;EAEC;EnDkgHD;AAjxGA;;AoDlTA;EACC,iBAAA;EACA,mBAAA;ApDskHD;;AqDxkHA;EACC,gBAAA;ArD2kHD;;AsD5kHA;;EAAA;AAKC;EACC,gBAAA;EACA,mBAAA;AtD6kHF;AsD3kHE;EACC,aAAA;AtD6kHH;AsD1kHE;EACC,gBAAA;AtD4kHH;AsDtkHE;EACC,kBAAA;EACA,kBAAA;EACA,SAAA;AtDwkHH;AsDrkHE;EACC,qBAAA;EACA,kBAAA;AtDukHH;AsDpkHE;EACC,uBAAA;AtDskHH;;AsDhkHA;;EAAA;AAIA;EAEC,kBAAA;EACA,sBAAA;AtDkkHD;AG/3GA;EmDtMA;EAEC;EtDmkHD;AA7zGA;AsDxQA;EAEC,kBAAA;EACA,sBAAA;AtDkkHD;AG/3GA;EmDtMA;EAEC;EtDmkHD;AA7zGA;;AsDlQA;EACC,aAAA;EACA,8BAAA;AtDkkHD;AsD9jHE;EACC,gIAAA;EACA,eAAA;EACA,kBAAA;EACA,mBAAA;EACA,sBAAA;AtDgkHH;;AsD3jHA,8BAAA;AACA;EACC,iBAAA;AtD8jHD;;AsD3jHA;;EAAA;AAGA;EACC,eAAA;EACA,gBAAA;AtD8jHD;AsD5jHC;EACC,gBAAA;EACA,mBAAA;AtD8jHF;;AsDzjHA;EACC,gBAAA;EACA,eAAA;AtD4jHD;AsD1jHC;EACC,gBAAA;EACA,mBAAA;AtD4jHF;;AK3nHE;EiDoEF;IAGE,mBAAA;EtD0jHA;AACF;;AsDvjHA;;EAAA;AAKC;EACC,gBAAA;EACA,kBAAA;AtDwjHF;AK1oHE;EiDgFD;IAKE,gBAAA;IACA,gBAAA;EtDyjHD;AACF;AsDvjHE;EACC,gIAAA;EACA,mBAAA;EACA,iBAAA;EACA,aAAA;EACA,qBAAA;EACA,sBAAA;AtDyjHH;AsDpjHC;EACC,cAAA;EACA,eAAA;EACA,oBAAA;AtDsjHF;AsDpjHE;EACC,iBAAA;AtDsjHH;AKhqHE;EiD8EF;IAkCE,qBAAA;EtDojHA;EsDljHA;IACC,kBAAA;EtDojHD;AACF;;AsDhjHA;EACC,mBAAA;EACA,gBAAA;AtDmjHD;;AsDhjHA;EACC,cAAA;AtDmjHD;;AsDhjHA;EACC,aAAA;AtDmjHD;;AsDhjHA;EAEC,gIAAA;AtDmjHD;;AsD/iHA;EACC,kBAAA;EACA,mBAAA;AtDkjHD;AsDhjHC;EACC,gBAAA;EACA,mBAAA;AtDkjHF;AsD/iHC;EACC,SAAA;AtDijHF;;AsD7iHA;EACC,qBAAA;AtDgjHD;;AsD5iHA;EAEC,gBAAA;EACA,mBAAA;AtD+iHD;;AsD5iHA;EACC,gBAAA;AtD+iHD;;AsD5iHA;EACC,gBAAA;EACA,mBAAA;AtD+iHD;AsD7iHC;EACC,aAAA;AtD+iHF;AsD5iHC;EACC,gBAAA;AtD8iHF;AsD5iHE;EACC,mBAAA;AtD8iHH;;AsDziHA;EACC,gBAAA;AtD4iHD;AsD1iHC;EACC,mBAAA;AtD4iHF;;AsDxiHA;EACC,aAAA;EACA,eAAA;AtD2iHD;AsDziHC;EACC,gBAAA;AtD2iHF;AsDxiHC;EACC,mBAAA;AtD0iHF;AsDviHC;;EAEC,WAAA;AtDyiHF;AsDtiHC;;EAEC,aAAA;EACA,YAAA;AtDwiHF;AKnwHE;EiDwND;;IAME,gBAAA;EtD0iHD;AACF;AsDviHC;EAEC,eAAA;EACA,mBAAA;AtDyiHF;AsD5iHC;EAEC,eAAA;EACA,mBAAA;AtDyiHF;;AsDriHA;EACC,mBAAA;AtDwiHD;AsDtiHC;EACC,aAAA;AtDwiHF;AsDriHC;EACC,gBAAA;AtDuiHF;AsDpiHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDsiHF;AsD/iHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDsiHF;AsD/iHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDsiHF;AsD/iHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDsiHF;AsD/iHC;EAKC,cAAA;EACA,mBAAA;EACA,mBAAA;EACA,WAAA;EACA,gBAAA;AtDsiHF;AsDniHC;EACC,aAAA;AtDqiHF;AKhyHE;EiDgQA;IACC,kBAAA;EtDmiHD;EsDhiHA;IAEC,cAAA;EtDiiHD;AACF;;AuD9zHA;EACC,aAAA;EACA,8BAAA;EACA,kBAAA;EACA,QAAA;EACA,iBAAA;EACA,mBAAA;AvDi0HD;AKvzHE;EkDhBF;IASE,aAAA;EvDk0HA;AACF;AuD/zHC;EACC,aAAA;EACA,iBAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;EACA,6BAAA;EACA,YAAA;EACA,cAAA;AvDi0HF;AuD/zHE;EACC,aAAA;EACA,mBAAA;AvDi0HH;AuD/zHG;EACC,gBAAA;AvDi0HJ;AuD7zHG;EACC,kBAAA;EACA,SAAA;AvD+zHJ;AuD5zHG;EACC,aAAA;AvD8zHJ;AuDtzHI;EACC,aAAA;AvDwzHL;AuDrzHI;EACC,aAAA;AvDuzHL;AuDrzHK;EACC,uDAAA;EACA,wBAAA;AvDuzHN;AuD/yHC;EACC,WAAA;EACA,YAAA;EACA,yBAAA;AvDizHF;AuD/yHE;EACC,gBAAA;AvDizHH;;AuD5yHA;EACC,kBAAA;EACA,QAAA;EACA,QAAA;EACA,cAAA;EACA,kBAAA;EACA,iBAAA;EACA,aAAA;EACA,gBAAA;AvD+yHD;AuD5yHC;EACC,eAAA;EACA,kBAAA;EACA,UAAA;EACA,MAAA;EACA,QAAA;EACA,SAAA;EACA,OAAA;EAEA,8BAAA;EACA,kBAAA;EACA,mBAAA;EACA,oBAAA;EACA,yBAAA;EACA,2BAAA;AvD6yHF;AuD3yHE;EAhBD;IAiBE,iCAAA;EvD8yHD;AACF;AKr4HE;EkDqED;IAqBE,aAAA;IACA,YAAA;IACA,kBAAA;IACA,gBAAA;IACA,6BAAA;EvD+yHD;EuD7yHC;IACC,eAAA;IACA,yCAAA;EvD+yHF;EuD5yHC;IACC,SAAA;EvD8yHF;EG7rHD;IoDlHE;IACC;IvD8yHF;EAhoHF;EuD3KG;IACC,0BAAA;EvD6yHF;EGhsHD;IoD9GE;IACC;IvD6yHF;EAnoHF;EuDvKG;IACC,yBAAA;EvD4yHF;AACF;AK35HE;EkDoHD;IAGE,WAAA;IACA,eAAA;IACA,UAAA;EvDwyHD;AACF;AuDtyHE;EACC,kBAAA;EACA,mBAAA;EACA,UAAA;EACA,wBAAA;AvDwyHH;AKx6HE;EkDuIC;IACC,sCAAA;EvDoyHF;AACF;AKv6HE;EkDoDF;IAoFE,kBAAA;IACA,iBAAA;EvDmyHA;EuDhyHA;IACC,mBAAA;IACA,UAAA;IACA,kBAAA;IACA,UAAA;IACA,6BAAA;IACA,iBAAA;IACA,eAAA;EvDkyHD;EuD9xHA;IACC,aAAA;EvDgyHD;EuD5xHA;IACC,aAAA;EvD8xHD;EuD1xHA;IACC,YAAA;EvD4xHD;EuD1xHC;IACC,YAAA;EvD4xHF;AACF;AuDvxHC;EACC,aAAA;EACA,2BAAA;EACA,eAAA;EACA,gBAAA;EACA,SAAA;EACA,eAAA;EACA,eAAA;EACA,kBAAA;AvDyxHF;AKl9HE;EkDiLD;IAWE,qBAAA;EvD0xHD;EuDxxHC;IACC,eAAA;EvD0xHF;AACF;AuDvxHE;EACC,cAAA;EACA,kBAAA;EACA,WAAA;AvDyxHH;AKz9HE;EkD6LA;IAME,SAAA;IACA,cAAA;EvD0xHF;EuDxxHE;IACC,eAAA;EvD0xHH;AACF;AuDrxHE;EACC,aAAA;EACA,wBAAA;EACA,WAAA;EACA,UAAA;EACA,uBAAA;EACA,mBAAA;EACA,uBAAA;EACA,mBAAA;EACA,YAAA;AvDuxHH;AuDrxHG;EACC,0BAAA;AvDuxHJ;AKt/HE;EkDmNA;IAgBE,aAAA;EvDuxHF;AACF;AuDrxHG;;EAEC,YAAA;EACA,aAAA;EACA,mBAAA;AvDuxHJ;AuDrxHI;;EACC,gBAAA;AvDwxHL;AuDpxHG;EACC,aAAA;AvDsxHJ;AuDhxHI;EACC,aAAA;AvDkxHL;AuD/wHI;EACC,aAAA;AvDixHL;AuD3wHE;EAEC,kBAAA;AvD4wHH;AuDzwHI;EALF;IAMG,yBAAA;EvD4wHH;AACF;AKhhIE;EkD6PA;IAWE,OAAA;IACA,SAAA;IACA,sBAAA;IACA,kBAAA;IACA,SAAA;IACA,gBAAA;IACA,cAAA;EvD4wHF;EuD1wHE;IAEC,WAAA;IACA,cAAA;IACA,kBAAA;IACA,QAAA;IACA,UAAA;IACA,UAAA;IACA,mBAAA;IACA,iCAAA;IACA,4BAAA;EvD2wHH;EuDrxHE;IAEC,WAAA;IACA,cAAA;IACA,kBAAA;IACA,QAAA;IACA,UAAA;IACA,UAAA;IACA,mBAAA;IACA,iCAAA;IACA,4BAAA;EvD2wHH;EuDxwHE;IACC,SAAA;IACA,iCAAA;EvD0wHH;EuDvwHE;IACC,mBAAA;EvDywHH;EuDtwHE;IAEC,eAAA;IACA,OAAA;IAEA,eAAA;IACA,WAAA;EvDswHH;EuDpwHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvDmwHJ;EuD1wHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvDmwHJ;EuD/vHE;IAEC,eAAA;IACA,QAAA;IAEA,eAAA;IACA,UAAA;EvD+vHH;EuD7vHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvD4vHJ;EuDnwHG;IAGC,eAAA;IACA,UAAA;IAEA,eAAA;IACA,WAAA;EvD4vHJ;AACF;AuDrvHC;EACC,cAAA;AvDuvHF;AKxkIE;EkDoVD;IAGE,mBAAA;IACA,kBAAA;EvDqvHD;EuDlvHC;IACC,aAAA;EvDovHF;EuDlvHE;IACC,kBAAA;IACA,mBAAA;EvDovHH;EuDlvHG;IACC,iBAAA;EvDovHJ;AACF;AuD7uHC;EACC,cAAA;EACA,gIAAA;EACA,mBAAA;EACA,mBAAA;EACA,eAAA;EACA,qBAAA;AvD+uHF;AKhmIE;EkD2WD;IASE,cAAA;IACA,gIAAA;IACA,kBAAA;IACA,mBAAA;EvDgvHD;AACF;AuD9uHE;EACC,aAAA;AvDgvHH;AuD7uHE;EAGC,cAAA;AvD6uHH;AuDhvHE;EAGC,cAAA;AvD6uHH;AuDhvHE;EAGC,cAAA;AvD6uHH;AuD1uHE;EACC,0BAAA;EACA,6BAAA;AvD4uHH;AuDzuHE;EACC,kBAAA;EACA,cAAA;EACA,iBAAA;EACA,8BAAA;AvD2uHH;AuDvuHC;;EAEC,0BAAA;EACA,4BAAA;AvDyuHF;AuDvuHE;;EACC,0BAAA;EACA,6BAAA;AvD0uHH;AuDruHC;EACC,SAAA;EACA,UAAA;EACA,gBAAA;EACA,iBAAA;EACA,yBAAA;AvDuuHF;AuDruHE;EACC,YAAA;AvDuuHH;AK5oIE;EkD4aC;IACC,UAAA;EvDmuHF;AACF;AKvpIE;EkD2bE;IACC,gBAAA;EvD+tHH;AACF;AuD3tHG;EACC,kBAAA;EACA,cAAA;EACA,mBAAA;EACA,kBAAA;AvD6tHJ;AK5pIE;EkD2bC;IAOE,eAAA;IACA,kBAAA;EvD8tHH;AACF;AuDttHE;EACC,aAAA;AvDwtHH;AKrqIE;EkDkdC;IACC,qBAAA;IACA,YAAA;EvDstHF;EuDntHC;IACC,aAAA;EvDqtHF;AACF;AuDhtHC;EACC,cAAA;EACA,WAAA;EACA,eAAA;EACA,oBAAA;EACA,gBAAA;AvDktHF;AuDhtHE;EACC,qBAAA;AvDktHH;;AK9rIE;EkDofD;IACC,eAAA;IACA,eAAA;IACA,WAAA;EvD8sHA;AACF;AuD1sHA;EAEC;IACC,UAAA;EvD2sHA;EuDxsHD;IACC,UAAA;EvD0sHA;AACF;AwDjuIA;EACC,gBAAA;EACA,mBAAA;EACA,cAAA;EACA,eAAA;EACA,gIAAA;AxDmuID;;AwDhuIA;EACC,aAAA;EACA,uBAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;AxDmuID;AwDjuIC;EACC,eAAA;EAEA,cAAA;AxDkuIF;AwDhuIE;EACC,kBAAA;EACA,cAAA;AxDkuIH;AwDhuIG;EAGC,cAAA;AxDguIJ;AwDnuIG;EAGC,cAAA;AxDguIJ;AwDnuIG;EAGC,cAAA;AxDguIJ;AwD7tIG;EACC,0BAAA;EACA,6BAAA;EACA,8BAAA;EACA,cAAA;AxD+tIJ;AwDxtIK;EACC,aAAA;AxD0tIN;AwDntIK;EACC,UAAA;AxDqtIN;AwD/sIE;EACC,sBAAA;EACA,aAAA;AxDitIH;AwD/sIG;EACC,qBAAA;AxDitIJ;AwD9sIG;EARD;IASE,+BAAA;ExDitIF;AACF;AwD7sIC;;EAEC,aAAA;AxD+sIF;;AyDxxIA,6BAAA;AAMC;EAFA,cAAA;AzD6xID;AyD3xIC;EAEC,qBAAA;AzDyxIF;AyDvxIE;EACC,cAAA;EACA,0BAAA;EACA,6BAAA;AzDyxIH;AyDtxIE;EACC,cAAA;AzDwxIH;AyDrxIE;EACC,cAAA;AzDuxIH;AyDjxIE;EACC,eAAA;EACA,gBAAA;AzDmxIH;AyDhxIE;;EAEC,aAAA;EACA,sBAAA;AzDkxIH;AyD/wIE;EACC,kBAAA;AzDixIH;AKlxIE;EoDbD;IAkBE,aAAA;IACA,uBAAA;IACA,eAAA;EzDixID;EyD/wIC;IAEC,cAAA;IACA,sBAAA;IACA,mBAAA;IACA,2BAAA;EzDixIF;EyD9wIC;IACC,iBAAA;EzDgxIF;AACF;AyD5wIC;EACC,qBAAA;EACA,kBAAA;EACA,sBAAA;EACA,kBAAA;AzD8wIF;AyD3wIC;EAEC,SAAA;EACA,iBAAA;AzD6wIF;AyD1wIC;EAEC,SAAA;EACA,gBAAA;AzD4wIF;;AyDvwIA;EAEC,iBAAA;AzDywID;AK/xIE;EoDoBF;IAKE,iBAAA;EzD0wIA;AACF;AyDtwIC;EACC,gBAAA;EACA,cAAA;AzDwwIF;AyDrwIC;EACC,qBAAA;EACA,gIAAA;EACA,iBAAA;EACA,gBAAA;EACA,gBAAA;AzDuwIF;AK/yIE;EoDmCD;IAOE,kBAAA;EzDywID;AACF;AKx1IE;EoDkFD;IAEE,8BAAA;EzDwwID;AACF;AyDrwIC;EAEC,gBAAA;EACA,mBAAA;AzDuwIF;AyDrwIE;;EACC,aAAA;AzDwwIH;AyDrwIE;;EACC,gBAAA;AzDwwIH;;AyDlwIA;EAGC,6BAAA;EACA,iBAAA;EACA,iBAAA;AzDowID;AK70IE;EoDoEF;IAQE,iBAAA;EzDswIA;AACF;AyDjwIC;EACC,iBAAA;AzDowIF;AyDlwIE;EACC,cAAA;AzDqwIH;AyDtwIE;EACC,cAAA;AzDqwIH;AyDhwIG;EAGC,cAAA;AzDqwIJ;AyDxwIG;EAGC,cAAA;AzDqwIJ;AyDxwIG;EAGC,cAAA;AzDqwIJ;AyDxwIG;EAGC,cAAA;AzDqwIJ;AyDxwIG;EAGC,cAAA;AzDqwIJ;AyDxwIG;EAGC,cAAA;AzDqwIJ;AyD/vIG;EAGC,WAAA;AzDowIJ;AyDvwIG;EAGC,WAAA;AzDowIJ;AyDvwIG;EAGC,WAAA;AzDowIJ;AyDvwIG;EAGC,WAAA;AzDowIJ;AyDvwIG;EAGC,WAAA;AzDowIJ;AyDvwIG;EAGC,WAAA;AzDowIJ;AyD/vIC;EACC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,kBAAA;AzDkwIF;AyDzwIC;EACC,cAAA;EACA,gIAAA;EACA,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,kBAAA;AzDkwIF;AyDhwIE;;EACC,0BAAA;AzDmwIH;AyDhwIE;;EACC,6BAAA;AzDmwIH;AyDhwIE;;EACC,cAAA;AzDmwIH;AyDhwIE;;EACC,eAAA;AzDmwIH;AyDhwIE;;EACC,iBAAA;AzDmwIH;AyDhwIE;;EACC,kBAAA;AzDmwIH;AKn5IE;EoDsJA;;IACC,aAAA;IACA,eAAA;EzDiwID;EyD9vIA;;IACC,aAAA;EzDiwID;EyD/vIC;;;IAEC,qBAAA;IACA,cAAA;EzDkwIF;AACF;AKx8IE;EoD4MA;;IACC,aAAA;EzDgwID;AACF;;AyD3vIA;EACC,iBAAA;EACA,iBAAA;AzD8vID;AKz6IE;EoDyKF;IAKE,4BAAA;EzD+vIA;AACF;AyD7vIC;EACC,kBAAA;AzD+vIF;;A0D/+IA;EAEC,iBAAA;EACA,oBAAA;EACA,cAAA;EACA,mBAAA;EACA,gIAAA;A1Di/ID;AKr8IE;EqDlDF;IASE,aAAA;IACA,qCAAA;IACA,gBAAA;E1Dk/IA;AACF;AKp7IE;EqD1EF;IAeE,qCAAA;E1Dm/IA;AACF;AK/+IE;EqDpBF;IAmBE,gBAAA;E1Do/IA;AACF;A0Dh/IE;EACC,gBAAA;EACA,yBAAA;A1Dk/IH;A0D/+IE;EACC,gBAAA;A1Di/IH;A0D7+IC;EACC,WAAA;EACA,cAAA;EACA,WAAA;A1D++IF;;A0Dz+IC;EAMC,gBAAA;EACA,gBAAA;A1D4+IF;A0Dz+IC;EACC,kBAAA;A1D2+IF;A0Dx+IC;EACC,mBAAA;A1D0+IF;A0D39IC;EACC,eAAA;A1Ds+IF;A0Dn+IC;EACC,qBAAA;EACA,UAAA;A1Dq+IF;A0Dn+IE;EACC,gBAAA;A1Dq+IH;A0Dl+IE;EAEC,iBAAA;A1Dm+IH;A0Dh+IE;EACC,aAAA;A1Dk+IH;A0D99IC;EACC,cAAA;EACA,0BAAA;EACA,4BAAA;EACA,mCAAA;A1Dg+IF;A0D99IE;EAGC,cAAA;A1D89IH;A0Dj+IE;EAGC,cAAA;A1D89IH;A0Dj+IE;EAGC,cAAA;A1D89IH;A0D39IE;EACC,cAAA;EACA,6BAAA;A1D69IH;;A0Dv9IA;EACC,aAAA;EACA,eAAA;EACA,YAAA;EACA,6BAAA;A1D09ID;;AKvjJE;EqDyFF;EAIC;E1D09ID;AA/8HA;;AKpkBE;EqDqDF;EAIC;E1D09ID;AAz8HA;A0D/gBC;EACC,WAAA;EACA,gBAAA;EACA,gBAAA;A1D09IF;A0Dv9IC;EACC,YAAA;EACA,kBAAA;EACA,gBAAA;EACA,kBAAA;A1Dy9IF;A0Dt9IC;EACC,gBAAA;EACA,iBAAA;A1Dw9IF;;A0Dl9IC;EACC,kBAAA;EACA,wBAAA;EACA,mBAAA;A1Dq9IF;A0Dl9IC;EACC,cAAA;EACA,mBAAA;A1Do9IF;;A0Dh9IA;EACC,aAAA;A1Dm9ID;;AE1/IA,0FAAA;AyDpHA;EACC,SAAA;EACA,8BAAA;EACA,6BAAA;EACA,qBAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;EACA,UAAA;EACA,6BAAA;EACA,UAAA;EACA,4BAAA;EACA,kBAAA;A3DknJD;;A2D/mJA;EACC,yBAAA;EACA,kBAAA;EACA,0CAAA;EACA,qBAAA;EACA,uBAAA;EACA,eAAA;EACA,cAAA;EACA,cAAA;EACA,mBAAA;EACA,gBAAA;EACA,YAAA;EACA,SAAA;EACA,mBAAA;EACA,uBAAA;EACA,qBAAA;EACA,QAAA;EACA,WAAA;EACA,eAAA;A3DknJD;;A2D/mJA,qDAAA;AACA;EACC,UAAA;A3DknJD;;A4DtpJA;EAMC,WAAA;A5DopJD;A4DxpJC;EAEC,WAAA;A5D0pJF;;A4DrpJA;EAMC,cAAA;A5DmpJD;A4DvpJC;EAEC,cAAA;A5DypJF;;A4DppJA;EAMC,cAAA;A5DkpJD;A4DtpJC;EAEC,cAAA;A5DwpJF;;A4DnpJA;EAMC,cAAA;A5DipJD;A4DrpJC;EAEC,cAAA;A5DupJF;;A4DlpJA;EAMC,cAAA;A5DgpJD;A4DppJC;EAEC,cAAA;A5DspJF;;A4DjpJA;EAMC,cAAA;A5D+oJD;A4DnpJC;EAEC,cAAA;A5DqpJF;;A4DhpJA;EAMC,cAAA;A5D8oJD;A4DlpJC;EAEC,cAAA;A5DopJF;;A4D/oJA;EAMC,cAAA;A5D6oJD;A4DjpJC;EAEC,cAAA;A5DmpJF;;A4D9oJA;EAMC,cAAA;A5D4oJD;A4DhpJC;EAEC,cAAA;A5DkpJF;;A4D7oJA;EAMC,WAAA;A5D2oJD;A4D/oJC;EAEC,WAAA;A5DipJF;;A4DzoJC;;;;;;;;EAQC,mBAAA;A5D4oJF;;A4DxoJA;EAMC,sBAAA;A5DsoJD;A4D1oJC;EAEC,sBAAA;A5D4oJF;;A4DvoJA;EAMC,yBAAA;A5DqoJD;A4DzoJC;EAEC,yBAAA;A5D2oJF;;A4DtoJA;EAMC,yBAAA;A5DooJD;A4DxoJC;EAEC,yBAAA;A5D0oJF;;A4DroJA;EAMC,yBAAA;A5DmoJD;A4DvoJC;EAEC,yBAAA;A5DyoJF;;A4DpoJA;EAMC,yBAAA;A5DkoJD;A4DtoJC;EAEC,yBAAA;A5DwoJF;;A4DnoJA;EAMC,yBAAA;A5DioJD;A4DroJC;EAEC,yBAAA;A5DuoJF;;A4DloJA;EAMC,yBAAA;A5DgoJD;A4DpoJC;EAEC,yBAAA;A5DsoJF;;A4DjoJA;EAMC,yBAAA;A5D+nJD;A4DnoJC;EAEC,yBAAA;A5DqoJF;;A4DhoJA;EAMC,yBAAA;A5D8nJD;A4DloJC;EAEC,yBAAA;A5DooJF;;A4D/nJA;EAMC,yBAAA;A5D6nJD;A4DjoJC;EAEC,yBAAA;A5DmoJF;;A4D9nJA;EAMC,sBAAA;A5D4nJD;A4DhoJC;EAEC,sBAAA;A5DkoJF;;A4D3nJC;EAGG,WAAA;A5D4nJJ;;A4D/nJC;EAGG,WAAA;A5D4nJJ;;A4D/nJC;EAGG,WAAA;A5D4nJJ;A4DznJE;EAMC;A5DunJH;A4D7nJE;EAMC;A5DunJH;A4D7nJE;EAMC;A5DunJH;A4DnnJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4DznJC;EAOG,cAAA;A5DknJJ;A4D/mJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;A4DnnJE;EAMC;A5D6mJH;;A4DvmJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A4D1mJA;EACC,qDAAA;A5D6mJD;;A6D73JA;EAGC,gBAAA;A7Dg4JD;;A6D73JA;;;;;;;;;;;EAWC,eAAA;A7Dg4JD;;A8Dl5JC;EACC,WAAA;A9Dq5JF;A8Dn5JE;;;;;;;;;;;EAWC,WAAA;A9Dq5JH;A8Dl5JE;;;;EAIC,UAAA;A9Do5JH;A8Dj5JE;EACC,gBAAA;A9Dm5JH;AK15JE;EyDaE;;IAEC,sBAAA;E9Dg5JH;AACF;A8D54JE;EACC,cAAA;A9D84JH;A8D14JC;EACC,cAAA;A9D44JF;A8Dz4JC;EACC,eAAA;A9D24JF","file":"ie.css"}
\ No newline at end of file
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css
index d6f1bd7819fb1..676e1981e8ee0 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css
+++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css
@@ -302,6 +302,11 @@
 	}
 }
 
+b,
+strong {
+	font-weight: 700;
+}
+
 blockquote {
 	padding: 0;
 	position: relative;
@@ -931,19 +936,6 @@ a:hover {
 	color: var(--global--color-white);
 }
 
-.wp-block-group {
-	display: block;
-	clear: both;
-	display: flow-root;
-}
-
-.wp-block-group:before,
-.wp-block-group:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
 .wp-block-group.has-background {
 	padding: var(--global--spacing-vertical);
 }
@@ -1376,13 +1368,13 @@ dt {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation__container {
-	background: var(--global--color-background);
-	padding: 0;
+.wp-block-navigation [data-block] {
+	margin-top: revert;
+	margin-bottom: revert;
 }
 
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
+.wp-block-navigation .wp-block-navigation__container {
+	background: var(--global--color-background);
 }
 
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
@@ -1427,6 +1419,11 @@ pre.wp-block-preformatted {
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: var(--pullquote--font-style);
+	font-family: var(--pullquote--font-family);
+	letter-spacing: var(--pullquote--letter-spacing);
+	line-height: var(--pullquote--line-height);
 }
 
 .wp-block-pullquote blockquote::before {
@@ -1441,12 +1438,12 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-pullquote p {
-	font-family: var(--pullquote--font-family);
-	font-size: var(--pullquote--font-size);
-	font-style: var(--pullquote--font-style);
-	font-weight: 700;
-	letter-spacing: var(--pullquote--letter-spacing);
-	line-height: var(--pullquote--line-height);
+	font-family: inherit;
+	font-size: inherit;
+	font-style: inherit;
+	font-weight: inherit;
+	letter-spacing: inherit;
+	line-height: inherit;
 	margin: 0;
 }
 
diff --git a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map
index 5310c307c4957..f7812dac0094a 100644
--- a/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map
+++ b/src/wp-content/themes/twentytwentyone/assets/css/style-editor.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-comments/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;ACAA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAhGC;EA2GD;IACC;IACA;IACA;IACA;;;ACzIF;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;ADlDA;ECpBF;IA0EE;;EAEA;IACC;;;;AC7EH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AC1EF;ECsBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;;ADzEF;AAAA;AAAA;AAYG;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAUA;EAGC;;AAID;EACC;;AAGA;EACC;;AAMD;EACC;;AAKF;EACC;;AAKF;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;;AAKF;EACC;EACA;;AAKF;EACC;;;AAIF;AAAA;EAEC;;;AE5HD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;EAOC;EACA;EACA;EACA;;AAPA;AAAA;EACC;;AAQD;AAAA;EACC;EACA;;AFuED;AAAA;EACC;;AAID;AAAA;EACC;;AAID;AAAA;AAAA;EAEC;;AE9ED;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAOD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAKF;AAAA;EACC;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAKF;AAAA;EACC;;AAID;AAAA;EACC;;;ACvED;EACC;;AAGD;AAAA;EAGC;;AH4ED;EACC;;AAID;EACC;;AAID;EAEC;;AN/CA;EShCC;IACC;IACA;IACA;;EAcC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IACC;IACA;;EAKF;AAAA;IAEC;;EAGD;IACC;;;AAQH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;;AC9DF;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EJSA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EIdC;;AJoBA;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;AI3DA;EACC;EACA;;;ACnBF;EACC;;AAEA;EACC;;;ACNH;EAIC;EACA;EAEA;;AAEA;EAEC;EACA;EACA;;AAID;EACC;;AAEA;EACC;EACA;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;ANmDF;EACC;;AAID;EACC;;AAID;EAEC;;;AMxDF;EACC;EACA;;;AC3CD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAkBC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC/ED;EAEC;EACA;EACA;;;ACJD;AAEA;AAAA;EAEC;;;AAGD;EACC;;;AAGD;AAEA;AAAA;EAEC;;;AAGD;EACC;;;ACnBD;EACC;;;ACDD;EACC;;AAGA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;;AAKH;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;EACA;;AAIF;EACC;EACA;;;AC5IH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;ACxCD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAMD;AAAA;EAEC;;;AAIF;EACC;EACA;;;AC5BA;EACC;EACA;;AdiFD;EACC;;AAID;EACC;;AAID;EAEC;;AcxFD;EACC;;AAID;EACC;;;ACbD;EACC;EACA;;AAKA;EACC;;AAGD;EACC;EACA;EACA;;AAMD;EACC;;AAUC;EAEC;;AAKH;EACC;;;ACzCH;EACC;;AAEA;EACC;;;ACJF;EACC;EACA;EACA;;;ACHD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AAID;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EARD;IASE;;;AAGD;EACC;;AAGD;EAEC;EACA;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;;AAUD;EACC;;;AAQF;AAAA;EACC;;;ACrGD;EACC;;AzBuBA;EyBxBD;IAIE;;;;ACNH;EACC;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAEA;EAIC;;AAIF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;A1B9EF;E0B6CD;IAsCE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;;A1B9FH;E0BpBF;IAyHE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A1BhHD;E0B1BF;IA+IE;;EAEA;IACC;;;;AClJH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAIF;EtBPA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EsBCC;EACA;;AtBIA;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;AsB5CA;EACC;EACA;;AAEA;EACC;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAKF;EACC;EACA;;AAMD;EACC;;AAGD;EACC;;AAQC;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAMJ;EAEC;;;AAKH;EACC;;;AAOC;EACC;;;AC9GH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;EAEC;;AAEA;AAAA;AAAA;EACC;;AAIF;AAAA;EACC;;AAIF;AAAA;AAAA;AAAA;AAAA;EAIC;;;AC1CD;EACC;EACA;;AAKA;EACC;;AAGD;EACC;;;ACZF;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;ACpFD;EACC;;;ACHF;EACC;EACA;;;ACCA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAAA;AAAA;AAAA;AAMA;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;;AAKF;EACC;EACA;;;AAID;EACC;;;AAGD;EACC;;;AAMA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAID;EACC;EACA;;;AAID;EAIC;;AAGA;EAEC;;AAGD;EAEC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EAEC;IACC;IACA;;EAGD;IACC;IACA;;;AAKF;EACC;;;AAID;EACC;;;AC1ID;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAID;EACC;;AAEA;EACC;;AAGD;EACC;EACA;;;AAQD;EAEC;;;AAIF;AAAA;EAEC;;;ACxCD;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC","file":"style-editor.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/style-editor.scss","../sass/01-settings/global.scss","../sass/03-generic/breakpoints.scss","../sass/04-elements/blockquote.scss","../sass/04-elements/media.scss","../sass/04-elements/forms-editor.scss","../sass/04-elements/links.scss","../sass/05-blocks/button/_editor.scss","../sass/02-tools/mixins.scss","../sass/05-blocks/code/_editor.scss","../sass/05-blocks/cover/_editor.scss","../sass/05-blocks/columns/_editor.scss","../sass/05-blocks/file/_editor.scss","../sass/05-blocks/gallery/_editor.scss","../sass/05-blocks/group/_editor.scss","../sass/05-blocks/heading/_editor.scss","../sass/05-blocks/html/_editor.scss","../sass/05-blocks/image/_editor.scss","../sass/05-blocks/latest-comments/_editor.scss","../sass/05-blocks/latest-posts/_editor.scss","../sass/05-blocks/legacy/_editor.scss","../sass/05-blocks/list/_editor.scss","../sass/05-blocks/media-text/_editor.scss","../sass/05-blocks/navigation/_editor.scss","../sass/05-blocks/paragraph/_editor.scss","../sass/05-blocks/preformatted/_editor.scss","../sass/05-blocks/pullquote/_editor.scss","../sass/05-blocks/query-loop/_editor.scss","../sass/05-blocks/quote/_editor.scss","../sass/05-blocks/rss/_editor.scss","../sass/05-blocks/search/_editor.scss","../sass/05-blocks/separator/_editor.scss","../sass/05-blocks/social-icons/_editor.scss","../sass/05-blocks/table/_editor.scss","../sass/05-blocks/tag-clould/_editor.scss","../sass/05-blocks/verse/_editor.scss","../sass/05-blocks/utilities/_font-sizes.scss","../sass/05-blocks/utilities/_editor.scss","../sass/06-components/editor.scss","../sass/07-utilities/color-palette.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;ACAA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAhGC;EA2GD;IACC;IACA;IACA;IACA;;;AF7HF;AAAA;EAEI;;;AGdJ;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;ADlDA;ECpBF;IA0EE;;EAEA;IACC;;;;AC7EH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AC1EF;ECsBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;;ADzEF;AAAA;AAAA;AAYG;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAUA;EAGC;;AAID;EACC;;AAGA;EACC;;AAMD;EACC;;AAKF;EACC;;AAKF;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;;AAKF;EACC;EACA;;AAKF;EACC;;;AAIF;AAAA;EAEC;;;AE5HD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;ACXD;AAAA;EAOC;EACA;EACA;EACA;;AAPA;AAAA;EACC;;AAQD;AAAA;EACC;EACA;;AFuED;AAAA;EACC;;AAID;AAAA;EACC;;AAID;AAAA;AAAA;EAEC;;AE9ED;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAOD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAKF;AAAA;EACC;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAKF;AAAA;EACC;;AAID;AAAA;EACC;;;ACvED;EACC;;AAGD;AAAA;EAGC;;AH4ED;EACC;;AAID;EACC;;AAID;EAEC;;AN/CA;EShCC;IACC;IACA;IACA;;EAcC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IACC;IACA;;EAKF;AAAA;IAEC;;EAGD;IACC;;;AAQH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;;AC9DF;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EJSA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EIdC;;AJoBA;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;AI3DA;EACC;EACA;;;ACnBF;EACC;;AAEA;EACC;;;ACJF;EACC;;AAEA;EACC;EACA;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;ANkEF;EACC;;AAID;EACC;;AAID;EAEC;;;AMvEF;EACC;EACA;;;AC5BD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAkBC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC/ED;EAEC;EACA;EACA;;;ACJD;AAEA;AAAA;EAEC;;;AAGD;EACC;;;AAGD;AAEA;AAAA;EAEC;;;AAGD;EACC;;;ACnBD;EACC;;;ACDD;EACC;;AAGA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;;AAKH;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;EACA;;AAIF;EACC;EACA;;;AC5IH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;ACxCD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAMD;AAAA;EAEC;;;AAIF;EACC;EACA;;;AC5BA;EACC;EACA;;AdiFD;EACC;;AAID;EACC;;AAID;EAEC;;AcxFD;EACC;;AAID;EACC;;;ACbD;EACC;EACA;;AAGD;EACC;;AAKA;EACC;EACA;EACA;;AAMD;EACC;;AAUC;EAEC;;AAKH;EACC;;;ACzCH;EACC;;AAEA;EACC;;;ACJF;EACC;EACA;EACA;;;ACHD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AAID;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EARD;IASE;;;AAGD;EACC;;AAGD;EAEC;EACA;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;;AAUD;EACC;;;AAQF;AAAA;EACC;;;AC1GD;EACC;;AzBuBA;EyBxBD;IAIE;;;;ACNH;EACC;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAEA;EAIC;;AAIF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;A1B9EF;E0B6CD;IAsCE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;;A1B9FH;E0BpBF;IAyHE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A1BhHD;E0B1BF;IA+IE;;EAEA;IACC;;;;AClJH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAIF;EtBPA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EsBCC;EACA;;AtBIA;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAID;EACC;EACA;EACA;;AsB5CA;EACC;EACA;;AAEA;EACC;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAKF;EACC;EACA;;AAMD;EACC;;AAGD;EACC;;AAQC;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAMJ;EAEC;;;AAKH;EACC;;;AAOC;EACC;;;AC9GH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;EAEC;;AAEA;AAAA;AAAA;EACC;;AAIF;AAAA;EACC;;AAIF;AAAA;AAAA;AAAA;AAAA;EAIC;;;AC1CD;EACC;EACA;;AAKA;EACC;;AAGD;EACC;;;ACZF;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;ACpFD;EACC;;;ACHF;EACC;EACA;;;ACCA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAAA;AAAA;AAAA;AAMA;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;;;AAKF;EACC;EACA;;;AAID;EACC;;;AAGD;EACC;;;AAMA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAID;EACC;EACA;;;AAID;EAIC;;AAGA;EAEC;;AAGD;EAEC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EAEC;IACC;IACA;;EAGD;IACC;IACA;;;AAKF;EACC;;;AAID;EACC;;;AC1ID;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAID;EACC;;AAEA;EACC;;AAGD;EACC;EACA;;;AAQD;EAEC;;;AAIF;AAAA;EAEC;;;ACxCD;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC","file":"style-editor.css"}
\ No newline at end of file
diff --git a/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js b/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js
index ec15e106dcf2a..c53af8268c83e 100644
--- a/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js
+++ b/src/wp-content/themes/twentytwentyone/assets/js/primary-navigation.js
@@ -172,9 +172,9 @@ function twentytwentyoneExpandSubMenu( el ) { // jshint ignore:line
 		 *
 		 * @since Twenty Twenty-One 1.1
 		 */
-		document.addEventListener( 'click', function( event ) {
+		document.getElementById( 'site-navigation' ).addEventListener( 'click', function( event ) {
 			// If target onclick is <a> with # within the href attribute
-			if ( event.target.hash && event.target.hash.includes( '#' ) ) {
+			if ( event.target.hash ) {
 				wrapper.classList.remove( id + '-navigation-open', 'lock-scrolling' );
 				twentytwentyoneToggleAriaExpanded( mobileButton );
 				// Wait 550 and scroll to the anchor.
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss
index 6a5eed2b8cde7..e6b4f3e0de1ab 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/01-settings/file-header.scss
@@ -5,9 +5,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog.
 Requires at least: 5.3
-Tested up to: 6.0
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.7
+Version: 1.9
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
index c3f2bd6260746..5f28b46e0af7a 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/group/_editor.scss
@@ -1,19 +1,4 @@
 .wp-block-group {
-	// Start IE clearfix.
-	// This hack is only necessary because we want to support IE11.
-	// If we don't want to support IE11, then "display: flow-root" would suffice.
-	display: block;
-	clear: both;
-
-	display: flow-root; // stylelint-disable-line declaration-block-no-duplicate-properties
-
-	&:before,
-	&:after {
-		content: "";
-		display: block;
-		clear: both;
-	}
-	// End IE clearfix.
 
 	&.has-background {
 		padding: var(--global--spacing-vertical);
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
index 028376dabb035..38b4a7e550caf 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_editor.scss
@@ -1,16 +1,16 @@
 .wp-block-navigation {
 
+	[data-block] {
+		margin-top: revert;
+		margin-bottom: revert;
+	}
+
 	.wp-block-navigation__container {
 		background: var(--global--color-background);
-		padding: 0;
 	}
 
 	.wp-block-navigation-link {
 
-		.wp-block-navigation-link__content {
-			padding: var(--primary-nav--padding);
-		}
-
 		.wp-block-navigation-link__label {
 			font-family: var(--primary-nav--font-family);
 			font-size: var(--primary-nav--font-size);
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
index 3e3b1ca3483a4..d991e52cc3488 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/navigation/_style.scss
@@ -1,12 +1,6 @@
 .wp-block-navigation {
 
 	.wp-block-navigation-link {
-		padding: 0;
-
-		.wp-block-navigation-link__content {
-			padding: var(--primary-nav--padding);
-		}
-
 		.wp-block-navigation-link__label {
 			font-family: var(--primary-nav--font-family);
 			font-size: var(--primary-nav--font-size);
@@ -30,35 +24,16 @@
 			.wp-block-navigation__container {
 				border: none;
 				left: 0;
-				margin-left: var(--primary-nav--padding);
 				min-width: max-content;
 				opacity: 0;
 				padding: 0;
 				position: inherit;
 				top: inherit;
 
-				.wp-block-navigation-link {
-
-					.wp-block-navigation-link__content {
-						display: inline-block;
-						padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-					}
-				}
-
 				.wp-block-navigation-link__submenu-icon {
 					display: none;
 				}
 			}
-
-			&:hover,
-			&:focus-within {
-
-				.wp-block-navigation__container {
-					display: block;
-					opacity: 1;
-					visibility: visible;
-				}
-			}
 		}
 
 		> .has-child {
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss
index 5b223b19e2ef0..3eb13cbccdacc 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_editor.scss
@@ -7,6 +7,11 @@
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: var(--pullquote--font-style);
+	font-family: var(--pullquote--font-family);
+	letter-spacing: var(--pullquote--letter-spacing);
+	line-height: var(--pullquote--line-height);
 
 	blockquote::before {
 		color: currentColor;
@@ -20,12 +25,12 @@
 	}
 
 	p {
-		font-family: var(--pullquote--font-family);
-		font-size: var(--pullquote--font-size);
-		font-style: var(--pullquote--font-style);
-		font-weight: 700;
-		letter-spacing: var(--pullquote--letter-spacing);
-		line-height: var(--pullquote--line-height);
+		font-family: inherit;
+		font-size: inherit;
+		font-style: inherit;
+		font-weight: inherit;
+		letter-spacing: inherit;
+		line-height: inherit;
 		margin: 0;
 	}
 
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss
index ad0bc2cb9d22d..686691199f4ab 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/pullquote/_style.scss
@@ -7,6 +7,11 @@
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: var(--pullquote--font-style);
+	font-family: var(--pullquote--font-family);
+	letter-spacing: var(--pullquote--letter-spacing);
+	line-height: var(--pullquote--line-height);
 
 	blockquote::before {
 		color: currentColor;
@@ -20,12 +25,12 @@
 	}
 
 	p {
-		font-family: var(--pullquote--font-family);
-		font-size: var(--pullquote--font-size);
-		font-style: var(--pullquote--font-style);
-		font-weight: 700;
-		letter-spacing: var(--pullquote--letter-spacing);
-		line-height: var(--pullquote--line-height);
+		font-family: inherit;
+		font-size: inherit;
+		font-style: inherit;
+		font-weight: inherit;
+		letter-spacing: inherit;
+		line-height: inherit;
 		margin: 0;
 	}
 
diff --git a/src/wp-content/themes/twentytwentyone/assets/sass/style-editor.scss b/src/wp-content/themes/twentytwentyone/assets/sass/style-editor.scss
index 6106d38ab74f8..151413c61af64 100644
--- a/src/wp-content/themes/twentytwentyone/assets/sass/style-editor.scss
+++ b/src/wp-content/themes/twentytwentyone/assets/sass/style-editor.scss
@@ -9,6 +9,12 @@
 
 @import "03-generic/breakpoints";
 
+// Add relevant styles from "04-elements/misc"
+b,
+strong {
+    font-weight: 700;
+}
+
 @import "04-elements/blockquote";
 @import "04-elements/media";
 @import "04-elements/forms-editor";
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php
index 3b6833c388d71..03dbd308b4139 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-custom-colors.php
@@ -23,7 +23,7 @@ public function __construct() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'custom_color_variables' ) );
 
 		// Enqueue color variables for editor.
-		add_action( 'enqueue_block_editor_assets', array( $this, 'editor_custom_color_variables' ) );
+		add_action( 'enqueue_block_assets', array( $this, 'editor_custom_color_variables' ) );
 
 		// Add body-class if needed.
 		add_filter( 'body_class', array( $this, 'body_class' ) );
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize-notice-control.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize-notice-control.php
index a8c22b8f2de4d..401468549940d 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize-notice-control.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize-notice-control.php
@@ -37,7 +37,7 @@ public function render_content() {
 		?>
 		<div class="notice notice-warning">
 			<p><?php esc_html_e( 'To access the Dark Mode settings, select a light background color.', 'twentytwentyone' ); ?></p>
-			<p><a href="<?php echo esc_url( __( 'https://wordpress.org/support/article/twenty-twenty-one/#dark-mode-support', 'twentytwentyone' ) ); ?>">
+			<p><a href="<?php echo esc_url( __( 'https://wordpress.org/documentation/article/twenty-twenty-one/#dark-mode-support', 'twentytwentyone' ) ); ?>">
 				<?php esc_html_e( 'Learn more about Dark Mode.', 'twentytwentyone' ); ?>
 			</a></p>
 		</div><!-- .notice -->
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
index 4a0fe6f7af502..d3af05ec42a79 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-customize.php
@@ -113,7 +113,7 @@ public function register( $wp_customize ) {
 
 			// Background color.
 			// Include the custom control class.
-			include_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-color-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
+			require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-color-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
 
 			// Register the custom control.
 			$wp_customize->register_control_type( 'Twenty_Twenty_One_Customize_Color_Control' );
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
index 6955fc7c1b692..ec599cfd0bb3a 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php
@@ -13,14 +13,14 @@
 class Twenty_Twenty_One_Dark_Mode {
 
 	/**
-	 * Instantiate the object.
+	 * Instantiates the object.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 */
 	public function __construct() {
 
 		// Enqueue assets for the block-editor.
-		add_action( 'enqueue_block_editor_assets', array( $this, 'editor_custom_color_variables' ) );
+		add_action( 'enqueue_block_assets', array( $this, 'editor_custom_color_variables' ) );
 
 		// Add styles for dark-mode.
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
@@ -45,7 +45,7 @@ public function __construct() {
 	}
 
 	/**
-	 * Editor custom color variables & scripts.
+	 * Enqueues editor custom color variables & scripts.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -82,7 +82,7 @@ public function editor_custom_color_variables() {
 	}
 
 	/**
-	 * Enqueue scripts and styles.
+	 * Enqueues scripts and styles.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -100,7 +100,7 @@ public function enqueue_scripts() {
 	}
 
 	/**
-	 * Enqueue scripts for the customizer.
+	 * Enqueues scripts for the customizer.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -120,7 +120,7 @@ public function customize_controls_enqueue_scripts() {
 	}
 
 	/**
-	 * Register customizer options.
+	 * Registers customizer options.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -135,7 +135,7 @@ public function customizer_controls( $wp_customize ) {
 		}
 
 		// Custom notice control.
-		include_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-notice-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
+		require_once get_theme_file_path( 'classes/class-twenty-twenty-one-customize-notice-control.php' ); // phpcs:ignore WPThemeReview.CoreFunctionality.FileInclude.FileIncludeFound
 
 		$wp_customize->add_setting(
 			'respect_user_color_preference_notice',
@@ -175,7 +175,7 @@ public function customizer_controls( $wp_customize ) {
 		$description .= sprintf(
 			/* translators: %s: Twenty Twenty-One support article URL. */
 			__( 'Dark Mode is a device setting. If a visitor to your site requests it, your site will be shown with a dark background and light text. <a href="%s">Learn more about Dark Mode.</a>', 'twentytwentyone' ),
-			esc_url( __( 'https://wordpress.org/support/article/twenty-twenty-one/#dark-mode-support', 'twentytwentyone' ) )
+			esc_url( __( 'https://wordpress.org/documentation/article/twenty-twenty-one/#dark-mode-support', 'twentytwentyone' ) )
 		);
 		$description .= '</p>';
 		$description .= '<p>' . __( 'Dark Mode can also be turned on and off with a button that you can find in the bottom corner of the page.', 'twentytwentyone' ) . '</p>';
@@ -209,7 +209,7 @@ public function customizer_controls( $wp_customize ) {
 	}
 
 	/**
-	 * Calculate classes for the main <html> element.
+	 * Calculates classes for the main <html> element.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -235,6 +235,8 @@ public function html_classes( $classes ) {
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
+	 * @global WP_Screen $current_screen WordPress current screen object.
+	 *
 	 * @param string $classes The admin body-classes.
 	 * @return string
 	 */
@@ -261,10 +263,12 @@ public function admin_body_classes( $classes ) {
 	}
 
 	/**
-	 * Determine if we want to print the dark-mode switch or not.
+	 * Determines if we want to print the dark-mode switch or not.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
+	 * @global bool $is_IE
+	 *
 	 * @return bool
 	 */
 	public function switch_should_render() {
@@ -277,7 +281,7 @@ public function switch_should_render() {
 	}
 
 	/**
-	 * Add night/day switch.
+	 * Adds night/day switch.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
@@ -292,7 +296,7 @@ public function the_switch() {
 	}
 
 	/**
-	 * Print the dark-mode switch HTML.
+	 * Prints the dark-mode switch HTML.
 	 *
 	 * Inspired from https://codepen.io/aaroniker/pen/KGpXZo (MIT-licensed)
 	 *
@@ -352,7 +356,7 @@ public function the_html( $attrs = array() ) {
 	}
 
 	/**
-	 * Print the dark-mode switch script.
+	 * Prints the dark-mode switch script.
 	 *
 	 * @since Twenty Twenty-One 1.0
 	 *
diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
index 3a82cf76ab4c4..d88aabc0944ac 100644
--- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
+++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php
@@ -127,6 +127,18 @@ class Twenty_Twenty_One_SVG_Icons {
 		'mail'      => array(
 			'mailto:',
 		),
+		'mastodon'  => array(
+			'mastodon.social',
+			'pawoo.net',
+			'mstdn.jp',
+			'mastodon.cloud',
+			'mastodon.online',
+			'counter.social',
+			'mstdn.social',
+			'mas.to',
+			'mastodon.world',
+			'gc2.jp',
+		),
 		'pocket'    => array(
 			'getpocket.com',
 		),
diff --git a/src/wp-content/themes/twentytwentyone/functions.php b/src/wp-content/themes/twentytwentyone/functions.php
index 73eefb9518ad5..eb80b67daa3f2 100644
--- a/src/wp-content/themes/twentytwentyone/functions.php
+++ b/src/wp-content/themes/twentytwentyone/functions.php
@@ -27,13 +27,6 @@
 	 * @return void
 	 */
 	function twenty_twenty_one_setup() {
-		/*
-		 * Make theme available for translation.
-		 * Translations can be filed in the /languages/ directory.
-		 * If you're building a theme based on Twenty Twenty-One, use a find and replace
-		 * to change 'twentytwentyone' to the name of your theme in all the template files.
-		 */
-		load_theme_textdomain( 'twentytwentyone', get_template_directory() . '/languages' );
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );
@@ -329,8 +322,8 @@ function twenty_twenty_one_setup() {
 		// Add support for custom line height controls.
 		add_theme_support( 'custom-line-height' );
 
-		// Add support for experimental link color control.
-		add_theme_support( 'experimental-link-color' );
+		// Add support for link color control.
+		add_theme_support( 'link-color' );
 
 		// Add support for experimental cover block spacing.
 		add_theme_support( 'custom-spacing' );
@@ -340,13 +333,13 @@ function twenty_twenty_one_setup() {
 		add_theme_support( 'custom-units' );
 
 		// Remove feed icon link from legacy RSS widget.
-		add_filter( 'rss_widget_feed_link', '__return_false' );
+		add_filter( 'rss_widget_feed_link', '__return_empty_string' );
 	}
 }
 add_action( 'after_setup_theme', 'twenty_twenty_one_setup' );
 
 /**
- * Register widget area.
+ * Registers widget area.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -371,7 +364,7 @@ function twenty_twenty_one_widgets_init() {
 add_action( 'widgets_init', 'twenty_twenty_one_widgets_init' );
 
 /**
- * Set the content width in pixels, based on the theme's design and stylesheet.
+ * Sets the content width in pixels, based on the theme's design and stylesheet.
  *
  * Priority 0 to make it available to lower priority callbacks.
  *
@@ -390,10 +383,13 @@ function twenty_twenty_one_content_width() {
 add_action( 'after_setup_theme', 'twenty_twenty_one_content_width', 0 );
 
 /**
- * Enqueue scripts and styles.
+ * Enqueues scripts and styles.
  *
  * @since Twenty Twenty-One 1.0
  *
+ * @global bool       $is_IE
+ * @global WP_Scripts $wp_scripts
+ *
  * @return void
  */
 function twenty_twenty_one_scripts() {
@@ -469,7 +465,7 @@ function twenty_twenty_one_scripts() {
 add_action( 'wp_enqueue_scripts', 'twenty_twenty_one_scripts' );
 
 /**
- * Enqueue block editor script.
+ * Enqueues block editor script.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -483,12 +479,13 @@ function twentytwentyone_block_editor_script() {
 add_action( 'enqueue_block_editor_assets', 'twentytwentyone_block_editor_script' );
 
 /**
- * Fix skip link focus in IE11.
+ * Fixes skip link focus in IE11.
  *
  * This does not enqueue the script because it is tiny and because it is only for IE11,
  * thus it does not warrant having an entire dedicated blocking script being loaded.
  *
  * @since Twenty Twenty-One 1.0
+ * @deprecated Twenty Twenty-One 1.9 Removed from wp_print_footer_scripts action.
  *
  * @link https://git.io/vWdr2
  */
@@ -508,10 +505,9 @@ function twenty_twenty_one_skip_link_focus_fix() {
 		<?php
 	}
 }
-add_action( 'wp_print_footer_scripts', 'twenty_twenty_one_skip_link_focus_fix' );
 
 /**
- * Enqueue non-latin language styles.
+ * Enqueues non-latin language styles.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -557,7 +553,7 @@ function twenty_twenty_one_non_latin_languages() {
 new Twenty_Twenty_One_Dark_Mode();
 
 /**
- * Enqueue scripts for the customizer preview.
+ * Enqueues scripts for the customizer preview.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -583,7 +579,7 @@ function twentytwentyone_customize_preview_init() {
 add_action( 'customize_preview_init', 'twentytwentyone_customize_preview_init' );
 
 /**
- * Enqueue scripts for the customizer.
+ * Enqueues scripts for the customizer.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -602,7 +598,7 @@ function twentytwentyone_customize_controls_enqueue_scripts() {
 add_action( 'customize_controls_enqueue_scripts', 'twentytwentyone_customize_controls_enqueue_scripts' );
 
 /**
- * Calculate classes for the main <html> element.
+ * Calculates classes for the main <html> element.
  *
  * @since Twenty Twenty-One 1.0
  *
@@ -624,7 +620,7 @@ function twentytwentyone_the_html_classes() {
 }
 
 /**
- * Add "is-IE" class to body if the user is on Internet Explorer.
+ * Adds "is-IE" class to body if the user is on Internet Explorer.
  *
  * @since Twenty Twenty-One 1.0
  *
diff --git a/src/wp-content/themes/twentytwentyone/header.php b/src/wp-content/themes/twentytwentyone/header.php
index 1e3b588aeb865..a601a2aa6bca8 100644
--- a/src/wp-content/themes/twentytwentyone/header.php
+++ b/src/wp-content/themes/twentytwentyone/header.php
@@ -23,7 +23,12 @@
 <body <?php body_class(); ?>>
 <?php wp_body_open(); ?>
 <div id="page" class="site">
-	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'twentytwentyone' ); ?></a>
+	<a class="skip-link screen-reader-text" href="#content">
+		<?php
+		/* translators: Hidden accessibility text. */
+		esc_html_e( 'Skip to content', 'twentytwentyone' );
+		?>
+	</a>
 
 	<?php get_template_part( 'template-parts/header/site-header' ); ?>
 
diff --git a/src/wp-content/themes/twentytwentyone/image.php b/src/wp-content/themes/twentytwentyone/image.php
index 530bb5cdbe447..2977f8f7073f7 100644
--- a/src/wp-content/themes/twentytwentyone/image.php
+++ b/src/wp-content/themes/twentytwentyone/image.php
@@ -80,6 +80,7 @@
 			if ( $metadata ) {
 				printf(
 					'<span class="full-size-link"><span class="screen-reader-text">%1$s</span><a href="%2$s">%3$s &times; %4$s</a></span>',
+					/* translators: Hidden accessibility text. */
 					esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentytwentyone' ), // phpcs:ignore WordPress.Security.EscapeOutput
 					esc_url( wp_get_attachment_url() ),
 					absint( $metadata['width'] ),
diff --git a/src/wp-content/themes/twentytwentyone/inc/menu-functions.php b/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
index c461047c77c6f..d8d2aae36c74b 100644
--- a/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
+++ b/src/wp-content/themes/twentytwentyone/inc/menu-functions.php
@@ -31,6 +31,7 @@ function twenty_twenty_one_add_sub_menu_toggle( $output, $item, $depth, $args )
 		$output .= '<button class="sub-menu-toggle" aria-expanded="false" onClick="twentytwentyoneExpandSubMenu(this)">';
 		$output .= '<span class="icon-plus">' . twenty_twenty_one_get_icon_svg( 'ui', 'plus', 18 ) . '</span>';
 		$output .= '<span class="icon-minus">' . twenty_twenty_one_get_icon_svg( 'ui', 'minus', 18 ) . '</span>';
+		/* translators: Hidden accessibility text. */
 		$output .= '<span class="screen-reader-text">' . esc_html__( 'Open menu', 'twentytwentyone' ) . '</span>';
 		$output .= '</button>';
 	}
diff --git a/src/wp-content/themes/twentytwentyone/inc/starter-content.php b/src/wp-content/themes/twentytwentyone/inc/starter-content.php
index ca9776a5205b1..bdbd9f8a133e5 100644
--- a/src/wp-content/themes/twentytwentyone/inc/starter-content.php
+++ b/src/wp-content/themes/twentytwentyone/inc/starter-content.php
@@ -119,7 +119,7 @@ function twenty_twenty_one_get_starter_content() {
 					<!-- wp:columns -->
 					<div class="wp-block-columns"><!-- wp:column -->
 					<div class="wp-block-column"><!-- wp:paragraph -->
-					<p><a href="https://wordpress.org/support/article/twenty-twenty-one/">' . esc_html_x( 'Read the Theme Documentation', 'Theme starter content', 'twentytwentyone' ) . '</a></p>
+					<p><a href="https://wordpress.org/documentation/article/twenty-twenty-one/">' . esc_html_x( 'Read the Theme Documentation', 'Theme starter content', 'twentytwentyone' ) . '</a></p>
 					<!-- /wp:paragraph --></div>
 					<!-- /wp:column -->
 
diff --git a/src/wp-content/themes/twentytwentyone/inc/template-functions.php b/src/wp-content/themes/twentytwentyone/inc/template-functions.php
index 6ae2f0bd1805b..a862dfac14a38 100644
--- a/src/wp-content/themes/twentytwentyone/inc/template-functions.php
+++ b/src/wp-content/themes/twentytwentyone/inc/template-functions.php
@@ -421,7 +421,7 @@ function twenty_twenty_one_password_form( $output, $post = 0 ) {
 	$label  = 'pwbox-' . ( empty( $post->ID ) ? wp_rand() : $post->ID );
 	$output = '<p class="post-password-message">' . esc_html__( 'This content is password protected. Please enter a password to view.', 'twentytwentyone' ) . '</p>
 	<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
-	<label class="post-password-form__label" for="' . esc_attr( $label ) . '">' . esc_html_x( 'Password', 'Post password form', 'twentytwentyone' ) . '</label><input class="post-password-form__input" name="post_password" id="' . esc_attr( $label ) . '" type="password" size="20" /><input type="submit" class="post-password-form__submit" name="' . esc_attr_x( 'Submit', 'Post password form', 'twentytwentyone' ) . '" value="' . esc_attr_x( 'Enter', 'Post password form', 'twentytwentyone' ) . '" /></form>
+	<label class="post-password-form__label" for="' . esc_attr( $label ) . '">' . esc_html_x( 'Password', 'Post password form', 'twentytwentyone' ) . '</label><input class="post-password-form__input" name="post_password" id="' . esc_attr( $label ) . '" type="password" spellcheck="false" size="20" /><input type="submit" class="post-password-form__submit" name="' . esc_attr_x( 'Submit', 'Post password form', 'twentytwentyone' ) . '" value="' . esc_attr_x( 'Enter', 'Post password form', 'twentytwentyone' ) . '" /></form>
 	';
 	return $output;
 }
@@ -445,7 +445,7 @@ function twenty_twenty_one_get_attachment_image_attributes( $attr, $attachment,
 		return $attr;
 	}
 
-	if ( isset( $attr['class'] ) && false !== strpos( $attr['class'], 'custom-logo' ) ) {
+	if ( isset( $attr['class'] ) && str_contains( $attr['class'], 'custom-logo' ) ) {
 		return $attr;
 	}
 
diff --git a/src/wp-content/themes/twentytwentyone/package-lock.json b/src/wp-content/themes/twentytwentyone/package-lock.json
index c6777e80391bc..6205e3e2de5a0 100644
--- a/src/wp-content/themes/twentytwentyone/package-lock.json
+++ b/src/wp-content/themes/twentytwentyone/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "twentytwentyone",
-	"version": "1.7.0",
+	"version": "1.9.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -79,9 +79,9 @@
 					}
 				},
 				"json5": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-					"integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+					"version": "2.2.3",
+					"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+					"integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
 					"dev": true
 				},
 				"semver": {
@@ -436,6 +436,30 @@
 				}
 			}
 		},
+		"@csstools/cascade-layer-name-parser": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.1.tgz",
+			"integrity": "sha512-SAAi5DpgJJWkfTvWSaqkgyIsTawa83hMwKrktkj6ra2h+q6ZN57vOGZ6ySHq6RSo+CbP64fA3aPChPBRDDUgtw==",
+			"dev": true
+		},
+		"@csstools/css-parser-algorithms": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.0.1.tgz",
+			"integrity": "sha512-B9/8PmOtU6nBiibJg0glnNktQDZ3rZnGn/7UmDfrm2vMtrdlXO3p7ErE95N0up80IRk9YEtB5jyj/TmQ1WH3dw==",
+			"dev": true
+		},
+		"@csstools/css-tokenizer": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.0.1.tgz",
+			"integrity": "sha512-sYD3H7ReR88S/4+V5VbKiBEUJF4FqvG+8aNJkxqoPAnbhFziDG22IDZc4+h+xA63SfgM+h15lq5OnLeCxQ9nPA==",
+			"dev": true
+		},
+		"@csstools/media-query-list-parser": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.1.tgz",
+			"integrity": "sha512-X2/OuzEbjaxhzm97UJ+95GrMeT29d1Ib+Pu+paGLuRWZnWRK9sI9r3ikmKXPWGA1C4y4JEdBEFpp9jEqCvLeRA==",
+			"dev": true
+		},
 		"@es-joy/jsdoccomment": {
 			"version": "0.10.8",
 			"resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz",
@@ -456,15 +480,15 @@
 			}
 		},
 		"@eslint/eslintrc": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
-			"integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
+			"integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
 			"dev": true,
 			"requires": {
 				"ajv": "^6.12.4",
 				"debug": "^4.3.2",
 				"espree": "^9.4.0",
-				"globals": "^13.15.0",
+				"globals": "^13.19.0",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.2.1",
 				"js-yaml": "^4.1.0",
@@ -482,18 +506,18 @@
 					}
 				},
 				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+					"version": "13.20.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+					"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
 					}
 				},
 				"ignore": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+					"version": "5.2.4",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+					"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
 					"dev": true
 				},
 				"minimatch": {
@@ -514,22 +538,27 @@
 			}
 		},
 		"@humanwhocodes/config-array": {
-			"version": "0.10.5",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
-			"integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
+			"version": "0.11.8",
+			"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
+			"integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==",
 			"dev": true,
 			"requires": {
 				"@humanwhocodes/object-schema": "^1.2.1",
 				"debug": "^4.1.1",
-				"minimatch": "^3.0.4"
+				"minimatch": "^3.0.5"
+			},
+			"dependencies": {
+				"minimatch": {
+					"version": "3.1.2",
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+					"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+					"dev": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				}
 			}
 		},
-		"@humanwhocodes/gitignore-to-minimatch": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
-			"integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
-			"dev": true
-		},
 		"@humanwhocodes/module-importer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -754,9 +783,9 @@
 			}
 		},
 		"@wordpress/browserslist-config": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.1.0.tgz",
-			"integrity": "sha512-rfIHuzamXWL4ZBVmYrlOlqs+8wRzjiAcx0wjgCZ4/+8I9U0SNPgYbjrx6nL48XVbTNA+1GL6XIgdx1g/kHHwoQ==",
+			"version": "5.9.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-5.9.0.tgz",
+			"integrity": "sha512-VC1QK741SRfrfsq2SdWHlkuDo7ZSXD7LFbK0dU6lOnuUt3f01HTU05NfcrC6uWCaoMP87MPDCQVaWTygNSFirQ==",
 			"dev": true
 		},
 		"@wordpress/eslint-plugin": {
@@ -781,6 +810,14 @@
 				"globals": "^12.0.0",
 				"prettier": "npm:wp-prettier@2.2.1-beta-1",
 				"requireindex": "^1.2.0"
+			},
+			"dependencies": {
+				"prettier": {
+					"version": "npm:wp-prettier@2.2.1-beta-1",
+					"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz",
+					"integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==",
+					"dev": true
+				}
 			}
 		},
 		"@wordpress/prettier-config": {
@@ -820,9 +857,9 @@
 			}
 		},
 		"acorn": {
-			"version": "8.8.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-			"integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+			"version": "8.8.2",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
+			"integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
 			"dev": true
 		},
 		"acorn-jsx": {
@@ -1267,13 +1304,13 @@
 			"dev": true
 		},
 		"autoprefixer": {
-			"version": "10.4.12",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-			"integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+			"version": "10.4.13",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
+			"integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
 			"dev": true,
 			"requires": {
 				"browserslist": "^4.21.4",
-				"caniuse-lite": "^1.0.30001407",
+				"caniuse-lite": "^1.0.30001426",
 				"fraction.js": "^4.2.0",
 				"normalize-range": "^0.1.2",
 				"picocolors": "^1.0.0",
@@ -1281,33 +1318,33 @@
 			},
 			"dependencies": {
 				"browserslist": {
-					"version": "4.21.4",
-					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-					"integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+					"version": "4.21.5",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+					"integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
 					"dev": true,
 					"requires": {
-						"caniuse-lite": "^1.0.30001400",
-						"electron-to-chromium": "^1.4.251",
-						"node-releases": "^2.0.6",
-						"update-browserslist-db": "^1.0.9"
+						"caniuse-lite": "^1.0.30001449",
+						"electron-to-chromium": "^1.4.284",
+						"node-releases": "^2.0.8",
+						"update-browserslist-db": "^1.0.10"
 					}
 				},
 				"caniuse-lite": {
-					"version": "1.0.30001410",
-					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
-					"integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==",
+					"version": "1.0.30001450",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
+					"integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
 					"dev": true
 				},
 				"electron-to-chromium": {
-					"version": "1.4.258",
-					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
-					"integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A==",
+					"version": "1.4.286",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.286.tgz",
+					"integrity": "sha512-Vp3CVhmYpgf4iXNKAucoQUDcCrBQX3XLBtwgFqP9BUXuucgvAV9zWp1kYU7LL9j4++s9O+12cb3wMtN4SJy6UQ==",
 					"dev": true
 				},
 				"node-releases": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-					"integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+					"version": "2.0.10",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
+					"integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
 					"dev": true
 				},
 				"postcss-value-parser": {
@@ -1315,6 +1352,16 @@
 					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
 					"dev": true
+				},
+				"update-browserslist-db": {
+					"version": "1.0.10",
+					"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+					"integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+					"dev": true,
+					"requires": {
+						"escalade": "^3.1.1",
+						"picocolors": "^1.0.0"
+					}
 				}
 			}
 		},
@@ -1807,15 +1854,15 @@
 			"dev": true
 		},
 		"eslint": {
-			"version": "8.23.1",
-			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
-			"integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+			"version": "8.33.0",
+			"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
+			"integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
 			"dev": true,
 			"requires": {
-				"@eslint/eslintrc": "^1.3.2",
-				"@humanwhocodes/config-array": "^0.10.4",
-				"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+				"@eslint/eslintrc": "^1.4.1",
+				"@humanwhocodes/config-array": "^0.11.8",
 				"@humanwhocodes/module-importer": "^1.0.1",
+				"@nodelib/fs.walk": "^1.2.8",
 				"ajv": "^6.10.0",
 				"chalk": "^4.0.0",
 				"cross-spawn": "^7.0.2",
@@ -1831,14 +1878,14 @@
 				"fast-deep-equal": "^3.1.3",
 				"file-entry-cache": "^6.0.1",
 				"find-up": "^5.0.0",
-				"glob-parent": "^6.0.1",
-				"globals": "^13.15.0",
-				"globby": "^11.1.0",
+				"glob-parent": "^6.0.2",
+				"globals": "^13.19.0",
 				"grapheme-splitter": "^1.0.4",
 				"ignore": "^5.2.0",
 				"import-fresh": "^3.0.0",
 				"imurmurhash": "^0.1.4",
 				"is-glob": "^4.0.0",
+				"is-path-inside": "^3.0.3",
 				"js-sdsl": "^4.1.4",
 				"js-yaml": "^4.1.0",
 				"json-stable-stringify-without-jsonify": "^1.0.1",
@@ -1853,6 +1900,32 @@
 				"text-table": "^0.2.0"
 			},
 			"dependencies": {
+				"@nodelib/fs.scandir": {
+					"version": "2.1.5",
+					"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+					"integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+					"dev": true,
+					"requires": {
+						"@nodelib/fs.stat": "2.0.5",
+						"run-parallel": "^1.1.9"
+					}
+				},
+				"@nodelib/fs.stat": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+					"integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+					"dev": true
+				},
+				"@nodelib/fs.walk": {
+					"version": "1.2.8",
+					"resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+					"integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+					"dev": true,
+					"requires": {
+						"@nodelib/fs.scandir": "2.1.5",
+						"fastq": "^1.6.0"
+					}
+				},
 				"ansi-regex": {
 					"version": "5.0.1",
 					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -1939,30 +2012,6 @@
 					"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
 					"dev": true
 				},
-				"fast-glob": {
-					"version": "3.2.12",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-					"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-					"dev": true,
-					"requires": {
-						"@nodelib/fs.stat": "^2.0.2",
-						"@nodelib/fs.walk": "^1.2.3",
-						"glob-parent": "^5.1.2",
-						"merge2": "^1.3.0",
-						"micromatch": "^4.0.4"
-					},
-					"dependencies": {
-						"glob-parent": {
-							"version": "5.1.2",
-							"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-							"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-							"dev": true,
-							"requires": {
-								"is-glob": "^4.0.1"
-							}
-						}
-					}
-				},
 				"find-up": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -1994,28 +2043,14 @@
 					}
 				},
 				"globals": {
-					"version": "13.17.0",
-					"resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-					"integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+					"version": "13.20.0",
+					"resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
+					"integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
 					"dev": true,
 					"requires": {
 						"type-fest": "^0.20.2"
 					}
 				},
-				"globby": {
-					"version": "11.1.0",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-					"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-					"dev": true,
-					"requires": {
-						"array-union": "^2.1.0",
-						"dir-glob": "^3.0.1",
-						"fast-glob": "^3.2.9",
-						"ignore": "^5.2.0",
-						"merge2": "^1.4.1",
-						"slash": "^3.0.0"
-					}
-				},
 				"has-flag": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2023,9 +2058,9 @@
 					"dev": true
 				},
 				"ignore": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+					"version": "5.2.4",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+					"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
 					"dev": true
 				},
 				"locate-path": {
@@ -2037,16 +2072,6 @@
 						"p-locate": "^5.0.0"
 					}
 				},
-				"micromatch": {
-					"version": "4.0.5",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-					"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-					"dev": true,
-					"requires": {
-						"braces": "^3.0.2",
-						"picomatch": "^2.3.1"
-					}
-				},
 				"minimatch": {
 					"version": "3.1.2",
 					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -2080,12 +2105,6 @@
 					"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 					"dev": true
 				},
-				"picomatch": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-					"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-					"dev": true
-				},
 				"strip-ansi": {
 					"version": "6.0.1",
 					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -2409,9 +2428,9 @@
 			"dev": true
 		},
 		"espree": {
-			"version": "9.4.0",
-			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-			"integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+			"version": "9.4.1",
+			"resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz",
+			"integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==",
 			"dev": true,
 			"requires": {
 				"acorn": "^8.8.0",
@@ -2591,9 +2610,9 @@
 			"dev": true
 		},
 		"fs-extra": {
-			"version": "10.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-			"integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
+			"integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
 			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.2.0",
@@ -2881,9 +2900,9 @@
 			"dev": true
 		},
 		"immutable": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-			"integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+			"version": "4.2.4",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.2.4.tgz",
+			"integrity": "sha512-WDxL3Hheb1JkRN3sQkyujNlL/xRjAo3rJtaU5xeufUauG66JdMr32bLj4gF+vWl84DIA3Zxw7tiAjneYzRRw+w==",
 			"dev": true
 		},
 		"import-fresh": {
@@ -3120,6 +3139,12 @@
 				"has-tostringtag": "^1.0.0"
 			}
 		},
+		"is-path-inside": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+			"integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+			"dev": true
+		},
 		"is-plain-obj": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -3242,9 +3267,9 @@
 			"dev": true
 		},
 		"js-sdsl": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-			"integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
+			"integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==",
 			"dev": true
 		},
 		"js-tokens": {
@@ -3299,9 +3324,9 @@
 			"dev": true
 		},
 		"json5": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-			"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+			"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
 			"dev": true,
 			"requires": {
 				"minimist": "^1.2.0"
@@ -3685,18 +3710,18 @@
 			"dev": true
 		},
 		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+			"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
 			"dev": true,
 			"requires": {
 				"brace-expansion": "^1.1.7"
 			}
 		},
 		"minimist": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-			"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
+			"integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
 			"dev": true
 		},
 		"minimist-options": {
@@ -4513,9 +4538,9 @@
 			"dev": true
 		},
 		"postcss": {
-			"version": "8.4.16",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-			"integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+			"version": "8.4.21",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+			"integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
 			"dev": true,
 			"requires": {
 				"nanoid": "^3.3.4",
@@ -4552,14 +4577,14 @@
 			}
 		},
 		"postcss-cli": {
-			"version": "10.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.0.0.tgz",
-			"integrity": "sha512-Wjy/00wBBEgQqnSToznxLWDnATznokFGXsHtF/3G8glRZpz5KYlfHcBW/VMJmWAeF2x49zjgy4izjM3/Wx1dKA==",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.1.0.tgz",
+			"integrity": "sha512-Zu7PLORkE9YwNdvOeOVKPmWghprOtjFQU3srMUGbdz3pHJiFh7yZ4geiZFMkjMfB0mtTFR3h8RemR62rPkbOPA==",
 			"dev": true,
 			"requires": {
 				"chokidar": "^3.3.0",
 				"dependency-graph": "^0.11.0",
-				"fs-extra": "^10.0.0",
+				"fs-extra": "^11.0.0",
 				"get-stdin": "^9.0.0",
 				"globby": "^13.0.0",
 				"picocolors": "^1.0.0",
@@ -4567,7 +4592,7 @@
 				"postcss-reporter": "^7.0.0",
 				"pretty-hrtime": "^1.0.3",
 				"read-cache": "^1.0.0",
-				"slash": "^4.0.0",
+				"slash": "^5.0.0",
 				"yargs": "^17.0.0"
 			},
 			"dependencies": {
@@ -4587,13 +4612,13 @@
 					}
 				},
 				"cliui": {
-					"version": "7.0.4",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-					"integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+					"version": "8.0.1",
+					"resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+					"integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
 					"dev": true,
 					"requires": {
 						"string-width": "^4.2.0",
-						"strip-ansi": "^6.0.0",
+						"strip-ansi": "^6.0.1",
 						"wrap-ansi": "^7.0.0"
 					}
 				},
@@ -4619,9 +4644,9 @@
 					"dev": true
 				},
 				"fast-glob": {
-					"version": "3.2.11",
-					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
-					"integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+					"version": "3.2.12",
+					"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+					"integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
 					"dev": true,
 					"requires": {
 						"@nodelib/fs.stat": "^2.0.2",
@@ -4638,9 +4663,9 @@
 					"dev": true
 				},
 				"globby": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz",
-					"integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==",
+					"version": "13.1.3",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-13.1.3.tgz",
+					"integrity": "sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==",
 					"dev": true,
 					"requires": {
 						"dir-glob": "^3.0.1",
@@ -4648,12 +4673,20 @@
 						"ignore": "^5.2.0",
 						"merge2": "^1.4.1",
 						"slash": "^4.0.0"
+					},
+					"dependencies": {
+						"slash": {
+							"version": "4.0.0",
+							"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+							"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+							"dev": true
+						}
 					}
 				},
 				"ignore": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-					"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+					"version": "5.2.4",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+					"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
 					"dev": true
 				},
 				"is-fullwidth-code-point": {
@@ -4679,9 +4712,9 @@
 					"dev": true
 				},
 				"slash": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-					"integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-5.0.0.tgz",
+					"integrity": "sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ==",
 					"dev": true
 				},
 				"string-width": {
@@ -4722,24 +4755,24 @@
 					"dev": true
 				},
 				"yargs": {
-					"version": "17.5.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-					"integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+					"version": "17.6.2",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+					"integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
 					"dev": true,
 					"requires": {
-						"cliui": "^7.0.2",
+						"cliui": "^8.0.1",
 						"escalade": "^3.1.1",
 						"get-caller-file": "^2.0.5",
 						"require-directory": "^2.1.1",
 						"string-width": "^4.2.3",
 						"y18n": "^5.0.5",
-						"yargs-parser": "^21.0.0"
+						"yargs-parser": "^21.1.1"
 					}
 				},
 				"yargs-parser": {
-					"version": "21.0.1",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-					"integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+					"version": "21.1.1",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+					"integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
 					"dev": true
 				}
 			}
@@ -4756,20 +4789,15 @@
 			}
 		},
 		"postcss-custom-media": {
-			"version": "8.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-			"integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+			"version": "9.1.1",
+			"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-9.1.1.tgz",
+			"integrity": "sha512-veQwzQkHgBkizxYCV/EBsiK8sFIJA0oQMQL9mpQ3gqFGc2dWlNWURHk4J44i9Q0dFeFCK81vV/Xpj7fyfNQKSA==",
 			"dev": true,
 			"requires": {
-				"postcss-value-parser": "^4.2.0"
-			},
-			"dependencies": {
-				"postcss-value-parser": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-					"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-					"dev": true
-				}
+				"@csstools/cascade-layer-name-parser": "^1.0.0",
+				"@csstools/css-parser-algorithms": "^2.0.0",
+				"@csstools/css-tokenizer": "^2.0.0",
+				"@csstools/media-query-list-parser": "^2.0.0"
 			}
 		},
 		"postcss-discard-duplicates": {
@@ -4779,18 +4807,18 @@
 			"dev": true
 		},
 		"postcss-focus-within": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-6.1.1.tgz",
-			"integrity": "sha512-3NwCIuP/VQMzKbGS7sxCN8tquUhZSeQg9GGS6krST9dF9R243OvP0+zRBTlO2KgWNotyO4HVB7bwNqWRXicr0Q==",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-7.0.1.tgz",
+			"integrity": "sha512-iSpk018Yqn0xwltFR7NHjagyt+e/6u8w50uEnGOcFOddLay5zQFjpJBg6euEZu7wY5WDq83DPpdO99eL+8Er8g==",
 			"dev": true,
 			"requires": {
 				"postcss-selector-parser": "^6.0.10"
 			},
 			"dependencies": {
 				"postcss-selector-parser": {
-					"version": "6.0.10",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-					"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+					"version": "6.0.11",
+					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+					"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
 					"dev": true,
 					"requires": {
 						"cssesc": "^3.0.0",
@@ -4846,9 +4874,9 @@
 			},
 			"dependencies": {
 				"yaml": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-					"integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.2.1.tgz",
+					"integrity": "sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==",
 					"dev": true
 				}
 			}
@@ -4860,42 +4888,82 @@
 			"dev": true
 		},
 		"postcss-merge-rules": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz",
-			"integrity": "sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==",
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz",
+			"integrity": "sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.16.6",
+				"browserslist": "^4.21.4",
 				"caniuse-api": "^3.0.0",
 				"cssnano-utils": "^3.1.0",
 				"postcss-selector-parser": "^6.0.5"
 			},
 			"dependencies": {
+				"browserslist": {
+					"version": "4.21.5",
+					"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz",
+					"integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+					"dev": true,
+					"requires": {
+						"caniuse-lite": "^1.0.30001449",
+						"electron-to-chromium": "^1.4.284",
+						"node-releases": "^2.0.8",
+						"update-browserslist-db": "^1.0.10"
+					}
+				},
+				"caniuse-lite": {
+					"version": "1.0.30001450",
+					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz",
+					"integrity": "sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew==",
+					"dev": true
+				},
+				"electron-to-chromium": {
+					"version": "1.4.286",
+					"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.286.tgz",
+					"integrity": "sha512-Vp3CVhmYpgf4iXNKAucoQUDcCrBQX3XLBtwgFqP9BUXuucgvAV9zWp1kYU7LL9j4++s9O+12cb3wMtN4SJy6UQ==",
+					"dev": true
+				},
+				"node-releases": {
+					"version": "2.0.10",
+					"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz",
+					"integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+					"dev": true
+				},
 				"postcss-selector-parser": {
-					"version": "6.0.10",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-					"integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+					"version": "6.0.11",
+					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+					"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
 					"dev": true,
 					"requires": {
 						"cssesc": "^3.0.0",
 						"util-deprecate": "^1.0.2"
 					}
+				},
+				"update-browserslist-db": {
+					"version": "1.0.10",
+					"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+					"integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+					"dev": true,
+					"requires": {
+						"escalade": "^3.1.1",
+						"picocolors": "^1.0.0"
+					}
 				}
 			}
 		},
 		"postcss-nested": {
-			"version": "5.0.6",
-			"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz",
-			"integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==",
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
+			"integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
 			"dev": true,
 			"requires": {
-				"postcss-selector-parser": "^6.0.6"
+				"postcss-selector-parser": "^6.0.10"
 			},
 			"dependencies": {
 				"postcss-selector-parser": {
-					"version": "6.0.6",
-					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-					"integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+					"version": "6.0.11",
+					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+					"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
 					"dev": true,
 					"requires": {
 						"cssesc": "^3.0.0",
@@ -5011,12 +5079,6 @@
 			"integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
 			"dev": true
 		},
-		"prettier": {
-			"version": "npm:wp-prettier@2.2.1-beta-1",
-			"resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz",
-			"integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==",
-			"dev": true
-		},
 		"prettier-linter-helpers": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
@@ -5373,9 +5435,9 @@
 			"dev": true
 		},
 		"sass": {
-			"version": "1.55.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz",
-			"integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==",
+			"version": "1.58.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.58.0.tgz",
+			"integrity": "sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==",
 			"dev": true,
 			"requires": {
 				"chokidar": ">=3.0.0 <4.0.0",
diff --git a/src/wp-content/themes/twentytwentyone/package.json b/src/wp-content/themes/twentytwentyone/package.json
index fd3ef724ce25f..048d3c8ede300 100644
--- a/src/wp-content/themes/twentytwentyone/package.json
+++ b/src/wp-content/themes/twentytwentyone/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "twentytwentyone",
-	"version": "1.7.0",
+	"version": "1.9.0",
 	"description": "Default WP Theme",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -13,25 +13,25 @@
 	},
 	"homepage": "https://wordpress.org/themes/twentytwentyone/",
 	"devDependencies": {
-		"@wordpress/browserslist-config": "^5.1.0",
+		"@wordpress/browserslist-config": "^5.9.0",
 		"@wordpress/eslint-plugin": "^9.3.0",
 		"@wordpress/stylelint-config": "^19.1.0",
-		"autoprefixer": "^10.4.12",
+		"autoprefixer": "^10.4.13",
 		"chokidar-cli": "^3.0.0",
-		"eslint": "^8.23.1",
-		"minimist": "^1.2.6",
+		"eslint": "^8.33.0",
+		"minimist": "^1.2.7",
 		"npm-run-all": "^4.1.5",
-		"postcss": "^8.4.16",
+		"postcss": "^8.4.21",
 		"postcss-calc": "^8.2.4",
-		"postcss-cli": "^10.0.0",
+		"postcss-cli": "^10.1.0",
 		"postcss-css-variables": "^0.18.0",
-		"postcss-custom-media": "^8.0.2",
+		"postcss-custom-media": "^9.1.1",
 		"postcss-discard-duplicates": "^5.1.0",
-		"postcss-focus-within": "^6.1.1",
-		"postcss-merge-rules": "^5.1.2",
-		"postcss-nested": "^5.0.6",
+		"postcss-focus-within": "^7.0.1",
+		"postcss-merge-rules": "^5.1.3",
+		"postcss-nested": "^6.0.0",
 		"rtlcss": "^4.0.0",
-		"sass": "^1.55.0",
+		"sass": "^1.58.0",
 		"stylelint": "^13.13.1",
 		"stylelint-config-recommended-scss": "^5.0.2"
 	},
diff --git a/src/wp-content/themes/twentytwentyone/readme.txt b/src/wp-content/themes/twentytwentyone/readme.txt
index eb90941a93b2b..539916d55ff3e 100644
--- a/src/wp-content/themes/twentytwentyone/readme.txt
+++ b/src/wp-content/themes/twentytwentyone/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Twenty-One ===
 Contributors: wordpressdotorg
 Requires at least: 5.3
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.6
-Stable tag: 1.7
+Stable tag: 1.9
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -30,49 +30,59 @@ No data is saved in the database or transferred.
 
 == Changelog ==
 
+= 1.9 =
+* Released: August 8, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.9
+
+= 1.8 =
+* Released: March 28, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.8
+
 = 1.7 =
 * Released: November 1, 2022
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.7
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.7
 
 = 1.6 =
 * Released: May 24, 2022
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.6
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.6
 
 = 1.5 =
 * Released: January 25, 2022
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.5
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.5
 
 = 1.4 =
 * Released: July 20, 2021
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.4
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.4
 
 = 1.3 =
 * Released: April 14, 2021
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.3
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.3
 
 = 1.2 =
 * Released: March 9, 2021
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.2
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.2
 
 = 1.1 =
 * Released: December 22, 2020
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.1
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.1
 
 = 1.0 =
 * Released: December 8, 2020
 
-https://wordpress.org/support/article/twenty-twenty-one-changelog#Version_1.0
+https://wordpress.org/documentation/article/twenty-twenty-one-changelog/#Version_1.0
 
 == Copyright ==
 
-Twenty Twenty-One WordPress Theme, 2020-2022 WordPress.org
+Twenty Twenty-One WordPress Theme, 2020-2023 WordPress.org
 Twenty Twenty-One is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
@@ -90,19 +100,19 @@ Twenty Twenty-One is derived from Seedlet, (C) 2020 Automattic, Inc.
 
 Twenty Twenty-One is also based on:
 
-Twenty Nineteen. 2018-2022 WordPress.org
+Twenty Nineteen. 2018-2023 WordPress.org
 Twenty Nineteen is distributed under the terms of the GNU GPL v2 or later.
 
-Twenty Seventeen. Copyright (C) 2016-2022 WordPress.org
+Twenty Seventeen. Copyright (C) 2016-2023 WordPress.org
 Twenty Seventeen is distributed under the terms of the GNU GPL v2 or later.
 
-Twenty Sixteen. Copyright (C) 2015-2022 WordPress.org
+Twenty Sixteen. Copyright (C) 2015-2023 WordPress.org
 Twenty Sixteen is distributed under the terms of the GNU GPL v2 or later.
 
-Twenty Twenty. Copyright (C) 2020-2022 WordPress.org
+Twenty Twenty. Copyright (C) 2020-2023 WordPress.org
 Twenty Twenty is distributed under the terms of the GNU GPL v2 or later.
 
-Underscores https://underscores.me/, Copyright (C) 2012-2022 Automattic, Inc.
+Underscores https://underscores.me/, Copyright (C) 2012-2023 Automattic, Inc.
 Underscores is distributed under the terms of the GNU GPL v2 or later.
 
 Normalizing styles have been helped along thanks to the fine work of
diff --git a/src/wp-content/themes/twentytwentyone/style-rtl.css b/src/wp-content/themes/twentytwentyone/style-rtl.css
index 5880cd2f05c59..2b863b1588cee 100644
--- a/src/wp-content/themes/twentytwentyone/style-rtl.css
+++ b/src/wp-content/themes/twentytwentyone/style-rtl.css
@@ -7,9 +7,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog.
 Requires at least: 5.3
-Tested up to: 6.0
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.7
+Version: 1.9
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
@@ -2711,14 +2711,6 @@ dd {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: var(--primary-nav--font-family);
 	font-size: var(--primary-nav--font-size);
@@ -2736,7 +2728,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	right: 0;
-	margin-right: var(--primary-nav--padding);
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -2744,22 +2735,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: var(--global--color-background);
 	margin: 0;
@@ -2835,6 +2814,11 @@ pre.wp-block-preformatted {
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: var(--pullquote--font-style);
+	font-family: var(--pullquote--font-family);
+	letter-spacing: var(--pullquote--letter-spacing);
+	line-height: var(--pullquote--line-height);
 
 	/**
    * Block Options
@@ -2853,12 +2837,12 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-pullquote p {
-	font-family: var(--pullquote--font-family);
-	font-size: var(--pullquote--font-size);
-	font-style: var(--pullquote--font-style);
-	font-weight: 700;
-	letter-spacing: var(--pullquote--letter-spacing);
-	line-height: var(--pullquote--line-height);
+	font-family: inherit;
+	font-size: inherit;
+	font-style: inherit;
+	font-weight: inherit;
+	letter-spacing: inherit;
+	line-height: inherit;
 	margin: 0;
 }
 
diff --git a/src/wp-content/themes/twentytwentyone/style.css b/src/wp-content/themes/twentytwentyone/style.css
index 45600e20fcd09..88302eb38cfe8 100644
--- a/src/wp-content/themes/twentytwentyone/style.css
+++ b/src/wp-content/themes/twentytwentyone/style.css
@@ -7,9 +7,9 @@ Author: the WordPress team
 Author URI: https://wordpress.org/
 Description: Twenty Twenty-One is a blank canvas for your ideas and it makes the block editor your best brush. With new block patterns, which allow you to create a beautiful layout in a matter of seconds, this theme’s soft colors and eye-catching — yet timeless — design will let your work shine. Take it for a spin! See how Twenty Twenty-One elevates your portfolio, business website, or personal blog.
 Requires at least: 5.3
-Tested up to: 6.0
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.7
+Version: 1.9
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentyone
@@ -2721,14 +2721,6 @@ dd {
 	border: calc(3 * var(--separator--height)) solid var(--global--color-border);
 }
 
-.wp-block-navigation .wp-block-navigation-link {
-	padding: 0;
-}
-
-.wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__content {
-	padding: var(--primary-nav--padding);
-}
-
 .wp-block-navigation .wp-block-navigation-link .wp-block-navigation-link__label {
 	font-family: var(--primary-nav--font-family);
 	font-size: var(--primary-nav--font-size);
@@ -2746,7 +2738,6 @@ dd {
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container {
 	border: none;
 	left: 0;
-	margin-left: var(--primary-nav--padding);
 	min-width: max-content;
 	opacity: 0;
 	padding: 0;
@@ -2754,22 +2745,10 @@ dd {
 	top: inherit;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link .wp-block-navigation-link__content {
-	display: inline-block;
-	padding: calc(0.5 * var(--primary-nav--padding)) var(--primary-nav--padding);
-}
-
 .wp-block-navigation > .wp-block-navigation__container .has-child .wp-block-navigation__container .wp-block-navigation-link__submenu-icon {
 	display: none;
 }
 
-.wp-block-navigation > .wp-block-navigation__container .has-child:hover .wp-block-navigation__container,
-.wp-block-navigation > .wp-block-navigation__container .has-child:focus-within .wp-block-navigation__container {
-	display: block;
-	opacity: 1;
-	visibility: visible;
-}
-
 .wp-block-navigation > .wp-block-navigation__container > .has-child > .wp-block-navigation__container {
 	background: var(--global--color-background);
 	margin: 0;
@@ -2845,6 +2824,11 @@ pre.wp-block-preformatted {
 	color: currentColor;
 	border-color: currentColor;
 	position: relative;
+	font-weight: 700;
+	font-style: var(--pullquote--font-style);
+	font-family: var(--pullquote--font-family);
+	letter-spacing: var(--pullquote--letter-spacing);
+	line-height: var(--pullquote--line-height);
 
 	/**
    * Block Options
@@ -2863,12 +2847,12 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-pullquote p {
-	font-family: var(--pullquote--font-family);
-	font-size: var(--pullquote--font-size);
-	font-style: var(--pullquote--font-style);
-	font-weight: 700;
-	letter-spacing: var(--pullquote--letter-spacing);
-	line-height: var(--pullquote--line-height);
+	font-family: inherit;
+	font-size: inherit;
+	font-style: inherit;
+	font-weight: inherit;
+	letter-spacing: inherit;
+	line-height: inherit;
 	margin: 0;
 }
 
diff --git a/src/wp-content/themes/twentytwentyone/style.css.map b/src/wp-content/themes/twentytwentyone/style.css.map
index 7961f4e64a9d8..4cf0fa9012507 100644
--- a/src/wp-content/themes/twentytwentyone/style.css.map
+++ b/src/wp-content/themes/twentytwentyone/style.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["assets/sass/01-settings/file-header.scss","assets/sass/style.scss","assets/sass/01-settings/global.scss","assets/sass/03-generic/normalize.scss","assets/sass/03-generic/breakpoints.scss","assets/sass/03-generic/vertical-margins.scss","assets/sass/03-generic/reset.scss","assets/sass/03-generic/clearings.scss","assets/sass/04-elements/blockquote.scss","assets/sass/04-elements/forms.scss","assets/sass/04-elements/media.scss","assets/sass/04-elements/misc.scss","assets/sass/04-elements/links.scss","assets/sass/05-blocks/audio/_style.scss","assets/sass/05-blocks/button/_style.scss","assets/sass/02-tools/mixins.scss","assets/sass/05-blocks/code/_style.scss","assets/sass/05-blocks/columns/_style.scss","assets/sass/05-blocks/cover/_style.scss","assets/sass/05-blocks/file/_style.scss","assets/sass/05-blocks/gallery/_style.scss","assets/sass/05-blocks/group/_style.scss","assets/sass/05-blocks/heading/_style.scss","assets/sass/05-blocks/image/_style.scss","assets/sass/05-blocks/latest-comments/_style.scss","assets/sass/05-blocks/latest-posts/_style.scss","assets/sass/05-blocks/legacy/_style.scss","assets/sass/05-blocks/list/_style.scss","assets/sass/05-blocks/media-text/_style.scss","assets/sass/05-blocks/navigation/_style.scss","assets/sass/05-blocks/paragraph/_style.scss","assets/sass/05-blocks/preformatted/_style.scss","assets/sass/05-blocks/pullquote/_style.scss","assets/sass/05-blocks/query-loop/_style.scss","assets/sass/05-blocks/quote/_style.scss","assets/sass/05-blocks/rss/_style.scss","assets/sass/05-blocks/search/_style.scss","assets/sass/05-blocks/separator/_style.scss","assets/sass/05-blocks/social-icons/_style.scss","assets/sass/05-blocks/table/_style.scss","assets/sass/05-blocks/tag-clould/_style.scss","assets/sass/05-blocks/verse/_style.scss","assets/sass/05-blocks/video/_style.scss","assets/sass/05-blocks/utilities/_font-sizes.scss","assets/sass/05-blocks/utilities/_style.scss","assets/sass/06-components/header.scss","assets/sass/06-components/footer.scss","assets/sass/06-components/single.scss","assets/sass/06-components/posts-and-pages.scss","assets/sass/06-components/entry.scss","assets/sass/06-components/archives.scss","assets/sass/06-components/404.scss","assets/sass/06-components/search.scss","assets/sass/06-components/comments.scss","assets/sass/06-components/navigation.scss","assets/sass/06-components/footer-navigation.scss","assets/sass/06-components/pagination.scss","assets/sass/06-components/widgets.scss","assets/sass/07-utilities/a11y.scss","assets/sass/07-utilities/color-palette.scss","assets/sass/07-utilities/measure.scss","assets/sass/07-utilities/ie.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;ACEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA4EA;AC9EA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAEA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;EAGC;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA,QACQ;EACP;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA,SACS;EACR;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;EAEC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AC5VD;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;AAAA;EACC;EACA;EACA;;;AAGD;AAAA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAvGC;EA2GD;IACC;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;;;AAvHC;EAqJD;AAEC;IACA;AAEA;IACA;;;AA3JA;EAyKD;AAEC;IACA;AAEA;IACA;;;ACzMF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASA;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;ADCC;ECHF;IAKE;;;;AAIF;AAAA;AAAA;AAAA;AAIA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;;AAIF;AAAA;AAAA;AAOA;AAAA;AAAA;AAOA;AAAA;AAAA;AAQA;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;ADxEC;ECgEF;AAAA;AAAA;AAAA;AAAA;AAAA;IAWE;IACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;EAEC;EACA;;AD3FC;ECwFF;AAAA;IAME;IACA;;;;AAIF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EACC;;;AAKF;AAAA;AAAA;AAAA;AAIA;AAeC;;AAbA;EAKC;;AAGD;EAEC;;AAID;EAEC;;;AC1KF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAwBC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAMA;AAEC;EACA;EAGA;EACA;;;AAGD;AAAA;AAAA;AAKC;EAGC;;;AAKF;EACC;EACA;EACA;EACA;EACA;;;AAID;EACC;;;ACzED;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAYC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;;;ANoED;AO3FA;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AJlDA;EIpBF;IA0EE;;EAEA;IACC;;;;AC7EH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAeC;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAOD;EACC;;AAEA;EACC;;;AAKH;EACC;EACA;;;AAGD;AAAA;AAGC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AAGD;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAKA;EAEC;AAAA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;AAAA;IACC;;EAGD;AAAA;IACC;;EAMD;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAKH;IACC;;EAEA;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAID;IACC;IACA;;;AAMJ;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;IACC;IACA;IACA;IACA;IACA;IACA;;EAEA;IACC;;EAIF;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;;AAEA;EACC;;AAKA;EACC;;AAGD;EACC;;AAGD;EAEC;;AAGD;EAEC;EACA;EACA;;;AAKH;EACC;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;;AL7RA;EK4RD;IAGE;;;;ACrUH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AACA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;EAIC;;;AAGD;EACC;EACA;;;ACfD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AXwBF;AYhGC;EACC;EACA;;;ACJF;AAAA;AAAA;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ECmBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAID;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;;AAID;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;ADhEF;AAAA;AAAA;AAWG;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;EACA;EACA;;AAUA;EAGC;;AAID;EACC;;AAGA;EACC;;AAMD;EACC;;AAKF;EACC;;AAIF;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;;AAMH;EACC;;;AAIF;AAAA;EAEC;EACA;;;AExHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;;;ACTD;EACC;;AAKA;EACC;EACA;;AbgBD;EalBA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AAIF;EACC;;AAIF;EACC;;AbNA;EaKD;IAIE;;;Ab2BD;Ea/BD;IAQE;;;AAIF;EAEC;;AbKA;EaCE;IACC;IACA;IACA;;EAcC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IACC;IACA;;EAKF;AAAA;IAEC;;EAGD;IACC;;;AAWH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;;ACpGJ;AAAA;EAYC;EACA;EACA;EACA;AAkBA;AAUA;AA+DA;AAKA;;AA5GA;AAAA;EACC;;AAGD;AAAA;EACC;EACA;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAOD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKF;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAIF;AAAA;EAEC;;AAEA;AAAA;EACC;EACA;;Ad7CD;Ec2CA;AAAA;IAKE;IACA;;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAKH;AAAA;AAAA;EAEC;;AAEA;AAAA;AAAA;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;EAEC;;AAID;AAAA;EACC;;AAID;AAAA;EACC;;;AC9GD;AAAA;AAAA;EAGC;;AAGD;EACC;;;ACVF;EAEC;;AAEA;AAAA;EAIC;;AAEA;AAAA;EACC;EAEA;EACA;;AAEA;AAAA;EACC;;AAEA;AAAA;EACC;EACA;EACA;;AAKH;AAAA;EACC;;;AC5BH;EAIC;EACA;EAEA;;AAEA;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AjBGD;EiBLA;IASE;IACA;;;AAGD;EACC;;AAGD;EACC;;AAKH;EACC;;AjBnBA;EiBkBD;IAIE;;;AAKF;EACC;EACA;;AAOA;AAAA;AAAA;EAEC;EACA;EACA;;;AClEH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAYC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AC/DD;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKF;AAAA;EAEC;EACA;;AAGA;AAAA;EACC;;;AAKF;AAAA;EAEC;;;AAGD;EACC;;;AnBlBC;EmByBA;AAAA;IAGE;;;AnBlCF;EmB+BA;AAAA;IAME;IACA;;;;AC1DJ;EACC;;AAEA;EACC;EACA;AAEA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;;;AChCF;EACC;;AAGA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;AAKF;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;;AAIF;EACC;EACA;;;AC/KH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;AAID;EACC;;;ACrDD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AC1CD;AAqCC;AAAA;AAAA;;AAnCA;EACC;EACA;;AAGD;EACC;;AAGD;EACC;;AxB0BA;EwB3BD;IAIE;;;AAGD;EACC;EACA;;AxBMD;EwBRA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AxBNF;EwBeD;IAEE;IACA;;;AAKF;EACC;;;AChDD;EACC;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAIF;EACC;;AAQC;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIC;EACC;EACA;;AAIF;EACC;;AAOD;EACC;EACA;EACA;;AAOF;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAQH;EACC;;AAEA;EACC;;AAWA;EAEC;;AAGD;EACC;EACA;;AAKH;EACC;;;AC5HH;EAEC;;AAGA;EACC;;AAID;EACC;;;ACXF;EACC;EACA;;;ACFD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAqCA;AAAA;AAAA;;AAnCA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;;AAMD;EACC;;AAKA;AAAA;EAEC;;AAIF;EAEC;;AAGD;EAEC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EAPD;IAQE;;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;AAGD;EAEC;;AAEA;EACC;;;ACvGH;EACC;;A7BuBA;E6BxBD;IAIE;;;;ACNH;EACC;AAqBA;AAAA;AAAA;;AAnBA;EACC;EACA;EACA;EACA;;AAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAOF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;EACA;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;;A9B3ED;E8BiCD;IA8CE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A9BhGF;E8BuGA;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;;ACtIH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAIC;EACC;;AAIF;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;EACA;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAOF;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAIF;EACC;;AAGA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAIF;EACC;;;AAOL;EACC;;;AClHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;AAiBA;AAAA;AAAA;;AAfA;EACC;;AAKA;EACC;;AAGD;EACC;;AAOF;EACC;;AAKA;EAEC;;AAEA;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAIF;EAIC;;;ACtDF;EACC;;AAKA;EACC;;AAGD;EAEC;;;ACdH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;EACA;;AAGD;AAAA;EACC;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;AC9FD;EACC;EACA;;;ACJF;EACC;;;ACCA;EACC;EACA;EACA;EACA;EACA;;;AAIF;EACC;EACA;EACA;;;ACXA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAEA;AAAA;AAAA;AAQA;AAAA;AAAA;AAGA;AAEC;EACA;EAEA;;;AAKD;EACC;;;AxCEC;EwCID;AAEC;IACA;AAEA;IACA;IACA;;EAGD;IACC;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;EACA;;;AAKD;EACC;;;AxC3CC;EwCiDD;AAEC;IACA;AAEA;IACA;;EAGD;IACC;;;AAKF;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAGA;EACC;;;AAQD;AAAA;AAAA;AAGA;EACC;;;AAUD;EACC;;;AAGD;EACC;;;AAID;EACC;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAGD;EACC;;AxChIC;EwC+HF;IAIE;;;;A3CxDF;A4CpGA;EAEC;EACA;EACA;EACA;;AAEA;EACC;;AzCiBA;EyCzBF;IAYE;;;AzCiDA;EyC7DF;IAgBE;;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;AzCHA;EyCJF;IAWE;IACA;;;;AAKF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EAEC;;AzCnCD;EyCaF;IA4BE;;;;AAKF;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAID;EAEC;;AAEA;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AzC5EA;EyCiFA;IACC;IACA;IACA;IACA;;;;AzC3FD;EyC0GG;IACC;IACA;IACA;IACA;;EAEA;IACC;;EAGD;IACC;;EAMJ;IACC;;EAEA;IACC;;EAEA;IACC;;EAIF;IACC;;EAKA;IACC;;EAGD;IACC;IACA;;EAGD;IACC;IACA;IACA;;EAEA;IAGC;IACA;IACA;;EAWH;IACC;IACA;;EAKH;IACC;;;ACrMH;EACC;EACA;;AAIA;EACC;;A1CYA;E0CPA;IACC;;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;AAAA;EAEC;;A1C2BA;E0C1CF;IAmBE;IACA;;EAEA;IACC;;EAGD;AAAA;IAEC;IACA;;EAGD;IACC;;;AAIF;EACC;;AAEA;EAGC;;AAGD;EACC;;AAGD;EACC;;AAEA;EACC;;AAID;EACC;;;AC/EJ;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;ACXD;EACC;;;AAID;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;ACpBH;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKH;EACC;;;AAGD;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAKA;EACC;;AAID;EAEC;EACA;;AASF;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EAEC;;AAGD;EACC;;;AAMH;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EAEC;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;EAIC;;A7C1GA;E6CiFF;IA6BE;;EAEA;IACC;;EAGD;AAAA;IAEC;;;;AAKH;AAAA;AAAA;AAIA;EAEC;;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAIF;AAAA;AAAA;AAIA;EACC;EACA;EACA;;AAEA;EACC;;AAMA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;;AC9MH;EACC;;;AAGD;AAAA;EAEC;;;AAGD;EACC;;;AAGD;EACC;EACA;;;AAaE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAUF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;AAQA;AAAA;AAAA;EACC;;;AAMJ;EACC;EACA;EACA;;;AClED;EACC;EACA;;;ACFD;EACC;;;ACDD;AAAA;AAAA;AAKC;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAGD;EACC;;;AAMH;AAAA;AAAA;AAIA;AAAA;EAEC;EACA;;;AAGD;EACC;EACA;;AAIC;EACC;EACA;EACA;EACA;EACA;;;AAKH;AACA;EACC;;;AAGD;AAAA;AAAA;AAGA;EACC;EACA;;AAEA;EACC;EACA;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;;;AjD/DA;EiDoEF;AAAA;IAGE;;;;AAIF;AAAA;AAAA;AAKC;EACC;EACA;;AjDlFA;EiDgFD;IAKE;IACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAKF;EACC;EACA;EACA;;AAEA;EACC;;AjD1GD;EiD8EF;IAkCE;;EAEA;IACC;;;;AAKH;EACC;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;EAEC;;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;;AAIF;EACC;;;AAID;AAAA;EAEC;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EACC;;;AAKH;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;EAEC;;AAGD;AAAA;EAEC;EACA;;AjD3NA;EiDwND;AAAA;IAME;;;AAIF;AAAA;EAEC;EACA;;;AAIF;EACC;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AjD3PA;EiDgQA;IACC;;EAGD;IAEC;;;;AC5RH;EACC;EACA;EACA;EACA;EACA;EACA;;AlDUC;EkDhBF;IASE;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAID;EACC;EACA;;AAGD;EACC;;AAQA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAQL;EACC;EACA;EACA;;AAEA;EACC;;;AAKH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAhBD;IAiBE;;;AlDtFD;EkDqED;IAqBE;IACA;IACA;IACA;IACA;;EAEA;IACC;IACA;;EAGD;IACC;;EAGD;IACC;;EAGD;IACC;;;AlD9GF;EkDoHD;IAGE;IACA;IACA;;;AAGD;EACC;EACA;EACA;EACA;;AlDhID;EkDuIC;IACC;;;AlDlIF;EkDoDF;IAoFE;IACA;;EAGA;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAID;IACC;;EAID;IACC;;EAID;IACC;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AlDzLA;EkDiLD;IAWE;;EAEA;IACC;;;AAIF;EACC;EACA;EACA;;AlDhMD;EkD6LA;IAME;IACA;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;AlD/NF;EkDmNA;IAgBE;;;AAGD;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;EACC;;AAIF;EACC;;AAMA;EACC;;AAGD;EACC;;AAMH;EAEC;;AAGC;EALF;IAMG;;;AlDnQH;EkD6PA;IAWE;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;;EAGD;IACC;;EAGD;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;EAIF;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;;AAQL;EACC;;AlDjVA;EkDoVD;IAGE;IACA;;EAGA;IACC;;EAEA;IACC;IACA;;EAEA;IACC;;;AAQL;EACC;EACA;EACA;EACA;EACA;EACA;;AlDjXA;EkD2WD;IASE;IACA;IACA;IACA;;;AAGD;EACC;;AAGD;EAGC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;EACA;;AAKF;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AlDraD;EkD4aC;IACC;;;AlDnbF;EkD2bE;IACC;;;AAKF;EACC;EACA;EACA;EACA;;AlD/bF;EkD2bC;IAOE;IACA;;;AASH;EACC;;AlD7cD;EkDkdC;IACC;IACA;;EAGD;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AlD5eD;EkDofD;IACC;IACA;IACA;;;AAKF;EAEC;IACC;;EAGD;IACC;;;ACthBF;EACC;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EAEA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;EACA;EACA;;AAOC;EACC;;AAOD;EACC;;AAMJ;EACC;EACA;;AAEA;EACC;;AAGD;EARD;IASE;;;AAKH;AAAA;EAEC;;;ACzEF;AAGA;EACC;;AAEA;EACC;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAMD;EACC;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;;ApDDD;EoDbD;IAkBE;IACA;IACA;;EAEA;AAAA;IAEC;IACA;IACA;IACA;;EAGD;IACC;;;AAKH;EACC;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;EAEC;EACA;;;AAKF;EAEC;;ApDtBC;EoDoBF;IAKE;;;AAKD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;;ApDxCA;EoDmCD;IAOE;;;ApD9ED;EoDkFD;IAEE;;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAMH;AAAA;EAGC;EACA;EACA;;ApDzEC;EoDoEF;AAAA;IAQE;;;AAMD;AAAA;EACC;;AAEA;AAAA;EACC;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKH;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;ApDhJD;EoDsJA;AAAA;IACC;IACA;;EAGD;AAAA;IACC;;EAEA;AAAA;AAAA;IAEC;IACA;;;ApDrMF;EoD4MA;AAAA;IACC;;;;AAMH;EACC;EACA;;ApD3KC;EoDyKF;IAKE;;;AAGD;EACC;;;AChPF;EAEC;EACA;EACA;EACA;EACA;;ArD4CC;EqDlDF;IASE;IACA;IACA;;;ArD+DA;EqD1EF;IAeE;;;ArDKA;EqDpBF;IAmBE;;;AAKA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EAEC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;;;AAMH;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AxDvCD;AyDpHA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;;;ACpCD;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AChRD;AAAA;AAAA;EAGC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;;AClBA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;AAGD;AAAA;AAAA;AAAA;EAIC;;AAGD;EACC;;AzDPD;EyDaE;AAAA;IAEC;;;AAKH;EACC;;AAIF;EACC;;AAGD;EACC","file":"style.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["assets/sass/01-settings/file-header.scss","assets/sass/style.scss","assets/sass/01-settings/global.scss","assets/sass/03-generic/normalize.scss","assets/sass/03-generic/breakpoints.scss","assets/sass/03-generic/vertical-margins.scss","assets/sass/03-generic/reset.scss","assets/sass/03-generic/clearings.scss","assets/sass/04-elements/blockquote.scss","assets/sass/04-elements/forms.scss","assets/sass/04-elements/media.scss","assets/sass/04-elements/misc.scss","assets/sass/04-elements/links.scss","assets/sass/05-blocks/audio/_style.scss","assets/sass/05-blocks/button/_style.scss","assets/sass/02-tools/mixins.scss","assets/sass/05-blocks/code/_style.scss","assets/sass/05-blocks/columns/_style.scss","assets/sass/05-blocks/cover/_style.scss","assets/sass/05-blocks/file/_style.scss","assets/sass/05-blocks/gallery/_style.scss","assets/sass/05-blocks/group/_style.scss","assets/sass/05-blocks/heading/_style.scss","assets/sass/05-blocks/image/_style.scss","assets/sass/05-blocks/latest-comments/_style.scss","assets/sass/05-blocks/latest-posts/_style.scss","assets/sass/05-blocks/legacy/_style.scss","assets/sass/05-blocks/list/_style.scss","assets/sass/05-blocks/media-text/_style.scss","assets/sass/05-blocks/navigation/_style.scss","assets/sass/05-blocks/paragraph/_style.scss","assets/sass/05-blocks/preformatted/_style.scss","assets/sass/05-blocks/pullquote/_style.scss","assets/sass/05-blocks/query-loop/_style.scss","assets/sass/05-blocks/quote/_style.scss","assets/sass/05-blocks/rss/_style.scss","assets/sass/05-blocks/search/_style.scss","assets/sass/05-blocks/separator/_style.scss","assets/sass/05-blocks/social-icons/_style.scss","assets/sass/05-blocks/table/_style.scss","assets/sass/05-blocks/tag-clould/_style.scss","assets/sass/05-blocks/verse/_style.scss","assets/sass/05-blocks/video/_style.scss","assets/sass/05-blocks/utilities/_font-sizes.scss","assets/sass/05-blocks/utilities/_style.scss","assets/sass/06-components/header.scss","assets/sass/06-components/footer.scss","assets/sass/06-components/single.scss","assets/sass/06-components/posts-and-pages.scss","assets/sass/06-components/entry.scss","assets/sass/06-components/archives.scss","assets/sass/06-components/404.scss","assets/sass/06-components/search.scss","assets/sass/06-components/comments.scss","assets/sass/06-components/navigation.scss","assets/sass/06-components/footer-navigation.scss","assets/sass/06-components/pagination.scss","assets/sass/06-components/widgets.scss","assets/sass/07-utilities/a11y.scss","assets/sass/07-utilities/color-palette.scss","assets/sass/07-utilities/measure.scss","assets/sass/07-utilities/ie.scss"],"names":[],"mappings":";AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;AAAA;ACEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA4EA;AC9EA;AAKA;AAEC;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;AAEA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;AAEA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;;;AAGD;EACC;;AAEA;EAHD;IAIE;;;;AAIF;EACC;IACC;IACA;IACA;IACA;IACA;;;ACtPF;AAEA;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;EAGC;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA,QACQ;EACP;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA,SACS;EACR;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;AAAA;EAEC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAAA;AAKA;EACC;EACA;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAGA;AAAA;AAAA;AAIA;EACC;;;AAGD;AAAA;AAAA;AAIA;EACC;;;AC5VD;AAAA;AAAA;AAIA;AAAA;AAAA;AA4EA;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AA/DC;EAoED;IACC;IACA;IACA;IACA;;;AApCA;EA0CD;IACC;IACA;;;AAIF;AAAA;AAAA;AAGA;AAAA;EACC;EACA;EACA;;;AAGD;AAAA;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAvGC;EA2GD;IACC;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;;;AAvHC;EAqJD;AAEC;IACA;AAEA;IACA;;;AA3JA;EAyKD;AAEC;IACA;AAEA;IACA;;;ACzMF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASA;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;ADCC;ECHF;IAKE;;;;AAIF;AAAA;AAAA;AAAA;AAIA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;;AAIF;AAAA;AAAA;AAOA;AAAA;AAAA;AAOA;AAAA;AAAA;AAQA;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;ADxEC;ECgEF;AAAA;AAAA;AAAA;AAAA;AAAA;IAWE;IACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;EAEC;EACA;;AD3FC;ECwFF;AAAA;IAME;IACA;;;;AAIF;AAAA;AAAA;AAAA;AAKA;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EACC;;;AAKF;AAAA;AAAA;AAAA;AAIA;AAeC;;AAbA;EAKC;;AAGD;EAEC;;AAID;EAEC;;;AC1KF;AAAA;AAAA;AAIA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAwBC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAMA;AAEC;EACA;EAGA;EACA;;;AAGD;AAAA;AAAA;AAKC;EAGC;;;AAKF;EACC;EACA;EACA;EACA;EACA;;;AAID;EACC;;;ACzED;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAYC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;;;ANoED;AO3FA;EACC;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;AAGD;EAGC;;AAEA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;EAEC;EACA;;AAIF;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;;AJlDA;EIpBF;IA0EE;;EAEA;IACC;;;;AC7EH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAeC;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAOD;EACC;;AAEA;EACC;;;AAKH;EACC;EACA;;;AAGD;AAAA;AAGC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AAGD;EACC;EACA;EACA;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAKA;EAEC;AAAA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;AAAA;IACC;;EAGD;AAAA;IACC;;EAMD;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAKH;IACC;;EAEA;IACC;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;;EAEA;IACC;;EAID;IACC;IACA;;;AAMJ;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;IACC;IACA;IACA;IACA;IACA;IACA;;EAEA;IACC;;EAIF;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;;AAIF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;;AAEA;EACC;;AAKA;EACC;;AAGD;EACC;;AAGD;EAEC;;AAGD;EAEC;EACA;EACA;;;AAKH;EACC;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;EACA;EACA;;AAGD;EACC;;AL7RA;EK4RD;IAGE;;;;ACrUH;EACC;EACA;EACA;;;AAGD;AACA;EACC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;;;AAGD;AACA;AAAA;AAAA;AAAA;EAIC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;;AAIF;AACA;AAAA;AAAA;EAGC;EACA;EACA;EACA;;;AC5CD;AACA;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAAA;EAIC;;;AAGD;EACC;EACA;;;ACfD;AAAA;AAAA;AAAA;AAAA;AAKA;EACC;EACA;EACA;EACA;;;AAGD;EACC;EACA;;;AAGD;AAEC;EACA;EAEA;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAEA;EACC;;AAKF;EACC;EACA;;AAEA;EACC;;AAIF;AAEC;EACA;EACA;;AAEA;EACC;EACA;;AAIF;EACC;;AAGD;EACC;;;AAQD;EAEC;;;AXwBF;AYhGC;EACC;EACA;;;ACJF;AAAA;AAAA;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;ECmBC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAMC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;EACA;EACA;;AAID;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;;AAID;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;EACA;EACA;;;ADhEF;AAAA;AAAA;AAWG;EACC;;AAGA;EACC;;AAEA;EACC;;AAMH;EACC;;AAGA;EACC;;AAMH;AAAA;EAEC;EACA;EACA;;AAUA;EAGC;;AAID;EACC;;AAGA;EACC;;AAMD;EACC;;AAKF;EACC;;AAIF;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;;AAMH;EACC;;;AAIF;AAAA;EAEC;EACA;;;AExHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;;;ACTD;EACC;;AAKA;EACC;EACA;;AbgBD;EalBA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AAIF;EACC;;AAIF;EACC;;AbNA;EaKD;IAIE;;;Ab2BD;Ea/BD;IAQE;;;AAIF;EAEC;;AbKA;EaCE;IACC;IACA;IACA;;EAcC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IACC;IACA;;EAKF;AAAA;IAEC;;EAGD;IACC;;;AAWH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAOC;EACA;;;ACpGJ;AAAA;EAYC;EACA;EACA;EACA;AAkBA;AAUA;AA+DA;AAKA;;AA5GA;AAAA;EACC;;AAGD;AAAA;EACC;EACA;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAOD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKF;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAIF;AAAA;EAEC;;AAEA;AAAA;EACC;EACA;;Ad7CD;Ec2CA;AAAA;IAKE;IACA;;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAKH;AAAA;AAAA;EAEC;;AAEA;AAAA;AAAA;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;EAEC;;AAID;AAAA;EACC;;AAID;AAAA;EACC;;;AC9GD;AAAA;AAAA;EAGC;;AAGD;EACC;;;ACVF;EAEC;;AAEA;AAAA;EAIC;;AAEA;AAAA;EACC;EAEA;EACA;;AAEA;AAAA;EACC;;AAEA;AAAA;EACC;EACA;EACA;;AAKH;AAAA;EACC;;;AC5BH;EAIC;EACA;EAEA;;AAEA;EAEC;EACA;EACA;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AjBGD;EiBLA;IASE;IACA;;;AAGD;EACC;;AAGD;EACC;;AAKH;EACC;;AjBnBA;EiBkBD;IAIE;;;AAKF;EACC;EACA;;AAOA;AAAA;AAAA;EAEC;EACA;EACA;;;AClEH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAYC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;;AAIF;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AAGD;AAAA;EAEC;EACA;EACA;EACA;;;AC/DD;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKF;AAAA;EAEC;EACA;;AAGA;AAAA;EACC;;;AAKF;AAAA;EAEC;;;AAGD;EACC;;;AnBlBC;EmByBA;AAAA;IAGE;;;AnBlCF;EmB+BA;AAAA;IAME;IACA;;;;AC1DJ;EACC;;AAEA;EACC;EACA;AAEA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;;;AChCF;EACC;;AAGA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAIF;EACC;EACA;;AAGD;EACC;EACA;;AAEA;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;AAKF;EACC;EACA;;AAEA;AAAA;EAEC;EACA;EACA;EACA;;AAEA;AAAA;EACC;EACA;;AAIF;EAEC;EACA;;AAEA;EACC;EACA;EACA;;AAEA;EACC;;AAMF;EAEE;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;EADD;IACC;;;AASJ;EACC;EACA;;AAEA;EACC;;AAIF;EACC;EACA;;;AC/KH;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;;AAIF;EACC;;;AAID;EACC;;;ACrDD;AAAA;EAEC;EACA;EACA;;AAGA;AAAA;EACC;EACA;;AAGD;AAAA;EACC;EACA;EACA;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;;AAGD;EACC;EACA;;;AC1CD;AAqCC;AAAA;AAAA;;AAnCA;EACC;EACA;;AAGD;EACC;;AAGD;EACC;;AxB0BA;EwB3BD;IAIE;;;AAGD;EACC;EACA;;AxBMD;EwBRA;IAKE;IACA;;;AAGD;EACC;;AAGD;EACC;;AxBNF;EwBeD;IAEE;IACA;;;AAKF;EACC;;;AC/CA;EACC;EACA;EACA;;AAIF;EACC;;AAQC;EACC;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;AAOF;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;;AAQH;EACC;;AAEA;EACC;;AAWA;EAEC;;AAGD;EACC;EACA;;AAKH;EACC;;;ACnGH;EAEC;;AAGA;EACC;;AAID;EACC;;;ACXF;EACC;EACA;;;ACFD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AAqCA;AAAA;AAAA;;AAnCA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;EAGC;EACA;EACA;EACA;EACA;;AAMD;EACC;;AAKA;AAAA;EAEC;;AAIF;EAEC;;AAGD;EAEC;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EAPD;IAQE;;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAIF;AAAA;AAAA;EAGC;;AAGD;EAEC;;AAEA;EACC;;;AC5GH;EACC;;A7BuBA;E6BxBD;IAIE;;;;ACNH;EACC;AAqBA;AAAA;AAAA;;AAnBA;EACC;EACA;EACA;EACA;;AAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAIC;;AAOF;EACC;EACA;EACA;;AAGA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;EACC;;AAEA;EACC;;AAIF;EAEC;EACA;AAEA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMA;EACC;;AAID;EACC;EACA;EACA;EACA;EACA;;AAIF;AAAA;AAAA;AAAA;AAAA;EAGC;EACA;;A9B3ED;E8BiCD;IA8CE;;EAEA;IACC;;EAGD;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;A9BhGF;E8BuGA;IACC;IACA;;EAEA;IACC;;EAIF;IACC;IACA;;;;ACtIH;EACC;;AAEA;EACC;;AAID;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;;AAEA;EACC;;AAKF;EAUC;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAKF;EACC;EACA;EACA;EACA;EACA;EACA;;AAID;EACC;EACA;EACA;;AAID;EACC;EACA;EACA;;AAEA;EAEC;;AAKF;AAAA;EAEC;EACA;EACA;EACA;;AAID;EACC;EACA;;AAEA;EAEC;EACA;;;ACzGH;EACC;;AAIC;EACC;;AAIF;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;;AAEA;EACC;;AAEA;EACC;EACA;EACA;;AAOD;EACC;EACA;;AAGD;EACC;;AAOF;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;EACA;EACA;;AAGA;EACC;EACA;EACA;;AAIF;EACC;;AAGA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAIF;EACC;;;AAOL;EACC;;;AClHD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;AAiBA;AAAA;AAAA;;AAfA;EACC;;AAKA;EACC;;AAGD;EACC;;AAOF;EACC;;AAKA;EAEC;;AAEA;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAIF;EAIC;;;ACtDF;EACC;;AAKA;EACC;;AAGD;EAEC;;;ACdH;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;AAAA;AAAA;EAEC;EACA;;AAGD;AAAA;EACC;EACA;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EACC;;AAEA;AAAA;AAAA;AAAA;EAEC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;;AAOF;AAAA;EAEC;EACA;EACA;EACA;EACA;EACA;;AAGD;EACC;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;EACA;EACA;EACA;;;AAIF;EACC;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAIF;EACC;;;AC9FD;EACC;EACA;;;ACJF;EACC;;;ACCA;EACC;EACA;EACA;EACA;EACA;;;AAIF;EACC;EACA;EACA;;;ACXA;AAAA;EAEC;;AAGD;AAAA;EAEC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;AAAA;AAAA;EAIC;EACA;;AAGD;AAAA;EAEC;EACA;EAGA;;AAGD;AAAA;EAEC;EACA;EAGA;;;AClDF;AAEA;AAAA;AAAA;AAQA;AAAA;AAAA;AAGA;AAEC;EACA;EAEA;;;AAKD;EACC;;;AxCEC;EwCID;AAEC;IACA;AAEA;IACA;IACA;;EAGD;IACC;;;AAIF;AAAA;AAAA;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAGD;AAAA;AAAA;AAGA;EAEC;EACA;;;AAKD;EACC;;;AxC3CC;EwCiDD;AAEC;IACA;AAEA;IACA;;EAGD;IACC;;;AAKF;AAAA;EAEC;;;AAGD;AAAA;AAAA;AAGA;EACC;;;AAQD;AAAA;AAAA;AAGA;EACC;;;AAUD;EACC;;;AAGD;EACC;;;AAID;EACC;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;;;AAGD;EACC;;AxChIC;EwC+HF;IAIE;;;;A3CxDF;A4CpGA;EAEC;EACA;EACA;EACA;;AAEA;EACC;;AzCiBA;EyCzBF;IAYE;;;AzCiDA;EyC7DF;IAgBE;;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;EACA;;AzCHA;EyCJF;IAWE;IACA;;;;AAKF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EAEC;;AzCnCD;EyCaF;IA4BE;;;;AAKF;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAID;EAEC;;AAEA;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AzC5EA;EyCiFA;IACC;IACA;IACA;IACA;;;;AzC3FD;EyC0GG;IACC;IACA;IACA;IACA;;EAEA;IACC;;EAGD;IACC;;EAMJ;IACC;;EAEA;IACC;;EAEA;IACC;;EAIF;IACC;;EAKA;IACC;;EAGD;IACC;IACA;;EAGD;IACC;IACA;IACA;;EAEA;IAGC;IACA;IACA;;EAWH;IACC;IACA;;EAKH;IACC;;;ACrMH;EACC;EACA;;AAIA;EACC;;A1CYA;E0CPA;IACC;;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAGD;AAAA;EAEC;;A1C2BA;E0C1CF;IAmBE;IACA;;EAEA;IACC;;EAGD;AAAA;IAEC;IACA;;EAGD;IACC;;;AAIF;EACC;;AAEA;EAGC;;AAGD;EACC;;AAGD;EACC;;AAEA;EACC;;AAID;EACC;;;AC/EJ;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;AAGD;EACC;EACA;EACA;;;ACXD;EACC;;;AAID;EACC;;AAEA;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;ACpBH;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;EACC;;;AAKH;EACC;;;AAGD;EACC;EACA;;;AAGD;AAAA;AAAA;AAIA;AAAA;EAEC;;;AAKA;EACC;;AAID;EAEC;EACA;;AASF;EAEC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EAEC;;AAGD;EACC;;;AAMH;EACC;EACA;EACA;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EAEC;EACA;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;EAIC;;A7C1GA;E6CiFF;IA6BE;;EAEA;IACC;;EAGD;AAAA;IAEC;;;;AAKH;AAAA;AAAA;AAIA;EAEC;;AAOA;EACC;EACA;EACA;EACA;EACA;EACA;;;AAIF;AAAA;AAAA;AAIA;EACC;EACA;EACA;;AAEA;EACC;;AAMA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;;;AC9MH;EACC;;;AAGD;AAAA;EAEC;;;AAGD;EACC;;;AAGD;EACC;EACA;;;AAaE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAUF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EACC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAEC;;AAQA;AAAA;AAAA;EACC;;;AAMJ;EACC;EACA;EACA;;;AClED;EACC;EACA;;;ACFD;EACC;;;ACDD;AAAA;AAAA;AAKC;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;AAGD;EACC;;;AAMH;AAAA;AAAA;AAIA;AAAA;EAEC;EACA;;;AAGD;EACC;EACA;;AAIC;EACC;EACA;EACA;EACA;EACA;;;AAKH;AACA;EACC;;;AAGD;AAAA;AAAA;AAGA;EACC;EACA;;AAEA;EACC;EACA;;;AAKF;EACC;EACA;;AAEA;EACC;EACA;;;AjD/DA;EiDoEF;AAAA;IAGE;;;;AAIF;AAAA;AAAA;AAKC;EACC;EACA;;AjDlFA;EiDgFD;IAKE;IACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AAKF;EACC;EACA;EACA;;AAEA;EACC;;AjD1GD;EiD8EF;IAkCE;;EAEA;IACC;;;;AAKH;EACC;EACA;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;AAAA;EAEC;;;AAID;EACC;EACA;;AAEA;EACC;EACA;;AAGD;EACC;;;AAIF;EACC;;;AAID;AAAA;EAEC;EACA;;;AAGD;EACC;;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAEA;EACC;;;AAKH;EACC;;AAEA;EACC;;;AAIF;EACC;EACA;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;EAEC;;AAGD;AAAA;EAEC;EACA;;AjD3NA;EiDwND;AAAA;IAME;;;AAIF;AAAA;EAEC;EACA;;;AAIF;EACC;;AAEA;EACC;;AAGD;EACC;;AAGD;AAAA;AAAA;AAAA;AAAA;EAKC;EACA;EACA;EACA;EACA;;AAGD;EACC;;AjD3PA;EiDgQA;IACC;;EAGD;IAEC;;;;AC5RH;EACC;EACA;EACA;EACA;EACA;EACA;;AlDUC;EkDhBF;IASE;;;AAID;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAEA;EACC;;AAID;EACC;EACA;;AAGD;EACC;;AAQA;EACC;;AAGD;EACC;;AAEA;EACC;EACA;;AAQL;EACC;EACA;EACA;;AAEA;EACC;;;AAKH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAhBD;IAiBE;;;AlDtFD;EkDqED;IAqBE;IACA;IACA;IACA;IACA;;EAEA;IACC;IACA;;EAGD;IACC;;EAGD;IACC;;EAGD;IACC;;;AlD9GF;EkDoHD;IAGE;IACA;IACA;;;AAGD;EACC;EACA;EACA;EACA;;AlDhID;EkDuIC;IACC;;;AlDlIF;EkDoDF;IAoFE;IACA;;EAGA;IACC;IACA;IACA;IACA;IACA;IACA;IACA;;EAID;IACC;;EAID;IACC;;EAID;IACC;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AlDzLA;EkDiLD;IAWE;;EAEA;IACC;;;AAIF;EACC;EACA;EACA;;AlDhMD;EkD6LA;IAME;IACA;;EAEA;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;;AlD/NF;EkDmNA;IAgBE;;;AAGD;AAAA;EAEC;EACA;EACA;;AAEA;AAAA;EACC;;AAIF;EACC;;AAMA;EACC;;AAGD;EACC;;AAMH;EAEC;;AAGC;EALF;IAMG;;;AlDnQH;EkD6PA;IAWE;IACA;IACA;IACA;IACA;IACA;IACA;;EAEA;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;;EAGD;IACC;IACA;;EAGD;IACC;;EAGD;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;EAIF;AAEC;IACA;AAEA;IACA;;EAEA;AAGC;IACA;AAEA;IACA;;;AAQL;EACC;;AlDjVA;EkDoVD;IAGE;IACA;;EAGA;IACC;;EAEA;IACC;IACA;;EAEA;IACC;;;AAQL;EACC;EACA;EACA;EACA;EACA;EACA;;AlDjXA;EkD2WD;IASE;IACA;IACA;IACA;;;AAGD;EACC;;AAGD;EAGC;;AAGD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;EACA;;AAKF;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;AlDraD;EkD4aC;IACC;;;AlDnbF;EkD2bE;IACC;;;AAKF;EACC;EACA;EACA;EACA;;AlD/bF;EkD2bC;IAOE;IACA;;;AASH;EACC;;AlD7cD;EkDkdC;IACC;IACA;;EAGD;IACC;;;AAMH;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;;;AlD5eD;EkDofD;IACC;IACA;IACA;;;AAKF;EAEC;IACC;;EAGD;IACC;;;ACthBF;EACC;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;;AAEA;EACC;EAEA;;AAEA;EACC;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;EACA;EACA;;AAOC;EACC;;AAOD;EACC;;AAMJ;EACC;EACA;;AAEA;EACC;;AAGD;EARD;IASE;;;AAKH;AAAA;EAEC;;;ACzEF;AAGA;EACC;;AAEA;EACC;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;;AAGD;EACC;;AAMD;EACC;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;EACC;;ApDDD;EoDbD;IAkBE;IACA;IACA;;EAEA;AAAA;IAEC;IACA;IACA;IACA;;EAGD;IACC;;;AAKH;EACC;EACA;EACA;EACA;;AAGD;AAAA;EAEC;EACA;;AAGD;AAAA;EAEC;EACA;;;AAKF;EAEC;;ApDtBC;EoDoBF;IAKE;;;AAKD;EACC;EACA;;AAGD;EACC;EACA;EACA;EACA;EACA;;ApDxCA;EoDmCD;IAOE;;;ApD9ED;EoDkFD;IAEE;;;AAIF;AAAA;EAEC;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;;AAMH;AAAA;EAGC;EACA;EACA;;ApDzEC;EoDoEF;AAAA;IAQE;;;AAMD;AAAA;EACC;;AAEA;AAAA;EACC;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAGC;;AAKH;AAAA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;AAGD;AAAA;EACC;;ApDhJD;EoDsJA;AAAA;IACC;IACA;;EAGD;AAAA;IACC;;EAEA;AAAA;AAAA;IAEC;IACA;;;ApDrMF;EoD4MA;AAAA;IACC;;;;AAMH;EACC;EACA;;ApD3KC;EoDyKF;IAKE;;;AAGD;EACC;;;AChPF;EAEC;EACA;EACA;EACA;EACA;;ArD4CC;EqDlDF;IASE;IACA;IACA;;;ArD+DA;EqD1EF;IAeE;;;ArDKA;EqDpBF;IAmBE;;;AAKA;EACC;EACA;;AAGD;EACC;;AAIF;EACC;EACA;EACA;;;AAMD;AAAA;AAAA;AAAA;AAAA;AAAA;EAMC;EACA;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;;AAGD;EACC;EACA;;AAEA;EACC;;AAGD;EAEC;;AAGD;EACC;;AAIF;EACC;EACA;EACA;EACA;;AAEA;EAGC;;AAGD;EACC;EACA;;;AAMH;EACC;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;;AAGD;EACC;EACA;EACA;EACA;;AAGD;EACC;EACA;;;AAMD;EACC;EACA;EACA;;AAGD;EACC;EACA;;;AAIF;EACC;;;AxDvCD;AyDpHA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGD;AACA;EACC;;;ACpCD;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAQD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAQC;;;AAIF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAKF;EAMC;;AAJA;EACC;EACA;;;AAOD;EAGG;;AAGF;EACC;EAKA;;AAHA;EACC;;AAMH;EAOG;;AAGF;EACC;EAKA;;AAHA;EACC;;;AAQJ;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AAGD;EACC;;;AChRD;AAAA;AAAA;EAGC;;;AAGD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;;AClBA;EACC;;AAEA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAWC;;AAGD;AAAA;AAAA;AAAA;EAIC;;AAGD;EACC;;AzDPD;EyDaE;AAAA;IAEC;;;AAKH;EACC;;AAIF;EACC;;AAGD;EACC","file":"style.css"}
\ No newline at end of file
diff --git a/src/wp-content/themes/twentytwentyone/template-parts/post/author-bio.php b/src/wp-content/themes/twentytwentyone/template-parts/post/author-bio.php
index 92151bb07481a..33a82dcd7e939 100644
--- a/src/wp-content/themes/twentytwentyone/template-parts/post/author-bio.php
+++ b/src/wp-content/themes/twentytwentyone/template-parts/post/author-bio.php
@@ -20,7 +20,7 @@
 				get_the_author()
 			);
 			?>
-			</h2>
+			</h2><!-- .author-title -->
 			<p class="author-description"> <?php the_author_meta( 'description' ); ?></p><!-- .author-description -->
 			<?php
 			printf(
diff --git a/src/wp-content/themes/twentytwentythree/patterns/call-to-action.php b/src/wp-content/themes/twentytwentythree/patterns/call-to-action.php
index 642aa509531b7..119677d8e2db5 100644
--- a/src/wp-content/themes/twentytwentythree/patterns/call-to-action.php
+++ b/src/wp-content/themes/twentytwentythree/patterns/call-to-action.php
@@ -32,8 +32,8 @@
 
 	<!-- wp:column -->
 	<div class="wp-block-column">
-		<!-- wp:separator -->
-		<hr class="wp-block-separator has-alpha-channel-opacity"/>
+		<!-- wp:separator {"className":"is-style-wide"} -->
+		<hr class="wp-block-separator has-alpha-channel-opacity is-style-wide"/>
 		<!-- /wp:separator -->
 	</div>
 	<!-- /wp:column -->
diff --git a/src/wp-content/themes/twentytwentythree/readme.txt b/src/wp-content/themes/twentytwentythree/readme.txt
index 8e0a3d389bdf6..f4e00bfee75fd 100644
--- a/src/wp-content/themes/twentytwentythree/readme.txt
+++ b/src/wp-content/themes/twentytwentythree/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Twenty-Three ===
 Contributors: wordpressdotorg
 Requires at least: 6.1
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.6
-Stable tag: 1.0
+Stable tag: 1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -15,10 +15,20 @@ Whether you want to build a complex or incredibly simple website, you can do it
 
 == Changelog ==
 
+= 1.2 =
+* Released: August 8, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-three-changelog/#Version_1.2
+
+= 1.1 =
+* Released: March 28, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-three-changelog/#Version_1.1
+
 = 1.0 =
 * Released: November 1, 2022
 
-https://wordpress.org/support/article/twenty-twenty-three-changelog#Version_1.0
+https://wordpress.org/documentation/article/twenty-twenty-three-changelog/#Version_1.0
 
 == Copyright ==
 
diff --git a/src/wp-content/themes/twentytwentythree/style.css b/src/wp-content/themes/twentytwentythree/style.css
index 5b49ceecc8e3c..181a6c9c5cc04 100644
--- a/src/wp-content/themes/twentytwentythree/style.css
+++ b/src/wp-content/themes/twentytwentythree/style.css
@@ -5,11 +5,11 @@ Author: the WordPress team
 Author URI: https://wordpress.org
 Description: Twenty Twenty-Three is designed to take advantage of the new design tools introduced in WordPress 6.1. With a clean, blank base as a starting point, this default theme includes ten diverse style variations created by members of the WordPress community. Whether you want to build a complex or incredibly simple website, you can do it quickly and intuitively through the bundled styles or dive into creation and full customization yourself.
 Requires at least: 6.1
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.0
+Version: 1.2
 License: GNU General Public License v2 or later
 License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 Text Domain: twentytwentythree
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, translation-ready, wide-blocks, block-styles, accessibility-ready, blog, portfolio, news
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, translation-ready, wide-blocks, block-styles, style-variations, accessibility-ready, blog, portfolio, news
 */
diff --git a/src/wp-content/themes/twentytwentythree/styles/aubergine.json b/src/wp-content/themes/twentytwentythree/styles/aubergine.json
index aab104550e295..74ca7f86703cd 100644
--- a/src/wp-content/themes/twentytwentythree/styles/aubergine.json
+++ b/src/wp-content/themes/twentytwentythree/styles/aubergine.json
@@ -16,12 +16,12 @@
 					"slug": "base-secondary-base"
 				},
 				{
-					"gradient": "linear-gradient(90deg, var(--wp--preset--color--tertiary) 5.74%, var(--wp--preset--color--primary) 100%);",
+					"gradient": "linear-gradient(90deg, var(--wp--preset--color--tertiary) 5.74%, var(--wp--preset--color--primary) 100%)",
 					"name": "Tertiary to Primary",
 					"slug": "tertiary-primary"
 				},
 				{
-					"gradient": "linear-gradient(90deg, var(--wp--preset--color--primary) 5.74%, var(--wp--preset--color--tertiary) 100%);",
+					"gradient": "linear-gradient(90deg, var(--wp--preset--color--primary) 5.74%, var(--wp--preset--color--tertiary) 100%)",
 					"name": "Primary to Tertiary",
 					"slug": "primary-tertiary"
 				}
diff --git a/src/wp-content/themes/twentytwentythree/styles/marigold.json b/src/wp-content/themes/twentytwentythree/styles/marigold.json
index 31fc120ce692d..4ad7ef40ad579 100644
--- a/src/wp-content/themes/twentytwentythree/styles/marigold.json
+++ b/src/wp-content/themes/twentytwentythree/styles/marigold.json
@@ -153,7 +153,6 @@
 				"elements": {
 					"link": {
 						"typography": {
-							"fontSize": "var(--wp--preset--font-size--large)",
 							"textDecoration": "none"
 						},
 						"color": {
@@ -168,6 +167,7 @@
 					}
 				},
 				"typography": {
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"fontWeight": "600"
 				}
 			},
@@ -203,14 +203,8 @@
 				}
 			},
 			"core/site-title": {
-				"elements": {
-					"link": {
-						"typography": {
-							"fontSize": "var(--wp--preset--font-size--normal)"
-						}
-					}
-				},
 				"typography": {
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"textTransform": "lowercase"
 				}
 			}
diff --git a/src/wp-content/themes/twentytwentythree/styles/whisper.json b/src/wp-content/themes/twentytwentythree/styles/whisper.json
index d35267d0ce661..c93b7f4b08a20 100644
--- a/src/wp-content/themes/twentytwentythree/styles/whisper.json
+++ b/src/wp-content/themes/twentytwentythree/styles/whisper.json
@@ -288,16 +288,15 @@
 							}
 						},
 						"typography": {
-							"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-							"fontSize": "var(--wp--preset--font-size--large)",
-							"fontWeight": "700",
-							"letterSpacing": "-0.01em",
 							"textDecoration": "none"
 						}
 					}
 				},
 				"typography": {
+					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontSize": "var(--wp--preset--font-size--large)",
+					"fontWeight": "700",
+					"letterSpacing": "-0.01em",
 					"lineHeight": "1.4",
 					"textTransform": "capitalize"
 				}
diff --git a/src/wp-content/themes/twentytwentythree/templates/archive.html b/src/wp-content/themes/twentytwentythree/templates/archive.html
index 8376b241deaaf..74a8a5c238003 100644
--- a/src/wp-content/themes/twentytwentythree/templates/archive.html
+++ b/src/wp-content/themes/twentytwentythree/templates/archive.html
@@ -4,10 +4,10 @@
 <main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
 	<!-- wp:query-title {"type":"archive","align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|50"}}}} /-->
 
-	<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
+	<!-- wp:query {"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-query alignwide">
 		<!-- wp:post-template {"align":"wide"} -->
-			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"max(15vw, 30vh)","align":"wide"} /-->
+			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"clamp(15vw, 30vh, 400px)","align":"wide"} /-->
 			<!-- wp:post-title {"isLink":true} /-->
 			<!-- wp:post-excerpt /-->
 			<!-- wp:post-date {"isLink":true} /-->
diff --git a/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html b/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html
index 6212ea20cdb2f..cd6c89b516e42 100644
--- a/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html
+++ b/src/wp-content/themes/twentytwentythree/templates/blog-alternative.html
@@ -15,7 +15,7 @@
 
 				<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->
 				<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%">
-					<!-- wp:post-title /-->
+					<!-- wp:post-title {"isLink":true} /-->
 				</div>
 				<!-- /wp:column -->
 			</div>
diff --git a/src/wp-content/themes/twentytwentythree/templates/home.html b/src/wp-content/themes/twentytwentythree/templates/home.html
index ce0c31601b977..9b84d2b3b81f2 100644
--- a/src/wp-content/themes/twentytwentythree/templates/home.html
+++ b/src/wp-content/themes/twentytwentythree/templates/home.html
@@ -6,10 +6,10 @@
 	<h1 class="alignwide" style="margin-bottom:var(--wp--preset--spacing--60)">Mindblown: a blog about philosophy.</h1>
 	<!-- /wp:heading -->
 
-	<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"constrained"}} -->
+	<!-- wp:query {"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"constrained"}} -->
 	<div class="wp-block-query alignwide">
 		<!-- wp:post-template {"align":"wide"} -->
-			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"max(15vw, 30vh)","align":"wide"} /-->
+			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"clamp(15vw, 30vh, 400px)","align":"wide"} /-->
 			<!-- wp:post-title {"isLink":true} /-->
 			<!-- wp:post-excerpt /-->
 			<!-- wp:post-date {"isLink":true} /-->
diff --git a/src/wp-content/themes/twentytwentythree/templates/index.html b/src/wp-content/themes/twentytwentythree/templates/index.html
index 91e66405df3f0..bed3d1ebf0871 100644
--- a/src/wp-content/themes/twentytwentythree/templates/index.html
+++ b/src/wp-content/themes/twentytwentythree/templates/index.html
@@ -2,10 +2,10 @@
 
 <!-- wp:group {"tagName":"main","layout":{"type":"constrained"}} -->
 <main class="wp-block-group">
-	<!-- wp:query {"query":{"perPage":10,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
+	<!-- wp:query {"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true,"taxQuery":null,"parents":[]},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-query alignwide">
 		<!-- wp:post-template {"align":"wide"} -->
-			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"max(15vw, 30vh)","align":"wide"} /-->
+			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"clamp(15vw, 30vh, 400px)","align":"wide"} /-->
 			<!-- wp:post-title {"isLink":true,"align":"wide"} /-->
 			<!-- wp:post-excerpt /-->
 			<!-- wp:post-date {"isLink":true} /-->
diff --git a/src/wp-content/themes/twentytwentythree/templates/search.html b/src/wp-content/themes/twentytwentythree/templates/search.html
index c80b421dc27b7..c80325d77e5eb 100644
--- a/src/wp-content/themes/twentytwentythree/templates/search.html
+++ b/src/wp-content/themes/twentytwentythree/templates/search.html
@@ -4,10 +4,10 @@
 <main class="wp-block-group" style="margin-top:var(--wp--preset--spacing--70);margin-bottom:var(--wp--preset--spacing--70)">
 	<!-- wp:query-title {"type":"search","align":"wide","style":{"spacing":{"margin":{"bottom":"var:preset|spacing|50"}}}} /-->
 
-	<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
+	<!-- wp:query {"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":true},"displayLayout":{"type":"flex","columns":3},"align":"wide","layout":{"type":"default"}} -->
 	<div class="wp-block-query alignwide">
 		<!-- wp:post-template {"align":"wide"} -->
-			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"max(15vw, 30vh)","align":"wide"} /-->
+			<!-- wp:post-featured-image {"isLink":true,"width":"100%","height":"clamp(15vw, 30vh, 400px)","align":"wide"} /-->
 			<!-- wp:post-title {"isLink":true} /-->
 			<!-- wp:post-excerpt /-->
 			<!-- wp:post-date {"isLink":true} /-->
diff --git a/src/wp-content/themes/twentytwentythree/theme.json b/src/wp-content/themes/twentytwentythree/theme.json
index ba78a4a50f5ec..68e17a87e9adc 100644
--- a/src/wp-content/themes/twentytwentythree/theme.json
+++ b/src/wp-content/themes/twentytwentythree/theme.json
@@ -539,7 +539,11 @@
 			},
 			"core/quote": {
 				"border": {
-					"width": "1px"
+					"left": {
+						"color": "inherit",
+						"style": "solid",
+						"width": "1px"
+					}
 				},
 				"elements": {
 					"cite": {
@@ -587,6 +591,9 @@
 					"fontWeight": "normal",
 					"lineHeight": "1.4"
 				}
+			},
+			"core/separator": {
+				"css": " &:not(.is-style-wide):not(.is-style-dots):not(.alignwide):not(.alignfull){width: 100px}"
 			}
 		},
 		"color": {
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php
index c2cac8dcef403..b10ed5b9b6350 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-logo-black-background.php
@@ -3,7 +3,7 @@
  * Header with centered logo and black background
  */
 return array(
-	'title'      => __( 'Header with centered logo and black background', 'twentytwentytwo' ),
+	'title'      => __( 'Header with centered logo and background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"var(--wp--custom--spacing--small, 1.25rem)","top":"var(--wp--custom--spacing--small, 1.25rem)"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"foreground","textColor":"background","layout":{"type":"flex","justifyContent":"center"}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php
index 2e4dc451d196f..cb1b310e110d8 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-centered-title-navigation-social.php
@@ -3,7 +3,7 @@
  * Centered header with navigation, social links, and salmon background block pattern
  */
 return array(
-	'title'      => __( 'Centered header with navigation, social links, and salmon background', 'twentytwentytwo' ),
+	'title'      => __( 'Centered header with navigation, social links, and background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|primary"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"secondary","textColor":"primary","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php
index dbe8de9fe4e84..3ddea755f02c2 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-gray-background.php
@@ -3,7 +3,7 @@
  * Logo and navigation header with gray background
  */
 return array(
-	'title'      => __( 'Logo and navigation header with gray background', 'twentytwentytwo' ),
+	'title'      => __( 'Logo and navigation header with background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"tertiary","textColor":"foreground","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php
index f881b41d81d96..c9b0f886d1dda 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-logo-navigation-social-black-background.php
@@ -3,7 +3,7 @@
  * Logo, navigation, and social links header with black background block pattern
  */
 return array(
-	'title'      => __( 'Logo, navigation, and social links header with black background', 'twentytwentytwo' ),
+	'title'      => __( 'Logo, navigation, and social links header with background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"foreground","textColor":"background","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php
index 0e11c13607fb6..468a696dd709c 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-green-background.php
@@ -3,7 +3,7 @@
  * Text-only header with green background block pattern
  */
 return array(
-	'title'      => __( 'Text-only header with green background', 'twentytwentytwo' ),
+	'title'      => __( 'Text-only header with background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|background"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"primary","textColor":"background","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php
index b03e528a48e0d..4a4913ec472cf 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-salmon-background.php
@@ -3,7 +3,7 @@
  * Text-only header with salmon background block pattern
  */
 return array(
-	'title'      => __( 'Text-only header with salmon background', 'twentytwentytwo' ),
+	'title'      => __( 'Text-only header with background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|foreground"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"secondary","textColor":"foreground","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php
index 4c2a4864f0cc6..d529fe851dcff 100644
--- a/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php
+++ b/src/wp-content/themes/twentytwentytwo/inc/patterns/header-text-only-with-tagline-black-background.php
@@ -3,7 +3,7 @@
  * Text-only header with tagline and black background block pattern
  */
 return array(
-	'title'      => __( 'Text-only header with tagline and black background', 'twentytwentytwo' ),
+	'title'      => __( 'Text-only header with tagline and background', 'twentytwentytwo' ),
 	'categories' => array( 'header' ),
 	'blockTypes' => array( 'core/template-part/header' ),
 	'content'    => '<!-- wp:group {"align":"full","style":{"elements":{"link":{"color":{"text":"var:preset|color|secondary"}}},"spacing":{"padding":{"top":"var(--wp--custom--spacing--small, 1.25rem)","bottom":"var(--wp--custom--spacing--small, 1.25rem)"}}},"backgroundColor":"foreground","textColor":"secondary","layout":{"inherit":true}} -->
diff --git a/src/wp-content/themes/twentytwentytwo/readme.txt b/src/wp-content/themes/twentytwentytwo/readme.txt
index 20663b579f56c..258e6f2b4ba6b 100644
--- a/src/wp-content/themes/twentytwentytwo/readme.txt
+++ b/src/wp-content/themes/twentytwentytwo/readme.txt
@@ -1,9 +1,9 @@
 === Twenty Twenty-Two ===
 Contributors: wordpressdotorg
 Requires at least: 5.9
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.6
-Stable tag: 1.3
+Stable tag: 1.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -11,35 +11,45 @@ License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page.
 
-The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Full Site Editing features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks.
+The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Site Editor features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks.
 
 Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours.
 
 == Changelog ==
 
+= 1.5 =
+* Released: August 8, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.5
+
+= 1.4 =
+* Released: March 28, 2023
+
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.4
+
 = 1.3 =
 * Released: November 1, 2022
 
-https://wordpress.org/support/article/twenty-twenty-two-changelog#Version_1.3
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.3
 
 = 1.2 =
 * Released: May 24, 2022
 
-https://wordpress.org/support/article/twenty-twenty-two-changelog#Version_1.2
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.2
 
 = 1.1 =
 * Released: February 22, 2022
 
-https://wordpress.org/support/article/twenty-twenty-two-changelog#Version_1.1
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.1
 
 = 1.0 =
 * Released: January 25, 2022
 
-https://wordpress.org/support/article/twenty-twenty-two-changelog#Version_1.0
+https://wordpress.org/documentation/article/twenty-twenty-two-changelog/#Version_1.0
 
 == Copyright ==
 
-Twenty Twenty-Two WordPress Theme, 2021-2022 WordPress.org
+Twenty Twenty-Two WordPress Theme, 2021-2023 WordPress.org
 Twenty Twenty-Two is distributed under the terms of the GNU GPL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/src/wp-content/themes/twentytwentytwo/style.css b/src/wp-content/themes/twentytwentytwo/style.css
index 0f46424d18c3a..effdeb698c3a5 100644
--- a/src/wp-content/themes/twentytwentytwo/style.css
+++ b/src/wp-content/themes/twentytwentytwo/style.css
@@ -3,15 +3,15 @@ Theme Name: Twenty Twenty-Two
 Theme URI: https://wordpress.org/themes/twentytwentytwo/
 Author: the WordPress team
 Author URI: https://wordpress.org/
-Description: Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Full Site Editing features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours.
+Description: Built on a solidly designed foundation, Twenty Twenty-Two embraces the idea that everyone deserves a truly unique website. The theme’s subtle styles are inspired by the diversity and versatility of birds: its typography is lightweight yet strong, its color palette is drawn from nature, and its layout elements sit gently on the page. The true richness of Twenty Twenty-Two lies in its opportunity for customization. The theme is built to take advantage of the Site Editor features introduced in WordPress 5.9, which means that colors, typography, and the layout of every single page on your site can be customized to suit your vision. It also includes dozens of block patterns, opening the door to a wide range of professionally designed layouts in just a few clicks. Whether you’re building a single-page website, a blog, a business website, or a portfolio, Twenty Twenty-Two will help you create a site that is uniquely yours.
 Requires at least: 5.9
-Tested up to: 6.1
+Tested up to: 6.3
 Requires PHP: 5.6
-Version: 1.3
+Version: 1.5
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: twentytwentytwo
-Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, accessibility-ready
+Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, block-patterns, rtl-language-support, sticky-post, threaded-comments, style-variations, wide-blocks, block-styles, accessibility-ready, blog, portfolio, news
 
 Twenty Twenty-Two WordPress Theme, (C) 2021 WordPress.org
 Twenty Twenty-Two is distributed under the terms of the GNU GPL.
@@ -146,3 +146,16 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
 	padding-left: var(--wp--custom--spacing--outer);
 }
 
+/*
+ * Improves spacing for the legacy Post Comments block.
+ * https://core.trac.wordpress.org/ticket/57560
+ */
+
+.wp-block-post-comments ol.commentlist ul.children {
+	margin-top: 1rem;
+	margin-bottom: 1rem;
+}
+
+.wp-block-post-comments ol.commentlist li.comment:not(:last-child) {
+	margin-bottom: 1rem;
+}
diff --git a/src/wp-cron.php b/src/wp-cron.php
index 164e4ef191fc7..161478ac49469 100644
--- a/src/wp-cron.php
+++ b/src/wp-cron.php
@@ -23,7 +23,7 @@
 	header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
 }
 
-/* Don't make the request block till we finish, if possible. */
+// Don't run cron until the request finishes, if possible.
 if ( PHP_VERSION_ID >= 70016 && function_exists( 'fastcgi_finish_request' ) ) {
 	fastcgi_finish_request();
 } elseif ( function_exists( 'litespeed_finish_request' ) ) {
@@ -35,7 +35,7 @@
 }
 
 /**
- * Tell WordPress we are doing the cron task.
+ * Tell WordPress the cron task is running.
  *
  * @var bool
  */
@@ -46,6 +46,9 @@
 	require_once __DIR__ . '/wp-load.php';
 }
 
+// Attempt to raise the PHP memory limit for cron event processing.
+wp_raise_memory_limit( 'cron' );
+
 /**
  * Retrieves the cron lock.
  *
diff --git a/src/wp-includes/IXR/class-IXR-message.php b/src/wp-includes/IXR/class-IXR-message.php
index 6c1279e69c4c2..2b27293f52cb8 100644
--- a/src/wp-includes/IXR/class-IXR-message.php
+++ b/src/wp-includes/IXR/class-IXR-message.php
@@ -144,7 +144,7 @@ function parse()
     function tag_open($parser, $tag, $attr)
     {
         $this->_currentTagContents = '';
-        $this->currentTag = $tag;
+        $this->_currentTag = $tag;
         switch($tag) {
             case 'methodCall':
             case 'methodResponse':
diff --git a/src/wp-includes/PHPMailer/PHPMailer.php b/src/wp-includes/PHPMailer/PHPMailer.php
index 8e51a2a9bafb0..79cf323307987 100644
--- a/src/wp-includes/PHPMailer/PHPMailer.php
+++ b/src/wp-includes/PHPMailer/PHPMailer.php
@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.6.5';
+    const VERSION = '6.8.0';
 
     /**
      * Error severity: message only, continue processing.
@@ -858,7 +858,7 @@ public function __destruct()
     private function mailPassthru($to, $subject, $body, $header, $params)
     {
         //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+        if ((int)ini_get('mbstring.func_overload') & 1) { // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
             $subject = $this->secureHeader($subject);
         } else {
             $subject = $this->encodeHeader($this->secureHeader($subject));
@@ -1124,6 +1124,22 @@ protected function addOrEnqueueAnAddress($kind, $address, $name)
         return call_user_func_array([$this, 'addAnAddress'], $params);
     }
 
+    /**
+     * Set the boundaries to use for delimiting MIME parts.
+     * If you override this, ensure you set all 3 boundaries to unique values.
+     * The default boundaries include a "=_" sequence which cannot occur in quoted-printable bodies,
+     * as suggested by https://www.rfc-editor.org/rfc/rfc2045#section-6.7
+     *
+     * @return void
+     */
+    public function setBoundaries()
+    {
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1=_' . $this->uniqueid;
+        $this->boundary[2] = 'b2=_' . $this->uniqueid;
+        $this->boundary[3] = 'b3=_' . $this->uniqueid;
+    }
+
     /**
      * Add an address to one of the recipient arrays or to the ReplyTo array.
      * Addresses that have been added already return false, but do not throw exceptions.
@@ -1673,11 +1689,11 @@ public function postSend()
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
             }
         } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
             if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
                 $this->smtp->reset();
             }
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
             if ($this->exceptions) {
                 throw $exc;
             }
@@ -2409,7 +2425,7 @@ public function addrAppend($type, $addr)
      */
     public function addrFormat($addr)
     {
-        if (empty($addr[1])) { //No name provided
+        if (!isset($addr[1]) || ($addr[1] === '')) { //No name provided
             return $this->secureHeader($addr[0]);
         }
 
@@ -2796,10 +2812,7 @@ public function createBody()
     {
         $body = '';
         //Create unique IDs and preset boundaries
-        $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1_' . $this->uniqueid;
-        $this->boundary[2] = 'b2_' . $this->uniqueid;
-        $this->boundary[3] = 'b3_' . $this->uniqueid;
+        $this->setBoundaries();
 
         if ($this->sign_key_file) {
             $body .= $this->getMailMIME() . static::$LE;
@@ -2835,7 +2848,7 @@ public function createBody()
             $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE;
+        $mimepre = '';
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -3071,6 +3084,18 @@ public function createBody()
         return $body;
     }
 
+    /**
+     * Get the boundaries that this message will use
+     * @return array
+     */
+    public function getBoundaries()
+    {
+        if (empty($this->boundary)) {
+            $this->setBoundaries();
+        }
+        return $this->boundary;
+    }
+
     /**
      * Return the start of a message boundary.
      *
@@ -4188,6 +4213,7 @@ public function isError()
      * @param string      $name  Custom header name
      * @param string|null $value Header value
      *
+     * @return bool True if a header was set successfully
      * @throws Exception
      */
     public function addCustomHeader($name, $value = null)
@@ -4637,17 +4663,29 @@ public static function normalizeBreaks($text, $breaktype = null)
     }
 
     /**
-     * Remove trailing breaks from a string.
+     * Remove trailing whitespace from a string.
      *
      * @param string $text
      *
-     * @return string The text to remove breaks from
+     * @return string The text to remove whitespace from
      */
     public static function stripTrailingWSP($text)
     {
         return rtrim($text, " \r\n\t");
     }
 
+    /**
+     * Strip trailing line breaks from a string.
+     *
+     * @param string $text
+     *
+     * @return string The text to remove breaks from
+     */
+    public static function stripTrailingBreaks($text)
+    {
+        return rtrim($text, "\r\n");
+    }
+
     /**
      * Return the current line break format string.
      *
@@ -4811,7 +4849,7 @@ public function DKIM_BodyC($body)
         $body = static::normalizeBreaks($body, self::CRLF);
 
         //Reduce multiple trailing line breaks to a single one
-        return static::stripTrailingWSP($body) . self::CRLF;
+        return static::stripTrailingBreaks($body) . self::CRLF;
     }
 
     /**
diff --git a/src/wp-includes/PHPMailer/SMTP.php b/src/wp-includes/PHPMailer/SMTP.php
index 312f753cea64c..fc4b781a5fdeb 100644
--- a/src/wp-includes/PHPMailer/SMTP.php
+++ b/src/wp-includes/PHPMailer/SMTP.php
@@ -35,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.6.5';
+    const VERSION = '6.8.0';
 
     /**
      * SMTP line break constant.
@@ -51,6 +51,13 @@ class SMTP
      */
     const DEFAULT_PORT = 25;
 
+    /**
+     * The SMTPs port to use if one is not specified.
+     *
+     * @var int
+     */
+    const DEFAULT_SECURE_PORT = 465;
+
     /**
      * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
      * *excluding* a trailing CRLF break.
@@ -187,6 +194,7 @@ class SMTP
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
         'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
+        'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
         'Mailjet' => '/[\d]{3} OK queued as (.*)/',
     ];
 
diff --git a/src/wp-includes/Requests/Auth.php b/src/wp-includes/Requests/Auth.php
deleted file mode 100644
index 914c7449ca601..0000000000000
--- a/src/wp-includes/Requests/Auth.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Authentication provider interface
- *
- * @package Requests
- * @subpackage Authentication
- */
-
-/**
- * Authentication provider interface
- *
- * Implement this interface to act as an authentication provider.
- *
- * Parameters should be passed via the constructor where possible, as this
- * makes it much easier for users to use your provider.
- *
- * @see Requests_Hooks
- * @package Requests
- * @subpackage Authentication
- */
-interface Requests_Auth {
-	/**
-	 * Register hooks as needed
-	 *
-	 * This method is called in {@see Requests::request} when the user has set
-	 * an instance as the 'auth' option. Use this callback to register all the
-	 * hooks you'll need.
-	 *
-	 * @see Requests_Hooks::register
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks $hooks);
-}
diff --git a/src/wp-includes/Requests/Auth/Basic.php b/src/wp-includes/Requests/Auth/Basic.php
deleted file mode 100644
index 68d15bd5db2a6..0000000000000
--- a/src/wp-includes/Requests/Auth/Basic.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Basic Authentication provider
- *
- * @package Requests
- * @subpackage Authentication
- */
-
-/**
- * Basic Authentication provider
- *
- * Provides a handler for Basic HTTP authentication via the Authorization
- * header.
- *
- * @package Requests
- * @subpackage Authentication
- */
-class Requests_Auth_Basic implements Requests_Auth {
-	/**
-	 * Username
-	 *
-	 * @var string
-	 */
-	public $user;
-
-	/**
-	 * Password
-	 *
-	 * @var string
-	 */
-	public $pass;
-
-	/**
-	 * Constructor
-	 *
-	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
-	 * @param array|null $args Array of user and password. Must have exactly two elements
-	 */
-	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
-				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
-			}
-
-			list($this->user, $this->pass) = $args;
-		}
-	}
-
-	/**
-	 * Register the necessary callbacks
-	 *
-	 * @see curl_before_send
-	 * @see fsockopen_header
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks $hooks) {
-		$hooks->register('curl.before_send', array($this, 'curl_before_send'));
-		$hooks->register('fsockopen.after_headers', array($this, 'fsockopen_header'));
-	}
-
-	/**
-	 * Set cURL parameters before the data is sent
-	 *
-	 * @param resource $handle cURL resource
-	 */
-	public function curl_before_send(&$handle) {
-		curl_setopt($handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-		curl_setopt($handle, CURLOPT_USERPWD, $this->getAuthString());
-	}
-
-	/**
-	 * Add extra headers to the request before sending
-	 *
-	 * @param string $out HTTP header string
-	 */
-	public function fsockopen_header(&$out) {
-		$out .= sprintf("Authorization: Basic %s\r\n", base64_encode($this->getAuthString()));
-	}
-
-	/**
-	 * Get the authentication string (user:pass)
-	 *
-	 * @return string
-	 */
-	public function getAuthString() {
-		return $this->user . ':' . $this->pass;
-	}
-}
diff --git a/src/wp-includes/Requests/Cookie/Jar.php b/src/wp-includes/Requests/Cookie/Jar.php
deleted file mode 100644
index a816f90a0ae7f..0000000000000
--- a/src/wp-includes/Requests/Cookie/Jar.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/**
- * Cookie holder object
- *
- * @package Requests
- * @subpackage Cookies
- */
-
-/**
- * Cookie holder object
- *
- * @package Requests
- * @subpackage Cookies
- */
-class Requests_Cookie_Jar implements ArrayAccess, IteratorAggregate {
-	/**
-	 * Actual item data
-	 *
-	 * @var array
-	 */
-	protected $cookies = array();
-
-	/**
-	 * Create a new jar
-	 *
-	 * @param array $cookies Existing cookie values
-	 */
-	public function __construct($cookies = array()) {
-		$this->cookies = $cookies;
-	}
-
-	/**
-	 * Normalise cookie data into a Requests_Cookie
-	 *
-	 * @param string|Requests_Cookie $cookie
-	 * @return Requests_Cookie
-	 */
-	public function normalize_cookie($cookie, $key = null) {
-		if ($cookie instanceof Requests_Cookie) {
-			return $cookie;
-		}
-
-		return Requests_Cookie::parse($cookie, $key);
-	}
-
-	/**
-	 * Normalise cookie data into a Requests_Cookie
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
-	 * @return Requests_Cookie
-	 */
-	public function normalizeCookie($cookie, $key = null) {
-		return $this->normalize_cookie($cookie, $key);
-	}
-
-	/**
-	 * Check if the given item exists
-	 *
-	 * @param string $key Item key
-	 * @return boolean Does the item exist?
-	 */
-	public function offsetExists($key) {
-		return isset($this->cookies[$key]);
-	}
-
-	/**
-	 * Get the value for the item
-	 *
-	 * @param string $key Item key
-	 * @return string|null Item value (null if offsetExists is false)
-	 */
-	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
-			return null;
-		}
-
-		return $this->cookies[$key];
-	}
-
-	/**
-	 * Set the given item
-	 *
-	 * @throws Requests_Exception On attempting to use dictionary as list (`invalidset`)
-	 *
-	 * @param string $key Item name
-	 * @param string $value Item value
-	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
-			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
-		}
-
-		$this->cookies[$key] = $value;
-	}
-
-	/**
-	 * Unset the given header
-	 *
-	 * @param string $key
-	 */
-	public function offsetUnset($key) {
-		unset($this->cookies[$key]);
-	}
-
-	/**
-	 * Get an iterator for the data
-	 *
-	 * @return ArrayIterator
-	 */
-	public function getIterator() {
-		return new ArrayIterator($this->cookies);
-	}
-
-	/**
-	 * Register the cookie handler with the request's hooking system
-	 *
-	 * @param Requests_Hooker $hooks Hooking system
-	 */
-	public function register(Requests_Hooker $hooks) {
-		$hooks->register('requests.before_request', array($this, 'before_request'));
-		$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
-	}
-
-	/**
-	 * Add Cookie header to a request if we have any
-	 *
-	 * As per RFC 6265, cookies are separated by '; '
-	 *
-	 * @param string $url
-	 * @param array $headers
-	 * @param array $data
-	 * @param string $type
-	 * @param array $options
-	 */
-	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
-			$url = new Requests_IRI($url);
-		}
-
-		if (!empty($this->cookies)) {
-			$cookies = array();
-			foreach ($this->cookies as $key => $cookie) {
-				$cookie = $this->normalize_cookie($cookie, $key);
-
-				// Skip expired cookies
-				if ($cookie->is_expired()) {
-					continue;
-				}
-
-				if ($cookie->domain_matches($url->host)) {
-					$cookies[] = $cookie->format_for_header();
-				}
-			}
-
-			$headers['Cookie'] = implode('; ', $cookies);
-		}
-	}
-
-	/**
-	 * Parse all cookies from a response and attach them to the response
-	 *
-	 * @var Requests_Response $response
-	 */
-	public function before_redirect_check(Requests_Response $return) {
-		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
-			$url = new Requests_IRI($url);
-		}
-
-		$cookies         = Requests_Cookie::parse_from_headers($return->headers, $url);
-		$this->cookies   = array_merge($this->cookies, $cookies);
-		$return->cookies = $this;
-	}
-}
diff --git a/src/wp-includes/Requests/Exception/HTTP/429.php b/src/wp-includes/Requests/Exception/HTTP/429.php
deleted file mode 100644
index 78a3148adf406..0000000000000
--- a/src/wp-includes/Requests/Exception/HTTP/429.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Exception for 429 Too Many Requests responses
- *
- * @see https://tools.ietf.org/html/draft-nottingham-http-new-status-04
- * @package Requests
- */
-
-/**
- * Exception for 429 Too Many Requests responses
- *
- * @see https://tools.ietf.org/html/draft-nottingham-http-new-status-04
- * @package Requests
- */
-class Requests_Exception_HTTP_429 extends Requests_Exception_HTTP {
-	/**
-	 * HTTP status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 429;
-
-	/**
-	 * Reason phrase
-	 *
-	 * @var string
-	 */
-	protected $reason = 'Too Many Requests';
-}
diff --git a/src/wp-includes/Requests/Exception/Transport.php b/src/wp-includes/Requests/Exception/Transport.php
deleted file mode 100644
index e60b4884c2219..0000000000000
--- a/src/wp-includes/Requests/Exception/Transport.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class Requests_Exception_Transport extends Requests_Exception {
-
-}
diff --git a/src/wp-includes/Requests/Hooks.php b/src/wp-includes/Requests/Hooks.php
deleted file mode 100644
index f857902cedd1c..0000000000000
--- a/src/wp-includes/Requests/Hooks.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Handles adding and dispatching events
- *
- * @package Requests
- * @subpackage Utilities
- */
-
-/**
- * Handles adding and dispatching events
- *
- * @package Requests
- * @subpackage Utilities
- */
-class Requests_Hooks implements Requests_Hooker {
-	/**
-	 * Registered callbacks for each hook
-	 *
-	 * @var array
-	 */
-	protected $hooks = array();
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		// pass
-	}
-
-	/**
-	 * Register a callback for a hook
-	 *
-	 * @param string $hook Hook name
-	 * @param callback $callback Function/method to call on event
-	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
-	 */
-	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
-			$this->hooks[$hook] = array();
-		}
-		if (!isset($this->hooks[$hook][$priority])) {
-			$this->hooks[$hook][$priority] = array();
-		}
-
-		$this->hooks[$hook][$priority][] = $callback;
-	}
-
-	/**
-	 * Dispatch a message
-	 *
-	 * @param string $hook Hook name
-	 * @param array $parameters Parameters to pass to callbacks
-	 * @return boolean Successfulness
-	 */
-	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
-			return false;
-		}
-
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
-				call_user_func_array($callback, $parameters);
-			}
-		}
-
-		return true;
-	}
-}
diff --git a/src/wp-includes/Requests/Proxy.php b/src/wp-includes/Requests/Proxy.php
deleted file mode 100644
index 0a798dbe9e741..0000000000000
--- a/src/wp-includes/Requests/Proxy.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Proxy connection interface
- *
- * @package Requests
- * @subpackage Proxy
- * @since 1.6
- */
-
-/**
- * Proxy connection interface
- *
- * Implement this interface to handle proxy settings and authentication
- *
- * Parameters should be passed via the constructor where possible, as this
- * makes it much easier for users to use your provider.
- *
- * @see Requests_Hooks
- * @package Requests
- * @subpackage Proxy
- * @since 1.6
- */
-interface Requests_Proxy {
-	/**
-	 * Register hooks as needed
-	 *
-	 * This method is called in {@see Requests::request} when the user has set
-	 * an instance as the 'auth' option. Use this callback to register all the
-	 * hooks you'll need.
-	 *
-	 * @see Requests_Hooks::register
-	 * @param Requests_Hooks $hooks Hook system
-	 */
-	public function register(Requests_Hooks $hooks);
-}
diff --git a/src/wp-includes/Requests/Response.php b/src/wp-includes/Requests/Response.php
deleted file mode 100644
index 20861dfb82052..0000000000000
--- a/src/wp-includes/Requests/Response.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * HTTP response class
- *
- * Contains a response from Requests::request()
- * @package Requests
- */
-
-/**
- * HTTP response class
- *
- * Contains a response from Requests::request()
- * @package Requests
- */
-class Requests_Response {
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->headers = new Requests_Response_Headers();
-		$this->cookies = new Requests_Cookie_Jar();
-	}
-
-	/**
-	 * Response body
-	 *
-	 * @var string
-	 */
-	public $body = '';
-
-	/**
-	 * Raw HTTP data from the transport
-	 *
-	 * @var string
-	 */
-	public $raw = '';
-
-	/**
-	 * Headers, as an associative array
-	 *
-	 * @var Requests_Response_Headers Array-like object representing headers
-	 */
-	public $headers = array();
-
-	/**
-	 * Status code, false if non-blocking
-	 *
-	 * @var integer|boolean
-	 */
-	public $status_code = false;
-
-	/**
-	 * Protocol version, false if non-blocking
-	 *
-	 * @var float|boolean
-	 */
-	public $protocol_version = false;
-
-	/**
-	 * Whether the request succeeded or not
-	 *
-	 * @var boolean
-	 */
-	public $success = false;
-
-	/**
-	 * Number of redirects the request used
-	 *
-	 * @var integer
-	 */
-	public $redirects = 0;
-
-	/**
-	 * URL requested
-	 *
-	 * @var string
-	 */
-	public $url = '';
-
-	/**
-	 * Previous requests (from redirects)
-	 *
-	 * @var array Array of Requests_Response objects
-	 */
-	public $history = array();
-
-	/**
-	 * Cookies from the request
-	 *
-	 * @var Requests_Cookie_Jar Array-like object representing a cookie jar
-	 */
-	public $cookies = array();
-
-	/**
-	 * Is the response a redirect?
-	 *
-	 * @return boolean True if redirect (3xx status), false if not.
-	 */
-	public function is_redirect() {
-		$code = $this->status_code;
-		return in_array($code, array(300, 301, 302, 303, 307), true) || $code > 307 && $code < 400;
-	}
-
-	/**
-	 * Throws an exception if the request was not successful
-	 *
-	 * @throws Requests_Exception If `$allow_redirects` is false, and code is 3xx (`response.no_redirects`)
-	 * @throws Requests_Exception_HTTP On non-successful status code. Exception class corresponds to code (e.g. {@see Requests_Exception_HTTP_404})
-	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
-	 */
-	public function throw_for_status($allow_redirects = true) {
-		if ($this->is_redirect()) {
-			if (!$allow_redirects) {
-				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
-			}
-		}
-		elseif (!$this->success) {
-			$exception = Requests_Exception_HTTP::get_class($this->status_code);
-			throw new $exception(null, $this);
-		}
-	}
-}
diff --git a/src/wp-includes/Requests/Response/Headers.php b/src/wp-includes/Requests/Response/Headers.php
deleted file mode 100644
index 12db128ae5df8..0000000000000
--- a/src/wp-includes/Requests/Response/Headers.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Case-insensitive dictionary, suitable for HTTP headers
- *
- * @package Requests
- */
-
-/**
- * Case-insensitive dictionary, suitable for HTTP headers
- *
- * @package Requests
- */
-class Requests_Response_Headers extends Requests_Utility_CaseInsensitiveDictionary {
-	/**
-	 * Get the given header
-	 *
-	 * Unlike {@see self::getValues()}, this returns a string. If there are
-	 * multiple values, it concatenates them with a comma as per RFC2616.
-	 *
-	 * Avoid using this where commas may be used unquoted in values, such as
-	 * Set-Cookie headers.
-	 *
-	 * @param string $key
-	 * @return string|null Header value
-	 */
-	public function offsetGet($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
-			return null;
-		}
-
-		return $this->flatten($this->data[$key]);
-	}
-
-	/**
-	 * Set the given item
-	 *
-	 * @throws Requests_Exception On attempting to use dictionary as list (`invalidset`)
-	 *
-	 * @param string $key Item name
-	 * @param string $value Item value
-	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
-			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
-		}
-
-		$key = strtolower($key);
-
-		if (!isset($this->data[$key])) {
-			$this->data[$key] = array();
-		}
-
-		$this->data[$key][] = $value;
-	}
-
-	/**
-	 * Get all values for a given header
-	 *
-	 * @param string $key
-	 * @return array|null Header values
-	 */
-	public function getValues($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
-			return null;
-		}
-
-		return $this->data[$key];
-	}
-
-	/**
-	 * Flattens a value into a string
-	 *
-	 * Converts an array into a string by imploding values with a comma, as per
-	 * RFC2616's rules for folding headers.
-	 *
-	 * @param string|array $value Value to flatten
-	 * @return string Flattened value
-	 */
-	public function flatten($value) {
-		if (is_array($value)) {
-			$value = implode(',', $value);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * Get an iterator for the data
-	 *
-	 * Converts the internal
-	 * @return ArrayIterator
-	 */
-	public function getIterator() {
-		return new Requests_Utility_FilteredIterator($this->data, array($this, 'flatten'));
-	}
-}
diff --git a/src/wp-includes/Requests/Transport.php b/src/wp-includes/Requests/Transport.php
deleted file mode 100644
index 5146c01d87faf..0000000000000
--- a/src/wp-includes/Requests/Transport.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Base HTTP transport
- *
- * @package Requests
- * @subpackage Transport
- */
-
-/**
- * Base HTTP transport
- *
- * @package Requests
- * @subpackage Transport
- */
-interface Requests_Transport {
-	/**
-	 * Perform a request
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Associative array of request headers
-	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return string Raw HTTP result
-	 */
-	public function request($url, $headers = array(), $data = array(), $options = array());
-
-	/**
-	 * Send multiple requests simultaneously
-	 *
-	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
-	 * @param array $options Global options, see {@see Requests::response()} for documentation
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
-	 */
-	public function request_multiple($requests, $options);
-
-	/**
-	 * Self-test whether the transport can be used
-	 * @return bool
-	 */
-	public static function test();
-}
diff --git a/src/wp-includes/Requests/Utility/CaseInsensitiveDictionary.php b/src/wp-includes/Requests/Utility/CaseInsensitiveDictionary.php
deleted file mode 100644
index 7eebeb7a7234e..0000000000000
--- a/src/wp-includes/Requests/Utility/CaseInsensitiveDictionary.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Case-insensitive dictionary, suitable for HTTP headers
- *
- * @package Requests
- * @subpackage Utilities
- */
-
-/**
- * Case-insensitive dictionary, suitable for HTTP headers
- *
- * @package Requests
- * @subpackage Utilities
- */
-class Requests_Utility_CaseInsensitiveDictionary implements ArrayAccess, IteratorAggregate {
-	/**
-	 * Actual item data
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Creates a case insensitive dictionary.
-	 *
-	 * @param array $data Dictionary/map to convert to case-insensitive
-	 */
-	public function __construct(array $data = array()) {
-		foreach ($data as $key => $value) {
-			$this->offsetSet($key, $value);
-		}
-	}
-
-	/**
-	 * Check if the given item exists
-	 *
-	 * @param string $key Item key
-	 * @return boolean Does the item exist?
-	 */
-	public function offsetExists($key) {
-		$key = strtolower($key);
-		return isset($this->data[$key]);
-	}
-
-	/**
-	 * Get the value for the item
-	 *
-	 * @param string $key Item key
-	 * @return string|null Item value (null if offsetExists is false)
-	 */
-	public function offsetGet($key) {
-		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
-			return null;
-		}
-
-		return $this->data[$key];
-	}
-
-	/**
-	 * Set the given item
-	 *
-	 * @throws Requests_Exception On attempting to use dictionary as list (`invalidset`)
-	 *
-	 * @param string $key Item name
-	 * @param string $value Item value
-	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
-			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
-		}
-
-		$key              = strtolower($key);
-		$this->data[$key] = $value;
-	}
-
-	/**
-	 * Unset the given header
-	 *
-	 * @param string $key
-	 */
-	public function offsetUnset($key) {
-		unset($this->data[strtolower($key)]);
-	}
-
-	/**
-	 * Get an iterator for the data
-	 *
-	 * @return ArrayIterator
-	 */
-	public function getIterator() {
-		return new ArrayIterator($this->data);
-	}
-
-	/**
-	 * Get the headers as an array
-	 *
-	 * @return array Header data
-	 */
-	public function getAll() {
-		return $this->data;
-	}
-}
diff --git a/src/wp-includes/Requests/Utility/FilteredIterator.php b/src/wp-includes/Requests/Utility/FilteredIterator.php
deleted file mode 100644
index 7c6c2c0238c29..0000000000000
--- a/src/wp-includes/Requests/Utility/FilteredIterator.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Iterator for arrays requiring filtered values
- *
- * @package Requests
- * @subpackage Utilities
- */
-
-/**
- * Iterator for arrays requiring filtered values
- *
- * @package Requests
- * @subpackage Utilities
- */
-class Requests_Utility_FilteredIterator extends ArrayIterator {
-	/**
-	 * Callback to run as a filter
-	 *
-	 * @var callable
-	 */
-	protected $callback;
-
-	/**
-	 * Create a new iterator
-	 *
-	 * @param array $data
-	 * @param callable $callback Callback to be called on each value
-	 */
-	public function __construct($data, $callback) {
-		parent::__construct($data);
-
-		$this->callback = $callback;
-	}
-
-	/**
-	 * Get the current item's value after filtering
-	 *
-	 * @return string
-	 */
-	public function current() {
-		$value = parent::current();
-
-		if (is_callable($this->callback)) {
-			$value = call_user_func($this->callback, $value);
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function unserialize($serialized) {}
-
-	/**
-	 * @inheritdoc
-	 *
-	 * @phpcs:disable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound
-	 */
-	public function __unserialize($serialized) {}
-
-	public function __wakeup() {
-		unset($this->callback);
-	}
-}
diff --git a/src/wp-includes/Requests/library/Requests.php b/src/wp-includes/Requests/library/Requests.php
new file mode 100644
index 0000000000000..9e42db596b8c9
--- /dev/null
+++ b/src/wp-includes/Requests/library/Requests.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Loads the old Requests class file when the autoloader
+ * references the original PSR-0 Requests class.
+ *
+ * @deprecated 6.2.0
+ * @package WordPress
+ * @subpackage Requests
+ * @since 6.2.0
+ */
+
+include_once ABSPATH . WPINC . '/class-requests.php';
diff --git a/src/wp-includes/Requests/src/Auth.php b/src/wp-includes/Requests/src/Auth.php
new file mode 100644
index 0000000000000..63ebb0833377e
--- /dev/null
+++ b/src/wp-includes/Requests/src/Auth.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Authentication provider interface
+ *
+ * @package Requests\Authentication
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Hooks;
+
+/**
+ * Authentication provider interface
+ *
+ * Implement this interface to act as an authentication provider.
+ *
+ * Parameters should be passed via the constructor where possible, as this
+ * makes it much easier for users to use your provider.
+ *
+ * @see \WpOrg\Requests\Hooks
+ *
+ * @package Requests\Authentication
+ */
+interface Auth {
+	/**
+	 * Register hooks as needed
+	 *
+	 * This method is called in {@see \WpOrg\Requests\Requests::request()} when the user
+	 * has set an instance as the 'auth' option. Use this callback to register all the
+	 * hooks you'll need.
+	 *
+	 * @see \WpOrg\Requests\Hooks::register()
+	 * @param \WpOrg\Requests\Hooks $hooks Hook system
+	 */
+	public function register(Hooks $hooks);
+}
diff --git a/src/wp-includes/Requests/src/Auth/Basic.php b/src/wp-includes/Requests/src/Auth/Basic.php
new file mode 100644
index 0000000000000..8ea0eb5538ce9
--- /dev/null
+++ b/src/wp-includes/Requests/src/Auth/Basic.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Basic Authentication provider
+ *
+ * @package Requests\Authentication
+ */
+
+namespace WpOrg\Requests\Auth;
+
+use WpOrg\Requests\Auth;
+use WpOrg\Requests\Exception\ArgumentCount;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Hooks;
+
+/**
+ * Basic Authentication provider
+ *
+ * Provides a handler for Basic HTTP authentication via the Authorization
+ * header.
+ *
+ * @package Requests\Authentication
+ */
+class Basic implements Auth {
+	/**
+	 * Username
+	 *
+	 * @var string
+	 */
+	public $user;
+
+	/**
+	 * Password
+	 *
+	 * @var string
+	 */
+	public $pass;
+
+	/**
+	 * Constructor
+	 *
+	 * @since 2.0 Throws an `InvalidArgument` exception.
+	 * @since 2.0 Throws an `ArgumentCount` exception instead of the Requests base `Exception.
+	 *
+	 * @param array|null $args Array of user and password. Must have exactly two elements
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not an array or null.
+	 * @throws \WpOrg\Requests\Exception\ArgumentCount   On incorrect number of array elements (`authbasicbadargs`).
+	 */
+	public function __construct($args = null) {
+		if (is_array($args)) {
+			if (count($args) !== 2) {
+				throw ArgumentCount::create('an array with exactly two elements', count($args), 'authbasicbadargs');
+			}
+
+			list($this->user, $this->pass) = $args;
+			return;
+		}
+
+		if ($args !== null) {
+			throw InvalidArgument::create(1, '$args', 'array|null', gettype($args));
+		}
+	}
+
+	/**
+	 * Register the necessary callbacks
+	 *
+	 * @see \WpOrg\Requests\Auth\Basic::curl_before_send()
+	 * @see \WpOrg\Requests\Auth\Basic::fsockopen_header()
+	 * @param \WpOrg\Requests\Hooks $hooks Hook system
+	 */
+	public function register(Hooks $hooks) {
+		$hooks->register('curl.before_send', [$this, 'curl_before_send']);
+		$hooks->register('fsockopen.after_headers', [$this, 'fsockopen_header']);
+	}
+
+	/**
+	 * Set cURL parameters before the data is sent
+	 *
+	 * @param resource|\CurlHandle $handle cURL handle
+	 */
+	public function curl_before_send(&$handle) {
+		curl_setopt($handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+		curl_setopt($handle, CURLOPT_USERPWD, $this->getAuthString());
+	}
+
+	/**
+	 * Add extra headers to the request before sending
+	 *
+	 * @param string $out HTTP header string
+	 */
+	public function fsockopen_header(&$out) {
+		$out .= sprintf("Authorization: Basic %s\r\n", base64_encode($this->getAuthString()));
+	}
+
+	/**
+	 * Get the authentication string (user:pass)
+	 *
+	 * @return string
+	 */
+	public function getAuthString() {
+		return $this->user . ':' . $this->pass;
+	}
+}
diff --git a/src/wp-includes/Requests/src/Autoload.php b/src/wp-includes/Requests/src/Autoload.php
new file mode 100644
index 0000000000000..669ddecafe9d0
--- /dev/null
+++ b/src/wp-includes/Requests/src/Autoload.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Autoloader for Requests for PHP.
+ *
+ * Include this file if you'd like to avoid having to create your own autoloader.
+ *
+ * @package Requests
+ * @since   2.0.0
+ *
+ * @codeCoverageIgnore
+ */
+
+namespace WpOrg\Requests;
+
+/*
+ * Ensure the autoloader is only declared once.
+ * This safeguard is in place as this is the typical entry point for this library
+ * and this file being required unconditionally could easily cause
+ * fatal "Class already declared" errors.
+ */
+if (class_exists('WpOrg\Requests\Autoload') === false) {
+
+	/**
+	 * Autoloader for Requests for PHP.
+	 *
+	 * This autoloader supports the PSR-4 based Requests 2.0.0 classes in a case-sensitive manner
+	 * as the most common server OS-es are case-sensitive and the file names are in mixed case.
+	 *
+	 * For the PSR-0 Requests 1.x BC-layer, requested classes will be treated case-insensitively.
+	 *
+	 * @package Requests
+	 */
+	final class Autoload {
+
+		/**
+		 * List of the old PSR-0 class names in lowercase as keys with their PSR-4 case-sensitive name as a value.
+		 *
+		 * @var array
+		 */
+		private static $deprecated_classes = [
+			// Interfaces.
+			'requests_auth'                              => '\WpOrg\Requests\Auth',
+			'requests_hooker'                            => '\WpOrg\Requests\HookManager',
+			'requests_proxy'                             => '\WpOrg\Requests\Proxy',
+			'requests_transport'                         => '\WpOrg\Requests\Transport',
+
+			// Classes.
+			'requests_cookie'                            => '\WpOrg\Requests\Cookie',
+			'requests_exception'                         => '\WpOrg\Requests\Exception',
+			'requests_hooks'                             => '\WpOrg\Requests\Hooks',
+			'requests_idnaencoder'                       => '\WpOrg\Requests\IdnaEncoder',
+			'requests_ipv6'                              => '\WpOrg\Requests\Ipv6',
+			'requests_iri'                               => '\WpOrg\Requests\Iri',
+			'requests_response'                          => '\WpOrg\Requests\Response',
+			'requests_session'                           => '\WpOrg\Requests\Session',
+			'requests_ssl'                               => '\WpOrg\Requests\Ssl',
+			'requests_auth_basic'                        => '\WpOrg\Requests\Auth\Basic',
+			'requests_cookie_jar'                        => '\WpOrg\Requests\Cookie\Jar',
+			'requests_proxy_http'                        => '\WpOrg\Requests\Proxy\Http',
+			'requests_response_headers'                  => '\WpOrg\Requests\Response\Headers',
+			'requests_transport_curl'                    => '\WpOrg\Requests\Transport\Curl',
+			'requests_transport_fsockopen'               => '\WpOrg\Requests\Transport\Fsockopen',
+			'requests_utility_caseinsensitivedictionary' => '\WpOrg\Requests\Utility\CaseInsensitiveDictionary',
+			'requests_utility_filterediterator'          => '\WpOrg\Requests\Utility\FilteredIterator',
+			'requests_exception_http'                    => '\WpOrg\Requests\Exception\Http',
+			'requests_exception_transport'               => '\WpOrg\Requests\Exception\Transport',
+			'requests_exception_transport_curl'          => '\WpOrg\Requests\Exception\Transport\Curl',
+			'requests_exception_http_304'                => '\WpOrg\Requests\Exception\Http\Status304',
+			'requests_exception_http_305'                => '\WpOrg\Requests\Exception\Http\Status305',
+			'requests_exception_http_306'                => '\WpOrg\Requests\Exception\Http\Status306',
+			'requests_exception_http_400'                => '\WpOrg\Requests\Exception\Http\Status400',
+			'requests_exception_http_401'                => '\WpOrg\Requests\Exception\Http\Status401',
+			'requests_exception_http_402'                => '\WpOrg\Requests\Exception\Http\Status402',
+			'requests_exception_http_403'                => '\WpOrg\Requests\Exception\Http\Status403',
+			'requests_exception_http_404'                => '\WpOrg\Requests\Exception\Http\Status404',
+			'requests_exception_http_405'                => '\WpOrg\Requests\Exception\Http\Status405',
+			'requests_exception_http_406'                => '\WpOrg\Requests\Exception\Http\Status406',
+			'requests_exception_http_407'                => '\WpOrg\Requests\Exception\Http\Status407',
+			'requests_exception_http_408'                => '\WpOrg\Requests\Exception\Http\Status408',
+			'requests_exception_http_409'                => '\WpOrg\Requests\Exception\Http\Status409',
+			'requests_exception_http_410'                => '\WpOrg\Requests\Exception\Http\Status410',
+			'requests_exception_http_411'                => '\WpOrg\Requests\Exception\Http\Status411',
+			'requests_exception_http_412'                => '\WpOrg\Requests\Exception\Http\Status412',
+			'requests_exception_http_413'                => '\WpOrg\Requests\Exception\Http\Status413',
+			'requests_exception_http_414'                => '\WpOrg\Requests\Exception\Http\Status414',
+			'requests_exception_http_415'                => '\WpOrg\Requests\Exception\Http\Status415',
+			'requests_exception_http_416'                => '\WpOrg\Requests\Exception\Http\Status416',
+			'requests_exception_http_417'                => '\WpOrg\Requests\Exception\Http\Status417',
+			'requests_exception_http_418'                => '\WpOrg\Requests\Exception\Http\Status418',
+			'requests_exception_http_428'                => '\WpOrg\Requests\Exception\Http\Status428',
+			'requests_exception_http_429'                => '\WpOrg\Requests\Exception\Http\Status429',
+			'requests_exception_http_431'                => '\WpOrg\Requests\Exception\Http\Status431',
+			'requests_exception_http_500'                => '\WpOrg\Requests\Exception\Http\Status500',
+			'requests_exception_http_501'                => '\WpOrg\Requests\Exception\Http\Status501',
+			'requests_exception_http_502'                => '\WpOrg\Requests\Exception\Http\Status502',
+			'requests_exception_http_503'                => '\WpOrg\Requests\Exception\Http\Status503',
+			'requests_exception_http_504'                => '\WpOrg\Requests\Exception\Http\Status504',
+			'requests_exception_http_505'                => '\WpOrg\Requests\Exception\Http\Status505',
+			'requests_exception_http_511'                => '\WpOrg\Requests\Exception\Http\Status511',
+			'requests_exception_http_unknown'            => '\WpOrg\Requests\Exception\Http\StatusUnknown',
+		];
+
+		/**
+		 * Register the autoloader.
+		 *
+		 * Note: the autoloader is *prepended* in the autoload queue.
+		 * This is done to ensure that the Requests 2.0 autoloader takes precedence
+		 * over a potentially (dependency-registered) Requests 1.x autoloader.
+		 *
+		 * @internal This method contains a safeguard against the autoloader being
+		 * registered multiple times. This safeguard uses a global constant to
+		 * (hopefully/in most cases) still function correctly, even if the
+		 * class would be renamed.
+		 *
+		 * @return void
+		 */
+		public static function register() {
+			if (defined('REQUESTS_AUTOLOAD_REGISTERED') === false) {
+				spl_autoload_register([self::class, 'load'], true);
+				define('REQUESTS_AUTOLOAD_REGISTERED', true);
+			}
+		}
+
+		/**
+		 * Autoloader.
+		 *
+		 * @param string $class_name Name of the class name to load.
+		 *
+		 * @return bool Whether a class was loaded or not.
+		 */
+		public static function load($class_name) {
+			// Check that the class starts with "Requests" (PSR-0) or "WpOrg\Requests" (PSR-4).
+			$psr_4_prefix_pos = strpos($class_name, 'WpOrg\\Requests\\');
+
+			if (stripos($class_name, 'Requests') !== 0 && $psr_4_prefix_pos !== 0) {
+				return false;
+			}
+
+			$class_lower = strtolower($class_name);
+
+			if ($class_lower === 'requests') {
+				// Reference to the original PSR-0 Requests class.
+				$file = dirname(__DIR__) . '/library/Requests.php';
+			} elseif ($psr_4_prefix_pos === 0) {
+				// PSR-4 classname.
+				$file = __DIR__ . '/' . strtr(substr($class_name, 15), '\\', '/') . '.php';
+			}
+
+			if (isset($file) && file_exists($file)) {
+				include $file;
+				return true;
+			}
+
+			/*
+			 * Okay, so the class starts with "Requests", but we couldn't find the file.
+			 * If this is one of the deprecated/renamed PSR-0 classes being requested,
+			 * let's alias it to the new name and throw a deprecation notice.
+			 */
+			if (isset(self::$deprecated_classes[$class_lower])) {
+				/*
+				 * Integrators who cannot yet upgrade to the PSR-4 class names can silence deprecations
+				 * by defining a `REQUESTS_SILENCE_PSR0_DEPRECATIONS` constant and setting it to `true`.
+				 * The constant needs to be defined before the first deprecated class is requested
+				 * via this autoloader.
+				 */
+				if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS') || REQUESTS_SILENCE_PSR0_DEPRECATIONS !== true) {
+					// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+					trigger_error(
+						'The PSR-0 `Requests_...` class names in the Requests library are deprecated.'
+						. ' Switch to the PSR-4 `WpOrg\Requests\...` class names at your earliest convenience.',
+						E_USER_DEPRECATED
+					);
+
+					// Prevent the deprecation notice from being thrown twice.
+					if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS')) {
+						define('REQUESTS_SILENCE_PSR0_DEPRECATIONS', true);
+					}
+				}
+
+				// Create an alias and let the autoloader recursively kick in to load the PSR-4 class.
+				return class_alias(self::$deprecated_classes[$class_lower], $class_name, true);
+			}
+
+			return false;
+		}
+	}
+}
diff --git a/src/wp-includes/Requests/src/Capability.php b/src/wp-includes/Requests/src/Capability.php
new file mode 100644
index 0000000000000..30572bab2ee70
--- /dev/null
+++ b/src/wp-includes/Requests/src/Capability.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Capability interface declaring the known capabilities.
+ *
+ * @package Requests\Utilities
+ */
+
+namespace WpOrg\Requests;
+
+/**
+ * Capability interface declaring the known capabilities.
+ *
+ * This is used as the authoritative source for which capabilities can be queried.
+ *
+ * @package Requests\Utilities
+ */
+interface Capability {
+
+	/**
+	 * Support for SSL.
+	 *
+	 * @var string
+	 */
+	const SSL = 'ssl';
+
+	/**
+	 * Collection of all capabilities supported in Requests.
+	 *
+	 * Note: this does not automatically mean that the capability will be supported for your chosen transport!
+	 *
+	 * @var string[]
+	 */
+	const ALL = [
+		self::SSL,
+	];
+}
diff --git a/src/wp-includes/Requests/Cookie.php b/src/wp-includes/Requests/src/Cookie.php
similarity index 63%
rename from src/wp-includes/Requests/Cookie.php
rename to src/wp-includes/Requests/src/Cookie.php
index 7dd5b6822d347..6f971d6dbf2a8 100644
--- a/src/wp-includes/Requests/Cookie.php
+++ b/src/wp-includes/Requests/src/Cookie.php
@@ -2,17 +2,23 @@
 /**
  * Cookie storage object
  *
- * @package Requests
- * @subpackage Cookies
+ * @package Requests\Cookies
  */
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Iri;
+use WpOrg\Requests\Response\Headers;
+use WpOrg\Requests\Utility\CaseInsensitiveDictionary;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * Cookie storage object
  *
- * @package Requests
- * @subpackage Cookies
+ * @package Requests\Cookies
  */
-class Requests_Cookie {
+class Cookie {
 	/**
 	 * Cookie name.
 	 *
@@ -30,22 +36,21 @@ class Requests_Cookie {
 	/**
 	 * Cookie attributes
 	 *
-	 * Valid keys are (currently) path, domain, expires, max-age, secure and
-	 * httponly.
+	 * Valid keys are `'path'`, `'domain'`, `'expires'`, `'max-age'`, `'secure'` and
+	 * `'httponly'`.
 	 *
-	 * @var Requests_Utility_CaseInsensitiveDictionary|array Array-like object
+	 * @var \WpOrg\Requests\Utility\CaseInsensitiveDictionary|array Array-like object
 	 */
-	public $attributes = array();
+	public $attributes = [];
 
 	/**
 	 * Cookie flags
 	 *
-	 * Valid keys are (currently) creation, last-access, persistent and
-	 * host-only.
+	 * Valid keys are `'creation'`, `'last-access'`, `'persistent'` and `'host-only'`.
 	 *
 	 * @var array
 	 */
-	public $flags = array();
+	public $flags = [];
 
 	/**
 	 * Reference time for relative calculations
@@ -60,20 +65,50 @@ class Requests_Cookie {
 	/**
 	 * Create a new cookie object
 	 *
-	 * @param string $name
-	 * @param string $value
-	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
+	 * @param string                                                  $name           The name of the cookie.
+	 * @param string                                                  $value          The value for the cookie.
+	 * @param array|\WpOrg\Requests\Utility\CaseInsensitiveDictionary $attributes Associative array of attribute data
+	 * @param array                                                   $flags          The flags for the cookie.
+	 *                                                                                Valid keys are `'creation'`, `'last-access'`,
+	 *                                                                                `'persistent'` and `'host-only'`.
+	 * @param int|null                                                $reference_time Reference time for relative calculations.
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $name argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $value argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $attributes argument is not an array or iterable object with array access.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $flags argument is not an array.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $reference_time argument is not an integer or null.
 	 */
-	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
+	public function __construct($name, $value, $attributes = [], $flags = [], $reference_time = null) {
+		if (is_string($name) === false) {
+			throw InvalidArgument::create(1, '$name', 'string', gettype($name));
+		}
+
+		if (is_string($value) === false) {
+			throw InvalidArgument::create(2, '$value', 'string', gettype($value));
+		}
+
+		if (InputValidator::has_array_access($attributes) === false || InputValidator::is_iterable($attributes) === false) {
+			throw InvalidArgument::create(3, '$attributes', 'array|ArrayAccess&Traversable', gettype($attributes));
+		}
+
+		if (is_array($flags) === false) {
+			throw InvalidArgument::create(4, '$flags', 'array', gettype($flags));
+		}
+
+		if ($reference_time !== null && is_int($reference_time) === false) {
+			throw InvalidArgument::create(5, '$reference_time', 'integer|null', gettype($reference_time));
+		}
+
 		$this->name       = $name;
 		$this->value      = $value;
 		$this->attributes = $attributes;
-		$default_flags    = array(
+		$default_flags    = [
 			'creation'    => time(),
 			'last-access' => time(),
 			'persistent'  => false,
 			'host-only'   => true,
-		);
+		];
 		$this->flags      = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
@@ -84,6 +119,15 @@ public function __construct($name, $value, $attributes = array(), $flags = array
 		$this->normalize();
 	}
 
+	/**
+	 * Get the cookie value
+	 *
+	 * Attributes and other data can be accessed via methods.
+	 */
+	public function __toString() {
+		return $this->value;
+	}
+
 	/**
 	 * Check if a cookie is expired.
 	 *
@@ -113,10 +157,10 @@ public function is_expired() {
 	/**
 	 * Check if a cookie is valid for a given URI
 	 *
-	 * @param Requests_IRI $uri URI to check
+	 * @param \WpOrg\Requests\Iri $uri URI to check
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
-	public function uri_matches(Requests_IRI $uri) {
+	public function uri_matches(Iri $uri) {
 		if (!$this->domain_matches($uri->host)) {
 			return false;
 		}
@@ -131,19 +175,23 @@ public function uri_matches(Requests_IRI $uri) {
 	/**
 	 * Check if a cookie is valid for a given domain
 	 *
-	 * @param string $string Domain to check
+	 * @param string $domain Domain to check
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
-	public function domain_matches($string) {
+	public function domain_matches($domain) {
+		if (is_string($domain) === false) {
+			return false;
+		}
+
 		if (!isset($this->attributes['domain'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
 		}
 
-		$domain_string = $this->attributes['domain'];
-		if ($domain_string === $string) {
-			// The domain string and the string are identical.
+		$cookie_domain = $this->attributes['domain'];
+		if ($cookie_domain === $domain) {
+			// The cookie domain and the passed domain are identical.
 			return true;
 		}
 
@@ -153,26 +201,26 @@ public function domain_matches($string) {
 			return false;
 		}
 
-		if (strlen($string) <= strlen($domain_string)) {
-			// For obvious reasons, the string cannot be a suffix if the domain
-			// is shorter than the domain string
+		if (strlen($domain) <= strlen($cookie_domain)) {
+			// For obvious reasons, the cookie domain cannot be a suffix if the passed domain
+			// is shorter than the cookie domain
 			return false;
 		}
 
-		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
-			// The domain string should be a suffix of the string.
+		if (substr($domain, -1 * strlen($cookie_domain)) !== $cookie_domain) {
+			// The cookie domain should be a suffix of the passed domain.
 			return false;
 		}
 
-		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
+		$prefix = substr($domain, 0, strlen($domain) - strlen($cookie_domain));
 		if (substr($prefix, -1) !== '.') {
-			// The last character of the string that is not included in the
+			// The last character of the passed domain that is not included in the
 			// domain string should be a %x2E (".") character.
 			return false;
 		}
 
-		// The string should be a host name (i.e., not an IP address).
-		return !preg_match('#^(.+\.)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $string);
+		// The passed domain should be a host name (i.e., not an IP address).
+		return !preg_match('#^(.+\.)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $domain);
 	}
 
 	/**
@@ -195,6 +243,10 @@ public function path_matches($request_path) {
 			return true;
 		}
 
+		if (is_scalar($request_path) === false) {
+			return false;
+		}
+
 		$cookie_path = $this->attributes['path'];
 
 		if ($cookie_path === $request_path) {
@@ -228,7 +280,11 @@ public function path_matches($request_path) {
 	public function normalize() {
 		foreach ($this->attributes as $key => $value) {
 			$orig_value = $value;
-			$value      = $this->normalize_attribute($key, $value);
+
+			if (is_string($key)) {
+				$value = $this->normalize_attribute($key, $value);
+			}
+
 			if ($value === null) {
 				unset($this->attributes[$key]);
 				continue;
@@ -248,7 +304,7 @@ public function normalize() {
 	 * Handles parsing individual attributes from the cookie values.
 	 *
 	 * @param string $name Attribute name
-	 * @param string|boolean $value Attribute value (string value, or true if empty/flag)
+	 * @param string|int|bool $value Attribute value (string/integer value, or true if empty/flag)
 	 * @return mixed Value if available, or null if the attribute value is invalid (and should be skipped)
 	 */
 	protected function normalize_attribute($name, $value) {
@@ -280,8 +336,7 @@ protected function normalize_attribute($name, $value) {
 				$delta_seconds = (int) $value;
 				if ($delta_seconds <= 0) {
 					$expiry_time = 0;
-				}
-				else {
+				} else {
 					$expiry_time = $this->reference_time + $delta_seconds;
 				}
 
@@ -316,17 +371,6 @@ public function format_for_header() {
 		return sprintf('%s=%s', $this->name, $this->value);
 	}
 
-	/**
-	 * Format a cookie for a Cookie header
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Use {@see Requests_Cookie::format_for_header}
-	 * @return string
-	 */
-	public function formatForHeader() {
-		return $this->format_for_header();
-	}
-
 	/**
 	 * Format a cookie for a Set-Cookie header
 	 *
@@ -338,40 +382,20 @@ public function formatForHeader() {
 	public function format_for_set_cookie() {
 		$header_value = $this->format_for_header();
 		if (!empty($this->attributes)) {
-			$parts = array();
+			$parts = [];
 			foreach ($this->attributes as $key => $value) {
 				// Ignore non-associative attributes
 				if (is_numeric($key)) {
 					$parts[] = $value;
-				}
-				else {
+				} else {
 					$parts[] = sprintf('%s=%s', $key, $value);
 				}
 			}
 
 			$header_value .= '; ' . implode('; ', $parts);
 		}
-		return $header_value;
-	}
-
-	/**
-	 * Format a cookie for a Set-Cookie header
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Use {@see Requests_Cookie::format_for_set_cookie}
-	 * @return string
-	 */
-	public function formatForSetCookie() {
-		return $this->format_for_set_cookie();
-	}
 
-	/**
-	 * Get the cookie value
-	 *
-	 * Attributes and other data can be accessed via methods.
-	 */
-	public function __toString() {
-		return $this->value;
+		return $header_value;
 	}
 
 	/**
@@ -381,17 +405,29 @@ public function __toString() {
 	 * is an intentional deviation from RFC 2109 and RFC 2616. RFC 6265
 	 * specifies some of this handling, but not in a thorough manner.
 	 *
-	 * @param string Cookie header value (from a Set-Cookie header)
-	 * @return Requests_Cookie Parsed cookie object
+	 * @param string $cookie_header Cookie header value (from a Set-Cookie header)
+	 * @param string $name
+	 * @param int|null $reference_time
+	 * @return \WpOrg\Requests\Cookie Parsed cookie object
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $cookie_header argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $name argument is not a string.
 	 */
-	public static function parse($string, $name = '', $reference_time = null) {
-		$parts   = explode(';', $string);
+	public static function parse($cookie_header, $name = '', $reference_time = null) {
+		if (is_string($cookie_header) === false) {
+			throw InvalidArgument::create(1, '$cookie_header', 'string', gettype($cookie_header));
+		}
+
+		if (is_string($name) === false) {
+			throw InvalidArgument::create(2, '$name', 'string', gettype($name));
+		}
+
+		$parts   = explode(';', $cookie_header);
 		$kvparts = array_shift($parts);
 
 		if (!empty($name)) {
-			$value = $string;
-		}
-		elseif (strpos($kvparts, '=') === false) {
+			$value = $cookie_header;
+		} elseif (strpos($kvparts, '=') === false) {
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -399,23 +435,22 @@ public static function parse($string, $name = '', $reference_time = null) {
 			// https://bugzilla.mozilla.org/show_bug.cgi?id=169091
 			$name  = '';
 			$value = $kvparts;
-		}
-		else {
+		} else {
 			list($name, $value) = explode('=', $kvparts, 2);
 		}
+
 		$name  = trim($name);
 		$value = trim($value);
 
-		// Attribute key are handled case-insensitively
-		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
+		// Attribute keys are handled case-insensitively
+		$attributes = new CaseInsensitiveDictionary();
 
 		if (!empty($parts)) {
 			foreach ($parts as $part) {
 				if (strpos($part, '=') === false) {
 					$part_key   = $part;
 					$part_value = true;
-				}
-				else {
+				} else {
 					list($part_key, $part_value) = explode('=', $part, 2);
 					$part_value                  = trim($part_value);
 				}
@@ -425,24 +460,24 @@ public static function parse($string, $name = '', $reference_time = null) {
 			}
 		}
 
-		return new Requests_Cookie($name, $value, $attributes, array(), $reference_time);
+		return new static($name, $value, $attributes, [], $reference_time);
 	}
 
 	/**
 	 * Parse all Set-Cookie headers from request headers
 	 *
-	 * @param Requests_Response_Headers $headers Headers to parse from
-	 * @param Requests_IRI|null $origin URI for comparing cookie origins
+	 * @param \WpOrg\Requests\Response\Headers $headers Headers to parse from
+	 * @param \WpOrg\Requests\Iri|null $origin URI for comparing cookie origins
 	 * @param int|null $time Reference time for expiration calculation
 	 * @return array
 	 */
-	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
+	public static function parse_from_headers(Headers $headers, Iri $origin = null, $time = null) {
 		$cookie_headers = $headers->getValues('Set-Cookie');
 		if (empty($cookie_headers)) {
-			return array();
+			return [];
 		}
 
-		$cookies = array();
+		$cookies = [];
 		foreach ($cookie_headers as $header) {
 			$parsed = self::parse($header, '', $time);
 
@@ -450,8 +485,7 @@ public static function parse_from_headers(Requests_Response_Headers $headers, Re
 			if (empty($parsed->attributes['domain']) && !empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only']   = true;
-			}
-			else {
+			} else {
 				$parsed->flags['host-only'] = false;
 			}
 
@@ -465,19 +499,18 @@ public static function parse_from_headers(Requests_Response_Headers $headers, Re
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
-				}
-				elseif (substr_count($path, '/') === 1) {
+				} elseif (substr_count($path, '/') === 1) {
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
 					$path = '/';
-				}
-				else {
+				} else {
 					// Output the characters of the uri-path from the first
 					// character up to, but not including, the right-most
 					// %x2F ("/").
 					$path = substr($path, 0, strrpos($path, '/'));
 				}
+
 				$parsed->attributes['path'] = $path;
 			}
 
@@ -491,15 +524,4 @@ public static function parse_from_headers(Requests_Response_Headers $headers, Re
 
 		return $cookies;
 	}
-
-	/**
-	 * Parse all Set-Cookie headers from request headers
-	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Use {@see Requests_Cookie::parse_from_headers}
-	 * @return array
-	 */
-	public static function parseFromHeaders(Requests_Response_Headers $headers) {
-		return self::parse_from_headers($headers);
-	}
 }
diff --git a/src/wp-includes/Requests/src/Cookie/Jar.php b/src/wp-includes/Requests/src/Cookie/Jar.php
new file mode 100644
index 0000000000000..7633786b92ae1
--- /dev/null
+++ b/src/wp-includes/Requests/src/Cookie/Jar.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Cookie holder object
+ *
+ * @package Requests\Cookies
+ */
+
+namespace WpOrg\Requests\Cookie;
+
+use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
+use ReturnTypeWillChange;
+use WpOrg\Requests\Cookie;
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\HookManager;
+use WpOrg\Requests\Iri;
+use WpOrg\Requests\Response;
+
+/**
+ * Cookie holder object
+ *
+ * @package Requests\Cookies
+ */
+class Jar implements ArrayAccess, IteratorAggregate {
+	/**
+	 * Actual item data
+	 *
+	 * @var array
+	 */
+	protected $cookies = [];
+
+	/**
+	 * Create a new jar
+	 *
+	 * @param array $cookies Existing cookie values
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not an array.
+	 */
+	public function __construct($cookies = []) {
+		if (is_array($cookies) === false) {
+			throw InvalidArgument::create(1, '$cookies', 'array', gettype($cookies));
+		}
+
+		$this->cookies = $cookies;
+	}
+
+	/**
+	 * Normalise cookie data into a \WpOrg\Requests\Cookie
+	 *
+	 * @param string|\WpOrg\Requests\Cookie $cookie Cookie header value, possibly pre-parsed (object).
+	 * @param string                        $key    Optional. The name for this cookie.
+	 * @return \WpOrg\Requests\Cookie
+	 */
+	public function normalize_cookie($cookie, $key = '') {
+		if ($cookie instanceof Cookie) {
+			return $cookie;
+		}
+
+		return Cookie::parse($cookie, $key);
+	}
+
+	/**
+	 * Check if the given item exists
+	 *
+	 * @param string $offset Item key
+	 * @return boolean Does the item exist?
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetExists($offset) {
+		return isset($this->cookies[$offset]);
+	}
+
+	/**
+	 * Get the value for the item
+	 *
+	 * @param string $offset Item key
+	 * @return string|null Item value (null if offsetExists is false)
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetGet($offset) {
+		if (!isset($this->cookies[$offset])) {
+			return null;
+		}
+
+		return $this->cookies[$offset];
+	}
+
+	/**
+	 * Set the given item
+	 *
+	 * @param string $offset Item name
+	 * @param string $value Item value
+	 *
+	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
+			throw new Exception('Object is a dictionary, not a list', 'invalidset');
+		}
+
+		$this->cookies[$offset] = $value;
+	}
+
+	/**
+	 * Unset the given header
+	 *
+	 * @param string $offset The key for the item to unset.
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetUnset($offset) {
+		unset($this->cookies[$offset]);
+	}
+
+	/**
+	 * Get an iterator for the data
+	 *
+	 * @return \ArrayIterator
+	 */
+	#[ReturnTypeWillChange]
+	public function getIterator() {
+		return new ArrayIterator($this->cookies);
+	}
+
+	/**
+	 * Register the cookie handler with the request's hooking system
+	 *
+	 * @param \WpOrg\Requests\HookManager $hooks Hooking system
+	 */
+	public function register(HookManager $hooks) {
+		$hooks->register('requests.before_request', [$this, 'before_request']);
+		$hooks->register('requests.before_redirect_check', [$this, 'before_redirect_check']);
+	}
+
+	/**
+	 * Add Cookie header to a request if we have any
+	 *
+	 * As per RFC 6265, cookies are separated by '; '
+	 *
+	 * @param string $url
+	 * @param array $headers
+	 * @param array $data
+	 * @param string $type
+	 * @param array $options
+	 */
+	public function before_request($url, &$headers, &$data, &$type, &$options) {
+		if (!$url instanceof Iri) {
+			$url = new Iri($url);
+		}
+
+		if (!empty($this->cookies)) {
+			$cookies = [];
+			foreach ($this->cookies as $key => $cookie) {
+				$cookie = $this->normalize_cookie($cookie, $key);
+
+				// Skip expired cookies
+				if ($cookie->is_expired()) {
+					continue;
+				}
+
+				if ($cookie->domain_matches($url->host)) {
+					$cookies[] = $cookie->format_for_header();
+				}
+			}
+
+			$headers['Cookie'] = implode('; ', $cookies);
+		}
+	}
+
+	/**
+	 * Parse all cookies from a response and attach them to the response
+	 *
+	 * @param \WpOrg\Requests\Response $response Response as received.
+	 */
+	public function before_redirect_check(Response $response) {
+		$url = $response->url;
+		if (!$url instanceof Iri) {
+			$url = new Iri($url);
+		}
+
+		$cookies           = Cookie::parse_from_headers($response->headers, $url);
+		$this->cookies     = array_merge($this->cookies, $cookies);
+		$response->cookies = $this;
+	}
+}
diff --git a/src/wp-includes/Requests/Exception.php b/src/wp-includes/Requests/src/Exception.php
similarity index 80%
rename from src/wp-includes/Requests/Exception.php
rename to src/wp-includes/Requests/src/Exception.php
index 1080efd971e7a..b67d1b1a40c70 100644
--- a/src/wp-includes/Requests/Exception.php
+++ b/src/wp-includes/Requests/src/Exception.php
@@ -2,15 +2,19 @@
 /**
  * Exception for HTTP requests
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests;
+
+use Exception as PHPException;
+
 /**
  * Exception for HTTP requests
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception extends Exception {
+class Exception extends PHPException {
 	/**
 	 * Type of exception
 	 *
@@ -41,7 +45,7 @@ public function __construct($message, $type, $data = null, $code = 0) {
 	}
 
 	/**
-	 * Like {@see getCode()}, but a string code.
+	 * Like {@see \Exception::getCode()}, but a string code.
 	 *
 	 * @codeCoverageIgnore
 	 * @return string
diff --git a/src/wp-includes/Requests/src/Exception/ArgumentCount.php b/src/wp-includes/Requests/src/Exception/ArgumentCount.php
new file mode 100644
index 0000000000000..b5773ddf3345e
--- /dev/null
+++ b/src/wp-includes/Requests/src/Exception/ArgumentCount.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace WpOrg\Requests\Exception;
+
+use WpOrg\Requests\Exception;
+
+/**
+ * Exception for when an incorrect number of arguments are passed to a method.
+ *
+ * Typically, this exception is used when all arguments for a method are optional,
+ * but certain arguments need to be passed together, i.e. a method which can be called
+ * with no arguments or with two arguments, but not with one argument.
+ *
+ * Along the same lines, this exception is also used if a method expects an array
+ * with a certain number of elements and the provided number of elements does not comply.
+ *
+ * @package Requests\Exceptions
+ * @since   2.0.0
+ */
+final class ArgumentCount extends Exception {
+
+	/**
+	 * Create a new argument count exception with a standardized text.
+	 *
+	 * @param string $expected The argument count expected as a phrase.
+	 *                         For example: `at least 2 arguments` or `exactly 1 argument`.
+	 * @param int    $received The actual argument count received.
+	 * @param string $type     Exception type.
+	 *
+	 * @return \WpOrg\Requests\Exception\ArgumentCount
+	 */
+	public static function create($expected, $received, $type) {
+		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_debug_backtrace
+		$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+		return new self(
+			sprintf(
+				'%s::%s() expects %s, %d given',
+				$stack[1]['class'],
+				$stack[1]['function'],
+				$expected,
+				$received
+			),
+			$type
+		);
+	}
+}
diff --git a/src/wp-includes/Requests/Exception/HTTP.php b/src/wp-includes/Requests/src/Exception/Http.php
similarity index 74%
rename from src/wp-includes/Requests/Exception/HTTP.php
rename to src/wp-includes/Requests/src/Exception/Http.php
index 42ac59095af02..7efbc939dc344 100644
--- a/src/wp-includes/Requests/Exception/HTTP.php
+++ b/src/wp-includes/Requests/src/Exception/Http.php
@@ -2,15 +2,20 @@
 /**
  * Exception based on HTTP response
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception;
+
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\Http\StatusUnknown;
+
 /**
  * Exception based on HTTP response
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP extends Requests_Exception {
+class Http extends Exception {
 	/**
 	 * HTTP status code
 	 *
@@ -44,7 +49,9 @@ public function __construct($reason = null, $data = null) {
 	}
 
 	/**
-	 * Get the status message
+	 * Get the status message.
+	 *
+	 * @return string
 	 */
 	public function getReason() {
 		return $this->reason;
@@ -58,14 +65,14 @@ public function getReason() {
 	 */
 	public static function get_class($code) {
 		if (!$code) {
-			return 'Requests_Exception_HTTP_Unknown';
+			return StatusUnknown::class;
 		}
 
-		$class = sprintf('Requests_Exception_HTTP_%d', $code);
+		$class = sprintf('\WpOrg\Requests\Exception\Http\Status%d', $code);
 		if (class_exists($class)) {
 			return $class;
 		}
 
-		return 'Requests_Exception_HTTP_Unknown';
+		return StatusUnknown::class;
 	}
 }
diff --git a/src/wp-includes/Requests/Exception/HTTP/304.php b/src/wp-includes/Requests/src/Exception/Http/Status304.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/304.php
rename to src/wp-includes/Requests/src/Exception/Http/Status304.php
index 2636ba4517d19..d510ae7d4ebbc 100644
--- a/src/wp-includes/Requests/Exception/HTTP/304.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status304.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 304 Not Modified responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 304 Not Modified responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_304 extends Requests_Exception_HTTP {
+final class Status304 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/305.php b/src/wp-includes/Requests/src/Exception/Http/Status305.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/305.php
rename to src/wp-includes/Requests/src/Exception/Http/Status305.php
index 37d115a81a3ff..8be63c3f21ee3 100644
--- a/src/wp-includes/Requests/Exception/HTTP/305.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status305.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 305 Use Proxy responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 305 Use Proxy responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_305 extends Requests_Exception_HTTP {
+final class Status305 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/306.php b/src/wp-includes/Requests/src/Exception/Http/Status306.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/306.php
rename to src/wp-includes/Requests/src/Exception/Http/Status306.php
index 743a4ed1d0ea7..2f3534ab9da87 100644
--- a/src/wp-includes/Requests/Exception/HTTP/306.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status306.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 306 Switch Proxy responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 306 Switch Proxy responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_306 extends Requests_Exception_HTTP {
+final class Status306 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/400.php b/src/wp-includes/Requests/src/Exception/Http/Status400.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/400.php
rename to src/wp-includes/Requests/src/Exception/Http/Status400.php
index 5bd5428c0fd66..4e39623578d63 100644
--- a/src/wp-includes/Requests/Exception/HTTP/400.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status400.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 400 Bad Request responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 400 Bad Request responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_400 extends Requests_Exception_HTTP {
+final class Status400 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/401.php b/src/wp-includes/Requests/src/Exception/Http/Status401.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/401.php
rename to src/wp-includes/Requests/src/Exception/Http/Status401.php
index 62a283ab09131..2a76429ce7e3b 100644
--- a/src/wp-includes/Requests/Exception/HTTP/401.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status401.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 401 Unauthorized responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 401 Unauthorized responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_401 extends Requests_Exception_HTTP {
+final class Status401 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/402.php b/src/wp-includes/Requests/src/Exception/Http/Status402.php
similarity index 62%
rename from src/wp-includes/Requests/Exception/HTTP/402.php
rename to src/wp-includes/Requests/src/Exception/Http/Status402.php
index f287fd4b226d6..09d42879d5fe9 100644
--- a/src/wp-includes/Requests/Exception/HTTP/402.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status402.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 402 Payment Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 402 Payment Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_402 extends Requests_Exception_HTTP {
+final class Status402 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/403.php b/src/wp-includes/Requests/src/Exception/Http/Status403.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/403.php
rename to src/wp-includes/Requests/src/Exception/Http/Status403.php
index 2ae1c44459cf2..0b1fc3963dd0b 100644
--- a/src/wp-includes/Requests/Exception/HTTP/403.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status403.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 403 Forbidden responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 403 Forbidden responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_403 extends Requests_Exception_HTTP {
+final class Status403 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/404.php b/src/wp-includes/Requests/src/Exception/Http/Status404.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/404.php
rename to src/wp-includes/Requests/src/Exception/Http/Status404.php
index e6e28672c3494..ef39a853e3d95 100644
--- a/src/wp-includes/Requests/Exception/HTTP/404.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status404.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 404 Not Found responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 404 Not Found responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_404 extends Requests_Exception_HTTP {
+final class Status404 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/405.php b/src/wp-includes/Requests/src/Exception/Http/Status405.php
similarity index 62%
rename from src/wp-includes/Requests/Exception/HTTP/405.php
rename to src/wp-includes/Requests/src/Exception/Http/Status405.php
index 0461e6108cbd8..666fbfe7c70ef 100644
--- a/src/wp-includes/Requests/Exception/HTTP/405.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status405.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 405 Method Not Allowed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 405 Method Not Allowed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_405 extends Requests_Exception_HTTP {
+final class Status405 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/406.php b/src/wp-includes/Requests/src/Exception/Http/Status406.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/406.php
rename to src/wp-includes/Requests/src/Exception/Http/Status406.php
index 980ef0efc56b5..37952f80a2e3f 100644
--- a/src/wp-includes/Requests/Exception/HTTP/406.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status406.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 406 Not Acceptable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 406 Not Acceptable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_406 extends Requests_Exception_HTTP {
+final class Status406 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/407.php b/src/wp-includes/Requests/src/Exception/Http/Status407.php
similarity index 64%
rename from src/wp-includes/Requests/Exception/HTTP/407.php
rename to src/wp-includes/Requests/src/Exception/Http/Status407.php
index d08c6af7cc72f..d8796f9b5495b 100644
--- a/src/wp-includes/Requests/Exception/HTTP/407.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status407.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 407 Proxy Authentication Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 407 Proxy Authentication Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_407 extends Requests_Exception_HTTP {
+final class Status407 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/408.php b/src/wp-includes/Requests/src/Exception/Http/Status408.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/408.php
rename to src/wp-includes/Requests/src/Exception/Http/Status408.php
index db15bc29105e8..6718d064a11da 100644
--- a/src/wp-includes/Requests/Exception/HTTP/408.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status408.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 408 Request Timeout responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 408 Request Timeout responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_408 extends Requests_Exception_HTTP {
+final class Status408 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/409.php b/src/wp-includes/Requests/src/Exception/Http/Status409.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/409.php
rename to src/wp-includes/Requests/src/Exception/Http/Status409.php
index 83002f9361193..711a5c43f7608 100644
--- a/src/wp-includes/Requests/Exception/HTTP/409.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status409.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 409 Conflict responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 409 Conflict responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_409 extends Requests_Exception_HTTP {
+final class Status409 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/410.php b/src/wp-includes/Requests/src/Exception/Http/Status410.php
similarity index 58%
rename from src/wp-includes/Requests/Exception/HTTP/410.php
rename to src/wp-includes/Requests/src/Exception/Http/Status410.php
index 5bf7aa6d4698b..127443b7815d8 100644
--- a/src/wp-includes/Requests/Exception/HTTP/410.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status410.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 410 Gone responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 410 Gone responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_410 extends Requests_Exception_HTTP {
+final class Status410 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/411.php b/src/wp-includes/Requests/src/Exception/Http/Status411.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/411.php
rename to src/wp-includes/Requests/src/Exception/Http/Status411.php
index 25517b4f3695d..e70e63c6490b9 100644
--- a/src/wp-includes/Requests/Exception/HTTP/411.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status411.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 411 Length Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 411 Length Required responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_411 extends Requests_Exception_HTTP {
+final class Status411 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/412.php b/src/wp-includes/Requests/src/Exception/Http/Status412.php
similarity index 62%
rename from src/wp-includes/Requests/Exception/HTTP/412.php
rename to src/wp-includes/Requests/src/Exception/Http/Status412.php
index e89533a7efa32..4a8b9185b27be 100644
--- a/src/wp-includes/Requests/Exception/HTTP/412.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status412.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 412 Precondition Failed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 412 Precondition Failed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_412 extends Requests_Exception_HTTP {
+final class Status412 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/413.php b/src/wp-includes/Requests/src/Exception/Http/Status413.php
similarity index 63%
rename from src/wp-includes/Requests/Exception/HTTP/413.php
rename to src/wp-includes/Requests/src/Exception/Http/Status413.php
index a7b38fce11c64..96a96fb163c66 100644
--- a/src/wp-includes/Requests/Exception/HTTP/413.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status413.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 413 Request Entity Too Large responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 413 Request Entity Too Large responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_413 extends Requests_Exception_HTTP {
+final class Status413 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/414.php b/src/wp-includes/Requests/src/Exception/Http/Status414.php
similarity index 63%
rename from src/wp-includes/Requests/Exception/HTTP/414.php
rename to src/wp-includes/Requests/src/Exception/Http/Status414.php
index 54c8b8c9aecf5..b65ec937af1ff 100644
--- a/src/wp-includes/Requests/Exception/HTTP/414.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status414.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 414 Request-URI Too Large responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 414 Request-URI Too Large responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_414 extends Requests_Exception_HTTP {
+final class Status414 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/415.php b/src/wp-includes/Requests/src/Exception/Http/Status415.php
similarity index 63%
rename from src/wp-includes/Requests/Exception/HTTP/415.php
rename to src/wp-includes/Requests/src/Exception/Http/Status415.php
index 6b5f0785b8326..cb45655e97436 100644
--- a/src/wp-includes/Requests/Exception/HTTP/415.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status415.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 415 Unsupported Media Type responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 415 Unsupported Media Type responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_415 extends Requests_Exception_HTTP {
+final class Status415 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/416.php b/src/wp-includes/Requests/src/Exception/Http/Status416.php
similarity index 65%
rename from src/wp-includes/Requests/Exception/HTTP/416.php
rename to src/wp-includes/Requests/src/Exception/Http/Status416.php
index 48a4ecdb8f0dd..c3661a193cfe6 100644
--- a/src/wp-includes/Requests/Exception/HTTP/416.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status416.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 416 Requested Range Not Satisfiable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 416 Requested Range Not Satisfiable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_416 extends Requests_Exception_HTTP {
+final class Status416 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/417.php b/src/wp-includes/Requests/src/Exception/Http/Status417.php
similarity index 62%
rename from src/wp-includes/Requests/Exception/HTTP/417.php
rename to src/wp-includes/Requests/src/Exception/Http/Status417.php
index 81570330aa758..4adba9a23efb7 100644
--- a/src/wp-includes/Requests/Exception/HTTP/417.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status417.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 417 Expectation Failed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 417 Expectation Failed responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_417 extends Requests_Exception_HTTP {
+final class Status417 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/418.php b/src/wp-includes/Requests/src/Exception/Http/Status418.php
similarity index 50%
rename from src/wp-includes/Requests/Exception/HTTP/418.php
rename to src/wp-includes/Requests/src/Exception/Http/Status418.php
index 0fcc87d614678..5bcb2b84a959a 100644
--- a/src/wp-includes/Requests/Exception/HTTP/418.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status418.php
@@ -2,17 +2,23 @@
 /**
  * Exception for 418 I'm A Teapot responses
  *
- * @see https://tools.ietf.org/html/rfc2324
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc2324
+ *
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 418 I'm A Teapot responses
  *
- * @see https://tools.ietf.org/html/rfc2324
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc2324
+ *
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_418 extends Requests_Exception_HTTP {
+final class Status418 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/428.php b/src/wp-includes/Requests/src/Exception/Http/Status428.php
similarity index 52%
rename from src/wp-includes/Requests/Exception/HTTP/428.php
rename to src/wp-includes/Requests/src/Exception/Http/Status428.php
index 799ddffd548d1..4d7ea51f5c9c7 100644
--- a/src/wp-includes/Requests/Exception/HTTP/428.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status428.php
@@ -2,17 +2,23 @@
 /**
  * Exception for 428 Precondition Required responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 428 Precondition Required responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_428 extends Requests_Exception_HTTP {
+final class Status428 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/src/Exception/Http/Status429.php b/src/wp-includes/Requests/src/Exception/Http/Status429.php
new file mode 100644
index 0000000000000..2018196c7bea1
--- /dev/null
+++ b/src/wp-includes/Requests/src/Exception/Http/Status429.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Exception for 429 Too Many Requests responses
+ *
+ * @link https://tools.ietf.org/html/draft-nottingham-http-new-status-04
+ *
+ * @package Requests\Exceptions
+ */
+
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
+/**
+ * Exception for 429 Too Many Requests responses
+ *
+ * @link https://tools.ietf.org/html/draft-nottingham-http-new-status-04
+ *
+ * @package Requests\Exceptions
+ */
+final class Status429 extends Http {
+	/**
+	 * HTTP status code
+	 *
+	 * @var integer
+	 */
+	protected $code = 429;
+
+	/**
+	 * Reason phrase
+	 *
+	 * @var string
+	 */
+	protected $reason = 'Too Many Requests';
+}
diff --git a/src/wp-includes/Requests/Exception/HTTP/431.php b/src/wp-includes/Requests/src/Exception/Http/Status431.php
similarity index 55%
rename from src/wp-includes/Requests/Exception/HTTP/431.php
rename to src/wp-includes/Requests/src/Exception/Http/Status431.php
index a92b48a4e7b0a..50bba430c730a 100644
--- a/src/wp-includes/Requests/Exception/HTTP/431.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status431.php
@@ -2,17 +2,23 @@
 /**
  * Exception for 431 Request Header Fields Too Large responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 431 Request Header Fields Too Large responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_431 extends Requests_Exception_HTTP {
+final class Status431 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/500.php b/src/wp-includes/Requests/src/Exception/Http/Status500.php
similarity index 63%
rename from src/wp-includes/Requests/Exception/HTTP/500.php
rename to src/wp-includes/Requests/src/Exception/Http/Status500.php
index 22a6406ab24d6..42089ff0eb818 100644
--- a/src/wp-includes/Requests/Exception/HTTP/500.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status500.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 500 Internal Server Error responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 500 Internal Server Error responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_500 extends Requests_Exception_HTTP {
+final class Status500 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/501.php b/src/wp-includes/Requests/src/Exception/Http/Status501.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/501.php
rename to src/wp-includes/Requests/src/Exception/Http/Status501.php
index 11f395b20a625..2b924302bfe2c 100644
--- a/src/wp-includes/Requests/Exception/HTTP/501.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status501.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 501 Not Implemented responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 501 Not Implemented responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_501 extends Requests_Exception_HTTP {
+final class Status501 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/502.php b/src/wp-includes/Requests/src/Exception/Http/Status502.php
similarity index 60%
rename from src/wp-includes/Requests/Exception/HTTP/502.php
rename to src/wp-includes/Requests/src/Exception/Http/Status502.php
index 43f576a62588e..7ce2b0f3de93b 100644
--- a/src/wp-includes/Requests/Exception/HTTP/502.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status502.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 502 Bad Gateway responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 502 Bad Gateway responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_502 extends Requests_Exception_HTTP {
+final class Status502 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/503.php b/src/wp-includes/Requests/src/Exception/Http/Status503.php
similarity index 62%
rename from src/wp-includes/Requests/Exception/HTTP/503.php
rename to src/wp-includes/Requests/src/Exception/Http/Status503.php
index 4024a4f5cde34..2e70dd9286562 100644
--- a/src/wp-includes/Requests/Exception/HTTP/503.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status503.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 503 Service Unavailable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 503 Service Unavailable responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_503 extends Requests_Exception_HTTP {
+final class Status503 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/504.php b/src/wp-includes/Requests/src/Exception/Http/Status504.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/504.php
rename to src/wp-includes/Requests/src/Exception/Http/Status504.php
index 25fd08631c0aa..efa100ae87f8d 100644
--- a/src/wp-includes/Requests/Exception/HTTP/504.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status504.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 504 Gateway Timeout responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 504 Gateway Timeout responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_504 extends Requests_Exception_HTTP {
+final class Status504 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/505.php b/src/wp-includes/Requests/src/Exception/Http/Status505.php
similarity index 64%
rename from src/wp-includes/Requests/Exception/HTTP/505.php
rename to src/wp-includes/Requests/src/Exception/Http/Status505.php
index 1f7cfec9b5ebe..71ba46320761d 100644
--- a/src/wp-includes/Requests/Exception/HTTP/505.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status505.php
@@ -2,15 +2,19 @@
 /**
  * Exception for 505 HTTP Version Not Supported responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 505 HTTP Version Not Supported responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_505 extends Requests_Exception_HTTP {
+final class Status505 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/511.php b/src/wp-includes/Requests/src/Exception/Http/Status511.php
similarity index 55%
rename from src/wp-includes/Requests/Exception/HTTP/511.php
rename to src/wp-includes/Requests/src/Exception/Http/Status511.php
index 3332513b15995..8d6fee7b6ae48 100644
--- a/src/wp-includes/Requests/Exception/HTTP/511.php
+++ b/src/wp-includes/Requests/src/Exception/Http/Status511.php
@@ -2,17 +2,23 @@
 /**
  * Exception for 511 Network Authentication Required responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+
 /**
  * Exception for 511 Network Authentication Required responses
  *
- * @see https://tools.ietf.org/html/rfc6585
- * @package Requests
+ * @link https://tools.ietf.org/html/rfc6585
+ *
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_511 extends Requests_Exception_HTTP {
+final class Status511 extends Http {
 	/**
 	 * HTTP status code
 	 *
diff --git a/src/wp-includes/Requests/Exception/HTTP/Unknown.php b/src/wp-includes/Requests/src/Exception/Http/StatusUnknown.php
similarity index 61%
rename from src/wp-includes/Requests/Exception/HTTP/Unknown.php
rename to src/wp-includes/Requests/src/Exception/Http/StatusUnknown.php
index b7eeb795381ca..802793feeb723 100644
--- a/src/wp-includes/Requests/Exception/HTTP/Unknown.php
+++ b/src/wp-includes/Requests/src/Exception/Http/StatusUnknown.php
@@ -2,15 +2,20 @@
 /**
  * Exception for unknown status responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
 
+namespace WpOrg\Requests\Exception\Http;
+
+use WpOrg\Requests\Exception\Http;
+use WpOrg\Requests\Response;
+
 /**
  * Exception for unknown status responses
  *
- * @package Requests
+ * @package Requests\Exceptions
  */
-class Requests_Exception_HTTP_Unknown extends Requests_Exception_HTTP {
+final class StatusUnknown extends Http {
 	/**
 	 * HTTP status code
 	 *
@@ -28,15 +33,15 @@ class Requests_Exception_HTTP_Unknown extends Requests_Exception_HTTP {
 	/**
 	 * Create a new exception
 	 *
-	 * If `$data` is an instance of {@see Requests_Response}, uses the status
+	 * If `$data` is an instance of {@see \WpOrg\Requests\Response}, uses the status
 	 * code from it. Otherwise, sets as 0
 	 *
 	 * @param string|null $reason Reason phrase
 	 * @param mixed $data Associated data
 	 */
 	public function __construct($reason = null, $data = null) {
-		if ($data instanceof Requests_Response) {
-			$this->code = $data->status_code;
+		if ($data instanceof Response) {
+			$this->code = (int) $data->status_code;
 		}
 
 		parent::__construct($reason, $data);
diff --git a/src/wp-includes/Requests/src/Exception/InvalidArgument.php b/src/wp-includes/Requests/src/Exception/InvalidArgument.php
new file mode 100644
index 0000000000000..0ab7332f4f66a
--- /dev/null
+++ b/src/wp-includes/Requests/src/Exception/InvalidArgument.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace WpOrg\Requests\Exception;
+
+use InvalidArgumentException;
+
+/**
+ * Exception for an invalid argument passed.
+ *
+ * @package Requests\Exceptions
+ * @since   2.0.0
+ */
+final class InvalidArgument extends InvalidArgumentException {
+
+	/**
+	 * Create a new invalid argument exception with a standardized text.
+	 *
+	 * @param int    $position The argument position in the function signature. 1-based.
+	 * @param string $name     The argument name in the function signature.
+	 * @param string $expected The argument type expected as a string.
+	 * @param string $received The actual argument type received.
+	 *
+	 * @return \WpOrg\Requests\Exception\InvalidArgument
+	 */
+	public static function create($position, $name, $expected, $received) {
+		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_debug_backtrace
+		$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+		return new self(
+			sprintf(
+				'%s::%s(): Argument #%d (%s) must be of type %s, %s given',
+				$stack[1]['class'],
+				$stack[1]['function'],
+				$position,
+				$name,
+				$expected,
+				$received
+			)
+		);
+	}
+}
diff --git a/src/wp-includes/Requests/src/Exception/Transport.php b/src/wp-includes/Requests/src/Exception/Transport.php
new file mode 100644
index 0000000000000..c76e92ec1c6f8
--- /dev/null
+++ b/src/wp-includes/Requests/src/Exception/Transport.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Transport Exception
+ *
+ * @package Requests\Exceptions
+ */
+
+namespace WpOrg\Requests\Exception;
+
+use WpOrg\Requests\Exception;
+
+/**
+ * Transport Exception
+ *
+ * @package Requests\Exceptions
+ */
+class Transport extends Exception {}
diff --git a/src/wp-includes/Requests/Exception/Transport/cURL.php b/src/wp-includes/Requests/src/Exception/Transport/Curl.php
similarity index 56%
rename from src/wp-includes/Requests/Exception/Transport/cURL.php
rename to src/wp-includes/Requests/src/Exception/Transport/Curl.php
index fffa8c259be39..4c0294d748ab9 100644
--- a/src/wp-includes/Requests/Exception/Transport/cURL.php
+++ b/src/wp-includes/Requests/src/Exception/Transport/Curl.php
@@ -1,6 +1,20 @@
 <?php
+/**
+ * CURL Transport Exception.
+ *
+ * @package Requests\Exceptions
+ */
 
-class Requests_Exception_Transport_cURL extends Requests_Exception_Transport {
+namespace WpOrg\Requests\Exception\Transport;
+
+use WpOrg\Requests\Exception\Transport;
+
+/**
+ * CURL Transport Exception.
+ *
+ * @package Requests\Exceptions
+ */
+final class Curl extends Transport {
 
 	const EASY  = 'cURLEasy';
 	const MULTI = 'cURLMulti';
@@ -29,13 +43,21 @@ class Requests_Exception_Transport_cURL extends Requests_Exception_Transport {
 	 */
 	protected $reason = 'Unknown';
 
+	/**
+	 * Create a new exception.
+	 *
+	 * @param string $message Exception message.
+	 * @param string $type    Exception type.
+	 * @param mixed  $data    Associated data, if applicable.
+	 * @param int    $code    Exception numerical code, if applicable.
+	 */
 	public function __construct($message, $type, $data = null, $code = 0) {
 		if ($type !== null) {
 			$this->type = $type;
 		}
 
 		if ($code !== null) {
-			$this->code = $code;
+			$this->code = (int) $code;
 		}
 
 		if ($message !== null) {
@@ -47,7 +69,9 @@ public function __construct($message, $type, $data = null, $code = 0) {
 	}
 
 	/**
-	 * Get the error message
+	 * Get the error message.
+	 *
+	 * @return string
 	 */
 	public function getReason() {
 		return $this->reason;
diff --git a/src/wp-includes/Requests/Hooker.php b/src/wp-includes/Requests/src/HookManager.php
similarity index 66%
rename from src/wp-includes/Requests/Hooker.php
rename to src/wp-includes/Requests/src/HookManager.php
index c852931f1a859..f2920170b9e6b 100644
--- a/src/wp-includes/Requests/Hooker.php
+++ b/src/wp-includes/Requests/src/HookManager.php
@@ -2,22 +2,22 @@
 /**
  * Event dispatcher
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\EventDispatcher
  */
 
+namespace WpOrg\Requests;
+
 /**
  * Event dispatcher
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\EventDispatcher
  */
-interface Requests_Hooker {
+interface HookManager {
 	/**
 	 * Register a callback for a hook
 	 *
 	 * @param string $hook Hook name
-	 * @param callback $callback Function/method to call on event
+	 * @param callable $callback Function/method to call on event
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
 	 */
 	public function register($hook, $callback, $priority = 0);
@@ -29,5 +29,5 @@ public function register($hook, $callback, $priority = 0);
 	 * @param array $parameters Parameters to pass to callbacks
 	 * @return boolean Successfulness
 	 */
-	public function dispatch($hook, $parameters = array());
+	public function dispatch($hook, $parameters = []);
 }
diff --git a/src/wp-includes/Requests/src/Hooks.php b/src/wp-includes/Requests/src/Hooks.php
new file mode 100644
index 0000000000000..74fba0b3e135a
--- /dev/null
+++ b/src/wp-includes/Requests/src/Hooks.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Handles adding and dispatching events
+ *
+ * @package Requests\EventDispatcher
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\HookManager;
+use WpOrg\Requests\Utility\InputValidator;
+
+/**
+ * Handles adding and dispatching events
+ *
+ * @package Requests\EventDispatcher
+ */
+class Hooks implements HookManager {
+	/**
+	 * Registered callbacks for each hook
+	 *
+	 * @var array
+	 */
+	protected $hooks = [];
+
+	/**
+	 * Register a callback for a hook
+	 *
+	 * @param string $hook Hook name
+	 * @param callable $callback Function/method to call on event
+	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $hook argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $callback argument is not callable.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $priority argument is not an integer.
+	 */
+	public function register($hook, $callback, $priority = 0) {
+		if (is_string($hook) === false) {
+			throw InvalidArgument::create(1, '$hook', 'string', gettype($hook));
+		}
+
+		if (is_callable($callback) === false) {
+			throw InvalidArgument::create(2, '$callback', 'callable', gettype($callback));
+		}
+
+		if (InputValidator::is_numeric_array_key($priority) === false) {
+			throw InvalidArgument::create(3, '$priority', 'integer', gettype($priority));
+		}
+
+		if (!isset($this->hooks[$hook])) {
+			$this->hooks[$hook] = [
+				$priority => [],
+			];
+		} elseif (!isset($this->hooks[$hook][$priority])) {
+			$this->hooks[$hook][$priority] = [];
+		}
+
+		$this->hooks[$hook][$priority][] = $callback;
+	}
+
+	/**
+	 * Dispatch a message
+	 *
+	 * @param string $hook Hook name
+	 * @param array $parameters Parameters to pass to callbacks
+	 * @return boolean Successfulness
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $hook argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $parameters argument is not an array.
+	 */
+	public function dispatch($hook, $parameters = []) {
+		if (is_string($hook) === false) {
+			throw InvalidArgument::create(1, '$hook', 'string', gettype($hook));
+		}
+
+		// Check strictly against array, as Array* objects don't work in combination with `call_user_func_array()`.
+		if (is_array($parameters) === false) {
+			throw InvalidArgument::create(2, '$parameters', 'array', gettype($parameters));
+		}
+
+		if (empty($this->hooks[$hook])) {
+			return false;
+		}
+
+		if (!empty($parameters)) {
+			// Strip potential keys from the array to prevent them being interpreted as parameter names in PHP 8.0.
+			$parameters = array_values($parameters);
+		}
+
+		ksort($this->hooks[$hook]);
+
+		foreach ($this->hooks[$hook] as $priority => $hooked) {
+			foreach ($hooked as $callback) {
+				$callback(...$parameters);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/src/wp-includes/Requests/IDNAEncoder.php b/src/wp-includes/Requests/src/IdnaEncoder.php
similarity index 59%
rename from src/wp-includes/Requests/IDNAEncoder.php
rename to src/wp-includes/Requests/src/IdnaEncoder.php
index 881142935b48c..4257a1acbefff 100644
--- a/src/wp-includes/Requests/IDNAEncoder.php
+++ b/src/wp-includes/Requests/src/IdnaEncoder.php
@@ -1,28 +1,45 @@
 <?php
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * IDNA URL encoder
  *
  * Note: Not fully compliant, as nameprep does nothing yet.
  *
- * @package Requests
- * @subpackage Utilities
- * @see https://tools.ietf.org/html/rfc3490 IDNA specification
- * @see https://tools.ietf.org/html/rfc3492 Punycode/Bootstrap specification
+ * @package Requests\Utilities
+ *
+ * @link https://tools.ietf.org/html/rfc3490 IDNA specification
+ * @link https://tools.ietf.org/html/rfc3492 Punycode/Bootstrap specification
  */
-class Requests_IDNAEncoder {
+class IdnaEncoder {
 	/**
 	 * ACE prefix used for IDNA
 	 *
-	 * @see https://tools.ietf.org/html/rfc3490#section-5
+	 * @link https://tools.ietf.org/html/rfc3490#section-5
 	 * @var string
 	 */
 	const ACE_PREFIX = 'xn--';
 
+	/**
+	 * Maximum length of a IDNA URL in ASCII.
+	 *
+	 * @see \WpOrg\Requests\IdnaEncoder::to_ascii()
+	 *
+	 * @since 2.0.0
+	 *
+	 * @var int
+	 */
+	const MAX_LENGTH = 64;
+
 	/**#@+
 	 * Bootstrap constant for Punycode
 	 *
-	 * @see https://tools.ietf.org/html/rfc3492#section-5
+	 * @link https://tools.ietf.org/html/rfc3492#section-5
 	 * @var int
 	 */
 	const BOOTSTRAP_BASE         = 36;
@@ -37,106 +54,119 @@ class Requests_IDNAEncoder {
 	/**
 	 * Encode a hostname using Punycode
 	 *
-	 * @param string $string Hostname
+	 * @param string|Stringable $hostname Hostname
 	 * @return string Punycode-encoded hostname
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string or a stringable object.
 	 */
-	public static function encode($string) {
-		$parts = explode('.', $string);
+	public static function encode($hostname) {
+		if (InputValidator::is_string_or_stringable($hostname) === false) {
+			throw InvalidArgument::create(1, '$hostname', 'string|Stringable', gettype($hostname));
+		}
+
+		$parts = explode('.', $hostname);
 		foreach ($parts as &$part) {
 			$part = self::to_ascii($part);
 		}
+
 		return implode('.', $parts);
 	}
 
 	/**
-	 * Convert a UTF-8 string to an ASCII string using Punycode
-	 *
-	 * @throws Requests_Exception Provided string longer than 64 ASCII characters (`idna.provided_too_long`)
-	 * @throws Requests_Exception Prepared string longer than 64 ASCII characters (`idna.prepared_too_long`)
-	 * @throws Requests_Exception Provided string already begins with xn-- (`idna.provided_is_prefixed`)
-	 * @throws Requests_Exception Encoded string longer than 64 ASCII characters (`idna.encoded_too_long`)
+	 * Convert a UTF-8 text string to an ASCII string using Punycode
 	 *
-	 * @param string $string ASCII or UTF-8 string (max length 64 characters)
+	 * @param string $text ASCII or UTF-8 string (max length 64 characters)
 	 * @return string ASCII string
+	 *
+	 * @throws \WpOrg\Requests\Exception Provided string longer than 64 ASCII characters (`idna.provided_too_long`)
+	 * @throws \WpOrg\Requests\Exception Prepared string longer than 64 ASCII characters (`idna.prepared_too_long`)
+	 * @throws \WpOrg\Requests\Exception Provided string already begins with xn-- (`idna.provided_is_prefixed`)
+	 * @throws \WpOrg\Requests\Exception Encoded string longer than 64 ASCII characters (`idna.encoded_too_long`)
 	 */
-	public static function to_ascii($string) {
-		// Step 1: Check if the string is already ASCII
-		if (self::is_ascii($string)) {
+	public static function to_ascii($text) {
+		// Step 1: Check if the text is already ASCII
+		if (self::is_ascii($text)) {
 			// Skip to step 7
-			if (strlen($string) < 64) {
-				return $string;
+			if (strlen($text) < self::MAX_LENGTH) {
+				return $text;
 			}
 
-			throw new Requests_Exception('Provided string is too long', 'idna.provided_too_long', $string);
+			throw new Exception('Provided string is too long', 'idna.provided_too_long', $text);
 		}
 
 		// Step 2: nameprep
-		$string = self::nameprep($string);
+		$text = self::nameprep($text);
 
 		// Step 3: UseSTD3ASCIIRules is false, continue
 		// Step 4: Check if it's ASCII now
-		if (self::is_ascii($string)) {
+		if (self::is_ascii($text)) {
 			// Skip to step 7
-			if (strlen($string) < 64) {
-				return $string;
+			/*
+			 * As the `nameprep()` method returns the original string, this code will never be reached until
+			 * that method is properly implemented.
+			 */
+			// @codeCoverageIgnoreStart
+			if (strlen($text) < self::MAX_LENGTH) {
+				return $text;
 			}
 
-			throw new Requests_Exception('Prepared string is too long', 'idna.prepared_too_long', $string);
+			throw new Exception('Prepared string is too long', 'idna.prepared_too_long', $text);
+			// @codeCoverageIgnoreEnd
 		}
 
 		// Step 5: Check ACE prefix
-		if (strpos($string, self::ACE_PREFIX) === 0) {
-			throw new Requests_Exception('Provided string begins with ACE prefix', 'idna.provided_is_prefixed', $string);
+		if (strpos($text, self::ACE_PREFIX) === 0) {
+			throw new Exception('Provided string begins with ACE prefix', 'idna.provided_is_prefixed', $text);
 		}
 
 		// Step 6: Encode with Punycode
-		$string = self::punycode_encode($string);
+		$text = self::punycode_encode($text);
 
 		// Step 7: Prepend ACE prefix
-		$string = self::ACE_PREFIX . $string;
+		$text = self::ACE_PREFIX . $text;
 
 		// Step 8: Check size
-		if (strlen($string) < 64) {
-			return $string;
+		if (strlen($text) < self::MAX_LENGTH) {
+			return $text;
 		}
 
-		throw new Requests_Exception('Encoded string is too long', 'idna.encoded_too_long', $string);
+		throw new Exception('Encoded string is too long', 'idna.encoded_too_long', $text);
 	}
 
 	/**
-	 * Check whether a given string contains only ASCII characters
+	 * Check whether a given text string contains only ASCII characters
 	 *
 	 * @internal (Testing found regex was the fastest implementation)
 	 *
-	 * @param string $string
-	 * @return bool Is the string ASCII-only?
+	 * @param string $text Text to examine.
+	 * @return bool Is the text string ASCII-only?
 	 */
-	protected static function is_ascii($string) {
-		return (preg_match('/(?:[^\x00-\x7F])/', $string) !== 1);
+	protected static function is_ascii($text) {
+		return (preg_match('/(?:[^\x00-\x7F])/', $text) !== 1);
 	}
 
 	/**
-	 * Prepare a string for use as an IDNA name
+	 * Prepare a text string for use as an IDNA name
 	 *
 	 * @todo Implement this based on RFC 3491 and the newer 5891
-	 * @param string $string
+	 * @param string $text Text to prepare.
 	 * @return string Prepared string
 	 */
-	protected static function nameprep($string) {
-		return $string;
+	protected static function nameprep($text) {
+		return $text;
 	}
 
 	/**
 	 * Convert a UTF-8 string to a UCS-4 codepoint array
 	 *
-	 * Based on Requests_IRI::replace_invalid_with_pct_encoding()
+	 * Based on \WpOrg\Requests\Iri::replace_invalid_with_pct_encoding()
 	 *
-	 * @throws Requests_Exception Invalid UTF-8 codepoint (`idna.invalidcodepoint`)
-	 * @param string $input
+	 * @param string $input Text to convert.
 	 * @return array Unicode code points
+	 *
+	 * @throws \WpOrg\Requests\Exception Invalid UTF-8 codepoint (`idna.invalidcodepoint`)
 	 */
 	protected static function utf8_to_codepoints($input) {
-		$codepoints = array();
+		$codepoints = [];
 
 		// Get number of bytes
 		$strlen = strlen($input);
@@ -145,50 +175,43 @@ protected static function utf8_to_codepoints($input) {
 		for ($position = 0; $position < $strlen; $position++) {
 			$value = ord($input[$position]);
 
-			// One byte sequence:
-			if ((~$value & 0x80) === 0x80) {
+			if ((~$value & 0x80) === 0x80) {            // One byte sequence:
 				$character = $value;
 				$length    = 1;
 				$remaining = 0;
-			}
-			// Two byte sequence:
-			elseif (($value & 0xE0) === 0xC0) {
+			} elseif (($value & 0xE0) === 0xC0) {       // Two byte sequence:
 				$character = ($value & 0x1F) << 6;
 				$length    = 2;
 				$remaining = 1;
-			}
-			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
+			} elseif (($value & 0xF0) === 0xE0) {       // Three byte sequence:
 				$character = ($value & 0x0F) << 12;
 				$length    = 3;
 				$remaining = 2;
-			}
-			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
+			} elseif (($value & 0xF8) === 0xF0) {       // Four byte sequence:
 				$character = ($value & 0x07) << 18;
 				$length    = 4;
 				$remaining = 3;
-			}
-			// Invalid byte:
-			else {
-				throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $value);
+			} else {                                    // Invalid byte:
+				throw new Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $value);
 			}
 
 			if ($remaining > 0) {
 				if ($position + $length > $strlen) {
-					throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
+					throw new Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
 				}
+
 				for ($position++; $remaining > 0; $position++) {
 					$value = ord($input[$position]);
 
 					// If it is invalid, count the sequence as invalid and reprocess the current byte:
 					if (($value & 0xC0) !== 0x80) {
-						throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
+						throw new Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
 					}
 
 					--$remaining;
 					$character |= ($value & 0x3F) << ($remaining * 6);
 				}
+
 				$position--;
 			}
 
@@ -208,7 +231,7 @@ protected static function utf8_to_codepoints($input) {
 					|| $character > 0xEFFFD
 				)
 			) {
-				throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
+				throw new Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
 			}
 
 			$codepoints[] = $character;
@@ -221,10 +244,11 @@ protected static function utf8_to_codepoints($input) {
 	 * RFC3492-compliant encoder
 	 *
 	 * @internal Pseudo-code from Section 6.3 is commented with "#" next to relevant code
-	 * @throws Requests_Exception On character outside of the domain (never happens with Punycode) (`idna.character_outside_domain`)
 	 *
 	 * @param string $input UTF-8 encoded string to encode
 	 * @return string Punycode-encoded string
+	 *
+	 * @throws \WpOrg\Requests\Exception On character outside of the domain (never happens with Punycode) (`idna.character_outside_domain`)
 	 */
 	public static function punycode_encode($input) {
 		$output = '';
@@ -239,7 +263,7 @@ public static function punycode_encode($input) {
 		$b = 0; // see loop
 		// copy them to the output in order
 		$codepoints = self::utf8_to_codepoints($input);
-		$extended   = array();
+		$extended   = [];
 
 		foreach ($codepoints as $char) {
 			if ($char < 128) {
@@ -247,18 +271,18 @@ public static function punycode_encode($input) {
 				// TODO: this should also check if it's valid for a URL
 				$output .= chr($char);
 				$h++;
-			}
-			// Check if the character is non-ASCII, but below initial n
-			// This never occurs for Punycode, so ignore in coverage
-			// @codeCoverageIgnoreStart
-			elseif ($char < $n) {
-				throw new Requests_Exception('Invalid character', 'idna.character_outside_domain', $char);
-			}
-			// @codeCoverageIgnoreEnd
-			else {
+
+				// Check if the character is non-ASCII, but below initial n
+				// This never occurs for Punycode, so ignore in coverage
+				// @codeCoverageIgnoreStart
+			} elseif ($char < $n) {
+				throw new Exception('Invalid character', 'idna.character_outside_domain', $char);
+				// @codeCoverageIgnoreEnd
+			} else {
 				$extended[$char] = true;
 			}
 		}
+
 		$extended = array_keys($extended);
 		sort($extended);
 		$b = $h;
@@ -266,6 +290,7 @@ public static function punycode_encode($input) {
 		if (strlen($output) > 0) {
 			$output .= '-';
 		}
+
 		// {if the input contains a non-basic code point < n then fail}
 		// while h < length(input) do begin
 		$codepointcount = count($codepoints);
@@ -283,9 +308,7 @@ public static function punycode_encode($input) {
 				// if c < n then increment delta, fail on overflow
 				if ($c < $n) {
 					$delta++;
-				}
-				// if c == n then begin
-				elseif ($c === $n) {
+				} elseif ($c === $n) { // if c == n then begin
 					// let q = delta
 					$q = $delta;
 					// for k = base to infinity in steps of base do begin
@@ -294,22 +317,22 @@ public static function punycode_encode($input) {
 						//     tmax if k >= bias + tmax, or k - bias otherwise
 						if ($k <= ($bias + self::BOOTSTRAP_TMIN)) {
 							$t = self::BOOTSTRAP_TMIN;
-						}
-						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
+						} elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
 							$t = self::BOOTSTRAP_TMAX;
-						}
-						else {
+						} else {
 							$t = $k - $bias;
 						}
+
 						// if q < t then break
 						if ($q < $t) {
 							break;
 						}
+
 						// output the code point for digit t + ((q - t) mod (base - t))
-						$digit   = $t + (($q - $t) % (self::BOOTSTRAP_BASE - $t));
+						$digit   = (int) ($t + (($q - $t) % (self::BOOTSTRAP_BASE - $t)));
 						$output .= self::digit_to_char($digit);
 						// let q = (q - t) div (base - t)
-						$q = floor(($q - $t) / (self::BOOTSTRAP_BASE - $t));
+						$q = (int) floor(($q - $t) / (self::BOOTSTRAP_BASE - $t));
 					} // end
 					// output the code point for digit q
 					$output .= self::digit_to_char($q);
@@ -332,18 +355,20 @@ public static function punycode_encode($input) {
 	/**
 	 * Convert a digit to its respective character
 	 *
-	 * @see https://tools.ietf.org/html/rfc3492#section-5
-	 * @throws Requests_Exception On invalid digit (`idna.invalid_digit`)
+	 * @link https://tools.ietf.org/html/rfc3492#section-5
 	 *
 	 * @param int $digit Digit in the range 0-35
 	 * @return string Single character corresponding to digit
+	 *
+	 * @throws \WpOrg\Requests\Exception On invalid digit (`idna.invalid_digit`)
 	 */
 	protected static function digit_to_char($digit) {
 		// @codeCoverageIgnoreStart
 		// As far as I know, this never happens, but still good to be sure.
 		if ($digit < 0 || $digit > 35) {
-			throw new Requests_Exception(sprintf('Invalid digit %d', $digit), 'idna.invalid_digit', $digit);
+			throw new Exception(sprintf('Invalid digit %d', $digit), 'idna.invalid_digit', $digit);
 		}
+
 		// @codeCoverageIgnoreEnd
 		$digits = 'abcdefghijklmnopqrstuvwxyz0123456789';
 		return substr($digits, $digit, 1);
@@ -352,11 +377,11 @@ protected static function digit_to_char($digit) {
 	/**
 	 * Adapt the bias
 	 *
-	 * @see https://tools.ietf.org/html/rfc3492#section-6.1
+	 * @link https://tools.ietf.org/html/rfc3492#section-6.1
 	 * @param int $delta
 	 * @param int $numpoints
 	 * @param bool $firsttime
-	 * @return int New bias
+	 * @return int|float New bias
 	 *
 	 * function adapt(delta,numpoints,firsttime):
 	 */
@@ -364,11 +389,11 @@ protected static function adapt($delta, $numpoints, $firsttime) {
 		// if firsttime then let delta = delta div damp
 		if ($firsttime) {
 			$delta = floor($delta / self::BOOTSTRAP_DAMP);
-		}
-		// else let delta = delta div 2
-		else {
+		} else {
+			// else let delta = delta div 2
 			$delta = floor($delta / 2);
 		}
+
 		// let delta = delta + (delta div numpoints)
 		$delta += floor($delta / $numpoints);
 		// let k = 0
diff --git a/src/wp-includes/Requests/IPv6.php b/src/wp-includes/Requests/src/Ipv6.php
similarity index 79%
rename from src/wp-includes/Requests/IPv6.php
rename to src/wp-includes/Requests/src/Ipv6.php
index ba88786be61b8..a90ab8a831b6f 100644
--- a/src/wp-includes/Requests/IPv6.php
+++ b/src/wp-includes/Requests/src/Ipv6.php
@@ -2,20 +2,23 @@
 /**
  * Class to validate and to work with IPv6 addresses
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  */
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * Class to validate and to work with IPv6 addresses
  *
  * This was originally based on the PEAR class of the same name, but has been
  * entirely rewritten.
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  */
-class Requests_IPv6 {
+final class Ipv6 {
 	/**
 	 * Uncompresses an IPv6 address
 	 *
@@ -30,11 +33,20 @@ class Requests_IPv6 {
 	 * @author elfrink at introweb dot nl
 	 * @author Josh Peck <jmp at joshpeck dot org>
 	 * @copyright 2003-2005 The PHP Group
-	 * @license http://www.opensource.org/licenses/bsd-license.php
-	 * @param string $ip An IPv6 address
+	 * @license https://opensource.org/licenses/bsd-license.php
+	 *
+	 * @param string|Stringable $ip An IPv6 address
 	 * @return string The uncompressed IPv6 address
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string or a stringable object.
 	 */
 	public static function uncompress($ip) {
+		if (InputValidator::is_string_or_stringable($ip) === false) {
+			throw InvalidArgument::create(1, '$ip', 'string|Stringable', gettype($ip));
+		}
+
+		$ip = (string) $ip;
+
 		if (substr_count($ip, '::') !== 1) {
 			return $ip;
 		}
@@ -46,25 +58,24 @@ public static function uncompress($ip) {
 		if (strpos($ip2, '.') !== false) {
 			$c2++;
 		}
-		// ::
+
 		if ($c1 === -1 && $c2 === -1) {
+			// ::
 			$ip = '0:0:0:0:0:0:0:0';
-		}
-		// ::xxx
-		elseif ($c1 === -1) {
+		} elseif ($c1 === -1) {
+			// ::xxx
 			$fill = str_repeat('0:', 7 - $c2);
 			$ip   = str_replace('::', $fill, $ip);
-		}
-		// xxx::
-		elseif ($c2 === -1) {
+		} elseif ($c2 === -1) {
+			// xxx::
 			$fill = str_repeat(':0', 7 - $c1);
 			$ip   = str_replace('::', $fill, $ip);
-		}
-		// xxx::xxx
-		else {
+		} else {
+			// xxx::xxx
 			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
 			$ip   = str_replace('::', $fill, $ip);
 		}
+
 		return $ip;
 	}
 
@@ -78,12 +89,14 @@ public static function uncompress($ip) {
 	 * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
 	 *           0:0:0:0:0:0:0:1        ->  ::1
 	 *
-	 * @see uncompress()
+	 * @see \WpOrg\Requests\Ipv6::uncompress()
+	 *
 	 * @param string $ip An IPv6 address
 	 * @return string The compressed IPv6 address
 	 */
 	public static function compress($ip) {
-		// Prepare the IP to be compressed
+		// Prepare the IP to be compressed.
+		// Note: Input validation is handled in the `uncompress()` method, which is the first call made in this method.
 		$ip       = self::uncompress($ip);
 		$ip_parts = self::split_v6_v4($ip);
 
@@ -106,8 +119,7 @@ public static function compress($ip) {
 
 		if ($ip_parts[1] !== '') {
 			return implode(':', $ip_parts);
-		}
-		else {
+		} else {
 			return $ip_parts[0];
 		}
 	}
@@ -124,15 +136,14 @@ public static function compress($ip) {
 	 * @param string $ip An IPv6 address
 	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
-	protected static function split_v6_v4($ip) {
+	private static function split_v6_v4($ip) {
 		if (strpos($ip, '.') !== false) {
 			$pos       = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
-			return array($ipv6_part, $ipv4_part);
-		}
-		else {
-			return array($ip, '');
+			return [$ipv6_part, $ipv4_part];
+		} else {
+			return [$ip, ''];
 		}
 	}
 
@@ -145,6 +156,7 @@ protected static function split_v6_v4($ip) {
 	 * @return bool true if $ip is a valid IPv6 address
 	 */
 	public static function check_ipv6($ip) {
+		// Note: Input validation is handled in the `uncompress()` method, which is the first call made in this method.
 		$ip                = self::uncompress($ip);
 		list($ipv6, $ipv4) = self::split_v6_v4($ip);
 		$ipv6              = explode(':', $ipv6);
@@ -173,6 +185,7 @@ public static function check_ipv6($ip) {
 					return false;
 				}
 			}
+
 			if (count($ipv4) === 4) {
 				foreach ($ipv4 as $ipv4_part) {
 					$value = (int) $ipv4_part;
@@ -181,9 +194,9 @@ public static function check_ipv6($ip) {
 					}
 				}
 			}
+
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
diff --git a/src/wp-includes/Requests/IRI.php b/src/wp-includes/Requests/src/Iri.php
similarity index 90%
rename from src/wp-includes/Requests/IRI.php
rename to src/wp-includes/Requests/src/Iri.php
index 5d80e495724bd..c452c7365b0f7 100644
--- a/src/wp-includes/Requests/IRI.php
+++ b/src/wp-includes/Requests/src/Iri.php
@@ -2,10 +2,17 @@
 /**
  * IRI parser/serialiser/normaliser
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  */
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Ipv6;
+use WpOrg\Requests\Port;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * IRI parser/serialiser/normaliser
  *
@@ -38,16 +45,15 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  * @author Geoffrey Sneddon
  * @author Steve Minutillo
  * @copyright 2007-2009 Geoffrey Sneddon and Steve Minutillo
- * @license http://www.opensource.org/licenses/bsd-license.php
+ * @license https://opensource.org/licenses/bsd-license.php
  * @link http://hg.gsnedders.com/iri/
  *
  * @property string $iri IRI we're working with
- * @property-read string $uri IRI in URI form, {@see to_uri}
+ * @property-read string $uri IRI in URI form, {@see \WpOrg\Requests\Iri::to_uri()}
  * @property string $scheme Scheme part of the IRI
  * @property string $authority Authority part, formatted for a URI (userinfo + host + port)
  * @property string $iauthority Authority part of the IRI (userinfo + host + port)
@@ -63,7 +69,7 @@
  * @property string $fragment Fragment, formatted for a URI (after '#')
  * @property string $ifragment Fragment part of the IRI (after '#')
  */
-class Requests_IRI {
+class Iri {
 	/**
 	 * Scheme
 	 *
@@ -123,19 +129,19 @@ class Requests_IRI {
 	 */
 	protected $normalization = array(
 		'acap' => array(
-			'port' => 674
+			'port' => Port::ACAP,
 		),
 		'dict' => array(
-			'port' => 2628
+			'port' => Port::DICT,
 		),
 		'file' => array(
-			'ihost' => 'localhost'
+			'ihost' => 'localhost',
 		),
 		'http' => array(
-			'port' => 80,
+			'port' => Port::HTTP,
 		),
 		'https' => array(
-			'port' => 443,
+			'port' => Port::HTTPS,
 		),
 	);
 
@@ -240,9 +246,15 @@ public function __unset($name) {
 	/**
 	 * Create a new IRI object, from a specified string
 	 *
-	 * @param string|null $iri
+	 * @param string|Stringable|null $iri
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $iri argument is not a string, Stringable or null.
 	 */
 	public function __construct($iri = null) {
+		if ($iri !== null && InputValidator::is_string_or_stringable($iri) === false) {
+			throw InvalidArgument::create(1, '$iri', 'string|Stringable|null', gettype($iri));
+		}
+
 		$this->set_iri($iri);
 	}
 
@@ -251,13 +263,13 @@ public function __construct($iri = null) {
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param Requests_IRI|string $base (Absolute) Base IRI
-	 * @param Requests_IRI|string $relative Relative IRI
-	 * @return Requests_IRI|false
+	 * @param \WpOrg\Requests\Iri|string $base (Absolute) Base IRI
+	 * @param \WpOrg\Requests\Iri|string $relative Relative IRI
+	 * @return \WpOrg\Requests\Iri|false
 	 */
 	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
-			$relative = new Requests_IRI($relative);
+		if (!($relative instanceof self)) {
+			$relative = new self($relative);
 		}
 		if (!$relative->is_valid()) {
 			return false;
@@ -266,8 +278,8 @@ public static function absolutize($base, $relative) {
 			return clone $relative;
 		}
 
-		if (!($base instanceof Requests_IRI)) {
-			$base = new Requests_IRI($base);
+		if (!($base instanceof self)) {
+			$base = new self($base);
 		}
 		if ($base->scheme === null || !$base->is_valid()) {
 			return false;
@@ -279,7 +291,7 @@ public static function absolutize($base, $relative) {
 				$target->scheme = $base->scheme;
 			}
 			else {
-				$target = new Requests_IRI;
+				$target = new self;
 				$target->scheme = $base->scheme;
 				$target->iuserinfo = $base->iuserinfo;
 				$target->ihost = $base->ihost;
@@ -330,7 +342,7 @@ protected function parse_iri($iri) {
 		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
 		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
 		if (!$has_match) {
-			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
+			throw new Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
 		}
 
 		if ($match[1] === '') {
@@ -383,11 +395,11 @@ protected function remove_dot_segments($input) {
 			// preceding "/" (if any) from the output buffer; otherwise,
 			elseif (strpos($input, '/../') === 0) {
 				$input = substr($input, 3);
-				$output = substr_replace($output, '', strrpos($output, '/'));
+				$output = substr_replace($output, '', (strrpos($output, '/') ?: 0));
 			}
 			elseif ($input === '/..') {
 				$input = '/';
-				$output = substr_replace($output, '', strrpos($output, '/'));
+				$output = substr_replace($output, '', (strrpos($output, '/') ?: 0));
 			}
 			// D: if the input buffer consists only of "." or "..", then remove
 			// that from the input buffer; otherwise,
@@ -413,18 +425,18 @@ protected function remove_dot_segments($input) {
 	/**
 	 * Replace invalid character with percent encoding
 	 *
-	 * @param string $string Input string
+	 * @param string $text Input string
 	 * @param string $extra_chars Valid characters not in iunreserved or
 	 *                            iprivate (this is ASCII-only)
 	 * @param bool $iprivate Allow iprivate
 	 * @return string
 	 */
-	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
+	protected function replace_invalid_with_pct_encoding($text, $extra_chars, $iprivate = false) {
 		// Normalize as many pct-encoded sections as possible
-		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string);
+		$text = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $text);
 
 		// Replace invalid percent characters
-		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+		$text = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $text);
 
 		// Add unreserved and % to $extra_chars (the latter is safe because all
 		// pct-encoded sections are now valid).
@@ -432,9 +444,9 @@ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $ipr
 
 		// Now replace any bytes that aren't allowed with their pct-encoded versions
 		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
-			$value = ord($string[$position]);
+		$strlen = strlen($text);
+		while (($position += strspn($text, $extra_chars, $position)) < $strlen) {
+			$value = ord($text[$position]);
 
 			// Start position
 			$start = $position;
@@ -471,7 +483,7 @@ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $ipr
 			if ($remaining) {
 				if ($position + $length <= $strlen) {
 					for ($position++; $remaining; $position++) {
-						$value = ord($string[$position]);
+						$value = ord($text[$position]);
 
 						// Check that the byte is valid, then add it to the character:
 						if (($value & 0xC0) === 0x80) {
@@ -522,7 +534,7 @@ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $ipr
 				}
 
 				for ($j = $start; $j <= $position; $j++) {
-					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+					$text = substr_replace($text, sprintf('%%%02X', ord($text[$j])), $j, 1);
 					$j += 2;
 					$position += 2;
 					$strlen += 2;
@@ -530,7 +542,7 @@ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $ipr
 			}
 		}
 
-		return $string;
+		return $text;
 	}
 
 	/**
@@ -539,13 +551,13 @@ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $ipr
 	 * Removes sequences of percent encoded bytes that represent UTF-8
 	 * encoded characters in iunreserved
 	 *
-	 * @param array $match PCRE match
+	 * @param array $regex_match PCRE match
 	 * @return string Replacement
 	 */
-	protected function remove_iunreserved_percent_encoded($match) {
+	protected function remove_iunreserved_percent_encoded($regex_match) {
 		// As we just have valid percent encoded sequences we can just explode
 		// and ignore the first member of the returned array (an empty string).
-		$bytes = explode('%', $match[0]);
+		$bytes = explode('%', $regex_match[0]);
 
 		// Initialize the new string (this is what will be returned) and that
 		// there are no bytes remaining in the current sequence (unsurprising
@@ -721,6 +733,9 @@ protected function set_iri($iri) {
 		if ($iri === null) {
 			return true;
 		}
+
+		$iri = (string) $iri;
+
 		if (isset($cache[$iri])) {
 			list($this->scheme,
 				 $this->iuserinfo,
@@ -733,7 +748,7 @@ protected function set_iri($iri) {
 			return $return;
 		}
 
-		$parsed = $this->parse_iri((string) $iri);
+		$parsed = $this->parse_iri($iri);
 
 		$return = $this->set_scheme($parsed['scheme'])
 			&& $this->set_authority($parsed['authority'])
@@ -809,7 +824,8 @@ protected function set_authority($authority) {
 		else {
 			$iuserinfo = null;
 		}
-		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
+
+		if (($port_start = strpos($remaining, ':', (strpos($remaining, ']') ?: 0))) !== false) {
 			$port = substr($remaining, $port_start + 1);
 			if ($port === false || $port === '') {
 				$port = null;
@@ -863,8 +879,8 @@ protected function set_host($ihost) {
 			return true;
 		}
 		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
-			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
-				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
+			if (Ipv6::check_ipv6(substr($ihost, 1, -1))) {
+				$this->ihost = '[' . Ipv6::compress(substr($ihost, 1, -1)) . ']';
 			}
 			else {
 				$this->ihost = null;
@@ -985,11 +1001,11 @@ protected function set_fragment($ifragment) {
 	/**
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
-	 * @param string|bool IRI to convert (or false from {@see get_iri})
+	 * @param string|bool $iri IRI to convert (or false from {@see \WpOrg\Requests\Iri::get_iri()})
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
-	protected function to_uri($string) {
-		if (!is_string($string)) {
+	protected function to_uri($iri) {
+		if (!is_string($iri)) {
 			return false;
 		}
 
@@ -999,14 +1015,14 @@ protected function to_uri($string) {
 		}
 
 		$position = 0;
-		$strlen = strlen($string);
-		while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
-			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+		$strlen = strlen($iri);
+		while (($position += strcspn($iri, $non_ascii, $position)) < $strlen) {
+			$iri = substr_replace($iri, sprintf('%%%02X', ord($iri[$position])), $position, 1);
 			$position += 3;
 			$strlen += 2;
 		}
 
-		return $string;
+		return $iri;
 	}
 
 	/**
diff --git a/src/wp-includes/Requests/src/Port.php b/src/wp-includes/Requests/src/Port.php
new file mode 100644
index 0000000000000..55454093855ee
--- /dev/null
+++ b/src/wp-includes/Requests/src/Port.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Port utilities for Requests
+ *
+ * @package Requests\Utilities
+ * @since   2.0.0
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+
+/**
+ * Find the correct port depending on the Request type.
+ *
+ * @package Requests\Utilities
+ * @since   2.0.0
+ */
+final class Port {
+
+	/**
+	 * Port to use with Acap requests.
+	 *
+	 * @var int
+	 */
+	const ACAP = 674;
+
+	/**
+	 * Port to use with Dictionary requests.
+	 *
+	 * @var int
+	 */
+	const DICT = 2628;
+
+	/**
+	 * Port to use with HTTP requests.
+	 *
+	 * @var int
+	 */
+	const HTTP = 80;
+
+	/**
+	 * Port to use with HTTP over SSL requests.
+	 *
+	 * @var int
+	 */
+	const HTTPS = 443;
+
+	/**
+	 * Retrieve the port number to use.
+	 *
+	 * @param string $type Request type.
+	 *                     The following requests types are supported:
+	 *                     'acap', 'dict', 'http' and 'https'.
+	 *
+	 * @return int
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When a non-string input has been passed.
+	 * @throws \WpOrg\Requests\Exception                 When a non-supported port is requested ('portnotsupported').
+	 */
+	public static function get($type) {
+		if (!is_string($type)) {
+			throw InvalidArgument::create(1, '$type', 'string', gettype($type));
+		}
+
+		$type = strtoupper($type);
+		if (!defined("self::{$type}")) {
+			$message = sprintf('Invalid port type (%s) passed', $type);
+			throw new Exception($message, 'portnotsupported');
+		}
+
+		return constant("self::{$type}");
+	}
+}
diff --git a/src/wp-includes/Requests/src/Proxy.php b/src/wp-includes/Requests/src/Proxy.php
new file mode 100644
index 0000000000000..18797a27f8b71
--- /dev/null
+++ b/src/wp-includes/Requests/src/Proxy.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Proxy connection interface
+ *
+ * @package Requests\Proxy
+ * @since   1.6
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Hooks;
+
+/**
+ * Proxy connection interface
+ *
+ * Implement this interface to handle proxy settings and authentication
+ *
+ * Parameters should be passed via the constructor where possible, as this
+ * makes it much easier for users to use your provider.
+ *
+ * @see \WpOrg\Requests\Hooks
+ *
+ * @package Requests\Proxy
+ * @since   1.6
+ */
+interface Proxy {
+	/**
+	 * Register hooks as needed
+	 *
+	 * This method is called in {@see \WpOrg\Requests\Requests::request()} when the user
+	 * has set an instance as the 'auth' option. Use this callback to register all the
+	 * hooks you'll need.
+	 *
+	 * @see \WpOrg\Requests\Hooks::register()
+	 * @param \WpOrg\Requests\Hooks $hooks Hook system
+	 */
+	public function register(Hooks $hooks);
+}
diff --git a/src/wp-includes/Requests/Proxy/HTTP.php b/src/wp-includes/Requests/src/Proxy/Http.php
similarity index 56%
rename from src/wp-includes/Requests/Proxy/HTTP.php
rename to src/wp-includes/Requests/src/Proxy/Http.php
index 25bb95a94a647..e553c9c508c1b 100644
--- a/src/wp-includes/Requests/Proxy/HTTP.php
+++ b/src/wp-includes/Requests/src/Proxy/Http.php
@@ -2,21 +2,26 @@
 /**
  * HTTP Proxy connection interface
  *
- * @package Requests
- * @subpackage Proxy
- * @since 1.6
+ * @package Requests\Proxy
+ * @since   1.6
  */
 
+namespace WpOrg\Requests\Proxy;
+
+use WpOrg\Requests\Exception\ArgumentCount;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Hooks;
+use WpOrg\Requests\Proxy;
+
 /**
  * HTTP Proxy connection interface
  *
  * Provides a handler for connection via an HTTP proxy
  *
- * @package Requests
- * @subpackage Proxy
- * @since 1.6
+ * @package Requests\Proxy
+ * @since   1.6
  */
-class Requests_Proxy_HTTP implements Requests_Proxy {
+final class Http implements Proxy {
 	/**
 	 * Proxy host and port
 	 *
@@ -51,24 +56,32 @@ class Requests_Proxy_HTTP implements Requests_Proxy {
 	 * Constructor
 	 *
 	 * @since 1.6
-	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
-	 * @param array|null $args Array of user and password. Must have exactly two elements
+	 *
+	 * @param array|string|null $args Proxy as a string or an array of proxy, user and password.
+	 *                                When passed as an array, must have exactly one (proxy)
+	 *                                or three elements (proxy, user, password).
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not an array, a string or null.
+	 * @throws \WpOrg\Requests\Exception\ArgumentCount On incorrect number of arguments (`proxyhttpbadargs`)
 	 */
 	public function __construct($args = null) {
 		if (is_string($args)) {
 			$this->proxy = $args;
-		}
-		elseif (is_array($args)) {
+		} elseif (is_array($args)) {
 			if (count($args) === 1) {
 				list($this->proxy) = $args;
-			}
-			elseif (count($args) === 3) {
+			} elseif (count($args) === 3) {
 				list($this->proxy, $this->user, $this->pass) = $args;
 				$this->use_authentication                    = true;
+			} else {
+				throw ArgumentCount::create(
+					'an array with exactly one element or exactly three elements',
+					count($args),
+					'proxyhttpbadargs'
+				);
 			}
-			else {
-				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
-			}
+		} elseif ($args !== null) {
+			throw InvalidArgument::create(1, '$args', 'array|string|null', gettype($args));
 		}
 	}
 
@@ -76,19 +89,19 @@ public function __construct($args = null) {
 	 * Register the necessary callbacks
 	 *
 	 * @since 1.6
-	 * @see curl_before_send
-	 * @see fsockopen_remote_socket
-	 * @see fsockopen_remote_host_path
-	 * @see fsockopen_header
-	 * @param Requests_Hooks $hooks Hook system
+	 * @see \WpOrg\Requests\Proxy\Http::curl_before_send()
+	 * @see \WpOrg\Requests\Proxy\Http::fsockopen_remote_socket()
+	 * @see \WpOrg\Requests\Proxy\Http::fsockopen_remote_host_path()
+	 * @see \WpOrg\Requests\Proxy\Http::fsockopen_header()
+	 * @param \WpOrg\Requests\Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks $hooks) {
-		$hooks->register('curl.before_send', array($this, 'curl_before_send'));
+	public function register(Hooks $hooks) {
+		$hooks->register('curl.before_send', [$this, 'curl_before_send']);
 
-		$hooks->register('fsockopen.remote_socket', array($this, 'fsockopen_remote_socket'));
-		$hooks->register('fsockopen.remote_host_path', array($this, 'fsockopen_remote_host_path'));
+		$hooks->register('fsockopen.remote_socket', [$this, 'fsockopen_remote_socket']);
+		$hooks->register('fsockopen.remote_host_path', [$this, 'fsockopen_remote_host_path']);
 		if ($this->use_authentication) {
-			$hooks->register('fsockopen.after_headers', array($this, 'fsockopen_header'));
+			$hooks->register('fsockopen.after_headers', [$this, 'fsockopen_header']);
 		}
 	}
 
@@ -96,7 +109,7 @@ public function register(Requests_Hooks $hooks) {
 	 * Set cURL parameters before the data is sent
 	 *
 	 * @since 1.6
-	 * @param resource $handle cURL resource
+	 * @param resource|\CurlHandle $handle cURL handle
 	 */
 	public function curl_before_send(&$handle) {
 		curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
diff --git a/src/wp-includes/Requests/src/Requests.php b/src/wp-includes/Requests/src/Requests.php
new file mode 100644
index 0000000000000..287bacaaa575b
--- /dev/null
+++ b/src/wp-includes/Requests/src/Requests.php
@@ -0,0 +1,1099 @@
+<?php
+/**
+ * Requests for PHP
+ *
+ * Inspired by Requests for Python.
+ *
+ * Based on concepts from SimplePie_File, RequestCore and WP_Http.
+ *
+ * @package Requests
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Auth\Basic;
+use WpOrg\Requests\Capability;
+use WpOrg\Requests\Cookie\Jar;
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Hooks;
+use WpOrg\Requests\IdnaEncoder;
+use WpOrg\Requests\Iri;
+use WpOrg\Requests\Proxy\Http;
+use WpOrg\Requests\Response;
+use WpOrg\Requests\Transport\Curl;
+use WpOrg\Requests\Transport\Fsockopen;
+use WpOrg\Requests\Utility\InputValidator;
+
+/**
+ * Requests for PHP
+ *
+ * Inspired by Requests for Python.
+ *
+ * Based on concepts from SimplePie_File, RequestCore and WP_Http.
+ *
+ * @package Requests
+ */
+class Requests {
+	/**
+	 * POST method
+	 *
+	 * @var string
+	 */
+	const POST = 'POST';
+
+	/**
+	 * PUT method
+	 *
+	 * @var string
+	 */
+	const PUT = 'PUT';
+
+	/**
+	 * GET method
+	 *
+	 * @var string
+	 */
+	const GET = 'GET';
+
+	/**
+	 * HEAD method
+	 *
+	 * @var string
+	 */
+	const HEAD = 'HEAD';
+
+	/**
+	 * DELETE method
+	 *
+	 * @var string
+	 */
+	const DELETE = 'DELETE';
+
+	/**
+	 * OPTIONS method
+	 *
+	 * @var string
+	 */
+	const OPTIONS = 'OPTIONS';
+
+	/**
+	 * TRACE method
+	 *
+	 * @var string
+	 */
+	const TRACE = 'TRACE';
+
+	/**
+	 * PATCH method
+	 *
+	 * @link https://tools.ietf.org/html/rfc5789
+	 * @var string
+	 */
+	const PATCH = 'PATCH';
+
+	/**
+	 * Default size of buffer size to read streams
+	 *
+	 * @var integer
+	 */
+	const BUFFER_SIZE = 1160;
+
+	/**
+	 * Option defaults.
+	 *
+	 * @see \WpOrg\Requests\Requests::get_default_options()
+	 * @see \WpOrg\Requests\Requests::request() for values returned by this method
+	 *
+	 * @since 2.0.0
+	 *
+	 * @var array
+	 */
+	const OPTION_DEFAULTS = [
+		'timeout'          => 10,
+		'connect_timeout'  => 10,
+		'useragent'        => 'php-requests/' . self::VERSION,
+		'protocol_version' => 1.1,
+		'redirected'       => 0,
+		'redirects'        => 10,
+		'follow_redirects' => true,
+		'blocking'         => true,
+		'type'             => self::GET,
+		'filename'         => false,
+		'auth'             => false,
+		'proxy'            => false,
+		'cookies'          => false,
+		'max_bytes'        => false,
+		'idn'              => true,
+		'hooks'            => null,
+		'transport'        => null,
+		'verify'           => null,
+		'verifyname'       => true,
+	];
+
+	/**
+	 * Default supported Transport classes.
+	 *
+	 * @since 2.0.0
+	 *
+	 * @var array
+	 */
+	const DEFAULT_TRANSPORTS = [
+		Curl::class      => Curl::class,
+		Fsockopen::class => Fsockopen::class,
+	];
+
+	/**
+	 * Current version of Requests
+	 *
+	 * @var string
+	 */
+	const VERSION = '2.0.6';
+
+	/**
+	 * Selected transport name
+	 *
+	 * Use {@see \WpOrg\Requests\Requests::get_transport()} instead
+	 *
+	 * @var array
+	 */
+	public static $transport = [];
+
+	/**
+	 * Registered transport classes
+	 *
+	 * @var array
+	 */
+	protected static $transports = [];
+
+	/**
+	 * Default certificate path.
+	 *
+	 * @see \WpOrg\Requests\Requests::get_certificate_path()
+	 * @see \WpOrg\Requests\Requests::set_certificate_path()
+	 *
+	 * @var string
+	 */
+	protected static $certificate_path = __DIR__ . '/../certificates/cacert.pem';
+
+	/**
+	 * All (known) valid deflate, gzip header magic markers.
+	 *
+	 * These markers relate to different compression levels.
+	 *
+	 * @link https://stackoverflow.com/a/43170354/482864 Marker source.
+	 *
+	 * @since 2.0.0
+	 *
+	 * @var array
+	 */
+	private static $magic_compression_headers = [
+		"\x1f\x8b" => true, // Gzip marker.
+		"\x78\x01" => true, // Zlib marker - level 1.
+		"\x78\x5e" => true, // Zlib marker - level 2 to 5.
+		"\x78\x9c" => true, // Zlib marker - level 6.
+		"\x78\xda" => true, // Zlib marker - level 7 to 9.
+	];
+
+	/**
+	 * This is a static class, do not instantiate it
+	 *
+	 * @codeCoverageIgnore
+	 */
+	private function __construct() {}
+
+	/**
+	 * Register a transport
+	 *
+	 * @param string $transport Transport class to add, must support the \WpOrg\Requests\Transport interface
+	 */
+	public static function add_transport($transport) {
+		if (empty(self::$transports)) {
+			self::$transports = self::DEFAULT_TRANSPORTS;
+		}
+
+		self::$transports[$transport] = $transport;
+	}
+
+	/**
+	 * Get the fully qualified class name (FQCN) for a working transport.
+	 *
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return string FQCN of the transport to use, or an empty string if no transport was
+	 *                found which provided the requested capabilities.
+	 */
+	protected static function get_transport_class(array $capabilities = []) {
+		// Caching code, don't bother testing coverage.
+		// @codeCoverageIgnoreStart
+		// Array of capabilities as a string to be used as an array key.
+		ksort($capabilities);
+		$cap_string = serialize($capabilities);
+
+		// Don't search for a transport if it's already been done for these $capabilities.
+		if (isset(self::$transport[$cap_string])) {
+			return self::$transport[$cap_string];
+		}
+
+		// Ensure we will not run this same check again later on.
+		self::$transport[$cap_string] = '';
+		// @codeCoverageIgnoreEnd
+
+		if (empty(self::$transports)) {
+			self::$transports = self::DEFAULT_TRANSPORTS;
+		}
+
+		// Find us a working transport.
+		foreach (self::$transports as $class) {
+			if (!class_exists($class)) {
+				continue;
+			}
+
+			$result = $class::test($capabilities);
+			if ($result === true) {
+				self::$transport[$cap_string] = $class;
+				break;
+			}
+		}
+
+		return self::$transport[$cap_string];
+	}
+
+	/**
+	 * Get a working transport.
+	 *
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return \WpOrg\Requests\Transport
+	 * @throws \WpOrg\Requests\Exception If no valid transport is found (`notransport`).
+	 */
+	protected static function get_transport(array $capabilities = []) {
+		$class = self::get_transport_class($capabilities);
+
+		if ($class === '') {
+			throw new Exception('No working transports found', 'notransport', self::$transports);
+		}
+
+		return new $class();
+	}
+
+	/**
+	 * Checks to see if we have a transport for the capabilities requested.
+	 *
+	 * Supported capabilities can be found in the {@see \WpOrg\Requests\Capability}
+	 * interface as constants.
+	 *
+	 * Example usage:
+	 * `Requests::has_capabilities([Capability::SSL => true])`.
+	 *
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return bool Whether the transport has the requested capabilities.
+	 */
+	public static function has_capabilities(array $capabilities = []) {
+		return self::get_transport_class($capabilities) !== '';
+	}
+
+	/**#@+
+	 * @see \WpOrg\Requests\Requests::request()
+	 * @param string $url
+	 * @param array $headers
+	 * @param array $options
+	 * @return \WpOrg\Requests\Response
+	 */
+	/**
+	 * Send a GET request
+	 */
+	public static function get($url, $headers = [], $options = []) {
+		return self::request($url, $headers, null, self::GET, $options);
+	}
+
+	/**
+	 * Send a HEAD request
+	 */
+	public static function head($url, $headers = [], $options = []) {
+		return self::request($url, $headers, null, self::HEAD, $options);
+	}
+
+	/**
+	 * Send a DELETE request
+	 */
+	public static function delete($url, $headers = [], $options = []) {
+		return self::request($url, $headers, null, self::DELETE, $options);
+	}
+
+	/**
+	 * Send a TRACE request
+	 */
+	public static function trace($url, $headers = [], $options = []) {
+		return self::request($url, $headers, null, self::TRACE, $options);
+	}
+	/**#@-*/
+
+	/**#@+
+	 * @see \WpOrg\Requests\Requests::request()
+	 * @param string $url
+	 * @param array $headers
+	 * @param array $data
+	 * @param array $options
+	 * @return \WpOrg\Requests\Response
+	 */
+	/**
+	 * Send a POST request
+	 */
+	public static function post($url, $headers = [], $data = [], $options = []) {
+		return self::request($url, $headers, $data, self::POST, $options);
+	}
+	/**
+	 * Send a PUT request
+	 */
+	public static function put($url, $headers = [], $data = [], $options = []) {
+		return self::request($url, $headers, $data, self::PUT, $options);
+	}
+
+	/**
+	 * Send an OPTIONS request
+	 */
+	public static function options($url, $headers = [], $data = [], $options = []) {
+		return self::request($url, $headers, $data, self::OPTIONS, $options);
+	}
+
+	/**
+	 * Send a PATCH request
+	 *
+	 * Note: Unlike {@see \WpOrg\Requests\Requests::post()} and {@see \WpOrg\Requests\Requests::put()},
+	 * `$headers` is required, as the specification recommends that should send an ETag
+	 *
+	 * @link https://tools.ietf.org/html/rfc5789
+	 */
+	public static function patch($url, $headers, $data = [], $options = []) {
+		return self::request($url, $headers, $data, self::PATCH, $options);
+	}
+	/**#@-*/
+
+	/**
+	 * Main interface for HTTP requests
+	 *
+	 * This method initiates a request and sends it via a transport before
+	 * parsing.
+	 *
+	 * The `$options` parameter takes an associative array with the following
+	 * options:
+	 *
+	 * - `timeout`: How long should we wait for a response?
+	 *    Note: for cURL, a minimum of 1 second applies, as DNS resolution
+	 *    operates at second-resolution only.
+	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
+	 * - `connect_timeout`: How long should we wait while trying to connect?
+	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
+	 * - `useragent`: Useragent to send to the server
+	 *    (string, default: php-requests/$version)
+	 * - `follow_redirects`: Should we follow 3xx redirects?
+	 *    (boolean, default: true)
+	 * - `redirects`: How many times should we redirect before erroring?
+	 *    (integer, default: 10)
+	 * - `blocking`: Should we block processing on this request?
+	 *    (boolean, default: true)
+	 * - `filename`: File to stream the body to instead.
+	 *    (string|boolean, default: false)
+	 * - `auth`: Authentication handler or array of user/password details to use
+	 *    for Basic authentication
+	 *    (\WpOrg\Requests\Auth|array|boolean, default: false)
+	 * - `proxy`: Proxy details to use for proxy by-passing and authentication
+	 *    (\WpOrg\Requests\Proxy|array|string|boolean, default: false)
+	 * - `max_bytes`: Limit for the response body size.
+	 *    (integer|boolean, default: false)
+	 * - `idn`: Enable IDN parsing
+	 *    (boolean, default: true)
+	 * - `transport`: Custom transport. Either a class name, or a
+	 *    transport object. Defaults to the first working transport from
+	 *    {@see \WpOrg\Requests\Requests::getTransport()}
+	 *    (string|\WpOrg\Requests\Transport, default: {@see \WpOrg\Requests\Requests::getTransport()})
+	 * - `hooks`: Hooks handler.
+	 *    (\WpOrg\Requests\HookManager, default: new WpOrg\Requests\Hooks())
+	 * - `verify`: Should we verify SSL certificates? Allows passing in a custom
+	 *    certificate file as a string. (Using true uses the system-wide root
+	 *    certificate store instead, but this may have different behaviour
+	 *    across transports.)
+	 *    (string|boolean, default: certificates/cacert.pem)
+	 * - `verifyname`: Should we verify the common name in the SSL certificate?
+	 *    (boolean, default: true)
+	 * - `data_format`: How should we send the `$data` parameter?
+	 *    (string, one of 'query' or 'body', default: 'query' for
+	 *    HEAD/GET/DELETE, 'body' for POST/PUT/OPTIONS/PATCH)
+	 *
+	 * @param string|Stringable $url URL to request
+	 * @param array $headers Extra headers to send with the request
+	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
+	 * @param string $type HTTP request type (use Requests constants)
+	 * @param array $options Options for the request (see description for more information)
+	 * @return \WpOrg\Requests\Response
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $url argument is not a string or Stringable.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $type argument is not a string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
+	 * @throws \WpOrg\Requests\Exception On invalid URLs (`nonhttp`)
+	 */
+	public static function request($url, $headers = [], $data = [], $type = self::GET, $options = []) {
+		if (InputValidator::is_string_or_stringable($url) === false) {
+			throw InvalidArgument::create(1, '$url', 'string|Stringable', gettype($url));
+		}
+
+		if (is_string($type) === false) {
+			throw InvalidArgument::create(4, '$type', 'string', gettype($type));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(5, '$options', 'array', gettype($options));
+		}
+
+		if (empty($options['type'])) {
+			$options['type'] = $type;
+		}
+
+		$options = array_merge(self::get_default_options(), $options);
+
+		self::set_defaults($url, $headers, $data, $type, $options);
+
+		$options['hooks']->dispatch('requests.before_request', [&$url, &$headers, &$data, &$type, &$options]);
+
+		if (!empty($options['transport'])) {
+			$transport = $options['transport'];
+
+			if (is_string($options['transport'])) {
+				$transport = new $transport();
+			}
+		} else {
+			$need_ssl     = (stripos($url, 'https://') === 0);
+			$capabilities = [Capability::SSL => $need_ssl];
+			$transport    = self::get_transport($capabilities);
+		}
+
+		$response = $transport->request($url, $headers, $data, $options);
+
+		$options['hooks']->dispatch('requests.before_parse', [&$response, $url, $headers, $data, $type, $options]);
+
+		return self::parse_response($response, $url, $headers, $data, $options);
+	}
+
+	/**
+	 * Send multiple HTTP requests simultaneously
+	 *
+	 * The `$requests` parameter takes an associative or indexed array of
+	 * request fields. The key of each request can be used to match up the
+	 * request with the returned data, or with the request passed into your
+	 * `multiple.request.complete` callback.
+	 *
+	 * The request fields value is an associative array with the following keys:
+	 *
+	 * - `url`: Request URL Same as the `$url` parameter to
+	 *    {@see \WpOrg\Requests\Requests::request()}
+	 *    (string, required)
+	 * - `headers`: Associative array of header fields. Same as the `$headers`
+	 *    parameter to {@see \WpOrg\Requests\Requests::request()}
+	 *    (array, default: `array()`)
+	 * - `data`: Associative array of data fields or a string. Same as the
+	 *    `$data` parameter to {@see \WpOrg\Requests\Requests::request()}
+	 *    (array|string, default: `array()`)
+	 * - `type`: HTTP request type (use \WpOrg\Requests\Requests constants). Same as the `$type`
+	 *    parameter to {@see \WpOrg\Requests\Requests::request()}
+	 *    (string, default: `\WpOrg\Requests\Requests::GET`)
+	 * - `cookies`: Associative array of cookie name to value, or cookie jar.
+	 *    (array|\WpOrg\Requests\Cookie\Jar)
+	 *
+	 * If the `$options` parameter is specified, individual requests will
+	 * inherit options from it. This can be used to use a single hooking system,
+	 * or set all the types to `\WpOrg\Requests\Requests::POST`, for example.
+	 *
+	 * In addition, the `$options` parameter takes the following global options:
+	 *
+	 * - `complete`: A callback for when a request is complete. Takes two
+	 *    parameters, a \WpOrg\Requests\Response/\WpOrg\Requests\Exception reference, and the
+	 *    ID from the request array (Note: this can also be overridden on a
+	 *    per-request basis, although that's a little silly)
+	 *    (callback)
+	 *
+	 * @param array $requests Requests data (see description for more information)
+	 * @param array $options Global and default options (see {@see \WpOrg\Requests\Requests::request()})
+	 * @return array Responses (either \WpOrg\Requests\Response or a \WpOrg\Requests\Exception object)
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $requests argument is not an array or iterable object with array access.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
+	 */
+	public static function request_multiple($requests, $options = []) {
+		if (InputValidator::has_array_access($requests) === false || InputValidator::is_iterable($requests) === false) {
+			throw InvalidArgument::create(1, '$requests', 'array|ArrayAccess&Traversable', gettype($requests));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(2, '$options', 'array', gettype($options));
+		}
+
+		$options = array_merge(self::get_default_options(true), $options);
+
+		if (!empty($options['hooks'])) {
+			$options['hooks']->register('transport.internal.parse_response', [static::class, 'parse_multiple']);
+			if (!empty($options['complete'])) {
+				$options['hooks']->register('multiple.request.complete', $options['complete']);
+			}
+		}
+
+		foreach ($requests as $id => &$request) {
+			if (!isset($request['headers'])) {
+				$request['headers'] = [];
+			}
+
+			if (!isset($request['data'])) {
+				$request['data'] = [];
+			}
+
+			if (!isset($request['type'])) {
+				$request['type'] = self::GET;
+			}
+
+			if (!isset($request['options'])) {
+				$request['options']         = $options;
+				$request['options']['type'] = $request['type'];
+			} else {
+				if (empty($request['options']['type'])) {
+					$request['options']['type'] = $request['type'];
+				}
+
+				$request['options'] = array_merge($options, $request['options']);
+			}
+
+			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
+
+			// Ensure we only hook in once
+			if ($request['options']['hooks'] !== $options['hooks']) {
+				$request['options']['hooks']->register('transport.internal.parse_response', [static::class, 'parse_multiple']);
+				if (!empty($request['options']['complete'])) {
+					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
+				}
+			}
+		}
+
+		unset($request);
+
+		if (!empty($options['transport'])) {
+			$transport = $options['transport'];
+
+			if (is_string($options['transport'])) {
+				$transport = new $transport();
+			}
+		} else {
+			$transport = self::get_transport();
+		}
+
+		$responses = $transport->request_multiple($requests, $options);
+
+		foreach ($responses as $id => &$response) {
+			// If our hook got messed with somehow, ensure we end up with the
+			// correct response
+			if (is_string($response)) {
+				$request = $requests[$id];
+				self::parse_multiple($response, $request);
+				$request['options']['hooks']->dispatch('multiple.request.complete', [&$response, $id]);
+			}
+		}
+
+		return $responses;
+	}
+
+	/**
+	 * Get the default options
+	 *
+	 * @see \WpOrg\Requests\Requests::request() for values returned by this method
+	 * @param boolean $multirequest Is this a multirequest?
+	 * @return array Default option values
+	 */
+	protected static function get_default_options($multirequest = false) {
+		$defaults           = static::OPTION_DEFAULTS;
+		$defaults['verify'] = self::$certificate_path;
+
+		if ($multirequest !== false) {
+			$defaults['complete'] = null;
+		}
+
+		return $defaults;
+	}
+
+	/**
+	 * Get default certificate path.
+	 *
+	 * @return string Default certificate path.
+	 */
+	public static function get_certificate_path() {
+		return self::$certificate_path;
+	}
+
+	/**
+	 * Set default certificate path.
+	 *
+	 * @param string|Stringable|bool $path Certificate path, pointing to a PEM file.
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $url argument is not a string, Stringable or boolean.
+	 */
+	public static function set_certificate_path($path) {
+		if (InputValidator::is_string_or_stringable($path) === false && is_bool($path) === false) {
+			throw InvalidArgument::create(1, '$path', 'string|Stringable|bool', gettype($path));
+		}
+
+		self::$certificate_path = $path;
+	}
+
+	/**
+	 * Set the default values
+	 *
+	 * The $options parameter is updated with the results.
+	 *
+	 * @param string $url URL to request
+	 * @param array $headers Extra headers to send with the request
+	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
+	 * @param string $type HTTP request type
+	 * @param array $options Options for the request
+	 * @return void
+	 *
+	 * @throws \WpOrg\Requests\Exception When the $url is not an http(s) URL.
+	 */
+	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
+		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+			throw new Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
+		}
+
+		if (empty($options['hooks'])) {
+			$options['hooks'] = new Hooks();
+		}
+
+		if (is_array($options['auth'])) {
+			$options['auth'] = new Basic($options['auth']);
+		}
+
+		if ($options['auth'] !== false) {
+			$options['auth']->register($options['hooks']);
+		}
+
+		if (is_string($options['proxy']) || is_array($options['proxy'])) {
+			$options['proxy'] = new Http($options['proxy']);
+		}
+
+		if ($options['proxy'] !== false) {
+			$options['proxy']->register($options['hooks']);
+		}
+
+		if (is_array($options['cookies'])) {
+			$options['cookies'] = new Jar($options['cookies']);
+		} elseif (empty($options['cookies'])) {
+			$options['cookies'] = new Jar();
+		}
+
+		if ($options['cookies'] !== false) {
+			$options['cookies']->register($options['hooks']);
+		}
+
+		if ($options['idn'] !== false) {
+			$iri       = new Iri($url);
+			$iri->host = IdnaEncoder::encode($iri->ihost);
+			$url       = $iri->uri;
+		}
+
+		// Massage the type to ensure we support it.
+		$type = strtoupper($type);
+
+		if (!isset($options['data_format'])) {
+			if (in_array($type, [self::HEAD, self::GET, self::DELETE], true)) {
+				$options['data_format'] = 'query';
+			} else {
+				$options['data_format'] = 'body';
+			}
+		}
+	}
+
+	/**
+	 * HTTP response parser
+	 *
+	 * @param string $headers Full response text including headers and body
+	 * @param string $url Original request URL
+	 * @param array $req_headers Original $headers array passed to {@link request()}, in case we need to follow redirects
+	 * @param array $req_data Original $data array passed to {@link request()}, in case we need to follow redirects
+	 * @param array $options Original $options array passed to {@link request()}, in case we need to follow redirects
+	 * @return \WpOrg\Requests\Response
+	 *
+	 * @throws \WpOrg\Requests\Exception On missing head/body separator (`requests.no_crlf_separator`)
+	 * @throws \WpOrg\Requests\Exception On missing head/body separator (`noversion`)
+	 * @throws \WpOrg\Requests\Exception On missing head/body separator (`toomanyredirects`)
+	 */
+	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
+		$return = new Response();
+		if (!$options['blocking']) {
+			return $return;
+		}
+
+		$return->raw  = $headers;
+		$return->url  = (string) $url;
+		$return->body = '';
+
+		if (!$options['filename']) {
+			$pos = strpos($headers, "\r\n\r\n");
+			if ($pos === false) {
+				// Crap!
+				throw new Exception('Missing header/body separator', 'requests.no_crlf_separator');
+			}
+
+			$headers = substr($return->raw, 0, $pos);
+			// Headers will always be separated from the body by two new lines - `\n\r\n\r`.
+			$body = substr($return->raw, $pos + 4);
+			if (!empty($body)) {
+				$return->body = $body;
+			}
+		}
+
+		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
+		$headers = str_replace("\r\n", "\n", $headers);
+		// Unfold headers (replace [CRLF] 1*( SP | HT ) with SP) as per RFC 2616 (section 2.2)
+		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
+		$headers = explode("\n", $headers);
+		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
+		if (empty($matches)) {
+			throw new Exception('Response could not be parsed', 'noversion', $headers);
+		}
+
+		$return->protocol_version = (float) $matches[1];
+		$return->status_code      = (int) $matches[2];
+		if ($return->status_code >= 200 && $return->status_code < 300) {
+			$return->success = true;
+		}
+
+		foreach ($headers as $header) {
+			list($key, $value) = explode(':', $header, 2);
+			$value             = trim($value);
+			preg_replace('#(\s+)#i', ' ', $value);
+			$return->headers[$key] = $value;
+		}
+
+		if (isset($return->headers['transfer-encoding'])) {
+			$return->body = self::decode_chunked($return->body);
+			unset($return->headers['transfer-encoding']);
+		}
+
+		if (isset($return->headers['content-encoding'])) {
+			$return->body = self::decompress($return->body);
+		}
+
+		//fsockopen and cURL compatibility
+		if (isset($return->headers['connection'])) {
+			unset($return->headers['connection']);
+		}
+
+		$options['hooks']->dispatch('requests.before_redirect_check', [&$return, $req_headers, $req_data, $options]);
+
+		if ($return->is_redirect() && $options['follow_redirects'] === true) {
+			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
+				if ($return->status_code === 303) {
+					$options['type'] = self::GET;
+				}
+
+				$options['redirected']++;
+				$location = $return->headers['location'];
+				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+					// relative redirect, for compatibility make it absolute
+					$location = Iri::absolutize($url, $location);
+					$location = $location->uri;
+				}
+
+				$hook_args = [
+					&$location,
+					&$req_headers,
+					&$req_data,
+					&$options,
+					$return,
+				];
+				$options['hooks']->dispatch('requests.before_redirect', $hook_args);
+				$redirected            = self::request($location, $req_headers, $req_data, $options['type'], $options);
+				$redirected->history[] = $return;
+				return $redirected;
+			} elseif ($options['redirected'] >= $options['redirects']) {
+				throw new Exception('Too many redirects', 'toomanyredirects', $return);
+			}
+		}
+
+		$return->redirects = $options['redirected'];
+
+		$options['hooks']->dispatch('requests.after_request', [&$return, $req_headers, $req_data, $options]);
+		return $return;
+	}
+
+	/**
+	 * Callback for `transport.internal.parse_response`
+	 *
+	 * Internal use only. Converts a raw HTTP response to a \WpOrg\Requests\Response
+	 * while still executing a multiple request.
+	 *
+	 * `$response` is either set to a \WpOrg\Requests\Response instance, or a \WpOrg\Requests\Exception object
+	 *
+	 * @param string $response Full response text including headers and body (will be overwritten with Response instance)
+	 * @param array $request Request data as passed into {@see \WpOrg\Requests\Requests::request_multiple()}
+	 * @return void
+	 */
+	public static function parse_multiple(&$response, $request) {
+		try {
+			$url      = $request['url'];
+			$headers  = $request['headers'];
+			$data     = $request['data'];
+			$options  = $request['options'];
+			$response = self::parse_response($response, $url, $headers, $data, $options);
+		} catch (Exception $e) {
+			$response = $e;
+		}
+	}
+
+	/**
+	 * Decoded a chunked body as per RFC 2616
+	 *
+	 * @link https://tools.ietf.org/html/rfc2616#section-3.6.1
+	 * @param string $data Chunked body
+	 * @return string Decoded body
+	 */
+	protected static function decode_chunked($data) {
+		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+			return $data;
+		}
+
+		$decoded = '';
+		$encoded = $data;
+
+		while (true) {
+			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
+			if (!$is_chunked) {
+				// Looks like it's not chunked after all
+				return $data;
+			}
+
+			$length = hexdec(trim($matches[1]));
+			if ($length === 0) {
+				// Ignore trailer headers
+				return $decoded;
+			}
+
+			$chunk_length = strlen($matches[0]);
+			$decoded     .= substr($encoded, $chunk_length, $length);
+			$encoded      = substr($encoded, $chunk_length + $length + 2);
+
+			if (trim($encoded) === '0' || empty($encoded)) {
+				return $decoded;
+			}
+		}
+
+		// We'll never actually get down here
+		// @codeCoverageIgnoreStart
+	}
+	// @codeCoverageIgnoreEnd
+
+	/**
+	 * Convert a key => value array to a 'key: value' array for headers
+	 *
+	 * @param iterable $dictionary Dictionary of header values
+	 * @return array List of headers
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not iterable.
+	 */
+	public static function flatten($dictionary) {
+		if (InputValidator::is_iterable($dictionary) === false) {
+			throw InvalidArgument::create(1, '$dictionary', 'iterable', gettype($dictionary));
+		}
+
+		$return = [];
+		foreach ($dictionary as $key => $value) {
+			$return[] = sprintf('%s: %s', $key, $value);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Decompress an encoded body
+	 *
+	 * Implements gzip, compress and deflate. Guesses which it is by attempting
+	 * to decode.
+	 *
+	 * @param string $data Compressed data in one of the above formats
+	 * @return string Decompressed string
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string.
+	 */
+	public static function decompress($data) {
+		if (is_string($data) === false) {
+			throw InvalidArgument::create(1, '$data', 'string', gettype($data));
+		}
+
+		if (trim($data) === '') {
+			// Empty body does not need further processing.
+			return $data;
+		}
+
+		$marker = substr($data, 0, 2);
+		if (!isset(self::$magic_compression_headers[$marker])) {
+			// Not actually compressed. Probably cURL ruining this for us.
+			return $data;
+		}
+
+		if (function_exists('gzdecode')) {
+			$decoded = @gzdecode($data);
+			if ($decoded !== false) {
+				return $decoded;
+			}
+		}
+
+		if (function_exists('gzinflate')) {
+			$decoded = @gzinflate($data);
+			if ($decoded !== false) {
+				return $decoded;
+			}
+		}
+
+		$decoded = self::compatible_gzinflate($data);
+		if ($decoded !== false) {
+			return $decoded;
+		}
+
+		if (function_exists('gzuncompress')) {
+			$decoded = @gzuncompress($data);
+			if ($decoded !== false) {
+				return $decoded;
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Decompression of deflated string while staying compatible with the majority of servers.
+	 *
+	 * Certain Servers will return deflated data with headers which PHP's gzinflate()
+	 * function cannot handle out of the box. The following function has been created from
+	 * various snippets on the gzinflate() PHP documentation.
+	 *
+	 * Warning: Magic numbers within. Due to the potential different formats that the compressed
+	 * data may be returned in, some "magic offsets" are needed to ensure proper decompression
+	 * takes place. For a simple progmatic way to determine the magic offset in use, see:
+	 * https://core.trac.wordpress.org/ticket/18273
+	 *
+	 * @since 1.6.0
+	 * @link https://core.trac.wordpress.org/ticket/18273
+	 * @link https://www.php.net/gzinflate#70875
+	 * @link https://www.php.net/gzinflate#77336
+	 *
+	 * @param string $gz_data String to decompress.
+	 * @return string|bool False on failure.
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string.
+	 */
+	public static function compatible_gzinflate($gz_data) {
+		if (is_string($gz_data) === false) {
+			throw InvalidArgument::create(1, '$gz_data', 'string', gettype($gz_data));
+		}
+
+		if (trim($gz_data) === '') {
+			return false;
+		}
+
+		// Compressed data might contain a full zlib header, if so strip it for
+		// gzinflate()
+		if (substr($gz_data, 0, 3) === "\x1f\x8b\x08") {
+			$i   = 10;
+			$flg = ord(substr($gz_data, 3, 1));
+			if ($flg > 0) {
+				if ($flg & 4) {
+					list($xlen) = unpack('v', substr($gz_data, $i, 2));
+					$i         += 2 + $xlen;
+				}
+
+				if ($flg & 8) {
+					$i = strpos($gz_data, "\0", $i) + 1;
+				}
+
+				if ($flg & 16) {
+					$i = strpos($gz_data, "\0", $i) + 1;
+				}
+
+				if ($flg & 2) {
+					$i += 2;
+				}
+			}
+
+			$decompressed = self::compatible_gzinflate(substr($gz_data, $i));
+			if ($decompressed !== false) {
+				return $decompressed;
+			}
+		}
+
+		// If the data is Huffman Encoded, we must first strip the leading 2
+		// byte Huffman marker for gzinflate()
+		// The response is Huffman coded by many compressors such as
+		// java.util.zip.Deflater, Ruby's Zlib::Deflate, and .NET's
+		// System.IO.Compression.DeflateStream.
+		//
+		// See https://decompres.blogspot.com/ for a quick explanation of this
+		// data type
+		$huffman_encoded = false;
+
+		// low nibble of first byte should be 0x08
+		list(, $first_nibble) = unpack('h', $gz_data);
+
+		// First 2 bytes should be divisible by 0x1F
+		list(, $first_two_bytes) = unpack('n', $gz_data);
+
+		if ($first_nibble === 0x08 && ($first_two_bytes % 0x1F) === 0) {
+			$huffman_encoded = true;
+		}
+
+		if ($huffman_encoded) {
+			$decompressed = @gzinflate(substr($gz_data, 2));
+			if ($decompressed !== false) {
+				return $decompressed;
+			}
+		}
+
+		if (substr($gz_data, 0, 4) === "\x50\x4b\x03\x04") {
+			// ZIP file format header
+			// Offset 6: 2 bytes, General-purpose field
+			// Offset 26: 2 bytes, filename length
+			// Offset 28: 2 bytes, optional field length
+			// Offset 30: Filename field, followed by optional field, followed
+			// immediately by data
+			list(, $general_purpose_flag) = unpack('v', substr($gz_data, 6, 2));
+
+			// If the file has been compressed on the fly, 0x08 bit is set of
+			// the general purpose field. We can use this to differentiate
+			// between a compressed document, and a ZIP file
+			$zip_compressed_on_the_fly = ((0x08 & $general_purpose_flag) === 0x08);
+
+			if (!$zip_compressed_on_the_fly) {
+				// Don't attempt to decode a compressed zip file
+				return $gz_data;
+			}
+
+			// Determine the first byte of data, based on the above ZIP header
+			// offsets:
+			$first_file_start = array_sum(unpack('v2', substr($gz_data, 26, 4)));
+			$decompressed     = @gzinflate(substr($gz_data, 30 + $first_file_start));
+			if ($decompressed !== false) {
+				return $decompressed;
+			}
+
+			return false;
+		}
+
+		// Finally fall back to straight gzinflate
+		$decompressed = @gzinflate($gz_data);
+		if ($decompressed !== false) {
+			return $decompressed;
+		}
+
+		// Fallback for all above failing, not expected, but included for
+		// debugging and preventing regressions and to track stats
+		$decompressed = @gzinflate(substr($gz_data, 2));
+		if ($decompressed !== false) {
+			return $decompressed;
+		}
+
+		return false;
+	}
+}
diff --git a/src/wp-includes/Requests/src/Response.php b/src/wp-includes/Requests/src/Response.php
new file mode 100644
index 0000000000000..86a0438bad54f
--- /dev/null
+++ b/src/wp-includes/Requests/src/Response.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * HTTP response class
+ *
+ * Contains a response from \WpOrg\Requests\Requests::request()
+ *
+ * @package Requests
+ */
+
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Cookie\Jar;
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\Http;
+use WpOrg\Requests\Response\Headers;
+
+/**
+ * HTTP response class
+ *
+ * Contains a response from \WpOrg\Requests\Requests::request()
+ *
+ * @package Requests
+ */
+class Response {
+
+	/**
+	 * Response body
+	 *
+	 * @var string
+	 */
+	public $body = '';
+
+	/**
+	 * Raw HTTP data from the transport
+	 *
+	 * @var string
+	 */
+	public $raw = '';
+
+	/**
+	 * Headers, as an associative array
+	 *
+	 * @var \WpOrg\Requests\Response\Headers Array-like object representing headers
+	 */
+	public $headers = [];
+
+	/**
+	 * Status code, false if non-blocking
+	 *
+	 * @var integer|boolean
+	 */
+	public $status_code = false;
+
+	/**
+	 * Protocol version, false if non-blocking
+	 *
+	 * @var float|boolean
+	 */
+	public $protocol_version = false;
+
+	/**
+	 * Whether the request succeeded or not
+	 *
+	 * @var boolean
+	 */
+	public $success = false;
+
+	/**
+	 * Number of redirects the request used
+	 *
+	 * @var integer
+	 */
+	public $redirects = 0;
+
+	/**
+	 * URL requested
+	 *
+	 * @var string
+	 */
+	public $url = '';
+
+	/**
+	 * Previous requests (from redirects)
+	 *
+	 * @var array Array of \WpOrg\Requests\Response objects
+	 */
+	public $history = [];
+
+	/**
+	 * Cookies from the request
+	 *
+	 * @var \WpOrg\Requests\Cookie\Jar Array-like object representing a cookie jar
+	 */
+	public $cookies = [];
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->headers = new Headers();
+		$this->cookies = new Jar();
+	}
+
+	/**
+	 * Is the response a redirect?
+	 *
+	 * @return boolean True if redirect (3xx status), false if not.
+	 */
+	public function is_redirect() {
+		$code = $this->status_code;
+		return in_array($code, [300, 301, 302, 303, 307], true) || $code > 307 && $code < 400;
+	}
+
+	/**
+	 * Throws an exception if the request was not successful
+	 *
+	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
+	 *
+	 * @throws \WpOrg\Requests\Exception If `$allow_redirects` is false, and code is 3xx (`response.no_redirects`)
+	 * @throws \WpOrg\Requests\Exception\Http On non-successful status code. Exception class corresponds to "Status" + code (e.g. {@see \WpOrg\Requests\Exception\Http\Status404})
+	 */
+	public function throw_for_status($allow_redirects = true) {
+		if ($this->is_redirect()) {
+			if ($allow_redirects !== true) {
+				throw new Exception('Redirection not allowed', 'response.no_redirects', $this);
+			}
+		} elseif (!$this->success) {
+			$exception = Http::get_class($this->status_code);
+			throw new $exception(null, $this);
+		}
+	}
+
+	/**
+	 * JSON decode the response body.
+	 *
+	 * The method parameters are the same as those for the PHP native `json_decode()` function.
+	 *
+	 * @link https://php.net/json-decode
+	 *
+	 * @param bool|null $associative Optional. When `true`, JSON objects will be returned as associative arrays;
+	 *                               When `false`, JSON objects will be returned as objects.
+	 *                               When `null`, JSON objects will be returned as associative arrays
+	 *                               or objects depending on whether `JSON_OBJECT_AS_ARRAY` is set in the flags.
+	 *                               Defaults to `true` (in contrast to the PHP native default of `null`).
+	 * @param int       $depth       Optional. Maximum nesting depth of the structure being decoded.
+	 *                               Defaults to `512`.
+	 * @param int       $options     Optional. Bitmask of JSON_BIGINT_AS_STRING, JSON_INVALID_UTF8_IGNORE,
+	 *                               JSON_INVALID_UTF8_SUBSTITUTE, JSON_OBJECT_AS_ARRAY, JSON_THROW_ON_ERROR.
+	 *                               Defaults to `0` (no options set).
+	 *
+	 * @return array
+	 *
+	 * @throws \WpOrg\Requests\Exception If `$this->body` is not valid json.
+	 */
+	public function decode_body($associative = true, $depth = 512, $options = 0) {
+		$data = json_decode($this->body, $associative, $depth, $options);
+
+		if (json_last_error() !== JSON_ERROR_NONE) {
+			$last_error = json_last_error_msg();
+			throw new Exception('Unable to parse JSON data: ' . $last_error, 'response.invalid', $this);
+		}
+
+		return $data;
+	}
+}
diff --git a/src/wp-includes/Requests/src/Response/Headers.php b/src/wp-includes/Requests/src/Response/Headers.php
new file mode 100644
index 0000000000000..b4d0fcf910886
--- /dev/null
+++ b/src/wp-includes/Requests/src/Response/Headers.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Case-insensitive dictionary, suitable for HTTP headers
+ *
+ * @package Requests
+ */
+
+namespace WpOrg\Requests\Response;
+
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\CaseInsensitiveDictionary;
+use WpOrg\Requests\Utility\FilteredIterator;
+
+/**
+ * Case-insensitive dictionary, suitable for HTTP headers
+ *
+ * @package Requests
+ */
+class Headers extends CaseInsensitiveDictionary {
+	/**
+	 * Get the given header
+	 *
+	 * Unlike {@see \WpOrg\Requests\Response\Headers::getValues()}, this returns a string. If there are
+	 * multiple values, it concatenates them with a comma as per RFC2616.
+	 *
+	 * Avoid using this where commas may be used unquoted in values, such as
+	 * Set-Cookie headers.
+	 *
+	 * @param string $offset Name of the header to retrieve.
+	 * @return string|null Header value
+	 */
+	public function offsetGet($offset) {
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		if (!isset($this->data[$offset])) {
+			return null;
+		}
+
+		return $this->flatten($this->data[$offset]);
+	}
+
+	/**
+	 * Set the given item
+	 *
+	 * @param string $offset Item name
+	 * @param string $value Item value
+	 *
+	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
+	 */
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
+			throw new Exception('Object is a dictionary, not a list', 'invalidset');
+		}
+
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		if (!isset($this->data[$offset])) {
+			$this->data[$offset] = [];
+		}
+
+		$this->data[$offset][] = $value;
+	}
+
+	/**
+	 * Get all values for a given header
+	 *
+	 * @param string $offset Name of the header to retrieve.
+	 * @return array|null Header values
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not valid as an array key.
+	 */
+	public function getValues($offset) {
+		if (!is_string($offset) && !is_int($offset)) {
+			throw InvalidArgument::create(1, '$offset', 'string|int', gettype($offset));
+		}
+
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		if (!isset($this->data[$offset])) {
+			return null;
+		}
+
+		return $this->data[$offset];
+	}
+
+	/**
+	 * Flattens a value into a string
+	 *
+	 * Converts an array into a string by imploding values with a comma, as per
+	 * RFC2616's rules for folding headers.
+	 *
+	 * @param string|array $value Value to flatten
+	 * @return string Flattened value
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string or an array.
+	 */
+	public function flatten($value) {
+		if (is_string($value)) {
+			return $value;
+		}
+
+		if (is_array($value)) {
+			return implode(',', $value);
+		}
+
+		throw InvalidArgument::create(1, '$value', 'string|array', gettype($value));
+	}
+
+	/**
+	 * Get an iterator for the data
+	 *
+	 * Converts the internally stored values to a comma-separated string if there is more
+	 * than one value for a key.
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator() {
+		return new FilteredIterator($this->data, [$this, 'flatten']);
+	}
+}
diff --git a/src/wp-includes/Requests/Session.php b/src/wp-includes/Requests/src/Session.php
similarity index 51%
rename from src/wp-includes/Requests/Session.php
rename to src/wp-includes/Requests/src/Session.php
index b2e10991d6cc4..000d2526d40de 100644
--- a/src/wp-includes/Requests/Session.php
+++ b/src/wp-includes/Requests/src/Session.php
@@ -2,10 +2,17 @@
 /**
  * Session handler for persistent requests and default parameters
  *
- * @package Requests
- * @subpackage Session Handler
+ * @package Requests\SessionHandler
  */
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Cookie\Jar;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Iri;
+use WpOrg\Requests\Requests;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * Session handler for persistent requests and default parameters
  *
@@ -14,10 +21,9 @@
  * with all subrequests resolved from this. Base options can be set (including
  * a shared cookie jar), then overridden for individual requests.
  *
- * @package Requests
- * @subpackage Session Handler
+ * @package Requests\SessionHandler
  */
-class Requests_Session {
+class Session {
 	/**
 	 * Base URL for requests
 	 *
@@ -32,7 +38,7 @@ class Requests_Session {
 	 *
 	 * @var array
 	 */
-	public $headers = array();
+	public $headers = [];
 
 	/**
 	 * Base data for requests
@@ -42,7 +48,7 @@ class Requests_Session {
 	 *
 	 * @var array
 	 */
-	public $data = array();
+	public $data = [];
 
 	/**
 	 * Base options for requests
@@ -55,36 +61,57 @@ class Requests_Session {
 	 *
 	 * @var array
 	 */
-	public $options = array();
+	public $options = [];
 
 	/**
 	 * Create a new session
 	 *
-	 * @param string|null $url Base URL for requests
+	 * @param string|Stringable|null $url Base URL for requests
 	 * @param array $headers Default headers for requests
 	 * @param array $data Default data for requests
 	 * @param array $options Default options for requests
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $url argument is not a string, Stringable or null.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $headers argument is not an array.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data argument is not an array.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
 	 */
-	public function __construct($url = null, $headers = array(), $data = array(), $options = array()) {
+	public function __construct($url = null, $headers = [], $data = [], $options = []) {
+		if ($url !== null && InputValidator::is_string_or_stringable($url) === false) {
+			throw InvalidArgument::create(1, '$url', 'string|Stringable|null', gettype($url));
+		}
+
+		if (is_array($headers) === false) {
+			throw InvalidArgument::create(2, '$headers', 'array', gettype($headers));
+		}
+
+		if (is_array($data) === false) {
+			throw InvalidArgument::create(3, '$data', 'array', gettype($data));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(4, '$options', 'array', gettype($options));
+		}
+
 		$this->url     = $url;
 		$this->headers = $headers;
 		$this->data    = $data;
 		$this->options = $options;
 
 		if (empty($this->options['cookies'])) {
-			$this->options['cookies'] = new Requests_Cookie_Jar();
+			$this->options['cookies'] = new Jar();
 		}
 	}
 
 	/**
 	 * Get a property's value
 	 *
-	 * @param string $key Property key
+	 * @param string $name Property name.
 	 * @return mixed|null Property value, null if none found
 	 */
-	public function __get($key) {
-		if (isset($this->options[$key])) {
-			return $this->options[$key];
+	public function __get($name) {
+		if (isset($this->options[$name])) {
+			return $this->options[$name];
 		}
 
 		return null;
@@ -93,93 +120,91 @@ public function __get($key) {
 	/**
 	 * Set a property's value
 	 *
-	 * @param string $key Property key
+	 * @param string $name Property name.
 	 * @param mixed $value Property value
 	 */
-	public function __set($key, $value) {
-		$this->options[$key] = $value;
+	public function __set($name, $value) {
+		$this->options[$name] = $value;
 	}
 
 	/**
 	 * Remove a property's value
 	 *
-	 * @param string $key Property key
+	 * @param string $name Property name.
 	 */
-	public function __isset($key) {
-		return isset($this->options[$key]);
+	public function __isset($name) {
+		return isset($this->options[$name]);
 	}
 
 	/**
 	 * Remove a property's value
 	 *
-	 * @param string $key Property key
+	 * @param string $name Property name.
 	 */
-	public function __unset($key) {
-		if (isset($this->options[$key])) {
-			unset($this->options[$key]);
-		}
+	public function __unset($name) {
+		unset($this->options[$name]);
 	}
 
 	/**#@+
-	 * @see request()
+	 * @see \WpOrg\Requests\Session::request()
 	 * @param string $url
 	 * @param array $headers
 	 * @param array $options
-	 * @return Requests_Response
+	 * @return \WpOrg\Requests\Response
 	 */
 	/**
 	 * Send a GET request
 	 */
-	public function get($url, $headers = array(), $options = array()) {
+	public function get($url, $headers = [], $options = []) {
 		return $this->request($url, $headers, null, Requests::GET, $options);
 	}
 
 	/**
 	 * Send a HEAD request
 	 */
-	public function head($url, $headers = array(), $options = array()) {
+	public function head($url, $headers = [], $options = []) {
 		return $this->request($url, $headers, null, Requests::HEAD, $options);
 	}
 
 	/**
 	 * Send a DELETE request
 	 */
-	public function delete($url, $headers = array(), $options = array()) {
+	public function delete($url, $headers = [], $options = []) {
 		return $this->request($url, $headers, null, Requests::DELETE, $options);
 	}
 	/**#@-*/
 
 	/**#@+
-	 * @see request()
+	 * @see \WpOrg\Requests\Session::request()
 	 * @param string $url
 	 * @param array $headers
 	 * @param array $data
 	 * @param array $options
-	 * @return Requests_Response
+	 * @return \WpOrg\Requests\Response
 	 */
 	/**
 	 * Send a POST request
 	 */
-	public function post($url, $headers = array(), $data = array(), $options = array()) {
+	public function post($url, $headers = [], $data = [], $options = []) {
 		return $this->request($url, $headers, $data, Requests::POST, $options);
 	}
 
 	/**
 	 * Send a PUT request
 	 */
-	public function put($url, $headers = array(), $data = array(), $options = array()) {
+	public function put($url, $headers = [], $data = [], $options = []) {
 		return $this->request($url, $headers, $data, Requests::PUT, $options);
 	}
 
 	/**
 	 * Send a PATCH request
 	 *
-	 * Note: Unlike {@see post} and {@see put}, `$headers` is required, as the
-	 * specification recommends that should send an ETag
+	 * Note: Unlike {@see \WpOrg\Requests\Session::post()} and {@see \WpOrg\Requests\Session::put()},
+	 * `$headers` is required, as the specification recommends that should send an ETag
 	 *
 	 * @link https://tools.ietf.org/html/rfc5789
 	 */
-	public function patch($url, $headers, $data = array(), $options = array()) {
+	public function patch($url, $headers, $data = [], $options = []) {
 		return $this->request($url, $headers, $data, Requests::PATCH, $options);
 	}
 	/**#@-*/
@@ -190,18 +215,18 @@ public function patch($url, $headers, $data = array(), $options = array()) {
 	 * This method initiates a request and sends it via a transport before
 	 * parsing.
 	 *
-	 * @see Requests::request()
-	 *
-	 * @throws Requests_Exception On invalid URLs (`nonhttp`)
+	 * @see \WpOrg\Requests\Requests::request()
 	 *
 	 * @param string $url URL to request
 	 * @param array $headers Extra headers to send with the request
 	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
-	 * @param string $type HTTP request type (use Requests constants)
-	 * @param array $options Options for the request (see {@see Requests::request})
-	 * @return Requests_Response
+	 * @param string $type HTTP request type (use \WpOrg\Requests\Requests constants)
+	 * @param array $options Options for the request (see {@see \WpOrg\Requests\Requests::request()})
+	 * @return \WpOrg\Requests\Response
+	 *
+	 * @throws \WpOrg\Requests\Exception On invalid URLs (`nonhttp`)
 	 */
-	public function request($url, $headers = array(), $data = array(), $type = Requests::GET, $options = array()) {
+	public function request($url, $headers = [], $data = [], $type = Requests::GET, $options = []) {
 		$request = $this->merge_request(compact('url', 'headers', 'data', 'options'));
 
 		return Requests::request($request['url'], $request['headers'], $request['data'], $type, $request['options']);
@@ -210,13 +235,24 @@ public function request($url, $headers = array(), $data = array(), $type = Reque
 	/**
 	 * Send multiple HTTP requests simultaneously
 	 *
-	 * @see Requests::request_multiple()
+	 * @see \WpOrg\Requests\Requests::request_multiple()
 	 *
-	 * @param array $requests Requests data (see {@see Requests::request_multiple})
-	 * @param array $options Global and default options (see {@see Requests::request})
-	 * @return array Responses (either Requests_Response or a Requests_Exception object)
+	 * @param array $requests Requests data (see {@see \WpOrg\Requests\Requests::request_multiple()})
+	 * @param array $options Global and default options (see {@see \WpOrg\Requests\Requests::request()})
+	 * @return array Responses (either \WpOrg\Requests\Response or a \WpOrg\Requests\Exception object)
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $requests argument is not an array or iterable object with array access.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
 	 */
-	public function request_multiple($requests, $options = array()) {
+	public function request_multiple($requests, $options = []) {
+		if (InputValidator::has_array_access($requests) === false || InputValidator::is_iterable($requests) === false) {
+			throw InvalidArgument::create(1, '$requests', 'array|ArrayAccess&Traversable', gettype($requests));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(2, '$options', 'array', gettype($options));
+		}
+
 		foreach ($requests as $key => $request) {
 			$requests[$key] = $this->merge_request($request, false);
 		}
@@ -232,31 +268,31 @@ public function request_multiple($requests, $options = array()) {
 	/**
 	 * Merge a request's data with the default data
 	 *
-	 * @param array $request Request data (same form as {@see request_multiple})
+	 * @param array $request Request data (same form as {@see \WpOrg\Requests\Session::request_multiple()})
 	 * @param boolean $merge_options Should we merge options as well?
 	 * @return array Request data
 	 */
 	protected function merge_request($request, $merge_options = true) {
 		if ($this->url !== null) {
-			$request['url'] = Requests_IRI::absolutize($this->url, $request['url']);
+			$request['url'] = Iri::absolutize($this->url, $request['url']);
 			$request['url'] = $request['url']->uri;
 		}
 
 		if (empty($request['headers'])) {
-			$request['headers'] = array();
+			$request['headers'] = [];
 		}
+
 		$request['headers'] = array_merge($this->headers, $request['headers']);
 
 		if (empty($request['data'])) {
 			if (is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
-		}
-		elseif (is_array($request['data']) && is_array($this->data)) {
+		} elseif (is_array($request['data']) && is_array($this->data)) {
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 
-		if ($merge_options !== false) {
+		if ($merge_options === true) {
 			$request['options'] = array_merge($this->options, $request['options']);
 
 			// Disallow forcing the type, as that's a per request setting
diff --git a/src/wp-includes/Requests/SSL.php b/src/wp-includes/Requests/src/Ssl.php
similarity index 55%
rename from src/wp-includes/Requests/SSL.php
rename to src/wp-includes/Requests/src/Ssl.php
index f7ecf3fbdba9e..99da11d8f7148 100644
--- a/src/wp-includes/Requests/SSL.php
+++ b/src/wp-includes/Requests/src/Ssl.php
@@ -2,37 +2,49 @@
 /**
  * SSL utilities for Requests
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  */
 
+namespace WpOrg\Requests;
+
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * SSL utilities for Requests
  *
  * Collection of utilities for working with and verifying SSL certificates.
  *
- * @package Requests
- * @subpackage Utilities
+ * @package Requests\Utilities
  */
-class Requests_SSL {
+final class Ssl {
 	/**
 	 * Verify the certificate against common name and subject alternative names
 	 *
 	 * Unfortunately, PHP doesn't check the certificate against the alternative
 	 * names, leading things like 'https://www.github.com/' to be invalid.
 	 *
-	 * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
+	 * @link https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
 	 *
-	 * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
-	 * @param string $host Host name to verify against
+	 * @param string|Stringable $host Host name to verify against
 	 * @param array $cert Certificate data from openssl_x509_parse()
 	 * @return bool
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $host argument is not a string or a stringable object.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $cert argument is not an array or array accessible.
 	 */
 	public static function verify_certificate($host, $cert) {
+		if (InputValidator::is_string_or_stringable($host) === false) {
+			throw InvalidArgument::create(1, '$host', 'string|Stringable', gettype($host));
+		}
+
+		if (InputValidator::has_array_access($cert) === false) {
+			throw InvalidArgument::create(2, '$cert', 'array|ArrayAccess', gettype($cert));
+		}
+
 		$has_dns_alt = false;
 
 		// Check the subjectAltName
-		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
+		if (!empty($cert['extensions']['subjectAltName'])) {
 			$altnames = explode(',', $cert['extensions']['subjectAltName']);
 			foreach ($altnames as $altname) {
 				$altname = trim($altname);
@@ -50,15 +62,17 @@ public static function verify_certificate($host, $cert) {
 					return true;
 				}
 			}
+
+			if ($has_dns_alt === true) {
+				return false;
+			}
 		}
 
 		// Fall back to checking the common name if we didn't get any dNSName
 		// alt names, as per RFC2818
-		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
+		if (!empty($cert['subject']['CN'])) {
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
-				return true;
-			}
+			return (self::match_domain($host, $cert['subject']['CN']) === true);
 		}
 
 		return false;
@@ -77,11 +91,29 @@ public static function verify_certificate($host, $cert) {
 	 * character to be the full first component; that is, with the exclusion of
 	 * the third rule.
 	 *
-	 * @param string $reference Reference dNSName
+	 * @param string|Stringable $reference Reference dNSName
 	 * @return boolean Is the name valid?
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string or a stringable object.
 	 */
 	public static function verify_reference_name($reference) {
+		if (InputValidator::is_string_or_stringable($reference) === false) {
+			throw InvalidArgument::create(1, '$reference', 'string|Stringable', gettype($reference));
+		}
+
+		if ($reference === '') {
+			return false;
+		}
+
+		if (preg_match('`\s`', $reference) > 0) {
+			// Whitespace detected. This can never be a dNSName.
+			return false;
+		}
+
 		$parts = explode('.', $reference);
+		if ($parts !== array_filter($parts)) {
+			// DNSName cannot contain two dots next to each other.
+			return false;
+		}
 
 		// Check the first part of the name
 		$first = array_shift($parts);
@@ -112,29 +144,35 @@ public static function verify_reference_name($reference) {
 	/**
 	 * Match a hostname against a dNSName reference
 	 *
-	 * @param string $host Requested host
-	 * @param string $reference dNSName to match against
+	 * @param string|Stringable $host Requested host
+	 * @param string|Stringable $reference dNSName to match against
 	 * @return boolean Does the domain match?
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When either of the passed arguments is not a string or a stringable object.
 	 */
 	public static function match_domain($host, $reference) {
+		if (InputValidator::is_string_or_stringable($host) === false) {
+			throw InvalidArgument::create(1, '$host', 'string|Stringable', gettype($host));
+		}
+
 		// Check if the reference is blocklisted first
 		if (self::verify_reference_name($reference) !== true) {
 			return false;
 		}
 
 		// Check for a direct match
-		if ($host === $reference) {
+		if ((string) $host === (string) $reference) {
 			return true;
 		}
 
 		// Calculate the valid wildcard match if the host is not an IP address
-		// Also validates that the host has 3 parts or more, as per Firefox's
-		// ruleset.
+		// Also validates that the host has 3 parts or more, as per Firefox's ruleset,
+		// as a wildcard reference is only allowed with 3 parts or more, so the
+		// comparison will never match if host doesn't contain 3 parts or more as well.
 		if (ip2long($host) === false) {
 			$parts    = explode('.', $host);
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if ($wildcard === (string) $reference) {
 				return true;
 			}
 		}
diff --git a/src/wp-includes/Requests/src/Transport.php b/src/wp-includes/Requests/src/Transport.php
new file mode 100644
index 0000000000000..f2e1c6ed737dc
--- /dev/null
+++ b/src/wp-includes/Requests/src/Transport.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Base HTTP transport
+ *
+ * @package Requests\Transport
+ */
+
+namespace WpOrg\Requests;
+
+/**
+ * Base HTTP transport
+ *
+ * @package Requests\Transport
+ */
+interface Transport {
+	/**
+	 * Perform a request
+	 *
+	 * @param string $url URL to request
+	 * @param array $headers Associative array of request headers
+	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
+	 * @param array $options Request options, see {@see \WpOrg\Requests\Requests::response()} for documentation
+	 * @return string Raw HTTP result
+	 */
+	public function request($url, $headers = [], $data = [], $options = []);
+
+	/**
+	 * Send multiple requests simultaneously
+	 *
+	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see \WpOrg\Requests\Transport::request()}
+	 * @param array $options Global options, see {@see \WpOrg\Requests\Requests::response()} for documentation
+	 * @return array Array of \WpOrg\Requests\Response objects (may contain \WpOrg\Requests\Exception or string responses as well)
+	 */
+	public function request_multiple($requests, $options);
+
+	/**
+	 * Self-test whether the transport can be used.
+	 *
+	 * The available capabilities to test for can be found in {@see \WpOrg\Requests\Capability}.
+	 *
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return bool Whether the transport can be used.
+	 */
+	public static function test($capabilities = []);
+}
diff --git a/src/wp-includes/Requests/Transport/cURL.php b/src/wp-includes/Requests/src/Transport/Curl.php
similarity index 68%
rename from src/wp-includes/Requests/Transport/cURL.php
rename to src/wp-includes/Requests/src/Transport/Curl.php
index 01bcf3b719f1c..7316987b5faed 100644
--- a/src/wp-includes/Requests/Transport/cURL.php
+++ b/src/wp-includes/Requests/src/Transport/Curl.php
@@ -2,17 +2,27 @@
 /**
  * cURL HTTP transport
  *
- * @package Requests
- * @subpackage Transport
+ * @package Requests\Transport
  */
 
+namespace WpOrg\Requests\Transport;
+
+use RecursiveArrayIterator;
+use RecursiveIteratorIterator;
+use WpOrg\Requests\Capability;
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Exception\Transport\Curl as CurlException;
+use WpOrg\Requests\Requests;
+use WpOrg\Requests\Transport;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * cURL HTTP transport
  *
- * @package Requests
- * @subpackage Transport
+ * @package Requests\Transport
  */
-class Requests_Transport_cURL implements Requests_Transport {
+final class Curl implements Transport {
 	const CURL_7_10_5 = 0x070A05;
 	const CURL_7_16_2 = 0x071002;
 
@@ -33,7 +43,7 @@ class Requests_Transport_cURL implements Requests_Transport {
 	/**
 	 * Information on the current request
 	 *
-	 * @var array cURL information array, see {@see https://secure.php.net/curl_getinfo}
+	 * @var array cURL information array, see {@link https://www.php.net/curl_getinfo}
 	 */
 	public $info;
 
@@ -47,44 +57,44 @@ class Requests_Transport_cURL implements Requests_Transport {
 	/**
 	 * cURL handle
 	 *
-	 * @var resource
+	 * @var resource|\CurlHandle Resource in PHP < 8.0, Instance of CurlHandle in PHP >= 8.0.
 	 */
-	protected $handle;
+	private $handle;
 
 	/**
 	 * Hook dispatcher instance
 	 *
-	 * @var Requests_Hooks
+	 * @var \WpOrg\Requests\Hooks
 	 */
-	protected $hooks;
+	private $hooks;
 
 	/**
 	 * Have we finished the headers yet?
 	 *
 	 * @var boolean
 	 */
-	protected $done_headers = false;
+	private $done_headers = false;
 
 	/**
 	 * If streaming to a file, keep the file pointer
 	 *
 	 * @var resource
 	 */
-	protected $stream_handle;
+	private $stream_handle;
 
 	/**
 	 * How many bytes are in the response body?
 	 *
 	 * @var int
 	 */
-	protected $response_bytes;
+	private $response_bytes;
 
 	/**
 	 * What's the maximum number of bytes we should keep?
 	 *
 	 * @var int|bool Byte count, or false if no limit.
 	 */
-	protected $response_byte_limit;
+	private $response_byte_limit;
 
 	/**
 	 * Constructor
@@ -99,10 +109,12 @@ public function __construct() {
 		if ($this->version >= self::CURL_7_10_5) {
 			curl_setopt($this->handle, CURLOPT_ENCODING, '');
 		}
+
 		if (defined('CURLOPT_PROTOCOLS')) {
 			// phpcs:ignore PHPCompatibility.Constants.NewConstants.curlopt_protocolsFound
 			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 		}
+
 		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
 			// phpcs:ignore PHPCompatibility.Constants.NewConstants.curlopt_redir_protocolsFound
 			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
@@ -121,23 +133,52 @@ public function __destruct() {
 	/**
 	 * Perform a request
 	 *
-	 * @throws Requests_Exception On a cURL error (`curlerror`)
-	 *
-	 * @param string $url URL to request
+	 * @param string|Stringable $url URL to request
 	 * @param array $headers Associative array of request headers
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
+	 * @param array $options Request options, see {@see \WpOrg\Requests\Requests::response()} for documentation
 	 * @return string Raw HTTP result
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $url argument is not a string or Stringable.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $headers argument is not an array.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data parameter is not an array or string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
+	 * @throws \WpOrg\Requests\Exception       On a cURL error (`curlerror`)
 	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
+	public function request($url, $headers = [], $data = [], $options = []) {
+		if (InputValidator::is_string_or_stringable($url) === false) {
+			throw InvalidArgument::create(1, '$url', 'string|Stringable', gettype($url));
+		}
+
+		if (is_array($headers) === false) {
+			throw InvalidArgument::create(2, '$headers', 'array', gettype($headers));
+		}
+
+		if (!is_array($data) && !is_string($data)) {
+			if ($data === null) {
+				$data = '';
+			} else {
+				throw InvalidArgument::create(3, '$data', 'array|string', gettype($data));
+			}
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(4, '$options', 'array', gettype($options));
+		}
+
 		$this->hooks = $options['hooks'];
 
 		$this->setup_handle($url, $headers, $data, $options);
 
-		$options['hooks']->dispatch('curl.before_send', array(&$this->handle));
+		$options['hooks']->dispatch('curl.before_send', [&$this->handle]);
 
 		if ($options['filename'] !== false) {
-			$this->stream_handle = fopen($options['filename'], 'wb');
+			// phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silenced the PHP native warning in favour of throwing an exception.
+			$this->stream_handle = @fopen($options['filename'], 'wb');
+			if ($this->stream_handle === false) {
+				$error = error_get_last();
+				throw new Exception($error['message'], 'fopen');
+			}
 		}
 
 		$this->response_data       = '';
@@ -151,8 +192,7 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 			if ($options['verify'] === false) {
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
-			}
-			elseif (is_string($options['verify'])) {
+			} elseif (is_string($options['verify'])) {
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
 			}
 		}
@@ -164,9 +204,9 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		curl_exec($this->handle);
 		$response = $this->response_data;
 
-		$options['hooks']->dispatch('curl.after_send', array());
+		$options['hooks']->dispatch('curl.after_send', []);
 
-		if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
+		if (curl_errno($this->handle) === CURLE_WRITE_ERROR || curl_errno($this->handle) === CURLE_BAD_CONTENT_ENCODING) {
 			// Reset encoding and try again
 			curl_setopt($this->handle, CURLOPT_ENCODING, 'none');
 
@@ -179,7 +219,7 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		$this->process_response($response, $options);
 
 		// Need to remove the $this reference from the curl handle.
-		// Otherwise Requests_Transport_cURL wont be garbage collected and the curl_close() will never be called.
+		// Otherwise \WpOrg\Requests\Transport\Curl won't be garbage collected and the curl_close() will never be called.
 		curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, null);
 		curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, null);
 
@@ -191,41 +231,51 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 	 *
 	 * @param array $requests Request data
 	 * @param array $options Global options
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+	 * @return array Array of \WpOrg\Requests\Response objects (may contain \WpOrg\Requests\Exception or string responses as well)
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $requests argument is not an array or iterable object with array access.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
 	 */
 	public function request_multiple($requests, $options) {
 		// If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
 		if (empty($requests)) {
-			return array();
+			return [];
+		}
+
+		if (InputValidator::has_array_access($requests) === false || InputValidator::is_iterable($requests) === false) {
+			throw InvalidArgument::create(1, '$requests', 'array|ArrayAccess&Traversable', gettype($requests));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(2, '$options', 'array', gettype($options));
 		}
 
 		$multihandle = curl_multi_init();
-		$subrequests = array();
-		$subhandles  = array();
+		$subrequests = [];
+		$subhandles  = [];
 
 		$class = get_class($this);
 		foreach ($requests as $id => $request) {
 			$subrequests[$id] = new $class();
 			$subhandles[$id]  = $subrequests[$id]->get_subrequest_handle($request['url'], $request['headers'], $request['data'], $request['options']);
-			$request['options']['hooks']->dispatch('curl.before_multi_add', array(&$subhandles[$id]));
+			$request['options']['hooks']->dispatch('curl.before_multi_add', [&$subhandles[$id]]);
 			curl_multi_add_handle($multihandle, $subhandles[$id]);
 		}
 
 		$completed       = 0;
-		$responses       = array();
+		$responses       = [];
 		$subrequestcount = count($subrequests);
 
-		$request['options']['hooks']->dispatch('curl.before_multi_exec', array(&$multihandle));
+		$request['options']['hooks']->dispatch('curl.before_multi_exec', [&$multihandle]);
 
 		do {
 			$active = 0;
 
 			do {
 				$status = curl_multi_exec($multihandle, $active);
-			}
-			while ($status === CURLM_CALL_MULTI_PERFORM);
+			} while ($status === CURLM_CALL_MULTI_PERFORM);
 
-			$to_process = array();
+			$to_process = [];
 
 			// Read the information as needed
 			while ($done = curl_multi_info_read($multihandle)) {
@@ -241,33 +291,32 @@ public function request_multiple($requests, $options) {
 				if ($done['result'] !== CURLE_OK) {
 					//get error string for handle.
 					$reason          = curl_error($done['handle']);
-					$exception       = new Requests_Exception_Transport_cURL(
+					$exception       = new CurlException(
 						$reason,
-						Requests_Exception_Transport_cURL::EASY,
+						CurlException::EASY,
 						$done['handle'],
 						$done['result']
 					);
 					$responses[$key] = $exception;
-					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
-				}
-				else {
+					$options['hooks']->dispatch('transport.internal.parse_error', [&$responses[$key], $requests[$key]]);
+				} else {
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
 
-					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
+					$options['hooks']->dispatch('transport.internal.parse_response', [&$responses[$key], $requests[$key]]);
 				}
 
 				curl_multi_remove_handle($multihandle, $done['handle']);
 				curl_close($done['handle']);
 
 				if (!is_string($responses[$key])) {
-					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
+					$options['hooks']->dispatch('multiple.request.complete', [&$responses[$key], $key]);
 				}
+
 				$completed++;
 			}
-		}
-		while ($active || $completed < $subrequestcount);
+		} while ($active || $completed < $subrequestcount);
 
-		$request['options']['hooks']->dispatch('curl.after_multi_exec', array(&$multihandle));
+		$request['options']['hooks']->dispatch('curl.after_multi_exec', [&$multihandle]);
 
 		curl_multi_close($multihandle);
 
@@ -280,8 +329,8 @@ public function request_multiple($requests, $options) {
 	 * @param string $url URL to request
 	 * @param array $headers Associative array of request headers
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
-	 * @return resource Subrequest's cURL handle
+	 * @param array $options Request options, see {@see \WpOrg\Requests\Requests::response()} for documentation
+	 * @return resource|\CurlHandle Subrequest's cURL handle
 	 */
 	public function &get_subrequest_handle($url, $headers, $data, $options) {
 		$this->setup_handle($url, $headers, $data, $options);
@@ -296,6 +345,7 @@ public function &get_subrequest_handle($url, $headers, $data, $options) {
 		if ($options['max_bytes'] !== false) {
 			$this->response_byte_limit = $options['max_bytes'];
 		}
+
 		$this->hooks = $options['hooks'];
 
 		return $this->handle;
@@ -307,10 +357,10 @@ public function &get_subrequest_handle($url, $headers, $data, $options) {
 	 * @param string $url URL to request
 	 * @param array $headers Associative array of request headers
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
+	 * @param array $options Request options, see {@see \WpOrg\Requests\Requests::response()} for documentation
 	 */
-	protected function setup_handle($url, $headers, $data, $options) {
-		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
+	private function setup_handle($url, $headers, $data, $options) {
+		$options['hooks']->dispatch('curl.before_request', [&$this->handle]);
 
 		// Force closing the connection for old versions of cURL (<7.22).
 		if (!isset($headers['Connection'])) {
@@ -340,9 +390,8 @@ protected function setup_handle($url, $headers, $data, $options) {
 			if ($data_format === 'query') {
 				$url  = self::format_get($url, $data);
 				$data = '';
-			}
-			elseif (!is_string($data)) {
-				$data = http_build_query($data, null, '&');
+			} elseif (!is_string($data)) {
+				$data = http_build_query($data, '', '&');
 			}
 		}
 
@@ -379,35 +428,33 @@ protected function setup_handle($url, $headers, $data, $options) {
 
 		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
-		}
-		else {
+		} else {
 			// phpcs:ignore PHPCompatibility.Constants.NewConstants.curlopt_timeout_msFound
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
 		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
-		}
-		else {
+		} else {
 			// phpcs:ignore PHPCompatibility.Constants.NewConstants.curlopt_connecttimeout_msFound
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
 		}
+
 		curl_setopt($this->handle, CURLOPT_URL, $url);
-		curl_setopt($this->handle, CURLOPT_REFERER, $url);
 		curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
 		if (!empty($headers)) {
 			curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
 		}
+
 		if ($options['protocol_version'] === 1.1) {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
 		if ($options['blocking'] === true) {
-			curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, array($this, 'stream_headers'));
-			curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, array($this, 'stream_body'));
+			curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, [$this, 'stream_headers']);
+			curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, [$this, 'stream_body']);
 			curl_setopt($this->handle, CURLOPT_BUFFERSIZE, Requests::BUFFER_SIZE);
 		}
 	}
@@ -418,19 +465,19 @@ protected function setup_handle($url, $headers, $data, $options) {
 	 * @param string $response Response data from the body
 	 * @param array $options Request options
 	 * @return string|false HTTP response data including headers. False if non-blocking.
-	 * @throws Requests_Exception
+	 * @throws \WpOrg\Requests\Exception If the request resulted in a cURL error.
 	 */
 	public function process_response($response, $options) {
 		if ($options['blocking'] === false) {
 			$fake_headers = '';
-			$options['hooks']->dispatch('curl.after_request', array(&$fake_headers));
+			$options['hooks']->dispatch('curl.after_request', [&$fake_headers]);
 			return false;
 		}
+
 		if ($options['filename'] !== false && $this->stream_handle) {
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
-		}
-		else {
+		} else {
 			$this->headers .= $response;
 		}
 
@@ -440,18 +487,19 @@ public function process_response($response, $options) {
 				curl_errno($this->handle),
 				curl_error($this->handle)
 			);
-			throw new Requests_Exception($error, 'curlerror', $this->handle);
+			throw new Exception($error, 'curlerror', $this->handle);
 		}
+
 		$this->info = curl_getinfo($this->handle);
 
-		$options['hooks']->dispatch('curl.after_request', array(&$this->headers, &$this->info));
+		$options['hooks']->dispatch('curl.after_request', [&$this->headers, &$this->info]);
 		return $this->headers;
 	}
 
 	/**
 	 * Collect the headers as they are received
 	 *
-	 * @param resource $handle cURL resource
+	 * @param resource|\CurlHandle $handle cURL handle
 	 * @param string $headers Header string
 	 * @return integer Length of provided header
 	 */
@@ -463,11 +511,13 @@ public function stream_headers($handle, $headers) {
 			$this->headers      = '';
 			$this->done_headers = false;
 		}
+
 		$this->headers .= $headers;
 
 		if ($headers === "\r\n") {
 			$this->done_headers = true;
 		}
+
 		return strlen($headers);
 	}
 
@@ -476,12 +526,12 @@ public function stream_headers($handle, $headers) {
 	 *
 	 * @since 1.6.1
 	 *
-	 * @param resource $handle cURL resource
+	 * @param resource|\CurlHandle $handle cURL handle
 	 * @param string $data Body data
 	 * @return integer Length of provided data
 	 */
 	public function stream_body($handle, $data) {
-		$this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
+		$this->hooks->dispatch('request.progress', [$data, $this->response_bytes, $this->response_byte_limit]);
 		$data_length = strlen($data);
 
 		// Are we limiting the response size?
@@ -500,8 +550,7 @@ public function stream_body($handle, $data) {
 
 		if ($this->stream_handle) {
 			fwrite($this->stream_handle, $data);
-		}
-		else {
+		} else {
 			$this->response_data .= $data;
 		}
 
@@ -512,47 +561,49 @@ public function stream_body($handle, $data) {
 	/**
 	 * Format a URL given GET data
 	 *
-	 * @param string $url
-	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
+	 * @param string       $url  Original URL.
+	 * @param array|object $data Data to build query using, see {@link https://www.php.net/http_build_query}
 	 * @return string URL with data
 	 */
-	protected static function format_get($url, $data) {
+	private static function format_get($url, $data) {
 		if (!empty($data)) {
 			$query     = '';
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$url_parts['query'] = '';
-			}
-			else {
+			} else {
 				$query = $url_parts['query'];
 			}
 
-			$query .= '&' . http_build_query($data, null, '&');
+			$query .= '&' . http_build_query($data, '', '&');
 			$query  = trim($query, '&');
 
 			if (empty($url_parts['query'])) {
 				$url .= '?' . $query;
-			}
-			else {
+			} else {
 				$url = str_replace($url_parts['query'], $query, $url);
 			}
 		}
+
 		return $url;
 	}
 
 	/**
-	 * Whether this transport is valid
+	 * Self-test whether the transport can be used.
+	 *
+	 * The available capabilities to test for can be found in {@see \WpOrg\Requests\Capability}.
 	 *
 	 * @codeCoverageIgnore
-	 * @return boolean True if the transport is valid, false otherwise.
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return bool Whether the transport can be used.
 	 */
-	public static function test($capabilities = array()) {
+	public static function test($capabilities = []) {
 		if (!function_exists('curl_init') || !function_exists('curl_exec')) {
 			return false;
 		}
 
 		// If needed, check that our installed curl version supports SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+		if (isset($capabilities[Capability::SSL]) && $capabilities[Capability::SSL]) {
 			$curl_version = curl_version();
 			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
 				return false;
@@ -568,7 +619,7 @@ public static function test($capabilities = array()) {
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD.
 	 * @return string The "Expect" header.
 	 */
-	protected function get_expect_header($data) {
+	private function get_expect_header($data) {
 		if (!is_array($data)) {
 			return strlen((string) $data) >= 1048576 ? '100-Continue' : '';
 		}
diff --git a/src/wp-includes/Requests/Transport/fsockopen.php b/src/wp-includes/Requests/src/Transport/Fsockopen.php
similarity index 58%
rename from src/wp-includes/Requests/Transport/fsockopen.php
rename to src/wp-includes/Requests/src/Transport/Fsockopen.php
index 56f94c99f2390..2b53d0c10c4b1 100644
--- a/src/wp-includes/Requests/Transport/fsockopen.php
+++ b/src/wp-includes/Requests/src/Transport/Fsockopen.php
@@ -2,17 +2,27 @@
 /**
  * fsockopen HTTP transport
  *
- * @package Requests
- * @subpackage Transport
+ * @package Requests\Transport
  */
 
+namespace WpOrg\Requests\Transport;
+
+use WpOrg\Requests\Capability;
+use WpOrg\Requests\Exception;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Port;
+use WpOrg\Requests\Requests;
+use WpOrg\Requests\Ssl;
+use WpOrg\Requests\Transport;
+use WpOrg\Requests\Utility\CaseInsensitiveDictionary;
+use WpOrg\Requests\Utility\InputValidator;
+
 /**
  * fsockopen HTTP transport
  *
- * @package Requests
- * @subpackage Transport
+ * @package Requests\Transport
  */
-class Requests_Transport_fsockopen implements Requests_Transport {
+final class Fsockopen implements Transport {
 	/**
 	 * Second to microsecond conversion
 	 *
@@ -30,7 +40,7 @@ class Requests_Transport_fsockopen implements Requests_Transport {
 	/**
 	 * Stream metadata
 	 *
-	 * @var array Associative array of properties, see {@see https://secure.php.net/stream_get_meta_data}
+	 * @var array Associative array of properties, see {@link https://www.php.net/stream_get_meta_data}
 	 */
 	public $info;
 
@@ -39,45 +49,75 @@ class Requests_Transport_fsockopen implements Requests_Transport {
 	 *
 	 * @var int|bool Byte count, or false if no limit.
 	 */
-	protected $max_bytes = false;
+	private $max_bytes = false;
 
-	protected $connect_error = '';
+	/**
+	 * Cache for received connection errors.
+	 *
+	 * @var string
+	 */
+	private $connect_error = '';
 
 	/**
 	 * Perform a request
 	 *
-	 * @throws Requests_Exception On failure to connect to socket (`fsockopenerror`)
-	 * @throws Requests_Exception On socket timeout (`timeout`)
-	 *
-	 * @param string $url URL to request
+	 * @param string|Stringable $url URL to request
 	 * @param array $headers Associative array of request headers
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
-	 * @param array $options Request options, see {@see Requests::response()} for documentation
+	 * @param array $options Request options, see {@see \WpOrg\Requests\Requests::response()} for documentation
 	 * @return string Raw HTTP result
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $url argument is not a string or Stringable.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $headers argument is not an array.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data parameter is not an array or string.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
+	 * @throws \WpOrg\Requests\Exception       On failure to connect to socket (`fsockopenerror`)
+	 * @throws \WpOrg\Requests\Exception       On socket timeout (`timeout`)
 	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
+	public function request($url, $headers = [], $data = [], $options = []) {
+		if (InputValidator::is_string_or_stringable($url) === false) {
+			throw InvalidArgument::create(1, '$url', 'string|Stringable', gettype($url));
+		}
+
+		if (is_array($headers) === false) {
+			throw InvalidArgument::create(2, '$headers', 'array', gettype($headers));
+		}
+
+		if (!is_array($data) && !is_string($data)) {
+			if ($data === null) {
+				$data = '';
+			} else {
+				throw InvalidArgument::create(3, '$data', 'array|string', gettype($data));
+			}
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(4, '$options', 'array', gettype($options));
+		}
+
 		$options['hooks']->dispatch('fsockopen.before_request');
 
 		$url_parts = parse_url($url);
 		if (empty($url_parts)) {
-			throw new Requests_Exception('Invalid URL.', 'invalidurl', $url);
+			throw new Exception('Invalid URL.', 'invalidurl', $url);
 		}
+
 		$host                     = $url_parts['host'];
 		$context                  = stream_context_create();
 		$verifyname               = false;
-		$case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
+		$case_insensitive_headers = new CaseInsensitiveDictionary($headers);
 
 		// HTTPS support
 		if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
 			$remote_socket = 'ssl://' . $host;
 			if (!isset($url_parts['port'])) {
-				$url_parts['port'] = 443;
+				$url_parts['port'] = Port::HTTPS;
 			}
 
-			$context_options = array(
+			$context_options = [
 				'verify_peer'       => true,
 				'capture_peer_cert' => true,
-			);
+			];
 			$verifyname      = true;
 
 			// SNI, if enabled (OpenSSL >=0.9.8j)
@@ -94,8 +134,7 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 					$context_options['verify_peer']      = false;
 					$context_options['verify_peer_name'] = false;
 					$verifyname                          = false;
-				}
-				elseif (is_string($options['verify'])) {
+				} elseif (is_string($options['verify'])) {
 					$context_options['cafile'] = $options['verify'];
 				}
 			}
@@ -105,39 +144,39 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 				$verifyname                          = false;
 			}
 
-			stream_context_set_option($context, array('ssl' => $context_options));
-		}
-		else {
+			stream_context_set_option($context, ['ssl' => $context_options]);
+		} else {
 			$remote_socket = 'tcp://' . $host;
 		}
 
 		$this->max_bytes = $options['max_bytes'];
 
 		if (!isset($url_parts['port'])) {
-			$url_parts['port'] = 80;
+			$url_parts['port'] = Port::HTTP;
 		}
+
 		$remote_socket .= ':' . $url_parts['port'];
 
 		// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_set_error_handler
-		set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
+		set_error_handler([$this, 'connect_error_handler'], E_WARNING | E_NOTICE);
 
-		$options['hooks']->dispatch('fsockopen.remote_socket', array(&$remote_socket));
+		$options['hooks']->dispatch('fsockopen.remote_socket', [&$remote_socket]);
 
 		$socket = stream_socket_client($remote_socket, $errno, $errstr, ceil($options['connect_timeout']), STREAM_CLIENT_CONNECT, $context);
 
 		restore_error_handler();
 
 		if ($verifyname && !$this->verify_certificate_from_context($host, $context)) {
-			throw new Requests_Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
+			throw new Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
 		}
 
 		if (!$socket) {
 			if ($errno === 0) {
 				// Connection issue
-				throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
+				throw new Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
 			}
 
-			throw new Requests_Exception($errstr, 'fsockopenerror', null, $errno);
+			throw new Exception($errstr, 'fsockopenerror', null, $errno);
 		}
 
 		$data_format = $options['data_format'];
@@ -145,12 +184,11 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		if ($data_format === 'query') {
 			$path = self::format_get($url_parts, $data);
 			$data = '';
-		}
-		else {
-			$path = self::format_get($url_parts, array());
+		} else {
+			$path = self::format_get($url_parts, []);
 		}
 
-		$options['hooks']->dispatch('fsockopen.remote_host_path', array(&$path, $url));
+		$options['hooks']->dispatch('fsockopen.remote_host_path', [&$path, $url]);
 
 		$request_body = '';
 		$out          = sprintf("%s %s HTTP/%.1F\r\n", $options['type'], $path, $options['protocol_version']);
@@ -158,8 +196,7 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		if ($options['type'] !== Requests::TRACE) {
 			if (is_array($data)) {
 				$request_body = http_build_query($data, '', '&');
-			}
-			else {
+			} else {
 				$request_body = $data;
 			}
 
@@ -177,11 +214,13 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		}
 
 		if (!isset($case_insensitive_headers['Host'])) {
-			$out .= sprintf('Host: %s', $url_parts['host']);
+			$out         .= sprintf('Host: %s', $url_parts['host']);
+			$scheme_lower = strtolower($url_parts['scheme']);
 
-			if ((strtolower($url_parts['scheme']) === 'http' && $url_parts['port'] !== 80) || (strtolower($url_parts['scheme']) === 'https' && $url_parts['port'] !== 443)) {
+			if (($scheme_lower === 'http' && $url_parts['port'] !== Port::HTTP) || ($scheme_lower === 'https' && $url_parts['port'] !== Port::HTTPS)) {
 				$out .= ':' . $url_parts['port'];
 			}
+
 			$out .= "\r\n";
 		}
 
@@ -200,7 +239,7 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 			$out .= implode("\r\n", $headers) . "\r\n";
 		}
 
-		$options['hooks']->dispatch('fsockopen.after_headers', array(&$out));
+		$options['hooks']->dispatch('fsockopen.after_headers', [&$out]);
 
 		if (substr($out, -2) !== "\r\n") {
 			$out .= "\r\n";
@@ -212,25 +251,25 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 
 		$out .= "\r\n" . $request_body;
 
-		$options['hooks']->dispatch('fsockopen.before_send', array(&$out));
+		$options['hooks']->dispatch('fsockopen.before_send', [&$out]);
 
 		fwrite($socket, $out);
-		$options['hooks']->dispatch('fsockopen.after_send', array($out));
+		$options['hooks']->dispatch('fsockopen.after_send', [$out]);
 
 		if (!$options['blocking']) {
 			fclose($socket);
 			$fake_headers = '';
-			$options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
+			$options['hooks']->dispatch('fsockopen.after_request', [&$fake_headers]);
 			return '';
 		}
 
 		$timeout_sec = (int) floor($options['timeout']);
 		if ($timeout_sec === $options['timeout']) {
 			$timeout_msec = 0;
-		}
-		else {
+		} else {
 			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
 		}
+
 		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
 
 		$response   = '';
@@ -241,13 +280,18 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 		$doingbody  = false;
 		$download   = false;
 		if ($options['filename']) {
-			$download = fopen($options['filename'], 'wb');
+			// phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silenced the PHP native warning in favour of throwing an exception.
+			$download = @fopen($options['filename'], 'wb');
+			if ($download === false) {
+				$error = error_get_last();
+				throw new Exception($error['message'], 'fopen');
+			}
 		}
 
 		while (!feof($socket)) {
 			$this->info = stream_get_meta_data($socket);
 			if ($this->info['timed_out']) {
-				throw new Requests_Exception('fsocket timed out', 'timeout');
+				throw new Exception('fsocket timed out', 'timeout');
 			}
 
 			$block = fread($socket, Requests::BUFFER_SIZE);
@@ -261,13 +305,14 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 
 			// Are we in body mode now?
 			if ($doingbody) {
-				$options['hooks']->dispatch('request.progress', array($block, $size, $this->max_bytes));
+				$options['hooks']->dispatch('request.progress', [$block, $size, $this->max_bytes]);
 				$data_length = strlen($block);
 				if ($this->max_bytes) {
 					// Have we already hit a limit?
 					if ($size === $this->max_bytes) {
 						continue;
 					}
+
 					if (($size + $data_length) > $this->max_bytes) {
 						// Limit the length
 						$limited_length = ($this->max_bytes - $size);
@@ -278,49 +323,64 @@ public function request($url, $headers = array(), $data = array(), $options = ar
 				$size += strlen($block);
 				if ($download) {
 					fwrite($download, $block);
-				}
-				else {
+				} else {
 					$body .= $block;
 				}
 			}
 		}
+
 		$this->headers = $headers;
 
 		if ($download) {
 			fclose($download);
-		}
-		else {
+		} else {
 			$this->headers .= "\r\n\r\n" . $body;
 		}
+
 		fclose($socket);
 
-		$options['hooks']->dispatch('fsockopen.after_request', array(&$this->headers, &$this->info));
+		$options['hooks']->dispatch('fsockopen.after_request', [&$this->headers, &$this->info]);
 		return $this->headers;
 	}
 
 	/**
 	 * Send multiple requests simultaneously
 	 *
-	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see Requests_Transport::request}
-	 * @param array $options Global options, see {@see Requests::response()} for documentation
-	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
+	 * @param array $requests Request data (array of 'url', 'headers', 'data', 'options') as per {@see \WpOrg\Requests\Transport::request()}
+	 * @param array $options Global options, see {@see \WpOrg\Requests\Requests::response()} for documentation
+	 * @return array Array of \WpOrg\Requests\Response objects (may contain \WpOrg\Requests\Exception or string responses as well)
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $requests argument is not an array or iterable object with array access.
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $options argument is not an array.
 	 */
 	public function request_multiple($requests, $options) {
-		$responses = array();
+		// If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
+		if (empty($requests)) {
+			return [];
+		}
+
+		if (InputValidator::has_array_access($requests) === false || InputValidator::is_iterable($requests) === false) {
+			throw InvalidArgument::create(1, '$requests', 'array|ArrayAccess&Traversable', gettype($requests));
+		}
+
+		if (is_array($options) === false) {
+			throw InvalidArgument::create(2, '$options', 'array', gettype($options));
+		}
+
+		$responses = [];
 		$class     = get_class($this);
 		foreach ($requests as $id => $request) {
 			try {
 				$handler        = new $class();
 				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
 
-				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
-			}
-			catch (Requests_Exception $e) {
+				$request['options']['hooks']->dispatch('transport.internal.parse_response', [&$responses[$id], $request]);
+			} catch (Exception $e) {
 				$responses[$id] = $e;
 			}
 
 			if (!is_string($responses[$id])) {
-				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
+				$request['options']['hooks']->dispatch('multiple.request.complete', [&$responses[$id], $id]);
 			}
 		}
 
@@ -332,8 +392,8 @@ public function request_multiple($requests, $options) {
 	 *
 	 * @return string Accept-Encoding header value
 	 */
-	protected static function accept_encoding() {
-		$type = array();
+	private static function accept_encoding() {
+		$type = [];
 		if (function_exists('gzinflate')) {
 			$type[] = 'deflate;q=1.0';
 		}
@@ -350,11 +410,11 @@ protected static function accept_encoding() {
 	/**
 	 * Format a URL given GET data
 	 *
-	 * @param array $url_parts
-	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
+	 * @param array        $url_parts Array of URL parts as received from {@link https://www.php.net/parse_url}
+	 * @param array|object $data Data to build query using, see {@link https://www.php.net/http_build_query}
 	 * @return string URL with data
 	 */
-	protected static function format_get($url_parts, $data) {
+	private static function format_get($url_parts, $data) {
 		if (!empty($data)) {
 			if (empty($url_parts['query'])) {
 				$url_parts['query'] = '';
@@ -363,17 +423,17 @@ protected static function format_get($url_parts, $data) {
 			$url_parts['query'] .= '&' . http_build_query($data, '', '&');
 			$url_parts['query']  = trim($url_parts['query'], '&');
 		}
+
 		if (isset($url_parts['path'])) {
 			if (isset($url_parts['query'])) {
 				$get = $url_parts['path'] . '?' . $url_parts['query'];
-			}
-			else {
+			} else {
 				$get = $url_parts['path'];
 			}
-		}
-		else {
+		} else {
 			$get = '/';
 		}
+
 		return $get;
 	}
 
@@ -401,13 +461,14 @@ public function connect_error_handler($errno, $errstr) {
 	 * names, leading things like 'https://www.github.com/' to be invalid.
 	 * Instead
 	 *
-	 * @see https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
+	 * @link https://tools.ietf.org/html/rfc2818#section-3.1 RFC2818, Section 3.1
 	 *
-	 * @throws Requests_Exception On failure to connect via TLS (`fsockopen.ssl.connect_error`)
-	 * @throws Requests_Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
 	 * @param string $host Host name to verify against
 	 * @param resource $context Stream context
 	 * @return bool
+	 *
+	 * @throws \WpOrg\Requests\Exception On failure to connect via TLS (`fsockopen.ssl.connect_error`)
+	 * @throws \WpOrg\Requests\Exception On not obtaining a match for the host (`fsockopen.ssl.no_match`)
 	 */
 	public function verify_certificate_from_context($host, $context) {
 		$meta = stream_context_get_options($context);
@@ -415,35 +476,33 @@ public function verify_certificate_from_context($host, $context) {
 		// If we don't have SSL options, then we couldn't make the connection at
 		// all
 		if (empty($meta) || empty($meta['ssl']) || empty($meta['ssl']['peer_certificate'])) {
-			throw new Requests_Exception(rtrim($this->connect_error), 'ssl.connect_error');
+			throw new Exception(rtrim($this->connect_error), 'ssl.connect_error');
 		}
 
 		$cert = openssl_x509_parse($meta['ssl']['peer_certificate']);
 
-		return Requests_SSL::verify_certificate($host, $cert);
+		return Ssl::verify_certificate($host, $cert);
 	}
 
 	/**
-	 * Whether this transport is valid
+	 * Self-test whether the transport can be used.
+	 *
+	 * The available capabilities to test for can be found in {@see \WpOrg\Requests\Capability}.
 	 *
 	 * @codeCoverageIgnore
-	 * @return boolean True if the transport is valid, false otherwise.
+	 * @param array<string, bool> $capabilities Optional. Associative array of capabilities to test against, i.e. `['<capability>' => true]`.
+	 * @return bool Whether the transport can be used.
 	 */
-	public static function test($capabilities = array()) {
+	public static function test($capabilities = []) {
 		if (!function_exists('fsockopen')) {
 			return false;
 		}
 
 		// If needed, check that streams support SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+		if (isset($capabilities[Capability::SSL]) && $capabilities[Capability::SSL]) {
 			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
 				return false;
 			}
-
-			// Currently broken, thanks to https://github.com/facebook/hhvm/issues/2156
-			if (defined('HHVM_VERSION')) {
-				return false;
-			}
 		}
 
 		return true;
diff --git a/src/wp-includes/Requests/src/Utility/CaseInsensitiveDictionary.php b/src/wp-includes/Requests/src/Utility/CaseInsensitiveDictionary.php
new file mode 100644
index 0000000000000..0e1a914cd64a0
--- /dev/null
+++ b/src/wp-includes/Requests/src/Utility/CaseInsensitiveDictionary.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Case-insensitive dictionary, suitable for HTTP headers
+ *
+ * @package Requests\Utilities
+ */
+
+namespace WpOrg\Requests\Utility;
+
+use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
+use ReturnTypeWillChange;
+use WpOrg\Requests\Exception;
+
+/**
+ * Case-insensitive dictionary, suitable for HTTP headers
+ *
+ * @package Requests\Utilities
+ */
+class CaseInsensitiveDictionary implements ArrayAccess, IteratorAggregate {
+	/**
+	 * Actual item data
+	 *
+	 * @var array
+	 */
+	protected $data = [];
+
+	/**
+	 * Creates a case insensitive dictionary.
+	 *
+	 * @param array $data Dictionary/map to convert to case-insensitive
+	 */
+	public function __construct(array $data = []) {
+		foreach ($data as $offset => $value) {
+			$this->offsetSet($offset, $value);
+		}
+	}
+
+	/**
+	 * Check if the given item exists
+	 *
+	 * @param string $offset Item key
+	 * @return boolean Does the item exist?
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetExists($offset) {
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		return isset($this->data[$offset]);
+	}
+
+	/**
+	 * Get the value for the item
+	 *
+	 * @param string $offset Item key
+	 * @return string|null Item value (null if the item key doesn't exist)
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetGet($offset) {
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		if (!isset($this->data[$offset])) {
+			return null;
+		}
+
+		return $this->data[$offset];
+	}
+
+	/**
+	 * Set the given item
+	 *
+	 * @param string $offset Item name
+	 * @param string $value Item value
+	 *
+	 * @throws \WpOrg\Requests\Exception On attempting to use dictionary as list (`invalidset`)
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetSet($offset, $value) {
+		if ($offset === null) {
+			throw new Exception('Object is a dictionary, not a list', 'invalidset');
+		}
+
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		$this->data[$offset] = $value;
+	}
+
+	/**
+	 * Unset the given header
+	 *
+	 * @param string $offset The key for the item to unset.
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetUnset($offset) {
+		if (is_string($offset)) {
+			$offset = strtolower($offset);
+		}
+
+		unset($this->data[$offset]);
+	}
+
+	/**
+	 * Get an iterator for the data
+	 *
+	 * @return \ArrayIterator
+	 */
+	#[ReturnTypeWillChange]
+	public function getIterator() {
+		return new ArrayIterator($this->data);
+	}
+
+	/**
+	 * Get the headers as an array
+	 *
+	 * @return array Header data
+	 */
+	public function getAll() {
+		return $this->data;
+	}
+}
diff --git a/src/wp-includes/Requests/src/Utility/FilteredIterator.php b/src/wp-includes/Requests/src/Utility/FilteredIterator.php
new file mode 100644
index 0000000000000..4865966c41e9b
--- /dev/null
+++ b/src/wp-includes/Requests/src/Utility/FilteredIterator.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Iterator for arrays requiring filtered values
+ *
+ * @package Requests\Utilities
+ */
+
+namespace WpOrg\Requests\Utility;
+
+use ArrayIterator;
+use ReturnTypeWillChange;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\InputValidator;
+
+/**
+ * Iterator for arrays requiring filtered values
+ *
+ * @package Requests\Utilities
+ */
+final class FilteredIterator extends ArrayIterator {
+	/**
+	 * Callback to run as a filter
+	 *
+	 * @var callable
+	 */
+	private $callback;
+
+	/**
+	 * Create a new iterator
+	 *
+	 * @param array    $data     The array or object to be iterated on.
+	 * @param callable $callback Callback to be called on each value
+	 *
+	 * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data argument is not iterable.
+	 */
+	public function __construct($data, $callback) {
+		if (InputValidator::is_iterable($data) === false) {
+			throw InvalidArgument::create(1, '$data', 'iterable', gettype($data));
+		}
+
+		parent::__construct($data);
+
+		if (is_callable($callback)) {
+			$this->callback = $callback;
+		}
+	}
+
+	/**
+	 * Prevent unserialization of the object for security reasons.
+	 *
+	 * @phpcs:disable PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound
+	 *
+	 * @param array $data Restored array of data originally serialized.
+	 *
+	 * @return void
+	 */
+	#[ReturnTypeWillChange]
+	public function __unserialize($data) {}
+	// phpcs:enable
+
+	/**
+	 * Perform reinitialization tasks.
+	 *
+	 * Prevents a callback from being injected during unserialization of an object.
+	 *
+	 * @return void
+	 */
+	public function __wakeup() {
+		unset($this->callback);
+	}
+
+	/**
+	 * Get the current item's value after filtering
+	 *
+	 * @return string
+	 */
+	#[ReturnTypeWillChange]
+	public function current() {
+		$value = parent::current();
+
+		if (is_callable($this->callback)) {
+			$value = call_user_func($this->callback, $value);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Prevent creating a PHP value from a stored representation of the object for security reasons.
+	 *
+	 * @param string $data The serialized string.
+	 *
+	 * @return void
+	 */
+	#[ReturnTypeWillChange]
+	public function unserialize($data) {}
+}
diff --git a/src/wp-includes/Requests/src/Utility/InputValidator.php b/src/wp-includes/Requests/src/Utility/InputValidator.php
new file mode 100644
index 0000000000000..7c10d61a4b24b
--- /dev/null
+++ b/src/wp-includes/Requests/src/Utility/InputValidator.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Input validation utilities.
+ *
+ * @package Requests\Utilities
+ */
+
+namespace WpOrg\Requests\Utility;
+
+use ArrayAccess;
+use CurlHandle;
+use Traversable;
+
+/**
+ * Input validation utilities.
+ *
+ * @package Requests\Utilities
+ */
+final class InputValidator {
+
+	/**
+	 * Verify that a received input parameter is of type string or is "stringable".
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function is_string_or_stringable($input) {
+		return is_string($input) || self::is_stringable_object($input);
+	}
+
+	/**
+	 * Verify whether a received input parameter is usable as an integer array key.
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function is_numeric_array_key($input) {
+		if (is_int($input)) {
+			return true;
+		}
+
+		if (!is_string($input)) {
+			return false;
+		}
+
+		return (bool) preg_match('`^-?[0-9]+$`', $input);
+	}
+
+	/**
+	 * Verify whether a received input parameter is "stringable".
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function is_stringable_object($input) {
+		return is_object($input) && method_exists($input, '__toString');
+	}
+
+	/**
+	 * Verify whether a received input parameter is _accessible as if it were an array_.
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function has_array_access($input) {
+		return is_array($input) || $input instanceof ArrayAccess;
+	}
+
+	/**
+	 * Verify whether a received input parameter is "iterable".
+	 *
+	 * @internal The PHP native `is_iterable()` function was only introduced in PHP 7.1
+	 * and this library still supports PHP 5.6.
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function is_iterable($input) {
+		return is_array($input) || $input instanceof Traversable;
+	}
+
+	/**
+	 * Verify whether a received input parameter is a Curl handle.
+	 *
+	 * The PHP Curl extension worked with resources prior to PHP 8.0 and with
+	 * an instance of the `CurlHandle` class since PHP 8.0.
+	 * {@link https://www.php.net/manual/en/migration80.incompatible.php#migration80.incompatible.resource2object}
+	 *
+	 * @param mixed $input Input parameter to verify.
+	 *
+	 * @return bool
+	 */
+	public static function is_curl_handle($input) {
+		if (is_resource($input)) {
+			return get_resource_type($input) === 'curl';
+		}
+
+		if (is_object($input)) {
+			return $input instanceof CurlHandle;
+		}
+
+		return false;
+	}
+}
diff --git a/src/wp-includes/Text/Diff.php b/src/wp-includes/Text/Diff.php
index 6f76278c5a1b1..40dba1a4a37cf 100644
--- a/src/wp-includes/Text/Diff.php
+++ b/src/wp-includes/Text/Diff.php
@@ -10,7 +10,7 @@
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @package Text_Diff
  * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
diff --git a/src/wp-includes/Text/Diff/Engine/native.php b/src/wp-includes/Text/Diff/Engine/native.php
index 5824329b7fc2c..b3d8441a583dd 100644
--- a/src/wp-includes/Text/Diff/Engine/native.php
+++ b/src/wp-includes/Text/Diff/Engine/native.php
@@ -6,7 +6,7 @@
  *
  * The algorithm used here is mostly lifted from the perl module
  * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
- * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
+ * https://cpan.metacpan.org/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
  *
  * More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html
  *
@@ -21,13 +21,23 @@
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @author  Geoffrey T. Dairiki <dairiki@dairiki.org>
  * @package Text_Diff
  */
 class Text_Diff_Engine_native {
 
+    public $xchanged;
+    public $ychanged;
+    public $xv;
+    public $yv;
+    public $xind;
+    public $yind;
+    public $seq;
+    public $in_seq;
+    public $lcs;
+
     function diff($from_lines, $to_lines)
     {
         array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
diff --git a/src/wp-includes/Text/Diff/Engine/shell.php b/src/wp-includes/Text/Diff/Engine/shell.php
index a2ccc70db85ce..545ac34a6fc40 100644
--- a/src/wp-includes/Text/Diff/Engine/shell.php
+++ b/src/wp-includes/Text/Diff/Engine/shell.php
@@ -8,7 +8,7 @@
  * Copyright 2007-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @author  Milian Wolff <mail@milianw.de>
  * @package Text_Diff
diff --git a/src/wp-includes/Text/Diff/Engine/string.php b/src/wp-includes/Text/Diff/Engine/string.php
index 76a111158cf70..74990d67778da 100644
--- a/src/wp-includes/Text/Diff/Engine/string.php
+++ b/src/wp-includes/Text/Diff/Engine/string.php
@@ -14,7 +14,7 @@
  * Copyright 2005-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @author  Örjan Persson <o@42mm.org>
  * @package Text_Diff
diff --git a/src/wp-includes/Text/Diff/Engine/xdiff.php b/src/wp-includes/Text/Diff/Engine/xdiff.php
index 02ce848078e52..d09307d8d52d0 100644
--- a/src/wp-includes/Text/Diff/Engine/xdiff.php
+++ b/src/wp-includes/Text/Diff/Engine/xdiff.php
@@ -8,7 +8,7 @@
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @author  Jon Parise <jon@horde.org>
  * @package Text_Diff
diff --git a/src/wp-includes/Text/Diff/Renderer.php b/src/wp-includes/Text/Diff/Renderer.php
index 712d985a8e65f..2417670aef062 100644
--- a/src/wp-includes/Text/Diff/Renderer.php
+++ b/src/wp-includes/Text/Diff/Renderer.php
@@ -8,7 +8,7 @@
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @package Text_Diff
  */
diff --git a/src/wp-includes/Text/Diff/Renderer/inline.php b/src/wp-includes/Text/Diff/Renderer/inline.php
index 392bd57cff5d4..52444f897551b 100644
--- a/src/wp-includes/Text/Diff/Renderer/inline.php
+++ b/src/wp-includes/Text/Diff/Renderer/inline.php
@@ -5,7 +5,7 @@
  * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
+ * not receive this file, see https://opensource.org/license/lgpl-2-1/.
  *
  * @author  Ciprian Popovici
  * @package Text_Diff
diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
index 19322a3451f11..d1d438d9e5843 100644
--- a/src/wp-includes/admin-bar.php
+++ b/src/wp-includes/admin-bar.php
@@ -41,7 +41,7 @@ function _wp_admin_bar_init() {
 	 */
 	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
 	if ( class_exists( $admin_bar_class ) ) {
-		$wp_admin_bar = new $admin_bar_class;
+		$wp_admin_bar = new $admin_bar_class();
 	} else {
 		return false;
 	}
@@ -122,16 +122,22 @@ function wp_admin_bar_render() {
  */
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 	if ( current_user_can( 'read' ) ) {
-		$about_url = self_admin_url( 'about.php' );
+		$about_url      = self_admin_url( 'about.php' );
+		$contribute_url = self_admin_url( 'contribute.php' );
 	} elseif ( is_multisite() ) {
-		$about_url = get_dashboard_url( get_current_user_id(), 'about.php' );
+		$about_url      = get_dashboard_url( get_current_user_id(), 'about.php' );
+		$contribute_url = get_dashboard_url( get_current_user_id(), 'contribute.php' );
 	} else {
-		$about_url = false;
+		$about_url      = false;
+		$contribute_url = false;
 	}
 
 	$wp_logo_menu_args = array(
 		'id'    => 'wp-logo',
-		'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
+		'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' .
+				/* translators: Hidden accessibility text. */
+				__( 'About WordPress' ) .
+			'</span>',
 		'href'  => $about_url,
 	);
 
@@ -156,6 +162,18 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 		);
 	}
 
+	if ( $contribute_url ) {
+		// Add contribute link.
+		$wp_admin_bar->add_node(
+			array(
+				'parent' => 'wp-logo',
+				'id'     => 'contribute',
+				'title'  => __( 'Get Involved' ),
+				'href'   => $contribute_url,
+			)
+		);
+	}
+
 	// Add WordPress.org link.
 	$wp_admin_bar->add_node(
 		array(
@@ -172,7 +190,7 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 			'parent' => 'wp-logo-external',
 			'id'     => 'documentation',
 			'title'  => __( 'Documentation' ),
-			'href'   => __( 'https://wordpress.org/support/' ),
+			'href'   => __( 'https://wordpress.org/documentation/' ),
 		)
 	);
 
@@ -209,7 +227,10 @@ function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 		$wp_admin_bar->add_node(
 			array(
 				'id'    => 'menu-toggle',
-				'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+				'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' .
+						/* translators: Hidden accessibility text. */
+						__( 'Menu' ) .
+					'</span>',
 				'href'  => '#',
 			)
 		);
@@ -413,9 +434,14 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
  *
  * @since 5.9.0
  *
+ * @global string $_wp_current_template_id
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
+ *
  * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+	global $_wp_current_template_id;
+
 	// Don't show if a block theme is not activated.
 	if ( ! wp_is_block_theme() ) {
 		return;
@@ -430,7 +456,13 @@ function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
 		array(
 			'id'    => 'site-editor',
 			'title' => __( 'Edit site' ),
-			'href'  => admin_url( 'site-editor.php' ),
+			'href'  => add_query_arg(
+				array(
+					'postType' => 'wp_template',
+					'postId'   => $_wp_current_template_id,
+				),
+				admin_url( 'site-editor.php' )
+			),
 		)
 	);
 }
@@ -865,7 +897,7 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 					)
 				);
 			}
-		} elseif ( is_a( $current_object, 'WP_User' ) && current_user_can( 'edit_user', $current_object->ID ) ) {
+		} elseif ( $current_object instanceof WP_User && current_user_can( 'edit_user', $current_object->ID ) ) {
 			$edit_user_link = get_edit_user_link( $current_object->ID );
 			if ( $edit_user_link ) {
 				$wp_admin_bar->add_node(
@@ -971,7 +1003,7 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 	$awaiting_mod  = wp_count_comments();
 	$awaiting_mod  = $awaiting_mod->moderated;
 	$awaiting_text = sprintf(
-		/* translators: %s: Number of comments. */
+		/* translators: Hidden accessibility text. %s: Number of comments. */
 		_n( '%s Comment in moderation', '%s Comments in moderation', $awaiting_mod ),
 		number_format_i18n( $awaiting_mod )
 	);
@@ -1046,7 +1078,7 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 			array(
 				'parent' => 'appearance',
 				'id'     => 'background',
-				'title'  => __( 'Background' ),
+				'title'  => _x( 'Background', 'custom background' ),
 				'href'   => admin_url( 'themes.php?page=custom-background' ),
 				'meta'   => array(
 					'class' => 'hide-if-customize',
@@ -1060,7 +1092,7 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 			array(
 				'parent' => 'appearance',
 				'id'     => 'header',
-				'title'  => __( 'Header' ),
+				'title'  => _x( 'Header', 'custom image header' ),
 				'href'   => admin_url( 'themes.php?page=custom-header' ),
 				'meta'   => array(
 					'class' => 'hide-if-customize',
@@ -1087,7 +1119,7 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 	}
 
 	$updates_text = sprintf(
-		/* translators: %s: Total number of updates available. */
+		/* translators: Hidden accessibility text. %s: Total number of updates available. */
 		_n( '%s update available', '%s updates available', $update_data['counts']['total'] ),
 		number_format_i18n( $update_data['counts']['total'] )
 	);
@@ -1119,7 +1151,10 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
 
 	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
-	$form .= '<label for="adminbar-search" class="screen-reader-text">' . __( 'Search' ) . '</label>';
+	$form .= '<label for="adminbar-search" class="screen-reader-text">' .
+			/* translators: Hidden accessibility text. */
+			__( 'Search' ) .
+		'</label>';
 	$form .= '<input type="submit" class="adminbar-button" value="' . __( 'Search' ) . '" />';
 	$form .= '</form>';
 
diff --git a/src/wp-includes/assets/script-loader-packages.min.php b/src/wp-includes/assets/script-loader-packages.min.php
index ee29f479925b6..5e2fc87fa6349 100644
--- a/src/wp-includes/assets/script-loader-packages.min.php
+++ b/src/wp-includes/assets/script-loader-packages.min.php
@@ -1 +1 @@
-<?php return array('a11y.min.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'ecce20f002eda4c19664'), 'annotations.min.js' => array('dependencies' => array('wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '1720fc5d5c76f53a1740'), 'api-fetch.min.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'bc0029ca2c943aec5311'), 'autop.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '43197d709df445ccf849'), 'blob.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'a078f260190acf405764'), 'block-directory.min.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '000a47d4ebe2ceac3593'), 'block-editor.min.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-shortcode', 'wp-style-engine', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => 'd39738cb7c1202964677'), 'block-library.min.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport'), 'version' => 'e005fd256a910edf8c87'), 'block-serialization-default-parser.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'eb2cdc8cd7a7975d49d9'), 'blocks.min.js' => array('dependencies' => array('lodash', 'wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-shortcode'), 'version' => '69022aed79bfd45b3b1d'), 'components.min.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-warning'), 'version' => '57b49a5bb19d1f1d566a'), 'compose.min.js' => array('dependencies' => array('lodash', 'react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '37228270687b2a94e518'), 'core-data.min.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-url'), 'version' => 'd8d458b31912f858bcdf'), 'customize-widgets.min.js' => array('dependencies' => array('lodash', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-widgets'), 'version' => '1fddf6d27e5c3aeddd54'), 'data.min.js' => array('dependencies' => array('lodash', 'react', 'wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-redux-routine'), 'version' => 'd8cf5b24f99c64ae47d6'), 'data-controls.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => 'e10d473d392daa8501e8'), 'date.min.js' => array('dependencies' => array('moment', 'wp-deprecated', 'wp-polyfill'), 'version' => 'ce7daf24092d87ff18be'), 'deprecated.min.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '6c963cb9494ba26b77eb'), 'dom.min.js' => array('dependencies' => array('wp-deprecated', 'wp-polyfill'), 'version' => '133a042fbbef48f38107'), 'dom-ready.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '392bdd43726760d1f3ca'), 'edit-post.min.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-url', 'wp-viewport', 'wp-warning'), 'version' => '2baffbeec6cbe5171dee'), 'edit-site.min.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-style-engine', 'wp-url', 'wp-viewport'), 'version' => 'c987f9377a6156968875'), 'edit-widgets.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => 'f920c6385e705b28f823'), 'editor.min.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => 'c9102d37531f38da0681'), 'element.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '47162ff4492c7ec4956b'), 'escape-html.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '03e27a7b6ae14f7afaa6'), 'format-library.min.js' => array('dependencies' => array('wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => '57876a359eac66da202b'), 'hooks.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4169d3cf8e8d95a3d6d5'), 'html-entities.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '36a4a255da7dd2e1bf8e'), 'i18n.min.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => '9e794f35a71bb98672ae'), 'is-shallow-equal.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '20c2b06ecf04afb14fee'), 'keyboard-shortcuts.min.js' => array('dependencies' => array('wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => 'b696c16720133edfc065'), 'keycodes.min.js' => array('dependencies' => array('lodash', 'wp-i18n', 'wp-polyfill'), 'version' => '6e0aadc0106bd8aadc89'), 'list-reusable-blocks.min.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'f97bc9cc3a1cd21b8c8e'), 'media-utils.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '17f6455b0630582352a4'), 'notices.min.js' => array('dependencies' => array('wp-data', 'wp-polyfill'), 'version' => '9c1575b7a31659f45a45'), 'nux.min.js' => array('dependencies' => array('wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '038c48e26a91639ae8ab'), 'plugins.min.js' => array('dependencies' => array('wp-compose', 'wp-element', 'wp-hooks', 'wp-polyfill', 'wp-primitives'), 'version' => '0d1b90278bae7df6ecf9'), 'preferences.min.js' => array('dependencies' => array('wp-a11y', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '5e6c91c252c0e040f379'), 'preferences-persistence.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-polyfill'), 'version' => 'c5543628aa7ff5bd5be4'), 'primitives.min.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => 'ae0bece54c0487c976b1'), 'priority-queue.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '99e325da95c5a35c7dc2'), 'redux-routine.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'c9ea6c0df793258797e6'), 'reusable-blocks.min.js' => array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '3fb4b31e589a583a362e'), 'rich-text.min.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'c704284bebe26cf1dd51'), 'server-side-render.min.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => 'ba8027ee85d65ae23ec7'), 'shortcode.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '7539044b04e6bca57f2e'), 'style-engine.min.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '10341d6e6decffab850e'), 'token-list.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f2cf0bb3ae80de227e43'), 'url.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'bb0ef862199bcae73aa7'), 'viewport.min.js' => array('dependencies' => array('lodash', 'wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => 'a9868d184d07e4c94fe4'), 'warning.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4acee5fc2fd9a24cefc2'), 'widgets.min.js' => array('dependencies' => array('lodash', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => 'ec7c547bc8a579c6061e'), 'wordcount.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'feb9569307aec24292f2'));
+<?php return array('a11y.min.js' => array('dependencies' => array('wp-dom-ready', 'wp-i18n', 'wp-polyfill'), 'version' => 'd90eebea464f6c09bfd5'), 'annotations.min.js' => array('dependencies' => array('wp-data', 'wp-hooks', 'wp-i18n', 'wp-polyfill', 'wp-rich-text'), 'version' => '682c9579f554fb26b1de'), 'api-fetch.min.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '7adefb5a2462c9794332'), 'autop.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '9fb50649848277dd318d'), 'blob.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '4839ed746deca49ab64b'), 'block-directory.min.js' => array('dependencies' => array('wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '15746e52461d865c4773'), 'block-editor.min.js' => array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-shortcode', 'wp-style-engine', 'wp-token-list', 'wp-url', 'wp-warning', 'wp-wordcount'), 'version' => '50289c74b4b091cfd1c4'), 'block-library.min.js' => array('dependencies' => array('lodash', 'wp-a11y', 'wp-api-fetch', 'wp-autop', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keycodes', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-viewport', 'wp-wordcount'), 'version' => '085d8b8e8d69ddfd24ca'), 'block-serialization-default-parser.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '14d44daebf663d05d330'), 'blocks.min.js' => array('dependencies' => array('wp-autop', 'wp-blob', 'wp-block-serialization-default-parser', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-private-apis', 'wp-shortcode'), 'version' => 'd77a87425593989916ed'), 'commands.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-polyfill', 'wp-private-apis'), 'version' => 'dd209c644927a527bbec'), 'components.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-a11y', 'wp-compose', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-rich-text', 'wp-warning'), 'version' => '0d4df8a554f1e01081cd'), 'compose.min.js' => array('dependencies' => array('react', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-is-shallow-equal', 'wp-keycodes', 'wp-polyfill', 'wp-priority-queue'), 'version' => '972bf65932d961478d57'), 'core-commands.min.js' => array('dependencies' => array('wp-commands', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-router', 'wp-url'), 'version' => 'b4701b8c2c63bed53182'), 'core-data.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-private-apis', 'wp-url'), 'version' => 'f6f0d082816872e05b7f'), 'customize-widgets.min.js' => array('dependencies' => array('wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-is-shallow-equal', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-widgets'), 'version' => 'ae6ac53966bc3989caf4'), 'data.min.js' => array('dependencies' => array('wp-compose', 'wp-deprecated', 'wp-element', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-priority-queue', 'wp-private-apis', 'wp-redux-routine'), 'version' => 'eae78311d25d2417dd78'), 'data-controls.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-data', 'wp-deprecated', 'wp-polyfill'), 'version' => '49f5587e8b90f9e7cc7e'), 'date.min.js' => array('dependencies' => array('moment', 'wp-deprecated', 'wp-polyfill'), 'version' => '797289f1929aa2fae953'), 'deprecated.min.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'e1f84915c5e8ae38964c'), 'dom.min.js' => array('dependencies' => array('wp-deprecated', 'wp-polyfill'), 'version' => '47f4b3d423b82287e35d'), 'dom-ready.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'f77871ff7694fffea381'), 'edit-post.min.js' => array('dependencies' => array('wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-url', 'wp-viewport', 'wp-warning', 'wp-widgets'), 'version' => '27b0fcb497dc1eb97006'), 'edit-site.min.js' => array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-commands', 'wp-components', 'wp-compose', 'wp-core-commands', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-editor', 'wp-element', 'wp-escape-html', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-reusable-blocks', 'wp-router', 'wp-url', 'wp-viewport', 'wp-widgets', 'wp-wordcount'), 'version' => 'af73bfa4190785230d09'), 'edit-widgets.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-reusable-blocks', 'wp-url', 'wp-viewport', 'wp-widgets'), 'version' => '65427b90fd0c6b1c1b60'), 'editor.min.js' => array('dependencies' => array('react', 'wp-a11y', 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-deprecated', 'wp-dom', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-keyboard-shortcuts', 'wp-keycodes', 'wp-media-utils', 'wp-notices', 'wp-polyfill', 'wp-preferences', 'wp-primitives', 'wp-private-apis', 'wp-reusable-blocks', 'wp-rich-text', 'wp-server-side-render', 'wp-url', 'wp-wordcount'), 'version' => '5bacab2f68a10d19f608'), 'element.min.js' => array('dependencies' => array('react', 'react-dom', 'wp-escape-html', 'wp-polyfill'), 'version' => '9c7e1c05c67e37a69170'), 'escape-html.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '6561a406d2d232a6fbd2'), 'format-library.min.js' => array('dependencies' => array('wp-a11y', 'wp-block-editor', 'wp-components', 'wp-data', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-polyfill', 'wp-primitives', 'wp-rich-text', 'wp-url'), 'version' => 'ee67175866c471628198'), 'hooks.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '2810c76e705dd1a53b18'), 'html-entities.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '2cd3358363e0675638fb'), 'i18n.min.js' => array('dependencies' => array('wp-hooks', 'wp-polyfill'), 'version' => 'aee497d955fe7a29a7d6'), 'is-shallow-equal.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'e0f9f1d78d83f5196979'), 'keyboard-shortcuts.min.js' => array('dependencies' => array('wp-data', 'wp-element', 'wp-keycodes', 'wp-polyfill'), 'version' => 'd7a04a89146882813a1d'), 'keycodes.min.js' => array('dependencies' => array('wp-i18n', 'wp-polyfill'), 'version' => '7e17818b141ff8f0eb95'), 'list-reusable-blocks.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-components', 'wp-compose', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '6f61c2dc8619bb065454'), 'media-utils.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-blob', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '3725b3cbc9d67853fce2'), 'notices.min.js' => array('dependencies' => array('wp-data', 'wp-polyfill'), 'version' => '673a68a7ac2f556ed50b'), 'nux.min.js' => array('dependencies' => array('wp-components', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '891d09ac9ffb76e20107'), 'plugins.min.js' => array('dependencies' => array('wp-compose', 'wp-element', 'wp-hooks', 'wp-is-shallow-equal', 'wp-polyfill', 'wp-primitives'), 'version' => '8d8028769b73d89786e2'), 'preferences.min.js' => array('dependencies' => array('wp-a11y', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '2cbf4a1104ebd69652a8'), 'preferences-persistence.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-polyfill'), 'version' => '5171fd253f5534917b6c'), 'primitives.min.js' => array('dependencies' => array('wp-element', 'wp-polyfill'), 'version' => '1d3aa967b00fb37887a9'), 'priority-queue.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '391948bb0355121a7f52'), 'private-apis.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '55dfab9f13a5554dce56'), 'redux-routine.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '72ec9ed71190c996fe2e'), 'reusable-blocks.min.js' => array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives', 'wp-private-apis', 'wp-url'), 'version' => 'b87c3ffc8741b3b1c546'), 'rich-text.min.js' => array('dependencies' => array('wp-a11y', 'wp-compose', 'wp-data', 'wp-deprecated', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-keycodes', 'wp-polyfill'), 'version' => 'a0562bca55261ca1df5d'), 'router.min.js' => array('dependencies' => array('wp-element', 'wp-polyfill', 'wp-private-apis', 'wp-url'), 'version' => 'cd28266aa30e2c9b5ace'), 'server-side-render.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-url'), 'version' => '11791fb851599a57f732'), 'shortcode.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => 'b7747eee0efafd2f0c3b'), 'style-engine.min.js' => array('dependencies' => array('lodash', 'wp-polyfill'), 'version' => '461efc828aecd54b2ded'), 'token-list.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '05f8a6df6258f0081718'), 'url.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '2f2f8174a8336b08dbd8'), 'viewport.min.js' => array('dependencies' => array('wp-compose', 'wp-data', 'wp-element', 'wp-polyfill'), 'version' => '8222fccb0a9b934986c5'), 'warning.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '417316bc721869f879e4'), 'widgets.min.js' => array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-polyfill', 'wp-primitives'), 'version' => 'c6d0bd07e3eebf0d82d6'), 'wordcount.min.js' => array('dependencies' => array('wp-polyfill'), 'version' => '55d8c2bf3dc99e7ea5ec'));
diff --git a/src/wp-includes/author-template.php b/src/wp-includes/author-template.php
index b4c344dcbc66b..184d7d0f38954 100644
--- a/src/wp-includes/author-template.php
+++ b/src/wp-includes/author-template.php
@@ -14,11 +14,12 @@
  * Retrieves the author of the current post.
  *
  * @since 1.5.0
+ * @since 6.3.0 Returns an empty string if the author's display name is unknown.
  *
  * @global WP_User $authordata The current author's data.
  *
  * @param string $deprecated Deprecated.
- * @return string|null The author's display name.
+ * @return string The author's display name, empty string if unknown.
  */
 function get_the_author( $deprecated = '' ) {
 	global $authordata;
@@ -32,9 +33,9 @@ function get_the_author( $deprecated = '' ) {
 	 *
 	 * @since 2.9.0
 	 *
-	 * @param string|null $display_name The author's display name.
+	 * @param string $display_name The author's display name.
 	 */
-	return apply_filters( 'the_author', is_object( $authordata ) ? $authordata->display_name : null );
+	return apply_filters( 'the_author', is_object( $authordata ) ? $authordata->display_name : '' );
 }
 
 /**
@@ -55,7 +56,7 @@ function get_the_author( $deprecated = '' ) {
  *
  * @param string $deprecated      Deprecated.
  * @param bool   $deprecated_echo Deprecated. Use get_the_author(). Echo the string or return it.
- * @return string|null The author's display name, from get_the_author().
+ * @return string The author's display name, from get_the_author().
  */
 function the_author( $deprecated = '', $deprecated_echo = true ) {
 	if ( ! empty( $deprecated ) ) {
@@ -155,7 +156,7 @@ function the_modified_author() {
  * @global WP_User $authordata The current author's data.
  *
  * @param string    $field   Optional. The user field to retrieve. Default empty.
- * @param int|false $user_id Optional. User ID.
+ * @param int|false $user_id Optional. User ID. Defaults to the current post author.
  * @return string The author's field from the current author's DB object, otherwise an empty string.
  */
 function get_the_author_meta( $field = '', $user_id = false ) {
@@ -196,7 +197,7 @@ function get_the_author_meta( $field = '', $user_id = false ) {
  *
  * @param string    $field   Selects the field of the users record. See get_the_author_meta()
  *                           for the list of possible fields.
- * @param int|false $user_id Optional. User ID.
+ * @param int|false $user_id Optional. User ID. Defaults to the current post author.
  *
  * @see get_the_author_meta()
  */
@@ -219,15 +220,15 @@ function the_author_meta( $field = '', $user_id = false ) {
 /**
  * Retrieves either author's link or author's name.
  *
- * If the author has a home page set, return an HTML link, otherwise just return the
- * author's name.
+ * If the author has a home page set, return an HTML link, otherwise just return
+ * the author's name.
  *
  * @since 3.0.0
  *
  * @global WP_User $authordata The current author's data.
  *
- * @return string|null An HTML link if the author's url exist in user meta,
- *                     else the result of get_the_author().
+ * @return string An HTML link if the author's URL exists in user meta,
+ *                otherwise the result of get_the_author().
  */
 function get_the_author_link() {
 	if ( get_the_author_meta( 'url' ) ) {
@@ -307,10 +308,11 @@ function the_author_posts() {
  *
  * @global WP_User $authordata The current author's data.
  *
- * @return string An HTML link to the author page, or an empty string if $authordata isn't defined.
+ * @return string An HTML link to the author page, or an empty string if $authordata is not set.
  */
 function get_the_author_posts_link() {
 	global $authordata;
+
 	if ( ! is_object( $authordata ) ) {
 		return '';
 	}
@@ -481,14 +483,15 @@ function wp_list_authors( $args = '' ) {
 	$post_counts = apply_filters( 'pre_wp_list_authors_post_counts_query', false, $parsed_args );
 
 	if ( ! is_array( $post_counts ) ) {
-		$post_counts = $wpdb->get_results(
+		$post_counts       = array();
+		$post_counts_query = $wpdb->get_results(
 			"SELECT DISTINCT post_author, COUNT(ID) AS count
 			FROM $wpdb->posts
 			WHERE " . get_private_posts_cap_sql( 'post' ) . '
 			GROUP BY post_author'
 		);
 
-		foreach ( (array) $post_counts as $row ) {
+		foreach ( (array) $post_counts_query as $row ) {
 			$post_counts[ $row->post_author ] = $row->count;
 		}
 	}
diff --git a/src/wp-includes/block-editor.php b/src/wp-includes/block-editor.php
index 1c67e6cc7af27..015a553f57b90 100644
--- a/src/wp-includes/block-editor.php
+++ b/src/wp-includes/block-editor.php
@@ -11,6 +11,7 @@
  * Returns the list of default categories for block types.
  *
  * @since 5.8.0
+ * @since 6.3.0 Reusable Blocks renamed to Patterns.
  *
  * @return array[] Array of categories for block types.
  */
@@ -48,7 +49,7 @@ function get_default_block_categories() {
 		),
 		array(
 			'slug'  => 'reusable',
-			'title' => _x( 'Reusable Blocks', 'block category' ),
+			'title' => _x( 'Patterns', 'block category' ),
 			'icon'  => null,
 		),
 	);
@@ -153,9 +154,14 @@ function get_allowed_block_types( $block_editor_context ) {
  */
 function get_default_block_editor_settings() {
 	// Media settings.
-	$max_upload_size = wp_max_upload_size();
-	if ( ! $max_upload_size ) {
-		$max_upload_size = 0;
+
+	// wp_max_upload_size() can be expensive, so only call it when relevant for the current user.
+	$max_upload_size = 0;
+	if ( current_user_can( 'upload_files' ) ) {
+		$max_upload_size = wp_max_upload_size();
+		if ( ! $max_upload_size ) {
+			$max_upload_size = 0;
+		}
 	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
@@ -211,13 +217,6 @@ function get_default_block_editor_settings() {
 		'allowedMimeTypes'                 => get_allowed_mime_types(),
 		'defaultEditorStyles'              => $default_editor_styles,
 		'blockCategories'                  => get_default_block_categories(),
-		'disableCustomColors'              => get_theme_support( 'disable-custom-colors' ),
-		'disableCustomFontSizes'           => get_theme_support( 'disable-custom-font-sizes' ),
-		'disableCustomGradients'           => get_theme_support( 'disable-custom-gradients' ),
-		'disableLayoutStyles'              => get_theme_support( 'disable-layout-styles' ),
-		'enableCustomLineHeight'           => get_theme_support( 'custom-line-height' ),
-		'enableCustomSpacing'              => get_theme_support( 'custom-spacing' ),
-		'enableCustomUnits'                => get_theme_support( 'custom-units' ),
 		'isRTL'                            => is_rtl(),
 		'imageDefaultSize'                 => $image_default_size,
 		'imageDimensions'                  => $image_dimensions,
@@ -228,20 +227,9 @@ function get_default_block_editor_settings() {
 		'__unstableGalleryWithImageBlocks' => true,
 	);
 
-	// Theme settings.
-	$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
-	if ( false !== $color_palette ) {
-		$editor_settings['colors'] = $color_palette;
-	}
-
-	$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
-	if ( false !== $font_sizes ) {
-		$editor_settings['fontSizes'] = $font_sizes;
-	}
-
-	$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
-	if ( false !== $gradient_presets ) {
-		$editor_settings['gradients'] = $gradient_presets;
+	$theme_settings = get_classic_theme_supports_block_editor_settings();
+	foreach ( $theme_settings as $key => $value ) {
+		$editor_settings[ $key ] = $value;
 	}
 
 	return $editor_settings;
@@ -299,7 +287,9 @@ function get_legacy_widget_block_editor_settings() {
  * @since 6.0.0
  * @access private
  *
- * @global string $pagenow The filename of the current screen.
+ * @global string     $pagenow    The filename of the current screen.
+ * @global WP_Styles  $wp_styles  The WP_Styles current instance.
+ * @global WP_Scripts $wp_scripts The WP_Scripts current instance.
  *
  * @return array {
  *     The block editor assets.
@@ -309,68 +299,171 @@ function get_legacy_widget_block_editor_settings() {
  * }
  */
 function _wp_get_iframed_editor_assets() {
-	global $pagenow;
+	global $wp_styles, $wp_scripts, $pagenow;
 
-	$script_handles = array();
-	$style_handles  = array(
-		'wp-block-editor',
-		'wp-block-library',
-		'wp-edit-blocks',
-	);
+	// Keep track of the styles and scripts instance to restore later.
+	$current_wp_styles  = $wp_styles;
+	$current_wp_scripts = $wp_scripts;
 
-	if ( current_theme_supports( 'wp-block-styles' ) ) {
-		$style_handles[] = 'wp-block-library-theme';
+	// Create new instances to collect the assets.
+	$wp_styles  = new WP_Styles();
+	$wp_scripts = new WP_Scripts();
+
+	/*
+	 * Register all currently registered styles and scripts. The actions that
+	 * follow enqueue assets, but don't necessarily register them.
+	 */
+	$wp_styles->registered  = $current_wp_styles->registered;
+	$wp_scripts->registered = $current_wp_scripts->registered;
+
+	/*
+	 * We generally do not need reset styles for the iframed editor.
+	 * However, if it's a classic theme, margins will be added to every block,
+	 * which is reset specifically for list items, so classic themes rely on
+	 * these reset styles.
+	 */
+	$wp_styles->done =
+		wp_theme_has_theme_json() ? array( 'wp-reset-editor-styles' ) : array();
+
+	wp_enqueue_script( 'wp-polyfill' );
+	// Enqueue the `editorStyle` handles for all core block, and dependencies.
+	wp_enqueue_style( 'wp-edit-blocks' );
+
+	if ( 'site-editor.php' === $pagenow ) {
+		wp_enqueue_style( 'wp-edit-site' );
 	}
 
-	if ( 'widgets.php' === $pagenow || 'customize.php' === $pagenow ) {
-		$style_handles[] = 'wp-widgets';
-		$style_handles[] = 'wp-edit-widgets';
+	if ( current_theme_supports( 'wp-block-styles' ) ) {
+		wp_enqueue_style( 'wp-block-library-theme' );
 	}
 
+	/*
+	 * We don't want to load EDITOR scripts in the iframe, only enqueue
+	 * front-end assets for the content.
+	 */
+	add_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
+	do_action( 'enqueue_block_assets' );
+	remove_filter( 'should_load_block_editor_scripts_and_styles', '__return_false' );
+
 	$block_registry = WP_Block_Type_Registry::get_instance();
 
+	/*
+	 * Additionally, do enqueue `editorStyle` assets for all blocks, which
+	 * contains editor-only styling for blocks (editor content).
+	 */
 	foreach ( $block_registry->get_all_registered() as $block_type ) {
-		$style_handles = array_merge(
-			$style_handles,
-			$block_type->style_handles,
-			$block_type->editor_style_handles
-		);
-
-		$script_handles = array_merge(
-			$script_handles,
-			$block_type->script_handles
-		);
+		if ( isset( $block_type->editor_style_handles ) && is_array( $block_type->editor_style_handles ) ) {
+			foreach ( $block_type->editor_style_handles as $style_handle ) {
+				wp_enqueue_style( $style_handle );
+			}
+		}
 	}
 
-	$style_handles = array_unique( $style_handles );
-	$done          = wp_styles()->done;
-
 	ob_start();
-
-	// We do not need reset styles for the iframed editor.
-	wp_styles()->done = array( 'wp-reset-editor-styles' );
-	wp_styles()->do_items( $style_handles );
-	wp_styles()->done = $done;
-
+	wp_print_styles();
 	$styles = ob_get_clean();
 
-	$script_handles = array_unique( $script_handles );
-	$done           = wp_scripts()->done;
-
 	ob_start();
-
-	wp_scripts()->done = array();
-	wp_scripts()->do_items( $script_handles );
-	wp_scripts()->done = $done;
-
+	wp_print_head_scripts();
+	wp_print_footer_scripts();
 	$scripts = ob_get_clean();
 
+	// Restore the original instances.
+	$wp_styles  = $current_wp_styles;
+	$wp_scripts = $current_wp_scripts;
+
 	return array(
 		'styles'  => $styles,
 		'scripts' => $scripts,
 	);
 }
 
+/**
+ * Finds the first occurrence of a specific block in an array of blocks.
+ *
+ * @since 6.3.0
+ *
+ * @param array  $blocks     Array of blocks.
+ * @param string $block_name Name of the block to find.
+ * @return array Found block, or empty array if none found.
+ */
+function wp_get_first_block( $blocks, $block_name ) {
+	foreach ( $blocks as $block ) {
+		if ( $block_name === $block['blockName'] ) {
+			return $block;
+		}
+		if ( ! empty( $block['innerBlocks'] ) ) {
+			$found_block = wp_get_first_block( $block['innerBlocks'], $block_name );
+
+			if ( ! empty( $found_block ) ) {
+				return $found_block;
+			}
+		}
+	}
+
+	return array();
+}
+
+/**
+ * Retrieves Post Content block attributes from the current post template.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @global int $post_ID
+ *
+ * @return array Post Content block attributes or empty array if they don't exist.
+ */
+function wp_get_post_content_block_attributes() {
+	global $post_ID;
+
+	$is_block_theme = wp_is_block_theme();
+
+	if ( ! $is_block_theme || ! $post_ID ) {
+		return array();
+	}
+
+	$template_slug = get_page_template_slug( $post_ID );
+
+	if ( ! $template_slug ) {
+		$post_slug      = 'singular';
+		$page_slug      = 'singular';
+		$template_types = get_block_templates();
+
+		foreach ( $template_types as $template_type ) {
+			if ( 'page' === $template_type->slug ) {
+				$page_slug = 'page';
+			}
+			if ( 'single' === $template_type->slug ) {
+				$post_slug = 'single';
+			}
+		}
+
+		$what_post_type = get_post_type( $post_ID );
+		switch ( $what_post_type ) {
+			case 'page':
+				$template_slug = $page_slug;
+				break;
+			default:
+				$template_slug = $post_slug;
+				break;
+		}
+	}
+
+	$current_template = get_block_templates( array( 'slug__in' => array( $template_slug ) ) );
+
+	if ( ! empty( $current_template ) ) {
+		$template_blocks    = parse_blocks( $current_template[0]->content );
+		$post_content_block = wp_get_first_block( $template_blocks, 'core/post-content' );
+
+		if ( ! empty( $post_content_block['attrs'] ) ) {
+			return $post_content_block['attrs'];
+		}
+	}
+
+	return array();
+}
+
 /**
  * Returns the contextualized block editor settings for a selected editor context.
  *
@@ -412,7 +505,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 		}
 	}
 
-	if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( wp_theme_has_theme_json() ) {
 		$block_classes = array(
 			'css'            => 'styles',
 			'__unstableType' => 'theme',
@@ -423,6 +516,16 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 			$block_classes['css'] = $actual_css;
 			$global_styles[]      = $block_classes;
 		}
+
+		/*
+		 * Add the custom CSS as a separate stylesheet so any invalid CSS
+		 * entered by users does not break other global styles.
+		 */
+		$global_styles[] = array(
+			'css'            => wp_get_global_styles_custom_css(),
+			'__unstableType' => 'user',
+			'isGlobalStyles' => true,
+		);
 	} else {
 		// If there is no `theme.json` file, ensure base layout styles are still available.
 		$block_classes = array(
@@ -508,6 +611,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 	}
 
 	$editor_settings['__unstableResolvedAssets']         = _wp_get_iframed_editor_assets();
+	$editor_settings['__unstableIsBlockBasedTheme']      = wp_is_block_theme();
 	$editor_settings['localAutosaveInterval']            = 15;
 	$editor_settings['disableLayoutStyles']              = current_theme_supports( 'disable-layout-styles' );
 	$editor_settings['__experimentalDiscussionSettings'] = array(
@@ -528,6 +632,12 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
 		),
 	);
 
+	$post_content_block_attributes = wp_get_post_content_block_attributes();
+
+	if ( ! empty( $post_content_block_attributes ) ) {
+		$editor_settings['postContentAttributes'] = $post_content_block_attributes;
+	}
+
 	/**
 	 * Filters the settings to pass to the block editor for all editor type.
 	 *
@@ -566,7 +676,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
  * @global WP_Styles  $wp_styles  The WP_Styles object for printing styles.
  *
- * @param string[]                $preload_paths        List of paths to preload.
+ * @param (string|string[])[]     $preload_paths        List of paths to preload.
  * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
  */
 function block_editor_rest_api_preload( array $preload_paths, $block_editor_context ) {
@@ -577,7 +687,7 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
 	 *
 	 * @since 5.8.0
 	 *
-	 * @param string[]                $preload_paths        Array of paths to preload.
+	 * @param (string|string[])[]     $preload_paths        Array of paths to preload.
 	 * @param WP_Block_Editor_Context $block_editor_context The current block editor context.
 	 */
 	$preload_paths = apply_filters( 'block_editor_rest_api_preload_paths', $preload_paths, $block_editor_context );
@@ -593,8 +703,8 @@ function block_editor_rest_api_preload( array $preload_paths, $block_editor_cont
 		 * @since 5.0.0
 		 * @deprecated 5.8.0 Use the {@see 'block_editor_rest_api_preload_paths'} filter instead.
 		 *
-		 * @param string[] $preload_paths Array of paths to preload.
-		 * @param WP_Post  $selected_post Post being edited.
+		 * @param (string|string[])[] $preload_paths Array of paths to preload.
+		 * @param WP_Post             $selected_post Post being edited.
 		 */
 		$preload_paths = apply_filters_deprecated( 'block_editor_preload_paths', array( $preload_paths, $selected_post ), '5.8.0', 'block_editor_rest_api_preload_paths' );
 	}
@@ -689,3 +799,40 @@ function get_block_editor_theme_styles() {
 
 	return $styles;
 }
+
+/**
+ * Returns the classic theme supports settings for block editor.
+ *
+ * @since 6.2.0
+ *
+ * @return array The classic theme supports settings.
+ */
+function get_classic_theme_supports_block_editor_settings() {
+	$theme_settings = array(
+		'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
+		'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
+		'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ),
+		'disableLayoutStyles'    => get_theme_support( 'disable-layout-styles' ),
+		'enableCustomLineHeight' => get_theme_support( 'custom-line-height' ),
+		'enableCustomSpacing'    => get_theme_support( 'custom-spacing' ),
+		'enableCustomUnits'      => get_theme_support( 'custom-units' ),
+	);
+
+	// Theme settings.
+	$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
+	if ( false !== $color_palette ) {
+		$theme_settings['colors'] = $color_palette;
+	}
+
+	$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) );
+	if ( false !== $font_sizes ) {
+		$theme_settings['fontSizes'] = $font_sizes;
+	}
+
+	$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) );
+	if ( false !== $gradient_presets ) {
+		$theme_settings['gradients'] = $gradient_presets;
+	}
+
+	return $theme_settings;
+}
diff --git a/src/wp-includes/block-patterns.php b/src/wp-includes/block-patterns.php
index 074ed33c84b44..5c7fc59f89c00 100644
--- a/src/wp-includes/block-patterns.php
+++ b/src/wp-includes/block-patterns.php
@@ -12,6 +12,7 @@
  * Registers the core block patterns and categories.
  *
  * @since 5.5.0
+ * @since 6.3.0 Added source to core block patterns.
  * @access private
  */
 function _register_core_block_patterns_and_categories() {
@@ -29,21 +30,157 @@ function _register_core_block_patterns_and_categories() {
 		);
 
 		foreach ( $core_block_patterns as $core_block_pattern ) {
-			register_block_pattern(
-				'core/' . $core_block_pattern,
-				require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php'
-			);
+			$pattern           = require __DIR__ . '/block-patterns/' . $core_block_pattern . '.php';
+			$pattern['source'] = 'core';
+			register_block_pattern( 'core/' . $core_block_pattern, $pattern );
 		}
 	}
 
-	register_block_pattern_category( 'buttons', array( 'label' => _x( 'Buttons', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'featured', array( 'label' => _x( 'Featured', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'footer', array( 'label' => _x( 'Footers', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) );
-	register_block_pattern_category( 'query', array( 'label' => _x( 'Query', 'Block pattern category' ) ) );
+	register_block_pattern_category( 'banner', array( 'label' => _x( 'Banners', 'Block pattern category' ) ) );
+	register_block_pattern_category(
+		'buttons',
+		array(
+			'label'       => _x( 'Buttons', 'Block pattern category' ),
+			'description' => __( 'Patterns that contain buttons and call to actions.' ),
+		)
+	);
+	register_block_pattern_category(
+		'columns',
+		array(
+			'label'       => _x( 'Columns', 'Block pattern category' ),
+			'description' => __( 'Multi-column patterns with more complex layouts.' ),
+		)
+	);
+	register_block_pattern_category(
+		'text',
+		array(
+			'label'       => _x( 'Text', 'Block pattern category' ),
+			'description' => __( 'Patterns containing mostly text.' ),
+		)
+	);
+	register_block_pattern_category(
+		'query',
+		array(
+			'label'       => _x( 'Posts', 'Block pattern category' ),
+			'description' => __( 'Display your latest posts in lists, grids or other layouts.' ),
+		)
+	);
+	register_block_pattern_category(
+		'featured',
+		array(
+			'label'       => _x( 'Featured', 'Block pattern category' ),
+			'description' => __( 'A set of high quality curated patterns.' ),
+		)
+	);
+	register_block_pattern_category(
+		'call-to-action',
+		array(
+			'label'       => _x( 'Call to Action', 'Block pattern category' ),
+			'description' => __( 'Sections whose purpose is to trigger a specific action.' ),
+		)
+	);
+	register_block_pattern_category(
+		'team',
+		array(
+			'label'       => _x( 'Team', 'Block pattern category' ),
+			'description' => __( 'A variety of designs to display your team members.' ),
+		)
+	);
+	register_block_pattern_category(
+		'testimonials',
+		array(
+			'label'       => _x( 'Testimonials', 'Block pattern category' ),
+			'description' => __( 'Share reviews and feedback about your brand/business.' ),
+		)
+	);
+	register_block_pattern_category(
+		'services',
+		array(
+			'label'       => _x( 'Services', 'Block pattern category' ),
+			'description' => __( 'Briefly describe what your business does and how you can help.' ),
+		)
+	);
+	register_block_pattern_category(
+		'contact',
+		array(
+			'label'       => _x( 'Contact', 'Block pattern category' ),
+			'description' => __( 'Display your contact information.' ),
+		)
+	);
+	register_block_pattern_category(
+		'about',
+		array(
+			'label'       => _x( 'About', 'Block pattern category' ),
+			'description' => __( 'Introduce yourself.' ),
+		)
+	);
+	register_block_pattern_category(
+		'portfolio',
+		array(
+			'label'       => _x( 'Portfolio', 'Block pattern category' ),
+			'description' => __( 'Showcase your latest work.' ),
+		)
+	);
+	register_block_pattern_category(
+		'gallery',
+		array(
+			'label'       => _x( 'Gallery', 'Block pattern category' ),
+			'description' => __( 'Different layouts for displaying images.' ),
+		)
+	);
+	register_block_pattern_category(
+		'media',
+		array(
+			'label'       => _x( 'Media', 'Block pattern category' ),
+			'description' => __( 'Different layouts containing video or audio.' ),
+		)
+	);
+	register_block_pattern_category(
+		'posts',
+		array(
+			'label'       => _x( 'Posts', 'Block pattern category' ),
+			'description' => __( 'Display your latest posts in lists, grids or other layouts.' ),
+		)
+	);
+	register_block_pattern_category(
+		'footer',
+		array(
+			'label'       => _x( 'Footers', 'Block pattern category' ),
+			'description' => __( 'A variety of footer designs displaying information and site navigation.' ),
+		)
+	);
+	register_block_pattern_category(
+		'header',
+		array(
+			'label'       => _x( 'Headers', 'Block pattern category' ),
+			'description' => __( 'A variety of header designs displaying your site title and navigation.' ),
+		)
+	);
+}
+
+/**
+ * Normalize the pattern properties to camelCase.
+ *
+ * The API's format is snake_case, `register_block_pattern()` expects camelCase.
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param array $pattern Pattern as returned from the Pattern Directory API.
+ * @return array Normalized pattern.
+ */
+function wp_normalize_remote_block_pattern( $pattern ) {
+	if ( isset( $pattern['block_types'] ) ) {
+		$pattern['blockTypes'] = $pattern['block_types'];
+		unset( $pattern['block_types'] );
+	}
+
+	if ( isset( $pattern['viewport_width'] ) ) {
+		$pattern['viewportWidth'] = $pattern['viewport_width'];
+		unset( $pattern['viewport_width'] );
+	}
+
+	return (array) $pattern;
 }
 
 /**
@@ -51,6 +188,9 @@ function _register_core_block_patterns_and_categories() {
  *
  * @since 5.8.0
  * @since 5.9.0 The $current_screen argument was removed.
+ * @since 6.2.0 Normalize the pattern from the API (snake_case) to the
+ *              format expected by `register_block_pattern` (camelCase).
+ * @since 6.3.0 Add 'pattern-directory/core' to the pattern's 'source'.
  *
  * @param WP_Screen $deprecated Unused. Formerly the screen that the current request was triggered from.
  */
@@ -84,9 +224,11 @@ function _load_remote_block_patterns( $deprecated = null ) {
 		}
 		$patterns = $response->get_data();
 
-		foreach ( $patterns as $settings ) {
-			$pattern_name = 'core/' . sanitize_title( $settings['title'] );
-			register_block_pattern( $pattern_name, (array) $settings );
+		foreach ( $patterns as $pattern ) {
+			$pattern['source']  = 'pattern-directory/core';
+			$normalized_pattern = wp_normalize_remote_block_pattern( $pattern );
+			$pattern_name       = 'core/' . sanitize_title( $normalized_pattern['title'] );
+			register_block_pattern( $pattern_name, $normalized_pattern );
 		}
 	}
 }
@@ -95,6 +237,9 @@ function _load_remote_block_patterns( $deprecated = null ) {
  * Register `Featured` (category) patterns from wordpress.org/patterns.
  *
  * @since 5.9.0
+ * @since 6.2.0 Normalized the pattern from the API (snake_case) to the
+ *              format expected by `register_block_pattern()` (camelCase).
+ * @since 6.3.0 Add 'pattern-directory/featured' to the pattern's 'source'.
  */
 function _load_remote_featured_patterns() {
 	$supports_core_patterns = get_theme_support( 'core-block-patterns' );
@@ -114,14 +259,15 @@ function _load_remote_featured_patterns() {
 		return;
 	}
 	$patterns = $response->get_data();
-
+	$registry = WP_Block_Patterns_Registry::get_instance();
 	foreach ( $patterns as $pattern ) {
-		$pattern_name = sanitize_title( $pattern['title'] );
-		$registry     = WP_Block_Patterns_Registry::get_instance();
+		$pattern['source']  = 'pattern-directory/featured';
+		$normalized_pattern = wp_normalize_remote_block_pattern( $pattern );
+		$pattern_name       = sanitize_title( $normalized_pattern['title'] );
 		// Some patterns might be already registered as core patterns with the `core` prefix.
 		$is_registered = $registry->is_registered( $pattern_name ) || $registry->is_registered( "core/$pattern_name" );
 		if ( ! $is_registered ) {
-			register_block_pattern( $pattern_name, (array) $pattern );
+			register_block_pattern( $pattern_name, $normalized_pattern );
 		}
 	}
 }
@@ -131,6 +277,9 @@ function _load_remote_featured_patterns() {
  * `theme.json` file.
  *
  * @since 6.0.0
+ * @since 6.2.0 Normalized the pattern from the API (snake_case) to the
+ *              format expected by `register_block_pattern()` (camelCase).
+ * @since 6.3.0 Add 'pattern-directory/theme' to the pattern's 'source'.
  * @access private
  */
 function _register_remote_theme_patterns() {
@@ -139,11 +288,11 @@ function _register_remote_theme_patterns() {
 		return;
 	}
 
-	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( ! wp_theme_has_theme_json() ) {
 		return;
 	}
 
-	$pattern_settings = WP_Theme_JSON_Resolver::get_theme_data()->get_patterns();
+	$pattern_settings = wp_get_theme_directory_pattern_slugs();
 	if ( empty( $pattern_settings ) ) {
 		return;
 	}
@@ -157,11 +306,13 @@ function _register_remote_theme_patterns() {
 	$patterns          = $response->get_data();
 	$patterns_registry = WP_Block_Patterns_Registry::get_instance();
 	foreach ( $patterns as $pattern ) {
-		$pattern_name = sanitize_title( $pattern['title'] );
+		$pattern['source']  = 'pattern-directory/theme';
+		$normalized_pattern = wp_normalize_remote_block_pattern( $pattern );
+		$pattern_name       = sanitize_title( $normalized_pattern['title'] );
 		// Some patterns might be already registered as core patterns with the `core` prefix.
 		$is_registered = $patterns_registry->is_registered( $pattern_name ) || $patterns_registry->is_registered( "core/$pattern_name" );
 		if ( ! $is_registered ) {
-			register_block_pattern( $pattern_name, (array) $pattern );
+			register_block_pattern( $pattern_name, $normalized_pattern );
 		}
 	}
 }
@@ -186,13 +337,16 @@ function _register_remote_theme_patterns() {
  *
  *   - Description
  *   - Viewport Width
+ *   - Inserter         (yes/no)
  *   - Categories       (comma-separated values)
  *   - Keywords         (comma-separated values)
  *   - Block Types      (comma-separated values)
  *   - Post Types       (comma-separated values)
- *   - Inserter         (yes/no)
+ *   - Template Types   (comma-separated values)
  *
  * @since 6.0.0
+ * @since 6.1.0 The `postTypes` property was added.
+ * @since 6.2.0 The `templateTypes` property was added.
  * @access private
  */
 function _register_theme_block_patterns() {
@@ -201,11 +355,12 @@ function _register_theme_block_patterns() {
 		'slug'          => 'Slug',
 		'description'   => 'Description',
 		'viewportWidth' => 'Viewport Width',
+		'inserter'      => 'Inserter',
 		'categories'    => 'Categories',
 		'keywords'      => 'Keywords',
 		'blockTypes'    => 'Block Types',
 		'postTypes'     => 'Post Types',
-		'inserter'      => 'Inserter',
+		'templateTypes' => 'Template Types',
 	);
 
 	/*
@@ -276,7 +431,7 @@ function _register_theme_block_patterns() {
 					}
 
 					// For properties of type array, parse data as comma-separated.
-					foreach ( array( 'categories', 'keywords', 'blockTypes', 'postTypes' ) as $property ) {
+					foreach ( array( 'categories', 'keywords', 'blockTypes', 'postTypes', 'templateTypes' ) as $property ) {
 						if ( ! empty( $pattern_data[ $property ] ) ) {
 							$pattern_data[ $property ] = array_filter(
 								preg_split(
@@ -313,10 +468,10 @@ function _register_theme_block_patterns() {
 
 					// Translate the pattern metadata.
 					$text_domain = $theme->get( 'TextDomain' );
-					//phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
+					// phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
 					$pattern_data['title'] = translate_with_gettext_context( $pattern_data['title'], 'Pattern title', $text_domain );
 					if ( ! empty( $pattern_data['description'] ) ) {
-						//phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
+						// phpcs:ignore WordPress.WP.I18n.NonSingularStringLiteralText, WordPress.WP.I18n.NonSingularStringLiteralContext, WordPress.WP.I18n.NonSingularStringLiteralDomain, WordPress.WP.I18n.LowLevelTranslationFunction
 						$pattern_data['description'] = translate_with_gettext_context( $pattern_data['description'], 'Pattern description', $text_domain );
 					}
 
diff --git a/src/wp-includes/block-supports/align.php b/src/wp-includes/block-supports/align.php
index 5a1e3a7e58c65..35591a1e31675 100644
--- a/src/wp-includes/block-supports/align.php
+++ b/src/wp-includes/block-supports/align.php
@@ -15,7 +15,7 @@
  * @param WP_Block_Type $block_type Block Type.
  */
 function wp_register_alignment_support( $block_type ) {
-	$has_align_support = block_has_support( $block_type, array( 'align' ), false );
+	$has_align_support = block_has_support( $block_type, 'align', false );
 	if ( $has_align_support ) {
 		if ( ! $block_type->attributes ) {
 			$block_type->attributes = array();
@@ -43,7 +43,7 @@ function wp_register_alignment_support( $block_type ) {
  */
 function wp_apply_alignment_support( $block_type, $block_attributes ) {
 	$attributes        = array();
-	$has_align_support = block_has_support( $block_type, array( 'align' ), false );
+	$has_align_support = block_has_support( $block_type, 'align', false );
 	if ( $has_align_support ) {
 		$has_block_alignment = array_key_exists( 'align', $block_attributes );
 
diff --git a/src/wp-includes/block-supports/border.php b/src/wp-includes/block-supports/border.php
index 443b808fd89ac..e68089e404b6a 100644
--- a/src/wp-includes/block-supports/border.php
+++ b/src/wp-includes/block-supports/border.php
@@ -22,7 +22,7 @@ function wp_register_border_support( $block_type ) {
 		$block_type->attributes = array();
 	}
 
-	if ( block_has_support( $block_type, array( '__experimentalBorder' ) ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
+	if ( block_has_support( $block_type, '__experimentalBorder' ) && ! array_key_exists( 'style', $block_type->attributes ) ) {
 		$block_type->attributes['style'] = array(
 			'type' => 'object',
 		);
diff --git a/src/wp-includes/block-supports/colors.php b/src/wp-includes/block-supports/colors.php
index 15c949560eab4..25fe3edd6018d 100644
--- a/src/wp-includes/block-supports/colors.php
+++ b/src/wp-includes/block-supports/colors.php
@@ -57,7 +57,7 @@ function wp_register_colors_support( $block_type ) {
 
 
 /**
- * Add CSS classes and inline styles for colors to the incoming attributes array.
+ * Adds CSS classes and inline styles for colors to the incoming attributes array.
  * This will be applied to the block markup in the front-end.
  *
  * @since 5.6.0
diff --git a/src/wp-includes/block-supports/custom-classname.php b/src/wp-includes/block-supports/custom-classname.php
index 96d806a77924a..1889918644fc9 100644
--- a/src/wp-includes/block-supports/custom-classname.php
+++ b/src/wp-includes/block-supports/custom-classname.php
@@ -15,7 +15,7 @@
  * @param WP_Block_Type $block_type Block Type.
  */
 function wp_register_custom_classname_support( $block_type ) {
-	$has_custom_classname_support = block_has_support( $block_type, array( 'customClassName' ), true );
+	$has_custom_classname_support = block_has_support( $block_type, 'customClassName', true );
 
 	if ( $has_custom_classname_support ) {
 		if ( ! $block_type->attributes ) {
@@ -31,7 +31,7 @@ function wp_register_custom_classname_support( $block_type ) {
 }
 
 /**
- * Add the custom classnames to the output.
+ * Adds the custom classnames to the output.
  *
  * @since 5.6.0
  * @access private
@@ -42,7 +42,7 @@ function wp_register_custom_classname_support( $block_type ) {
  * @return array Block CSS classes and inline styles.
  */
 function wp_apply_custom_classname_support( $block_type, $block_attributes ) {
-	$has_custom_classname_support = block_has_support( $block_type, array( 'customClassName' ), true );
+	$has_custom_classname_support = block_has_support( $block_type, 'customClassName', true );
 	$attributes                   = array();
 	if ( $has_custom_classname_support ) {
 		$has_custom_classnames = array_key_exists( 'className', $block_attributes );
diff --git a/src/wp-includes/block-supports/dimensions.php b/src/wp-includes/block-supports/dimensions.php
index 3223dbe0af4ac..bffeef992a2a4 100644
--- a/src/wp-includes/block-supports/dimensions.php
+++ b/src/wp-includes/block-supports/dimensions.php
@@ -29,8 +29,7 @@ function wp_register_dimensions_support( $block_type ) {
 		return;
 	}
 
-	$has_dimensions_support = block_has_support( $block_type, array( '__experimentalDimensions' ), false );
-	// Future block supports such as height & width will be added here.
+	$has_dimensions_support = block_has_support( $block_type, 'dimensions', false );
 
 	if ( $has_dimensions_support ) {
 		$block_type->attributes['style'] = array(
@@ -44,6 +43,7 @@ function wp_register_dimensions_support( $block_type ) {
  * This will be applied to the block markup in the front-end.
  *
  * @since 5.9.0
+ * @since 6.2.0 Added `minHeight` support.
  * @access private
  *
  * @param WP_Block_Type $block_type       Block Type.
@@ -51,16 +51,31 @@ function wp_register_dimensions_support( $block_type ) {
  * @return array Block dimensions CSS classes and inline styles.
  */
 function wp_apply_dimensions_support( $block_type, $block_attributes ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-	if ( wp_should_skip_block_supports_serialization( $block_type, '__experimentalDimensions' ) ) {
+	if ( wp_should_skip_block_supports_serialization( $block_type, 'dimensions' ) ) {
 		return array();
 	}
 
-	$styles = array();
+	$attributes = array();
 
-	// Height support to be added in near future.
 	// Width support to be added in near future.
 
-	return empty( $styles ) ? array() : array( 'style' => implode( ' ', $styles ) );
+	$has_min_height_support = block_has_support( $block_type, array( 'dimensions', 'minHeight' ), false );
+	$block_styles           = isset( $block_attributes['style'] ) ? $block_attributes['style'] : null;
+
+	if ( ! $block_styles ) {
+		return $attributes;
+	}
+
+	$skip_min_height                      = wp_should_skip_block_supports_serialization( $block_type, 'dimensions', 'minHeight' );
+	$dimensions_block_styles              = array();
+	$dimensions_block_styles['minHeight'] = $has_min_height_support && ! $skip_min_height ? _wp_array_get( $block_styles, array( 'dimensions', 'minHeight' ), null ) : null;
+	$styles                               = wp_style_engine_get_styles( array( 'dimensions' => $dimensions_block_styles ) );
+
+	if ( ! empty( $styles['css'] ) ) {
+		$attributes['style'] = $styles['css'];
+	}
+
+	return $attributes;
 }
 
 // Register the block support.
diff --git a/src/wp-includes/block-supports/duotone.php b/src/wp-includes/block-supports/duotone.php
index 95428c9c013c4..a90eb762ba8f0 100644
--- a/src/wp-includes/block-supports/duotone.php
+++ b/src/wp-includes/block-supports/duotone.php
@@ -32,566 +32,28 @@
  * @since 5.8.0
  */
 
-/**
- * Takes input from [0, n] and returns it as [0, 1].
- *
- * Direct port of TinyColor's function, lightly simplified to maintain
- * consistency with TinyColor.
- *
- * @see https://github.com/bgrins/TinyColor
- *
- * @since 5.8.0
- * @access private
- *
- * @param mixed $n   Number of unknown type.
- * @param int   $max Upper value of the range to bound to.
- * @return float Value in the range [0, 1].
- */
-function wp_tinycolor_bound01( $n, $max ) {
-	if ( 'string' === gettype( $n ) && false !== strpos( $n, '.' ) && 1 === (float) $n ) {
-		$n = '100%';
-	}
-
-	$n = min( $max, max( 0, (float) $n ) );
-
-	// Automatically convert percentage into number.
-	if ( 'string' === gettype( $n ) && false !== strpos( $n, '%' ) ) {
-		$n = (int) ( $n * $max ) / 100;
-	}
-
-	// Handle floating point rounding errors.
-	if ( ( abs( $n - $max ) < 0.000001 ) ) {
-		return 1.0;
-	}
-
-	// Convert into [0, 1] range if it isn't already.
-	return ( $n % $max ) / (float) $max;
-}
-
-/**
- * Direct port of tinycolor's boundAlpha function to maintain consistency with
- * how tinycolor works.
- *
- * @see https://github.com/bgrins/TinyColor
- *
- * @since 5.9.0
- * @access private
- *
- * @param mixed $n Number of unknown type.
- * @return float Value in the range [0,1].
- */
-function _wp_tinycolor_bound_alpha( $n ) {
-	if ( is_numeric( $n ) ) {
-		$n = (float) $n;
-		if ( $n >= 0 && $n <= 1 ) {
-			return $n;
-		}
-	}
-	return 1;
-}
-
-/**
- * Rounds and converts values of an RGB object.
- *
- * Direct port of TinyColor's function, lightly simplified to maintain
- * consistency with TinyColor.
- *
- * @see https://github.com/bgrins/TinyColor
- *
- * @since 5.8.0
- * @access private
- *
- * @param array $rgb_color RGB object.
- * @return array Rounded and converted RGB object.
- */
-function wp_tinycolor_rgb_to_rgb( $rgb_color ) {
-	return array(
-		'r' => wp_tinycolor_bound01( $rgb_color['r'], 255 ) * 255,
-		'g' => wp_tinycolor_bound01( $rgb_color['g'], 255 ) * 255,
-		'b' => wp_tinycolor_bound01( $rgb_color['b'], 255 ) * 255,
-	);
-}
-
-/**
- * Helper function for hsl to rgb conversion.
- *
- * Direct port of TinyColor's function, lightly simplified to maintain
- * consistency with TinyColor.
- *
- * @see https://github.com/bgrins/TinyColor
- *
- * @since 5.8.0
- * @access private
- *
- * @param float $p first component.
- * @param float $q second component.
- * @param float $t third component.
- * @return float R, G, or B component.
- */
-function wp_tinycolor_hue_to_rgb( $p, $q, $t ) {
-	if ( $t < 0 ) {
-		$t += 1;
-	}
-	if ( $t > 1 ) {
-		$t -= 1;
-	}
-	if ( $t < 1 / 6 ) {
-		return $p + ( $q - $p ) * 6 * $t;
-	}
-	if ( $t < 1 / 2 ) {
-		return $q;
-	}
-	if ( $t < 2 / 3 ) {
-		return $p + ( $q - $p ) * ( 2 / 3 - $t ) * 6;
-	}
-	return $p;
-}
-
-/**
- * Converts an HSL object to an RGB object with converted and rounded values.
- *
- * Direct port of TinyColor's function, lightly simplified to maintain
- * consistency with TinyColor.
- *
- * @see https://github.com/bgrins/TinyColor
- *
- * @since 5.8.0
- * @access private
- *
- * @param array $hsl_color HSL object.
- * @return array Rounded and converted RGB object.
- */
-function wp_tinycolor_hsl_to_rgb( $hsl_color ) {
-	$h = wp_tinycolor_bound01( $hsl_color['h'], 360 );
-	$s = wp_tinycolor_bound01( $hsl_color['s'], 100 );
-	$l = wp_tinycolor_bound01( $hsl_color['l'], 100 );
-
-	if ( 0 === $s ) {
-		// Achromatic.
-		$r = $l;
-		$g = $l;
-		$b = $l;
-	} else {
-		$q = $l < 0.5 ? $l * ( 1 + $s ) : $l + $s - $l * $s;
-		$p = 2 * $l - $q;
-		$r = wp_tinycolor_hue_to_rgb( $p, $q, $h + 1 / 3 );
-		$g = wp_tinycolor_hue_to_rgb( $p, $q, $h );
-		$b = wp_tinycolor_hue_to_rgb( $p, $q, $h - 1 / 3 );
-	}
-
-	return array(
-		'r' => $r * 255,
-		'g' => $g * 255,
-		'b' => $b * 255,
-	);
-}
-
-/**
- * Parses hex, hsl, and rgb CSS strings using the same regex as TinyColor v1.4.2
- * used in the JavaScript. Only colors output from react-color are implemented.
- *
- * Direct port of TinyColor's function, lightly simplified to maintain
- * consistency with TinyColor.
- *
- * @see https://github.com/bgrins/TinyColor
- * @see https://github.com/casesandberg/react-color/
- *
- * @since 5.8.0
- * @since 5.9.0 Added alpha processing.
- * @access private
- *
- * @param string $color_str CSS color string.
- * @return array RGB object.
- */
-function wp_tinycolor_string_to_rgb( $color_str ) {
-	$color_str = strtolower( trim( $color_str ) );
-
-	$css_integer = '[-\\+]?\\d+%?';
-	$css_number  = '[-\\+]?\\d*\\.\\d+%?';
-
-	$css_unit = '(?:' . $css_number . ')|(?:' . $css_integer . ')';
-
-	$permissive_match3 = '[\\s|\\(]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')\\s*\\)?';
-	$permissive_match4 = '[\\s|\\(]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')\\s*\\)?';
-
-	$rgb_regexp = '/^rgb' . $permissive_match3 . '$/';
-	if ( preg_match( $rgb_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => $match[1],
-				'g' => $match[2],
-				'b' => $match[3],
-			)
-		);
-
-		$rgb['a'] = 1;
-
-		return $rgb;
-	}
-
-	$rgba_regexp = '/^rgba' . $permissive_match4 . '$/';
-	if ( preg_match( $rgba_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => $match[1],
-				'g' => $match[2],
-				'b' => $match[3],
-			)
-		);
-
-		$rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] );
-
-		return $rgb;
-	}
-
-	$hsl_regexp = '/^hsl' . $permissive_match3 . '$/';
-	if ( preg_match( $hsl_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_hsl_to_rgb(
-			array(
-				'h' => $match[1],
-				's' => $match[2],
-				'l' => $match[3],
-			)
-		);
-
-		$rgb['a'] = 1;
-
-		return $rgb;
-	}
-
-	$hsla_regexp = '/^hsla' . $permissive_match4 . '$/';
-	if ( preg_match( $hsla_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_hsl_to_rgb(
-			array(
-				'h' => $match[1],
-				's' => $match[2],
-				'l' => $match[3],
-			)
-		);
-
-		$rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] );
-
-		return $rgb;
-	}
-
-	$hex8_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/';
-	if ( preg_match( $hex8_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => base_convert( $match[1], 16, 10 ),
-				'g' => base_convert( $match[2], 16, 10 ),
-				'b' => base_convert( $match[3], 16, 10 ),
-			)
-		);
-
-		$rgb['a'] = _wp_tinycolor_bound_alpha(
-			base_convert( $match[4], 16, 10 ) / 255
-		);
-
-		return $rgb;
-	}
-
-	$hex6_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/';
-	if ( preg_match( $hex6_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => base_convert( $match[1], 16, 10 ),
-				'g' => base_convert( $match[2], 16, 10 ),
-				'b' => base_convert( $match[3], 16, 10 ),
-			)
-		);
-
-		$rgb['a'] = 1;
-
-		return $rgb;
-	}
-
-	$hex4_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/';
-	if ( preg_match( $hex4_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => base_convert( $match[1] . $match[1], 16, 10 ),
-				'g' => base_convert( $match[2] . $match[2], 16, 10 ),
-				'b' => base_convert( $match[3] . $match[3], 16, 10 ),
-			)
-		);
-
-		$rgb['a'] = _wp_tinycolor_bound_alpha(
-			base_convert( $match[4] . $match[4], 16, 10 ) / 255
-		);
-
-		return $rgb;
-	}
-
-	$hex3_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/';
-	if ( preg_match( $hex3_regexp, $color_str, $match ) ) {
-		$rgb = wp_tinycolor_rgb_to_rgb(
-			array(
-				'r' => base_convert( $match[1] . $match[1], 16, 10 ),
-				'g' => base_convert( $match[2] . $match[2], 16, 10 ),
-				'b' => base_convert( $match[3] . $match[3], 16, 10 ),
-			)
-		);
-
-		$rgb['a'] = 1;
-
-		return $rgb;
-	}
-
-	/*
-	 * The JS color picker considers the string "transparent" to be a hex value,
-	 * so we need to handle it here as a special case.
-	 */
-	if ( 'transparent' === $color_str ) {
-		return array(
-			'r' => 0,
-			'g' => 0,
-			'b' => 0,
-			'a' => 0,
-		);
-	}
-}
-
-/**
- * Returns the prefixed id for the duotone filter for use as a CSS id.
- *
- * @since 5.9.1
- * @access private
- *
- * @param array $preset Duotone preset value as seen in theme.json.
- * @return string Duotone filter CSS id.
- */
-function wp_get_duotone_filter_id( $preset ) {
-	if ( ! isset( $preset['slug'] ) ) {
-		return '';
-	}
-
-	return 'wp-duotone-' . $preset['slug'];
-}
-
-/**
- * Returns the CSS filter property url to reference the rendered SVG.
- *
- * @since 5.9.0
- * @since 6.1.0 Allow unset for preset colors.
- * @access private
- *
- * @param array $preset Duotone preset value as seen in theme.json.
- * @return string Duotone CSS filter property url value.
- */
-function wp_get_duotone_filter_property( $preset ) {
-	if ( isset( $preset['colors'] ) && 'unset' === $preset['colors'] ) {
-		return 'none';
-	}
-	$filter_id = wp_get_duotone_filter_id( $preset );
-	return "url('#" . $filter_id . "')";
-}
-
-/**
- * Returns the duotone filter SVG string for the preset.
- *
- * @since 5.9.1
- * @access private
- *
- * @param array $preset Duotone preset value as seen in theme.json.
- * @return string Duotone SVG filter.
- */
-function wp_get_duotone_filter_svg( $preset ) {
-	$filter_id = wp_get_duotone_filter_id( $preset );
-
-	$duotone_values = array(
-		'r' => array(),
-		'g' => array(),
-		'b' => array(),
-		'a' => array(),
-	);
-
-	if ( ! isset( $preset['colors'] ) || ! is_array( $preset['colors'] ) ) {
-		$preset['colors'] = array();
-	}
-
-	foreach ( $preset['colors'] as $color_str ) {
-		$color = wp_tinycolor_string_to_rgb( $color_str );
-
-		$duotone_values['r'][] = $color['r'] / 255;
-		$duotone_values['g'][] = $color['g'] / 255;
-		$duotone_values['b'][] = $color['b'] / 255;
-		$duotone_values['a'][] = $color['a'];
-	}
-
-	ob_start();
-
-	?>
-
-	<svg
-		xmlns="http://www.w3.org/2000/svg"
-		viewBox="0 0 0 0"
-		width="0"
-		height="0"
-		focusable="false"
-		role="none"
-		style="visibility: hidden; position: absolute; left: -9999px; overflow: hidden;"
-	>
-		<defs>
-			<filter id="<?php echo esc_attr( $filter_id ); ?>">
-				<feColorMatrix
-					color-interpolation-filters="sRGB"
-					type="matrix"
-					values="
-						.299 .587 .114 0 0
-						.299 .587 .114 0 0
-						.299 .587 .114 0 0
-						.299 .587 .114 0 0
-					"
-				/>
-				<feComponentTransfer color-interpolation-filters="sRGB" >
-					<feFuncR type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['r'] ) ); ?>" />
-					<feFuncG type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['g'] ) ); ?>" />
-					<feFuncB type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['b'] ) ); ?>" />
-					<feFuncA type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['a'] ) ); ?>" />
-				</feComponentTransfer>
-				<feComposite in2="SourceGraphic" operator="in" />
-			</filter>
-		</defs>
-	</svg>
-
-	<?php
-
-	$svg = ob_get_clean();
-
-	if ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) {
-		// Clean up the whitespace.
-		$svg = preg_replace( "/[\r\n\t ]+/", ' ', $svg );
-		$svg = str_replace( '> <', '><', $svg );
-		$svg = trim( $svg );
-	}
-
-	return $svg;
-}
-
-/**
- * Registers the style and colors block attributes for block types that support it.
- *
- * @since 5.8.0
- * @access private
- *
- * @param WP_Block_Type $block_type Block Type.
- */
-function wp_register_duotone_support( $block_type ) {
-	$has_duotone_support = false;
-	if ( property_exists( $block_type, 'supports' ) ) {
-		$has_duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
-	}
-
-	if ( $has_duotone_support ) {
-		if ( ! $block_type->attributes ) {
-			$block_type->attributes = array();
-		}
-
-		if ( ! array_key_exists( 'style', $block_type->attributes ) ) {
-			$block_type->attributes['style'] = array(
-				'type' => 'object',
-			);
-		}
-	}
-}
-
-/**
- * Render out the duotone stylesheet and SVG.
- *
- * @since 5.8.0
- * @since 6.1.0 Allow unset for preset colors.
- * @access private
- *
- * @param string $block_content Rendered block content.
- * @param array  $block         Block object.
- * @return string Filtered block content.
- */
-function wp_render_duotone_support( $block_content, $block ) {
-	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-
-	$duotone_support = false;
-	if ( $block_type && property_exists( $block_type, 'supports' ) ) {
-		$duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
-	}
-
-	$has_duotone_attribute = isset( $block['attrs']['style']['color']['duotone'] );
-
-	if (
-		! $duotone_support ||
-		! $has_duotone_attribute
-	) {
-		return $block_content;
-	}
-
-	$colors          = $block['attrs']['style']['color']['duotone'];
-	$filter_key      = is_array( $colors ) ? implode( '-', $colors ) : $colors;
-	$filter_preset   = array(
-		'slug'   => wp_unique_id( sanitize_key( $filter_key . '-' ) ),
-		'colors' => $colors,
-	);
-	$filter_property = wp_get_duotone_filter_property( $filter_preset );
-	$filter_id       = wp_get_duotone_filter_id( $filter_preset );
-
-	$scope     = '.' . $filter_id;
-	$selectors = explode( ',', $duotone_support );
-	$scoped    = array();
-	foreach ( $selectors as $sel ) {
-		$scoped[] = $scope . ' ' . trim( $sel );
-	}
-	$selector = implode( ', ', $scoped );
-
-	// !important is needed because these styles render before global styles,
-	// and they should be overriding the duotone filters set by global styles.
-	$filter_style = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG
-		? $selector . " {\n\tfilter: " . $filter_property . " !important;\n}\n"
-		: $selector . '{filter:' . $filter_property . ' !important;}';
-
-	wp_register_style( $filter_id, false, array(), true, true );
-	wp_add_inline_style( $filter_id, $filter_style );
-	wp_enqueue_style( $filter_id );
-
-	if ( 'unset' !== $colors ) {
-		$filter_svg = wp_get_duotone_filter_svg( $filter_preset );
-		add_action(
-			'wp_footer',
-			static function () use ( $filter_svg, $selector ) {
-				echo $filter_svg;
-
-				/*
-				 * Safari renders elements incorrectly on first paint when the
-				 * SVG filter comes after the content that it is filtering, so
-				 * we force a repaint with a WebKit hack which solves the issue.
-				 */
-				global $is_safari;
-				if ( $is_safari ) {
-					/*
-					 * Simply accessing el.offsetHeight flushes layout and style
-					 * changes in WebKit without having to wait for setTimeout.
-					 */
-					printf(
-						'<script>( function() { var el = document.querySelector( %s ); var display = el.style.display; el.style.display = "none"; el.offsetHeight; el.style.display = display; } )();</script>',
-						wp_json_encode( $selector )
-					);
-				}
-			}
-		);
-	}
-
-	// Like the layout hook, this assumes the hook only applies to blocks with a single wrapper.
-	return preg_replace(
-		'/' . preg_quote( 'class="', '/' ) . '/',
-		'class="' . $filter_id . ' ',
-		$block_content,
-		1
-	);
-}
-
 // Register the block support.
 WP_Block_Supports::get_instance()->register(
 	'duotone',
 	array(
-		'register_attribute' => 'wp_register_duotone_support',
+		'register_attribute' => array( 'WP_Duotone', 'register_duotone_support' ),
 	)
 );
-add_filter( 'render_block', 'wp_render_duotone_support', 10, 2 );
+
+// Add classnames to blocks using duotone support.
+add_filter( 'render_block', array( 'WP_Duotone', 'render_duotone_support' ), 10, 3 );
+
+// Enqueue styles.
+// Block styles (core-block-supports-inline-css) before the style engine (wp_enqueue_stored_styles).
+// Global styles (global-styles-inline-css) after the other global styles (wp_enqueue_global_styles).
+add_action( 'wp_enqueue_scripts', array( 'WP_Duotone', 'output_block_styles' ), 9 );
+add_action( 'wp_enqueue_scripts', array( 'WP_Duotone', 'output_global_styles' ), 11 );
+
+// Add SVG filters to the footer. Also, for classic themes, output block styles (core-block-supports-inline-css).
+add_action( 'wp_footer', array( 'WP_Duotone', 'output_footer_assets' ), 10 );
+
+// Add styles and SVGs for use in the editor via the EditorStyles component.
+add_filter( 'block_editor_settings_all', array( 'WP_Duotone', 'add_editor_settings' ), 10 );
+
+// Migrate the old experimental duotone support flag.
+add_filter( 'block_type_metadata_settings', array( 'WP_Duotone', 'migrate_experimental_duotone_support_flag' ), 10, 2 );
diff --git a/src/wp-includes/block-supports/elements.php b/src/wp-includes/block-supports/elements.php
index 90c6d3d69161b..fa2536908ca6e 100644
--- a/src/wp-includes/block-supports/elements.php
+++ b/src/wp-includes/block-supports/elements.php
@@ -7,20 +7,20 @@
  */
 
 /**
- * Get the elements class names.
+ * Gets the elements class names.
  *
  * @since 6.0.0
  * @access private
  *
  * @param array $block Block object.
- * @return string      The unique class name.
+ * @return string The unique class name.
  */
 function wp_get_elements_class_name( $block ) {
 	return 'wp-elements-' . md5( serialize( $block ) );
 }
 
 /**
- * Update the block content with elements class names.
+ * Updates the block content with elements class names.
  *
  * @since 5.8.0
  * @access private
@@ -46,43 +46,33 @@ function wp_render_elements_support( $block_content, $block ) {
 		$link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', 'color', 'text' ), null );
 	}
 
+	$hover_link_color = null;
+	if ( ! empty( $block['attrs'] ) ) {
+		$hover_link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', ':hover', 'color', 'text' ), null );
+	}
+
 	/*
-	 * For now we only care about link color.
+	 * For now we only care about link colors.
 	 * This code in the future when we have a public API
 	 * should take advantage of WP_Theme_JSON::compute_style_properties
 	 * and work for any element and style.
 	 */
-	if ( null === $link_color ) {
+	if ( null === $link_color && null === $hover_link_color ) {
 		return $block_content;
 	}
 
-	$class_name = wp_get_elements_class_name( $block );
-
 	// Like the layout hook this assumes the hook only applies to blocks with a single wrapper.
-	// Retrieve the opening tag of the first HTML element.
-	$html_element_matches = array();
-	preg_match( '/<[^>]+>/', $block_content, $html_element_matches, PREG_OFFSET_CAPTURE );
-	$first_element = $html_element_matches[0][0];
-	// If the first HTML element has a class attribute just add the new class
-	// as we do on layout and duotone.
-	if ( strpos( $first_element, 'class="' ) !== false ) {
-		$content = preg_replace(
-			'/' . preg_quote( 'class="', '/' ) . '/',
-			'class="' . $class_name . ' ',
-			$block_content,
-			1
-		);
-	} else {
-		// If the first HTML element has no class attribute we should inject the attribute before the attribute at the end.
-		$first_element_offset = $html_element_matches[0][1];
-		$content              = substr_replace( $block_content, ' class="' . $class_name . '"', $first_element_offset + strlen( $first_element ) - 1, 0 );
+	// Add the class name to the first element, presuming it's the wrapper, if it exists.
+	$tags = new WP_HTML_Tag_Processor( $block_content );
+	if ( $tags->next_tag() ) {
+		$tags->add_class( wp_get_elements_class_name( $block ) );
 	}
 
-	return $content;
+	return $tags->get_updated_html();
 }
 
 /**
- * Render the elements stylesheet.
+ * Renders the elements stylesheet.
  *
  * In the case of nested blocks we want the parent element styles to be rendered before their descendants.
  * This solves the issue of an element (e.g.: link color) being styled in both the parent and a descendant:
@@ -92,9 +82,8 @@ function wp_render_elements_support( $block_content, $block ) {
  * @since 6.1.0 Implemented the style engine to generate CSS and classnames.
  * @access private
  *
- * @param string|null $pre_render   The pre-rendered content. Default null.
- * @param array       $block        The block being rendered.
- *
+ * @param string|null $pre_render The pre-rendered content. Default null.
+ * @param array       $block      The block being rendered.
  * @return null
  */
 function wp_render_elements_support_styles( $pre_render, $block ) {
@@ -120,6 +109,16 @@ function wp_render_elements_support_styles( $pre_render, $block ) {
 		)
 	);
 
+	if ( isset( $link_block_styles[':hover'] ) ) {
+		wp_style_engine_get_styles(
+			$link_block_styles[':hover'],
+			array(
+				'selector' => ".$class_name a:hover",
+				'context'  => 'block-supports',
+			)
+		);
+	}
+
 	return null;
 }
 
diff --git a/src/wp-includes/block-supports/generated-classname.php b/src/wp-includes/block-supports/generated-classname.php
index 57d657ef95cb6..bbedd0ee53542 100644
--- a/src/wp-includes/block-supports/generated-classname.php
+++ b/src/wp-includes/block-supports/generated-classname.php
@@ -7,13 +7,13 @@
  */
 
 /**
- * Get the generated classname from a given block name.
+ * Gets the generated classname from a given block name.
  *
  * @since 5.6.0
  *
  * @access private
  *
- * @param  string $block_name Block Name.
+ * @param string $block_name Block Name.
  * @return string Generated classname.
  */
 function wp_get_block_default_classname( $block_name ) {
@@ -30,8 +30,8 @@ function wp_get_block_default_classname( $block_name ) {
 	 *
 	 * @since 5.6.0
 	 *
-	 * @param string     $class_name The current applied classname.
-	 * @param string     $block_name The block name.
+	 * @param string $class_name The current applied classname.
+	 * @param string $block_name The block name.
 	 */
 	$classname = apply_filters( 'block_default_classname', $classname, $block_name );
 
@@ -39,19 +39,18 @@ function wp_get_block_default_classname( $block_name ) {
 }
 
 /**
- * Add the generated classnames to the output.
+ * Adds the generated classnames to the output.
  *
  * @since 5.6.0
  *
  * @access private
  *
- * @param  WP_Block_Type $block_type       Block Type.
- *
+ * @param WP_Block_Type $block_type Block Type.
  * @return array Block CSS classes and inline styles.
  */
 function wp_apply_generated_classname_support( $block_type ) {
 	$attributes                      = array();
-	$has_generated_classname_support = block_has_support( $block_type, array( 'className' ), true );
+	$has_generated_classname_support = block_has_support( $block_type, 'className', true );
 	if ( $has_generated_classname_support ) {
 		$block_classname = wp_get_block_default_classname( $block_type->name );
 
diff --git a/src/wp-includes/block-supports/layout.php b/src/wp-includes/block-supports/layout.php
index 7a882a9bab386..519574238dee9 100644
--- a/src/wp-includes/block-supports/layout.php
+++ b/src/wp-includes/block-supports/layout.php
@@ -6,16 +6,203 @@
  * @since 5.8.0
  */
 
+/**
+ * Returns layout definitions, keyed by layout type.
+ *
+ * Provides a common definition of slugs, classnames, base styles, and spacing styles for each layout type.
+ * When making changes or additions to layout definitions, the corresponding JavaScript definitions should
+ * also be updated.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @return array[] Layout definitions.
+ */
+function wp_get_layout_definitions() {
+	$layout_definitions = array(
+		'default'     => array(
+			'name'          => 'default',
+			'slug'          => 'flow',
+			'className'     => 'is-layout-flow',
+			'baseStyles'    => array(
+				array(
+					'selector' => ' > .alignleft',
+					'rules'    => array(
+						'float'               => 'left',
+						'margin-inline-start' => '0',
+						'margin-inline-end'   => '2em',
+					),
+				),
+				array(
+					'selector' => ' > .alignright',
+					'rules'    => array(
+						'float'               => 'right',
+						'margin-inline-start' => '2em',
+						'margin-inline-end'   => '0',
+					),
+				),
+				array(
+					'selector' => ' > .aligncenter',
+					'rules'    => array(
+						'margin-left'  => 'auto !important',
+						'margin-right' => 'auto !important',
+					),
+				),
+			),
+			'spacingStyles' => array(
+				array(
+					'selector' => ' > :first-child:first-child',
+					'rules'    => array(
+						'margin-block-start' => '0',
+					),
+				),
+				array(
+					'selector' => ' > :last-child:last-child',
+					'rules'    => array(
+						'margin-block-end' => '0',
+					),
+				),
+				array(
+					'selector' => ' > *',
+					'rules'    => array(
+						'margin-block-start' => null,
+						'margin-block-end'   => '0',
+					),
+				),
+			),
+		),
+		'constrained' => array(
+			'name'          => 'constrained',
+			'slug'          => 'constrained',
+			'className'     => 'is-layout-constrained',
+			'baseStyles'    => array(
+				array(
+					'selector' => ' > .alignleft',
+					'rules'    => array(
+						'float'               => 'left',
+						'margin-inline-start' => '0',
+						'margin-inline-end'   => '2em',
+					),
+				),
+				array(
+					'selector' => ' > .alignright',
+					'rules'    => array(
+						'float'               => 'right',
+						'margin-inline-start' => '2em',
+						'margin-inline-end'   => '0',
+					),
+				),
+				array(
+					'selector' => ' > .aligncenter',
+					'rules'    => array(
+						'margin-left'  => 'auto !important',
+						'margin-right' => 'auto !important',
+					),
+				),
+				array(
+					'selector' => ' > :where(:not(.alignleft):not(.alignright):not(.alignfull))',
+					'rules'    => array(
+						'max-width'    => 'var(--wp--style--global--content-size)',
+						'margin-left'  => 'auto !important',
+						'margin-right' => 'auto !important',
+					),
+				),
+				array(
+					'selector' => ' > .alignwide',
+					'rules'    => array(
+						'max-width' => 'var(--wp--style--global--wide-size)',
+					),
+				),
+			),
+			'spacingStyles' => array(
+				array(
+					'selector' => ' > :first-child:first-child',
+					'rules'    => array(
+						'margin-block-start' => '0',
+					),
+				),
+				array(
+					'selector' => ' > :last-child:last-child',
+					'rules'    => array(
+						'margin-block-end' => '0',
+					),
+				),
+				array(
+					'selector' => ' > *',
+					'rules'    => array(
+						'margin-block-start' => null,
+						'margin-block-end'   => '0',
+					),
+				),
+			),
+		),
+		'flex'        => array(
+			'name'          => 'flex',
+			'slug'          => 'flex',
+			'className'     => 'is-layout-flex',
+			'displayMode'   => 'flex',
+			'baseStyles'    => array(
+				array(
+					'selector' => '',
+					'rules'    => array(
+						'flex-wrap'   => 'wrap',
+						'align-items' => 'center',
+					),
+				),
+				array(
+					'selector' => ' > *',
+					'rules'    => array(
+						'margin' => '0',
+					),
+				),
+			),
+			'spacingStyles' => array(
+				array(
+					'selector' => '',
+					'rules'    => array(
+						'gap' => null,
+					),
+				),
+			),
+		),
+		'grid'        => array(
+			'name'          => 'grid',
+			'slug'          => 'grid',
+			'className'     => 'is-layout-grid',
+			'displayMode'   => 'grid',
+			'baseStyles'    => array(
+				array(
+					'selector' => ' > *',
+					'rules'    => array(
+						'margin' => '0',
+					),
+				),
+			),
+			'spacingStyles' => array(
+				array(
+					'selector' => '',
+					'rules'    => array(
+						'gap' => null,
+					),
+				),
+			),
+		),
+	);
+
+	return $layout_definitions;
+}
+
 /**
  * Registers the layout block attribute for block types that support it.
  *
  * @since 5.8.0
+ * @since 6.3.0 Check for layout support via the `layout` key with fallback to `__experimentalLayout`.
  * @access private
  *
  * @param WP_Block_Type $block_type Block Type.
  */
 function wp_register_layout_support( $block_type ) {
-	$support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false );
+	$support_layout = block_has_support( $block_type, 'layout', false ) || block_has_support( $block_type, '__experimentalLayout', false );
 	if ( $support_layout ) {
 		if ( ! $block_type->attributes ) {
 			$block_type->attributes = array();
@@ -34,6 +221,7 @@ function wp_register_layout_support( $block_type ) {
  *
  * @since 5.9.0
  * @since 6.1.0 Added `$block_spacing` param, use style engine to enqueue styles.
+ * @since 6.3.0 Added grid layout type.
  * @access private
  *
  * @param string               $selector                      CSS selector.
@@ -207,7 +395,11 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
 		);
 
 		if ( 'horizontal' === $layout_orientation ) {
-			$justify_content_options += array( 'space-between' => 'space-between' );
+			$justify_content_options    += array( 'space-between' => 'space-between' );
+			$vertical_alignment_options += array( 'stretch' => 'stretch' );
+		} else {
+			$justify_content_options    += array( 'stretch' => 'stretch' );
+			$vertical_alignment_options += array( 'space-between' => 'space-between' );
 		}
 
 		if ( ! empty( $layout['flexWrap'] ) && 'nowrap' === $layout['flexWrap'] ) {
@@ -276,6 +468,50 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
 					'declarations' => array( 'align-items' => 'flex-start' ),
 				);
 			}
+			if ( ! empty( $layout['verticalAlignment'] ) && array_key_exists( $layout['verticalAlignment'], $vertical_alignment_options ) ) {
+				$layout_styles[] = array(
+					'selector'     => $selector,
+					'declarations' => array( 'justify-content' => $vertical_alignment_options[ $layout['verticalAlignment'] ] ),
+				);
+			}
+		}
+	} elseif ( 'grid' === $layout_type ) {
+		if ( ! empty( $layout['columnCount'] ) ) {
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array( 'grid-template-columns' => 'repeat(' . $layout['columnCount'] . ', minmax(0, 1fr))' ),
+			);
+		} else {
+			$minimum_column_width = ! empty( $layout['minimumColumnWidth'] ) ? $layout['minimumColumnWidth'] : '12rem';
+
+			$layout_styles[] = array(
+				'selector'     => $selector,
+				'declarations' => array( 'grid-template-columns' => 'repeat(auto-fill, minmax(min(' . $minimum_column_width . ', 100%), 1fr))' ),
+			);
+		}
+
+		if ( $has_block_gap_support && isset( $gap_value ) ) {
+			$combined_gap_value = '';
+			$gap_sides          = is_array( $gap_value ) ? array( 'top', 'left' ) : array( 'top' );
+
+			foreach ( $gap_sides as $gap_side ) {
+				$process_value = is_string( $gap_value ) ? $gap_value : _wp_array_get( $gap_value, array( $gap_side ), $fallback_gap_value );
+				// Get spacing CSS variable from preset value if provided.
+				if ( is_string( $process_value ) && str_contains( $process_value, 'var:preset|spacing|' ) ) {
+					$index_to_splice = strrpos( $process_value, '|' ) + 1;
+					$slug            = _wp_to_kebab_case( substr( $process_value, $index_to_splice ) );
+					$process_value   = "var(--wp--preset--spacing--$slug)";
+				}
+				$combined_gap_value .= "$process_value ";
+			}
+			$gap_value = trim( $combined_gap_value );
+
+			if ( null !== $gap_value && ! $should_skip_gap_serialization ) {
+				$layout_styles[] = array(
+					'selector'     => $selector,
+					'declarations' => array( 'gap' => $gap_value ),
+				);
+			}
 		}
 	}
 
@@ -302,6 +538,8 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
  * Renders the layout config to the block wrapper.
  *
  * @since 5.8.0
+ * @since 6.3.0 Adds compound class to layout wrapper for global spacing styles.
+ * @since 6.3.0 Check for layout support via the `layout` key with fallback to `__experimentalLayout`.
  * @access private
  *
  * @param string $block_content Rendered block content.
@@ -309,28 +547,62 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false
  * @return string Filtered block content.
  */
 function wp_render_layout_support_flag( $block_content, $block ) {
-	$block_type     = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-	$support_layout = block_has_support( $block_type, array( '__experimentalLayout' ), false );
+	$block_type       = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	$support_layout   = block_has_support( $block_type, 'layout', false ) || block_has_support( $block_type, '__experimentalLayout', false );
+	$has_child_layout = isset( $block['attrs']['style']['layout']['selfStretch'] );
 
-	if ( ! $support_layout ) {
+	if ( ! $support_layout && ! $has_child_layout ) {
 		return $block_content;
 	}
+	$outer_class_names = array();
 
-	$block_gap              = wp_get_global_settings( array( 'spacing', 'blockGap' ) );
-	$global_layout_settings = wp_get_global_settings( array( 'layout' ) );
-	$has_block_gap_support  = isset( $block_gap ) ? null !== $block_gap : false;
-	$default_block_layout   = _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
-	$used_layout            = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $default_block_layout;
+	if ( $has_child_layout && ( 'fixed' === $block['attrs']['style']['layout']['selfStretch'] || 'fill' === $block['attrs']['style']['layout']['selfStretch'] ) ) {
+		$container_content_class = wp_unique_id( 'wp-container-content-' );
 
-	if ( isset( $used_layout['inherit'] ) && $used_layout['inherit'] ) {
-		if ( ! $global_layout_settings ) {
-			return $block_content;
+		$child_layout_styles = array();
+
+		if ( 'fixed' === $block['attrs']['style']['layout']['selfStretch'] && isset( $block['attrs']['style']['layout']['flexSize'] ) ) {
+			$child_layout_styles[] = array(
+				'selector'     => ".$container_content_class",
+				'declarations' => array(
+					'flex-basis' => $block['attrs']['style']['layout']['flexSize'],
+					'box-sizing' => 'border-box',
+				),
+			);
+		} elseif ( 'fill' === $block['attrs']['style']['layout']['selfStretch'] ) {
+			$child_layout_styles[] = array(
+				'selector'     => ".$container_content_class",
+				'declarations' => array(
+					'flex-grow' => '1',
+				),
+			);
 		}
+
+		wp_style_engine_get_stylesheet_from_css_rules(
+			$child_layout_styles,
+			array(
+				'context'  => 'block-supports',
+				'prettify' => false,
+			)
+		);
+
+		$outer_class_names[] = $container_content_class;
+	}
+
+	// Return early if only child layout exists.
+	if ( ! $support_layout && ! empty( $outer_class_names ) ) {
+		$content = new WP_HTML_Tag_Processor( $block_content );
+		$content->next_tag();
+		$content->add_class( implode( ' ', $outer_class_names ) );
+		return (string) $content;
 	}
 
+	$global_settings = wp_get_global_settings();
+	$fallback_layout = ! empty( _wp_array_get( $block_type->supports, array( 'layout', 'default' ), array() ) ) ? _wp_array_get( $block_type->supports, array( 'layout', 'default' ), array() ) : _wp_array_get( $block_type->supports, array( '__experimentalLayout', 'default' ), array() );
+	$used_layout     = isset( $block['attrs']['layout'] ) ? $block['attrs']['layout'] : $fallback_layout;
+
 	$class_names        = array();
-	$layout_definitions = _wp_array_get( $global_layout_settings, array( 'definitions' ), array() );
-	$block_classname    = wp_get_block_default_classname( $block['blockName'] );
+	$layout_definitions = wp_get_layout_definitions();
 	$container_class    = wp_unique_id( 'wp-container-' );
 	$layout_classname   = '';
 
@@ -339,8 +611,10 @@ function wp_render_layout_support_flag( $block_content, $block ) {
 		$used_layout['type'] = 'constrained';
 	}
 
+	$root_padding_aware_alignments = _wp_array_get( $global_settings, array( 'useRootPaddingAwareAlignments' ), false );
+
 	if (
-		wp_get_global_settings( array( 'useRootPaddingAwareAlignments' ) ) &&
+		$root_padding_aware_alignments &&
 		isset( $used_layout['type'] ) &&
 		'constrained' === $used_layout['type']
 	) {
@@ -405,8 +679,11 @@ function wp_render_layout_support_flag( $block_content, $block ) {
 		 */
 		$should_skip_gap_serialization = wp_should_skip_block_supports_serialization( $block_type, 'spacing', 'blockGap' );
 
+		$block_gap             = _wp_array_get( $global_settings, array( 'spacing', 'blockGap' ), null );
+		$has_block_gap_support = isset( $block_gap );
+
 		$style = wp_get_layout_style(
-			".$block_classname.$container_class",
+			".$container_class.$container_class",
 			$used_layout,
 			$has_block_gap_support,
 			$gap_value,
@@ -421,18 +698,53 @@ function wp_render_layout_support_flag( $block_content, $block ) {
 		}
 	}
 
-	/*
-	 * This assumes the hook only applies to blocks with a single wrapper.
-	 * A limitation of this hook is that nested inner blocks wrappers are not yet supported.
-	 */
-	$content = preg_replace(
-		'/' . preg_quote( 'class="', '/' ) . '/',
-		'class="' . esc_attr( implode( ' ', $class_names ) ) . ' ',
-		$block_content,
-		1
-	);
+	// Add combined layout and block classname for global styles to hook onto.
+	$block_name    = explode( '/', $block['blockName'] );
+	$class_names[] = 'wp-block-' . end( $block_name ) . '-' . $layout_classname;
+
+	$content_with_outer_classnames = '';
+
+	if ( ! empty( $outer_class_names ) ) {
+		$content_with_outer_classnames = new WP_HTML_Tag_Processor( $block_content );
+		$content_with_outer_classnames->next_tag();
+		foreach ( $outer_class_names as $outer_class_name ) {
+			$content_with_outer_classnames->add_class( $outer_class_name );
+		}
+
+		$content_with_outer_classnames = (string) $content_with_outer_classnames;
+	}
+
+	/**
+	* The first chunk of innerContent contains the block markup up until the inner blocks start.
+	* This targets the opening tag of the inner blocks wrapper, which is the last tag in that chunk.
+	*/
+	$inner_content_classnames = '';
+
+	if ( isset( $block['innerContent'][0] ) && 'string' === gettype( $block['innerContent'][0] ) && count( $block['innerContent'] ) > 1 ) {
+		$tags            = new WP_HTML_Tag_Processor( $block['innerContent'][0] );
+		$last_classnames = '';
+		while ( $tags->next_tag() ) {
+			$last_classnames = $tags->get_attribute( 'class' );
+		}
+
+		$inner_content_classnames = (string) $last_classnames;
+	}
+
+	$content = $content_with_outer_classnames ? new WP_HTML_Tag_Processor( $content_with_outer_classnames ) : new WP_HTML_Tag_Processor( $block_content );
+
+	if ( $inner_content_classnames ) {
+		$content->next_tag( array( 'class_name' => $inner_content_classnames ) );
+		foreach ( $class_names as $class_name ) {
+			$content->add_class( $class_name );
+		}
+	} else {
+		$content->next_tag();
+		foreach ( $class_names as $class_name ) {
+			$content->add_class( $class_name );
+		}
+	}
 
-	return $content;
+	return (string) $content;
 }
 
 // Register the block support.
@@ -464,7 +776,7 @@ function wp_restore_group_inner_container( $block_content, $block ) {
 	);
 
 	if (
-		WP_Theme_JSON_Resolver::theme_has_support() ||
+		wp_theme_has_theme_json() ||
 		1 === preg_match( $group_with_inner_container_regex, $block_content ) ||
 		( isset( $block['attrs']['layout']['type'] ) && 'flex' === $block['attrs']['layout']['type'] )
 	) {
@@ -527,7 +839,7 @@ function wp_restore_image_outer_container( $block_content, $block ) {
 )/iUx";
 
 	if (
-		WP_Theme_JSON_Resolver::theme_has_support() ||
+		wp_theme_has_theme_json() ||
 		0 === preg_match( $image_with_align, $block_content, $matches )
 	) {
 		return $block_content;
diff --git a/src/wp-includes/block-supports/position.php b/src/wp-includes/block-supports/position.php
new file mode 100644
index 0000000000000..164305cf284a3
--- /dev/null
+++ b/src/wp-includes/block-supports/position.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Position block support flag.
+ *
+ * @package WordPress
+ * @since 6.2.0
+ */
+
+/**
+ * Registers the style block attribute for block types that support it.
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_position_support( $block_type ) {
+	$has_position_support = block_has_support( $block_type, 'position', false );
+
+	// Set up attributes and styles within that if needed.
+	if ( ! $block_type->attributes ) {
+		$block_type->attributes = array();
+	}
+
+	if ( $has_position_support && ! array_key_exists( 'style', $block_type->attributes ) ) {
+		$block_type->attributes['style'] = array(
+			'type' => 'object',
+		);
+	}
+}
+
+/**
+ * Renders position styles to the block wrapper.
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ * @return string                Filtered block content.
+ */
+function wp_render_position_support( $block_content, $block ) {
+	$block_type           = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	$has_position_support = block_has_support( $block_type, 'position', false );
+
+	if (
+		! $has_position_support ||
+		empty( $block['attrs']['style']['position'] )
+	) {
+		return $block_content;
+	}
+
+	$global_settings          = wp_get_global_settings();
+	$theme_has_sticky_support = _wp_array_get( $global_settings, array( 'position', 'sticky' ), false );
+	$theme_has_fixed_support  = _wp_array_get( $global_settings, array( 'position', 'fixed' ), false );
+
+	// Only allow output for position types that the theme supports.
+	$allowed_position_types = array();
+	if ( true === $theme_has_sticky_support ) {
+		$allowed_position_types[] = 'sticky';
+	}
+	if ( true === $theme_has_fixed_support ) {
+		$allowed_position_types[] = 'fixed';
+	}
+
+	$style_attribute = _wp_array_get( $block, array( 'attrs', 'style' ), null );
+	$class_name      = wp_unique_id( 'wp-container-' );
+	$selector        = ".$class_name";
+	$position_styles = array();
+	$position_type   = _wp_array_get( $style_attribute, array( 'position', 'type' ), '' );
+	$wrapper_classes = array();
+
+	if (
+		in_array( $position_type, $allowed_position_types, true )
+	) {
+		$wrapper_classes[] = $class_name;
+		$wrapper_classes[] = 'is-position-' . $position_type;
+		$sides             = array( 'top', 'right', 'bottom', 'left' );
+
+		foreach ( $sides as $side ) {
+			$side_value = _wp_array_get( $style_attribute, array( 'position', $side ) );
+			if ( null !== $side_value ) {
+				/*
+				 * For fixed or sticky top positions,
+				 * ensure the value includes an offset for the logged in admin bar.
+				 */
+				if (
+					'top' === $side &&
+					( 'fixed' === $position_type || 'sticky' === $position_type )
+				) {
+					// Ensure 0 values can be used in `calc()` calculations.
+					if ( '0' === $side_value || 0 === $side_value ) {
+						$side_value = '0px';
+					}
+
+					// Ensure current side value also factors in the height of the logged in admin bar.
+					$side_value = "calc($side_value + var(--wp-admin--admin-bar--position-offset, 0px))";
+				}
+
+				$position_styles[] =
+					array(
+						'selector'     => $selector,
+						'declarations' => array(
+							$side => $side_value,
+						),
+					);
+			}
+		}
+
+		$position_styles[] =
+			array(
+				'selector'     => $selector,
+				'declarations' => array(
+					'position' => $position_type,
+					'z-index'  => '10',
+				),
+			);
+	}
+
+	if ( ! empty( $position_styles ) ) {
+		/*
+		 * Add to the style engine store to enqueue and render position styles.
+		 */
+		wp_style_engine_get_stylesheet_from_css_rules(
+			$position_styles,
+			array(
+				'context'  => 'block-supports',
+				'prettify' => false,
+			)
+		);
+
+		// Inject class name to block container markup.
+		$content = new WP_HTML_Tag_Processor( $block_content );
+		$content->next_tag();
+		foreach ( $wrapper_classes as $class ) {
+			$content->add_class( $class );
+		}
+		return (string) $content;
+	}
+
+	return $block_content;
+}
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register(
+	'position',
+	array(
+		'register_attribute' => 'wp_register_position_support',
+	)
+);
+add_filter( 'render_block', 'wp_render_position_support', 10, 2 );
diff --git a/src/wp-includes/block-supports/settings.php b/src/wp-includes/block-supports/settings.php
new file mode 100644
index 0000000000000..350eb24fe4039
--- /dev/null
+++ b/src/wp-includes/block-supports/settings.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Block level presets support.
+ *
+ * @package WordPress
+ * @since 6.2.0
+ */
+
+/**
+ * Get the class name used on block level presets.
+ *
+ * @internal
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param array $block Block object.
+ * @return string      The unique class name.
+ */
+function _wp_get_presets_class_name( $block ) {
+	return 'wp-settings-' . md5( serialize( $block ) );
+}
+
+/**
+ * Update the block content with block level presets class name.
+ *
+ * @internal
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ * @return string                Filtered block content.
+ */
+function _wp_add_block_level_presets_class( $block_content, $block ) {
+	if ( ! $block_content ) {
+		return $block_content;
+	}
+
+	// return early if the block doesn't have support for settings.
+	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	if ( ! block_has_support( $block_type, '__experimentalSettings', false ) ) {
+		return $block_content;
+	}
+
+	// return early if no settings are found on the block attributes.
+	$block_settings = _wp_array_get( $block, array( 'attrs', 'settings' ), null );
+	if ( empty( $block_settings ) ) {
+		return $block_content;
+	}
+
+	// Like the layout hook this assumes the hook only applies to blocks with a single wrapper.
+	// Add the class name to the first element, presuming it's the wrapper, if it exists.
+	$tags = new WP_HTML_Tag_Processor( $block_content );
+	if ( $tags->next_tag() ) {
+		$tags->add_class( _wp_get_presets_class_name( $block ) );
+	}
+
+	return $tags->get_updated_html();
+}
+
+/**
+ * Render the block level presets stylesheet.
+ *
+ * @internal
+ *
+ * @since 6.2.0
+ * @since 6.3.0 Updated preset styles to use Selectors API.
+ * @access private
+ *
+ * @param string|null $pre_render   The pre-rendered content. Default null.
+ * @param array       $block The block being rendered.
+ *
+ * @return null
+ */
+function _wp_add_block_level_preset_styles( $pre_render, $block ) {
+	// Return early if the block has not support for descendent block styles.
+	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	if ( ! block_has_support( $block_type, '__experimentalSettings', false ) ) {
+		return null;
+	}
+
+	// return early if no settings are found on the block attributes.
+	$block_settings = _wp_array_get( $block, array( 'attrs', 'settings' ), null );
+	if ( empty( $block_settings ) ) {
+		return null;
+	}
+
+	$class_name = '.' . _wp_get_presets_class_name( $block );
+
+	// the root selector for preset variables needs to target every possible block selector
+	// in order for the general setting to override any bock specific setting of a parent block or
+	// the site root.
+	$variables_root_selector = '*,[class*="wp-block"]';
+	$registry                = WP_Block_Type_Registry::get_instance();
+	$blocks                  = $registry->get_all_registered();
+	foreach ( $blocks as $block_type ) {
+		/*
+		 * We only want to append selectors for blocks using custom selectors
+		 * i.e. not `wp-block-<name>`.
+		 */
+		$has_custom_selector =
+			( isset( $block_type->supports['__experimentalSelector'] ) && is_string( $block_type->supports['__experimentalSelector'] ) ) ||
+			( isset( $block_type->selectors['root'] ) && is_string( $block_type->selectors['root'] ) );
+
+		if ( $has_custom_selector ) {
+			$variables_root_selector .= ',' . wp_get_block_css_selector( $block_type );
+		}
+	}
+	$variables_root_selector = WP_Theme_JSON::scope_selector( $class_name, $variables_root_selector );
+
+	// Remove any potentially unsafe styles.
+	$theme_json_shape  = WP_Theme_JSON::remove_insecure_properties(
+		array(
+			'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+			'settings' => $block_settings,
+		)
+	);
+	$theme_json_object = new WP_Theme_JSON( $theme_json_shape );
+
+	$styles = '';
+
+	// include preset css variables declaration on the stylesheet.
+	$styles .= $theme_json_object->get_stylesheet(
+		array( 'variables' ),
+		null,
+		array(
+			'root_selector' => $variables_root_selector,
+			'scope'         => $class_name,
+		)
+	);
+
+	// include preset css classes on the the stylesheet.
+	$styles .= $theme_json_object->get_stylesheet(
+		array( 'presets' ),
+		null,
+		array(
+			'root_selector' => $class_name . ',' . $class_name . ' *',
+			'scope'         => $class_name,
+		)
+	);
+
+	if ( ! empty( $styles ) ) {
+		wp_enqueue_block_support_styles( $styles );
+	}
+
+	return null;
+}
+
+add_filter( 'render_block', '_wp_add_block_level_presets_class', 10, 2 );
+add_filter( 'pre_render_block', '_wp_add_block_level_preset_styles', 10, 2 );
diff --git a/src/wp-includes/block-supports/shadow.php b/src/wp-includes/block-supports/shadow.php
new file mode 100644
index 0000000000000..6fa05b248f4c4
--- /dev/null
+++ b/src/wp-includes/block-supports/shadow.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Shadow block support flag.
+ *
+ * @package WordPress
+ * @since 6.3.0
+ */
+
+/**
+ * Registers the style and shadow block attributes for block types that support it.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_shadow_support( $block_type ) {
+	$has_shadow_support = block_has_support( $block_type, 'shadow', false );
+
+	if ( ! $has_shadow_support ) {
+		return;
+	}
+
+	if ( ! $block_type->attributes ) {
+		$block_type->attributes = array();
+	}
+
+	if ( array_key_exists( 'style', $block_type->attributes ) ) {
+		$block_type->attributes['style'] = array(
+			'type' => 'object',
+		);
+	}
+
+	if ( array_key_exists( 'shadow', $block_type->attributes ) ) {
+		$block_type->attributes['shadow'] = array(
+			'type' => 'string',
+		);
+	}
+}
+
+/**
+ * Add CSS classes and inline styles for shadow features to the incoming attributes array.
+ * This will be applied to the block markup in the front-end.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @param  WP_Block_Type $block_type       Block type.
+ * @param  array         $block_attributes Block attributes.
+ * @return array Shadow CSS classes and inline styles.
+ */
+function wp_apply_shadow_support( $block_type, $block_attributes ) {
+	$has_shadow_support = block_has_support( $block_type, 'shadow', false );
+
+	if ( ! $has_shadow_support ) {
+		return array();
+	}
+
+	$shadow_block_styles = array();
+
+	$preset_shadow                 = array_key_exists( 'shadow', $block_attributes ) ? "var:preset|shadow|{$block_attributes['shadow']}" : null;
+	$custom_shadow                 = isset( $block_attributes['style']['shadow'] ) ? $block_attributes['style']['shadow'] : null;
+	$shadow_block_styles['shadow'] = $preset_shadow ? $preset_shadow : $custom_shadow;
+
+	$attributes = array();
+	$styles     = wp_style_engine_get_styles( $shadow_block_styles );
+
+	if ( ! empty( $styles['css'] ) ) {
+		$attributes['style'] = $styles['css'];
+	}
+
+	return $attributes;
+}
+
+// Register the block support.
+WP_Block_Supports::get_instance()->register(
+	'shadow',
+	array(
+		'register_attribute' => 'wp_register_shadow_support',
+		'apply'              => 'wp_apply_shadow_support',
+	)
+);
diff --git a/src/wp-includes/block-supports/spacing.php b/src/wp-includes/block-supports/spacing.php
index ecb68566d9778..3b544720546f9 100644
--- a/src/wp-includes/block-supports/spacing.php
+++ b/src/wp-includes/block-supports/spacing.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Spacing block support flag.
-
+ *
  * For backwards compatibility, this remains separate to the dimensions.php
  * block support despite both belonging under a single panel in the editor.
  *
@@ -18,7 +18,7 @@
  * @param WP_Block_Type $block_type Block Type.
  */
 function wp_register_spacing_support( $block_type ) {
-	$has_spacing_support = block_has_support( $block_type, array( 'spacing' ), false );
+	$has_spacing_support = block_has_support( $block_type, 'spacing', false );
 
 	// Setup attributes and styles within that if needed.
 	if ( ! $block_type->attributes ) {
@@ -33,7 +33,7 @@ function wp_register_spacing_support( $block_type ) {
 }
 
 /**
- * Add CSS classes for block spacing to the incoming attributes array.
+ * Adds CSS classes for block spacing to the incoming attributes array.
  * This will be applied to the block markup in the front-end.
  *
  * @since 5.8.0
diff --git a/src/wp-includes/block-supports/typography.php b/src/wp-includes/block-supports/typography.php
index 2a1d90f55efea..78c8b0a2ffd0d 100644
--- a/src/wp-includes/block-supports/typography.php
+++ b/src/wp-includes/block-supports/typography.php
@@ -10,6 +10,7 @@
  * Registers the style and typography block attributes for block types that support it.
  *
  * @since 5.6.0
+ * @since 6.3.0 Added support for text-columns.
  * @access private
  *
  * @param WP_Block_Type $block_type Block Type.
@@ -30,6 +31,7 @@ function wp_register_typography_support( $block_type ) {
 	$has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
 	$has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
 	$has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
+	$has_text_columns_support    = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
 	$has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
 	$has_text_transform_support  = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
 
@@ -39,6 +41,7 @@ function wp_register_typography_support( $block_type ) {
 		|| $has_font_weight_support
 		|| $has_letter_spacing_support
 		|| $has_line_height_support
+		|| $has_text_columns_support
 		|| $has_text_decoration_support
 		|| $has_text_transform_support;
 
@@ -72,6 +75,7 @@ function wp_register_typography_support( $block_type ) {
  *
  * @since 5.6.0
  * @since 6.1.0 Used the style engine to generate CSS and classnames.
+ * @since 6.3.0 Added support for text-columns.
  * @access private
  *
  * @param WP_Block_Type $block_type       Block type.
@@ -98,6 +102,7 @@ function wp_apply_typography_support( $block_type, $block_attributes ) {
 	$has_font_weight_support     = _wp_array_get( $typography_supports, array( '__experimentalFontWeight' ), false );
 	$has_letter_spacing_support  = _wp_array_get( $typography_supports, array( '__experimentalLetterSpacing' ), false );
 	$has_line_height_support     = _wp_array_get( $typography_supports, array( 'lineHeight' ), false );
+	$has_text_columns_support    = _wp_array_get( $typography_supports, array( 'textColumns' ), false );
 	$has_text_decoration_support = _wp_array_get( $typography_supports, array( '__experimentalTextDecoration' ), false );
 	$has_text_transform_support  = _wp_array_get( $typography_supports, array( '__experimentalTextTransform' ), false );
 
@@ -107,6 +112,7 @@ function wp_apply_typography_support( $block_type, $block_attributes ) {
 	$should_skip_font_style      = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontStyle' );
 	$should_skip_font_weight     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'fontWeight' );
 	$should_skip_line_height     = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'lineHeight' );
+	$should_skip_text_columns    = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textColumns' );
 	$should_skip_text_decoration = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textDecoration' );
 	$should_skip_text_transform  = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'textTransform' );
 	$should_skip_letter_spacing  = wp_should_skip_block_supports_serialization( $block_type, 'typography', 'letterSpacing' );
@@ -162,6 +168,10 @@ function wp_apply_typography_support( $block_type, $block_attributes ) {
 		$typography_block_styles['lineHeight'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'lineHeight' ) );
 	}
 
+	if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) {
+		$typography_block_styles['textColumns'] = _wp_array_get( $block_attributes, array( 'style', 'typography', 'textColumns' ), null );
+	}
+
 	if (
 		$has_text_decoration_support &&
 		! $should_skip_text_decoration &&
@@ -368,6 +378,7 @@ function wp_get_typography_value_and_unit( $raw_value, $options = array() ) {
  * width and min/max font sizes.
  *
  * @since 6.1.0
+ * @since 6.3.0 Checks for unsupported min/max viewport values that cause invalid clamp values.
  * @access private
  *
  * @param array $args {
@@ -433,6 +444,11 @@ function wp_get_computed_fluid_typography_value( $args = array() ) {
 		)
 	);
 
+	// Protects against unsupported units in min and max viewport widths.
+	if ( ! $minimum_viewport_width || ! $maximum_viewport_width ) {
+		return null;
+	}
+
 	/*
 	 * Build CSS rule.
 	 * Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
@@ -452,6 +468,9 @@ function wp_get_computed_fluid_typography_value( $args = array() ) {
  * formula depending on available, valid values.
  *
  * @since 6.1.0
+ * @since 6.1.1 Adjusted rules for min and max font sizes.
+ * @since 6.2.0 Added 'settings.typography.fluid.minFontSize' support.
+ * @since 6.3.0 Using layout.wideSize as max viewport width, and logarithmic scale factor to calculate minimum font scale.
  *
  * @param array $preset                     {
  *     Required. fontSizes preset value as seen in theme.json.
@@ -478,20 +497,34 @@ function wp_get_typography_font_size_value( $preset, $should_use_fluid_typograph
 	}
 
 	// Checks if fluid font sizes are activated.
-	$typography_settings         = wp_get_global_settings( array( 'typography' ) );
-	$should_use_fluid_typography = isset( $typography_settings['fluid'] ) && true === $typography_settings['fluid'] ? true : $should_use_fluid_typography;
+	$global_settings     = wp_get_global_settings();
+	$typography_settings = isset( $global_settings['typography'] ) ? $global_settings['typography'] : array();
+	$layout_settings     = isset( $global_settings['layout'] ) ? $global_settings['layout'] : array();
+
+	if (
+		isset( $typography_settings['fluid'] ) &&
+		( true === $typography_settings['fluid'] || is_array( $typography_settings['fluid'] ) )
+	) {
+		$should_use_fluid_typography = true;
+	}
 
 	if ( ! $should_use_fluid_typography ) {
 		return $preset['size'];
 	}
 
+	$fluid_settings = isset( $typography_settings['fluid'] ) && is_array( $typography_settings['fluid'] )
+		? $typography_settings['fluid']
+		: array();
+
 	// Defaults.
-	$default_maximum_viewport_width   = '1600px';
-	$default_minimum_viewport_width   = '768px';
-	$default_minimum_font_size_factor = 0.75;
-	$default_maximum_font_size_factor = 1.5;
-	$default_scale_factor             = 1;
-	$default_minimum_font_size_limit  = '14px';
+	$default_maximum_viewport_width       = isset( $layout_settings['wideSize'] ) ? $layout_settings['wideSize'] : '1600px';
+	$default_minimum_viewport_width       = '320px';
+	$default_minimum_font_size_factor_max = 0.75;
+	$default_minimum_font_size_factor_min = 0.25;
+	$default_scale_factor                 = 1;
+	$has_min_font_size                    = isset( $fluid_settings['minFontSize'] ) &&
+		! empty( wp_get_typography_value_and_unit( $fluid_settings['minFontSize'] ) );
+	$default_minimum_font_size_limit      = $has_min_font_size ? $fluid_settings['minFontSize'] : '14px';
 
 	// Font sizes.
 	$fluid_font_size_settings = isset( $preset['fluid'] ) ? $preset['fluid'] : null;
@@ -508,22 +541,15 @@ function wp_get_typography_font_size_value( $preset, $should_use_fluid_typograph
 	// Font sizes.
 	$preferred_size = wp_get_typography_value_and_unit( $preset['size'] );
 
-	// Protect against unsupported units.
+	// Protects against unsupported units.
 	if ( empty( $preferred_size['unit'] ) ) {
 		return $preset['size'];
 	}
 
-	// If no fluid max font size is available, create one using max font size factor.
-	if ( ! $maximum_font_size_raw ) {
-		$maximum_font_size_raw = round( $preferred_size['value'] * $default_maximum_font_size_factor, 3 ) . $preferred_size['unit'];
-	}
-
-	// If no fluid min font size is available, create one using min font size factor.
-	if ( ! $minimum_font_size_raw ) {
-		$minimum_font_size_raw = round( $preferred_size['value'] * $default_minimum_font_size_factor, 3 ) . $preferred_size['unit'];
-	}
-
-	// Normalizes the minimum font size limit according to the incoming unit, so we can perform checks using it.
+	/*
+	 * Normalizes the minimum font size limit according to the incoming unit,
+	 * in order to perform comparative checks.
+	 */
 	$minimum_font_size_limit = wp_get_typography_value_and_unit(
 		$default_minimum_font_size_limit,
 		array(
@@ -531,29 +557,44 @@ function wp_get_typography_font_size_value( $preset, $should_use_fluid_typograph
 		)
 	);
 
-	if ( ! empty( $minimum_font_size_limit ) ) {
+	// Don't enforce minimum font size if a font size has explicitly set a min and max value.
+	if ( ! empty( $minimum_font_size_limit ) && ( ! $minimum_font_size_raw && ! $maximum_font_size_raw ) ) {
 		/*
 		 * If a minimum size was not passed to this function
 		 * and the user-defined font size is lower than $minimum_font_size_limit,
-		 * then use the user-defined font size as the minimum font-size.
+		 * do not calculate a fluid value.
 		 */
-		if ( ! isset( $fluid_font_size_settings['min'] ) && $preferred_size['value'] < $minimum_font_size_limit['value'] ) {
-			$minimum_font_size_raw = implode( '', $preferred_size );
+		if ( $preferred_size['value'] <= $minimum_font_size_limit['value'] ) {
+			return $preset['size'];
+		}
+	}
+
+	// If no fluid max font size is available use the incoming value.
+	if ( ! $maximum_font_size_raw ) {
+		$maximum_font_size_raw = $preferred_size['value'] . $preferred_size['unit'];
+	}
+
+	/*
+	 * If no minimumFontSize is provided, create one using
+	 * the given font size multiplied by the min font size scale factor.
+	 */
+	if ( ! $minimum_font_size_raw ) {
+		$preferred_font_size_in_px = 'px' === $preferred_size['unit'] ? $preferred_size['value'] : $preferred_size['value'] * 16;
+
+		/*
+		 * The scale factor is a multiplier that affects how quickly the curve will move towards the minimum,
+		 * that is, how quickly the size factor reaches 0 given increasing font size values.
+		 * For a - b * log2(), lower values of b will make the curve move towards the minimum faster.
+		 * The scale factor is constrained between min and max values.
+		 */
+		$minimum_font_size_factor     = min( max( 1 - 0.075 * log( $preferred_font_size_in_px, 2 ), $default_minimum_font_size_factor_min ), $default_minimum_font_size_factor_max );
+		$calculated_minimum_font_size = round( $preferred_size['value'] * $minimum_font_size_factor, 3 );
+
+		// Only use calculated min font size if it's > $minimum_font_size_limit value.
+		if ( ! empty( $minimum_font_size_limit ) && $calculated_minimum_font_size <= $minimum_font_size_limit['value'] ) {
+			$minimum_font_size_raw = $minimum_font_size_limit['value'] . $minimum_font_size_limit['unit'];
 		} else {
-			$minimum_font_size_parsed = wp_get_typography_value_and_unit(
-				$minimum_font_size_raw,
-				array(
-					'coerce_to' => $preferred_size['unit'],
-				)
-			);
-
-			/*
-			 * If the passed or calculated minimum font size is lower than $minimum_font_size_limit
-			 * use $minimum_font_size_limit instead.
-			 */
-			if ( ! empty( $minimum_font_size_parsed ) && $minimum_font_size_parsed['value'] < $minimum_font_size_limit['value'] ) {
-				$minimum_font_size_raw = implode( '', $minimum_font_size_limit );
-			}
+			$minimum_font_size_raw = $calculated_minimum_font_size . $preferred_size['unit'];
 		}
 	}
 
diff --git a/src/wp-includes/block-supports/utils.php b/src/wp-includes/block-supports/utils.php
index 6e15d5388bd2a..7c5d7db48a150 100644
--- a/src/wp-includes/block-supports/utils.php
+++ b/src/wp-includes/block-supports/utils.php
@@ -18,7 +18,7 @@
  * @param string        $feature_set Name of block support feature set..
  * @param string        $feature     Optional name of individual feature to check.
  *
- * @return boolean Whether to serialize block support styles & classes.
+ * @return bool Whether to serialize block support styles & classes.
  */
 function wp_should_skip_block_supports_serialization( $block_type, $feature_set, $feature = null ) {
 	if ( ! is_object( $block_type ) || ! $feature_set ) {
diff --git a/src/wp-includes/block-template-utils.php b/src/wp-includes/block-template-utils.php
index 5db20bf08c463..b8538ee3b43e2 100644
--- a/src/wp-includes/block-template-utils.php
+++ b/src/wp-includes/block-template-utils.php
@@ -59,13 +59,13 @@ function get_block_theme_folders( $theme_stylesheet = null ) {
  *
  * @since 5.9.0
  *
- * @return array The supported template part area values.
+ * @return array[] The supported template part area values.
  */
 function get_allowed_block_template_part_areas() {
 	$default_area_definitions = array(
 		array(
 			'area'        => WP_TEMPLATE_PART_AREA_UNCATEGORIZED,
-			'label'       => __( 'General' ),
+			'label'       => _x( 'General', 'template part area' ),
 			'description' => __(
 				'General templates often perform a specific role like displaying post content, and are not tied to any particular area.'
 			),
@@ -74,7 +74,7 @@ function get_allowed_block_template_part_areas() {
 		),
 		array(
 			'area'        => WP_TEMPLATE_PART_AREA_HEADER,
-			'label'       => __( 'Header' ),
+			'label'       => _x( 'Header', 'template part area' ),
 			'description' => __(
 				'The Header template defines a page area that typically contains a title, logo, and main navigation.'
 			),
@@ -83,7 +83,7 @@ function get_allowed_block_template_part_areas() {
 		),
 		array(
 			'area'        => WP_TEMPLATE_PART_AREA_FOOTER,
-			'label'       => __( 'Footer' ),
+			'label'       => _x( 'Footer', 'template part area' ),
 			'description' => __(
 				'The Footer template defines a page area that typically contains site credits, social links, or any other combination of blocks.'
 			),
@@ -97,7 +97,7 @@ function get_allowed_block_template_part_areas() {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array $default_area_definitions An array of supported area objects.
+	 * @param array[] $default_area_definitions An array of supported area objects.
 	 */
 	return apply_filters( 'default_wp_template_part_areas', $default_area_definitions );
 }
@@ -109,73 +109,73 @@ function get_allowed_block_template_part_areas() {
  *
  * @since 5.9.0
  *
- * @return array The default template types.
+ * @return array[] The default template types.
  */
 function get_default_block_template_types() {
 	$default_template_types = array(
 		'index'          => array(
 			'title'       => _x( 'Index', 'Template name' ),
-			'description' => __( 'Displays posts.' ),
+			'description' => __( 'Used as a fallback template for all pages when a more specific template is not defined.' ),
 		),
 		'home'           => array(
-			'title'       => _x( 'Home', 'Template name' ),
-			'description' => __( 'Displays posts on the homepage, or on the Posts page if a static homepage is set.' ),
+			'title'       => _x( 'Blog Home', 'Template name' ),
+			'description' => __( 'Displays the latest posts as either the site homepage or as the "Posts page" as defined under reading settings. If it exists, the Front Page template overrides this template when posts are shown on the homepage.' ),
 		),
 		'front-page'     => array(
 			'title'       => _x( 'Front Page', 'Template name' ),
-			'description' => __( 'Displays the homepage.' ),
+			'description' => __( 'Displays your site\'s homepage, whether it is set to display latest posts or a static page. The Front Page template takes precedence over all templates.' ),
 		),
 		'singular'       => array(
-			'title'       => _x( 'Singular', 'Template name' ),
-			'description' => __( 'Displays a single post or page.' ),
+			'title'       => _x( 'Single Entries', 'Template name' ),
+			'description' => __( 'Displays any single entry, such as a post or a page. This template will serve as a fallback when a more specific template (e.g. Single Post, Page, or Attachment) cannot be found.' ),
 		),
 		'single'         => array(
-			'title'       => _x( 'Single', 'Template name' ),
-			'description' => __( 'The default template for displaying any single post or attachment.' ),
+			'title'       => _x( 'Single Posts', 'Template name' ),
+			'description' => __( 'Displays single posts on your website unless a custom template has been applied to that post or a dedicated template exists.' ),
 		),
 		'page'           => array(
-			'title'       => _x( 'Page', 'Template name' ),
-			'description' => __( 'Displays a single page.' ),
+			'title'       => _x( 'Pages', 'Template name' ),
+			'description' => __( 'Display all static pages unless a custom template has been applied or a dedicated template exists.' ),
 		),
 		'archive'        => array(
-			'title'       => _x( 'Archive', 'Template name' ),
-			'description' => __( 'Displays post categories, tags, and other archives.' ),
+			'title'       => _x( 'All Archives', 'Template name' ),
+			'description' => __( 'Displays any archive, including posts by a single author, category, tag, taxonomy, custom post type, and date. This template will serve as a fallback when more specific templates (e.g. Category or Tag) cannot be found.' ),
 		),
 		'author'         => array(
-			'title'       => _x( 'Author', 'Template name' ),
-			'description' => __( 'Displays latest posts written by a single author.' ),
+			'title'       => _x( 'Author Archives', 'Template name' ),
+			'description' => __( 'Displays a single author\'s post archive. This template will serve as a fallback when a more specific template (e.g. Author: Admin) cannot be found.' ),
 		),
 		'category'       => array(
-			'title'       => _x( 'Category', 'Template name' ),
-			'description' => __( 'Displays latest posts from a single post category.' ),
+			'title'       => _x( 'Category Archives', 'Template name' ),
+			'description' => __( 'Displays a post category archive. This template will serve as a fallback when a more specific template (e.g. Category: Recipes) cannot be found.' ),
 		),
 		'taxonomy'       => array(
 			'title'       => _x( 'Taxonomy', 'Template name' ),
-			'description' => __( 'Displays latest posts from a single post taxonomy.' ),
+			'description' => __( 'Displays a custom taxonomy archive. Like categories and tags, taxonomies have terms which you use to classify things. For example: a taxonomy named "Art" can have multiple terms, such as "Modern" and "18th Century." This template will serve as a fallback when a more specific template (e.g. Taxonomy: Art) cannot be found.' ),
 		),
 		'date'           => array(
-			'title'       => _x( 'Date', 'Template name' ),
-			'description' => __( 'Displays posts from a specific date.' ),
+			'title'       => _x( 'Date Archives', 'Template name' ),
+			'description' => __( 'Displays a post archive when a specific date is visited (e.g., example.com/2023/).' ),
 		),
 		'tag'            => array(
-			'title'       => _x( 'Tag', 'Template name' ),
-			'description' => __( 'Displays latest posts with a single post tag.' ),
+			'title'       => _x( 'Tag Archives', 'Template name' ),
+			'description' => __( 'Displays a post tag archive. This template will serve as a fallback when a more specific template (e.g. Tag: Pizza) cannot be found.' ),
 		),
 		'attachment'     => array(
-			'title'       => __( 'Media' ),
-			'description' => __( 'Displays individual media items or attachments.' ),
+			'title'       => __( 'Attachment Pages' ),
+			'description' => __( 'Displays when a visitor views the dedicated page that exists for any media attachment.' ),
 		),
 		'search'         => array(
-			'title'       => _x( 'Search', 'Template name' ),
-			'description' => __( 'Displays search results.' ),
+			'title'       => _x( 'Search Results', 'Template name' ),
+			'description' => __( 'Displays when a visitor performs a search on your website.' ),
 		),
 		'privacy-policy' => array(
 			'title'       => __( 'Privacy Policy' ),
-			'description' => __( 'Displays the privacy policy page.' ),
+			'description' => __( 'Displays your site\'s Privacy Policy page.' ),
 		),
 		'404'            => array(
-			'title'       => _x( '404', 'Template name' ),
-			'description' => __( 'Displays when no content is found.' ),
+			'title'       => _x( 'Page: 404', 'Template name' ),
+			'description' => __( 'Displays when a visitor views a non-existent page, such as a dead link or a mistyped URL.' ),
 		),
 	);
 
@@ -184,7 +184,7 @@ function get_default_block_template_types() {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array $default_template_types An array of template types, formatted as [ slug => [ title, description ] ].
+	 * @param array[] $default_template_types An array of template types, formatted as [ slug => [ title, description ] ].
 	 */
 	return apply_filters( 'default_template_types', $default_template_types );
 }
@@ -227,7 +227,7 @@ static function ( $item ) {
  * @access private
  *
  * @param string $base_directory The theme's file path.
- * @return array A list of paths to all template part files.
+ * @return string[] A list of paths to all template part files.
  */
 function _get_block_templates_paths( $base_directory ) {
 	$path_list = array();
@@ -249,7 +249,18 @@ function _get_block_templates_paths( $base_directory ) {
  *
  * @param string $template_type 'wp_template' or 'wp_template_part'.
  * @param string $slug          Template slug.
- * @return array|null Template.
+ * @return array|null {
+ *    Array with template metadata if $template_type is one of 'wp_template' or 'wp_template_part'.
+ *    null otherwise.
+ *
+ *    @type string   $slug      Template slug.
+ *    @type string   $path      Template file path.
+ *    @type string   $theme     Theme slug.
+ *    @type string   $type      Template type.
+ *    @type string   $area      Template area. Only for 'wp_template_part'.
+ *    @type string   $title     Optional. Template title.
+ *    @type string[] $postTypes Optional. List of post types that the template supports. Only for 'wp_template'.
+ * }
  */
 function _get_block_template_file( $template_type, $slug ) {
 	if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) {
@@ -290,20 +301,41 @@ function _get_block_template_file( $template_type, $slug ) {
  * Retrieves the template files from the theme.
  *
  * @since 5.9.0
+ * @since 6.3.0 Added the `$query` parameter.
  * @access private
  *
  * @param string $template_type 'wp_template' or 'wp_template_part'.
- * @return array Template.
+ * @param array  $query {
+ *     Arguments to retrieve templates. Optional, empty by default.
+ *
+ *     @type string[] $slug__in     List of slugs to include.
+ *     @type string[] $slug__not_in List of slugs to skip.
+ *     @type string   $area         A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+ *     @type string   $post_type    Post type to get the templates for.
+ * }
+ *
+ * @return array Template
  */
-function _get_block_templates_files( $template_type ) {
+function _get_block_templates_files( $template_type, $query = array() ) {
 	if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) {
 		return null;
 	}
 
-	$themes         = array(
-		get_stylesheet() => get_stylesheet_directory(),
-		get_template()   => get_template_directory(),
+	// Prepare metadata from $query.
+	$slugs_to_include = isset( $query['slug__in'] ) ? $query['slug__in'] : array();
+	$slugs_to_skip    = isset( $query['slug__not_in'] ) ? $query['slug__not_in'] : array();
+	$area             = isset( $query['area'] ) ? $query['area'] : null;
+	$post_type        = isset( $query['post_type'] ) ? $query['post_type'] : '';
+
+	$stylesheet = get_stylesheet();
+	$template   = get_template();
+	$themes     = array(
+		$stylesheet => get_stylesheet_directory(),
 	);
+	// Add the parent theme if it's not the same as the current theme.
+	if ( $stylesheet !== $template ) {
+		$themes[ $template ] = get_template_directory();
+	}
 	$template_files = array();
 	foreach ( $themes as $theme_slug => $theme_dir ) {
 		$template_base_paths  = get_block_theme_folders( $theme_slug );
@@ -317,6 +349,25 @@ function _get_block_templates_files( $template_type ) {
 				// Subtract ending '.html'.
 				-5
 			);
+
+			// Skip this item if its slug doesn't match any of the slugs to include.
+			if ( ! empty( $slugs_to_include ) && ! in_array( $template_slug, $slugs_to_include, true ) ) {
+				continue;
+			}
+
+			// Skip this item if its slug matches any of the slugs to skip.
+			if ( ! empty( $slugs_to_skip ) && in_array( $template_slug, $slugs_to_skip, true ) ) {
+				continue;
+			}
+
+			/*
+			 * The child theme items (stylesheet) are processed before the parent theme's (template).
+			 * If a child theme defines a template, prevent the parent template from being added to the list as well.
+			 */
+			if ( isset( $template_files[ $template_slug ] ) ) {
+				continue;
+			}
+
 			$new_template_item = array(
 				'slug'  => $template_slug,
 				'path'  => $template_file,
@@ -325,16 +376,25 @@ function _get_block_templates_files( $template_type ) {
 			);
 
 			if ( 'wp_template_part' === $template_type ) {
-				$template_files[] = _add_block_template_part_area_info( $new_template_item );
+				$candidate = _add_block_template_part_area_info( $new_template_item );
+				if ( ! isset( $area ) || ( isset( $area ) && $area === $candidate['area'] ) ) {
+					$template_files[ $template_slug ] = $candidate;
+				}
 			}
 
 			if ( 'wp_template' === $template_type ) {
-				$template_files[] = _add_block_template_info( $new_template_item );
+				$candidate = _add_block_template_info( $new_template_item );
+				if (
+					! $post_type ||
+					( $post_type && isset( $candidate['postTypes'] ) && in_array( $post_type, $candidate['postTypes'], true ) )
+				) {
+					$template_files[ $template_slug ] = $candidate;
+				}
 			}
 		}
 	}
 
-	return $template_files;
+	return array_values( $template_files );
 }
 
 /**
@@ -347,11 +407,11 @@ function _get_block_templates_files( $template_type ) {
  * @return array Template item.
  */
 function _add_block_template_info( $template_item ) {
-	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( ! wp_theme_has_theme_json() ) {
 		return $template_item;
 	}
 
-	$theme_data = WP_Theme_JSON_Resolver::get_theme_data()->get_custom_templates();
+	$theme_data = wp_get_theme_data_custom_templates();
 	if ( isset( $theme_data[ $template_item['slug'] ] ) ) {
 		$template_item['title']     = $theme_data[ $template_item['slug'] ]['title'];
 		$template_item['postTypes'] = $theme_data[ $template_item['slug'] ]['postTypes'];
@@ -370,8 +430,8 @@ function _add_block_template_info( $template_item ) {
  * @return array Template info.
  */
 function _add_block_template_part_area_info( $template_info ) {
-	if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
-		$theme_data = WP_Theme_JSON_Resolver::get_theme_data()->get_template_parts();
+	if ( wp_theme_has_theme_json() ) {
+		$theme_data = wp_get_theme_data_template_parts();
 	}
 
 	if ( isset( $theme_data[ $template_info['slug'] ]['area'] ) ) {
@@ -437,7 +497,7 @@ function _inject_theme_attribute_in_block_template_content( $template_content )
 			'core/template-part' === $block['blockName'] &&
 			! isset( $block['attrs']['theme'] )
 		) {
-			$block['attrs']['theme'] = wp_get_theme()->get_stylesheet();
+			$block['attrs']['theme'] = get_stylesheet();
 			$has_updated_content     = true;
 		}
 	}
@@ -490,6 +550,7 @@ function _remove_theme_attribute_in_block_template_content( $template_content )
  * Builds a unified template object based on a theme file.
  *
  * @since 5.9.0
+ * @since 6.3.0 Added `modified` property to template objects.
  * @access private
  *
  * @param array  $template_file Theme file.
@@ -499,7 +560,7 @@ function _remove_theme_attribute_in_block_template_content( $template_content )
 function _build_block_template_result_from_file( $template_file, $template_type ) {
 	$default_template_types = get_default_block_template_types();
 	$template_content       = file_get_contents( $template_file['path'] );
-	$theme                  = wp_get_theme()->get_stylesheet();
+	$theme                  = get_stylesheet();
 
 	$template                 = new WP_Block_Template();
 	$template->id             = $theme . '//' . $template_file['slug'];
@@ -512,6 +573,7 @@ function _build_block_template_result_from_file( $template_file, $template_type
 	$template->status         = 'publish';
 	$template->has_theme_file = true;
 	$template->is_custom      = true;
+	$template->modified       = null;
 
 	if ( 'wp_template' === $template_type && isset( $default_template_types[ $template_file['slug'] ] ) ) {
 		$template->description = $default_template_types[ $template_file['slug'] ]['description'];
@@ -556,10 +618,11 @@ function _wp_build_title_and_description_for_single_post_type_block_template( $p
 		'no_found_rows'          => true,
 	);
 
-	$args  = array(
+	$args = array(
 		'name' => $slug,
 	);
-	$args  = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
+
 	$posts_query = new WP_Query( $args );
 
 	if ( empty( $posts_query->posts ) ) {
@@ -591,7 +654,8 @@ function _wp_build_title_and_description_for_single_post_type_block_template( $p
 	$args = array(
 		'title' => $post_title,
 	);
-	$args                        = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
+
 	$posts_with_same_title_query = new WP_Query( $args );
 
 	if ( count( $posts_with_same_title_query->posts ) > 1 ) {
@@ -630,14 +694,15 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
 
 	$term_query = new WP_Term_Query();
 
-	$args  = array(
+	$args = array(
 		'number' => 1,
 		'slug'   => $slug,
 	);
-	$args        = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
+
 	$terms_query = $term_query->query( $args );
 
-	if ( empty( $terms_query->terms ) ) {
+	if ( empty( $terms_query ) ) {
 		$template->title = sprintf(
 			/* translators: Custom template title in the Site Editor, referencing a taxonomy term that was not found. 1: Taxonomy singular name, 2: Term slug. */
 			__( 'Not found: %1$s (%2$s)' ),
@@ -647,7 +712,7 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
 		return false;
 	}
 
-	$term_title = $terms_query->terms[0]->name;
+	$term_title = $terms_query[0]->name;
 
 	$template->title = sprintf(
 		/* translators: Custom template title in the Site Editor. 1: Taxonomy singular name, 2: Term title. */
@@ -668,10 +733,11 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
 		'number' => 2,
 		'name'   => $term_title,
 	);
-	$args                        = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
+
 	$terms_with_same_title_query = $term_query->query( $args );
 
-	if ( count( $terms_with_same_title_query->terms ) > 1 ) {
+	if ( count( $terms_with_same_title_query ) > 1 ) {
 		$template->title = sprintf(
 			/* translators: Custom template title in the Site Editor. 1: Template title, 2: Term slug. */
 			__( '%1$s (%2$s)' ),
@@ -687,10 +753,11 @@ function _wp_build_title_and_description_for_taxonomy_block_template( $taxonomy,
  * Builds a unified template object based a post Object.
  *
  * @since 5.9.0
+ * @since 6.3.0 Added `modified` property to template objects.
  * @access private
  *
  * @param WP_Post $post Template post.
- * @return WP_Block_Template|WP_Error Template.
+ * @return WP_Block_Template|WP_Error Template or error object.
  */
 function _build_block_template_result_from_post( $post ) {
 	$default_template_types = get_default_block_template_types();
@@ -706,7 +773,7 @@ function _build_block_template_result_from_post( $post ) {
 
 	$theme          = $terms[0]->name;
 	$template_file  = _get_block_template_file( $post->post_type, $post->post_name );
-	$has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
+	$has_theme_file = get_stylesheet() === $theme && null !== $template_file;
 
 	$origin           = get_post_meta( $post->ID, 'origin', true );
 	$is_wp_suggestion = get_post_meta( $post->ID, 'is_wp_suggestion', true );
@@ -726,6 +793,7 @@ function _build_block_template_result_from_post( $post ) {
 	$template->has_theme_file = $has_theme_file;
 	$template->is_custom      = empty( $is_wp_suggestion );
 	$template->author         = $post->post_author;
+	$template->modified       = $post->post_modified;
 
 	if ( 'wp_template' === $post->post_type && $has_theme_file && isset( $template_file['postTypes'] ) ) {
 		$template->post_types = $template_file['postTypes'];
@@ -861,13 +929,13 @@ function _build_block_template_result_from_post( $post ) {
  * @param array  $query {
  *     Optional. Arguments to retrieve templates.
  *
- *     @type array  $slug__in  List of slugs to include.
- *     @type int    $wp_id     Post ID of customized template.
- *     @type string $area      A 'wp_template_part_area' taxonomy value to filter by (for wp_template_part template type only).
- *     @type string $post_type Post type to get the templates for.
+ *     @type string[] $slug__in  List of slugs to include.
+ *     @type int      $wp_id     Post ID of customized template.
+ *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+ *     @type string   $post_type Post type to get the templates for.
  * }
  * @param string $template_type 'wp_template' or 'wp_template_part'.
- * @return array Templates.
+ * @return WP_Block_Template[] Array of block templates.
  */
 function get_block_templates( $query = array(), $template_type = 'wp_template' ) {
 	/**
@@ -878,15 +946,16 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 	 * @since 5.9.0
 	 *
 	 * @param WP_Block_Template[]|null $block_templates Return an array of block templates to short-circuit the default query,
-	 *                                                  or null to allow WP to run it's normal queries.
+	 *                                                  or null to allow WP to run its normal queries.
 	 * @param array  $query {
-	 *     Optional. Arguments to retrieve templates.
+	 *     Arguments to retrieve templates. All arguments are optional.
 	 *
-	 *     @type array  $slug__in List of slugs to include.
-	 *     @type int    $wp_id Post ID of customized template.
-	 *     @type string $post_type Post type to get the templates for.
+	 *     @type string[] $slug__in  List of slugs to include.
+	 *     @type int      $wp_id     Post ID of customized template.
+	 *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+	 *     @type string   $post_type Post type to get the templates for.
 	 * }
-	 * @param string $template_type wp_template or wp_template_part.
+	 * @param string $template_type 'wp_template' or 'wp_template_part'.
 	 */
 	$templates = apply_filters( 'pre_get_block_templates', null, $query, $template_type );
 	if ( ! is_null( $templates ) ) {
@@ -895,15 +964,16 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 
 	$post_type     = isset( $query['post_type'] ) ? $query['post_type'] : '';
 	$wp_query_args = array(
-		'post_status'    => array( 'auto-draft', 'draft', 'publish' ),
-		'post_type'      => $template_type,
-		'posts_per_page' => -1,
-		'no_found_rows'  => true,
-		'tax_query'      => array(
+		'post_status'         => array( 'auto-draft', 'draft', 'publish' ),
+		'post_type'           => $template_type,
+		'posts_per_page'      => -1,
+		'no_found_rows'       => true,
+		'lazy_load_term_meta' => false,
+		'tax_query'           => array(
 			array(
 				'taxonomy' => 'wp_theme',
 				'field'    => 'name',
-				'terms'    => wp_get_theme()->get_stylesheet(),
+				'terms'    => get_stylesheet(),
 			),
 		),
 	);
@@ -917,8 +987,9 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 		$wp_query_args['tax_query']['relation'] = 'AND';
 	}
 
-	if ( isset( $query['slug__in'] ) ) {
-		$wp_query_args['post_name__in'] = $query['slug__in'];
+	if ( ! empty( $query['slug__in'] ) ) {
+		$wp_query_args['post_name__in']  = $query['slug__in'];
+		$wp_query_args['posts_per_page'] = count( array_unique( $query['slug__in'] ) );
 	}
 
 	// This is only needed for the regular templates/template parts post type listing and editor.
@@ -953,34 +1024,14 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 	}
 
 	if ( ! isset( $query['wp_id'] ) ) {
-		$template_files = _get_block_templates_files( $template_type );
+		/*
+		 * If the query has found some use templates, those have priority
+		 * over the theme-provided ones, so we skip querying and building them.
+		 */
+		$query['slug__not_in'] = wp_list_pluck( $query_result, 'slug' );
+		$template_files        = _get_block_templates_files( $template_type, $query );
 		foreach ( $template_files as $template_file ) {
-			$template = _build_block_template_result_from_file( $template_file, $template_type );
-
-			if ( $post_type && ! $template->is_custom ) {
-				continue;
-			}
-
-			if ( $post_type &&
-				isset( $template->post_types ) &&
-				! in_array( $post_type, $template->post_types, true )
-			) {
-				continue;
-			}
-
-			$is_not_custom   = false === array_search(
-				wp_get_theme()->get_stylesheet() . '//' . $template_file['slug'],
-				wp_list_pluck( $query_result, 'id' ),
-				true
-			);
-			$fits_slug_query =
-				! isset( $query['slug__in'] ) || in_array( $template_file['slug'], $query['slug__in'], true );
-			$fits_area_query =
-				! isset( $query['area'] ) || $template_file['area'] === $query['area'];
-			$should_include  = $is_not_custom && $fits_slug_query && $fits_area_query;
-			if ( $should_include ) {
-				$query_result[] = $template;
-			}
+			$query_result[] = _build_block_template_result_from_file( $template_file, $template_type );
 		}
 	}
 
@@ -990,13 +1041,15 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
 	 * @since 5.9.0
 	 *
 	 * @param WP_Block_Template[] $query_result Array of found block templates.
-	 * @param array  $query {
-	 *     Optional. Arguments to retrieve templates.
+	 * @param array               $query {
+	 *     Arguments to retrieve templates. All arguments are optional.
 	 *
-	 *     @type array  $slug__in List of slugs to include.
-	 *     @type int    $wp_id Post ID of customized template.
+	 *     @type string[] $slug__in  List of slugs to include.
+	 *     @type int      $wp_id     Post ID of customized template.
+	 *     @type string   $area      A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
+	 *     @type string   $post_type Post type to get the templates for.
 	 * }
-	 * @param string $template_type wp_template or wp_template_part.
+	 * @param string              $template_type wp_template or wp_template_part.
 	 */
 	return apply_filters( 'get_block_templates', $query_result, $query, $template_type );
 }
@@ -1006,9 +1059,9 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
  *
  * @since 5.8.0
  *
- * @param string $id            Template unique identifier (example: theme_slug//template_slug).
- * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`.
- *                              Default `'wp_template'`.
+ * @param string $id            Template unique identifier (example: 'theme_slug//template_slug').
+ * @param string $template_type Optional. Template type: 'wp_template' or 'wp_template_part'.
+ *                              Default 'wp_template'.
  * @return WP_Block_Template|null Template.
  */
 function get_block_template( $id, $template_type = 'wp_template' ) {
@@ -1021,8 +1074,8 @@ function get_block_template( $id, $template_type = 'wp_template' ) {
 	 *
 	 * @param WP_Block_Template|null $block_template Return block template object to short-circuit the default query,
 	 *                                               or null to allow WP to run its normal queries.
-	 * @param string                 $id             Template unique identifier (example: theme_slug//template_slug).
-	 * @param string                 $template_type  Template type: `'wp_template'` or '`wp_template_part'`.
+	 * @param string                 $id             Template unique identifier (example: 'theme_slug//template_slug').
+	 * @param string                 $template_type  Template type: 'wp_template' or 'wp_template_part'.
 	 */
 	$block_template = apply_filters( 'pre_get_block_template', null, $id, $template_type );
 	if ( ! is_null( $block_template ) ) {
@@ -1067,8 +1120,8 @@ function get_block_template( $id, $template_type = 'wp_template' ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_Block_Template|null $block_template The found block template, or null if there isn't one.
-	 * @param string                 $id             Template unique identifier (example: theme_slug//template_slug).
-	 * @param array                  $template_type  Template type: `'wp_template'` or '`wp_template_part'`.
+	 * @param string                 $id             Template unique identifier (example: 'theme_slug//template_slug').
+	 * @param array                  $template_type  Template type: 'wp_template' or 'wp_template_part'.
 	 */
 	return apply_filters( 'get_block_template', $block_template, $id, $template_type );
 }
@@ -1080,9 +1133,9 @@ function get_block_template( $id, $template_type = 'wp_template' ) {
  *
  * @since 5.9.0
  *
- * @param string $id            Template unique identifier (example: theme_slug//template_slug).
- * @param string $template_type Optional. Template type: `'wp_template'` or '`wp_template_part'`.
- *                              Default `'wp_template'`.
+ * @param string $id            Template unique identifier (example: 'theme_slug//template_slug').
+ * @param string $template_type Optional. Template type: 'wp_template' or 'wp_template_part'.
+ *                              Default 'wp_template'.
  * @return WP_Block_Template|null The found block template, or null if there isn't one.
  */
 function get_block_file_template( $id, $template_type = 'wp_template' ) {
@@ -1095,8 +1148,8 @@ function get_block_file_template( $id, $template_type = 'wp_template' ) {
 	 *
 	 * @param WP_Block_Template|null $block_template Return block template object to short-circuit the default query,
 	 *                                               or null to allow WP to run its normal queries.
-	 * @param string                 $id             Template unique identifier (example: theme_slug//template_slug).
-	 * @param string                 $template_type  Template type: `'wp_template'` or '`wp_template_part'`.
+	 * @param string                 $id             Template unique identifier (example: 'theme_slug//template_slug').
+	 * @param string                 $template_type  Template type: 'wp_template' or 'wp_template_part'.
 	 */
 	$block_template = apply_filters( 'pre_get_block_file_template', null, $id, $template_type );
 	if ( ! is_null( $block_template ) ) {
@@ -1110,7 +1163,7 @@ function get_block_file_template( $id, $template_type = 'wp_template' ) {
 	}
 	list( $theme, $slug ) = $parts;
 
-	if ( wp_get_theme()->get_stylesheet() !== $theme ) {
+	if ( get_stylesheet() !== $theme ) {
 		/** This filter is documented in wp-includes/block-template-utils.php */
 		return apply_filters( 'get_block_file_template', null, $id, $template_type );
 	}
@@ -1129,8 +1182,8 @@ function get_block_file_template( $id, $template_type = 'wp_template' ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_Block_Template|null $block_template The found block template, or null if there is none.
-	 * @param string                 $id             Template unique identifier (example: theme_slug//template_slug).
-	 * @param string                 $template_type  Template type: `'wp_template'` or '`wp_template_part'`.
+	 * @param string                 $id             Template unique identifier (example: 'theme_slug//template_slug').
+	 * @param string                 $template_type  Template type: 'wp_template' or 'wp_template_part'.
 	 */
 	return apply_filters( 'get_block_file_template', $block_template, $id, $template_type );
 }
@@ -1196,9 +1249,13 @@ function wp_is_theme_directory_ignored( $path ) {
  * @since 5.9.0
  * @since 6.0.0 Adds the whole theme to the export archive.
  *
+ * @global string $wp_version The WordPress version string.
+ *
  * @return WP_Error|string Path of the ZIP file or error on failure.
  */
 function wp_generate_block_templates_export_file() {
+	global $wp_version;
+
 	if ( ! class_exists( 'ZipArchive' ) ) {
 		return new WP_Error( 'missing_zip_package', __( 'Zip Export not supported.' ) );
 	}
@@ -1266,7 +1323,6 @@ function wp_generate_block_templates_export_file() {
 	$theme_json_raw = $tree->get_data();
 	// If a version is defined, add a schema.
 	if ( $theme_json_raw['version'] ) {
-		global $wp_version;
 		$theme_json_version = 'wp/' . substr( $wp_version, 0, 3 );
 		$schema             = array( '$schema' => 'https://schemas.wp.org/' . $theme_json_version . '/theme.json' );
 		$theme_json_raw     = array_merge( $schema, $theme_json_raw );
@@ -1293,7 +1349,6 @@ function wp_generate_block_templates_export_file() {
 /**
  * Gets the template hierarchy for the given template slug to be created.
  *
- *
  * Note: Always add `index` as the last fallback template.
  *
  * @since 6.1.0
@@ -1318,20 +1373,46 @@ function get_template_hierarchy( $slug, $is_custom = false, $template_prefix = '
 		return array( 'front-page', 'home', 'index' );
 	}
 
-	$template_hierarchy = array( $slug );
+	$matches = array();
 
+	$template_hierarchy = array( $slug );
 	// Most default templates don't have `$template_prefix` assigned.
-	if ( $template_prefix ) {
+	if ( ! empty( $template_prefix ) ) {
 		list( $type ) = explode( '-', $template_prefix );
-		// These checks are needed because the `$slug` above is always added.
+		// We need these checks because we always add the `$slug` above.
 		if ( ! in_array( $template_prefix, array( $slug, $type ), true ) ) {
 			$template_hierarchy[] = $template_prefix;
 		}
 		if ( $slug !== $type ) {
 			$template_hierarchy[] = $type;
 		}
-	}
+	} elseif ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
+		$template_hierarchy[] = $matches[1];
+	} elseif ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
+		$type           = $matches[1];
+		$slug_remaining = $matches[2];
+
+		$items = 'single' === $type ? get_post_types() : get_taxonomies();
+		foreach ( $items as $item ) {
+			if ( ! str_starts_with( $slug_remaining, $item ) ) {
+					continue;
+			}
 
+			// If $slug_remaining is equal to $post_type or $taxonomy we have
+			// the single-$post_type template or the taxonomy-$taxonomy template.
+			if ( $slug_remaining === $item ) {
+				$template_hierarchy[] = $type;
+				break;
+			}
+
+			// If $slug_remaining is single-$post_type-$slug template.
+			if ( strlen( $slug_remaining ) > strlen( $item ) + 1 ) {
+				$template_hierarchy[] = "$type-$item";
+				$template_hierarchy[] = $type;
+				break;
+			}
+		}
+	}
 	// Handle `archive` template.
 	if (
 		str_starts_with( $slug, 'author' ) ||
@@ -1346,7 +1427,6 @@ function get_template_hierarchy( $slug, $is_custom = false, $template_prefix = '
 	if ( 'attachment' === $slug ) {
 		$template_hierarchy[] = 'single';
 	}
-
 	// Handle `singular` template.
 	if (
 		str_starts_with( $slug, 'single' ) ||
@@ -1355,8 +1435,6 @@ function get_template_hierarchy( $slug, $is_custom = false, $template_prefix = '
 	) {
 		$template_hierarchy[] = 'singular';
 	}
-
 	$template_hierarchy[] = 'index';
-
 	return $template_hierarchy;
-};
+}
diff --git a/src/wp-includes/block-template.php b/src/wp-includes/block-template.php
index 0aa571117e899..794aec91203aa 100644
--- a/src/wp-includes/block-template.php
+++ b/src/wp-includes/block-template.php
@@ -6,28 +6,14 @@
  */
 
 /**
- * Adds necessary filters to use 'wp_template' posts instead of theme template files.
+ * Adds necessary hooks to resolve '_wp-find-template' requests.
  *
  * @access private
  * @since 5.9.0
  */
 function _add_template_loader_filters() {
-	if ( ! current_theme_supports( 'block-templates' ) ) {
-		return;
-	}
-
-	$template_types = array_keys( get_default_block_template_types() );
-	foreach ( $template_types as $template_type ) {
-		// Skip 'embed' for now because it is not a regular template type.
-		if ( 'embed' === $template_type ) {
-			continue;
-		}
-		add_filter( str_replace( '-', '', $template_type ) . '_template', 'locate_block_template', 20, 3 );
-	}
-
-	// Request to resolve a template.
-	if ( isset( $_GET['_wp-find-template'] ) ) {
-		add_filter( 'pre_get_posts', '_resolve_template_for_new_post' );
+	if ( isset( $_GET['_wp-find-template'] ) && current_theme_supports( 'block-templates' ) ) {
+		add_action( 'pre_get_posts', '_resolve_template_for_new_post' );
 	}
 }
 
@@ -37,16 +23,18 @@ function _add_template_loader_filters() {
  * Internally, this communicates the block content that needs to be used by the template canvas through a global variable.
  *
  * @since 5.8.0
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
  *
  * @global string $_wp_current_template_content
+ * @global string $_wp_current_template_id
  *
  * @param string   $template  Path to the template. See locate_template().
  * @param string   $type      Sanitized filename without extension.
  * @param string[] $templates A list of template candidates, in descending order of priority.
- * @return string The path to the Full Site Editing template canvas file, or the fallback PHP template.
+ * @return string The path to the Site Editor template canvas file, or the fallback PHP template.
  */
 function locate_block_template( $template, $type, array $templates ) {
-	global $_wp_current_template_content;
+	global $_wp_current_template_content, $_wp_current_template_id;
 
 	if ( ! current_theme_supports( 'block-templates' ) ) {
 		return $template;
@@ -78,6 +66,8 @@ function locate_block_template( $template, $type, array $templates ) {
 	$block_template = resolve_block_template( $type, $templates, $template );
 
 	if ( $block_template ) {
+		$_wp_current_template_id = $block_template->id;
+
 		if ( empty( $block_template->content ) && is_user_logged_in() ) {
 			$_wp_current_template_content =
 			sprintf(
@@ -145,7 +135,6 @@ function resolve_block_template( $template_type, $template_hierarchy, $fallback_
 
 	// Find all potential templates 'wp_template' post matching the hierarchy.
 	$query     = array(
-		'theme'    => wp_get_theme()->get_stylesheet(),
 		'slug__in' => $slugs,
 	);
 	$templates = get_block_templates( $query );
@@ -166,8 +155,8 @@ static function ( $template_a, $template_b ) use ( $slug_priorities ) {
 
 	// Is the active theme a child theme, and is the PHP fallback template part of it?
 	if (
-		strpos( $fallback_template, $theme_base_path ) === 0 &&
-		strpos( $fallback_template, $parent_theme_base_path ) === false
+		str_starts_with( $fallback_template, $theme_base_path ) &&
+		! str_contains( $fallback_template, $parent_theme_base_path )
 	) {
 		$fallback_template_slug = substr(
 			$fallback_template,
@@ -237,12 +226,12 @@ function get_the_block_template_html() {
 
 	$content = $wp_embed->run_shortcode( $_wp_current_template_content );
 	$content = $wp_embed->autoembed( $content );
+	$content = shortcode_unautop( $content );
+	$content = do_shortcode( $content );
 	$content = do_blocks( $content );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
-	$content = shortcode_unautop( $content );
-	$content = wp_filter_content_tags( $content );
-	$content = do_shortcode( $content );
+	$content = wp_filter_content_tags( $content, 'template' );
 	$content = str_replace( ']]>', ']]&gt;', $content );
 
 	// Wrap block template in .wp-site-blocks to allow for specific descendant styles
@@ -335,35 +324,3 @@ function _resolve_template_for_new_post( $wp_query ) {
 		$wp_query->set( 'post_status', 'auto-draft' );
 	}
 }
-
-/**
- * Returns the correct template for the site's home page.
- *
- * @access private
- * @since 6.0.0
- *
- * @return array|null A template object, or null if none could be found.
- */
-function _resolve_home_block_template() {
-	$show_on_front = get_option( 'show_on_front' );
-	$front_page_id = get_option( 'page_on_front' );
-
-	if ( 'page' === $show_on_front && $front_page_id ) {
-		return array(
-			'postType' => 'page',
-			'postId'   => $front_page_id,
-		);
-	}
-
-	$hierarchy = array( 'front-page', 'home', 'index' );
-	$template  = resolve_block_template( 'home', $hierarchy, '' );
-
-	if ( ! $template ) {
-		return null;
-	}
-
-	return array(
-		'postType' => 'wp_template',
-		'postId'   => $template->id,
-	);
-}
diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
index 29e375ab89591..4d3a34e34fa77 100644
--- a/src/wp-includes/blocks.php
+++ b/src/wp-includes/blocks.php
@@ -17,14 +17,14 @@
  */
 function remove_block_asset_path_prefix( $asset_handle_or_path ) {
 	$path_prefix = 'file:';
-	if ( 0 !== strpos( $asset_handle_or_path, $path_prefix ) ) {
+	if ( ! str_starts_with( $asset_handle_or_path, $path_prefix ) ) {
 		return $asset_handle_or_path;
 	}
 	$path = substr(
 		$asset_handle_or_path,
 		strlen( $path_prefix )
 	);
-	if ( strpos( $path, './' ) === 0 ) {
+	if ( str_starts_with( $path, './' ) ) {
 		$path = substr( $path, 2 );
 	}
 	return $path;
@@ -44,12 +44,12 @@ function remove_block_asset_path_prefix( $asset_handle_or_path ) {
  * @return string Generated asset name for the block's field.
  */
 function generate_block_asset_handle( $block_name, $field_name, $index = 0 ) {
-	if ( 0 === strpos( $block_name, 'core/' ) ) {
+	if ( str_starts_with( $block_name, 'core/' ) ) {
 		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
-		if ( 0 === strpos( $field_name, 'editor' ) ) {
+		if ( str_starts_with( $field_name, 'editor' ) ) {
 			$asset_handle .= '-editor';
 		}
-		if ( 0 === strpos( $field_name, 'view' ) ) {
+		if ( str_starts_with( $field_name, 'view' ) ) {
 			$asset_handle .= '-view';
 		}
 		if ( $index > 0 ) {
@@ -107,19 +107,19 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
 		return $script_handle;
 	}
 
-	$script_handle     = generate_block_asset_handle( $metadata['name'], $field_name, $index );
-	$script_asset_path = wp_normalize_path(
-		realpath(
-			dirname( $metadata['file'] ) . '/' .
-			substr_replace( $script_path, '.asset.php', - strlen( '.js' ) )
-		)
+	$script_asset_raw_path = dirname( $metadata['file'] ) . '/' . substr_replace( $script_path, '.asset.php', - strlen( '.js' ) );
+	$script_handle         = generate_block_asset_handle( $metadata['name'], $field_name, $index );
+	$script_asset_path     = wp_normalize_path(
+		realpath( $script_asset_raw_path )
 	);
-	if ( ! file_exists( $script_asset_path ) ) {
+
+	if ( empty( $script_asset_path ) ) {
 		_doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				/* translators: 1: Field name, 2: Block name. */
-				__( 'The asset file for the "%1$s" defined in "%2$s" block definition is missing.' ),
+				/* translators: 1: Asset file location, 2: Field name, 3: Block name.  */
+				__( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.' ),
+				$script_asset_raw_path,
 				$field_name,
 				$metadata['name']
 			),
@@ -134,17 +134,42 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
 		$wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
 	}
 
-	$theme_path_norm  = wp_normalize_path( get_theme_file_path() );
+	// Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
+	static $template_path_norm   = '';
+	static $stylesheet_path_norm = '';
+	if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
+		$template_path_norm   = wp_normalize_path( get_template_directory() );
+		$stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
+	}
+
 	$script_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $script_path ) );
 
-	$is_core_block  = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
-	$is_theme_block = 0 === strpos( $script_path_norm, $theme_path_norm );
+	$is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
 
-	$script_uri = plugins_url( $script_path, $metadata['file'] );
+	/*
+	 * Determine if the block script was registered in a theme, by checking if the script path starts with either
+	 * the parent (template) or child (stylesheet) directory path.
+	 */
+	$is_parent_theme_block = str_starts_with( $script_path_norm, $template_path_norm );
+	$is_child_theme_block  = str_starts_with( $script_path_norm, $stylesheet_path_norm );
+	$is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
+
+	$script_uri = '';
 	if ( $is_core_block ) {
 		$script_uri = includes_url( str_replace( $wpinc_path_norm, '', $script_path_norm ) );
 	} elseif ( $is_theme_block ) {
-		$script_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $script_path_norm ) );
+		// Get the script path deterministically based on whether or not it was registered in a parent or child theme.
+		$script_uri = $is_parent_theme_block
+			? get_theme_file_uri( str_replace( $template_path_norm, '', $script_path_norm ) )
+			: get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $script_path_norm ) );
+	} else {
+		// Fallback to plugins_url().
+		$script_uri = plugins_url( $script_path, $metadata['file'] );
+	}
+
+	$script_args = array();
+	if ( 'viewScript' === $field_name ) {
+		$script_args['strategy'] = 'defer';
 	}
 
 	$script_asset        = require $script_asset_path;
@@ -153,7 +178,8 @@ function register_block_script_handle( $metadata, $field_name, $index = 0 ) {
 		$script_handle,
 		$script_uri,
 		$script_dependencies,
-		isset( $script_asset['version'] ) ? $script_asset['version'] : false
+		isset( $script_asset['version'] ) ? $script_asset['version'] : false,
+		$script_args
 	);
 	if ( ! $result ) {
 		return false;
@@ -186,25 +212,31 @@ function register_block_style_handle( $metadata, $field_name, $index = 0 ) {
 		return false;
 	}
 
+	$style_handle = $metadata[ $field_name ];
+	if ( is_array( $style_handle ) ) {
+		if ( empty( $style_handle[ $index ] ) ) {
+			return false;
+		}
+		$style_handle = $style_handle[ $index ];
+	}
+
+	$style_handle_name = generate_block_asset_handle( $metadata['name'], $field_name, $index );
+	// If the style handle is already registered, skip re-registering.
+	if ( wp_style_is( $style_handle_name, 'registered' ) ) {
+		return $style_handle_name;
+	}
+
 	static $wpinc_path_norm = '';
 	if ( ! $wpinc_path_norm ) {
 		$wpinc_path_norm = wp_normalize_path( realpath( ABSPATH . WPINC ) );
 	}
 
-	$is_core_block = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], $wpinc_path_norm );
+	$is_core_block = isset( $metadata['file'] ) && str_starts_with( $metadata['file'], $wpinc_path_norm );
 	// Skip registering individual styles for each core block when a bundled version provided.
 	if ( $is_core_block && ! wp_should_load_separate_core_block_assets() ) {
 		return false;
 	}
 
-	$style_handle = $metadata[ $field_name ];
-	if ( is_array( $style_handle ) ) {
-		if ( empty( $style_handle[ $index ] ) ) {
-			return false;
-		}
-		$style_handle = $style_handle[ $index ];
-	}
-
 	$style_path      = remove_block_asset_path_prefix( $style_handle );
 	$is_style_handle = $style_handle === $style_path;
 	// Allow only passing style handles for core blocks.
@@ -219,7 +251,7 @@ function register_block_style_handle( $metadata, $field_name, $index = 0 ) {
 	// Check whether styles should have a ".min" suffix or not.
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 	if ( $is_core_block ) {
-		$style_path = "style$suffix.css";
+		$style_path = ( 'editorStyle' === $field_name ) ? "editor{$suffix}.css" : "style{$suffix}.css";
 	}
 
 	$style_path_norm = wp_normalize_path( realpath( dirname( $metadata['file'] ) . '/' . $style_path ) );
@@ -228,27 +260,36 @@ function register_block_style_handle( $metadata, $field_name, $index = 0 ) {
 	if ( $has_style_file ) {
 		$style_uri = plugins_url( $style_path, $metadata['file'] );
 
-		// Cache $theme_path_norm to avoid calling get_theme_file_path() multiple times.
-		static $theme_path_norm = '';
-		if ( ! $theme_path_norm ) {
-			$theme_path_norm = wp_normalize_path( get_theme_file_path() );
+		// Cache $template_path_norm and $stylesheet_path_norm to avoid unnecessary additional calls.
+		static $template_path_norm   = '';
+		static $stylesheet_path_norm = '';
+		if ( ! $template_path_norm || ! $stylesheet_path_norm ) {
+			$template_path_norm   = wp_normalize_path( get_template_directory() );
+			$stylesheet_path_norm = wp_normalize_path( get_stylesheet_directory() );
 		}
 
-		$is_theme_block = str_starts_with( $style_path_norm, $theme_path_norm );
-
-		if ( $is_theme_block ) {
-			$style_uri = get_theme_file_uri( str_replace( $theme_path_norm, '', $style_path_norm ) );
-		} elseif ( $is_core_block ) {
-			$style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . "/style$suffix.css" );
+		// Determine if the block style was registered in a theme, by checking if the script path starts with either
+		// the parent (template) or child (stylesheet) directory path.
+		$is_parent_theme_block = str_starts_with( $style_path_norm, $template_path_norm );
+		$is_child_theme_block  = str_starts_with( $style_path_norm, $stylesheet_path_norm );
+		$is_theme_block        = ( $is_parent_theme_block || $is_child_theme_block );
+
+		if ( $is_core_block ) {
+			// All possible $style_path variants for core blocks are hard-coded above.
+			$style_uri = includes_url( 'blocks/' . str_replace( 'core/', '', $metadata['name'] ) . '/' . $style_path );
+		} elseif ( $is_theme_block ) {
+			// Get the script path deterministically based on whether or not it was registered in a parent or child theme.
+			$style_uri = $is_parent_theme_block
+				? get_theme_file_uri( str_replace( $template_path_norm, '', $style_path_norm ) )
+				: get_theme_file_uri( str_replace( $stylesheet_path_norm, '', $style_path_norm ) );
 		}
 	} else {
 		$style_uri = false;
 	}
 
-	$style_handle = generate_block_asset_handle( $metadata['name'], $field_name, $index );
-	$version      = ! $is_core_block && isset( $metadata['version'] ) ? $metadata['version'] : false;
-	$result       = wp_register_style(
-		$style_handle,
+	$version = ! $is_core_block && isset( $metadata['version'] ) ? $metadata['version'] : false;
+	$result  = wp_register_style(
+		$style_handle_name,
 		$style_uri,
 		array(),
 		$version
@@ -258,18 +299,22 @@ function register_block_style_handle( $metadata, $field_name, $index = 0 ) {
 	}
 
 	if ( $has_style_file ) {
-		wp_style_add_data( $style_handle, 'path', $style_path_norm );
+		wp_style_add_data( $style_handle_name, 'path', $style_path_norm );
 
-		$rtl_file = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $style_path_norm );
+		if ( $is_core_block ) {
+			$rtl_file = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $style_path_norm );
+		} else {
+			$rtl_file = str_replace( '.css', '-rtl.css', $style_path_norm );
+		}
 
 		if ( is_rtl() && file_exists( $rtl_file ) ) {
-			wp_style_add_data( $style_handle, 'rtl', 'replace' );
-			wp_style_add_data( $style_handle, 'suffix', $suffix );
-			wp_style_add_data( $style_handle, 'path', $rtl_file );
+			wp_style_add_data( $style_handle_name, 'rtl', 'replace' );
+			wp_style_add_data( $style_handle_name, 'suffix', $suffix );
+			wp_style_add_data( $style_handle_name, 'path', $rtl_file );
 		}
 	}
 
-	return $style_handle;
+	return $style_handle_name;
 }
 
 /**
@@ -296,6 +341,7 @@ function get_block_metadata_i18n_schema() {
  * @since 5.7.0 Added support for `textdomain` field and i18n handling for all translatable fields.
  * @since 5.9.0 Added support for `variations` and `viewScript` fields.
  * @since 6.1.0 Added support for `render` field.
+ * @since 6.3.0 Added `selectors` field.
  *
  * @param string $file_or_folder Path to the JSON file with metadata definition for
  *                               the block or path to the folder where the `block.json` file is located.
@@ -314,20 +360,22 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) {
 	 */
 	static $core_blocks_meta;
 	if ( ! $core_blocks_meta ) {
-		$core_blocks_meta = include_once ABSPATH . WPINC . '/blocks/blocks-json.php';
+		$core_blocks_meta = require ABSPATH . WPINC . '/blocks/blocks-json.php';
 	}
 
 	$metadata_file = ( ! str_ends_with( $file_or_folder, 'block.json' ) ) ?
 		trailingslashit( $file_or_folder ) . 'block.json' :
 		$file_or_folder;
 
-	if ( ! file_exists( $metadata_file ) ) {
+	$is_core_block = str_starts_with( $file_or_folder, ABSPATH . WPINC );
+
+	if ( ! $is_core_block && ! file_exists( $metadata_file ) ) {
 		return false;
 	}
 
 	// Try to get metadata from the static cache for core blocks.
 	$metadata = false;
-	if ( str_starts_with( $file_or_folder, ABSPATH . WPINC ) ) {
+	if ( $is_core_block ) {
 		$core_block_name = str_replace( ABSPATH . WPINC . '/blocks/', '', $file_or_folder );
 		if ( ! empty( $core_blocks_meta[ $core_block_name ] ) ) {
 			$metadata = $core_blocks_meta[ $core_block_name ];
@@ -354,12 +402,16 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) {
 	$metadata = apply_filters( 'block_type_metadata', $metadata );
 
 	// Add `style` and `editor_style` for core blocks if missing.
-	if ( ! empty( $metadata['name'] ) && 0 === strpos( $metadata['name'], 'core/' ) ) {
+	if ( ! empty( $metadata['name'] ) && str_starts_with( $metadata['name'], 'core/' ) ) {
 		$block_name = str_replace( 'core/', '', $metadata['name'] );
 
 		if ( ! isset( $metadata['style'] ) ) {
 			$metadata['style'] = "wp-block-$block_name";
 		}
+		if ( current_theme_supports( 'wp-block-styles' ) && wp_should_load_separate_core_block_assets() ) {
+			$metadata['style']   = (array) $metadata['style'];
+			$metadata['style'][] = "wp-block-{$block_name}-theme";
+		}
 		if ( ! isset( $metadata['editorStyle'] ) ) {
 			$metadata['editorStyle'] = "wp-block-{$block_name}-editor";
 		}
@@ -378,6 +430,7 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) {
 		'attributes'      => 'attributes',
 		'providesContext' => 'provides_context',
 		'usesContext'     => 'uses_context',
+		'selectors'       => 'selectors',
 		'supports'        => 'supports',
 		'styles'          => 'styles',
 		'variations'      => 'variations',
@@ -479,7 +532,7 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) {
 			 *
 			 * @return string Returns the block content.
 			 */
-			$settings['render_callback'] = function( $attributes, $content, $block ) use ( $template_path ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+			$settings['render_callback'] = static function( $attributes, $content, $block ) use ( $template_path ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 				ob_start();
 				require $template_path;
 				return ob_get_clean();
@@ -575,7 +628,7 @@ function has_blocks( $post = null ) {
 		$post = $wp_post->post_content;
 	}
 
-	return false !== strpos( (string) $post, '<!-- wp:' );
+	return str_contains( (string) $post, '<!-- wp:' );
 }
 
 /**
@@ -611,12 +664,12 @@ function has_block( $block_name, $post = null ) {
 	 * This matches behavior for WordPress 5.0.0 - 5.3.0 in matching blocks by
 	 * their serialized names.
 	 */
-	if ( false === strpos( $block_name, '/' ) ) {
+	if ( ! str_contains( $block_name, '/' ) ) {
 		$block_name = 'core/' . $block_name;
 	}
 
 	// Test for existence of block by its fully qualified name.
-	$has_block = false !== strpos( $post, '<!-- wp:' . $block_name . ' ' );
+	$has_block = str_contains( $post, '<!-- wp:' . $block_name . ' ' );
 
 	if ( ! $has_block ) {
 		/*
@@ -625,7 +678,7 @@ function has_block( $block_name, $post = null ) {
 		 */
 		$serialized_block_name = strip_core_block_namespace( $block_name );
 		if ( $serialized_block_name !== $block_name ) {
-			$has_block = false !== strpos( $post, '<!-- wp:' . $serialized_block_name . ' ' );
+			$has_block = str_contains( $post, '<!-- wp:' . $serialized_block_name . ' ' );
 		}
 	}
 
@@ -692,7 +745,7 @@ function serialize_block_attributes( $block_attributes ) {
  * @return string Block name to use for serialization.
  */
 function strip_core_block_namespace( $block_name = null ) {
-	if ( is_string( $block_name ) && 0 === strpos( $block_name, 'core/' ) ) {
+	if ( is_string( $block_name ) && str_starts_with( $block_name, 'core/' ) ) {
 		return substr( $block_name, 5 );
 	}
 
@@ -794,6 +847,10 @@ function serialize_blocks( $blocks ) {
 function filter_block_content( $text, $allowed_html = 'post', $allowed_protocols = array() ) {
 	$result = '';
 
+	if ( str_contains( $text, '<!--' ) && str_contains( $text, '--->' ) ) {
+		$text = preg_replace_callback( '%<!--(.*?)--->%', '_filter_block_content_callback', $text );
+	}
+
 	$blocks = parse_blocks( $text );
 	foreach ( $blocks as $block ) {
 		$block   = filter_block_kses( $block, $allowed_html, $allowed_protocols );
@@ -803,6 +860,19 @@ function filter_block_content( $text, $allowed_html = 'post', $allowed_protocols
 	return $result;
 }
 
+/**
+ * Callback used for regular expression replacement in filter_block_content().
+ *
+ * @private
+ * @since 6.2.1
+ *
+ * @param array $matches Array of preg_replace_callback matches.
+ * @return string Replacement string.
+ */
+function _filter_block_content_callback( $matches ) {
+	return '<!--' . rtrim( $matches[1], '-' ) . '-->';
+}
+
 /**
  * Filters and sanitizes a parsed block to remove non-allowable HTML
  * from block attribute values.
@@ -948,6 +1018,27 @@ function excerpt_remove_blocks( $content ) {
 	return $output;
 }
 
+/**
+ * Parses footnotes markup out of a content string,
+ * and renders those appropriate for the excerpt.
+ *
+ * @since 6.3.0
+ *
+ * @param string $content The content to parse.
+ * @return string The parsed and filtered content.
+ */
+function excerpt_remove_footnotes( $content ) {
+	if ( ! str_contains( $content, 'data-fn=' ) ) {
+		return $content;
+	}
+
+	return preg_replace(
+		'_<sup data-fn="[^"]+" class="[^"]+">\s*<a href="[^"]+" id="[^"]+">\d+</a>\s*</sup>_',
+		'',
+		$content
+	);
+}
+
 /**
  * Renders inner blocks from the allowed wrapper blocks
  * for generating an excerpt.
@@ -1140,8 +1231,8 @@ function block_version( $content ) {
  * @link https://developer.wordpress.org/block-editor/reference-guides/block-api/block-styles/
  *
  * @param string $block_name       Block type name including namespace.
- * @param array  $style_properties Array containing the properties of the style name,
- *                                 label, style (name of the stylesheet to be enqueued),
+ * @param array  $style_properties Array containing the properties of the style name, label,
+ *                                 style_handle (name of the stylesheet to be enqueued),
  *                                 inline_style (string containing the CSS to be added).
  * @return bool True if the block style was registered with success and false otherwise.
  */
@@ -1166,16 +1257,25 @@ function unregister_block_style( $block_name, $block_style_name ) {
  * Checks whether the current block type supports the feature requested.
  *
  * @since 5.8.0
+ * @since 6.4.0 The `$feature` parameter now supports a string.
  *
- * @param WP_Block_Type $block_type Block type to check for support.
- * @param array         $feature    Path to a specific feature to check support for.
- * @param mixed         $default    Optional. Fallback value for feature support. Default false.
+ * @param WP_Block_Type $block_type    Block type to check for support.
+ * @param string|array  $feature       Feature slug, or path to a specific feature to check support for.
+ * @param mixed         $default_value Optional. Fallback value for feature support. Default false.
  * @return bool Whether the feature is supported.
  */
-function block_has_support( $block_type, $feature, $default = false ) {
-	$block_support = $default;
+function block_has_support( $block_type, $feature, $default_value = false ) {
+	$block_support = $default_value;
 	if ( $block_type && property_exists( $block_type, 'supports' ) ) {
-		$block_support = _wp_array_get( $block_type->supports, $feature, $default );
+		if ( is_array( $feature ) && count( $feature ) === 1 ) {
+			$feature = $feature[0];
+		}
+
+		if ( is_array( $feature ) ) {
+			$block_support = _wp_array_get( $block_type->supports, $feature, $default_value );
+		} elseif ( isset( $block_type->supports[ $feature ] ) ) {
+			$block_support = $block_type->supports[ $feature ];
+		}
 	}
 
 	return true === $block_support || is_array( $block_support );
@@ -1265,7 +1365,15 @@ function build_query_vars_from_query_block( $block, $page ) {
 		if ( isset( $block->context['query']['sticky'] ) && ! empty( $block->context['query']['sticky'] ) ) {
 			$sticky = get_option( 'sticky_posts' );
 			if ( 'only' === $block->context['query']['sticky'] ) {
-				$query['post__in'] = $sticky;
+				/*
+				 * Passing an empty array to post__in will return have_posts() as true (and all posts will be returned).
+				 * Logic should be used before hand to determine if WP_Query should be used in the event that the array
+				 * being passed to post__in is empty.
+				 *
+				 * @see https://core.trac.wordpress.org/ticket/28099
+				 */
+				$query['post__in']            = ! empty( $sticky ) ? $sticky : array( 0 );
+				$query['ignore_sticky_posts'] = 1;
 			} else {
 				$query['post__not_in'] = array_merge( $query['post__not_in'], $sticky );
 			}
@@ -1333,10 +1441,15 @@ function build_query_vars_from_query_block( $block, $page ) {
 			$query['orderby'] = $block->context['query']['orderBy'];
 		}
 		if (
-			isset( $block->context['query']['author'] ) &&
-			(int) $block->context['query']['author'] > 0
+			isset( $block->context['query']['author'] )
 		) {
-			$query['author'] = (int) $block->context['query']['author'];
+			if ( is_array( $block->context['query']['author'] ) ) {
+				$query['author__in'] = array_filter( array_map( 'intval', $block->context['query']['author'] ) );
+			} elseif ( is_string( $block->context['query']['author'] ) ) {
+				$query['author__in'] = array_filter( array_map( 'intval', explode( ',', $block->context['query']['author'] ) ) );
+			} elseif ( is_int( $block->context['query']['author'] ) && $block->context['query']['author'] > 0 ) {
+				$query['author'] = $block->context['query']['author'];
+			}
 		}
 		if ( ! empty( $block->context['query']['search'] ) ) {
 			$query['s'] = $block->context['query']['search'];
diff --git a/src/wp-includes/blocks/archives.php b/src/wp-includes/blocks/archives.php
index afbf400fedba8..695affde760a8 100644
--- a/src/wp-includes/blocks/archives.php
+++ b/src/wp-includes/blocks/archives.php
@@ -17,11 +17,12 @@
 function render_block_core_archives( $attributes ) {
 	$show_post_count = ! empty( $attributes['showPostCounts'] );
 	$type            = isset( $attributes['type'] ) ? $attributes['type'] : 'monthly';
-	$class           = '';
+
+	$class = 'wp-block-archives-list';
 
 	if ( ! empty( $attributes['displayAsDropdown'] ) ) {
 
-		$class .= ' wp-block-archives-dropdown';
+		$class = 'wp-block-archives-dropdown';
 
 		$dropdown_id = wp_unique_id( 'wp-block-archives-' );
 		$title       = __( 'Archives' );
@@ -40,9 +41,7 @@ function render_block_core_archives( $attributes ) {
 
 		$archives = wp_get_archives( $dropdown_args );
 
-		$classnames = esc_attr( $class );
-
-		$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
+		$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $class ) );
 
 		switch ( $dropdown_args['type'] ) {
 			case 'yearly':
@@ -75,8 +74,6 @@ function render_block_core_archives( $attributes ) {
 		);
 	}
 
-	$class .= ' wp-block-archives-list';
-
 	/** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */
 	$archives_args = apply_filters(
 		'widget_archives_args',
diff --git a/src/wp-includes/blocks/archives/block.json b/src/wp-includes/blocks/archives/block.json
index 3e589af452fa9..7e0f5181d2c3d 100644
--- a/src/wp-includes/blocks/archives/block.json
+++ b/src/wp-includes/blocks/archives/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/archives",
 	"title": "Archives",
 	"category": "widgets",
@@ -29,7 +29,11 @@
 		"html": false,
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/audio/block.json b/src/wp-includes/blocks/audio/block.json
index 13aed788968fb..a4740e304451c 100644
--- a/src/wp-includes/blocks/audio/block.json
+++ b/src/wp-includes/blocks/audio/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/audio",
 	"title": "Audio",
 	"category": "media",
@@ -49,7 +49,11 @@
 		"align": true,
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		}
 	},
 	"editorStyle": "wp-block-audio-editor",
diff --git a/src/wp-includes/blocks/avatar.php b/src/wp-includes/blocks/avatar.php
index f6e3f6a7eeaf2..1566fe6edfebc 100644
--- a/src/wp-includes/blocks/avatar.php
+++ b/src/wp-includes/blocks/avatar.php
@@ -16,67 +16,19 @@
 function render_block_core_avatar( $attributes, $content, $block ) {
 	$size               = isset( $attributes['size'] ) ? $attributes['size'] : 96;
 	$wrapper_attributes = get_block_wrapper_attributes();
+	$border_attributes  = get_block_core_avatar_border_attributes( $attributes );
 
-	$image_styles = array();
+	// Class gets passed through `esc_attr` via `get_avatar`.
+	$image_classes = ! empty( $border_attributes['class'] )
+		? "wp-block-avatar__image {$border_attributes['class']}"
+		: 'wp-block-avatar__image';
 
-	// Add border width styles.
-	$has_border_width = ! empty( $attributes['style']['border']['width'] );
-
-	if ( $has_border_width ) {
-		$border_width   = $attributes['style']['border']['width'];
-		$image_styles[] = sprintf( 'border-width: %s;', esc_attr( $border_width ) );
-	}
-
-	// Add border radius styles.
-	$has_border_radius = ! empty( $attributes['style']['border']['radius'] );
-
-	if ( $has_border_radius ) {
-		$border_radius = $attributes['style']['border']['radius'];
-
-		if ( is_array( $border_radius ) ) {
-			// Apply styles for individual corner border radii.
-			foreach ( $border_radius as $key => $value ) {
-				if ( null !== $value ) {
-					$name = _wp_to_kebab_case( $key );
-					// Add shared styles for individual border radii.
-					$border_style   = sprintf(
-						'border-%s-radius: %s;',
-						esc_attr( $name ),
-						esc_attr( $value )
-					);
-					$image_styles[] = $border_style;
-				}
-			}
-		} else {
-			$border_style   = sprintf( 'border-radius: %s;', esc_attr( $border_radius ) );
-			$image_styles[] = $border_style;
-		}
-	}
-
-	// Add border color styles.
-	$has_border_color = ! empty( $attributes['style']['border']['color'] );
-
-	if ( $has_border_color ) {
-		$border_color   = $attributes['style']['border']['color'];
-		$image_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) );
-	}
-
-	// Add border style (solid, dashed, dotted ).
-	$has_border_style = ! empty( $attributes['style']['border']['style'] );
-
-	if ( $has_border_style ) {
-		$border_style   = $attributes['style']['border']['style'];
-		$image_styles[] = sprintf( 'border-style: %s;', esc_attr( $border_style ) );
-	}
-
-	// Add border classes to the avatar image for both custom colors and palette colors.
-	$image_classes = '';
-	if ( $has_border_color || isset( $attributes['borderColor'] ) ) {
-		$image_classes .= 'has-border-color';
-	}
-	if ( isset( $attributes['borderColor'] ) ) {
-		$image_classes .= ' has-' . $attributes['borderColor'] . '-border-color';
-	}
+	// Unlike class, `get_avatar` doesn't filter the styles via `esc_attr`.
+	// The style engine does pass the border styles through
+	// `safecss_filter_attr` however.
+	$image_styles = ! empty( $border_attributes['style'] )
+		? sprintf( ' style="%s"', esc_attr( $border_attributes['style'] ) )
+		: '';
 
 	if ( ! isset( $block->context['commentId'] ) ) {
 		$author_id   = isset( $attributes['userId'] ) ? $attributes['userId'] : get_post_field( 'post_author', $block->context['postId'] );
@@ -89,8 +41,8 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 			'',
 			$alt,
 			array(
-				'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '',
-				'class'      => "wp-block-avatar__image $image_classes ",
+				'extra_attr' => $image_styles,
+				'class'      => $image_classes,
 			)
 		);
 		if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
@@ -100,7 +52,7 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 				$label = 'aria-label="' . sprintf( esc_attr__( '(%s author archive, opens in a new tab)' ), $author_name ) . '"';
 			}
 			// translators: %1$s: Author archive link. %2$s: Link target. %3$s Aria label. %4$s Avatar image.
-			$avatar_block = sprintf( '<a href="%1$s" target="%2$s" %3$s class="wp-block-avatar__link">%4$s</a>', get_author_posts_url( $author_id ), esc_attr( $attributes['linkTarget'] ), $label, $avatar_block );
+			$avatar_block = sprintf( '<a href="%1$s" target="%2$s" %3$s class="wp-block-avatar__link">%4$s</a>', esc_url( get_author_posts_url( $author_id ) ), esc_attr( $attributes['linkTarget'] ), $label, $avatar_block );
 		}
 		return sprintf( '<div %1s>%2s</div>', $wrapper_attributes, $avatar_block );
 	}
@@ -116,8 +68,8 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 		'',
 		$alt,
 		array(
-			'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '',
-			'class'      => "wp-block-avatar__image $image_classes",
+			'extra_attr' => $image_styles,
+			'class'      => $image_classes,
 		)
 	);
 	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] && isset( $comment->comment_author_url ) && '' !== $comment->comment_author_url ) {
@@ -132,6 +84,58 @@ function render_block_core_avatar( $attributes, $content, $block ) {
 	return sprintf( '<div %1s>%2s</div>', $wrapper_attributes, $avatar_block );
 }
 
+/**
+ * Generates class names and styles to apply the border support styles for
+ * the Avatar block.
+ *
+ * @param array $attributes The block attributes.
+ * @return array The border-related classnames and styles for the block.
+ */
+function get_block_core_avatar_border_attributes( $attributes ) {
+	$border_styles = array();
+	$sides         = array( 'top', 'right', 'bottom', 'left' );
+
+	// Border radius.
+	if ( isset( $attributes['style']['border']['radius'] ) ) {
+		$border_styles['radius'] = $attributes['style']['border']['radius'];
+	}
+
+	// Border style.
+	if ( isset( $attributes['style']['border']['style'] ) ) {
+		$border_styles['style'] = $attributes['style']['border']['style'];
+	}
+
+	// Border width.
+	if ( isset( $attributes['style']['border']['width'] ) ) {
+		$border_styles['width'] = $attributes['style']['border']['width'];
+	}
+
+	// Border color.
+	$preset_color           = array_key_exists( 'borderColor', $attributes ) ? "var:preset|color|{$attributes['borderColor']}" : null;
+	$custom_color           = _wp_array_get( $attributes, array( 'style', 'border', 'color' ), null );
+	$border_styles['color'] = $preset_color ? $preset_color : $custom_color;
+
+	// Individual border styles e.g. top, left etc.
+	foreach ( $sides as $side ) {
+		$border                 = _wp_array_get( $attributes, array( 'style', 'border', $side ), null );
+		$border_styles[ $side ] = array(
+			'color' => isset( $border['color'] ) ? $border['color'] : null,
+			'style' => isset( $border['style'] ) ? $border['style'] : null,
+			'width' => isset( $border['width'] ) ? $border['width'] : null,
+		);
+	}
+
+	$styles     = wp_style_engine_get_styles( array( 'border' => $border_styles ) );
+	$attributes = array();
+	if ( ! empty( $styles['classnames'] ) ) {
+		$attributes['class'] = $styles['classnames'];
+	}
+	if ( ! empty( $styles['css'] ) ) {
+		$attributes['style'] = $styles['css'];
+	}
+	return $attributes;
+}
+
 /**
  * Registers the `core/avatar` block on the server.
  */
diff --git a/src/wp-includes/blocks/avatar/block.json b/src/wp-includes/blocks/avatar/block.json
index bceef63ad6fb9..12e81d68aa767 100644
--- a/src/wp-includes/blocks/avatar/block.json
+++ b/src/wp-includes/blocks/avatar/block.json
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/avatar",
 	"title": "Avatar",
 	"category": "theme",
-	"description": "Add a user's avatar.",
+	"description": "Add a user’s avatar.",
 	"textdomain": "default",
 	"attributes": {
 		"userId": {
@@ -48,6 +48,6 @@
 			"__experimentalDuotone": "img"
 		}
 	},
-	"editorStyle": "wp-block-avatar",
+	"editorStyle": "wp-block-avatar-editor",
 	"style": "wp-block-avatar"
 }
diff --git a/src/wp-includes/blocks/block.php b/src/wp-includes/blocks/block.php
index 2cfd672aa3ada..d51b35d68b23d 100644
--- a/src/wp-includes/blocks/block.php
+++ b/src/wp-includes/blocks/block.php
@@ -27,8 +27,7 @@ function render_block_core_block( $attributes ) {
 	if ( isset( $seen_refs[ $attributes['ref'] ] ) ) {
 		// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
 		// is set in `wp_debug_mode()`.
-		$is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
-			defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+		$is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
 
 		return $is_debug ?
 			// translators: Visible only in the front end, this warning takes the place of a faulty block.
diff --git a/src/wp-includes/blocks/block/block.json b/src/wp-includes/blocks/block/block.json
index 8d850ef1c30ba..d6630177fc685 100644
--- a/src/wp-includes/blocks/block/block.json
+++ b/src/wp-includes/blocks/block/block.json
@@ -1,10 +1,11 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/block",
-	"title": "Reusable block",
+	"title": "Pattern",
 	"category": "reusable",
-	"description": "Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used.",
+	"description": "Create and save content to reuse across your site. Update the pattern, and the changes apply everywhere it’s used.",
+ 	"keywords": [ "reusable" ],
 	"textdomain": "default",
 	"attributes": {
 		"ref": {
@@ -15,6 +16,5 @@
 		"customClassName": false,
 		"html": false,
 		"inserter": false
-	},
-	"editorStyle": "wp-block-editor"
+	}
 }
diff --git a/src/wp-includes/blocks/blocks-json.php b/src/wp-includes/blocks/blocks-json.php
index 4f9b68e444f71..364e91f31e749 100644
--- a/src/wp-includes/blocks/blocks-json.php
+++ b/src/wp-includes/blocks/blocks-json.php
@@ -1 +1,5939 @@
-<?php return array('archives' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/archives', 'title' => 'Archives', 'category' => 'widgets', 'description' => 'Display a date archive of your posts.', 'textdomain' => 'default', 'attributes' => array('displayAsDropdown' => array('type' => 'boolean', 'default' => false), 'showLabel' => array('type' => 'boolean', 'default' => true), 'showPostCounts' => array('type' => 'boolean', 'default' => false), 'type' => array('type' => 'string', 'default' => 'monthly')), 'supports' => array('align' => true, 'html' => false, 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-archives-editor'), 'audio' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/audio', 'title' => 'Audio', 'category' => 'media', 'description' => 'Embed a simple audio player.', 'keywords' => array('music', 'sound', 'podcast', 'recording'), 'textdomain' => 'default', 'attributes' => array('src' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'audio', 'attribute' => 'src', '__experimentalRole' => 'content'), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => 'figcaption', '__experimentalRole' => 'content'), 'id' => array('type' => 'number', '__experimentalRole' => 'content'), 'autoplay' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'audio', 'attribute' => 'autoplay'), 'loop' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'audio', 'attribute' => 'loop'), 'preload' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'audio', 'attribute' => 'preload')), 'supports' => array('anchor' => true, 'align' => true, 'spacing' => array('margin' => true, 'padding' => true)), 'editorStyle' => 'wp-block-audio-editor', 'style' => 'wp-block-audio'), 'avatar' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/avatar', 'title' => 'Avatar', 'category' => 'theme', 'description' => 'Add a user\'s avatar.', 'textdomain' => 'default', 'attributes' => array('userId' => array('type' => 'number'), 'size' => array('type' => 'number', 'default' => 96), 'isLink' => array('type' => 'boolean', 'default' => false), 'linkTarget' => array('type' => 'string', 'default' => '_self')), 'usesContext' => array('postType', 'postId', 'commentId'), 'supports' => array('html' => false, 'align' => true, 'alignWide' => false, 'spacing' => array('margin' => true, 'padding' => true), '__experimentalBorder' => array('__experimentalSkipSerialization' => true, 'radius' => true, 'width' => true, 'color' => true, 'style' => true, '__experimentalDefaultControls' => array('radius' => true)), 'color' => array('text' => false, 'background' => false, '__experimentalDuotone' => 'img')), 'editorStyle' => 'wp-block-avatar', 'style' => 'wp-block-avatar'), 'block' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/block', 'title' => 'Reusable block', 'category' => 'reusable', 'description' => 'Create and save content to reuse across your site. Update the block, and the changes apply everywhere it’s used.', 'textdomain' => 'default', 'attributes' => array('ref' => array('type' => 'number')), 'supports' => array('customClassName' => false, 'html' => false, 'inserter' => false), 'editorStyle' => 'wp-block-editor'), 'button' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/button', 'title' => 'Button', 'category' => 'design', 'parent' => array('core/buttons'), 'description' => 'Prompt visitors to take action with a button-style link.', 'keywords' => array('link'), 'textdomain' => 'default', 'attributes' => array('url' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a', 'attribute' => 'href'), 'title' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a', 'attribute' => 'title'), 'text' => array('type' => 'string', 'source' => 'html', 'selector' => 'a'), 'linkTarget' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a', 'attribute' => 'target'), 'rel' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a', 'attribute' => 'rel'), 'placeholder' => array('type' => 'string'), 'backgroundColor' => array('type' => 'string'), 'textColor' => array('type' => 'string'), 'gradient' => array('type' => 'string'), 'width' => array('type' => 'number')), 'supports' => array('anchor' => true, 'align' => true, 'alignWide' => false, 'color' => array('__experimentalSkipSerialization' => true, 'gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'reusable' => false, 'spacing' => array('__experimentalSkipSerialization' => true, 'padding' => array('horizontal', 'vertical'), '__experimentalDefaultControls' => array('padding' => true)), '__experimentalBorder' => array('radius' => true, '__experimentalSkipSerialization' => true, '__experimentalDefaultControls' => array('radius' => true)), '__experimentalSelector' => '.wp-block-button .wp-block-button__link'), 'styles' => array(array('name' => 'fill', 'label' => 'Fill', 'isDefault' => true), array('name' => 'outline', 'label' => 'Outline')), 'editorStyle' => 'wp-block-button-editor', 'style' => 'wp-block-button'), 'buttons' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/buttons', 'title' => 'Buttons', 'category' => 'design', 'description' => 'Prompt visitors to take action with a group of button-style links.', 'keywords' => array('link'), 'textdomain' => 'default', 'supports' => array('anchor' => true, 'align' => array('wide', 'full'), '__experimentalExposeControlsToChildren' => true, 'spacing' => array('blockGap' => true, 'margin' => array('top', 'bottom'), '__experimentalDefaultControls' => array('blockGap' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'default' => array('type' => 'flex'))), 'editorStyle' => 'wp-block-buttons-editor', 'style' => 'wp-block-buttons'), 'calendar' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/calendar', 'title' => 'Calendar', 'category' => 'widgets', 'description' => 'A calendar of your site’s posts.', 'keywords' => array('posts', 'archive'), 'textdomain' => 'default', 'attributes' => array('month' => array('type' => 'integer'), 'year' => array('type' => 'integer')), 'supports' => array('align' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'style' => 'wp-block-calendar'), 'categories' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/categories', 'title' => 'Categories List', 'category' => 'widgets', 'description' => 'Display a list of all categories.', 'textdomain' => 'default', 'attributes' => array('displayAsDropdown' => array('type' => 'boolean', 'default' => false), 'showHierarchy' => array('type' => 'boolean', 'default' => false), 'showPostCounts' => array('type' => 'boolean', 'default' => false), 'showOnlyTopLevel' => array('type' => 'boolean', 'default' => false), 'showEmpty' => array('type' => 'boolean', 'default' => false)), 'supports' => array('align' => true, 'html' => false, 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-categories-editor', 'style' => 'wp-block-categories'), 'code' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/code', 'title' => 'Code', 'category' => 'text', 'description' => 'Display code snippets that respect your spacing and tabs.', 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string', 'source' => 'html', 'selector' => 'code')), 'supports' => array('anchor' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'spacing' => array('margin' => array('top', 'bottom'), 'padding' => true), '__experimentalBorder' => array('radius' => true, 'color' => true, 'width' => true, 'style' => true, '__experimentalDefaultControls' => array('width' => true, 'color' => true)), 'color' => array('text' => true, 'background' => true, 'gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true))), 'style' => 'wp-block-code'), 'column' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/column', 'title' => 'Column', 'category' => 'text', 'parent' => array('core/columns'), 'description' => 'A single column within a columns block.', 'textdomain' => 'default', 'attributes' => array('verticalAlignment' => array('type' => 'string'), 'width' => array('type' => 'string'), 'allowedBlocks' => array('type' => 'array'), 'templateLock' => array('type' => array('string', 'boolean'), 'enum' => array('all', 'insert', 'contentOnly', false))), 'supports' => array('anchor' => true, 'reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('blockGap' => true, 'padding' => true, '__experimentalDefaultControls' => array('padding' => true)), '__experimentalBorder' => array('color' => true, 'style' => true, 'width' => true, '__experimentalDefaultControls' => array('color' => true, 'style' => true, 'width' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalLayout' => true)), 'columns' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/columns', 'title' => 'Columns', 'category' => 'design', 'description' => 'Display content in multiple columns, with blocks added to each column.', 'textdomain' => 'default', 'attributes' => array('verticalAlignment' => array('type' => 'string'), 'isStackedOnMobile' => array('type' => 'boolean', 'default' => true)), 'supports' => array('anchor' => true, 'align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('blockGap' => array('__experimentalDefault' => '2em', 'sides' => array('horizontal', 'vertical')), 'margin' => array('top', 'bottom'), 'padding' => true, '__experimentalDefaultControls' => array('padding' => true)), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'allowEditing' => false, 'default' => array('type' => 'flex', 'flexWrap' => 'nowrap')), '__experimentalBorder' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-columns-editor', 'style' => 'wp-block-columns'), 'comment-author-name' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-author-name', 'title' => 'Comment Author Name', 'category' => 'theme', 'ancestor' => array('core/comment-template'), 'description' => 'Displays the name of the author of the comment.', 'textdomain' => 'default', 'attributes' => array('isLink' => array('type' => 'boolean', 'default' => true), 'linkTarget' => array('type' => 'string', 'default' => '_self'), 'textAlign' => array('type' => 'string')), 'usesContext' => array('commentId'), 'supports' => array('html' => false, 'spacing' => array('margin' => true, 'padding' => true), 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comment-content' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-content', 'title' => 'Comment Content', 'category' => 'theme', 'ancestor' => array('core/comment-template'), 'description' => 'Displays the contents of a comment.', 'textdomain' => 'default', 'usesContext' => array('commentId'), 'attributes' => array('textAlign' => array('type' => 'string')), 'supports' => array('color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'spacing' => array('padding' => array('horizontal', 'vertical'), '__experimentalDefaultControls' => array('padding' => true)), 'html' => false)), 'comment-date' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-date', 'title' => 'Comment Date', 'category' => 'theme', 'ancestor' => array('core/comment-template'), 'description' => 'Displays the date on which the comment was posted.', 'textdomain' => 'default', 'attributes' => array('format' => array('type' => 'string'), 'isLink' => array('type' => 'boolean', 'default' => true)), 'usesContext' => array('commentId'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comment-edit-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-edit-link', 'title' => 'Comment Edit Link', 'category' => 'theme', 'ancestor' => array('core/comment-template'), 'description' => 'Displays a link to edit the comment in the WordPress Dashboard. This link is only visible to users with the edit comment capability.', 'textdomain' => 'default', 'usesContext' => array('commentId'), 'attributes' => array('linkTarget' => array('type' => 'string', 'default' => '_self'), 'textAlign' => array('type' => 'string')), 'supports' => array('html' => false, 'color' => array('link' => true, 'gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comment-reply-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-reply-link', 'title' => 'Comment Reply Link', 'category' => 'theme', 'ancestor' => array('core/comment-template'), 'description' => 'Displays a link to reply to a comment.', 'textdomain' => 'default', 'usesContext' => array('commentId'), 'attributes' => array('textAlign' => array('type' => 'string')), 'supports' => array('color' => array('gradients' => true, 'link' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'html' => false)), 'comment-template' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comment-template', 'title' => 'Comment Template', 'category' => 'design', 'parent' => array('core/comments'), 'description' => 'Contains the block elements used to display a comment, like the title, date, author, avatar and more.', 'textdomain' => 'default', 'usesContext' => array('postId'), 'supports' => array('reusable' => false, 'html' => false, 'align' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'style' => 'wp-block-comment-template'), 'comments' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments', 'title' => 'Comments', 'category' => 'theme', 'description' => 'An advanced block that allows displaying post comments using different visual configurations.', 'textdomain' => 'default', 'attributes' => array('tagName' => array('type' => 'string', 'default' => 'div'), 'legacy' => array('type' => 'boolean', 'default' => false)), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-comments-editor', 'usesContext' => array('postId', 'postType')), 'comments-pagination' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments-pagination', 'title' => 'Comments Pagination', 'category' => 'theme', 'parent' => array('core/comments'), 'description' => 'Displays a paginated navigation to next/previous set of comments, when applicable.', 'textdomain' => 'default', 'attributes' => array('paginationArrow' => array('type' => 'string', 'default' => 'none')), 'providesContext' => array('comments/paginationArrow' => 'paginationArrow'), 'supports' => array('align' => true, 'reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'default' => array('type' => 'flex')), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-comments-pagination-editor', 'style' => 'wp-block-comments-pagination'), 'comments-pagination-next' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments-pagination-next', 'title' => 'Comments Next Page', 'category' => 'theme', 'parent' => array('core/comments-pagination'), 'description' => 'Displays the next comment\'s page link.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string')), 'usesContext' => array('postId', 'comments/paginationArrow'), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comments-pagination-numbers' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments-pagination-numbers', 'title' => 'Comments Page Numbers', 'category' => 'theme', 'parent' => array('core/comments-pagination'), 'description' => 'Displays a list of page numbers for comments pagination.', 'textdomain' => 'default', 'usesContext' => array('postId'), 'supports' => array('reusable' => false, 'html' => false, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comments-pagination-previous' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments-pagination-previous', 'title' => 'Comments Previous Page', 'category' => 'theme', 'parent' => array('core/comments-pagination'), 'description' => 'Displays the previous comment\'s page link.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string')), 'usesContext' => array('postId', 'comments/paginationArrow'), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'comments-title' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/comments-title', 'title' => 'Comments Title', 'category' => 'theme', 'ancestor' => array('core/comments'), 'description' => 'Displays a title with the number of comments', 'textdomain' => 'default', 'usesContext' => array('postId', 'postType'), 'attributes' => array('textAlign' => array('type' => 'string'), 'showPostTitle' => array('type' => 'boolean', 'default' => true), 'showCommentsCount' => array('type' => 'boolean', 'default' => true), 'level' => array('type' => 'number', 'default' => 2)), 'supports' => array('anchor' => false, 'align' => true, 'html' => false, '__experimentalBorder' => array('radius' => true, 'color' => true, 'width' => true, 'style' => true), 'color' => array('gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true, '__experimentalFontFamily' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true)))), 'cover' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/cover', 'title' => 'Cover', 'category' => 'media', 'description' => 'Add an image or video with a text overlay — great for headers.', 'textdomain' => 'default', 'attributes' => array('url' => array('type' => 'string'), 'useFeaturedImage' => array('type' => 'boolean', 'default' => false), 'id' => array('type' => 'number'), 'alt' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'alt', 'default' => ''), 'hasParallax' => array('type' => 'boolean', 'default' => false), 'isRepeated' => array('type' => 'boolean', 'default' => false), 'dimRatio' => array('type' => 'number', 'default' => 100), 'overlayColor' => array('type' => 'string'), 'customOverlayColor' => array('type' => 'string'), 'backgroundType' => array('type' => 'string', 'default' => 'image'), 'focalPoint' => array('type' => 'object'), 'minHeight' => array('type' => 'number'), 'minHeightUnit' => array('type' => 'string'), 'gradient' => array('type' => 'string'), 'customGradient' => array('type' => 'string'), 'contentPosition' => array('type' => 'string'), 'isDark' => array('type' => 'boolean', 'default' => true), 'allowedBlocks' => array('type' => 'array'), 'templateLock' => array('type' => array('string', 'boolean'), 'enum' => array('all', 'insert', 'contentOnly', false))), 'usesContext' => array('postId', 'postType'), 'supports' => array('anchor' => true, 'align' => true, 'html' => false, 'spacing' => array('padding' => true, 'margin' => array('top', 'bottom'), '__experimentalDefaultControls' => array('padding' => true)), 'color' => array('__experimentalDuotone' => '> .wp-block-cover__image-background, > .wp-block-cover__video-background', 'text' => false, 'background' => false), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-cover-editor', 'style' => 'wp-block-cover'), 'embed' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/embed', 'title' => 'Embed', 'category' => 'embed', 'description' => 'Add a block that displays content pulled from other sites, like Twitter or YouTube.', 'textdomain' => 'default', 'attributes' => array('url' => array('type' => 'string'), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => 'figcaption'), 'type' => array('type' => 'string'), 'providerNameSlug' => array('type' => 'string'), 'allowResponsive' => array('type' => 'boolean', 'default' => true), 'responsive' => array('type' => 'boolean', 'default' => false), 'previewable' => array('type' => 'boolean', 'default' => true)), 'supports' => array('align' => true), 'editorStyle' => 'wp-block-embed-editor', 'style' => 'wp-block-embed'), 'file' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/file', 'title' => 'File', 'category' => 'media', 'description' => 'Add a link to a downloadable file.', 'keywords' => array('document', 'pdf', 'download'), 'textdomain' => 'default', 'attributes' => array('id' => array('type' => 'number'), 'href' => array('type' => 'string'), 'fileId' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a:not([download])', 'attribute' => 'id'), 'fileName' => array('type' => 'string', 'source' => 'html', 'selector' => 'a:not([download])'), 'textLinkHref' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a:not([download])', 'attribute' => 'href'), 'textLinkTarget' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'a:not([download])', 'attribute' => 'target'), 'showDownloadButton' => array('type' => 'boolean', 'default' => true), 'downloadButtonText' => array('type' => 'string', 'source' => 'html', 'selector' => 'a[download]'), 'displayPreview' => array('type' => 'boolean'), 'previewHeight' => array('type' => 'number', 'default' => 600)), 'supports' => array('anchor' => true, 'align' => true), 'viewScript' => 'file:./view.min.js', 'editorStyle' => 'wp-block-file-editor', 'style' => 'wp-block-file'), 'freeform' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/freeform', 'title' => 'Classic', 'category' => 'text', 'description' => 'Use the classic WordPress editor.', 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string', 'source' => 'html')), 'supports' => array('className' => false, 'customClassName' => false, 'reusable' => false), 'editorStyle' => 'wp-block-freeform-editor'), 'gallery' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/gallery', 'title' => 'Gallery', 'category' => 'media', 'description' => 'Display multiple images in a rich gallery.', 'keywords' => array('images', 'photos'), 'textdomain' => 'default', 'attributes' => array('images' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => '.blocks-gallery-item', 'query' => array('url' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'src'), 'fullUrl' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'data-full-url'), 'link' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'data-link'), 'alt' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'alt', 'default' => ''), 'id' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'data-id'), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => '.blocks-gallery-item__caption'))), 'ids' => array('type' => 'array', 'items' => array('type' => 'number'), 'default' => array()), 'shortCodeTransforms' => array('type' => 'array', 'default' => array(), 'items' => array('type' => 'object')), 'columns' => array('type' => 'number', 'minimum' => 1, 'maximum' => 8), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => '.blocks-gallery-caption'), 'imageCrop' => array('type' => 'boolean', 'default' => true), 'fixedHeight' => array('type' => 'boolean', 'default' => true), 'linkTarget' => array('type' => 'string'), 'linkTo' => array('type' => 'string'), 'sizeSlug' => array('type' => 'string', 'default' => 'large'), 'allowResize' => array('type' => 'boolean', 'default' => false)), 'providesContext' => array('allowResize' => 'allowResize', 'imageCrop' => 'imageCrop', 'fixedHeight' => 'fixedHeight'), 'supports' => array('anchor' => true, 'align' => true, 'html' => false, 'units' => array('px', 'em', 'rem', 'vh', 'vw'), 'spacing' => array('margin' => true, 'padding' => true, 'blockGap' => array('horizontal', 'vertical'), '__experimentalSkipSerialization' => array('blockGap'), '__experimentalDefaultControls' => array('blockGap' => true)), 'color' => array('text' => false, 'background' => true, 'gradients' => true), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'allowEditing' => false, 'default' => array('type' => 'flex'))), 'editorStyle' => 'wp-block-gallery-editor', 'style' => 'wp-block-gallery'), 'group' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/group', 'title' => 'Group', 'category' => 'design', 'description' => 'Gather blocks in a layout container.', 'keywords' => array('container', 'wrapper', 'row', 'section'), 'textdomain' => 'default', 'attributes' => array('tagName' => array('type' => 'string', 'default' => 'div'), 'templateLock' => array('type' => array('string', 'boolean'), 'enum' => array('all', 'insert', 'contentOnly', false))), 'supports' => array('__experimentalOnEnter' => true, '__experimentalSettings' => true, 'align' => array('wide', 'full'), 'anchor' => true, 'ariaLabel' => true, 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => array('top', 'bottom'), 'padding' => true, 'blockGap' => true, '__experimentalDefaultControls' => array('padding' => true, 'blockGap' => true)), '__experimentalBorder' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalLayout' => true), 'editorStyle' => 'wp-block-group-editor', 'style' => 'wp-block-group'), 'heading' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/heading', 'title' => 'Heading', 'category' => 'text', 'description' => 'Introduce new sections and organize content to help visitors (and search engines) understand the structure of your content.', 'keywords' => array('title', 'subtitle'), 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string'), 'content' => array('type' => 'string', 'source' => 'html', 'selector' => 'h1,h2,h3,h4,h5,h6', 'default' => '', '__experimentalRole' => 'content'), 'level' => array('type' => 'number', 'default' => 2), 'placeholder' => array('type' => 'string')), 'supports' => array('align' => array('wide', 'full'), 'anchor' => true, 'className' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true, 'textTransform' => true)), '__experimentalSelector' => 'h1,h2,h3,h4,h5,h6', '__unstablePasteTextInline' => true, '__experimentalSlashInserter' => true), 'editorStyle' => 'wp-block-heading-editor', 'style' => 'wp-block-heading'), 'home-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/home-link', 'category' => 'design', 'parent' => array('core/navigation'), 'title' => 'Home Link', 'description' => 'Create a link that always points to the homepage of the site. Usually not necessary if there is already a site title link present in the header.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string')), 'usesContext' => array('textColor', 'customTextColor', 'backgroundColor', 'customBackgroundColor', 'fontSize', 'customFontSize', 'style'), 'supports' => array('reusable' => false, 'html' => false, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-home-link-editor', 'style' => 'wp-block-home-link'), 'html' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/html', 'title' => 'Custom HTML', 'category' => 'widgets', 'description' => 'Add custom HTML code and preview it as you edit.', 'keywords' => array('embed'), 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string', 'source' => 'html')), 'supports' => array('customClassName' => false, 'className' => false, 'html' => false), 'editorStyle' => 'wp-block-html-editor'), 'image' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/image', 'title' => 'Image', 'category' => 'media', 'usesContext' => array('allowResize', 'imageCrop', 'fixedHeight'), 'description' => 'Insert an image to make a visual statement.', 'keywords' => array('img', 'photo', 'picture'), 'textdomain' => 'default', 'attributes' => array('align' => array('type' => 'string'), 'url' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'src', '__experimentalRole' => 'content'), 'alt' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'alt', 'default' => '', '__experimentalRole' => 'content'), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => 'figcaption', '__experimentalRole' => 'content'), 'title' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'img', 'attribute' => 'title', '__experimentalRole' => 'content'), 'href' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure > a', 'attribute' => 'href', '__experimentalRole' => 'content'), 'rel' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure > a', 'attribute' => 'rel'), 'linkClass' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure > a', 'attribute' => 'class'), 'id' => array('type' => 'number', '__experimentalRole' => 'content'), 'width' => array('type' => 'number'), 'height' => array('type' => 'number'), 'sizeSlug' => array('type' => 'string'), 'linkDestination' => array('type' => 'string'), 'linkTarget' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure > a', 'attribute' => 'target')), 'supports' => array('anchor' => true, 'color' => array('__experimentalDuotone' => 'img, .components-placeholder', 'text' => false, 'background' => false), '__experimentalBorder' => array('color' => true, 'radius' => true, 'width' => true, '__experimentalSelector' => 'img, .wp-block-image__crop-area', '__experimentalSkipSerialization' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'width' => true))), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'rounded', 'label' => 'Rounded')), 'editorStyle' => 'wp-block-image-editor', 'style' => 'wp-block-image'), 'latest-comments' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/latest-comments', 'title' => 'Latest Comments', 'category' => 'widgets', 'description' => 'Display a list of your most recent comments.', 'keywords' => array('recent comments'), 'textdomain' => 'default', 'attributes' => array('commentsToShow' => array('type' => 'number', 'default' => 5, 'minimum' => 1, 'maximum' => 100), 'displayAvatar' => array('type' => 'boolean', 'default' => true), 'displayDate' => array('type' => 'boolean', 'default' => true), 'displayExcerpt' => array('type' => 'boolean', 'default' => true)), 'supports' => array('align' => true, 'html' => false), 'editorStyle' => 'wp-block-latest-comments-editor', 'style' => 'wp-block-latest-comments'), 'latest-posts' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/latest-posts', 'title' => 'Latest Posts', 'category' => 'widgets', 'description' => 'Display a list of your most recent posts.', 'keywords' => array('recent posts'), 'textdomain' => 'default', 'attributes' => array('categories' => array('type' => 'array', 'items' => array('type' => 'object')), 'selectedAuthor' => array('type' => 'number'), 'postsToShow' => array('type' => 'number', 'default' => 5), 'displayPostContent' => array('type' => 'boolean', 'default' => false), 'displayPostContentRadio' => array('type' => 'string', 'default' => 'excerpt'), 'excerptLength' => array('type' => 'number', 'default' => 55), 'displayAuthor' => array('type' => 'boolean', 'default' => false), 'displayPostDate' => array('type' => 'boolean', 'default' => false), 'postLayout' => array('type' => 'string', 'default' => 'list'), 'columns' => array('type' => 'number', 'default' => 3), 'order' => array('type' => 'string', 'default' => 'desc'), 'orderBy' => array('type' => 'string', 'default' => 'date'), 'displayFeaturedImage' => array('type' => 'boolean', 'default' => false), 'featuredImageAlign' => array('type' => 'string', 'enum' => array('left', 'center', 'right')), 'featuredImageSizeSlug' => array('type' => 'string', 'default' => 'thumbnail'), 'featuredImageSizeWidth' => array('type' => 'number', 'default' => null), 'featuredImageSizeHeight' => array('type' => 'number', 'default' => null), 'addLinkToFeaturedImage' => array('type' => 'boolean', 'default' => false)), 'supports' => array('align' => true, 'html' => false, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-latest-posts-editor', 'style' => 'wp-block-latest-posts'), 'legacy-widget' => array('apiVersion' => 2, 'name' => 'core/legacy-widget', 'title' => 'Legacy Widget', 'category' => 'widgets', 'description' => 'Display a legacy widget.', 'textdomain' => 'default', 'attributes' => array('id' => array('type' => 'string', 'default' => null), 'idBase' => array('type' => 'string', 'default' => null), 'instance' => array('type' => 'object', 'default' => null)), 'supports' => array('html' => false, 'customClassName' => false, 'reusable' => false), 'editorStyle' => 'wp-block-legacy-widget-editor'), 'list' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/list', 'title' => 'List', 'category' => 'text', 'description' => 'Create a bulleted or numbered list.', 'keywords' => array('bullet list', 'ordered list', 'numbered list'), 'textdomain' => 'default', 'attributes' => array('ordered' => array('type' => 'boolean', 'default' => false, '__experimentalRole' => 'content'), 'values' => array('type' => 'string', 'source' => 'html', 'selector' => 'ol,ul', 'multiline' => 'li', '__unstableMultilineWrapperTags' => array('ol', 'ul'), 'default' => '', '__experimentalRole' => 'content'), 'type' => array('type' => 'string'), 'start' => array('type' => 'number'), 'reversed' => array('type' => 'boolean'), 'placeholder' => array('type' => 'string')), 'supports' => array('anchor' => true, 'className' => false, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), '__unstablePasteTextInline' => true, '__experimentalSelector' => 'ol,ul', '__experimentalSlashInserter' => true), 'editorStyle' => 'wp-block-list-editor', 'style' => 'wp-block-list'), 'list-item' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/list-item', 'title' => 'List item', 'category' => 'text', 'parent' => array('core/list'), 'description' => 'Create a list item.', 'textdomain' => 'default', 'attributes' => array('placeholder' => array('type' => 'string'), 'content' => array('type' => 'string', 'source' => 'html', 'selector' => 'li', 'default' => '', '__experimentalRole' => 'content')), 'supports' => array('className' => false, '__experimentalSelector' => 'li')), 'loginout' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/loginout', 'title' => 'Login/out', 'category' => 'theme', 'description' => 'Show login & logout links.', 'keywords' => array('login', 'logout', 'form'), 'textdomain' => 'default', 'attributes' => array('displayLoginAsForm' => array('type' => 'boolean', 'default' => false), 'redirectToCurrent' => array('type' => 'boolean', 'default' => true)), 'supports' => array('className' => true, 'typography' => array('fontSize' => false))), 'media-text' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/media-text', 'title' => 'Media & Text', 'category' => 'media', 'description' => 'Set media and words side-by-side for a richer layout.', 'keywords' => array('image', 'video'), 'textdomain' => 'default', 'attributes' => array('align' => array('type' => 'string', 'default' => 'wide'), 'mediaAlt' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure img', 'attribute' => 'alt', 'default' => '', '__experimentalRole' => 'content'), 'mediaPosition' => array('type' => 'string', 'default' => 'left'), 'mediaId' => array('type' => 'number', '__experimentalRole' => 'content'), 'mediaUrl' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure video,figure img', 'attribute' => 'src', '__experimentalRole' => 'content'), 'mediaLink' => array('type' => 'string'), 'linkDestination' => array('type' => 'string'), 'linkTarget' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure a', 'attribute' => 'target'), 'href' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure a', 'attribute' => 'href', '__experimentalRole' => 'content'), 'rel' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure a', 'attribute' => 'rel'), 'linkClass' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'figure a', 'attribute' => 'class'), 'mediaType' => array('type' => 'string', '__experimentalRole' => 'content'), 'mediaWidth' => array('type' => 'number', 'default' => 50), 'mediaSizeSlug' => array('type' => 'string'), 'isStackedOnMobile' => array('type' => 'boolean', 'default' => true), 'verticalAlignment' => array('type' => 'string'), 'imageFill' => array('type' => 'boolean'), 'focalPoint' => array('type' => 'object')), 'supports' => array('anchor' => true, 'align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-media-text-editor', 'style' => 'wp-block-media-text'), 'missing' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/missing', 'title' => 'Unsupported', 'category' => 'text', 'description' => 'Your site doesn’t include support for this block.', 'textdomain' => 'default', 'attributes' => array('originalName' => array('type' => 'string'), 'originalUndelimitedContent' => array('type' => 'string'), 'originalContent' => array('type' => 'string', 'source' => 'html')), 'supports' => array('className' => false, 'customClassName' => false, 'inserter' => false, 'html' => false, 'reusable' => false)), 'more' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/more', 'title' => 'More', 'category' => 'design', 'description' => 'Content before this block will be shown in the excerpt on your archives page.', 'keywords' => array('read more'), 'textdomain' => 'default', 'attributes' => array('customText' => array('type' => 'string'), 'noTeaser' => array('type' => 'boolean', 'default' => false)), 'supports' => array('customClassName' => false, 'className' => false, 'html' => false, 'multiple' => false), 'editorStyle' => 'wp-block-more-editor'), 'navigation' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/navigation', 'title' => 'Navigation', 'category' => 'theme', 'description' => 'A collection of blocks that allow visitors to get around your site.', 'keywords' => array('menu', 'navigation', 'links'), 'textdomain' => 'default', 'attributes' => array('ref' => array('type' => 'number'), 'textColor' => array('type' => 'string'), 'customTextColor' => array('type' => 'string'), 'rgbTextColor' => array('type' => 'string'), 'backgroundColor' => array('type' => 'string'), 'customBackgroundColor' => array('type' => 'string'), 'rgbBackgroundColor' => array('type' => 'string'), 'showSubmenuIcon' => array('type' => 'boolean', 'default' => true), 'openSubmenusOnClick' => array('type' => 'boolean', 'default' => false), 'overlayMenu' => array('type' => 'string', 'default' => 'mobile'), 'icon' => array('type' => 'string', 'default' => 'handle'), 'hasIcon' => array('type' => 'boolean', 'default' => true), '__unstableLocation' => array('type' => 'string'), 'overlayBackgroundColor' => array('type' => 'string'), 'customOverlayBackgroundColor' => array('type' => 'string'), 'overlayTextColor' => array('type' => 'string'), 'customOverlayTextColor' => array('type' => 'string'), 'maxNestingLevel' => array('type' => 'number', 'default' => 5)), 'providesContext' => array('textColor' => 'textColor', 'customTextColor' => 'customTextColor', 'backgroundColor' => 'backgroundColor', 'customBackgroundColor' => 'customBackgroundColor', 'overlayTextColor' => 'overlayTextColor', 'customOverlayTextColor' => 'customOverlayTextColor', 'overlayBackgroundColor' => 'overlayBackgroundColor', 'customOverlayBackgroundColor' => 'customOverlayBackgroundColor', 'fontSize' => 'fontSize', 'customFontSize' => 'customFontSize', 'showSubmenuIcon' => 'showSubmenuIcon', 'openSubmenusOnClick' => 'openSubmenusOnClick', 'style' => 'style', 'orientation' => 'orientation', 'maxNestingLevel' => 'maxNestingLevel'), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'inserter' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalTextTransform' => true, '__experimentalFontFamily' => true, '__experimentalLetterSpacing' => true, '__experimentalTextDecoration' => true, '__experimentalSkipSerialization' => array('textDecoration'), '__experimentalDefaultControls' => array('fontSize' => true)), 'spacing' => array('blockGap' => true, 'units' => array('px', 'em', 'rem', 'vh', 'vw'), '__experimentalDefaultControls' => array('blockGap' => true)), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'allowVerticalAlignment' => false, 'default' => array('type' => 'flex')), '__experimentalStyle' => array('elements' => array('link' => array('color' => array('text' => 'inherit'))))), 'viewScript' => array('file:./view.min.js', 'file:./view-modal.min.js'), 'editorStyle' => 'wp-block-navigation-editor', 'style' => 'wp-block-navigation'), 'navigation-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/navigation-link', 'title' => 'Custom Link', 'category' => 'design', 'parent' => array('core/navigation'), 'description' => 'Add a page, link, or another item to your navigation.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string'), 'type' => array('type' => 'string'), 'description' => array('type' => 'string'), 'rel' => array('type' => 'string'), 'id' => array('type' => 'number'), 'opensInNewTab' => array('type' => 'boolean', 'default' => false), 'url' => array('type' => 'string'), 'title' => array('type' => 'string'), 'kind' => array('type' => 'string'), 'isTopLevelLink' => array('type' => 'boolean')), 'usesContext' => array('textColor', 'customTextColor', 'backgroundColor', 'customBackgroundColor', 'overlayTextColor', 'customOverlayTextColor', 'overlayBackgroundColor', 'customOverlayBackgroundColor', 'fontSize', 'customFontSize', 'showSubmenuIcon', 'maxNestingLevel', 'style'), 'supports' => array('reusable' => false, 'html' => false, '__experimentalSlashInserter' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-navigation-link-editor', 'style' => 'wp-block-navigation-link'), 'navigation-submenu' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/navigation-submenu', 'title' => 'Submenu', 'category' => 'design', 'parent' => array('core/navigation'), 'description' => 'Add a submenu to your navigation.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string'), 'type' => array('type' => 'string'), 'description' => array('type' => 'string'), 'rel' => array('type' => 'string'), 'id' => array('type' => 'number'), 'opensInNewTab' => array('type' => 'boolean', 'default' => false), 'url' => array('type' => 'string'), 'title' => array('type' => 'string'), 'kind' => array('type' => 'string'), 'isTopLevelItem' => array('type' => 'boolean')), 'usesContext' => array('textColor', 'customTextColor', 'backgroundColor', 'customBackgroundColor', 'overlayTextColor', 'customOverlayTextColor', 'overlayBackgroundColor', 'customOverlayBackgroundColor', 'fontSize', 'customFontSize', 'showSubmenuIcon', 'maxNestingLevel', 'openSubmenusOnClick', 'style'), 'supports' => array('reusable' => false, 'html' => false), 'editorStyle' => 'wp-block-navigation-submenu-editor', 'style' => 'wp-block-navigation-submenu'), 'nextpage' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/nextpage', 'title' => 'Page Break', 'category' => 'design', 'description' => 'Separate your content into a multi-page experience.', 'keywords' => array('next page', 'pagination'), 'parent' => array('core/post-content'), 'textdomain' => 'default', 'supports' => array('customClassName' => false, 'className' => false, 'html' => false), 'editorStyle' => 'wp-block-nextpage-editor'), 'page-list' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/page-list', 'title' => 'Page List', 'category' => 'widgets', 'description' => 'Display a list of all pages.', 'keywords' => array('menu', 'navigation'), 'textdomain' => 'default', 'attributes' => array(), 'usesContext' => array('textColor', 'customTextColor', 'backgroundColor', 'customBackgroundColor', 'overlayTextColor', 'customOverlayTextColor', 'overlayBackgroundColor', 'customOverlayBackgroundColor', 'fontSize', 'customFontSize', 'showSubmenuIcon', 'style', 'openSubmenusOnClick'), 'supports' => array('reusable' => false, 'html' => false), 'editorStyle' => 'wp-block-page-list-editor', 'style' => 'wp-block-page-list'), 'paragraph' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/paragraph', 'title' => 'Paragraph', 'category' => 'text', 'description' => 'Start with the basic building block of all narrative.', 'keywords' => array('text'), 'textdomain' => 'default', 'attributes' => array('align' => array('type' => 'string'), 'content' => array('type' => 'string', 'source' => 'html', 'selector' => 'p', 'default' => '', '__experimentalRole' => 'content'), 'dropCap' => array('type' => 'boolean', 'default' => false), 'placeholder' => array('type' => 'string'), 'direction' => array('type' => 'string', 'enum' => array('ltr', 'rtl'))), 'supports' => array('anchor' => true, 'className' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalTextDecoration' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalSelector' => 'p', '__unstablePasteTextInline' => true), 'editorStyle' => 'wp-block-paragraph-editor', 'style' => 'wp-block-paragraph'), 'pattern' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/pattern', 'title' => 'Pattern', 'category' => 'theme', 'description' => 'Show a block pattern.', 'supports' => array('html' => false, 'inserter' => false), 'textdomain' => 'default', 'attributes' => array('slug' => array('type' => 'string'))), 'post-author' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-author', 'title' => 'Post Author', 'category' => 'theme', 'description' => 'Display post author details such as name, avatar, and bio.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string'), 'avatarSize' => array('type' => 'number', 'default' => 48), 'showAvatar' => array('type' => 'boolean', 'default' => true), 'showBio' => array('type' => 'boolean'), 'byline' => array('type' => 'string')), 'usesContext' => array('postType', 'postId', 'queryId'), 'supports' => array('html' => false, 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), 'color' => array('gradients' => true, 'link' => true, '__experimentalDuotone' => '.wp-block-post-author__avatar img', '__experimentalDefaultControls' => array('background' => true, 'text' => true))), 'editorStyle' => 'wp-block-post-author-editor', 'style' => 'wp-block-post-author'), 'post-author-biography' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-author-biography', 'title' => 'Post Author Biography', 'category' => 'theme', 'description' => 'The author biography.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string')), 'usesContext' => array('postType', 'postId'), 'supports' => array('spacing' => array('margin' => true, 'padding' => true), 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'post-comments-form' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-comments-form', 'title' => 'Post Comments Form', 'category' => 'theme', 'description' => 'Display a post\'s comments form.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string')), 'usesContext' => array('postId', 'postType'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-post-comments-form-editor', 'style' => array('wp-block-post-comments-form', 'wp-block-buttons', 'wp-block-button')), 'post-content' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-content', 'title' => 'Post Content', 'category' => 'theme', 'description' => 'Displays the contents of a post or page.', 'textdomain' => 'default', 'usesContext' => array('postId', 'postType', 'queryId'), 'supports' => array('align' => array('wide', 'full'), 'html' => false, '__experimentalLayout' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-post-content-editor'), 'post-date' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-date', 'title' => 'Post Date', 'category' => 'theme', 'description' => 'Add the date of this post.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string'), 'format' => array('type' => 'string'), 'isLink' => array('type' => 'boolean', 'default' => false), 'displayType' => array('type' => 'string', 'default' => 'date')), 'usesContext' => array('postId', 'postType', 'queryId'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'post-excerpt' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-excerpt', 'title' => 'Post Excerpt', 'category' => 'theme', 'description' => 'Display a post\'s excerpt.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string'), 'moreText' => array('type' => 'string'), 'showMoreOnNewLine' => array('type' => 'boolean', 'default' => true)), 'usesContext' => array('postId', 'postType', 'queryId'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-post-excerpt-editor', 'style' => 'wp-block-post-excerpt'), 'post-featured-image' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-featured-image', 'title' => 'Post Featured Image', 'category' => 'theme', 'description' => 'Display a post\'s featured image.', 'textdomain' => 'default', 'attributes' => array('isLink' => array('type' => 'boolean', 'default' => false), 'width' => array('type' => 'string'), 'height' => array('type' => 'string'), 'scale' => array('type' => 'string', 'default' => 'cover'), 'sizeSlug' => array('type' => 'string'), 'rel' => array('type' => 'string', 'attribute' => 'rel', 'default' => ''), 'linkTarget' => array('type' => 'string', 'default' => '_self'), 'overlayColor' => array('type' => 'string'), 'customOverlayColor' => array('type' => 'string'), 'dimRatio' => array('type' => 'number', 'default' => 0), 'gradient' => array('type' => 'string'), 'customGradient' => array('type' => 'string')), 'usesContext' => array('postId', 'postType', 'queryId'), 'supports' => array('align' => array('left', 'right', 'center', 'wide', 'full'), 'color' => array('__experimentalDuotone' => 'img, .wp-block-post-featured-image__placeholder, .components-placeholder__illustration, .components-placeholder::before', 'text' => false, 'background' => false), '__experimentalBorder' => array('color' => true, 'radius' => true, 'width' => true, '__experimentalSelector' => 'img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay', '__experimentalSkipSerialization' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'width' => true)), 'html' => false, 'spacing' => array('margin' => true, 'padding' => true)), 'editorStyle' => 'wp-block-post-featured-image-editor', 'style' => 'wp-block-post-featured-image'), 'post-navigation-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-navigation-link', 'title' => 'Post Navigation Link', 'category' => 'theme', 'description' => 'Displays the next or previous post link that is adjacent to the current post.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string'), 'type' => array('type' => 'string', 'default' => 'next'), 'label' => array('type' => 'string'), 'showTitle' => array('type' => 'boolean', 'default' => false), 'linkLabel' => array('type' => 'boolean', 'default' => false)), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('link' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'post-template' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-template', 'title' => 'Post Template', 'category' => 'theme', 'parent' => array('core/query'), 'description' => 'Contains the block elements used to render a post, like the title, date, featured image, content or excerpt, and more.', 'textdomain' => 'default', 'usesContext' => array('queryId', 'query', 'queryContext', 'displayLayout', 'templateSlug', 'previewPostType'), 'supports' => array('reusable' => false, 'html' => false, 'align' => true, '__experimentalLayout' => array('allowEditing' => false), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'style' => 'wp-block-post-template', 'editorStyle' => 'wp-block-post-template-editor'), 'post-terms' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-terms', 'title' => 'Post Terms', 'category' => 'theme', 'description' => 'Post terms.', 'textdomain' => 'default', 'attributes' => array('term' => array('type' => 'string'), 'textAlign' => array('type' => 'string'), 'separator' => array('type' => 'string', 'default' => ', '), 'prefix' => array('type' => 'string', 'default' => ''), 'suffix' => array('type' => 'string', 'default' => '')), 'usesContext' => array('postId', 'postType'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'style' => 'wp-block-post-terms'), 'post-title' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/post-title', 'title' => 'Post Title', 'category' => 'theme', 'description' => 'Displays the title of a post, page, or any other content-type.', 'textdomain' => 'default', 'usesContext' => array('postId', 'postType', 'queryId'), 'attributes' => array('textAlign' => array('type' => 'string'), 'level' => array('type' => 'number', 'default' => 2), 'isLink' => array('type' => 'boolean', 'default' => false), 'rel' => array('type' => 'string', 'attribute' => 'rel', 'default' => ''), 'linkTarget' => array('type' => 'string', 'default' => '_self')), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true, 'textTransform' => true))), 'style' => 'wp-block-post-title'), 'preformatted' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/preformatted', 'title' => 'Preformatted', 'category' => 'text', 'description' => 'Add text that respects your spacing and tabs, and also allows styling.', 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string', 'source' => 'html', 'selector' => 'pre', 'default' => '', '__unstablePreserveWhiteSpace' => true, '__experimentalRole' => 'content')), 'supports' => array('anchor' => true, 'color' => array('gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'style' => 'wp-block-preformatted'), 'pullquote' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/pullquote', 'title' => 'Pullquote', 'category' => 'text', 'description' => 'Give special visual emphasis to a quote from your text.', 'textdomain' => 'default', 'attributes' => array('value' => array('type' => 'string', 'source' => 'html', 'selector' => 'p', '__experimentalRole' => 'content'), 'citation' => array('type' => 'string', 'source' => 'html', 'selector' => 'cite', 'default' => '', '__experimentalRole' => 'content'), 'textAlign' => array('type' => 'string')), 'supports' => array('anchor' => true, 'align' => array('left', 'right', 'wide', 'full'), 'color' => array('gradients' => true, 'background' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true)), '__experimentalBorder' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'style' => true, 'width' => true)), '__experimentalStyle' => array('typography' => array('fontSize' => '1.5em', 'lineHeight' => '1.6'))), 'editorStyle' => 'wp-block-pullquote-editor', 'style' => 'wp-block-pullquote'), 'query' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query', 'title' => 'Query Loop', 'category' => 'theme', 'description' => 'An advanced block that allows displaying post types based on different query parameters and visual configurations.', 'textdomain' => 'default', 'attributes' => array('queryId' => array('type' => 'number'), 'query' => array('type' => 'object', 'default' => array('perPage' => null, 'pages' => 0, 'offset' => 0, 'postType' => 'post', 'order' => 'desc', 'orderBy' => 'date', 'author' => '', 'search' => '', 'exclude' => array(), 'sticky' => '', 'inherit' => true, 'taxQuery' => null, 'parents' => array())), 'tagName' => array('type' => 'string', 'default' => 'div'), 'displayLayout' => array('type' => 'object', 'default' => array('type' => 'list')), 'namespace' => array('type' => 'string')), 'providesContext' => array('queryId' => 'queryId', 'query' => 'query', 'displayLayout' => 'displayLayout'), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), '__experimentalLayout' => true), 'editorStyle' => 'wp-block-query-editor'), 'query-no-results' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-no-results', 'title' => 'No results', 'category' => 'theme', 'description' => 'Contains the block elements used to render content when no query results are found.', 'parent' => array('core/query'), 'textdomain' => 'default', 'usesContext' => array('queryId', 'query'), 'supports' => array('align' => true, 'reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'link' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'query-pagination' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-pagination', 'title' => 'Pagination', 'category' => 'theme', 'parent' => array('core/query'), 'description' => 'Displays a paginated navigation to next/previous set of posts, when applicable.', 'textdomain' => 'default', 'attributes' => array('paginationArrow' => array('type' => 'string', 'default' => 'none')), 'usesContext' => array('queryId', 'query'), 'providesContext' => array('paginationArrow' => 'paginationArrow'), 'supports' => array('align' => true, 'reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'default' => array('type' => 'flex')), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-query-pagination-editor', 'style' => 'wp-block-query-pagination'), 'query-pagination-next' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-pagination-next', 'title' => 'Next Page', 'category' => 'theme', 'parent' => array('core/query-pagination'), 'description' => 'Displays the next posts page link.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string')), 'usesContext' => array('queryId', 'query', 'paginationArrow'), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'query-pagination-numbers' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-pagination-numbers', 'title' => 'Page Numbers', 'category' => 'theme', 'parent' => array('core/query-pagination'), 'description' => 'Displays a list of page numbers for pagination', 'textdomain' => 'default', 'usesContext' => array('queryId', 'query'), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'query-pagination-numbers-editor'), 'query-pagination-previous' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-pagination-previous', 'title' => 'Previous Page', 'category' => 'theme', 'parent' => array('core/query-pagination'), 'description' => 'Displays the previous posts page link.', 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string')), 'usesContext' => array('queryId', 'query', 'paginationArrow'), 'supports' => array('reusable' => false, 'html' => false, 'color' => array('gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)))), 'query-title' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/query-title', 'title' => 'Query Title', 'category' => 'theme', 'description' => 'Display the query title.', 'textdomain' => 'default', 'attributes' => array('type' => array('type' => 'string'), 'textAlign' => array('type' => 'string'), 'level' => array('type' => 'number', 'default' => 1), 'showPrefix' => array('type' => 'boolean', 'default' => true), 'showSearchTerm' => array('type' => 'boolean', 'default' => true)), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true, 'textTransform' => true))), 'style' => 'wp-block-query-title'), 'quote' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/quote', 'title' => 'Quote', 'category' => 'text', 'description' => 'Give quoted text visual emphasis. "In quoting others, we cite ourselves." — Julio Cortázar', 'keywords' => array('blockquote', 'cite'), 'textdomain' => 'default', 'attributes' => array('value' => array('type' => 'string', 'source' => 'html', 'selector' => 'blockquote', 'multiline' => 'p', 'default' => '', '__experimentalRole' => 'content'), 'citation' => array('type' => 'string', 'source' => 'html', 'selector' => 'cite', 'default' => '', '__experimentalRole' => 'content'), 'align' => array('type' => 'string')), 'supports' => array('anchor' => true, '__experimentalOnEnter' => true, 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true)), 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true))), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'plain', 'label' => 'Plain')), 'editorStyle' => 'wp-block-quote-editor', 'style' => 'wp-block-quote'), 'read-more' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/read-more', 'title' => 'Read More', 'category' => 'theme', 'description' => 'Displays the link of a post, page, or any other content-type.', 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string'), 'linkTarget' => array('type' => 'string', 'default' => '_self')), 'usesContext' => array('postId'), 'supports' => array('html' => false, 'color' => array('gradients' => true, 'text' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalLetterSpacing' => true, '__experimentalTextDecoration' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'textDecoration' => true)), 'spacing' => array('margin' => array('top', 'bottom'), 'padding' => true, '__experimentalDefaultControls' => array('padding' => true)), '__experimentalBorder' => array('color' => true, 'radius' => true, 'width' => true, '__experimentalDefaultControls' => array('width' => true))), 'style' => 'wp-block-read-more'), 'rss' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/rss', 'title' => 'RSS', 'category' => 'widgets', 'description' => 'Display entries from any RSS or Atom feed.', 'keywords' => array('atom', 'feed'), 'textdomain' => 'default', 'attributes' => array('columns' => array('type' => 'number', 'default' => 2), 'blockLayout' => array('type' => 'string', 'default' => 'list'), 'feedURL' => array('type' => 'string', 'default' => ''), 'itemsToShow' => array('type' => 'number', 'default' => 5), 'displayExcerpt' => array('type' => 'boolean', 'default' => false), 'displayAuthor' => array('type' => 'boolean', 'default' => false), 'displayDate' => array('type' => 'boolean', 'default' => false), 'excerptLength' => array('type' => 'number', 'default' => 55)), 'supports' => array('align' => true, 'html' => false), 'editorStyle' => 'wp-block-rss-editor', 'style' => 'wp-block-rss'), 'search' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/search', 'title' => 'Search', 'category' => 'widgets', 'description' => 'Help visitors find your content.', 'keywords' => array('find'), 'textdomain' => 'default', 'attributes' => array('label' => array('type' => 'string', '__experimentalRole' => 'content'), 'showLabel' => array('type' => 'boolean', 'default' => true), 'placeholder' => array('type' => 'string', 'default' => '', '__experimentalRole' => 'content'), 'width' => array('type' => 'number'), 'widthUnit' => array('type' => 'string'), 'buttonText' => array('type' => 'string', '__experimentalRole' => 'content'), 'buttonPosition' => array('type' => 'string', 'default' => 'button-outside'), 'buttonUseIcon' => array('type' => 'boolean', 'default' => false), 'query' => array('type' => 'object', 'default' => array())), 'supports' => array('align' => array('left', 'center', 'right'), 'color' => array('gradients' => true, '__experimentalSkipSerialization' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('__experimentalSkipSerialization' => true, '__experimentalSelector' => '.wp-block-search__label, .wp-block-search__input, .wp-block-search__button', 'fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalBorder' => array('color' => true, 'radius' => true, 'width' => true, '__experimentalSkipSerialization' => true, '__experimentalDefaultControls' => array('color' => true, 'radius' => true, 'width' => true)), 'html' => false), 'editorStyle' => 'wp-block-search-editor', 'style' => 'wp-block-search'), 'separator' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/separator', 'title' => 'Separator', 'category' => 'design', 'description' => 'Create a break between ideas or sections with a horizontal separator.', 'keywords' => array('horizontal-line', 'hr', 'divider'), 'textdomain' => 'default', 'attributes' => array('opacity' => array('type' => 'string', 'default' => 'alpha-channel')), 'supports' => array('anchor' => true, 'align' => array('center', 'wide', 'full'), 'color' => array('enableContrastChecker' => false, '__experimentalSkipSerialization' => true, 'gradients' => true, 'background' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => true)), 'spacing' => array('margin' => array('top', 'bottom'))), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'wide', 'label' => 'Wide Line'), array('name' => 'dots', 'label' => 'Dots')), 'editorStyle' => 'wp-block-separator-editor', 'style' => 'wp-block-separator'), 'shortcode' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/shortcode', 'title' => 'Shortcode', 'category' => 'widgets', 'description' => 'Insert additional custom elements with a WordPress shortcode.', 'textdomain' => 'default', 'attributes' => array('text' => array('type' => 'string', 'source' => 'html')), 'supports' => array('className' => false, 'customClassName' => false, 'html' => false), 'editorStyle' => 'wp-block-shortcode-editor'), 'site-logo' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/site-logo', 'title' => 'Site Logo', 'category' => 'theme', 'description' => 'Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.', 'textdomain' => 'default', 'attributes' => array('width' => array('type' => 'number'), 'isLink' => array('type' => 'boolean', 'default' => true), 'linkTarget' => array('type' => 'string', 'default' => '_self'), 'shouldSyncIcon' => array('type' => 'boolean')), 'example' => array('viewportWidth' => 500, 'attributes' => array('width' => 350, 'className' => 'block-editor-block-types-list__site-logo-example')), 'supports' => array('html' => false, 'align' => true, 'alignWide' => false, 'color' => array('__experimentalDuotone' => 'img, .components-placeholder__illustration, .components-placeholder::before', 'text' => false, 'background' => false), 'spacing' => array('margin' => true, 'padding' => true)), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'rounded', 'label' => 'Rounded')), 'editorStyle' => 'wp-block-site-logo-editor', 'style' => 'wp-block-site-logo'), 'site-tagline' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/site-tagline', 'title' => 'Site Tagline', 'category' => 'theme', 'description' => 'Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it\'s not displayed in the theme design.', 'keywords' => array('description'), 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string')), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-site-tagline-editor'), 'site-title' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/site-title', 'title' => 'Site Title', 'category' => 'theme', 'description' => 'Displays the name of this site. Update the block, and the changes apply everywhere it’s used. This will also appear in the browser title bar and in search results.', 'textdomain' => 'default', 'attributes' => array('level' => array('type' => 'number', 'default' => 1), 'textAlign' => array('type' => 'string'), 'isLink' => array('type' => 'boolean', 'default' => true), 'linkTarget' => array('type' => 'string', 'default' => '_self')), 'example' => array('viewportWidth' => 500), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true, 'link' => true)), 'spacing' => array('padding' => true, 'margin' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'lineHeight' => true, 'fontAppearance' => true, 'letterSpacing' => true, 'textTransform' => true))), 'editorStyle' => 'wp-block-site-title-editor'), 'social-link' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/social-link', 'title' => 'Social Icon', 'category' => 'widgets', 'parent' => array('core/social-links'), 'description' => 'Display an icon linking to a social media profile or site.', 'textdomain' => 'default', 'attributes' => array('url' => array('type' => 'string'), 'service' => array('type' => 'string'), 'label' => array('type' => 'string')), 'usesContext' => array('openInNewTab', 'showLabels', 'iconColorValue', 'iconBackgroundColorValue'), 'supports' => array('reusable' => false, 'html' => false), 'editorStyle' => 'wp-block-social-link-editor'), 'social-links' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/social-links', 'title' => 'Social Icons', 'category' => 'widgets', 'description' => 'Display icons linking to your social media profiles or sites.', 'keywords' => array('links'), 'textdomain' => 'default', 'attributes' => array('iconColor' => array('type' => 'string'), 'customIconColor' => array('type' => 'string'), 'iconColorValue' => array('type' => 'string'), 'iconBackgroundColor' => array('type' => 'string'), 'customIconBackgroundColor' => array('type' => 'string'), 'iconBackgroundColorValue' => array('type' => 'string'), 'openInNewTab' => array('type' => 'boolean', 'default' => false), 'showLabels' => array('type' => 'boolean', 'default' => false), 'size' => array('type' => 'string')), 'providesContext' => array('openInNewTab' => 'openInNewTab', 'showLabels' => 'showLabels', 'iconColorValue' => 'iconColorValue', 'iconBackgroundColorValue' => 'iconBackgroundColorValue'), 'supports' => array('align' => array('left', 'center', 'right'), 'anchor' => true, '__experimentalExposeControlsToChildren' => true, '__experimentalLayout' => array('allowSwitching' => false, 'allowInheriting' => false, 'allowVerticalAlignment' => false, 'default' => array('type' => 'flex')), 'color' => array('enableContrastChecker' => false, 'background' => true, 'gradients' => true, 'text' => false, '__experimentalDefaultControls' => array('background' => false)), 'spacing' => array('blockGap' => array('horizontal', 'vertical'), 'margin' => true, 'padding' => true, 'units' => array('px', 'em', 'rem', 'vh', 'vw'), '__experimentalDefaultControls' => array('blockGap' => true))), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'logos-only', 'label' => 'Logos Only'), array('name' => 'pill-shape', 'label' => 'Pill Shape')), 'editorStyle' => 'wp-block-social-links-editor', 'style' => 'wp-block-social-links'), 'spacer' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/spacer', 'title' => 'Spacer', 'category' => 'design', 'description' => 'Add white space between blocks and customize its height.', 'textdomain' => 'default', 'attributes' => array('height' => array('type' => 'string', 'default' => '100px'), 'width' => array('type' => 'string')), 'usesContext' => array('orientation'), 'supports' => array('anchor' => true, 'spacing' => array('margin' => array('top', 'bottom'), '__experimentalDefaultControls' => array('margin' => true))), 'editorStyle' => 'wp-block-spacer-editor', 'style' => 'wp-block-spacer'), 'table' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/table', 'title' => 'Table', 'category' => 'text', 'description' => 'Create structured content in rows and columns to display information.', 'textdomain' => 'default', 'attributes' => array('hasFixedLayout' => array('type' => 'boolean', 'default' => false), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => 'figcaption', 'default' => ''), 'head' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'thead tr', 'query' => array('cells' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'td,th', 'query' => array('content' => array('type' => 'string', 'source' => 'html'), 'tag' => array('type' => 'string', 'default' => 'td', 'source' => 'tag'), 'scope' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'scope'), 'align' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'data-align'))))), 'body' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'tbody tr', 'query' => array('cells' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'td,th', 'query' => array('content' => array('type' => 'string', 'source' => 'html'), 'tag' => array('type' => 'string', 'default' => 'td', 'source' => 'tag'), 'scope' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'scope'), 'align' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'data-align'))))), 'foot' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'tfoot tr', 'query' => array('cells' => array('type' => 'array', 'default' => array(), 'source' => 'query', 'selector' => 'td,th', 'query' => array('content' => array('type' => 'string', 'source' => 'html'), 'tag' => array('type' => 'string', 'default' => 'td', 'source' => 'tag'), 'scope' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'scope'), 'align' => array('type' => 'string', 'source' => 'attribute', 'attribute' => 'data-align')))))), 'supports' => array('anchor' => true, 'align' => true, 'color' => array('__experimentalSkipSerialization' => true, 'gradients' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('margin' => true, 'padding' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalDefaultControls' => array('fontSize' => true)), '__experimentalBorder' => array('__experimentalSkipSerialization' => true, 'color' => true, 'style' => true, 'width' => true, '__experimentalDefaultControls' => array('color' => true, 'style' => true, 'width' => true)), '__experimentalSelector' => '.wp-block-table > table'), 'styles' => array(array('name' => 'regular', 'label' => 'Default', 'isDefault' => true), array('name' => 'stripes', 'label' => 'Stripes')), 'editorStyle' => 'wp-block-table-editor', 'style' => 'wp-block-table'), 'tag-cloud' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/tag-cloud', 'title' => 'Tag Cloud', 'category' => 'widgets', 'description' => 'A cloud of your most used tags.', 'textdomain' => 'default', 'attributes' => array('numberOfTags' => array('type' => 'number', 'default' => 45, 'minimum' => 1, 'maximum' => 100), 'taxonomy' => array('type' => 'string', 'default' => 'post_tag'), 'showTagCounts' => array('type' => 'boolean', 'default' => false), 'smallestFontSize' => array('type' => 'string', 'default' => '8pt'), 'largestFontSize' => array('type' => 'string', 'default' => '22pt')), 'styles' => array(array('name' => 'default', 'label' => 'Default', 'isDefault' => true), array('name' => 'outline', 'label' => 'Outline')), 'supports' => array('html' => false, 'align' => true, 'spacing' => array('margin' => true, 'padding' => true)), 'editorStyle' => 'wp-block-tag-cloud-editor'), 'template-part' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/template-part', 'title' => 'Template Part', 'category' => 'theme', 'description' => 'Edit the different global regions of your site, like the header, footer, sidebar, or create your own.', 'textdomain' => 'default', 'attributes' => array('slug' => array('type' => 'string'), 'theme' => array('type' => 'string'), 'tagName' => array('type' => 'string'), 'area' => array('type' => 'string')), 'supports' => array('align' => true, 'html' => false, 'reusable' => false), 'editorStyle' => 'wp-block-template-part-editor'), 'term-description' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/term-description', 'title' => 'Term Description', 'category' => 'theme', 'description' => 'Display the description of categories, tags and custom taxonomies when viewing an archive.', 'textdomain' => 'default', 'attributes' => array('textAlign' => array('type' => 'string')), 'supports' => array('align' => array('wide', 'full'), 'html' => false, 'color' => array('link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'spacing' => array('padding' => true, 'margin' => true), 'typography' => array('fontSize' => true, 'lineHeight' => true, '__experimentalFontFamily' => true, '__experimentalFontWeight' => true, '__experimentalFontStyle' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalLetterSpacing' => true, '__experimentalDefaultControls' => array('fontSize' => true))), 'editorStyle' => 'wp-block-term-description-editor'), 'text-columns' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/text-columns', 'title' => 'Text Columns (deprecated)', 'icon' => 'columns', 'category' => 'design', 'description' => 'This block is deprecated. Please use the Columns block instead.', 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'array', 'source' => 'query', 'selector' => 'p', 'query' => array('children' => array('type' => 'string', 'source' => 'html')), 'default' => array(array(), array())), 'columns' => array('type' => 'number', 'default' => 2), 'width' => array('type' => 'string')), 'supports' => array('inserter' => false), 'editorStyle' => 'wp-block-text-columns-editor', 'style' => 'wp-block-text-columns'), 'verse' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/verse', 'title' => 'Verse', 'category' => 'text', 'description' => 'Insert poetry. Use special spacing formats. Or quote song lyrics.', 'keywords' => array('poetry', 'poem'), 'textdomain' => 'default', 'attributes' => array('content' => array('type' => 'string', 'source' => 'html', 'selector' => 'pre', 'default' => '', '__unstablePreserveWhiteSpace' => true, '__experimentalRole' => 'content'), 'textAlign' => array('type' => 'string')), 'supports' => array('anchor' => true, 'color' => array('gradients' => true, 'link' => true, '__experimentalDefaultControls' => array('background' => true, 'text' => true)), 'typography' => array('fontSize' => true, '__experimentalFontFamily' => true, 'lineHeight' => true, '__experimentalFontStyle' => true, '__experimentalFontWeight' => true, '__experimentalLetterSpacing' => true, '__experimentalTextTransform' => true, '__experimentalTextDecoration' => true, '__experimentalDefaultControls' => array('fontSize' => true, 'fontAppearance' => true)), 'spacing' => array('margin' => true, 'padding' => true)), 'style' => 'wp-block-verse', 'editorStyle' => 'wp-block-verse-editor'), 'video' => array('$schema' => 'https://schemas.wp.org/trunk/block.json', 'apiVersion' => 2, 'name' => 'core/video', 'title' => 'Video', 'category' => 'media', 'description' => 'Embed a video from your media library or upload a new one.', 'keywords' => array('movie'), 'textdomain' => 'default', 'attributes' => array('autoplay' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'autoplay'), 'caption' => array('type' => 'string', 'source' => 'html', 'selector' => 'figcaption', '__experimentalRole' => 'content'), 'controls' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'controls', 'default' => true), 'id' => array('type' => 'number', '__experimentalRole' => 'content'), 'loop' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'loop'), 'muted' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'muted'), 'poster' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'poster'), 'preload' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'preload', 'default' => 'metadata'), 'src' => array('type' => 'string', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'src', '__experimentalRole' => 'content'), 'playsInline' => array('type' => 'boolean', 'source' => 'attribute', 'selector' => 'video', 'attribute' => 'playsinline'), 'tracks' => array('__experimentalRole' => 'content', 'type' => 'array', 'items' => array('type' => 'object'), 'default' => array())), 'supports' => array('anchor' => true, 'align' => true, 'spacing' => array('margin' => true, 'padding' => true)), 'editorStyle' => 'wp-block-video-editor', 'style' => 'wp-block-video'), 'widget-group' => array('apiVersion' => 2, 'name' => 'core/widget-group', 'category' => 'widgets', 'attributes' => array('title' => array('type' => 'string')), 'supports' => array('html' => false, 'inserter' => true, 'customClassName' => true, 'reusable' => false), 'editorStyle' => 'wp-block-widget-group-editor', 'style' => 'wp-block-widget-group'));
\ No newline at end of file
+<?php return array(
+  'archives' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/archives',
+    'title' => 'Archives',
+    'category' => 'widgets',
+    'description' => 'Display a date archive of your posts.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'displayAsDropdown' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showLabel' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'showPostCounts' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'type' => array(
+        'type' => 'string',
+        'default' => 'monthly'
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-archives-editor'
+  ),
+  'audio' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/audio',
+    'title' => 'Audio',
+    'category' => 'media',
+    'description' => 'Embed a simple audio player.',
+    'keywords' => array(
+      'music',
+      'sound',
+      'podcast',
+      'recording'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'src' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'audio',
+        'attribute' => 'src',
+        '__experimentalRole' => 'content'
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'figcaption',
+        '__experimentalRole' => 'content'
+      ),
+      'id' => array(
+        'type' => 'number',
+        '__experimentalRole' => 'content'
+      ),
+      'autoplay' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'audio',
+        'attribute' => 'autoplay'
+      ),
+      'loop' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'audio',
+        'attribute' => 'loop'
+      ),
+      'preload' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'audio',
+        'attribute' => 'preload'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-audio-editor',
+    'style' => 'wp-block-audio'
+  ),
+  'avatar' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/avatar',
+    'title' => 'Avatar',
+    'category' => 'theme',
+    'description' => 'Add a user’s avatar.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'userId' => array(
+        'type' => 'number'
+      ),
+      'size' => array(
+        'type' => 'number',
+        'default' => 96
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'usesContext' => array(
+      'postType',
+      'postId',
+      'commentId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'align' => true,
+      'alignWide' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      '__experimentalBorder' => array(
+        '__experimentalSkipSerialization' => true,
+        'radius' => true,
+        'width' => true,
+        'color' => true,
+        'style' => true,
+        '__experimentalDefaultControls' => array(
+          'radius' => true
+        )
+      ),
+      'color' => array(
+        'text' => false,
+        'background' => false,
+        '__experimentalDuotone' => 'img'
+      )
+    ),
+    'editorStyle' => 'wp-block-avatar-editor',
+    'style' => 'wp-block-avatar'
+  ),
+  'block' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/block',
+    'title' => 'Pattern',
+    'category' => 'reusable',
+    'description' => 'Create and save content to reuse across your site. Update the pattern, and the changes apply everywhere it’s used.',
+    'keywords' => array(
+      'reusable'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'ref' => array(
+        'type' => 'number'
+      )
+    ),
+    'supports' => array(
+      'customClassName' => false,
+      'html' => false,
+      'inserter' => false
+    )
+  ),
+  'button' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/button',
+    'title' => 'Button',
+    'category' => 'design',
+    'parent' => array(
+      'core/buttons'
+    ),
+    'description' => 'Prompt visitors to take action with a button-style link.',
+    'keywords' => array(
+      'link'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'url' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a',
+        'attribute' => 'href',
+        '__experimentalRole' => 'content'
+      ),
+      'title' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a',
+        'attribute' => 'title',
+        '__experimentalRole' => 'content'
+      ),
+      'text' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'a',
+        '__experimentalRole' => 'content'
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a',
+        'attribute' => 'target',
+        '__experimentalRole' => 'content'
+      ),
+      'rel' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a',
+        'attribute' => 'rel',
+        '__experimentalRole' => 'content'
+      ),
+      'placeholder' => array(
+        'type' => 'string'
+      ),
+      'backgroundColor' => array(
+        'type' => 'string'
+      ),
+      'textColor' => array(
+        'type' => 'string'
+      ),
+      'gradient' => array(
+        'type' => 'string'
+      ),
+      'width' => array(
+        'type' => 'number'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => false,
+      'alignWide' => false,
+      'color' => array(
+        '__experimentalSkipSerialization' => true,
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'reusable' => false,
+      'shadow' => true,
+      'spacing' => array(
+        '__experimentalSkipSerialization' => true,
+        'padding' => array(
+          'horizontal',
+          'vertical'
+        ),
+        '__experimentalDefaultControls' => array(
+          'padding' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalSkipSerialization' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      '__experimentalSelector' => '.wp-block-button .wp-block-button__link'
+    ),
+    'styles' => array(
+      array(
+        'name' => 'fill',
+        'label' => 'Fill',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'outline',
+        'label' => 'Outline'
+      )
+    ),
+    'editorStyle' => 'wp-block-button-editor',
+    'style' => 'wp-block-button'
+  ),
+  'buttons' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/buttons',
+    'title' => 'Buttons',
+    'category' => 'design',
+    'description' => 'Prompt visitors to take action with a group of button-style links.',
+    'keywords' => array(
+      'link'
+    ),
+    'textdomain' => 'default',
+    'supports' => array(
+      'anchor' => true,
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      '__experimentalExposeControlsToChildren' => true,
+      'spacing' => array(
+        'blockGap' => true,
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        '__experimentalDefaultControls' => array(
+          'blockGap' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'default' => array(
+          'type' => 'flex'
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-buttons-editor',
+    'style' => 'wp-block-buttons'
+  ),
+  'calendar' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/calendar',
+    'title' => 'Calendar',
+    'category' => 'widgets',
+    'description' => 'A calendar of your site’s posts.',
+    'keywords' => array(
+      'posts',
+      'archive'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'month' => array(
+        'type' => 'integer'
+      ),
+      'year' => array(
+        'type' => 'integer'
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'color' => array(
+        'link' => true,
+        '__experimentalSkipSerialization' => array(
+          'text',
+          'background'
+        ),
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        ),
+        '__experimentalSelector' => 'table, th'
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-calendar'
+  ),
+  'categories' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/categories',
+    'title' => 'Categories List',
+    'category' => 'widgets',
+    'description' => 'Display a list of all categories.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'displayAsDropdown' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showHierarchy' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showPostCounts' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showOnlyTopLevel' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showEmpty' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-categories-editor',
+    'style' => 'wp-block-categories'
+  ),
+  'code' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/code',
+    'title' => 'Code',
+    'category' => 'text',
+    'description' => 'Display code snippets that respect your spacing and tabs.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'code'
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide'
+      ),
+      'anchor' => true,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      '__experimentalBorder' => array(
+        'radius' => true,
+        'color' => true,
+        'width' => true,
+        'style' => true,
+        '__experimentalDefaultControls' => array(
+          'width' => true,
+          'color' => true
+        )
+      ),
+      'color' => array(
+        'text' => true,
+        'background' => true,
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-code'
+  ),
+  'column' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/column',
+    'title' => 'Column',
+    'category' => 'design',
+    'parent' => array(
+      'core/columns'
+    ),
+    'description' => 'A single column within a columns block.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'verticalAlignment' => array(
+        'type' => 'string'
+      ),
+      'width' => array(
+        'type' => 'string'
+      ),
+      'allowedBlocks' => array(
+        'type' => 'array'
+      ),
+      'templateLock' => array(
+        'type' => array(
+          'string',
+          'boolean'
+        ),
+        'enum' => array(
+          'all',
+          'insert',
+          'contentOnly',
+          false
+        )
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'blockGap' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'padding' => true,
+          'blockGap' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'layout' => true
+    )
+  ),
+  'columns' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/columns',
+    'title' => 'Columns',
+    'category' => 'design',
+    'description' => 'Display content in multiple columns, with blocks added to each column.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'verticalAlignment' => array(
+        'type' => 'string'
+      ),
+      'isStackedOnMobile' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'templateLock' => array(
+        'type' => array(
+          'string',
+          'boolean'
+        ),
+        'enum' => array(
+          'all',
+          'insert',
+          'contentOnly',
+          false
+        )
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'blockGap' => array(
+          '__experimentalDefault' => '2em',
+          'sides' => array(
+            'horizontal',
+            'vertical'
+          )
+        ),
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'padding' => true,
+          'blockGap' => true
+        )
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'allowEditing' => false,
+        'default' => array(
+          'type' => 'flex',
+          'flexWrap' => 'nowrap'
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-columns-editor',
+    'style' => 'wp-block-columns'
+  ),
+  'comment-author-name' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-author-name',
+    'title' => 'Comment Author Name',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comment-template'
+    ),
+    'description' => 'Displays the name of the author of the comment.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'commentId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comment-content' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-content',
+    'title' => 'Comment Content',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comment-template'
+    ),
+    'description' => 'Displays the contents of a comment.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'commentId'
+    ),
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'spacing' => array(
+        'padding' => array(
+          'horizontal',
+          'vertical'
+        ),
+        '__experimentalDefaultControls' => array(
+          'padding' => true
+        )
+      ),
+      'html' => false
+    )
+  ),
+  'comment-date' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-date',
+    'title' => 'Comment Date',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comment-template'
+    ),
+    'description' => 'Displays the date on which the comment was posted.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'format' => array(
+        'type' => 'string'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => true
+      )
+    ),
+    'usesContext' => array(
+      'commentId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comment-edit-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-edit-link',
+    'title' => 'Comment Edit Link',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comment-template'
+    ),
+    'description' => 'Displays a link to edit the comment in the WordPress Dashboard. This link is only visible to users with the edit comment capability.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'commentId'
+    ),
+    'attributes' => array(
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'link' => true,
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comment-reply-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-reply-link',
+    'title' => 'Comment Reply Link',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comment-template'
+    ),
+    'description' => 'Displays a link to reply to a comment.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'commentId'
+    ),
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'html' => false
+    )
+  ),
+  'comment-template' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comment-template',
+    'title' => 'Comment Template',
+    'category' => 'design',
+    'parent' => array(
+      'core/comments'
+    ),
+    'description' => 'Contains the block elements used to display a comment, like the title, date, author, avatar and more.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId'
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'reusable' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-comment-template'
+  ),
+  'comments' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments',
+    'title' => 'Comments',
+    'category' => 'theme',
+    'description' => 'An advanced block that allows displaying post comments using different visual configurations.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'tagName' => array(
+        'type' => 'string',
+        'default' => 'div'
+      ),
+      'legacy' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-comments-editor',
+    'usesContext' => array(
+      'postId',
+      'postType'
+    )
+  ),
+  'comments-pagination' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments-pagination',
+    'title' => 'Comments Pagination',
+    'category' => 'theme',
+    'parent' => array(
+      'core/comments'
+    ),
+    'description' => 'Displays a paginated navigation to next/previous set of comments, when applicable.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'paginationArrow' => array(
+        'type' => 'string',
+        'default' => 'none'
+      )
+    ),
+    'providesContext' => array(
+      'comments/paginationArrow' => 'paginationArrow'
+    ),
+    'supports' => array(
+      'align' => true,
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'default' => array(
+          'type' => 'flex'
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-comments-pagination-editor',
+    'style' => 'wp-block-comments-pagination'
+  ),
+  'comments-pagination-next' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments-pagination-next',
+    'title' => 'Comments Next Page',
+    'category' => 'theme',
+    'parent' => array(
+      'core/comments-pagination'
+    ),
+    'description' => 'Displays the next comment\'s page link.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'comments/paginationArrow'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comments-pagination-numbers' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments-pagination-numbers',
+    'title' => 'Comments Page Numbers',
+    'category' => 'theme',
+    'parent' => array(
+      'core/comments-pagination'
+    ),
+    'description' => 'Displays a list of page numbers for comments pagination.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comments-pagination-previous' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments-pagination-previous',
+    'title' => 'Comments Previous Page',
+    'category' => 'theme',
+    'parent' => array(
+      'core/comments-pagination'
+    ),
+    'description' => 'Displays the previous comment\'s page link.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'comments/paginationArrow'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'comments-title' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/comments-title',
+    'title' => 'Comments Title',
+    'category' => 'theme',
+    'ancestor' => array(
+      'core/comments'
+    ),
+    'description' => 'Displays a title with the number of comments',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId',
+      'postType'
+    ),
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'showPostTitle' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'showCommentsCount' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'level' => array(
+        'type' => 'number',
+        'default' => 2
+      )
+    ),
+    'supports' => array(
+      'anchor' => false,
+      'align' => true,
+      'html' => false,
+      '__experimentalBorder' => array(
+        'radius' => true,
+        'color' => true,
+        'width' => true,
+        'style' => true
+      ),
+      'color' => array(
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          '__experimentalFontFamily' => true,
+          '__experimentalFontStyle' => true,
+          '__experimentalFontWeight' => true
+        )
+      )
+    )
+  ),
+  'cover' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/cover',
+    'title' => 'Cover',
+    'category' => 'media',
+    'description' => 'Add an image or video with a text overlay.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'url' => array(
+        'type' => 'string'
+      ),
+      'useFeaturedImage' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'id' => array(
+        'type' => 'number'
+      ),
+      'alt' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'img',
+        'attribute' => 'alt',
+        'default' => ''
+      ),
+      'hasParallax' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'isRepeated' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'dimRatio' => array(
+        'type' => 'number',
+        'default' => 100
+      ),
+      'overlayColor' => array(
+        'type' => 'string'
+      ),
+      'customOverlayColor' => array(
+        'type' => 'string'
+      ),
+      'backgroundType' => array(
+        'type' => 'string',
+        'default' => 'image'
+      ),
+      'focalPoint' => array(
+        'type' => 'object'
+      ),
+      'minHeight' => array(
+        'type' => 'number'
+      ),
+      'minHeightUnit' => array(
+        'type' => 'string'
+      ),
+      'gradient' => array(
+        'type' => 'string'
+      ),
+      'customGradient' => array(
+        'type' => 'string'
+      ),
+      'contentPosition' => array(
+        'type' => 'string'
+      ),
+      'isDark' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'allowedBlocks' => array(
+        'type' => 'array'
+      ),
+      'templateLock' => array(
+        'type' => array(
+          'string',
+          'boolean'
+        ),
+        'enum' => array(
+          'all',
+          'insert',
+          'contentOnly',
+          false
+        )
+      ),
+      'tagName' => array(
+        'type' => 'string',
+        'default' => 'div'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType'
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'html' => false,
+      'spacing' => array(
+        'padding' => true,
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        'blockGap' => true,
+        '__experimentalDefaultControls' => array(
+          'padding' => true,
+          'blockGap' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      'color' => array(
+        '__experimentalDuotone' => '> .wp-block-cover__image-background, > .wp-block-cover__video-background',
+        'text' => true,
+        'background' => false,
+        '__experimentalSkipSerialization' => array(
+          'gradients'
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'layout' => array(
+        'allowJustification' => false
+      )
+    ),
+    'editorStyle' => 'wp-block-cover-editor',
+    'style' => 'wp-block-cover'
+  ),
+  'details' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/details',
+    'title' => 'Details',
+    'category' => 'text',
+    'description' => 'Hide and show additional content.',
+    'keywords' => array(
+      'disclosure',
+      'summary',
+      'hide'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'showContent' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'summary' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'width' => true,
+        'style' => true
+      ),
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-details-editor',
+    'style' => 'wp-block-details'
+  ),
+  'embed' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/embed',
+    'title' => 'Embed',
+    'category' => 'embed',
+    'description' => 'Add a block that displays content pulled from other sites, like Twitter or YouTube.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'url' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'figcaption',
+        '__experimentalRole' => 'content'
+      ),
+      'type' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'providerNameSlug' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'allowResponsive' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'responsive' => array(
+        'type' => 'boolean',
+        'default' => false,
+        '__experimentalRole' => 'content'
+      ),
+      'previewable' => array(
+        'type' => 'boolean',
+        'default' => true,
+        '__experimentalRole' => 'content'
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'spacing' => array(
+        'margin' => true
+      )
+    ),
+    'editorStyle' => 'wp-block-embed-editor',
+    'style' => 'wp-block-embed'
+  ),
+  'file' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/file',
+    'title' => 'File',
+    'category' => 'media',
+    'description' => 'Add a link to a downloadable file.',
+    'keywords' => array(
+      'document',
+      'pdf',
+      'download'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'id' => array(
+        'type' => 'number'
+      ),
+      'href' => array(
+        'type' => 'string'
+      ),
+      'fileId' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a:not([download])',
+        'attribute' => 'id'
+      ),
+      'fileName' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'a:not([download])'
+      ),
+      'textLinkHref' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a:not([download])',
+        'attribute' => 'href'
+      ),
+      'textLinkTarget' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'a:not([download])',
+        'attribute' => 'target'
+      ),
+      'showDownloadButton' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'downloadButtonText' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'a[download]'
+      ),
+      'displayPreview' => array(
+        'type' => 'boolean'
+      ),
+      'previewHeight' => array(
+        'type' => 'number',
+        'default' => 600
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'link' => true
+        )
+      )
+    ),
+    'viewScript' => 'file:./view.min.js',
+    'editorStyle' => 'wp-block-file-editor',
+    'style' => 'wp-block-file'
+  ),
+  'footnotes' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/footnotes',
+    'title' => 'Footnotes',
+    'category' => 'text',
+    'description' => '',
+    'keywords' => array(
+      'references'
+    ),
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId',
+      'postType'
+    ),
+    'supports' => array(
+      'html' => false,
+      'multiple' => false,
+      'reusable' => false
+    ),
+    'style' => 'wp-block-footnotes'
+  ),
+  'freeform' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/freeform',
+    'title' => 'Classic',
+    'category' => 'text',
+    'description' => 'Use the classic WordPress editor.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string',
+        'source' => 'raw'
+      )
+    ),
+    'supports' => array(
+      'className' => false,
+      'customClassName' => false,
+      'reusable' => false
+    ),
+    'editorStyle' => 'wp-block-freeform-editor'
+  ),
+  'gallery' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/gallery',
+    'title' => 'Gallery',
+    'category' => 'media',
+    'description' => 'Display multiple images in a rich gallery.',
+    'keywords' => array(
+      'images',
+      'photos'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'images' => array(
+        'type' => 'array',
+        'default' => array(
+          
+        ),
+        'source' => 'query',
+        'selector' => '.blocks-gallery-item',
+        'query' => array(
+          'url' => array(
+            'type' => 'string',
+            'source' => 'attribute',
+            'selector' => 'img',
+            'attribute' => 'src'
+          ),
+          'fullUrl' => array(
+            'type' => 'string',
+            'source' => 'attribute',
+            'selector' => 'img',
+            'attribute' => 'data-full-url'
+          ),
+          'link' => array(
+            'type' => 'string',
+            'source' => 'attribute',
+            'selector' => 'img',
+            'attribute' => 'data-link'
+          ),
+          'alt' => array(
+            'type' => 'string',
+            'source' => 'attribute',
+            'selector' => 'img',
+            'attribute' => 'alt',
+            'default' => ''
+          ),
+          'id' => array(
+            'type' => 'string',
+            'source' => 'attribute',
+            'selector' => 'img',
+            'attribute' => 'data-id'
+          ),
+          'caption' => array(
+            'type' => 'string',
+            'source' => 'html',
+            'selector' => '.blocks-gallery-item__caption'
+          )
+        )
+      ),
+      'ids' => array(
+        'type' => 'array',
+        'items' => array(
+          'type' => 'number'
+        ),
+        'default' => array(
+          
+        )
+      ),
+      'shortCodeTransforms' => array(
+        'type' => 'array',
+        'default' => array(
+          
+        ),
+        'items' => array(
+          'type' => 'object'
+        )
+      ),
+      'columns' => array(
+        'type' => 'number',
+        'minimum' => 1,
+        'maximum' => 8
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => '.blocks-gallery-caption'
+      ),
+      'imageCrop' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'fixedHeight' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'linkTarget' => array(
+        'type' => 'string'
+      ),
+      'linkTo' => array(
+        'type' => 'string'
+      ),
+      'sizeSlug' => array(
+        'type' => 'string',
+        'default' => 'large'
+      ),
+      'allowResize' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'providesContext' => array(
+      'allowResize' => 'allowResize',
+      'imageCrop' => 'imageCrop',
+      'fixedHeight' => 'fixedHeight'
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'html' => false,
+      'units' => array(
+        'px',
+        'em',
+        'rem',
+        'vh',
+        'vw'
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        'blockGap' => array(
+          'horizontal',
+          'vertical'
+        ),
+        '__experimentalSkipSerialization' => array(
+          'blockGap'
+        ),
+        '__experimentalDefaultControls' => array(
+          'blockGap' => true,
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'color' => array(
+        'text' => false,
+        'background' => true,
+        'gradients' => true
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'allowEditing' => false,
+        'default' => array(
+          'type' => 'flex'
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-gallery-editor',
+    'style' => 'wp-block-gallery'
+  ),
+  'group' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/group',
+    'title' => 'Group',
+    'category' => 'design',
+    'description' => 'Gather blocks in a layout container.',
+    'keywords' => array(
+      'container',
+      'wrapper',
+      'row',
+      'section'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'tagName' => array(
+        'type' => 'string',
+        'default' => 'div'
+      ),
+      'templateLock' => array(
+        'type' => array(
+          'string',
+          'boolean'
+        ),
+        'enum' => array(
+          'all',
+          'insert',
+          'contentOnly',
+          false
+        )
+      ),
+      'allowedBlocks' => array(
+        'type' => 'array'
+      )
+    ),
+    'supports' => array(
+      '__experimentalOnEnter' => true,
+      '__experimentalSettings' => true,
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'anchor' => true,
+      'ariaLabel' => true,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        'padding' => true,
+        'blockGap' => true,
+        '__experimentalDefaultControls' => array(
+          'padding' => true,
+          'blockGap' => true
+        )
+      ),
+      'dimensions' => array(
+        'minHeight' => true
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      'position' => array(
+        'sticky' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'layout' => array(
+        'allowSizingOnChildren' => true
+      )
+    ),
+    'editorStyle' => 'wp-block-group-editor',
+    'style' => 'wp-block-group'
+  ),
+  'heading' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/heading',
+    'title' => 'Heading',
+    'category' => 'text',
+    'description' => 'Introduce new sections and organize content to help visitors (and search engines) understand the structure of your content.',
+    'keywords' => array(
+      'title',
+      'subtitle'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'h1,h2,h3,h4,h5,h6',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'level' => array(
+        'type' => 'number',
+        'default' => 2
+      ),
+      'placeholder' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'anchor' => true,
+      'className' => true,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true,
+          'textTransform' => true
+        )
+      ),
+      '__unstablePasteTextInline' => true,
+      '__experimentalSlashInserter' => true
+    ),
+    'editorStyle' => 'wp-block-heading-editor',
+    'style' => 'wp-block-heading'
+  ),
+  'home-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/home-link',
+    'category' => 'design',
+    'parent' => array(
+      'core/navigation'
+    ),
+    'title' => 'Home Link',
+    'description' => 'Create a link that always points to the homepage of the site. Usually not necessary if there is already a site title link present in the header.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'textColor',
+      'customTextColor',
+      'backgroundColor',
+      'customBackgroundColor',
+      'fontSize',
+      'customFontSize',
+      'style'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-home-link-editor',
+    'style' => 'wp-block-home-link'
+  ),
+  'html' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/html',
+    'title' => 'Custom HTML',
+    'category' => 'widgets',
+    'description' => 'Add custom HTML code and preview it as you edit.',
+    'keywords' => array(
+      'embed'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string',
+        'source' => 'raw'
+      )
+    ),
+    'supports' => array(
+      'customClassName' => false,
+      'className' => false,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-html-editor'
+  ),
+  'image' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/image',
+    'title' => 'Image',
+    'category' => 'media',
+    'usesContext' => array(
+      'allowResize',
+      'imageCrop',
+      'fixedHeight'
+    ),
+    'description' => 'Insert an image to make a visual statement.',
+    'keywords' => array(
+      'img',
+      'photo',
+      'picture'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'align' => array(
+        'type' => 'string'
+      ),
+      'url' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'img',
+        'attribute' => 'src',
+        '__experimentalRole' => 'content'
+      ),
+      'alt' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'img',
+        'attribute' => 'alt',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'figcaption',
+        '__experimentalRole' => 'content'
+      ),
+      'title' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'img',
+        'attribute' => 'title',
+        '__experimentalRole' => 'content'
+      ),
+      'href' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure > a',
+        'attribute' => 'href',
+        '__experimentalRole' => 'content'
+      ),
+      'rel' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure > a',
+        'attribute' => 'rel'
+      ),
+      'linkClass' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure > a',
+        'attribute' => 'class'
+      ),
+      'id' => array(
+        'type' => 'number',
+        '__experimentalRole' => 'content'
+      ),
+      'width' => array(
+        'type' => 'number'
+      ),
+      'height' => array(
+        'type' => 'number'
+      ),
+      'aspectRatio' => array(
+        'type' => 'string'
+      ),
+      'scale' => array(
+        'type' => 'string'
+      ),
+      'sizeSlug' => array(
+        'type' => 'string'
+      ),
+      'linkDestination' => array(
+        'type' => 'string'
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure > a',
+        'attribute' => 'target'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'behaviors' => array(
+        'lightbox' => true
+      ),
+      'color' => array(
+        'text' => false,
+        'background' => false
+      ),
+      'filter' => array(
+        'duotone' => true
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'width' => true,
+        '__experimentalSkipSerialization' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'width' => true
+        )
+      )
+    ),
+    'selectors' => array(
+      'border' => '.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder',
+      'filter' => array(
+        'duotone' => '.wp-block-image img, .wp-block-image .components-placeholder'
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'rounded',
+        'label' => 'Rounded'
+      )
+    ),
+    'editorStyle' => 'wp-block-image-editor',
+    'style' => 'wp-block-image'
+  ),
+  'latest-comments' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/latest-comments',
+    'title' => 'Latest Comments',
+    'category' => 'widgets',
+    'description' => 'Display a list of your most recent comments.',
+    'keywords' => array(
+      'recent comments'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'commentsToShow' => array(
+        'type' => 'number',
+        'default' => 5,
+        'minimum' => 1,
+        'maximum' => 100
+      ),
+      'displayAvatar' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'displayDate' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'displayExcerpt' => array(
+        'type' => 'boolean',
+        'default' => true
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-latest-comments-editor',
+    'style' => 'wp-block-latest-comments'
+  ),
+  'latest-posts' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/latest-posts',
+    'title' => 'Latest Posts',
+    'category' => 'widgets',
+    'description' => 'Display a list of your most recent posts.',
+    'keywords' => array(
+      'recent posts'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'categories' => array(
+        'type' => 'array',
+        'items' => array(
+          'type' => 'object'
+        )
+      ),
+      'selectedAuthor' => array(
+        'type' => 'number'
+      ),
+      'postsToShow' => array(
+        'type' => 'number',
+        'default' => 5
+      ),
+      'displayPostContent' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'displayPostContentRadio' => array(
+        'type' => 'string',
+        'default' => 'excerpt'
+      ),
+      'excerptLength' => array(
+        'type' => 'number',
+        'default' => 55
+      ),
+      'displayAuthor' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'displayPostDate' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'postLayout' => array(
+        'type' => 'string',
+        'default' => 'list'
+      ),
+      'columns' => array(
+        'type' => 'number',
+        'default' => 3
+      ),
+      'order' => array(
+        'type' => 'string',
+        'default' => 'desc'
+      ),
+      'orderBy' => array(
+        'type' => 'string',
+        'default' => 'date'
+      ),
+      'displayFeaturedImage' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'featuredImageAlign' => array(
+        'type' => 'string',
+        'enum' => array(
+          'left',
+          'center',
+          'right'
+        )
+      ),
+      'featuredImageSizeSlug' => array(
+        'type' => 'string',
+        'default' => 'thumbnail'
+      ),
+      'featuredImageSizeWidth' => array(
+        'type' => 'number',
+        'default' => null
+      ),
+      'featuredImageSizeHeight' => array(
+        'type' => 'number',
+        'default' => null
+      ),
+      'addLinkToFeaturedImage' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-latest-posts-editor',
+    'style' => 'wp-block-latest-posts'
+  ),
+  'legacy-widget' => array(
+    'apiVersion' => 3,
+    'name' => 'core/legacy-widget',
+    'title' => 'Legacy Widget',
+    'category' => 'widgets',
+    'description' => 'Display a legacy widget.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'id' => array(
+        'type' => 'string',
+        'default' => null
+      ),
+      'idBase' => array(
+        'type' => 'string',
+        'default' => null
+      ),
+      'instance' => array(
+        'type' => 'object',
+        'default' => null
+      )
+    ),
+    'supports' => array(
+      'html' => false,
+      'customClassName' => false,
+      'reusable' => false
+    ),
+    'editorStyle' => 'wp-block-legacy-widget-editor'
+  ),
+  'list' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/list',
+    'title' => 'List',
+    'category' => 'text',
+    'description' => 'Create a bulleted or numbered list.',
+    'keywords' => array(
+      'bullet list',
+      'ordered list',
+      'numbered list'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'ordered' => array(
+        'type' => 'boolean',
+        'default' => false,
+        '__experimentalRole' => 'content'
+      ),
+      'values' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'ol,ul',
+        'multiline' => 'li',
+        '__unstableMultilineWrapperTags' => array(
+          'ol',
+          'ul'
+        ),
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'type' => array(
+        'type' => 'string'
+      ),
+      'start' => array(
+        'type' => 'number'
+      ),
+      'reversed' => array(
+        'type' => 'boolean'
+      ),
+      'placeholder' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'className' => false,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      '__unstablePasteTextInline' => true,
+      '__experimentalSelector' => 'ol,ul',
+      '__experimentalSlashInserter' => true
+    ),
+    'editorStyle' => 'wp-block-list-editor',
+    'style' => 'wp-block-list'
+  ),
+  'list-item' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/list-item',
+    'title' => 'List item',
+    'category' => 'text',
+    'parent' => array(
+      'core/list'
+    ),
+    'description' => 'Create a list item.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'placeholder' => array(
+        'type' => 'string'
+      ),
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'li',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      )
+    ),
+    'supports' => array(
+      'className' => false,
+      '__experimentalSelector' => 'li',
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'loginout' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/loginout',
+    'title' => 'Login/out',
+    'category' => 'theme',
+    'description' => 'Show login & logout links.',
+    'keywords' => array(
+      'login',
+      'logout',
+      'form'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'displayLoginAsForm' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'redirectToCurrent' => array(
+        'type' => 'boolean',
+        'default' => true
+      )
+    ),
+    'supports' => array(
+      'className' => true,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'media-text' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/media-text',
+    'title' => 'Media & Text',
+    'category' => 'media',
+    'description' => 'Set media and words side-by-side for a richer layout.',
+    'keywords' => array(
+      'image',
+      'video'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'align' => array(
+        'type' => 'string',
+        'default' => 'none'
+      ),
+      'mediaAlt' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure img',
+        'attribute' => 'alt',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'mediaPosition' => array(
+        'type' => 'string',
+        'default' => 'left'
+      ),
+      'mediaId' => array(
+        'type' => 'number',
+        '__experimentalRole' => 'content'
+      ),
+      'mediaUrl' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure video,figure img',
+        'attribute' => 'src',
+        '__experimentalRole' => 'content'
+      ),
+      'mediaLink' => array(
+        'type' => 'string'
+      ),
+      'linkDestination' => array(
+        'type' => 'string'
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure a',
+        'attribute' => 'target'
+      ),
+      'href' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure a',
+        'attribute' => 'href',
+        '__experimentalRole' => 'content'
+      ),
+      'rel' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure a',
+        'attribute' => 'rel'
+      ),
+      'linkClass' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'figure a',
+        'attribute' => 'class'
+      ),
+      'mediaType' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'mediaWidth' => array(
+        'type' => 'number',
+        'default' => 50
+      ),
+      'mediaSizeSlug' => array(
+        'type' => 'string'
+      ),
+      'isStackedOnMobile' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'verticalAlignment' => array(
+        'type' => 'string'
+      ),
+      'imageFill' => array(
+        'type' => 'boolean'
+      ),
+      'focalPoint' => array(
+        'type' => 'object'
+      ),
+      'allowedBlocks' => array(
+        'type' => 'array'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-media-text-editor',
+    'style' => 'wp-block-media-text'
+  ),
+  'missing' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/missing',
+    'title' => 'Unsupported',
+    'category' => 'text',
+    'description' => 'Your site doesn’t include support for this block.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'originalName' => array(
+        'type' => 'string'
+      ),
+      'originalUndelimitedContent' => array(
+        'type' => 'string'
+      ),
+      'originalContent' => array(
+        'type' => 'string',
+        'source' => 'html'
+      )
+    ),
+    'supports' => array(
+      'className' => false,
+      'customClassName' => false,
+      'inserter' => false,
+      'html' => false,
+      'reusable' => false
+    )
+  ),
+  'more' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/more',
+    'title' => 'More',
+    'category' => 'design',
+    'description' => 'Content before this block will be shown in the excerpt on your archives page.',
+    'keywords' => array(
+      'read more'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'customText' => array(
+        'type' => 'string'
+      ),
+      'noTeaser' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'supports' => array(
+      'customClassName' => false,
+      'className' => false,
+      'html' => false,
+      'multiple' => false
+    ),
+    'editorStyle' => 'wp-block-more-editor'
+  ),
+  'navigation' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/navigation',
+    'title' => 'Navigation',
+    'category' => 'theme',
+    'description' => 'A collection of blocks that allow visitors to get around your site.',
+    'keywords' => array(
+      'menu',
+      'navigation',
+      'links'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'ref' => array(
+        'type' => 'number'
+      ),
+      'textColor' => array(
+        'type' => 'string'
+      ),
+      'customTextColor' => array(
+        'type' => 'string'
+      ),
+      'rgbTextColor' => array(
+        'type' => 'string'
+      ),
+      'backgroundColor' => array(
+        'type' => 'string'
+      ),
+      'customBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'rgbBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'showSubmenuIcon' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'openSubmenusOnClick' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'overlayMenu' => array(
+        'type' => 'string',
+        'default' => 'mobile'
+      ),
+      'icon' => array(
+        'type' => 'string',
+        'default' => 'handle'
+      ),
+      'hasIcon' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      '__unstableLocation' => array(
+        'type' => 'string'
+      ),
+      'overlayBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'customOverlayBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'overlayTextColor' => array(
+        'type' => 'string'
+      ),
+      'customOverlayTextColor' => array(
+        'type' => 'string'
+      ),
+      'maxNestingLevel' => array(
+        'type' => 'number',
+        'default' => 5
+      ),
+      'templateLock' => array(
+        'type' => array(
+          'string',
+          'boolean'
+        ),
+        'enum' => array(
+          'all',
+          'insert',
+          'contentOnly',
+          false
+        )
+      )
+    ),
+    'providesContext' => array(
+      'textColor' => 'textColor',
+      'customTextColor' => 'customTextColor',
+      'backgroundColor' => 'backgroundColor',
+      'customBackgroundColor' => 'customBackgroundColor',
+      'overlayTextColor' => 'overlayTextColor',
+      'customOverlayTextColor' => 'customOverlayTextColor',
+      'overlayBackgroundColor' => 'overlayBackgroundColor',
+      'customOverlayBackgroundColor' => 'customOverlayBackgroundColor',
+      'fontSize' => 'fontSize',
+      'customFontSize' => 'customFontSize',
+      'showSubmenuIcon' => 'showSubmenuIcon',
+      'openSubmenusOnClick' => 'openSubmenusOnClick',
+      'style' => 'style',
+      'maxNestingLevel' => 'maxNestingLevel'
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'inserter' => true,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalSkipSerialization' => array(
+          'textDecoration'
+        ),
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'spacing' => array(
+        'blockGap' => true,
+        'units' => array(
+          'px',
+          'em',
+          'rem',
+          'vh',
+          'vw'
+        ),
+        '__experimentalDefaultControls' => array(
+          'blockGap' => true
+        )
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'allowVerticalAlignment' => false,
+        'allowSizingOnChildren' => true,
+        'default' => array(
+          'type' => 'flex'
+        )
+      ),
+      '__experimentalStyle' => array(
+        'elements' => array(
+          'link' => array(
+            'color' => array(
+              'text' => 'inherit'
+            )
+          )
+        )
+      )
+    ),
+    'viewScript' => array(
+      'file:./view.min.js',
+      'file:./view-modal.min.js'
+    ),
+    'editorStyle' => 'wp-block-navigation-editor',
+    'style' => 'wp-block-navigation'
+  ),
+  'navigation-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/navigation-link',
+    'title' => 'Custom Link',
+    'category' => 'design',
+    'parent' => array(
+      'core/navigation'
+    ),
+    'description' => 'Add a page, link, or another item to your navigation.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      ),
+      'type' => array(
+        'type' => 'string'
+      ),
+      'description' => array(
+        'type' => 'string'
+      ),
+      'rel' => array(
+        'type' => 'string'
+      ),
+      'id' => array(
+        'type' => 'number'
+      ),
+      'opensInNewTab' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'url' => array(
+        'type' => 'string'
+      ),
+      'title' => array(
+        'type' => 'string'
+      ),
+      'kind' => array(
+        'type' => 'string'
+      ),
+      'isTopLevelLink' => array(
+        'type' => 'boolean'
+      )
+    ),
+    'usesContext' => array(
+      'textColor',
+      'customTextColor',
+      'backgroundColor',
+      'customBackgroundColor',
+      'overlayTextColor',
+      'customOverlayTextColor',
+      'overlayBackgroundColor',
+      'customOverlayBackgroundColor',
+      'fontSize',
+      'customFontSize',
+      'showSubmenuIcon',
+      'maxNestingLevel',
+      'style'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      '__experimentalSlashInserter' => true,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-navigation-link-editor',
+    'style' => 'wp-block-navigation-link'
+  ),
+  'navigation-submenu' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/navigation-submenu',
+    'title' => 'Submenu',
+    'category' => 'design',
+    'parent' => array(
+      'core/navigation'
+    ),
+    'description' => 'Add a submenu to your navigation.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      ),
+      'type' => array(
+        'type' => 'string'
+      ),
+      'description' => array(
+        'type' => 'string'
+      ),
+      'rel' => array(
+        'type' => 'string'
+      ),
+      'id' => array(
+        'type' => 'number'
+      ),
+      'opensInNewTab' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'url' => array(
+        'type' => 'string'
+      ),
+      'title' => array(
+        'type' => 'string'
+      ),
+      'kind' => array(
+        'type' => 'string'
+      ),
+      'isTopLevelItem' => array(
+        'type' => 'boolean'
+      )
+    ),
+    'usesContext' => array(
+      'textColor',
+      'customTextColor',
+      'backgroundColor',
+      'customBackgroundColor',
+      'overlayTextColor',
+      'customOverlayTextColor',
+      'overlayBackgroundColor',
+      'customOverlayBackgroundColor',
+      'fontSize',
+      'customFontSize',
+      'showSubmenuIcon',
+      'maxNestingLevel',
+      'openSubmenusOnClick',
+      'style'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-navigation-submenu-editor',
+    'style' => 'wp-block-navigation-submenu'
+  ),
+  'nextpage' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/nextpage',
+    'title' => 'Page Break',
+    'category' => 'design',
+    'description' => 'Separate your content into a multi-page experience.',
+    'keywords' => array(
+      'next page',
+      'pagination'
+    ),
+    'parent' => array(
+      'core/post-content'
+    ),
+    'textdomain' => 'default',
+    'supports' => array(
+      'customClassName' => false,
+      'className' => false,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-nextpage-editor'
+  ),
+  'page-list' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/page-list',
+    'title' => 'Page List',
+    'category' => 'widgets',
+    'description' => 'Display a list of all pages.',
+    'keywords' => array(
+      'menu',
+      'navigation'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'parentPageID' => array(
+        'type' => 'integer',
+        'default' => 0
+      ),
+      'isNested' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'usesContext' => array(
+      'textColor',
+      'customTextColor',
+      'backgroundColor',
+      'customBackgroundColor',
+      'overlayTextColor',
+      'customOverlayTextColor',
+      'overlayBackgroundColor',
+      'customOverlayBackgroundColor',
+      'fontSize',
+      'customFontSize',
+      'showSubmenuIcon',
+      'style',
+      'openSubmenusOnClick'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-page-list-editor',
+    'style' => 'wp-block-page-list'
+  ),
+  'page-list-item' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/page-list-item',
+    'title' => 'Page List Item',
+    'category' => 'widgets',
+    'parent' => array(
+      'core/page-list'
+    ),
+    'description' => 'Displays a page inside a list of all pages.',
+    'keywords' => array(
+      'page',
+      'menu',
+      'navigation'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'id' => array(
+        'type' => 'number'
+      ),
+      'label' => array(
+        'type' => 'string'
+      ),
+      'title' => array(
+        'type' => 'string'
+      ),
+      'link' => array(
+        'type' => 'string'
+      ),
+      'hasChildren' => array(
+        'type' => 'boolean'
+      )
+    ),
+    'usesContext' => array(
+      'textColor',
+      'customTextColor',
+      'backgroundColor',
+      'customBackgroundColor',
+      'overlayTextColor',
+      'customOverlayTextColor',
+      'overlayBackgroundColor',
+      'customOverlayBackgroundColor',
+      'fontSize',
+      'customFontSize',
+      'showSubmenuIcon',
+      'style',
+      'openSubmenusOnClick'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'lock' => false,
+      'inserter' => false,
+      '__experimentalToolbar' => false
+    ),
+    'editorStyle' => 'wp-block-page-list-editor',
+    'style' => 'wp-block-page-list'
+  ),
+  'paragraph' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/paragraph',
+    'title' => 'Paragraph',
+    'category' => 'text',
+    'description' => 'Start with the basic building block of all narrative.',
+    'keywords' => array(
+      'text'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'align' => array(
+        'type' => 'string'
+      ),
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'p',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'dropCap' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'placeholder' => array(
+        'type' => 'string'
+      ),
+      'direction' => array(
+        'type' => 'string',
+        'enum' => array(
+          'ltr',
+          'rtl'
+        )
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'className' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      '__experimentalSelector' => 'p',
+      '__unstablePasteTextInline' => true
+    ),
+    'editorStyle' => 'wp-block-paragraph-editor',
+    'style' => 'wp-block-paragraph'
+  ),
+  'pattern' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/pattern',
+    'title' => 'Pattern placeholder',
+    'category' => 'theme',
+    'description' => 'Show a block pattern.',
+    'supports' => array(
+      'html' => false,
+      'inserter' => false
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'slug' => array(
+        'type' => 'string'
+      )
+    )
+  ),
+  'post-author' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-author',
+    'title' => 'Post Author',
+    'category' => 'theme',
+    'description' => 'Display post author details such as name, avatar, and bio.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'avatarSize' => array(
+        'type' => 'number',
+        'default' => 48
+      ),
+      'showAvatar' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'showBio' => array(
+        'type' => 'boolean'
+      ),
+      'byline' => array(
+        'type' => 'string'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'usesContext' => array(
+      'postType',
+      'postId',
+      'queryId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDuotone' => '.wp-block-post-author__avatar img',
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-post-author'
+  ),
+  'post-author-biography' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-author-biography',
+    'title' => 'Post Author Biography',
+    'category' => 'theme',
+    'description' => 'The author biography.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'postType',
+      'postId'
+    ),
+    'supports' => array(
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'post-author-name' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-author-name',
+    'title' => 'Post Author Name',
+    'category' => 'theme',
+    'description' => 'The author name.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'usesContext' => array(
+      'postType',
+      'postId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'post-comments-form' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-comments-form',
+    'title' => 'Post Comments Form',
+    'category' => 'theme',
+    'description' => 'Display a post\'s comments form.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-post-comments-form-editor',
+    'style' => array(
+      'wp-block-post-comments-form',
+      'wp-block-buttons',
+      'wp-block-button'
+    )
+  ),
+  'post-content' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-content',
+    'title' => 'Post Content',
+    'category' => 'theme',
+    'description' => 'Displays the contents of a post or page.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId',
+      'postType',
+      'queryId'
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'layout' => true,
+      'dimensions' => array(
+        'minHeight' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-post-content-editor'
+  ),
+  'post-date' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-date',
+    'title' => 'Post Date',
+    'category' => 'theme',
+    'description' => 'Add the date of this post.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'format' => array(
+        'type' => 'string'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'displayType' => array(
+        'type' => 'string',
+        'default' => 'date'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType',
+      'queryId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'post-excerpt' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-excerpt',
+    'title' => 'Excerpt',
+    'category' => 'theme',
+    'description' => 'Display the excerpt.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'moreText' => array(
+        'type' => 'string'
+      ),
+      'showMoreOnNewLine' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'excerptLength' => array(
+        'type' => 'number',
+        'default' => 55
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType',
+      'queryId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-post-excerpt-editor',
+    'style' => 'wp-block-post-excerpt'
+  ),
+  'post-featured-image' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-featured-image',
+    'title' => 'Post Featured Image',
+    'category' => 'theme',
+    'description' => 'Display a post\'s featured image.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'aspectRatio' => array(
+        'type' => 'string'
+      ),
+      'width' => array(
+        'type' => 'string'
+      ),
+      'height' => array(
+        'type' => 'string'
+      ),
+      'scale' => array(
+        'type' => 'string',
+        'default' => 'cover'
+      ),
+      'sizeSlug' => array(
+        'type' => 'string'
+      ),
+      'rel' => array(
+        'type' => 'string',
+        'attribute' => 'rel',
+        'default' => ''
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      ),
+      'overlayColor' => array(
+        'type' => 'string'
+      ),
+      'customOverlayColor' => array(
+        'type' => 'string'
+      ),
+      'dimRatio' => array(
+        'type' => 'number',
+        'default' => 0
+      ),
+      'gradient' => array(
+        'type' => 'string'
+      ),
+      'customGradient' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType',
+      'queryId'
+    ),
+    'supports' => array(
+      'align' => array(
+        'left',
+        'right',
+        'center',
+        'wide',
+        'full'
+      ),
+      'color' => array(
+        '__experimentalDuotone' => 'img, .wp-block-post-featured-image__placeholder, .components-placeholder__illustration, .components-placeholder::before',
+        'text' => false,
+        'background' => false
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'width' => true,
+        '__experimentalSelector' => 'img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay',
+        '__experimentalSkipSerialization' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'width' => true
+        )
+      ),
+      'html' => false,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      )
+    ),
+    'editorStyle' => 'wp-block-post-featured-image-editor',
+    'style' => 'wp-block-post-featured-image'
+  ),
+  'post-navigation-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-navigation-link',
+    'title' => 'Post Navigation Link',
+    'category' => 'theme',
+    'description' => 'Displays the next or previous post link that is adjacent to the current post.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'type' => array(
+        'type' => 'string',
+        'default' => 'next'
+      ),
+      'label' => array(
+        'type' => 'string'
+      ),
+      'showTitle' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'linkLabel' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'arrow' => array(
+        'type' => 'string',
+        'default' => 'none'
+      )
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'link' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-post-navigation-link'
+  ),
+  'post-template' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-template',
+    'title' => 'Post Template',
+    'category' => 'theme',
+    'parent' => array(
+      'core/query'
+    ),
+    'description' => 'Contains the block elements used to render a post, like the title, date, featured image, content or excerpt, and more.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'queryId',
+      'query',
+      'queryContext',
+      'displayLayout',
+      'templateSlug',
+      'previewPostType'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'layout' => true,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      'spacing' => array(
+        'blockGap' => array(
+          '__experimentalDefault' => '1.25em'
+        ),
+        '__experimentalDefaultControls' => array(
+          'blockGap' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-post-template',
+    'editorStyle' => 'wp-block-post-template-editor'
+  ),
+  'post-terms' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-terms',
+    'title' => 'Post Terms',
+    'category' => 'theme',
+    'description' => 'Post terms.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'term' => array(
+        'type' => 'string'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'separator' => array(
+        'type' => 'string',
+        'default' => ', '
+      ),
+      'prefix' => array(
+        'type' => 'string',
+        'default' => ''
+      ),
+      'suffix' => array(
+        'type' => 'string',
+        'default' => ''
+      )
+    ),
+    'usesContext' => array(
+      'postId',
+      'postType'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-post-terms'
+  ),
+  'post-title' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/post-title',
+    'title' => 'Title',
+    'category' => 'theme',
+    'description' => 'Displays the title of a post, page, or any other content-type.',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'postId',
+      'postType',
+      'queryId'
+    ),
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'level' => array(
+        'type' => 'number',
+        'default' => 2
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'rel' => array(
+        'type' => 'string',
+        'attribute' => 'rel',
+        'default' => ''
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true,
+          'textTransform' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-post-title'
+  ),
+  'preformatted' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/preformatted',
+    'title' => 'Preformatted',
+    'category' => 'text',
+    'description' => 'Add text that respects your spacing and tabs, and also allows styling.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'pre',
+        'default' => '',
+        '__unstablePreserveWhiteSpace' => true,
+        '__experimentalRole' => 'content'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'color' => array(
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-preformatted'
+  ),
+  'pullquote' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/pullquote',
+    'title' => 'Pullquote',
+    'category' => 'text',
+    'description' => 'Give special visual emphasis to a quote from your text.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'value' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'p',
+        '__experimentalRole' => 'content'
+      ),
+      'citation' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'cite',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => array(
+        'left',
+        'right',
+        'wide',
+        'full'
+      ),
+      'color' => array(
+        'gradients' => true,
+        'background' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      '__experimentalStyle' => array(
+        'typography' => array(
+          'fontSize' => '1.5em',
+          'lineHeight' => '1.6'
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-pullquote-editor',
+    'style' => 'wp-block-pullquote'
+  ),
+  'query' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query',
+    'title' => 'Query Loop',
+    'category' => 'theme',
+    'description' => 'An advanced block that allows displaying post types based on different query parameters and visual configurations.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'queryId' => array(
+        'type' => 'number'
+      ),
+      'query' => array(
+        'type' => 'object',
+        'default' => array(
+          'perPage' => null,
+          'pages' => 0,
+          'offset' => 0,
+          'postType' => 'post',
+          'order' => 'desc',
+          'orderBy' => 'date',
+          'author' => '',
+          'search' => '',
+          'exclude' => array(
+            
+          ),
+          'sticky' => '',
+          'inherit' => true,
+          'taxQuery' => null,
+          'parents' => array(
+            
+          )
+        )
+      ),
+      'tagName' => array(
+        'type' => 'string',
+        'default' => 'div'
+      ),
+      'namespace' => array(
+        'type' => 'string'
+      )
+    ),
+    'providesContext' => array(
+      'queryId' => 'queryId',
+      'query' => 'query',
+      'displayLayout' => 'displayLayout'
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'layout' => true
+    ),
+    'editorStyle' => 'wp-block-query-editor'
+  ),
+  'query-no-results' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-no-results',
+    'title' => 'No results',
+    'category' => 'theme',
+    'description' => 'Contains the block elements used to render content when no query results are found.',
+    'parent' => array(
+      'core/query'
+    ),
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'queryId',
+      'query'
+    ),
+    'supports' => array(
+      'align' => true,
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'query-pagination' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-pagination',
+    'title' => 'Pagination',
+    'category' => 'theme',
+    'parent' => array(
+      'core/query'
+    ),
+    'description' => 'Displays a paginated navigation to next/previous set of posts, when applicable.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'paginationArrow' => array(
+        'type' => 'string',
+        'default' => 'none'
+      ),
+      'showLabel' => array(
+        'type' => 'boolean',
+        'default' => true
+      )
+    ),
+    'usesContext' => array(
+      'queryId',
+      'query'
+    ),
+    'providesContext' => array(
+      'paginationArrow' => 'paginationArrow',
+      'showLabel' => 'showLabel'
+    ),
+    'supports' => array(
+      'align' => true,
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'default' => array(
+          'type' => 'flex'
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-query-pagination-editor',
+    'style' => 'wp-block-query-pagination'
+  ),
+  'query-pagination-next' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-pagination-next',
+    'title' => 'Next Page',
+    'category' => 'theme',
+    'parent' => array(
+      'core/query-pagination'
+    ),
+    'description' => 'Displays the next posts page link.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'queryId',
+      'query',
+      'paginationArrow',
+      'showLabel'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'query-pagination-numbers' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-pagination-numbers',
+    'title' => 'Page Numbers',
+    'category' => 'theme',
+    'parent' => array(
+      'core/query-pagination'
+    ),
+    'description' => 'Displays a list of page numbers for pagination',
+    'textdomain' => 'default',
+    'usesContext' => array(
+      'queryId',
+      'query'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-query-pagination-numbers-editor'
+  ),
+  'query-pagination-previous' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-pagination-previous',
+    'title' => 'Previous Page',
+    'category' => 'theme',
+    'parent' => array(
+      'core/query-pagination'
+    ),
+    'description' => 'Displays the previous posts page link.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'queryId',
+      'query',
+      'paginationArrow',
+      'showLabel'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'query-title' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/query-title',
+    'title' => 'Query Title',
+    'category' => 'theme',
+    'description' => 'Display the query title.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'type' => array(
+        'type' => 'string'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'level' => array(
+        'type' => 'number',
+        'default' => 1
+      ),
+      'showPrefix' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'showSearchTerm' => array(
+        'type' => 'boolean',
+        'default' => true
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true,
+          'textTransform' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-query-title'
+  ),
+  'quote' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/quote',
+    'title' => 'Quote',
+    'category' => 'text',
+    'description' => 'Give quoted text visual emphasis. "In quoting others, we cite ourselves." — Julio Cortázar',
+    'keywords' => array(
+      'blockquote',
+      'cite'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'value' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'blockquote',
+        'multiline' => 'p',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'citation' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'cite',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'align' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'html' => false,
+      '__experimentalOnEnter' => true,
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true
+        )
+      ),
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'plain',
+        'label' => 'Plain'
+      )
+    ),
+    'editorStyle' => 'wp-block-quote-editor',
+    'style' => 'wp-block-quote'
+  ),
+  'read-more' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/read-more',
+    'title' => 'Read More',
+    'category' => 'theme',
+    'description' => 'Displays the link of a post, page, or any other content-type.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string'
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'usesContext' => array(
+      'postId'
+    ),
+    'supports' => array(
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'text' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'textDecoration' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'padding' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'width' => true
+        )
+      )
+    ),
+    'style' => 'wp-block-read-more'
+  ),
+  'rss' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/rss',
+    'title' => 'RSS',
+    'category' => 'widgets',
+    'description' => 'Display entries from any RSS or Atom feed.',
+    'keywords' => array(
+      'atom',
+      'feed'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'columns' => array(
+        'type' => 'number',
+        'default' => 2
+      ),
+      'blockLayout' => array(
+        'type' => 'string',
+        'default' => 'list'
+      ),
+      'feedURL' => array(
+        'type' => 'string',
+        'default' => ''
+      ),
+      'itemsToShow' => array(
+        'type' => 'number',
+        'default' => 5
+      ),
+      'displayExcerpt' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'displayAuthor' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'displayDate' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'excerptLength' => array(
+        'type' => 'number',
+        'default' => 55
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-rss-editor',
+    'style' => 'wp-block-rss'
+  ),
+  'search' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/search',
+    'title' => 'Search',
+    'category' => 'widgets',
+    'description' => 'Help visitors find your content.',
+    'keywords' => array(
+      'find'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'label' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'showLabel' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'placeholder' => array(
+        'type' => 'string',
+        'default' => '',
+        '__experimentalRole' => 'content'
+      ),
+      'width' => array(
+        'type' => 'number'
+      ),
+      'widthUnit' => array(
+        'type' => 'string'
+      ),
+      'buttonText' => array(
+        'type' => 'string',
+        '__experimentalRole' => 'content'
+      ),
+      'buttonPosition' => array(
+        'type' => 'string',
+        'default' => 'button-outside'
+      ),
+      'buttonUseIcon' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'query' => array(
+        'type' => 'object',
+        'default' => array(
+          
+        )
+      ),
+      'buttonBehavior' => array(
+        'type' => 'string',
+        'default' => 'expand-searchfield'
+      ),
+      'isSearchFieldHidden' => array(
+        'type' => 'boolean',
+        'default' => false
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'left',
+        'center',
+        'right'
+      ),
+      'color' => array(
+        'gradients' => true,
+        '__experimentalSkipSerialization' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        '__experimentalSkipSerialization' => true,
+        '__experimentalSelector' => '.wp-block-search__label, .wp-block-search__input, .wp-block-search__button',
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        'color' => true,
+        'radius' => true,
+        'width' => true,
+        '__experimentalSkipSerialization' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'radius' => true,
+          'width' => true
+        )
+      ),
+      'html' => false
+    ),
+    'viewScript' => 'file:./view.min.js',
+    'editorStyle' => 'wp-block-search-editor',
+    'style' => 'wp-block-search'
+  ),
+  'separator' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/separator',
+    'title' => 'Separator',
+    'category' => 'design',
+    'description' => 'Create a break between ideas or sections with a horizontal separator.',
+    'keywords' => array(
+      'horizontal-line',
+      'hr',
+      'divider'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'opacity' => array(
+        'type' => 'string',
+        'default' => 'alpha-channel'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => array(
+        'center',
+        'wide',
+        'full'
+      ),
+      'color' => array(
+        'enableContrastChecker' => false,
+        '__experimentalSkipSerialization' => true,
+        'gradients' => true,
+        'background' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => array(
+          'top',
+          'bottom'
+        )
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'wide',
+        'label' => 'Wide Line'
+      ),
+      array(
+        'name' => 'dots',
+        'label' => 'Dots'
+      )
+    ),
+    'editorStyle' => 'wp-block-separator-editor',
+    'style' => 'wp-block-separator'
+  ),
+  'shortcode' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/shortcode',
+    'title' => 'Shortcode',
+    'category' => 'widgets',
+    'description' => 'Insert additional custom elements with a WordPress shortcode.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'text' => array(
+        'type' => 'string',
+        'source' => 'raw'
+      )
+    ),
+    'supports' => array(
+      'className' => false,
+      'customClassName' => false,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-shortcode-editor'
+  ),
+  'site-logo' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/site-logo',
+    'title' => 'Site Logo',
+    'category' => 'theme',
+    'description' => 'Display an image to represent this site. Update this block and the changes apply everywhere.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'width' => array(
+        'type' => 'number'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      ),
+      'shouldSyncIcon' => array(
+        'type' => 'boolean'
+      )
+    ),
+    'example' => array(
+      'viewportWidth' => 500,
+      'attributes' => array(
+        'width' => 350,
+        'className' => 'block-editor-block-types-list__site-logo-example'
+      )
+    ),
+    'supports' => array(
+      'html' => false,
+      'align' => true,
+      'alignWide' => false,
+      'color' => array(
+        '__experimentalDuotone' => 'img, .components-placeholder__illustration, .components-placeholder::before',
+        'text' => false,
+        'background' => false
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'rounded',
+        'label' => 'Rounded'
+      )
+    ),
+    'editorStyle' => 'wp-block-site-logo-editor',
+    'style' => 'wp-block-site-logo'
+  ),
+  'site-tagline' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/site-tagline',
+    'title' => 'Site Tagline',
+    'category' => 'theme',
+    'description' => 'Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it’s not displayed in the theme design.',
+    'keywords' => array(
+      'description'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'example' => array(
+      
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-site-tagline-editor'
+  ),
+  'site-title' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/site-title',
+    'title' => 'Site Title',
+    'category' => 'theme',
+    'description' => 'Displays the name of this site. Update the block, and the changes apply everywhere it’s used. This will also appear in the browser title bar and in search results.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'level' => array(
+        'type' => 'number',
+        'default' => 1
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      ),
+      'isLink' => array(
+        'type' => 'boolean',
+        'default' => true
+      ),
+      'linkTarget' => array(
+        'type' => 'string',
+        'default' => '_self'
+      )
+    ),
+    'example' => array(
+      'viewportWidth' => 500
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true,
+          'link' => true
+        )
+      ),
+      'spacing' => array(
+        'padding' => true,
+        'margin' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'lineHeight' => true,
+          'fontAppearance' => true,
+          'letterSpacing' => true,
+          'textTransform' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-site-title-editor',
+    'style' => 'wp-block-site-title'
+  ),
+  'social-link' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/social-link',
+    'title' => 'Social Icon',
+    'category' => 'widgets',
+    'parent' => array(
+      'core/social-links'
+    ),
+    'description' => 'Display an icon linking to a social media profile or site.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'url' => array(
+        'type' => 'string'
+      ),
+      'service' => array(
+        'type' => 'string'
+      ),
+      'label' => array(
+        'type' => 'string'
+      ),
+      'rel' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'openInNewTab',
+      'showLabels',
+      'iconColor',
+      'iconColorValue',
+      'iconBackgroundColor',
+      'iconBackgroundColorValue'
+    ),
+    'supports' => array(
+      'reusable' => false,
+      'html' => false
+    ),
+    'editorStyle' => 'wp-block-social-link-editor'
+  ),
+  'social-links' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/social-links',
+    'title' => 'Social Icons',
+    'category' => 'widgets',
+    'description' => 'Display icons linking to your social media profiles or sites.',
+    'keywords' => array(
+      'links'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'iconColor' => array(
+        'type' => 'string'
+      ),
+      'customIconColor' => array(
+        'type' => 'string'
+      ),
+      'iconColorValue' => array(
+        'type' => 'string'
+      ),
+      'iconBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'customIconBackgroundColor' => array(
+        'type' => 'string'
+      ),
+      'iconBackgroundColorValue' => array(
+        'type' => 'string'
+      ),
+      'openInNewTab' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'showLabels' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'size' => array(
+        'type' => 'string'
+      )
+    ),
+    'providesContext' => array(
+      'openInNewTab' => 'openInNewTab',
+      'showLabels' => 'showLabels',
+      'iconColor' => 'iconColor',
+      'iconColorValue' => 'iconColorValue',
+      'iconBackgroundColor' => 'iconBackgroundColor',
+      'iconBackgroundColorValue' => 'iconBackgroundColorValue'
+    ),
+    'supports' => array(
+      'align' => array(
+        'left',
+        'center',
+        'right'
+      ),
+      'anchor' => true,
+      '__experimentalExposeControlsToChildren' => true,
+      'layout' => array(
+        'allowSwitching' => false,
+        'allowInheriting' => false,
+        'allowVerticalAlignment' => false,
+        'default' => array(
+          'type' => 'flex'
+        )
+      ),
+      'color' => array(
+        'enableContrastChecker' => false,
+        'background' => true,
+        'gradients' => true,
+        'text' => false,
+        '__experimentalDefaultControls' => array(
+          'background' => false
+        )
+      ),
+      'spacing' => array(
+        'blockGap' => array(
+          'horizontal',
+          'vertical'
+        ),
+        'margin' => true,
+        'padding' => true,
+        'units' => array(
+          'px',
+          'em',
+          'rem',
+          'vh',
+          'vw'
+        ),
+        '__experimentalDefaultControls' => array(
+          'blockGap' => true,
+          'margin' => true,
+          'padding' => false
+        )
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'logos-only',
+        'label' => 'Logos Only'
+      ),
+      array(
+        'name' => 'pill-shape',
+        'label' => 'Pill Shape'
+      )
+    ),
+    'editorStyle' => 'wp-block-social-links-editor',
+    'style' => 'wp-block-social-links'
+  ),
+  'spacer' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/spacer',
+    'title' => 'Spacer',
+    'category' => 'design',
+    'description' => 'Add white space between blocks and customize its height.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'height' => array(
+        'type' => 'string',
+        'default' => '100px'
+      ),
+      'width' => array(
+        'type' => 'string'
+      )
+    ),
+    'usesContext' => array(
+      'orientation'
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'spacing' => array(
+        'margin' => array(
+          'top',
+          'bottom'
+        ),
+        '__experimentalDefaultControls' => array(
+          'margin' => true
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-spacer-editor',
+    'style' => 'wp-block-spacer'
+  ),
+  'table' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/table',
+    'title' => 'Table',
+    'category' => 'text',
+    'description' => 'Create structured content in rows and columns to display information.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'hasFixedLayout' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'figcaption',
+        'default' => ''
+      ),
+      'head' => array(
+        'type' => 'array',
+        'default' => array(
+          
+        ),
+        'source' => 'query',
+        'selector' => 'thead tr',
+        'query' => array(
+          'cells' => array(
+            'type' => 'array',
+            'default' => array(
+              
+            ),
+            'source' => 'query',
+            'selector' => 'td,th',
+            'query' => array(
+              'content' => array(
+                'type' => 'string',
+                'source' => 'html'
+              ),
+              'tag' => array(
+                'type' => 'string',
+                'default' => 'td',
+                'source' => 'tag'
+              ),
+              'scope' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'scope'
+              ),
+              'align' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'data-align'
+              ),
+              'colspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'colspan'
+              ),
+              'rowspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'rowspan'
+              )
+            )
+          )
+        )
+      ),
+      'body' => array(
+        'type' => 'array',
+        'default' => array(
+          
+        ),
+        'source' => 'query',
+        'selector' => 'tbody tr',
+        'query' => array(
+          'cells' => array(
+            'type' => 'array',
+            'default' => array(
+              
+            ),
+            'source' => 'query',
+            'selector' => 'td,th',
+            'query' => array(
+              'content' => array(
+                'type' => 'string',
+                'source' => 'html'
+              ),
+              'tag' => array(
+                'type' => 'string',
+                'default' => 'td',
+                'source' => 'tag'
+              ),
+              'scope' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'scope'
+              ),
+              'align' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'data-align'
+              ),
+              'colspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'colspan'
+              ),
+              'rowspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'rowspan'
+              )
+            )
+          )
+        )
+      ),
+      'foot' => array(
+        'type' => 'array',
+        'default' => array(
+          
+        ),
+        'source' => 'query',
+        'selector' => 'tfoot tr',
+        'query' => array(
+          'cells' => array(
+            'type' => 'array',
+            'default' => array(
+              
+            ),
+            'source' => 'query',
+            'selector' => 'td,th',
+            'query' => array(
+              'content' => array(
+                'type' => 'string',
+                'source' => 'html'
+              ),
+              'tag' => array(
+                'type' => 'string',
+                'default' => 'td',
+                'source' => 'tag'
+              ),
+              'scope' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'scope'
+              ),
+              'align' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'data-align'
+              ),
+              'colspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'colspan'
+              ),
+              'rowspan' => array(
+                'type' => 'string',
+                'source' => 'attribute',
+                'attribute' => 'rowspan'
+              )
+            )
+          )
+        )
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'color' => array(
+        '__experimentalSkipSerialization' => true,
+        'gradients' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      ),
+      '__experimentalBorder' => array(
+        '__experimentalSkipSerialization' => true,
+        'color' => true,
+        'style' => true,
+        'width' => true,
+        '__experimentalDefaultControls' => array(
+          'color' => true,
+          'style' => true,
+          'width' => true
+        )
+      ),
+      '__experimentalSelector' => '.wp-block-table > table'
+    ),
+    'styles' => array(
+      array(
+        'name' => 'regular',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'stripes',
+        'label' => 'Stripes'
+      )
+    ),
+    'editorStyle' => 'wp-block-table-editor',
+    'style' => 'wp-block-table'
+  ),
+  'tag-cloud' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/tag-cloud',
+    'title' => 'Tag Cloud',
+    'category' => 'widgets',
+    'description' => 'A cloud of your most used tags.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'numberOfTags' => array(
+        'type' => 'number',
+        'default' => 45,
+        'minimum' => 1,
+        'maximum' => 100
+      ),
+      'taxonomy' => array(
+        'type' => 'string',
+        'default' => 'post_tag'
+      ),
+      'showTagCounts' => array(
+        'type' => 'boolean',
+        'default' => false
+      ),
+      'smallestFontSize' => array(
+        'type' => 'string',
+        'default' => '8pt'
+      ),
+      'largestFontSize' => array(
+        'type' => 'string',
+        'default' => '22pt'
+      )
+    ),
+    'styles' => array(
+      array(
+        'name' => 'default',
+        'label' => 'Default',
+        'isDefault' => true
+      ),
+      array(
+        'name' => 'outline',
+        'label' => 'Outline'
+      )
+    ),
+    'supports' => array(
+      'html' => false,
+      'align' => true,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true
+      ),
+      'typography' => array(
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalLetterSpacing' => true
+      )
+    ),
+    'editorStyle' => 'wp-block-tag-cloud-editor'
+  ),
+  'template-part' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/template-part',
+    'title' => 'Template Part',
+    'category' => 'theme',
+    'description' => 'Edit the different global regions of your site, like the header, footer, sidebar, or create your own.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'slug' => array(
+        'type' => 'string'
+      ),
+      'theme' => array(
+        'type' => 'string'
+      ),
+      'tagName' => array(
+        'type' => 'string'
+      ),
+      'area' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'align' => true,
+      'html' => false,
+      'reusable' => false
+    ),
+    'editorStyle' => 'wp-block-template-part-editor'
+  ),
+  'term-description' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/term-description',
+    'title' => 'Term Description',
+    'category' => 'theme',
+    'description' => 'Display the description of categories, tags and custom taxonomies when viewing an archive.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'align' => array(
+        'wide',
+        'full'
+      ),
+      'html' => false,
+      'color' => array(
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'spacing' => array(
+        'padding' => true,
+        'margin' => true
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        'lineHeight' => true,
+        '__experimentalFontFamily' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true
+        )
+      )
+    )
+  ),
+  'text-columns' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/text-columns',
+    'title' => 'Text Columns (deprecated)',
+    'icon' => 'columns',
+    'category' => 'design',
+    'description' => 'This block is deprecated. Please use the Columns block instead.',
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'array',
+        'source' => 'query',
+        'selector' => 'p',
+        'query' => array(
+          'children' => array(
+            'type' => 'string',
+            'source' => 'html'
+          )
+        ),
+        'default' => array(
+          array(
+            
+          ),
+          array(
+            
+          )
+        )
+      ),
+      'columns' => array(
+        'type' => 'number',
+        'default' => 2
+      ),
+      'width' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'inserter' => false
+    ),
+    'editorStyle' => 'wp-block-text-columns-editor',
+    'style' => 'wp-block-text-columns'
+  ),
+  'verse' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/verse',
+    'title' => 'Verse',
+    'category' => 'text',
+    'description' => 'Insert poetry. Use special spacing formats. Or quote song lyrics.',
+    'keywords' => array(
+      'poetry',
+      'poem'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'content' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'pre',
+        'default' => '',
+        '__unstablePreserveWhiteSpace' => true,
+        '__experimentalRole' => 'content'
+      ),
+      'textAlign' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'color' => array(
+        'gradients' => true,
+        'link' => true,
+        '__experimentalDefaultControls' => array(
+          'background' => true,
+          'text' => true
+        )
+      ),
+      'typography' => array(
+        'fontSize' => true,
+        '__experimentalFontFamily' => true,
+        'lineHeight' => true,
+        '__experimentalFontStyle' => true,
+        '__experimentalFontWeight' => true,
+        '__experimentalLetterSpacing' => true,
+        '__experimentalTextTransform' => true,
+        '__experimentalTextDecoration' => true,
+        '__experimentalDefaultControls' => array(
+          'fontSize' => true,
+          'fontAppearance' => true
+        )
+      ),
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      ),
+      '__experimentalBorder' => array(
+        'radius' => true,
+        'width' => true,
+        'color' => true,
+        'style' => true
+      )
+    ),
+    'style' => 'wp-block-verse',
+    'editorStyle' => 'wp-block-verse-editor'
+  ),
+  'video' => array(
+    '$schema' => 'https://schemas.wp.org/trunk/block.json',
+    'apiVersion' => 3,
+    'name' => 'core/video',
+    'title' => 'Video',
+    'category' => 'media',
+    'description' => 'Embed a video from your media library or upload a new one.',
+    'keywords' => array(
+      'movie'
+    ),
+    'textdomain' => 'default',
+    'attributes' => array(
+      'autoplay' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'autoplay'
+      ),
+      'caption' => array(
+        'type' => 'string',
+        'source' => 'html',
+        'selector' => 'figcaption',
+        '__experimentalRole' => 'content'
+      ),
+      'controls' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'controls',
+        'default' => true
+      ),
+      'id' => array(
+        'type' => 'number',
+        '__experimentalRole' => 'content'
+      ),
+      'loop' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'loop'
+      ),
+      'muted' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'muted'
+      ),
+      'poster' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'poster'
+      ),
+      'preload' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'preload',
+        'default' => 'metadata'
+      ),
+      'src' => array(
+        'type' => 'string',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'src',
+        '__experimentalRole' => 'content'
+      ),
+      'playsInline' => array(
+        'type' => 'boolean',
+        'source' => 'attribute',
+        'selector' => 'video',
+        'attribute' => 'playsinline'
+      ),
+      'tracks' => array(
+        '__experimentalRole' => 'content',
+        'type' => 'array',
+        'items' => array(
+          'type' => 'object'
+        ),
+        'default' => array(
+          
+        )
+      )
+    ),
+    'supports' => array(
+      'anchor' => true,
+      'align' => true,
+      'spacing' => array(
+        'margin' => true,
+        'padding' => true,
+        '__experimentalDefaultControls' => array(
+          'margin' => false,
+          'padding' => false
+        )
+      )
+    ),
+    'editorStyle' => 'wp-block-video-editor',
+    'style' => 'wp-block-video'
+  ),
+  'widget-group' => array(
+    'apiVersion' => 3,
+    'name' => 'core/widget-group',
+    'category' => 'widgets',
+    'attributes' => array(
+      'title' => array(
+        'type' => 'string'
+      )
+    ),
+    'supports' => array(
+      'html' => false,
+      'inserter' => true,
+      'customClassName' => true,
+      'reusable' => false
+    ),
+    'editorStyle' => 'wp-block-widget-group-editor',
+    'style' => 'wp-block-widget-group'
+  )
+);
\ No newline at end of file
diff --git a/src/wp-includes/blocks/button/block.json b/src/wp-includes/blocks/button/block.json
index 6076db9b8feec..e337aa857fc17 100644
--- a/src/wp-includes/blocks/button/block.json
+++ b/src/wp-includes/blocks/button/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/button",
 	"title": "Button",
 	"category": "design",
@@ -9,34 +9,42 @@
 	"keywords": [ "link" ],
 	"textdomain": "default",
 	"attributes": {
+		"textAlign": {
+			"type": "string"
+		},
 		"url": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
-			"attribute": "href"
+			"attribute": "href",
+			"__experimentalRole": "content"
 		},
 		"title": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
-			"attribute": "title"
+			"attribute": "title",
+			"__experimentalRole": "content"
 		},
 		"text": {
 			"type": "string",
 			"source": "html",
-			"selector": "a"
+			"selector": "a",
+			"__experimentalRole": "content"
 		},
 		"linkTarget": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
-			"attribute": "target"
+			"attribute": "target",
+			"__experimentalRole": "content"
 		},
 		"rel": {
 			"type": "string",
 			"source": "attribute",
 			"selector": "a",
-			"attribute": "rel"
+			"attribute": "rel",
+			"__experimentalRole": "content"
 		},
 		"placeholder": {
 			"type": "string"
@@ -56,7 +64,7 @@
 	},
 	"supports": {
 		"anchor": true,
-		"align": true,
+		"align": false,
 		"alignWide": false,
 		"color": {
 			"__experimentalSkipSerialization": true,
@@ -80,6 +88,7 @@
 			}
 		},
 		"reusable": false,
+		"shadow": true,
 		"spacing": {
 			"__experimentalSkipSerialization": true,
 			"padding": [ "horizontal", "vertical" ],
@@ -88,10 +97,16 @@
 			}
 		},
 		"__experimentalBorder": {
+			"color": true,
 			"radius": true,
+			"style": true,
+			"width": true,
 			"__experimentalSkipSerialization": true,
 			"__experimentalDefaultControls": {
-				"radius": true
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
 			}
 		},
 		"__experimentalSelector": ".wp-block-button .wp-block-button__link"
diff --git a/src/wp-includes/blocks/buttons/block.json b/src/wp-includes/blocks/buttons/block.json
index 266646d96bcee..4dc420bd41885 100644
--- a/src/wp-includes/blocks/buttons/block.json
+++ b/src/wp-includes/blocks/buttons/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/buttons",
 	"title": "Buttons",
 	"category": "design",
@@ -10,6 +10,7 @@
 	"supports": {
 		"anchor": true,
 		"align": [ "wide", "full" ],
+		"html": false,
 		"__experimentalExposeControlsToChildren": true,
 		"spacing": {
 			"blockGap": true,
@@ -31,7 +32,7 @@
 				"fontSize": true
 			}
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"default": {
diff --git a/src/wp-includes/blocks/calendar.php b/src/wp-includes/blocks/calendar.php
index 8f6226e943480..07a5e9d032cf7 100644
--- a/src/wp-includes/blocks/calendar.php
+++ b/src/wp-includes/blocks/calendar.php
@@ -40,11 +40,34 @@ function render_block_core_calendar( $attributes ) {
 		}
 	}
 
+	$color_block_styles = array();
+
+	// Text color.
+	$preset_text_color          = array_key_exists( 'textColor', $attributes ) ? "var:preset|color|{$attributes['textColor']}" : null;
+	$custom_text_color          = _wp_array_get( $attributes, array( 'style', 'color', 'text' ), null );
+	$color_block_styles['text'] = $preset_text_color ? $preset_text_color : $custom_text_color;
+
+	// Background Color.
+	$preset_background_color          = array_key_exists( 'backgroundColor', $attributes ) ? "var:preset|color|{$attributes['backgroundColor']}" : null;
+	$custom_background_color          = _wp_array_get( $attributes, array( 'style', 'color', 'background' ), null );
+	$color_block_styles['background'] = $preset_background_color ? $preset_background_color : $custom_background_color;
+
+	// Generate color styles and classes.
+	$styles        = wp_style_engine_get_styles( array( 'color' => $color_block_styles ), array( 'convert_vars_to_classnames' => true ) );
+	$inline_styles = empty( $styles['css'] ) ? '' : sprintf( ' style="%s"', esc_attr( $styles['css'] ) );
+	$classnames    = empty( $styles['classnames'] ) ? '' : ' ' . esc_attr( $styles['classnames'] );
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classnames .= ' has-link-color';
+	}
+	// Apply color classes and styles to the calendar.
+	$calendar = str_replace( '<table', '<table' . $inline_styles, get_calendar( true, false ) );
+	$calendar = str_replace( 'class="wp-calendar-table', 'class="wp-calendar-table' . $classnames, $calendar );
+
 	$wrapper_attributes = get_block_wrapper_attributes();
 	$output             = sprintf(
 		'<div %1$s>%2$s</div>',
 		$wrapper_attributes,
-		get_calendar( true, false )
+		$calendar
 	);
 
 	// phpcs:ignore WordPress.WP.GlobalVariablesOverride.OverrideProhibited
diff --git a/src/wp-includes/blocks/calendar/block.json b/src/wp-includes/blocks/calendar/block.json
index fad97e0a9efc7..974d47ff8ec2c 100644
--- a/src/wp-includes/blocks/calendar/block.json
+++ b/src/wp-includes/blocks/calendar/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/calendar",
 	"title": "Calendar",
 	"category": "widgets",
@@ -17,6 +17,15 @@
 	},
 	"supports": {
 		"align": true,
+		"color": {
+			"link": true,
+			"__experimentalSkipSerialization": [ "text", "background" ],
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true
+			},
+			"__experimentalSelector": "table, th"
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/categories.php b/src/wp-includes/blocks/categories.php
index 027688152fe7f..7e3979b7aefe2 100644
--- a/src/wp-includes/blocks/categories.php
+++ b/src/wp-includes/blocks/categories.php
@@ -14,7 +14,7 @@
  */
 function render_block_core_categories( $attributes ) {
 	static $block_id = 0;
-	$block_id++;
+	++$block_id;
 
 	$args = array(
 		'echo'         => false,
diff --git a/src/wp-includes/blocks/categories/block.json b/src/wp-includes/blocks/categories/block.json
index adf28dc42b4f0..5014da8298049 100644
--- a/src/wp-includes/blocks/categories/block.json
+++ b/src/wp-includes/blocks/categories/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/categories",
 	"title": "Categories List",
 	"category": "widgets",
@@ -33,7 +33,11 @@
 		"html": false,
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/code/block.json b/src/wp-includes/blocks/code/block.json
index 6927800229569..4d19423f1b629 100644
--- a/src/wp-includes/blocks/code/block.json
+++ b/src/wp-includes/blocks/code/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/code",
 	"title": "Code",
 	"category": "text",
@@ -14,6 +14,7 @@
 		}
 	},
 	"supports": {
+		"align": [ "wide" ],
 		"anchor": true,
 		"typography": {
 			"fontSize": true,
@@ -30,7 +31,11 @@
 		},
 		"spacing": {
 			"margin": [ "top", "bottom" ],
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"__experimentalBorder": {
 			"radius": true,
diff --git a/src/wp-includes/blocks/column/block.json b/src/wp-includes/blocks/column/block.json
index f6f7bc8d1f5cc..31ad66cb6b191 100644
--- a/src/wp-includes/blocks/column/block.json
+++ b/src/wp-includes/blocks/column/block.json
@@ -1,9 +1,9 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/column",
 	"title": "Column",
-	"category": "text",
+	"category": "design",
 	"parent": [ "core/columns" ],
 	"description": "A single column within a columns block.",
 	"textdomain": "default",
@@ -38,7 +38,8 @@
 			"blockGap": true,
 			"padding": true,
 			"__experimentalDefaultControls": {
-				"padding": true
+				"padding": true,
+				"blockGap": true
 			}
 		},
 		"__experimentalBorder": {
@@ -64,6 +65,6 @@
 				"fontSize": true
 			}
 		},
-		"__experimentalLayout": true
+		"layout": true
 	}
 }
diff --git a/src/wp-includes/blocks/columns/block.json b/src/wp-includes/blocks/columns/block.json
index aaaa72263e309..a99fd020ca8d2 100644
--- a/src/wp-includes/blocks/columns/block.json
+++ b/src/wp-includes/blocks/columns/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/columns",
 	"title": "Columns",
 	"category": "design",
@@ -13,6 +13,10 @@
 		"isStackedOnMobile": {
 			"type": "boolean",
 			"default": true
+		},
+		"templateLock": {
+			"type": [ "string", "boolean" ],
+			"enum": [ "all", "insert", "contentOnly", false ]
 		}
 	},
 	"supports": {
@@ -35,10 +39,11 @@
 			"margin": [ "top", "bottom" ],
 			"padding": true,
 			"__experimentalDefaultControls": {
-				"padding": true
+				"padding": true,
+				"blockGap": true
 			}
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"allowEditing": false,
diff --git a/src/wp-includes/blocks/comment-author-name.php b/src/wp-includes/blocks/comment-author-name.php
index 04d8e60c65e8c..d3cd68c0dfbfc 100644
--- a/src/wp-includes/blocks/comment-author-name.php
+++ b/src/wp-includes/blocks/comment-author-name.php
@@ -25,12 +25,15 @@ function render_block_core_comment_author_name( $attributes, $content, $block )
 		return '';
 	}
 
-	$classes = '';
+	$classes = array();
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= 'has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 	$comment_author     = get_comment_author( $comment );
 	$link               = get_comment_author_url( $comment );
 
diff --git a/src/wp-includes/blocks/comment-author-name/block.json b/src/wp-includes/blocks/comment-author-name/block.json
index 59300c317a679..93350779fc8bd 100644
--- a/src/wp-includes/blocks/comment-author-name/block.json
+++ b/src/wp-includes/blocks/comment-author-name/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-author-name",
 	"title": "Comment Author Name",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comment-content.php b/src/wp-includes/blocks/comment-content.php
index 90ba060b44dfa..50bca402acf03 100644
--- a/src/wp-includes/blocks/comment-content.php
+++ b/src/wp-includes/blocks/comment-content.php
@@ -49,12 +49,15 @@ function render_block_core_comment_content( $attributes, $content, $block ) {
 		}
 	}
 
-	$classes = '';
+	$classes = array();
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= 'has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return sprintf(
 		'<div %1$s>%2$s%3$s</div>',
diff --git a/src/wp-includes/blocks/comment-content/block.json b/src/wp-includes/blocks/comment-content/block.json
index 0c28c25f330ca..9ac4b5453365b 100644
--- a/src/wp-includes/blocks/comment-content/block.json
+++ b/src/wp-includes/blocks/comment-content/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-content",
 	"title": "Comment Content",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comment-date.php b/src/wp-includes/blocks/comment-date.php
index 9bff9f2f6cbbf..0f9c18bf2c006 100644
--- a/src/wp-includes/blocks/comment-date.php
+++ b/src/wp-includes/blocks/comment-date.php
@@ -23,7 +23,7 @@ function render_block_core_comment_date( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$classes = '';
+	$classes = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
 	$formatted_date     = get_comment_date(
diff --git a/src/wp-includes/blocks/comment-date/block.json b/src/wp-includes/blocks/comment-date/block.json
index e90cb0b0d8c4d..7e4776c68ff2f 100644
--- a/src/wp-includes/blocks/comment-date/block.json
+++ b/src/wp-includes/blocks/comment-date/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-date",
 	"title": "Comment Date",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comment-edit-link.php b/src/wp-includes/blocks/comment-edit-link.php
index 39727ea5aed10..ce7ad9bf207d4 100644
--- a/src/wp-includes/blocks/comment-edit-link.php
+++ b/src/wp-includes/blocks/comment-edit-link.php
@@ -27,12 +27,15 @@ function render_block_core_comment_edit_link( $attributes, $content, $block ) {
 		$link_atts .= sprintf( 'target="%s"', esc_attr( $attributes['linkTarget'] ) );
 	}
 
-	$classes = '';
+	$classes = array();
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= 'has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return sprintf(
 		'<div %1$s><a href="%2$s" %3$s>%4$s</a></div>',
diff --git a/src/wp-includes/blocks/comment-edit-link/block.json b/src/wp-includes/blocks/comment-edit-link/block.json
index 14795c83e1c53..505305f60987a 100644
--- a/src/wp-includes/blocks/comment-edit-link/block.json
+++ b/src/wp-includes/blocks/comment-edit-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-edit-link",
 	"title": "Comment Edit Link",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comment-reply-link.php b/src/wp-includes/blocks/comment-reply-link.php
index 169b62ac24bdf..3f7b6e48b617c 100644
--- a/src/wp-includes/blocks/comment-reply-link.php
+++ b/src/wp-includes/blocks/comment-reply-link.php
@@ -34,7 +34,7 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
 
 	// Compute comment's depth iterating over its ancestors.
 	while ( ! empty( $parent_id ) ) {
-		$depth++;
+		++$depth;
 		$parent_id = get_comment( $parent_id )->comment_parent;
 	}
 
@@ -51,12 +51,15 @@ function render_block_core_comment_reply_link( $attributes, $content, $block ) {
 		return;
 	}
 
-	$classes = '';
+	$classes = array();
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= 'has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return sprintf(
 		'<div %1$s>%2$s</div>',
diff --git a/src/wp-includes/blocks/comment-reply-link/block.json b/src/wp-includes/blocks/comment-reply-link/block.json
index 9d4a1d8668acc..c10129412145c 100644
--- a/src/wp-includes/blocks/comment-reply-link/block.json
+++ b/src/wp-includes/blocks/comment-reply-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-reply-link",
 	"title": "Comment Reply Link",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comment-template.php b/src/wp-includes/blocks/comment-template.php
index 770959854b58a..5a0eef5685cf1 100644
--- a/src/wp-includes/blocks/comment-template.php
+++ b/src/wp-includes/blocks/comment-template.php
@@ -8,6 +8,8 @@
 /**
  * Function that recursively renders a list of nested comments.
  *
+ * @since 6.3.0 Changed render_block_context priority to `1`.
+ *
  * @global int $comment_depth
  *
  * @param WP_Comment[] $comments        The array of comments.
@@ -25,13 +27,29 @@ function block_core_comment_template_render_comments( $comments, $block ) {
 
 	$content = '';
 	foreach ( $comments as $comment ) {
+		$comment_id           = $comment->comment_ID;
+		$filter_block_context = static function( $context ) use ( $comment_id ) {
+			$context['commentId'] = $comment_id;
+			return $context;
+		};
+
+		/*
+		 * We set commentId context through the `render_block_context` filter so
+		 * that dynamically inserted blocks (at `render_block` filter stage)
+		 * will also receive that context.
+		 *
+		 * Use an early priority to so that other 'render_block_context' filters
+		 * have access to the values.
+		 */
+		add_filter( 'render_block_context', $filter_block_context, 1 );
 
-		$block_content = ( new WP_Block(
-			$block->parsed_block,
-			array(
-				'commentId' => $comment->comment_ID,
-			)
-		) )->render( array( 'dynamic' => false ) );
+		/*
+		 * We construct a new WP_Block instance from the parsed block so that
+		 * it'll receive any changes made by the `render_block_data` filter.
+		 */
+		$block_content = ( new WP_Block( $block->parsed_block ) )->render( array( 'dynamic' => false ) );
+
+		remove_filter( 'render_block_context', $filter_block_context, 1 );
 
 		$children = $comment->get_children();
 
@@ -50,19 +68,18 @@ function block_core_comment_template_render_comments( $comments, $block ) {
 		// comments.
 		if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
 			if ( $comment_depth < $thread_comments_depth ) {
-				$comment_depth += 1;
+				++$comment_depth;
 				$inner_content  = block_core_comment_template_render_comments(
 					$children,
 					$block
 				);
 				$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
-				$comment_depth -= 1;
+				--$comment_depth;
 			} else {
-				$inner_content  = block_core_comment_template_render_comments(
+				$block_content .= block_core_comment_template_render_comments(
 					$children,
 					$block
 				);
-				$block_content .= sprintf( $inner_content );
 			}
 		}
 
@@ -70,7 +87,6 @@ function block_core_comment_template_render_comments( $comments, $block ) {
 	}
 
 	return $content;
-
 }
 
 /**
diff --git a/src/wp-includes/blocks/comment-template/block.json b/src/wp-includes/blocks/comment-template/block.json
index 1a8dd4da1ada3..7b9bfc5e0340f 100644
--- a/src/wp-includes/blocks/comment-template/block.json
+++ b/src/wp-includes/blocks/comment-template/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comment-template",
 	"title": "Comment Template",
 	"category": "design",
@@ -9,9 +9,13 @@
 	"textdomain": "default",
 	"usesContext": [ "postId" ],
 	"supports": {
-		"reusable": false,
-		"html": false,
 		"align": true,
+		"html": false,
+		"reusable": false,
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/comments-pagination-next.php b/src/wp-includes/blocks/comments-pagination-next.php
index a535b7c40d6c4..5a8df691ff092 100644
--- a/src/wp-includes/blocks/comments-pagination-next.php
+++ b/src/wp-includes/blocks/comments-pagination-next.php
@@ -26,7 +26,7 @@ function render_block_core_comments_pagination_next( $attributes, $content, $blo
 	$label            = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? $attributes['label'] : $default_label;
 	$pagination_arrow = get_comments_pagination_arrow( $block, 'next' );
 
-	$filter_link_attributes = function() {
+	$filter_link_attributes = static function() {
 		return get_block_wrapper_attributes();
 	};
 	add_filter( 'next_comments_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/comments-pagination-next/block.json b/src/wp-includes/blocks/comments-pagination-next/block.json
index 48da9495bff62..d619865ebd6f5 100644
--- a/src/wp-includes/blocks/comments-pagination-next/block.json
+++ b/src/wp-includes/blocks/comments-pagination-next/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments-pagination-next",
 	"title": "Comments Next Page",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comments-pagination-numbers/block.json b/src/wp-includes/blocks/comments-pagination-numbers/block.json
index 97a0649a7a4c1..fcebb52763870 100644
--- a/src/wp-includes/blocks/comments-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/comments-pagination-numbers/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments-pagination-numbers",
 	"title": "Comments Page Numbers",
 	"category": "theme",
@@ -11,6 +11,13 @@
 	"supports": {
 		"reusable": false,
 		"html": false,
+		"color": {
+			"gradients": true,
+			"text": false,
+			"__experimentalDefaultControls": {
+				"background": true
+			}
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/comments-pagination-previous.php b/src/wp-includes/blocks/comments-pagination-previous.php
index 951dc8dd78a06..ed3fa653abda9 100644
--- a/src/wp-includes/blocks/comments-pagination-previous.php
+++ b/src/wp-includes/blocks/comments-pagination-previous.php
@@ -22,7 +22,7 @@ function render_block_core_comments_pagination_previous( $attributes, $content,
 		$label = $pagination_arrow . $label;
 	}
 
-	$filter_link_attributes = function() {
+	$filter_link_attributes = static function() {
 		return get_block_wrapper_attributes();
 	};
 	add_filter( 'previous_comments_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/comments-pagination-previous/block.json b/src/wp-includes/blocks/comments-pagination-previous/block.json
index a48782af29760..2dab1e9dd7367 100644
--- a/src/wp-includes/blocks/comments-pagination-previous/block.json
+++ b/src/wp-includes/blocks/comments-pagination-previous/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments-pagination-previous",
 	"title": "Comments Previous Page",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comments-pagination.php b/src/wp-includes/blocks/comments-pagination.php
index 5c041c237c64f..2f9cef27f78cf 100644
--- a/src/wp-includes/blocks/comments-pagination.php
+++ b/src/wp-includes/blocks/comments-pagination.php
@@ -22,9 +22,12 @@ function render_block_core_comments_pagination( $attributes, $content ) {
 		return;
 	}
 
+	$classes            = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+
 	return sprintf(
 		'<div %1$s>%2$s</div>',
-		get_block_wrapper_attributes(),
+		$wrapper_attributes,
 		$content
 	);
 }
diff --git a/src/wp-includes/blocks/comments-pagination/block.json b/src/wp-includes/blocks/comments-pagination/block.json
index ffa2828912f26..a11decd201e94 100644
--- a/src/wp-includes/blocks/comments-pagination/block.json
+++ b/src/wp-includes/blocks/comments-pagination/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments-pagination",
 	"title": "Comments Pagination",
 	"category": "theme",
@@ -29,7 +29,7 @@
 				"link": true
 			}
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"default": {
diff --git a/src/wp-includes/blocks/comments-title/block.json b/src/wp-includes/blocks/comments-title/block.json
index 3c5db438a3fe6..12b105afe9a31 100644
--- a/src/wp-includes/blocks/comments-title/block.json
+++ b/src/wp-includes/blocks/comments-title/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments-title",
 	"title": "Comments Title",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/comments.php b/src/wp-includes/blocks/comments.php
index 69044c081c74e..48aac15af6fbb 100644
--- a/src/wp-includes/blocks/comments.php
+++ b/src/wp-includes/blocks/comments.php
@@ -29,13 +29,8 @@ function render_block_core_comments( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$comment_args = array(
-		'post_id' => $post_id,
-		'count'   => true,
-		'status'  => 'approve',
-	);
 	// Return early if there are no comments and comments are closed.
-	if ( ! comments_open( $post_id ) && get_comments( $comment_args ) === 0 ) {
+	if ( ! comments_open( $post_id ) && (int) get_comments_number( $post_id ) === 0 ) {
 		return '';
 	}
 
@@ -202,7 +197,6 @@ function register_legacy_post_comments_block() {
 			'wp-block-buttons',
 			'wp-block-button',
 		),
-		'editorStyle'       => 'wp-block-post-comments-editor',
 		'render_callback'   => 'render_block_core_comments',
 		'skip_inner_blocks' => true,
 	);
@@ -213,6 +207,7 @@ function register_legacy_post_comments_block() {
 	 * like `_wp_multiple_block_styles`, which is required in this case because
 	 * the block has multiple styles.
 	 */
+	/** This filter is documented in wp-includes/blocks.php */
 	$metadata = apply_filters( 'block_type_metadata', $metadata );
 
 	register_block_type( 'core/post-comments', $metadata );
diff --git a/src/wp-includes/blocks/comments/block.json b/src/wp-includes/blocks/comments/block.json
index 59d315b5fcb83..4bfe4bb901786 100644
--- a/src/wp-includes/blocks/comments/block.json
+++ b/src/wp-includes/blocks/comments/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/comments",
 	"title": "Comments",
 	"category": "theme",
@@ -28,6 +28,10 @@
 				"link": true
 			}
 		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/cover.php b/src/wp-includes/blocks/cover.php
index 4168d267671f7..5f6b2cadaaa57 100644
--- a/src/wp-includes/blocks/cover.php
+++ b/src/wp-includes/blocks/cover.php
@@ -25,7 +25,7 @@ function render_block_core_cover( $attributes, $content ) {
 		);
 
 		if ( isset( $attributes['focalPoint'] ) ) {
-			$object_position              = round( $attributes['focalPoint']['x'] * 100 ) . '%' . ' ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
+			$object_position              = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
 			$attr['data-object-position'] = $object_position;
 			$attr['style']                = 'object-position: ' . $object_position;
 		}
@@ -34,7 +34,7 @@ function render_block_core_cover( $attributes, $content ) {
 
 		/*
 		 * Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
-		 * and removes eventual withespace characters between the two (typically introduced at template level)
+		 * and removes eventual whitespace characters between the two (typically introduced at template level)
 		 */
 		$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
 		if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
@@ -46,22 +46,19 @@ function render_block_core_cover( $attributes, $content ) {
 			update_post_thumbnail_cache();
 		}
 		$current_featured_image = get_the_post_thumbnail_url();
+		if ( ! $current_featured_image ) {
+			return $content;
+		}
 
-		$styles = 'background-image:url(' . esc_url( $current_featured_image ) . '); ';
-
-		if ( isset( $attributes['minHeight'] ) ) {
-			$height_unit = empty( $attributes['minHeightUnit'] ) ? 'px' : $attributes['minHeightUnit'];
-			$height      = " min-height:{$attributes['minHeight']}{$height_unit}";
+		$processor = new WP_HTML_Tag_Processor( $content );
+		$processor->next_tag();
 
-			$styles .= $height;
-		}
+		$styles         = $processor->get_attribute( 'style' );
+		$merged_styles  = ! empty( $styles ) ? $styles . ';' : '';
+		$merged_styles .= 'background-image:url(' . esc_url( $current_featured_image ) . ');';
 
-		$content = preg_replace(
-			'/class=\".*?\"/',
-			'${0} style="' . $styles . '"',
-			$content,
-			1
-		);
+		$processor->set_attribute( 'style', $merged_styles );
+		$content = $processor->get_updated_html();
 	}
 
 	return $content;
diff --git a/src/wp-includes/blocks/cover/block.json b/src/wp-includes/blocks/cover/block.json
index 1982ecc44853e..39ee697802548 100644
--- a/src/wp-includes/blocks/cover/block.json
+++ b/src/wp-includes/blocks/cover/block.json
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/cover",
 	"title": "Cover",
 	"category": "media",
-	"description": "Add an image or video with a text overlay — great for headers.",
+	"description": "Add an image or video with a text overlay.",
 	"textdomain": "default",
 	"attributes": {
 		"url": {
@@ -74,6 +74,10 @@
 		"templateLock": {
 			"type": [ "string", "boolean" ],
 			"enum": [ "all", "insert", "contentOnly", false ]
+		},
+		"tagName": {
+			"type": "string",
+			"default": "div"
 		}
 	},
 	"usesContext": [ "postId", "postType" ],
@@ -84,14 +88,29 @@
 		"spacing": {
 			"padding": true,
 			"margin": [ "top", "bottom" ],
+			"blockGap": true,
+			"__experimentalDefaultControls": {
+				"padding": true,
+				"blockGap": true
+			}
+		},
+		"__experimentalBorder": {
+			"color": true,
+			"radius": true,
+			"style": true,
+			"width": true,
 			"__experimentalDefaultControls": {
-				"padding": true
+				"color": true,
+				"radius": true,
+				"style": true,
+				"width": true
 			}
 		},
 		"color": {
 			"__experimentalDuotone": "> .wp-block-cover__image-background, > .wp-block-cover__video-background",
-			"text": false,
-			"background": false
+			"text": true,
+			"background": false,
+			"__experimentalSkipSerialization": [ "gradients" ]
 		},
 		"typography": {
 			"fontSize": true,
@@ -105,6 +124,9 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"layout": {
+			"allowJustification": false
 		}
 	},
 	"editorStyle": "wp-block-cover-editor",
diff --git a/src/wp-includes/blocks/details/block.json b/src/wp-includes/blocks/details/block.json
new file mode 100644
index 0000000000000..222be7357c3fb
--- /dev/null
+++ b/src/wp-includes/blocks/details/block.json
@@ -0,0 +1,59 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "core/details",
+	"title": "Details",
+	"category": "text",
+	"description": "Hide and show additional content.",
+	"keywords": [ "disclosure", "summary", "hide" ],
+	"textdomain": "default",
+	"attributes": {
+		"showContent": {
+			"type": "boolean",
+			"default": false
+		},
+		"summary": {
+			"type": "string"
+		}
+	},
+	"supports": {
+		"align": [ "wide", "full" ],
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true
+			}
+		},
+		"__experimentalBorder": {
+			"color": true,
+			"width": true,
+			"style": true
+		},
+		"html": false,
+		"spacing": {
+			"margin": true,
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
+		},
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		}
+	},
+	"editorStyle": "wp-block-details-editor",
+	"style": "wp-block-details"
+}
diff --git a/src/wp-includes/blocks/embed/block.json b/src/wp-includes/blocks/embed/block.json
index 7257b54cf20fa..9ca54db871db1 100644
--- a/src/wp-includes/blocks/embed/block.json
+++ b/src/wp-includes/blocks/embed/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/embed",
 	"title": "Embed",
 	"category": "embed",
@@ -8,18 +8,22 @@
 	"textdomain": "default",
 	"attributes": {
 		"url": {
-			"type": "string"
+			"type": "string",
+			"__experimentalRole": "content"
 		},
 		"caption": {
 			"type": "string",
 			"source": "html",
-			"selector": "figcaption"
+			"selector": "figcaption",
+			"__experimentalRole": "content"
 		},
 		"type": {
-			"type": "string"
+			"type": "string",
+			"__experimentalRole": "content"
 		},
 		"providerNameSlug": {
-			"type": "string"
+			"type": "string",
+			"__experimentalRole": "content"
 		},
 		"allowResponsive": {
 			"type": "boolean",
@@ -27,15 +31,20 @@
 		},
 		"responsive": {
 			"type": "boolean",
-			"default": false
+			"default": false,
+			"__experimentalRole": "content"
 		},
 		"previewable": {
 			"type": "boolean",
-			"default": true
+			"default": true,
+			"__experimentalRole": "content"
 		}
 	},
 	"supports": {
-		"align": true
+		"align": true,
+		"spacing": {
+			"margin": true
+		}
 	},
 	"editorStyle": "wp-block-embed-editor",
 	"style": "wp-block-embed"
diff --git a/src/wp-includes/blocks/file.php b/src/wp-includes/blocks/file.php
index 9081b63a5e76b..26a48ccad98c3 100644
--- a/src/wp-includes/blocks/file.php
+++ b/src/wp-includes/blocks/file.php
@@ -5,18 +5,47 @@
  * @package WordPress
  */
 
+if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
+	/**
+	 * Replaces view script for the File block with version using Interactivity API.
+	 *
+	 * @param array $metadata Block metadata as read in via block.json.
+	 *
+	 * @return array Filtered block type metadata.
+	 */
+	function gutenberg_block_core_file_update_interactive_view_script( $metadata ) {
+		if ( 'core/file' === $metadata['name'] ) {
+			$metadata['viewScript'] = array( 'file:./interactivity.min.js' );
+		}
+		return $metadata;
+	}
+	add_filter( 'block_type_metadata', 'gutenberg_block_core_file_update_interactive_view_script', 10, 1 );
+}
+
 /**
  * When the `core/file` block is rendering, check if we need to enqueue the `'wp-block-file-view` script.
  *
- * @param array  $attributes The block attributes.
- * @param string $content    The block content.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The block content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string Returns the block content.
  */
-function render_block_core_file( $attributes, $content ) {
-	$should_load_view_script = ! empty( $attributes['displayPreview'] ) && ! wp_script_is( 'wp-block-file-view' );
-	if ( $should_load_view_script ) {
-		wp_enqueue_script( 'wp-block-file-view' );
+function render_block_core_file( $attributes, $content, $block ) {
+	$should_load_view_script = ! empty( $attributes['displayPreview'] );
+	$view_js_file            = 'wp-block-file-view';
+	// If the script already exists, there is no point in removing it from viewScript.
+	if ( ! wp_script_is( $view_js_file ) ) {
+		$script_handles = $block->block_type->view_script_handles;
+
+		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
+		if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
+		}
+		// If the script is needed, but it was previously removed, add it again.
+		if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
+		}
 	}
 
 	// Update object's aria-label attribute if present in block HTML.
@@ -25,7 +54,7 @@ function render_block_core_file( $attributes, $content ) {
 	$pattern = '@<object.+(?<attribute>aria-label="(?<filename>[^"]+)?")@i';
 	$content = preg_replace_callback(
 		$pattern,
-		function ( $matches ) {
+		static function ( $matches ) {
 			$filename     = ! empty( $matches['filename'] ) ? $matches['filename'] : '';
 			$has_filename = ! empty( $filename ) && 'PDF embed' !== $filename;
 			$label        = $has_filename ?
@@ -41,6 +70,17 @@ function ( $matches ) {
 		$content
 	);
 
+	// If it uses the Interactivity API, add the directives.
+	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && $should_load_view_script ) {
+		$processor = new WP_HTML_Tag_Processor( $content );
+		$processor->next_tag();
+		$processor->set_attribute( 'data-wp-interactive', '' );
+		$processor->next_tag( 'object' );
+		$processor->set_attribute( 'data-wp-bind--hidden', '!selectors.core.file.hasPdfPreview' );
+		$processor->set_attribute( 'hidden', true );
+		return $processor->get_updated_html();
+	}
+
 	return $content;
 }
 
diff --git a/src/wp-includes/blocks/file/block.json b/src/wp-includes/blocks/file/block.json
index 8e90825a64dfd..12edc20630d1e 100644
--- a/src/wp-includes/blocks/file/block.json
+++ b/src/wp-includes/blocks/file/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/file",
 	"title": "File",
 	"category": "media",
@@ -56,7 +56,16 @@
 	},
 	"supports": {
 		"anchor": true,
-		"align": true
+		"align": true,
+		"color": {
+			"gradients": true,
+			"link": true,
+			"text": false,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"link": true
+			}
+		}
 	},
 	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-file-editor",
diff --git a/src/wp-includes/blocks/file/view.asset.php b/src/wp-includes/blocks/file/view.asset.php
index 06a9e2f5783c4..3588868e9e983 100644
--- a/src/wp-includes/blocks/file/view.asset.php
+++ b/src/wp-includes/blocks/file/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'ee575fc5e86fe255013d');
+<?php return array('dependencies' => array(), 'version' => '8b491e23dbdddf35bd2d');
diff --git a/src/wp-includes/blocks/file/view.min.asset.php b/src/wp-includes/blocks/file/view.min.asset.php
index d27ebcbf946b3..124a65c1a47a2 100644
--- a/src/wp-includes/blocks/file/view.min.asset.php
+++ b/src/wp-includes/blocks/file/view.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '2a20786ca914ea00891f');
+<?php return array('dependencies' => array(), 'version' => 'ec37fc1961bd4baeb46a');
diff --git a/src/wp-includes/blocks/footnotes.php b/src/wp-includes/blocks/footnotes.php
new file mode 100644
index 0000000000000..5924db3a190c2
--- /dev/null
+++ b/src/wp-includes/blocks/footnotes.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Server-side rendering of the `core/footnotes` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/footnotes` block on the server.
+ *
+ * @since 6.3.0
+ *
+ * @param array    $attributes Block attributes.
+ * @param string   $content    Block default content.
+ * @param WP_Block $block      Block instance.
+ *
+ * @return string Returns the HTML representing the footnotes.
+ */
+function render_block_core_footnotes( $attributes, $content, $block ) {
+	// Bail out early if the post ID is not set for some reason.
+	if ( empty( $block->context['postId'] ) ) {
+		return '';
+	}
+
+	if ( post_password_required( $block->context['postId'] ) ) {
+		return;
+	}
+
+	$footnotes = get_post_meta( $block->context['postId'], 'footnotes', true );
+
+	if ( ! $footnotes ) {
+		return;
+	}
+
+	$footnotes = json_decode( $footnotes, true );
+
+	if ( ! is_array( $footnotes ) || count( $footnotes ) === 0 ) {
+		return '';
+	}
+
+	$wrapper_attributes = get_block_wrapper_attributes();
+
+	$block_content = '';
+
+	foreach ( $footnotes as $footnote ) {
+		$block_content .= sprintf(
+			'<li id="%1$s">%2$s <a href="#%1$s-link">↩︎</a></li>',
+			$footnote['id'],
+			$footnote['content']
+		);
+	}
+
+	return sprintf(
+		'<ol %1$s>%2$s</ol>',
+		$wrapper_attributes,
+		$block_content
+	);
+}
+
+/**
+ * Registers the `core/footnotes` block on the server.
+ *
+ * @since 6.3.0
+ */
+function register_block_core_footnotes() {
+	foreach ( array( 'post', 'page' ) as $post_type ) {
+		register_post_meta(
+			$post_type,
+			'footnotes',
+			array(
+				'show_in_rest' => true,
+				'single'       => true,
+				'type'         => 'string',
+			)
+		);
+	}
+	register_block_type_from_metadata(
+		__DIR__ . '/footnotes',
+		array(
+			'render_callback' => 'render_block_core_footnotes',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_footnotes' );
+
+/**
+ * Saves the footnotes meta value to the revision.
+ *
+ * @since 6.3.0
+ *
+ * @param int $revision_id The revision ID.
+ */
+function wp_save_footnotes_meta( $revision_id ) {
+	$post_id = wp_is_post_revision( $revision_id );
+
+	if ( $post_id ) {
+		$footnotes = get_post_meta( $post_id, 'footnotes', true );
+
+		if ( $footnotes ) {
+			// Can't use update_post_meta() because it doesn't allow revisions.
+			update_metadata( 'post', $revision_id, 'footnotes', wp_slash( $footnotes ) );
+		}
+	}
+}
+add_action( 'wp_after_insert_post', 'wp_save_footnotes_meta' );
+
+/**
+ * Keeps track of the revision ID for "rest_after_insert_{$post_type}".
+ *
+ * @since 6.3.0
+ *
+ * @global int $wp_temporary_footnote_revision_id The footnote revision ID.
+ *
+ * @param int $revision_id The revision ID.
+ */
+function wp_keep_footnotes_revision_id( $revision_id ) {
+	global $wp_temporary_footnote_revision_id;
+	$wp_temporary_footnote_revision_id = $revision_id;
+}
+add_action( '_wp_put_post_revision', 'wp_keep_footnotes_revision_id' );
+
+/**
+ * This is a specific fix for the REST API. The REST API doesn't update
+ * the post and post meta in one go (through `meta_input`). While it
+ * does fix the `wp_after_insert_post` hook to be called correctly after
+ * updating meta, it does NOT fix hooks such as post_updated and
+ * save_post, which are normally also fired after post meta is updated
+ * in `wp_insert_post()`. Unfortunately, `wp_save_post_revision` is
+ * added to the `post_updated` action, which means the meta is not
+ * available at the time, so we have to add it afterwards through the
+ * `"rest_after_insert_{$post_type}"` action.
+ *
+ * @since 6.3.0
+ *
+ * @global int $wp_temporary_footnote_revision_id The footnote revision ID.
+ *
+ * @param WP_Post $post The post object.
+ */
+function wp_add_footnotes_revisions_to_post_meta( $post ) {
+	global $wp_temporary_footnote_revision_id;
+
+	if ( $wp_temporary_footnote_revision_id ) {
+		$revision = get_post( $wp_temporary_footnote_revision_id );
+
+		if ( ! $revision ) {
+			return;
+		}
+
+		$post_id = $revision->post_parent;
+
+		// Just making sure we're updating the right revision.
+		if ( $post->ID === $post_id ) {
+			$footnotes = get_post_meta( $post_id, 'footnotes', true );
+
+			if ( $footnotes ) {
+				// Can't use update_post_meta() because it doesn't allow revisions.
+				update_metadata( 'post', $wp_temporary_footnote_revision_id, 'footnotes', wp_slash( $footnotes ) );
+			}
+		}
+	}
+}
+
+add_action( 'rest_after_insert_post', 'wp_add_footnotes_revisions_to_post_meta' );
+add_action( 'rest_after_insert_page', 'wp_add_footnotes_revisions_to_post_meta' );
+
+/**
+ * Restores the footnotes meta value from the revision.
+ *
+ * @since 6.3.0
+ *
+ * @param int $post_id     The post ID.
+ * @param int $revision_id The revision ID.
+ */
+function wp_restore_footnotes_from_revision( $post_id, $revision_id ) {
+	$footnotes = get_post_meta( $revision_id, 'footnotes', true );
+
+	if ( $footnotes ) {
+		update_post_meta( $post_id, 'footnotes', wp_slash( $footnotes ) );
+	} else {
+		delete_post_meta( $post_id, 'footnotes' );
+	}
+}
+add_action( 'wp_restore_post_revision', 'wp_restore_footnotes_from_revision', 10, 2 );
+
+/**
+ * Adds the footnotes field to the revision.
+ *
+ * @since 6.3.0
+ *
+ * @param array $fields The revision fields.
+ * @return array The revision fields.
+ */
+function wp_add_footnotes_to_revision( $fields ) {
+	$fields['footnotes'] = __( 'Footnotes' );
+	return $fields;
+}
+add_filter( '_wp_post_revision_fields', 'wp_add_footnotes_to_revision' );
+
+/**
+ * Gets the footnotes field from the revision.
+ *
+ * @since 6.3.0
+ *
+ * @param string $revision_field The field value, but $revision->$field
+ *                               (footnotes) does not exist.
+ * @param string $field          The field name, in this case "footnotes".
+ * @param object $revision       The revision object to compare against.
+ * @return string The field value.
+ */
+function wp_get_footnotes_from_revision( $revision_field, $field, $revision ) {
+	return get_metadata( 'post', $revision->ID, $field, true );
+}
+add_filter( '_wp_post_revision_field_footnotes', 'wp_get_footnotes_from_revision', 10, 3 );
+
+/**
+ * The REST API autosave endpoint doesn't save meta, so we can use the
+ * `wp_creating_autosave` when it updates an exiting autosave, and
+ * `_wp_put_post_revision` when it creates a new autosave.
+ *
+ * @since 6.3.0
+ *
+ * @param int|array $autosave The autosave ID or array.
+ */
+function _wp_rest_api_autosave_meta( $autosave ) {
+	// Ensure it's a REST API request.
+	if ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) {
+		return;
+	}
+
+	$body = rest_get_server()->get_raw_data();
+	$body = json_decode( $body, true );
+
+	if ( ! isset( $body['meta']['footnotes'] ) ) {
+		return;
+	}
+
+	// `wp_creating_autosave` passes the array,
+	// `_wp_put_post_revision` passes the ID.
+	$id = is_int( $autosave ) ? $autosave : $autosave['ID'];
+
+	if ( ! $id ) {
+		return;
+	}
+
+	update_post_meta( $id, 'footnotes', wp_slash( $body['meta']['footnotes'] ) );
+}
+// See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L391C1-L391C1.
+add_action( 'wp_creating_autosave', '_wp_rest_api_autosave_meta' );
+// See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L398.
+// Then https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/revision.php#L367.
+add_action( '_wp_put_post_revision', '_wp_rest_api_autosave_meta' );
+
+/**
+ * This is a workaround for the autosave endpoint returning early if the
+ * revision field are equal. The problem is that "footnotes" is not real
+ * revision post field, so there's nothing to compare against.
+ *
+ * This trick sets the "footnotes" field (value doesn't matter), which will
+ * cause the autosave endpoint to always update the latest revision. That should
+ * be fine, it should be ok to update the revision even if nothing changed. Of
+ * course, this is temporary fix.
+ *
+ * @since 6.3.0
+ *
+ * @param WP_Post         $prepared_post The prepared post object.
+ * @param WP_REST_Request $request       The request object.
+ *
+ * See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L365-L384.
+ * See https://github.com/WordPress/wordpress-develop/blob/2103cb9966e57d452c94218bbc3171579b536a40/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php#L219.
+ */
+function _wp_rest_api_force_autosave_difference( $prepared_post, $request ) {
+	// We only want to be altering POST requests.
+	if ( $request->get_method() !== 'POST' ) {
+		return $prepared_post;
+	}
+
+	// Only alter requests for the '/autosaves' route.
+	if ( substr( $request->get_route(), -strlen( '/autosaves' ) ) !== '/autosaves' ) {
+		return $prepared_post;
+	}
+
+	$prepared_post->footnotes = '[]';
+	return $prepared_post;
+}
+
+add_filter( 'rest_pre_insert_post', '_wp_rest_api_force_autosave_difference', 10, 2 );
diff --git a/src/wp-includes/blocks/footnotes/block.json b/src/wp-includes/blocks/footnotes/block.json
new file mode 100644
index 0000000000000..e021e9c5225da
--- /dev/null
+++ b/src/wp-includes/blocks/footnotes/block.json
@@ -0,0 +1,17 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "core/footnotes",
+	"title": "Footnotes",
+	"category": "text",
+	"description": "",
+	"keywords": [ "references" ],
+	"textdomain": "default",
+	"usesContext": [ "postId", "postType" ],
+	"supports": {
+		"html": false,
+		"multiple": false,
+		"reusable": false
+	},
+	"style": "wp-block-footnotes"
+}
diff --git a/src/wp-includes/blocks/freeform/block.json b/src/wp-includes/blocks/freeform/block.json
index 84b57b75326c0..d40e8ea13dc11 100644
--- a/src/wp-includes/blocks/freeform/block.json
+++ b/src/wp-includes/blocks/freeform/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/freeform",
 	"title": "Classic",
 	"category": "text",
@@ -9,7 +9,7 @@
 	"attributes": {
 		"content": {
 			"type": "string",
-			"source": "html"
+			"source": "raw"
 		}
 	},
 	"supports": {
diff --git a/src/wp-includes/blocks/gallery.php b/src/wp-includes/blocks/gallery.php
index 7bc5e2821b796..86c86acfff927 100644
--- a/src/wp-includes/blocks/gallery.php
+++ b/src/wp-includes/blocks/gallery.php
@@ -76,13 +76,10 @@ function block_core_gallery_render( $attributes, $content ) {
 		}
 	}
 
-	$class   = wp_unique_id( 'wp-block-gallery-' );
-	$content = preg_replace(
-		'/' . preg_quote( 'class="', '/' ) . '/',
-		'class="' . $class . ' ',
-		$content,
-		1
-	);
+	$unique_gallery_classname = wp_unique_id( 'wp-block-gallery-' );
+	$processed_content        = new WP_HTML_Tag_Processor( $content );
+	$processed_content->next_tag();
+	$processed_content->add_class( $unique_gallery_classname );
 
 	// --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
 	// gap on the gallery.
@@ -102,10 +99,23 @@ function block_core_gallery_render( $attributes, $content ) {
 	}
 
 	// Set the CSS variable to the column value, and the `gap` property to the combined gap value.
-	$style = '.wp-block-gallery.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_column . '; gap: ' . $gap_value . '}';
+	$gallery_styles = array(
+		array(
+			'selector'     => ".wp-block-gallery.{$unique_gallery_classname}",
+			'declarations' => array(
+				'--wp--style--unstable-gallery-gap' => $gap_column,
+				'gap'                               => $gap_value,
+			),
+		),
+	);
 
-	wp_enqueue_block_support_styles( $style, 11 );
-	return $content;
+	wp_style_engine_get_stylesheet_from_css_rules(
+		$gallery_styles,
+		array(
+			'context' => 'block-supports',
+		)
+	);
+	return (string) $processed_content;
 }
 /**
  * Registers the `core/gallery` block on server.
diff --git a/src/wp-includes/blocks/gallery/block.json b/src/wp-includes/blocks/gallery/block.json
index 0400430b95ee6..69427d53dfef2 100644
--- a/src/wp-includes/blocks/gallery/block.json
+++ b/src/wp-includes/blocks/gallery/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/gallery",
 	"title": "Gallery",
 	"category": "media",
@@ -115,7 +115,9 @@
 			"blockGap": [ "horizontal", "vertical" ],
 			"__experimentalSkipSerialization": [ "blockGap" ],
 			"__experimentalDefaultControls": {
-				"blockGap": true
+				"blockGap": true,
+				"margin": false,
+				"padding": false
 			}
 		},
 		"color": {
@@ -123,7 +125,7 @@
 			"background": true,
 			"gradients": true
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"allowEditing": false,
diff --git a/src/wp-includes/blocks/group/block.json b/src/wp-includes/blocks/group/block.json
index 968f00cb1c5cb..6eaf78586285e 100644
--- a/src/wp-includes/blocks/group/block.json
+++ b/src/wp-includes/blocks/group/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/group",
 	"title": "Group",
 	"category": "design",
@@ -15,6 +15,9 @@
 		"templateLock": {
 			"type": [ "string", "boolean" ],
 			"enum": [ "all", "insert", "contentOnly", false ]
+		},
+		"allowedBlocks": {
+			"type": "array"
 		}
 	},
 	"supports": {
@@ -41,6 +44,9 @@
 				"blockGap": true
 			}
 		},
+		"dimensions": {
+			"minHeight": true
+		},
 		"__experimentalBorder": {
 			"color": true,
 			"radius": true,
@@ -53,6 +59,9 @@
 				"width": true
 			}
 		},
+		"position": {
+			"sticky": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
@@ -66,7 +75,9 @@
 				"fontSize": true
 			}
 		},
-		"__experimentalLayout": true
+		"layout": {
+			"allowSizingOnChildren": true
+		}
 	},
 	"editorStyle": "wp-block-group-editor",
 	"style": "wp-block-group"
diff --git a/src/wp-includes/blocks/heading.php b/src/wp-includes/blocks/heading.php
new file mode 100644
index 0000000000000..5a7e8dbaab43c
--- /dev/null
+++ b/src/wp-includes/blocks/heading.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Appending the wp-block-heading to before rendering the stored `core/heading` block contents.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Adds a wp-block-heading class to the heading block content.
+ *
+ * For example, the following block content:
+ *  <h2 class="align-left">Hello World</h2>
+ *
+ * Would be transformed to:
+ *  <h2 class="align-left wp-block-heading">Hello World</h2>
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ *
+ * @return string The content of the block being rendered.
+ */
+function block_core_heading_render( $attributes, $content ) {
+	if ( ! $content ) {
+		return $content;
+	}
+
+	$p = new WP_HTML_Tag_Processor( $content );
+
+	$header_tags = array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' );
+	while ( $p->next_tag() ) {
+		if ( in_array( $p->get_tag(), $header_tags, true ) ) {
+			$p->add_class( 'wp-block-heading' );
+			break;
+		}
+	}
+
+	return $p->get_updated_html();
+}
+
+/**
+ * Registers the `core/heading` block on server.
+ */
+function register_block_core_heading() {
+	register_block_type_from_metadata(
+		__DIR__ . '/heading',
+		array(
+			'render_callback' => 'block_core_heading_render',
+		)
+	);
+}
+
+add_action( 'init', 'register_block_core_heading' );
diff --git a/src/wp-includes/blocks/heading/block.json b/src/wp-includes/blocks/heading/block.json
index 89c1514808911..80f1f0c47b5a8 100644
--- a/src/wp-includes/blocks/heading/block.json
+++ b/src/wp-includes/blocks/heading/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/heading",
 	"title": "Heading",
 	"category": "text",
@@ -29,7 +29,7 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"anchor": true,
-		"className": false,
+		"className": true,
 		"color": {
 			"gradients": true,
 			"link": true,
@@ -40,7 +40,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
@@ -57,7 +61,6 @@
 				"textTransform": true
 			}
 		},
-		"__experimentalSelector": "h1,h2,h3,h4,h5,h6",
 		"__unstablePasteTextInline": true,
 		"__experimentalSlashInserter": true
 	},
diff --git a/src/wp-includes/blocks/home-link.php b/src/wp-includes/blocks/home-link.php
index 5bf7aeda5505d..459979b0d4389 100644
--- a/src/wp-includes/blocks/home-link.php
+++ b/src/wp-includes/blocks/home-link.php
@@ -98,12 +98,12 @@ function block_core_home_link_build_li_wrapper_attributes( $context ) {
 		$colors['css_classes'],
 		$font_sizes['css_classes']
 	);
+	$classes[]       = 'wp-block-navigation-item';
 	$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
-	$css_classes     = trim( implode( ' ', $classes ) ) . ' wp-block-navigation-item';
 
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
-			'class' => $css_classes,
+			'class' => implode( ' ', $classes ),
 			'style' => $style_attribute,
 		)
 	);
@@ -128,7 +128,7 @@ function render_block_core_home_link( $attributes, $content, $block ) {
 	$aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : '';
 
 	return sprintf(
-		'<li %1$s><a class="wp-block-home-link__content wp-block-navigation-item__content" href="%2$s" "rel="home"%3$s>%4$s</a></li>',
+		'<li %1$s><a class="wp-block-home-link__content wp-block-navigation-item__content" href="%2$s" rel="home"%3$s>%4$s</a></li>',
 		block_core_home_link_build_li_wrapper_attributes( $block->context ),
 		esc_url( home_url() ),
 		$aria_current,
diff --git a/src/wp-includes/blocks/home-link/block.json b/src/wp-includes/blocks/home-link/block.json
index 567bdf8c27ba7..a9827b7718b9b 100644
--- a/src/wp-includes/blocks/home-link/block.json
+++ b/src/wp-includes/blocks/home-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/home-link",
 	"category": "design",
 	"parent": [ "core/navigation" ],
diff --git a/src/wp-includes/blocks/html/block.json b/src/wp-includes/blocks/html/block.json
index e72a674373e14..b1a2ad60625d1 100644
--- a/src/wp-includes/blocks/html/block.json
+++ b/src/wp-includes/blocks/html/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/html",
 	"title": "Custom HTML",
 	"category": "widgets",
@@ -10,7 +10,7 @@
 	"attributes": {
 		"content": {
 			"type": "string",
-			"source": "html"
+			"source": "raw"
 		}
 	},
 	"supports": {
diff --git a/src/wp-includes/blocks/image.php b/src/wp-includes/blocks/image.php
index 9a9f175556e81..1e437d860aa09 100644
--- a/src/wp-includes/blocks/image.php
+++ b/src/wp-includes/blocks/image.php
@@ -14,24 +14,30 @@
  * @return string Returns the block content with the data-id attribute added.
  */
 function render_block_core_image( $attributes, $content ) {
+
+	$processor = new WP_HTML_Tag_Processor( $content );
+	$processor->next_tag( 'img' );
+
+	if ( $processor->get_attribute( 'src' ) === null ) {
+		return '';
+	}
+
 	if ( isset( $attributes['data-id'] ) ) {
 		// Add the data-id="$id" attribute to the img element
 		// to provide backwards compatibility for the Gallery Block,
 		// which now wraps Image Blocks within innerBlocks.
 		// The data-id attribute is added in a core/gallery `render_block_data` hook.
-		$data_id_attribute = 'data-id="' . esc_attr( $attributes['data-id'] ) . '"';
-		if ( ! str_contains( $content, $data_id_attribute ) ) {
-			$content = str_replace( '<img', '<img ' . $data_id_attribute . ' ', $content );
-		}
+		$processor->set_attribute( 'data-id', $attributes['data-id'] );
 	}
-	return $content;
-}
 
+	return $processor->get_updated_html();
+}
 
 /**
  * Registers the `core/image` block on server.
  */
 function register_block_core_image() {
+
 	register_block_type_from_metadata(
 		__DIR__ . '/image',
 		array(
diff --git a/src/wp-includes/blocks/image/block.json b/src/wp-includes/blocks/image/block.json
index 62edb882be0c9..7c8b2c2715c99 100644
--- a/src/wp-includes/blocks/image/block.json
+++ b/src/wp-includes/blocks/image/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/image",
 	"title": "Image",
 	"category": "media",
@@ -69,6 +69,12 @@
 		"height": {
 			"type": "number"
 		},
+		"aspectRatio": {
+			"type": "string"
+		},
+		"scale": {
+			"type": "string"
+		},
 		"sizeSlug": {
 			"type": "string"
 		},
@@ -84,16 +90,20 @@
 	},
 	"supports": {
 		"anchor": true,
+		"behaviors": {
+			"lightbox": true
+		},
 		"color": {
-			"__experimentalDuotone": "img, .components-placeholder",
 			"text": false,
 			"background": false
 		},
+		"filter": {
+			"duotone": true
+		},
 		"__experimentalBorder": {
 			"color": true,
 			"radius": true,
 			"width": true,
-			"__experimentalSelector": "img, .wp-block-image__crop-area",
 			"__experimentalSkipSerialization": true,
 			"__experimentalDefaultControls": {
 				"color": true,
@@ -102,6 +112,12 @@
 			}
 		}
 	},
+	"selectors": {
+		"border": ".wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder",
+		"filter": {
+			"duotone": ".wp-block-image img, .wp-block-image .components-placeholder"
+		}
+	},
 	"styles": [
 		{
 			"name": "default",
diff --git a/src/wp-includes/blocks/index.php b/src/wp-includes/blocks/index.php
index e372a74a4859b..4a95b903516f2 100644
--- a/src/wp-includes/blocks/index.php
+++ b/src/wp-includes/blocks/index.php
@@ -12,6 +12,98 @@
 require BLOCKS_PATH . 'widget-group.php';
 require BLOCKS_PATH . 'require-dynamic-blocks.php';
 
+/**
+ * Registers core block style handles.
+ *
+ * While {@see register_block_style_handle()} is typically used for that, the way it is
+ * implemented is inefficient for core block styles. Registering those style handles here
+ * avoids unnecessary logic and filesystem lookups in the other function.
+ *
+ * @since 6.3.0
+ */
+function register_core_block_style_handles() {
+	if ( ! wp_should_load_separate_core_block_assets() ) {
+		return;
+	}
+
+	static $core_blocks_meta;
+	if ( ! $core_blocks_meta ) {
+		$core_blocks_meta = require ABSPATH . WPINC . '/blocks/blocks-json.php';
+	}
+
+	$includes_url  = includes_url();
+	$includes_path = ABSPATH . WPINC . '/';
+	$suffix        = wp_scripts_get_suffix();
+	$wp_styles     = wp_styles();
+	$style_fields  = array(
+		'style'       => 'style',
+		'editorStyle' => 'editor',
+	);
+
+	/*
+	 * Ignore transient cache when the development mode is set to 'core'. Why? To avoid interfering with
+	 * the core developer's workflow.
+	 */
+	if ( ! wp_is_development_mode( 'core' ) ) {
+		$transient_name = 'wp_core_block_css_files';
+		$files          = get_transient( $transient_name );
+		if ( ! $files ) {
+			$files = glob( wp_normalize_path( __DIR__ . '/**/**.css' ) );
+			set_transient( $transient_name, $files );
+		}
+	} else {
+		$files = glob( wp_normalize_path( __DIR__ . '/**/**.css' ) );
+	}
+
+	$register_style = static function( $name, $filename, $style_handle ) use ( $includes_path, $includes_url, $suffix, $wp_styles, $files ) {
+		$style_path = "blocks/{$name}/{$filename}{$suffix}.css";
+		$path       = wp_normalize_path( $includes_path . $style_path );
+
+		if ( ! in_array( $path, $files, true ) ) {
+			$wp_styles->add(
+				$style_handle,
+				false
+			);
+			return;
+		}
+
+		$wp_styles->add( $style_handle, $includes_url . $style_path );
+		$wp_styles->add_data( $style_handle, 'path', $path );
+
+		$rtl_file = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $path );
+		if ( is_rtl() && in_array( $rtl_file, $files, true ) ) {
+			$wp_styles->add_data( $style_handle, 'rtl', 'replace' );
+			$wp_styles->add_data( $style_handle, 'suffix', $suffix );
+			$wp_styles->add_data( $style_handle, 'path', $rtl_file );
+		}
+	};
+
+	foreach ( $core_blocks_meta as $name => $schema ) {
+		/** This filter is documented in wp-includes/blocks.php */
+		$schema = apply_filters( 'block_type_metadata', $schema );
+
+		// Backfill these properties similar to `register_block_type_from_metadata()`.
+		if ( ! isset( $schema['style'] ) ) {
+			$schema['style'] = "wp-block-{$name}";
+		}
+		if ( ! isset( $schema['editorStyle'] ) ) {
+			$schema['editorStyle'] = "wp-block-{$name}-editor";
+		}
+
+		// Register block theme styles.
+		$register_style( $name, 'theme', "wp-block-{$name}-theme" );
+
+		foreach ( $style_fields as $style_field => $filename ) {
+			$style_handle = $schema[ $style_field ];
+			if ( is_array( $style_handle ) ) {
+				continue;
+			}
+			$register_style( $name, $filename, $style_handle );
+		}
+	}
+}
+add_action( 'init', 'register_core_block_style_handles', 9 );
+
 /**
  * Registers core block types using metadata files.
  * Dynamic core blocks are registered separately.
@@ -21,7 +113,7 @@
 function register_core_block_types_from_metadata() {
 	$block_folders = require BLOCKS_PATH . 'require-static-blocks.php';
 	foreach ( $block_folders as $block_folder ) {
-		register_block_type(
+		register_block_type_from_metadata(
 			BLOCKS_PATH . $block_folder
 		);
 	}
diff --git a/src/wp-includes/blocks/latest-comments/block.json b/src/wp-includes/blocks/latest-comments/block.json
index 4f8b0fbf54284..0b213e9b7903a 100644
--- a/src/wp-includes/blocks/latest-comments/block.json
+++ b/src/wp-includes/blocks/latest-comments/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/latest-comments",
 	"title": "Latest Comments",
 	"category": "widgets",
@@ -29,7 +29,24 @@
 	},
 	"supports": {
 		"align": true,
-		"html": false
+		"html": false,
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		}
 	},
 	"editorStyle": "wp-block-latest-comments-editor",
 	"style": "wp-block-latest-comments"
diff --git a/src/wp-includes/blocks/latest-posts.php b/src/wp-includes/blocks/latest-posts.php
index cbeafb6677a13..c7a37fe0fe31f 100644
--- a/src/wp-includes/blocks/latest-posts.php
+++ b/src/wp-includes/blocks/latest-posts.php
@@ -48,6 +48,14 @@ function render_block_core_latest_posts( $attributes ) {
 	$block_core_latest_posts_excerpt_length = $attributes['excerptLength'];
 	add_filter( 'excerpt_length', 'block_core_latest_posts_get_excerpt_length', 20 );
 
+	$filter_latest_posts_excerpt_more = static function( $more ) use ( $attributes ) {
+		$use_excerpt = 'excerpt' === $attributes['displayPostContentRadio'];
+		/* translators: %1$s is a URL to a post, excerpt truncation character, default … */
+		return $use_excerpt ? sprintf( __( ' … <a href="%1$s" rel="noopener noreferrer">Read more</a>' ), esc_url( get_permalink() ) ) : $more;
+	};
+
+	add_filter( 'excerpt_more', $filter_latest_posts_excerpt_more );
+
 	if ( isset( $attributes['categories'] ) ) {
 		$args['category__in'] = array_column( $attributes['categories'], 'id' );
 	}
@@ -55,7 +63,7 @@ function render_block_core_latest_posts( $attributes ) {
 		$args['author'] = $attributes['selectedAuthor'];
 	}
 
-	$query        = new WP_Query;
+	$query        = new WP_Query();
 	$recent_posts = $query->query( $args );
 
 	if ( isset( $attributes['displayFeaturedImage'] ) && $attributes['displayFeaturedImage'] ) {
@@ -173,25 +181,24 @@ function render_block_core_latest_posts( $attributes ) {
 
 	remove_filter( 'excerpt_length', 'block_core_latest_posts_get_excerpt_length', 20 );
 
-	$class = 'wp-block-latest-posts__list';
-
+	$classes = array( 'wp-block-latest-posts__list' );
 	if ( isset( $attributes['postLayout'] ) && 'grid' === $attributes['postLayout'] ) {
-		$class .= ' is-grid';
+		$classes[] = 'is-grid';
 	}
-
 	if ( isset( $attributes['columns'] ) && 'grid' === $attributes['postLayout'] ) {
-		$class .= ' columns-' . $attributes['columns'];
+		$classes[] = 'columns-' . $attributes['columns'];
 	}
-
 	if ( isset( $attributes['displayPostDate'] ) && $attributes['displayPostDate'] ) {
-		$class .= ' has-dates';
+		$classes[] = 'has-dates';
 	}
-
 	if ( isset( $attributes['displayAuthor'] ) && $attributes['displayAuthor'] ) {
-		$class .= ' has-author';
+		$classes[] = 'has-author';
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $class ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return sprintf(
 		'<ul %1$s>%2$s</ul>',
diff --git a/src/wp-includes/blocks/latest-posts/block.json b/src/wp-includes/blocks/latest-posts/block.json
index b423b09d900cb..f36164614dd50 100644
--- a/src/wp-includes/blocks/latest-posts/block.json
+++ b/src/wp-includes/blocks/latest-posts/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/latest-posts",
 	"title": "Latest Posts",
 	"category": "widgets",
@@ -85,6 +85,19 @@
 	"supports": {
 		"align": true,
 		"html": false,
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true,
+				"link": true
+			}
+		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/legacy-widget/block.json b/src/wp-includes/blocks/legacy-widget/block.json
index 30b60c6448835..6b0c1e2a916fd 100644
--- a/src/wp-includes/blocks/legacy-widget/block.json
+++ b/src/wp-includes/blocks/legacy-widget/block.json
@@ -1,5 +1,5 @@
 {
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/legacy-widget",
 	"title": "Legacy Widget",
 	"category": "widgets",
diff --git a/src/wp-includes/blocks/list-item/block.json b/src/wp-includes/blocks/list-item/block.json
index 674cf381aa99c..41221f1c31772 100644
--- a/src/wp-includes/blocks/list-item/block.json
+++ b/src/wp-includes/blocks/list-item/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/list-item",
 	"title": "List item",
 	"category": "text",
@@ -21,6 +21,19 @@
 	},
 	"supports": {
 		"className": false,
-		"__experimentalSelector": "li"
+		"__experimentalSelector": "li",
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		}
 	}
 }
diff --git a/src/wp-includes/blocks/list/block.json b/src/wp-includes/blocks/list/block.json
index 4e1089b088738..9c4c1ef4f2784 100644
--- a/src/wp-includes/blocks/list/block.json
+++ b/src/wp-includes/blocks/list/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/list",
 	"title": "List",
 	"category": "text",
@@ -61,7 +61,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"__unstablePasteTextInline": true,
 		"__experimentalSelector": "ol,ul",
diff --git a/src/wp-includes/blocks/loginout/block.json b/src/wp-includes/blocks/loginout/block.json
index 3db9d0040ce5f..3593961c09cfd 100644
--- a/src/wp-includes/blocks/loginout/block.json
+++ b/src/wp-includes/blocks/loginout/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/loginout",
 	"title": "Login/out",
 	"category": "theme",
@@ -20,7 +20,17 @@
 	"supports": {
 		"className": true,
 		"typography": {
-			"fontSize": false
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
 		}
 	}
 }
diff --git a/src/wp-includes/blocks/media-text/block.json b/src/wp-includes/blocks/media-text/block.json
index 1c9fc0b6820f1..8ffc653d68414 100644
--- a/src/wp-includes/blocks/media-text/block.json
+++ b/src/wp-includes/blocks/media-text/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/media-text",
 	"title": "Media & Text",
 	"category": "media",
@@ -10,7 +10,7 @@
 	"attributes": {
 		"align": {
 			"type": "string",
-			"default": "wide"
+			"default": "none"
 		},
 		"mediaAlt": {
 			"type": "string",
@@ -89,6 +89,9 @@
 		},
 		"focalPoint": {
 			"type": "object"
+		},
+		"allowedBlocks": {
+			"type": "array"
 		}
 	},
 	"supports": {
diff --git a/src/wp-includes/blocks/missing/block.json b/src/wp-includes/blocks/missing/block.json
index 9a44caa248509..0bc512bbbf709 100644
--- a/src/wp-includes/blocks/missing/block.json
+++ b/src/wp-includes/blocks/missing/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/missing",
 	"title": "Unsupported",
 	"category": "text",
diff --git a/src/wp-includes/blocks/more/block.json b/src/wp-includes/blocks/more/block.json
index 25f1df23771f3..bfd95652ea176 100644
--- a/src/wp-includes/blocks/more/block.json
+++ b/src/wp-includes/blocks/more/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/more",
 	"title": "More",
 	"category": "design",
diff --git a/src/wp-includes/blocks/navigation-link.php b/src/wp-includes/blocks/navigation-link.php
index f32437b41a3f8..5333ab6ea3dc9 100644
--- a/src/wp-includes/blocks/navigation-link.php
+++ b/src/wp-includes/blocks/navigation-link.php
@@ -9,18 +9,17 @@
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the navigation markup in the front-end.
  *
- * @param  array $context    Navigation block context.
- * @param  array $attributes Block attributes.
+ * @param  array $context     Navigation block context.
+ * @param  array $attributes  Block attributes.
+ * @param  bool  $is_sub_menu Whether the link is part of a sub-menu.
  * @return array Colors CSS classes and inline styles.
  */
-function block_core_navigation_link_build_css_colors( $context, $attributes ) {
+function block_core_navigation_link_build_css_colors( $context, $attributes, $is_sub_menu = false ) {
 	$colors = array(
 		'css_classes'   => array(),
 		'inline_styles' => '',
 	);
 
-	$is_sub_menu = isset( $attributes['isTopLevelLink'] ) ? ( ! $attributes['isTopLevelLink'] ) : false;
-
 	// Text color.
 	$named_text_color  = null;
 	$custom_text_color = null;
@@ -120,6 +119,33 @@ function block_core_navigation_link_render_submenu_icon() {
 	return '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
 }
 
+/**
+ * Decodes a url if it's encoded, returning the same url if not.
+ *
+ * @param string $url The url to decode.
+ *
+ * @return string $url Returns the decoded url.
+ */
+function block_core_navigation_link_maybe_urldecode( $url ) {
+	$is_url_encoded = false;
+	$query          = parse_url( $url, PHP_URL_QUERY );
+	$query_params   = wp_parse_args( $query );
+
+	foreach ( $query_params as $query_param ) {
+		if ( rawurldecode( $query_param ) !== $query_param ) {
+			$is_url_encoded = true;
+			break;
+		}
+	}
+
+	if ( $is_url_encoded ) {
+		return rawurldecode( $url );
+	}
+
+	return $url;
+}
+
+
 /**
  * Renders the `core/navigation-link` block.
  *
@@ -147,17 +173,16 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$colors          = block_core_navigation_link_build_css_colors( $block->context, $attributes );
 	$font_sizes      = block_core_navigation_link_build_css_font_sizes( $block->context );
 	$classes         = array_merge(
-		$colors['css_classes'],
 		$font_sizes['css_classes']
 	);
-	$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
+	$style_attribute = $font_sizes['inline_styles'];
 
 	$css_classes = trim( implode( ' ', $classes ) );
 	$has_submenu = count( $block->inner_blocks ) > 0;
-	$is_active   = ! empty( $attributes['id'] ) && ( get_queried_object_id() === (int) $attributes['id'] );
+	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
+	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
@@ -171,7 +196,7 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
 
 	// Start appending HTML attributes to anchor tag.
 	if ( isset( $attributes['url'] ) ) {
-		$html .= ' href="' . esc_url( $attributes['url'] ) . '"';
+		$html .= ' href="' . esc_url( block_core_navigation_link_maybe_urldecode( $attributes['url'] ) ) . '"';
 	}
 
 	if ( $is_active ) {
diff --git a/src/wp-includes/blocks/navigation-link/block.json b/src/wp-includes/blocks/navigation-link/block.json
index ae151a279e5ac..b2cbeaed63d3e 100644
--- a/src/wp-includes/blocks/navigation-link/block.json
+++ b/src/wp-includes/blocks/navigation-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/navigation-link",
 	"title": "Custom Link",
 	"category": "design",
diff --git a/src/wp-includes/blocks/navigation-submenu.php b/src/wp-includes/blocks/navigation-submenu.php
index 0ad7ba1d658f4..ee8b0e789dd24 100644
--- a/src/wp-includes/blocks/navigation-submenu.php
+++ b/src/wp-includes/blocks/navigation-submenu.php
@@ -9,72 +9,11 @@
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the navigation markup in the front-end.
  *
- * @param  array $context    Navigation block context.
- * @param  array $attributes Block attributes.
+ * @param  array $context     Navigation block context.
+ * @param  array $attributes  Block attributes.
+ * @param  bool  $is_sub_menu Whether the block is a sub-menu.
  * @return array Colors CSS classes and inline styles.
  */
-function block_core_navigation_submenu_build_css_colors( $context, $attributes ) {
-	$colors = array(
-		'css_classes'   => array(),
-		'inline_styles' => '',
-	);
-
-	$is_sub_menu = isset( $attributes['isTopLevelItem'] ) ? ( ! $attributes['isTopLevelItem'] ) : false;
-
-	// Text color.
-	$named_text_color  = null;
-	$custom_text_color = null;
-
-	if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) {
-		$custom_text_color = $context['customOverlayTextColor'];
-	} elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) {
-		$named_text_color = $context['overlayTextColor'];
-	} elseif ( array_key_exists( 'customTextColor', $context ) ) {
-		$custom_text_color = $context['customTextColor'];
-	} elseif ( array_key_exists( 'textColor', $context ) ) {
-		$named_text_color = $context['textColor'];
-	} elseif ( isset( $context['style']['color']['text'] ) ) {
-		$custom_text_color = $context['style']['color']['text'];
-	}
-
-	// If has text color.
-	if ( ! is_null( $named_text_color ) ) {
-		// Add the color class.
-		array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) );
-	} elseif ( ! is_null( $custom_text_color ) ) {
-		// Add the custom color inline style.
-		$colors['css_classes'][]  = 'has-text-color';
-		$colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color );
-	}
-
-	// Background color.
-	$named_background_color  = null;
-	$custom_background_color = null;
-
-	if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) {
-		$custom_background_color = $context['customOverlayBackgroundColor'];
-	} elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) {
-		$named_background_color = $context['overlayBackgroundColor'];
-	} elseif ( array_key_exists( 'customBackgroundColor', $context ) ) {
-		$custom_background_color = $context['customBackgroundColor'];
-	} elseif ( array_key_exists( 'backgroundColor', $context ) ) {
-		$named_background_color = $context['backgroundColor'];
-	} elseif ( isset( $context['style']['color']['background'] ) ) {
-		$custom_background_color = $context['style']['color']['background'];
-	}
-
-	// If has background color.
-	if ( ! is_null( $named_background_color ) ) {
-		// Add the background-color class.
-		array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) );
-	} elseif ( ! is_null( $custom_background_color ) ) {
-		// Add the custom background-color inline style.
-		$colors['css_classes'][]  = 'has-background';
-		$colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color );
-	}
-
-	return $colors;
-}
 
 /**
  * Build an array with CSS classes and inline styles defining the font sizes
@@ -130,7 +69,6 @@ function block_core_navigation_submenu_render_submenu_icon() {
  * @return string Returns the post content with the legacy widget added.
  */
 function render_block_core_navigation_submenu( $attributes, $content, $block ) {
-
 	$navigation_link_has_id = isset( $attributes['id'] ) && is_numeric( $attributes['id'] );
 	$is_post_type           = isset( $attributes['kind'] ) && 'post-type' === $attributes['kind'];
 	$is_post_type           = $is_post_type || isset( $attributes['type'] ) && ( 'post' === $attributes['type'] || 'page' === $attributes['type'] );
@@ -145,17 +83,13 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$colors          = block_core_navigation_submenu_build_css_colors( $block->context, $attributes );
 	$font_sizes      = block_core_navigation_submenu_build_css_font_sizes( $block->context );
-	$classes         = array_merge(
-		$colors['css_classes'],
-		$font_sizes['css_classes']
-	);
-	$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
+	$style_attribute = $font_sizes['inline_styles'];
 
-	$css_classes = trim( implode( ' ', $classes ) );
+	$css_classes = trim( implode( ' ', $font_sizes['css_classes'] ) );
 	$has_submenu = count( $block->inner_blocks ) > 0;
-	$is_active   = ! empty( $attributes['id'] ) && ( get_the_ID() === (int) $attributes['id'] );
+	$kind        = empty( $attributes['kind'] ) ? 'post_type' : str_replace( '-', '_', $attributes['kind'] );
+	$is_active   = ! empty( $attributes['id'] ) && get_queried_object_id() === (int) $attributes['id'] && ! empty( get_queried_object()->$kind );
 
 	$show_submenu_indicators = isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'];
 	$open_on_click           = isset( $block->context['openSubmenusOnClick'] ) && $block->context['openSubmenusOnClick'];
@@ -250,15 +184,60 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	}
 
 	if ( $has_submenu ) {
+		// Copy some attributes from the parent block to this one.
+		// Ideally this would happen in the client when the block is created.
+		if ( array_key_exists( 'overlayTextColor', $block->context ) ) {
+			$attributes['textColor'] = $block->context['overlayTextColor'];
+		}
+		if ( array_key_exists( 'overlayBackgroundColor', $block->context ) ) {
+			$attributes['backgroundColor'] = $block->context['overlayBackgroundColor'];
+		}
+		if ( array_key_exists( 'customOverlayTextColor', $block->context ) ) {
+			$attributes['style']['color']['text'] = $block->context['customOverlayTextColor'];
+		}
+		if ( array_key_exists( 'customOverlayBackgroundColor', $block->context ) ) {
+			$attributes['style']['color']['background'] = $block->context['customOverlayBackgroundColor'];
+		}
+
+		// This allows us to be able to get a response from wp_apply_colors_support.
+		$block->block_type->supports['color'] = true;
+		$colors_supports                      = wp_apply_colors_support( $block->block_type, $attributes );
+		$css_classes                          = 'wp-block-navigation__submenu-container';
+		if ( array_key_exists( 'class', $colors_supports ) ) {
+			$css_classes .= ' ' . $colors_supports['class'];
+		}
+
+		$style_attribute = '';
+		if ( array_key_exists( 'style', $colors_supports ) ) {
+			$style_attribute = $colors_supports['style'];
+		}
+
 		$inner_blocks_html = '';
 		foreach ( $block->inner_blocks as $inner_block ) {
 			$inner_blocks_html .= $inner_block->render();
 		}
 
+		if ( strpos( $inner_blocks_html, 'current-menu-item' ) ) {
+			$tag_processor = new WP_HTML_Tag_Processor( $html );
+			while ( $tag_processor->next_tag( array( 'class_name' => 'wp-block-navigation-item__content' ) ) ) {
+				$tag_processor->add_class( 'current-menu-ancestor' );
+			}
+			$html = $tag_processor->get_updated_html();
+		}
+
+		$wrapper_attributes = get_block_wrapper_attributes(
+			array(
+				'class' => $css_classes,
+				'style' => $style_attribute,
+			)
+		);
+
 		$html .= sprintf(
-			'<ul class="wp-block-navigation__submenu-container">%s</ul>',
+			'<ul %s>%s</ul>',
+			$wrapper_attributes,
 			$inner_blocks_html
 		);
+
 	}
 
 	$html .= '</li>';
diff --git a/src/wp-includes/blocks/navigation-submenu/block.json b/src/wp-includes/blocks/navigation-submenu/block.json
index f311a9f36e41a..91364109ea740 100644
--- a/src/wp-includes/blocks/navigation-submenu/block.json
+++ b/src/wp-includes/blocks/navigation-submenu/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/navigation-submenu",
 	"title": "Submenu",
 	"category": "design",
diff --git a/src/wp-includes/blocks/navigation.php b/src/wp-includes/blocks/navigation.php
index c3f6317eb2955..6de09f8dd36aa 100644
--- a/src/wp-includes/blocks/navigation.php
+++ b/src/wp-includes/blocks/navigation.php
@@ -67,58 +67,86 @@ function block_core_navigation_sort_menu_items_by_parent_id( $menu_items ) {
 	}
 
 	/**
-	 * Turns menu item data into a nested array of parsed blocks
+	 * Add Interactivity API directives to the navigation-submenu and page-list blocks markup using the Tag Processor
+	 * The final HTML of the navigation-submenu and the page-list blocks will look similar to this:
 	 *
-	 * @param array $menu_items               An array of menu items that represent
-	 *                                        an individual level of a menu.
-	 * @param array $menu_items_by_parent_id  An array keyed by the id of the
-	 *                                        parent menu where each element is an
-	 *                                        array of menu items that belong to
-	 *                                        that parent.
-	 * @return array An array of parsed block data.
+	 * <li
+	 *   class="has-child"
+	 *   data-wp-context='{ "core": { "navigation": { "isMenuOpen": false, "overlay": false } } }'
+	 *   data-wp-effect="effects.core.navigation.initMenu"
+	 *   data-wp-on.keydown="actions.core.navigation.handleMenuKeydown"
+	 *   data-wp-on.focusout="actions.core.navigation.handleMenuFocusout"
+	 * >
+	 *   <button
+	 *     class="wp-block-navigation-submenu__toggle"
+	 *     data-wp-on.click="actions.core.navigation.openMenu"
+	 *     data-wp-bind.aria-expanded="context.core.navigation.isMenuOpen"
+	 *   >
+	 *   </button>
+	 *   <span>Title</span>
+	 *   <ul class="wp-block-navigation__submenu-container">
+	 *     SUBMENU ITEMS
+	 *   </ul>
+	 * </li>
+	 *
+	 * @param string $w Markup of the navigation block.
+	 * @param array  $block_attributes Block attributes.
+	 *
+	 * @return string Submenu markup with the directives injected.
 	 */
-	function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
-		if ( empty( $menu_items ) ) {
-			return array();
-		}
-
-		$blocks = array();
-
-		foreach ( $menu_items as $menu_item ) {
-			$class_name       = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
-			$id               = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
-			$opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
-			$rel              = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
-			$kind             = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
-
-			$block = array(
-				'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
-				'attrs'     => array(
-					'className'     => $class_name,
-					'description'   => $menu_item->description,
-					'id'            => $id,
-					'kind'          => $kind,
-					'label'         => $menu_item->title,
-					'opensInNewTab' => $opens_in_new_tab,
-					'rel'           => $rel,
-					'title'         => $menu_item->attr_title,
-					'type'          => $menu_item->object,
-					'url'           => $menu_item->url,
-				),
-			);
-
-			$block['innerBlocks']  = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
-				? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
-				: array();
-			$block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
+	function block_core_navigation_add_directives_to_submenu( $w, $block_attributes ) {
+		while ( $w->next_tag(
+			array(
+				'tag_name'   => 'LI',
+				'class_name' => 'has-child',
+			)
+		) ) {
+			// Add directives to the parent `<li>`.
+			$w->set_attribute( 'data-wp-interactive', true );
+			$w->set_attribute( 'data-wp-context', '{ "core": { "navigation": { "isMenuOpen": { "click": false, "hover": false }, "overlay": false } } }' );
+			$w->set_attribute( 'data-wp-effect', 'effects.core.navigation.initMenu' );
+			$w->set_attribute( 'data-wp-on--focusout', 'actions.core.navigation.handleMenuFocusout' );
+			$w->set_attribute( 'data-wp-on--keydown', 'actions.core.navigation.handleMenuKeydown' );
+			if ( ! isset( $block_attributes['openSubmenusOnClick'] ) || false === $block_attributes['openSubmenusOnClick'] ) {
+				$w->set_attribute( 'data-wp-on--mouseenter', 'actions.core.navigation.openMenuOnHover' );
+				$w->set_attribute( 'data-wp-on--mouseleave', 'actions.core.navigation.closeMenuOnHover' );
+			}
 
-			$blocks[] = $block;
+			// Add directives to the toggle submenu button.
+			if ( $w->next_tag(
+				array(
+					'tag_name'   => 'BUTTON',
+					'class_name' => 'wp-block-navigation-submenu__toggle',
+				)
+			) ) {
+				$w->set_attribute( 'data-wp-on--click', 'actions.core.navigation.toggleMenuOnClick' );
+				$w->set_attribute( 'data-wp-bind--aria-expanded', 'selectors.core.navigation.isMenuOpen' );
+			};
+
+			// Iterate through subitems if exist.
+			block_core_navigation_add_directives_to_submenu( $w, $block_attributes );
 		}
+		return $w->get_updated_html();
+	};
 
-		return $blocks;
+	/**
+	 * Replaces view script for the Navigation block with version using Interactivity API.
+	 *
+	 * @param array $metadata Block metadata as read in via block.json.
+	 *
+	 * @return array Filtered block type metadata.
+	 */
+	function gutenberg_block_core_navigation_update_interactive_view_script( $metadata ) {
+		if ( 'core/navigation' === $metadata['name'] ) {
+			$metadata['viewScript'] = array( 'file:./interactivity.min.js' );
+		}
+		return $metadata;
 	}
+	add_filter( 'block_type_metadata', 'gutenberg_block_core_navigation_update_interactive_view_script', 10, 1 );
 }
 
+
+
 /**
  * Build an array with CSS classes and inline styles defining the colors
  * which will be applied to the navigation markup in the front-end.
@@ -249,29 +277,8 @@ function block_core_navigation_render_submenu_icon() {
 }
 
 
-/**
- * Finds the most recently published `wp_navigation` Post.
- *
- * @return WP_Post|null the first non-empty Navigation or null.
- */
-function block_core_navigation_get_most_recently_published_navigation() {
-	// We default to the most recently created menu.
-	$parsed_args = array(
-		'post_type'      => 'wp_navigation',
-		'no_found_rows'  => true,
-		'order'          => 'DESC',
-		'orderby'        => 'date',
-		'post_status'    => 'publish',
-		'posts_per_page' => 1, // get only the most recent.
-	);
 
-	$navigation_post = new WP_Query( $parsed_args );
-	if ( count( $navigation_post->posts ) > 0 ) {
-		return $navigation_post->posts[0];
-	}
 
-	return null;
-}
 
 /**
  * Filter out empty "null" blocks from the block list.
@@ -285,7 +292,7 @@ function block_core_navigation_get_most_recently_published_navigation() {
 function block_core_navigation_filter_out_empty_blocks( $parsed_blocks ) {
 	$filtered = array_filter(
 		$parsed_blocks,
-		function( $block ) {
+		static function( $block ) {
 			return isset( $block['blockName'] );
 		}
 	);
@@ -294,6 +301,25 @@ function( $block ) {
 	return array_values( $filtered );
 }
 
+/**
+ * Returns true if the navigation block contains a nested navigation block.
+ *
+ * @param WP_Block_List $inner_blocks Inner block instance to be normalized.
+ * @return bool true if the navigation block contains a nested navigation block.
+ */
+function block_core_navigation_block_contains_core_navigation( $inner_blocks ) {
+	foreach ( $inner_blocks as $block ) {
+		if ( 'core/navigation' === $block->name ) {
+			return true;
+		}
+		if ( $block->inner_blocks && block_core_navigation_block_contains_core_navigation( $block->inner_blocks ) ) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * Retrieves the appropriate fallback to be used on the front of the
  * site when there is no menu assigned to the Nav block.
@@ -315,13 +341,16 @@ function block_core_navigation_get_fallback_blocks() {
 	// If `core/page-list` is not registered then return empty blocks.
 	$fallback_blocks = $registry->is_registered( 'core/page-list' ) ? $page_list_fallback : array();
 
-	// Default to a list of Pages.
-
-	$navigation_post = block_core_navigation_get_most_recently_published_navigation();
+	if ( class_exists( 'WP_Navigation_Fallback' ) ) {
+		$navigation_post = WP_Navigation_Fallback::get_fallback();
+	} else {
+		$navigation_post = Gutenberg_Navigation_Fallback::get_fallback();
+	}
 
-	// Prefer using the first non-empty Navigation as fallback if available.
+	// Use the first non-empty Navigation as fallback if available.
 	if ( $navigation_post ) {
-		$maybe_fallback = block_core_navigation_filter_out_empty_blocks( parse_blocks( $navigation_post->post_content ) );
+		$parsed_blocks  = parse_blocks( $navigation_post->post_content );
+		$maybe_fallback = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
 
 		// Normalizing blocks may result in an empty array of blocks if they were all `null` blocks.
 		// In this case default to the (Page List) fallback.
@@ -387,7 +416,6 @@ function block_core_navigation_from_block_get_post_ids( $block ) {
  * @return string Returns the post content with the legacy widget added.
  */
 function render_block_core_navigation( $attributes, $content, $block ) {
-
 	static $seen_menu_names = array();
 
 	// Flag used to indicate whether the rendered output is considered to be
@@ -418,15 +446,6 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	 */
 	$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
 	$is_responsive_menu           = isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
-	$should_load_view_script      = ! wp_script_is( 'wp-block-navigation-view' ) && ( $is_responsive_menu || $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] );
-	if ( $should_load_view_script ) {
-		wp_enqueue_script( 'wp-block-navigation-view' );
-	}
-
-	$should_load_modal_view_script = isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'];
-	if ( $should_load_modal_view_script ) {
-		wp_enqueue_script( 'wp-block-navigation-view-modal' );
-	}
 
 	$inner_blocks = $block->inner_blocks;
 
@@ -501,6 +520,10 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		$inner_blocks = new WP_Block_List( $fallback_blocks, $attributes );
 	}
 
+	if ( block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
+		return '';
+	}
+
 	/**
 	 * Filter navigation block $inner_blocks.
 	 * Allows modification of a navigation block menu items.
@@ -520,7 +543,10 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 
 	// Restore legacy classnames for submenu positioning.
 	$layout_class = '';
-	if ( isset( $attributes['layout']['justifyContent'] ) ) {
+	if (
+		isset( $attributes['layout']['justifyContent'] ) &&
+		isset( $layout_justification[ $attributes['layout']['justifyContent'] ] )
+	) {
 		$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
 	}
 	if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
@@ -551,22 +577,80 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		_prime_post_caches( $post_ids, false, false );
 	}
 
+	$list_item_nav_blocks = array(
+		'core/navigation-link',
+		'core/home-link',
+		'core/site-title',
+		'core/site-logo',
+		'core/navigation-submenu',
+	);
+
+	$needs_list_item_wrapper = array(
+		'core/site-title',
+		'core/site-logo',
+	);
+
+	$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
+	$style        = $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'];
+	$class        = implode( ' ', $classes );
+
+	// If the menu name has been used previously then append an ID
+	// to the name to ensure uniqueness across a given post.
+	if ( isset( $seen_menu_names[ $nav_menu_name ] ) && $seen_menu_names[ $nav_menu_name ] > 1 ) {
+		$count         = $seen_menu_names[ $nav_menu_name ];
+		$nav_menu_name = $nav_menu_name . ' ' . ( $count );
+	}
+
+	$wrapper_attributes = get_block_wrapper_attributes(
+		array(
+			'class'      => $class,
+			'style'      => $style,
+			'aria-label' => $nav_menu_name,
+		)
+	);
+
+	$container_attributes = get_block_wrapper_attributes(
+		array(
+			'class' => 'wp-block-navigation__container ' . $class,
+			'style' => $style,
+		)
+	);
+
 	$inner_blocks_html = '';
 	$is_list_open      = false;
+	$has_submenus      = false;
 	foreach ( $inner_blocks as $inner_block ) {
-		if ( ( 'core/navigation-link' === $inner_block->name || 'core/home-link' === $inner_block->name || 'core/site-title' === $inner_block->name || 'core/site-logo' === $inner_block->name || 'core/navigation-submenu' === $inner_block->name ) && ! $is_list_open ) {
+		$is_list_item = in_array( $inner_block->name, $list_item_nav_blocks, true );
+
+		if ( $is_list_item && ! $is_list_open ) {
 			$is_list_open       = true;
-			$inner_blocks_html .= '<ul class="wp-block-navigation__container">';
+			$inner_blocks_html .= sprintf(
+				'<ul %1$s>',
+				$container_attributes
+			);
 		}
-		if ( 'core/navigation-link' !== $inner_block->name && 'core/home-link' !== $inner_block->name && 'core/site-title' !== $inner_block->name && 'core/site-logo' !== $inner_block->name && 'core/navigation-submenu' !== $inner_block->name && $is_list_open ) {
+
+		if ( ! $is_list_item && $is_list_open ) {
 			$is_list_open       = false;
 			$inner_blocks_html .= '</ul>';
 		}
+
 		$inner_block_content = $inner_block->render();
-		if ( 'core/site-title' === $inner_block->name || ( 'core/site-logo' === $inner_block->name && $inner_block_content ) ) {
-			$inner_blocks_html .= '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
-		} else {
-			$inner_blocks_html .= $inner_block_content;
+		$p                   = new WP_HTML_Tag_Processor( $inner_block_content );
+		if ( $p->next_tag(
+			array(
+				'name'       => 'LI',
+				'class_name' => 'has-child',
+			)
+		) ) {
+			$has_submenus = true;
+		}
+		if ( ! empty( $inner_block_content ) ) {
+			if ( in_array( $inner_block->name, $needs_list_item_wrapper, true ) ) {
+				$inner_blocks_html .= '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
+			} else {
+				$inner_blocks_html .= $inner_block_content;
+			}
 		}
 	}
 
@@ -574,22 +658,27 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		$inner_blocks_html .= '</ul>';
 	}
 
-	$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
+	// If the script already exists, there is no point in removing it from viewScript.
+	$should_load_view_script = ( $is_responsive_menu || ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) );
+	$view_js_file            = 'wp-block-navigation-view';
+	if ( ! wp_script_is( $view_js_file ) ) {
+		$script_handles = $block->block_type->view_script_handles;
 
-	// If the menu name has been used previously then append an ID
-	// to the name to ensure uniqueness across a given post.
-	if ( isset( $seen_menu_names[ $nav_menu_name ] ) && $seen_menu_names[ $nav_menu_name ] > 1 ) {
-		$count         = $seen_menu_names[ $nav_menu_name ];
-		$nav_menu_name = $nav_menu_name . ' ' . ( $count );
+		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
+		if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file, 'wp-block-navigation-view-2' ) );
+		}
+		// If the script is needed, but it was previously removed, add it again.
+		if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file, 'wp-block-navigation-view-2' ) );
+		}
 	}
 
-	$wrapper_attributes = get_block_wrapper_attributes(
-		array(
-			'class'      => implode( ' ', $classes ),
-			'style'      => $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'],
-			'aria-label' => $nav_menu_name,
-		)
-	);
+	// Add directives to the submenu if needed.
+	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && $has_submenus && $should_load_view_script ) {
+		$w                 = new WP_HTML_Tag_Processor( $inner_blocks_html );
+		$inner_blocks_html = block_core_navigation_add_directives_to_submenu( $w, $attributes );
+	}
 
 	$modal_unique_id = wp_unique_id( 'modal-' );
 
@@ -628,12 +717,45 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 	$toggle_aria_label_open      = $should_display_icon_label ? 'aria-label="' . __( 'Open menu' ) . '"' : ''; // Open button label.
 	$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
 
+	// Add Interactivity API directives to the markup if needed.
+	$nav_element_directives          = '';
+	$open_button_directives          = '';
+	$responsive_container_directives = '';
+	$responsive_dialog_directives    = '';
+	$close_button_directives         = '';
+	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && $should_load_view_script ) {
+		$nav_element_directives          = '
+			data-wp-interactive
+			data-wp-context=\'{ "core": { "navigation": { "isMenuOpen": { "click": false, "hover": false }, "overlay": true, "roleAttribute": "" } } }\'
+		';
+		$open_button_directives          = '
+			data-wp-on--click="actions.core.navigation.openMenuOnClick"
+			data-wp-on--keydown="actions.core.navigation.handleMenuKeydown"
+		';
+		$responsive_container_directives = '
+			data-wp-class--has-modal-open="selectors.core.navigation.isMenuOpen"
+			data-wp-class--is-menu-open="selectors.core.navigation.isMenuOpen"
+			data-wp-effect="effects.core.navigation.initMenu"
+			data-wp-on--keydown="actions.core.navigation.handleMenuKeydown"
+			data-wp-on--focusout="actions.core.navigation.handleMenuFocusout"
+			tabindex="-1"
+		';
+		$responsive_dialog_directives    = '
+			data-wp-bind--aria-modal="selectors.core.navigation.isMenuOpen"
+			data-wp-bind--role="selectors.core.navigation.roleAttribute"
+			data-wp-effect="effects.core.navigation.focusFirstElement"
+		';
+		$close_button_directives         = '
+			data-wp-on--click="actions.core.navigation.closeMenuOnClick"
+		';
+	}
+
 	$responsive_container_markup = sprintf(
-		'<button aria-haspopup="true" %3$s class="%6$s" data-micromodal-trigger="%1$s">%9$s</button>
-			<div class="%5$s" style="%7$s" id="%1$s">
+		'<button aria-haspopup="true" %3$s class="%6$s" data-micromodal-trigger="%1$s" %11$s>%9$s</button>
+			<div class="%5$s" style="%7$s" id="%1$s" %12$s>
 				<div class="wp-block-navigation__responsive-close" tabindex="-1" data-micromodal-close>
-					<div class="wp-block-navigation__responsive-dialog" aria-label="%8$s">
-							<button %4$s data-micromodal-close class="wp-block-navigation__responsive-container-close">%10$s</button>
+					<div class="wp-block-navigation__responsive-dialog" aria-label="%8$s" %13$s>
+							<button %4$s data-micromodal-close class="wp-block-navigation__responsive-container-close" %14$s>%10$s</button>
 						<div class="wp-block-navigation__responsive-container-content" id="%1$s-content">
 							%2$s
 						</div>
@@ -649,13 +771,18 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
 		__( 'Menu' ),
 		$toggle_button_content,
-		$toggle_close_button_content
+		$toggle_close_button_content,
+		$open_button_directives,
+		$responsive_container_directives,
+		$responsive_dialog_directives,
+		$close_button_directives
 	);
 
 	return sprintf(
-		'<nav %1$s>%2$s</nav>',
+		'<nav %1$s %3$s>%2$s</nav>',
 		$wrapper_attributes,
-		$responsive_container_markup
+		$responsive_container_markup,
+		$nav_element_directives
 	);
 }
 
@@ -709,3 +836,222 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
 }
 
 add_filter( 'render_block_data', 'block_core_navigation_typographic_presets_backcompatibility' );
+
+/**
+ * Turns menu item data into a nested array of parsed blocks
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::parse_blocks_from_menu_items() instead.
+ *
+ * @param array $menu_items               An array of menu items that represent
+ *                                        an individual level of a menu.
+ * @param array $menu_items_by_parent_id  An array keyed by the id of the
+ *                                        parent menu where each element is an
+ *                                        array of menu items that belong to
+ *                                        that parent.
+ * @return array An array of parsed block data.
+ */
+function block_core_navigation_parse_blocks_from_menu_items( $menu_items, $menu_items_by_parent_id ) {
+
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::parse_blocks_from_menu_items' );
+
+	if ( empty( $menu_items ) ) {
+		return array();
+	}
+
+	$blocks = array();
+
+	foreach ( $menu_items as $menu_item ) {
+		$class_name       = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
+		$id               = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
+		$opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
+		$rel              = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
+		$kind             = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
+
+		$block = array(
+			'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
+			'attrs'     => array(
+				'className'     => $class_name,
+				'description'   => $menu_item->description,
+				'id'            => $id,
+				'kind'          => $kind,
+				'label'         => $menu_item->title,
+				'opensInNewTab' => $opens_in_new_tab,
+				'rel'           => $rel,
+				'title'         => $menu_item->attr_title,
+				'type'          => $menu_item->object,
+				'url'           => $menu_item->url,
+			),
+		);
+
+		$block['innerBlocks']  = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
+			? block_core_navigation_parse_blocks_from_menu_items( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
+			: array();
+		$block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
+
+		$blocks[] = $block;
+	}
+
+	return $blocks;
+}
+
+/**
+ * Get the classic navigation menu to use as a fallback.
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback() instead.
+ *
+ * @return object WP_Term The classic navigation.
+ */
+function block_core_navigation_get_classic_menu_fallback() {
+
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_classic_menu_fallback' );
+
+	$classic_nav_menus = wp_get_nav_menus();
+
+	// If menus exist.
+	if ( $classic_nav_menus && ! is_wp_error( $classic_nav_menus ) ) {
+		// Handles simple use case where user has a classic menu and switches to a block theme.
+
+		// Returns the menu assigned to location `primary`.
+		$locations = get_nav_menu_locations();
+		if ( isset( $locations['primary'] ) ) {
+			$primary_menu = wp_get_nav_menu_object( $locations['primary'] );
+			if ( $primary_menu ) {
+				return $primary_menu;
+			}
+		}
+
+		// Returns a menu if `primary` is its slug.
+		foreach ( $classic_nav_menus as $classic_nav_menu ) {
+			if ( 'primary' === $classic_nav_menu->slug ) {
+				return $classic_nav_menu;
+			}
+		}
+
+		// Otherwise return the most recently created classic menu.
+		usort(
+			$classic_nav_menus,
+			static function( $a, $b ) {
+				return $b->term_id - $a->term_id;
+			}
+		);
+		return $classic_nav_menus[0];
+	}
+}
+
+/**
+ * Converts a classic navigation to blocks.
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_classic_menu_fallback_blocks() instead.
+ *
+ * @param  object $classic_nav_menu WP_Term The classic navigation object to convert.
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_menu ) {
+
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_classic_menu_fallback_blocks' );
+
+	// BEGIN: Code that already exists in wp_nav_menu().
+	$menu_items = wp_get_nav_menu_items( $classic_nav_menu->term_id, array( 'update_post_term_cache' => false ) );
+
+	// Set up the $menu_item variables.
+	_wp_menu_item_classes_by_context( $menu_items );
+
+	$sorted_menu_items = array();
+	foreach ( (array) $menu_items as $menu_item ) {
+		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
+	}
+
+	unset( $menu_items, $menu_item );
+
+	// END: Code that already exists in wp_nav_menu().
+
+	$menu_items_by_parent_id = array();
+	foreach ( $sorted_menu_items as $menu_item ) {
+		$menu_items_by_parent_id[ $menu_item->menu_item_parent ][] = $menu_item;
+	}
+
+	$inner_blocks = block_core_navigation_parse_blocks_from_menu_items(
+		isset( $menu_items_by_parent_id[0] )
+			? $menu_items_by_parent_id[0]
+			: array(),
+		$menu_items_by_parent_id
+	);
+
+	return serialize_blocks( $inner_blocks );
+}
+
+/**
+ * If there's a classic menu then use it as a fallback.
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::create_classic_menu_fallback() instead.
+ *
+ * @return array the normalized parsed blocks.
+ */
+function block_core_navigation_maybe_use_classic_menu_fallback() {
+
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::create_classic_menu_fallback' );
+
+	// See if we have a classic menu.
+	$classic_nav_menu = block_core_navigation_get_classic_menu_fallback();
+
+	if ( ! $classic_nav_menu ) {
+		return;
+	}
+
+	// If we have a classic menu then convert it to blocks.
+	$classic_nav_menu_blocks = block_core_navigation_get_classic_menu_fallback_blocks( $classic_nav_menu );
+
+	if ( empty( $classic_nav_menu_blocks ) ) {
+		return;
+	}
+
+	// Create a new navigation menu from the classic menu.
+	$wp_insert_post_result = wp_insert_post(
+		array(
+			'post_content' => $classic_nav_menu_blocks,
+			'post_title'   => $classic_nav_menu->name,
+			'post_name'    => $classic_nav_menu->slug,
+			'post_status'  => 'publish',
+			'post_type'    => 'wp_navigation',
+		),
+		true // So that we can check whether the result is an error.
+	);
+
+	if ( is_wp_error( $wp_insert_post_result ) ) {
+		return;
+	}
+
+	// Fetch the most recently published navigation which will be the classic one created above.
+	return block_core_navigation_get_most_recently_published_navigation();
+}
+
+/**
+ * Finds the most recently published `wp_navigation` Post.
+ *
+ * @deprecated 6.3.0 Use WP_Navigation_Fallback::get_most_recently_published_navigation() instead.
+ *
+ * @return WP_Post|null the first non-empty Navigation or null.
+ */
+function block_core_navigation_get_most_recently_published_navigation() {
+
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Navigation_Fallback::get_most_recently_published_navigation' );
+
+	// Default to the most recently created menu.
+	$parsed_args = array(
+		'post_type'              => 'wp_navigation',
+		'no_found_rows'          => true,
+		'update_post_meta_cache' => false,
+		'update_post_term_cache' => false,
+		'order'                  => 'DESC',
+		'orderby'                => 'date',
+		'post_status'            => 'publish',
+		'posts_per_page'         => 1, // get only the most recent.
+	);
+
+	$navigation_post = new WP_Query( $parsed_args );
+	if ( count( $navigation_post->posts ) > 0 ) {
+		return $navigation_post->posts[0];
+	}
+
+	return null;
+}
diff --git a/src/wp-includes/blocks/navigation/block.json b/src/wp-includes/blocks/navigation/block.json
index 5e856a30ceaba..e45d053536778 100644
--- a/src/wp-includes/blocks/navigation/block.json
+++ b/src/wp-includes/blocks/navigation/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/navigation",
 	"title": "Navigation",
 	"category": "theme",
@@ -67,6 +67,10 @@
 		"maxNestingLevel": {
 			"type": "number",
 			"default": 5
+		},
+		"templateLock": {
+			"type": [ "string", "boolean" ],
+			"enum": [ "all", "insert", "contentOnly", false ]
 		}
 	},
 	"providesContext": {
@@ -83,7 +87,6 @@
 		"showSubmenuIcon": "showSubmenuIcon",
 		"openSubmenusOnClick": "openSubmenusOnClick",
 		"style": "style",
-		"orientation": "orientation",
 		"maxNestingLevel": "maxNestingLevel"
 	},
 	"supports": {
@@ -111,10 +114,11 @@
 				"blockGap": true
 			}
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"allowVerticalAlignment": false,
+			"allowSizingOnChildren": true,
 			"default": {
 				"type": "flex"
 			}
diff --git a/src/wp-includes/blocks/navigation/view-modal.asset.php b/src/wp-includes/blocks/navigation/view-modal.asset.php
index a4d19fb3ca75c..781621aa549b1 100644
--- a/src/wp-includes/blocks/navigation/view-modal.asset.php
+++ b/src/wp-includes/blocks/navigation/view-modal.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '6d574d0390bc333487cb');
+<?php return array('dependencies' => array(), 'version' => '1be33df2c2460f78d1bd');
diff --git a/src/wp-includes/blocks/navigation/view-modal.min.asset.php b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
index 97565b80d692d..7a4dfef79d147 100644
--- a/src/wp-includes/blocks/navigation/view-modal.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view-modal.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '45f05135277abf0b0408');
+<?php return array('dependencies' => array(), 'version' => '252a2757b4db083871a8');
diff --git a/src/wp-includes/blocks/navigation/view.asset.php b/src/wp-includes/blocks/navigation/view.asset.php
index 47c4cec85f97f..28bd3b1a75caa 100644
--- a/src/wp-includes/blocks/navigation/view.asset.php
+++ b/src/wp-includes/blocks/navigation/view.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '4ab20ef60d94f9632256');
+<?php return array('dependencies' => array(), 'version' => '3df3afc90dd8cabb979b');
diff --git a/src/wp-includes/blocks/navigation/view.min.asset.php b/src/wp-includes/blocks/navigation/view.min.asset.php
index a5cea71cb5991..ddf8890326926 100644
--- a/src/wp-includes/blocks/navigation/view.min.asset.php
+++ b/src/wp-includes/blocks/navigation/view.min.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'c24330f635f5cb9d5e0e');
+<?php return array('dependencies' => array(), 'version' => '5687b52bb8c84fb4ae68');
diff --git a/src/wp-includes/blocks/nextpage/block.json b/src/wp-includes/blocks/nextpage/block.json
index 6a133264d6747..ab88d4a7be4f0 100644
--- a/src/wp-includes/blocks/nextpage/block.json
+++ b/src/wp-includes/blocks/nextpage/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/nextpage",
 	"title": "Page Break",
 	"category": "design",
diff --git a/src/wp-includes/blocks/page-list-item.php b/src/wp-includes/blocks/page-list-item.php
new file mode 100644
index 0000000000000..2955c795aec2b
--- /dev/null
+++ b/src/wp-includes/blocks/page-list-item.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Server-side rendering of the `core/page-list-item` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Registers the `core/page-list-item` block on server.
+ */
+function register_block_core_page_list_item() {
+	register_block_type_from_metadata( __DIR__ . '/page-list-item' );
+}
+add_action( 'init', 'register_block_core_page_list_item' );
diff --git a/src/wp-includes/blocks/page-list-item/block.json b/src/wp-includes/blocks/page-list-item/block.json
new file mode 100644
index 0000000000000..abd86924949ab
--- /dev/null
+++ b/src/wp-includes/blocks/page-list-item/block.json
@@ -0,0 +1,52 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "core/page-list-item",
+	"title": "Page List Item",
+	"category": "widgets",
+	"parent": [ "core/page-list" ],
+	"description": "Displays a page inside a list of all pages.",
+	"keywords": [ "page", "menu", "navigation" ],
+	"textdomain": "default",
+	"attributes": {
+		"id": {
+			"type": "number"
+		},
+		"label": {
+			"type": "string"
+		},
+		"title": {
+			"type": "string"
+		},
+		"link": {
+			"type": "string"
+		},
+		"hasChildren": {
+			"type": "boolean"
+		}
+	},
+	"usesContext": [
+		"textColor",
+		"customTextColor",
+		"backgroundColor",
+		"customBackgroundColor",
+		"overlayTextColor",
+		"customOverlayTextColor",
+		"overlayBackgroundColor",
+		"customOverlayBackgroundColor",
+		"fontSize",
+		"customFontSize",
+		"showSubmenuIcon",
+		"style",
+		"openSubmenusOnClick"
+	],
+	"supports": {
+		"reusable": false,
+		"html": false,
+		"lock": false,
+		"inserter": false,
+		"__experimentalToolbar": false
+	},
+	"editorStyle": "wp-block-page-list-editor",
+	"style": "wp-block-page-list"
+}
diff --git a/src/wp-includes/blocks/page-list.php b/src/wp-includes/blocks/page-list.php
index 5ef169fe13a87..b9ef8bf745a73 100644
--- a/src/wp-includes/blocks/page-list.php
+++ b/src/wp-includes/blocks/page-list.php
@@ -139,17 +139,19 @@ function block_core_page_list_build_css_font_sizes( $context ) {
  * @param boolean $show_submenu_icons Whether to show submenu indicator icons.
  * @param boolean $is_navigation_child If block is a child of Navigation block.
  * @param array   $nested_pages The array of nested pages.
+ * @param boolean $is_nested Whether the submenu is nested or not.
  * @param array   $active_page_ancestor_ids An array of ancestor ids for active page.
  * @param array   $colors Color information for overlay styles.
  * @param integer $depth The nesting depth.
  *
  * @return string List markup.
  */
-function block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $active_page_ancestor_ids = array(), $colors = array(), $depth = 0 ) {
+function block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $is_nested, $active_page_ancestor_ids = array(), $colors = array(), $depth = 0 ) {
 	if ( empty( $nested_pages ) ) {
 		return;
 	}
-	$markup = '';
+	$front_page_id = (int) get_option( 'page_on_front' );
+	$markup        = '';
 	foreach ( (array) $nested_pages as $page ) {
 		$css_class       = $page['is_active'] ? ' current-menu-item' : '';
 		$aria_current    = $page['is_active'] ? ' aria-current="page"' : '';
@@ -173,14 +175,13 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 		$navigation_child_content_class = $is_navigation_child ? ' wp-block-navigation-item__content' : '';
 
 		// If this is the first level of submenus, include the overlay colors.
-		if ( 1 === $depth && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) {
+		if ( ( ( 0 < $depth && ! $is_nested ) || $is_nested ) && isset( $colors['overlay_css_classes'], $colors['overlay_inline_styles'] ) ) {
 			$css_class .= ' ' . trim( implode( ' ', $colors['overlay_css_classes'] ) );
 			if ( '' !== $colors['overlay_inline_styles'] ) {
 				$style_attribute = sprintf( ' style="%s"', esc_attr( $colors['overlay_inline_styles'] ) );
 			}
 		}
 
-		$front_page_id = (int) get_option( 'page_on_front' );
 		if ( (int) $page['page_id'] === $front_page_id ) {
 			$css_class .= ' menu-item-home';
 		}
@@ -196,7 +197,7 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 
 		if ( isset( $page['children'] ) && $is_navigation_child && $open_submenus_on_click ) {
 			$markup .= '<button aria-label="' . esc_attr( $aria_label ) . '" class="' . esc_attr( $navigation_child_content_class ) . ' wp-block-navigation-submenu__toggle" aria-expanded="false">' . esc_html( $title ) .
-			'</button>' . '<span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
+			'</button><span class="wp-block-page-list__submenu-icon wp-block-navigation__submenu-icon"><svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg></span>';
 		} else {
 			$markup .= '<a class="wp-block-pages-list__item__link' . esc_attr( $navigation_child_content_class ) . '" href="' . esc_url( $page['link'] ) . '"' . $aria_current . '>' . $title . '</a>';
 		}
@@ -207,12 +208,9 @@ function block_core_page_list_render_nested_page_list( $open_submenus_on_click,
 				$markup .= '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" aria-hidden="true" focusable="false"><path d="M1.50002 4L6.00002 8L10.5 4" stroke-width="1.5"></path></svg>';
 				$markup .= '</button>';
 			}
-			$markup .= '<ul class="submenu-container';
-			// Extra classname is added when the block is a child of Navigation.
-			if ( $is_navigation_child ) {
-				$markup .= ' wp-block-navigation__submenu-container';
-			}
-			$markup .= '">' . block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $page['children'], $active_page_ancestor_ids, $colors, $depth + 1 ) . '</ul>';
+			$markup .= '<ul class="wp-block-navigation__submenu-container">';
+			$markup .= block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $page['children'], $is_nested, $active_page_ancestor_ids, $colors, $depth + 1 );
+			$markup .= '</ul>';
 		}
 		$markup .= '</li>';
 	}
@@ -250,7 +248,10 @@ function block_core_page_list_nest_pages( $current_level, $children ) {
  */
 function render_block_core_page_list( $attributes, $content, $block ) {
 	static $block_id = 0;
-	$block_id++;
+	++$block_id;
+
+	$parent_page_id = $attributes['parentPageID'];
+	$is_nested      = $attributes['isNested'];
 
 	$all_pages = get_pages(
 		array(
@@ -271,7 +272,7 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 	$active_page_ancestor_ids = array();
 
 	foreach ( (array) $all_pages as $page ) {
-		$is_active = ! empty( $page->ID ) && ( get_the_ID() === $page->ID );
+		$is_active = ! empty( $page->ID ) && ( get_queried_object_id() === $page->ID );
 
 		if ( $is_active ) {
 			$active_page_ancestor_ids = get_post_ancestors( $page->ID );
@@ -281,14 +282,14 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 			$pages_with_children[ $page->post_parent ][ $page->ID ] = array(
 				'page_id'   => $page->ID,
 				'title'     => $page->post_title,
-				'link'      => get_permalink( $page->ID ),
+				'link'      => get_permalink( $page ),
 				'is_active' => $is_active,
 			);
 		} else {
 			$top_level_pages[ $page->ID ] = array(
 				'page_id'   => $page->ID,
 				'title'     => $page->post_title,
-				'link'      => get_permalink( $page->ID ),
+				'link'      => get_permalink( $page ),
 				'is_active' => $is_active,
 			);
 
@@ -306,15 +307,27 @@ function render_block_core_page_list( $attributes, $content, $block ) {
 
 	$nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
 
+	if ( 0 !== $parent_page_id ) {
+		// If the parent page has no child pages, there is nothing to show.
+		if ( ! array_key_exists( $parent_page_id, $pages_with_children ) ) {
+			return;
+		}
+
+		$nested_pages = block_core_page_list_nest_pages(
+			$pages_with_children[ $parent_page_id ],
+			$pages_with_children
+		);
+	}
+
 	$is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context );
 
 	$open_submenus_on_click = array_key_exists( 'openSubmenusOnClick', $block->context ) ? $block->context['openSubmenusOnClick'] : false;
 
 	$show_submenu_icons = array_key_exists( 'showSubmenuIcon', $block->context ) ? $block->context['showSubmenuIcon'] : false;
 
-	$wrapper_markup = '<ul %1$s>%2$s</ul>';
+	$wrapper_markup = $is_nested ? '%2$s' : '<ul %1$s>%2$s</ul>';
 
-	$items_markup = block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $active_page_ancestor_ids, $colors );
+	$items_markup = block_core_page_list_render_nested_page_list( $open_submenus_on_click, $show_submenu_icons, $is_navigation_child, $nested_pages, $is_nested, $active_page_ancestor_ids, $colors );
 
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
diff --git a/src/wp-includes/blocks/page-list/block.json b/src/wp-includes/blocks/page-list/block.json
index 3068a1fb8bc00..7f4f2ce86c425 100644
--- a/src/wp-includes/blocks/page-list/block.json
+++ b/src/wp-includes/blocks/page-list/block.json
@@ -1,13 +1,22 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/page-list",
 	"title": "Page List",
 	"category": "widgets",
 	"description": "Display a list of all pages.",
 	"keywords": [ "menu", "navigation" ],
 	"textdomain": "default",
-	"attributes": {},
+	"attributes": {
+		"parentPageID": {
+			"type": "integer",
+			"default": 0
+		},
+		"isNested": {
+			"type": "boolean",
+			"default": false
+		}
+	},
 	"usesContext": [
 		"textColor",
 		"customTextColor",
@@ -25,7 +34,20 @@
 	],
 	"supports": {
 		"reusable": false,
-		"html": false
+		"html": false,
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		}
 	},
 	"editorStyle": "wp-block-page-list-editor",
 	"style": "wp-block-page-list"
diff --git a/src/wp-includes/blocks/paragraph/block.json b/src/wp-includes/blocks/paragraph/block.json
index 497a6b2c29a66..cbabc108eca31 100644
--- a/src/wp-includes/blocks/paragraph/block.json
+++ b/src/wp-includes/blocks/paragraph/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/paragraph",
 	"title": "Paragraph",
 	"category": "text",
@@ -43,7 +43,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/pattern.php b/src/wp-includes/blocks/pattern.php
index 32a08601ca808..6368bdb7b7487 100644
--- a/src/wp-includes/blocks/pattern.php
+++ b/src/wp-includes/blocks/pattern.php
@@ -22,6 +22,8 @@ function register_block_core_pattern() {
 /**
  * Renders the `core/pattern` block on the server.
  *
+ * @since 6.3.0 Backwards compatibility: blocks with no `syncStatus` attribute do not receive block wrapper.
+ *
  * @param array $attributes Block attributes.
  *
  * @return string Returns the output of the pattern.
@@ -33,6 +35,7 @@ function render_block_core_pattern( $attributes ) {
 
 	$slug     = $attributes['slug'];
 	$registry = WP_Block_Patterns_Registry::get_instance();
+
 	if ( ! $registry->is_registered( $slug ) ) {
 		return '';
 	}
diff --git a/src/wp-includes/blocks/pattern/block.json b/src/wp-includes/blocks/pattern/block.json
index da023142403c8..e9a85a9b2f84f 100644
--- a/src/wp-includes/blocks/pattern/block.json
+++ b/src/wp-includes/blocks/pattern/block.json
@@ -1,8 +1,8 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/pattern",
-	"title": "Pattern",
+	"title": "Pattern placeholder",
 	"category": "theme",
 	"description": "Show a block pattern.",
 	"supports": {
diff --git a/src/wp-includes/blocks/post-author-biography/block.json b/src/wp-includes/blocks/post-author-biography/block.json
index 434b6b0965880..6964da19696b7 100644
--- a/src/wp-includes/blocks/post-author-biography/block.json
+++ b/src/wp-includes/blocks/post-author-biography/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-author-biography",
 	"title": "Post Author Biography",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/post-author-name.php b/src/wp-includes/blocks/post-author-name.php
new file mode 100644
index 0000000000000..c5c6d142e06dd
--- /dev/null
+++ b/src/wp-includes/blocks/post-author-name.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Server-side rendering of the `core/post-author-name` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/post-author-name` block on the server.
+ *
+ * @param  array    $attributes Block attributes.
+ * @param  string   $content    Block default content.
+ * @param  WP_Block $block      Block instance.
+ * @return string Returns the rendered post author name block.
+ */
+function render_block_core_post_author_name( $attributes, $content, $block ) {
+	if ( ! isset( $block->context['postId'] ) ) {
+		return '';
+	}
+
+	$author_id = get_post_field( 'post_author', $block->context['postId'] );
+	if ( empty( $author_id ) ) {
+		return '';
+	}
+
+	$author_name = get_the_author_meta( 'display_name', $author_id );
+	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
+		$author_name = sprintf( '<a href="%1$s" target="%2$s" class="wp-block-post-author-name__link">%3$s</a>', get_author_posts_url( $author_id ), esc_attr( $attributes['linkTarget'] ), $author_name );
+	}
+
+	$classes = array();
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
+
+	return sprintf( '<div %1$s>%2$s</div>', $wrapper_attributes, $author_name );
+}
+
+/**
+ * Registers the `core/post-author-name` block on the server.
+ */
+function register_block_core_post_author_name() {
+	register_block_type_from_metadata(
+		__DIR__ . '/post-author-name',
+		array(
+			'render_callback' => 'render_block_core_post_author_name',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_post_author_name' );
diff --git a/src/wp-includes/blocks/post-author-name/block.json b/src/wp-includes/blocks/post-author-name/block.json
new file mode 100644
index 0000000000000..3acb8c19bf62d
--- /dev/null
+++ b/src/wp-includes/blocks/post-author-name/block.json
@@ -0,0 +1,52 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 3,
+	"name": "core/post-author-name",
+	"title": "Post Author Name",
+	"category": "theme",
+	"description": "The author name.",
+	"textdomain": "default",
+	"attributes": {
+		"textAlign": {
+			"type": "string"
+		},
+		"isLink": {
+			"type": "boolean",
+			"default": false
+		},
+		"linkTarget": {
+			"type": "string",
+			"default": "_self"
+		}
+	},
+	"usesContext": [ "postType", "postId" ],
+	"supports": {
+		"html": false,
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true,
+				"link": true
+			}
+		},
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		}
+	}
+}
diff --git a/src/wp-includes/blocks/post-author.php b/src/wp-includes/blocks/post-author.php
index 325aa43607d22..898d9478283bc 100644
--- a/src/wp-includes/blocks/post-author.php
+++ b/src/wp-includes/blocks/post-author.php
@@ -29,11 +29,23 @@ function render_block_core_post_author( $attributes, $content, $block ) {
 		$attributes['avatarSize']
 	) : null;
 
+	$link        = get_author_posts_url( $author_id );
+	$author_name = get_the_author_meta( 'display_name', $author_id );
+	if ( ! empty( $attributes['isLink'] && ! empty( $attributes['linkTarget'] ) ) ) {
+		$author_name = sprintf( '<a href="%1$s" target="%2$s">%3$s</a>', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $author_name );
+	}
+
 	$byline  = ! empty( $attributes['byline'] ) ? $attributes['byline'] : false;
-	$classes = array_merge(
-		isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
-		isset( $attributes['textAlign'] ) ? array( 'has-text-align-' . $attributes['textAlign'] ) : array()
-	);
+	$classes = array();
+	if ( isset( $attributes['itemsJustification'] ) ) {
+		$classes[] = 'items-justified-' . $attributes['itemsJustification'];
+	}
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
 
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
@@ -41,7 +53,7 @@ function render_block_core_post_author( $attributes, $content, $block ) {
 	( ! empty( $attributes['showAvatar'] ) ? '<div class="wp-block-post-author__avatar">' . $avatar . '</div>' : '' ) .
 	'<div class="wp-block-post-author__content">' .
 	( ! empty( $byline ) ? '<p class="wp-block-post-author__byline">' . wp_kses_post( $byline ) . '</p>' : '' ) .
-	'<p class="wp-block-post-author__name">' . get_the_author_meta( 'display_name', $author_id ) . '</p>' .
+	'<p class="wp-block-post-author__name">' . $author_name . '</p>' .
 	( ! empty( $attributes['showBio'] ) ? '<p class="wp-block-post-author__bio">' . get_the_author_meta( 'user_description', $author_id ) . '</p>' : '' ) .
 	'</div>' .
 	'</div>';
diff --git a/src/wp-includes/blocks/post-author/block.json b/src/wp-includes/blocks/post-author/block.json
index 232e20dbd0a8d..ada3a77803f11 100644
--- a/src/wp-includes/blocks/post-author/block.json
+++ b/src/wp-includes/blocks/post-author/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-author",
 	"title": "Post Author",
 	"category": "theme",
@@ -23,6 +23,14 @@
 		},
 		"byline": {
 			"type": "string"
+		},
+		"isLink": {
+			"type": "boolean",
+			"default": false
+		},
+		"linkTarget": {
+			"type": "string",
+			"default": "_self"
 		}
 	},
 	"usesContext": [ "postType", "postId", "queryId" ],
@@ -55,6 +63,5 @@
 			}
 		}
 	},
-	"editorStyle": "wp-block-post-author-editor",
 	"style": "wp-block-post-author"
 }
diff --git a/src/wp-includes/blocks/post-comments-form.php b/src/wp-includes/blocks/post-comments-form.php
index 53a6f8b5242a9..644b02ae0f149 100644
--- a/src/wp-includes/blocks/post-comments-form.php
+++ b/src/wp-includes/blocks/post-comments-form.php
@@ -22,12 +22,14 @@ function render_block_core_post_comments_form( $attributes, $content, $block ) {
 		return;
 	}
 
-	$classes = 'comment-respond'; // See comment further below.
+	$classes = array( 'comment-respond' ); // See comment further below.
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= ' has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
 	}
-
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	add_filter( 'comment_form_defaults', 'post_comments_form_block_form_defaults' );
 
diff --git a/src/wp-includes/blocks/post-comments-form/block.json b/src/wp-includes/blocks/post-comments-form/block.json
index 47cc0a443baee..62f92b7581c9e 100644
--- a/src/wp-includes/blocks/post-comments-form/block.json
+++ b/src/wp-includes/blocks/post-comments-form/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-comments-form",
 	"title": "Post Comments Form",
 	"category": "theme",
@@ -22,6 +22,10 @@
 				"text": true
 			}
 		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-content.php b/src/wp-includes/blocks/post-content.php
index 228a0d52f4069..2be1ef77b3b85 100644
--- a/src/wp-includes/blocks/post-content.php
+++ b/src/wp-includes/blocks/post-content.php
@@ -25,8 +25,7 @@ function render_block_core_post_content( $attributes, $content, $block ) {
 	if ( isset( $seen_ids[ $post_id ] ) ) {
 		// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
 		// is set in `wp_debug_mode()`.
-		$is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
-			defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+		$is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
 
 		return $is_debug ?
 			// translators: Visible only in the front end, this warning takes the place of a faulty block.
diff --git a/src/wp-includes/blocks/post-content/block.json b/src/wp-includes/blocks/post-content/block.json
index c330f624ee142..044ca5768bf8d 100644
--- a/src/wp-includes/blocks/post-content/block.json
+++ b/src/wp-includes/blocks/post-content/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-content",
 	"title": "Post Content",
 	"category": "theme",
@@ -10,7 +10,10 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
-		"__experimentalLayout": true,
+		"layout": true,
+		"dimensions": {
+			"minHeight": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-date.php b/src/wp-includes/blocks/post-date.php
index fc1537d156689..b59db80b242cd 100644
--- a/src/wp-includes/blocks/post-date.php
+++ b/src/wp-includes/blocks/post-date.php
@@ -18,18 +18,34 @@ function render_block_core_post_date( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$post_ID            = $block->context['postId'];
-	$align_class_name   = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+	$post_ID          = $block->context['postId'];
+	$formatted_date   = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+	$unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
+	$classes          = array();
 
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
+
+	/*
+	 * If the "Display last modified date" setting is enabled,
+	 * only display the modified date if it is later than the publishing date.
+	 */
 	if ( isset( $attributes['displayType'] ) && 'modified' === $attributes['displayType'] ) {
-		$formatted_date   = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
-		$unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
-	} else {
-		$formatted_date   = get_the_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
-		$unformatted_date = esc_attr( get_the_date( 'c', $post_ID ) );
+		if ( get_the_modified_date( 'Ymdhi', $post_ID ) > get_the_date( 'Ymdhi', $post_ID ) ) {
+			$formatted_date   = get_the_modified_date( empty( $attributes['format'] ) ? '' : $attributes['format'], $post_ID );
+			$unformatted_date = esc_attr( get_the_modified_date( 'c', $post_ID ) );
+			$classes[]        = 'wp-block-post-date__modified-date';
+		} else {
+			return '';
+		}
 	}
 
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
+
 	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
 		$formatted_date = sprintf( '<a href="%1s">%2s</a>', get_the_permalink( $post_ID ), $formatted_date );
 	}
diff --git a/src/wp-includes/blocks/post-date/block.json b/src/wp-includes/blocks/post-date/block.json
index b469dbe87d7e0..ed87259c3b228 100644
--- a/src/wp-includes/blocks/post-date/block.json
+++ b/src/wp-includes/blocks/post-date/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-date",
 	"title": "Post Date",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/post-excerpt.php b/src/wp-includes/blocks/post-excerpt.php
index 79cc959cd86d7..4ed4edab95078 100644
--- a/src/wp-includes/blocks/post-excerpt.php
+++ b/src/wp-includes/blocks/post-excerpt.php
@@ -18,14 +18,20 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$excerpt = get_the_excerpt();
-
-	if ( empty( $excerpt ) ) {
-		return '';
+	/*
+	* The purpose of the excerpt length setting is to limit the length of both
+	* automatically generated and user-created excerpts.
+	* Because the excerpt_length filter only applies to auto generated excerpts,
+	* wp_trim_words is used instead.
+	*/
+	$excerpt_length = $attributes['excerptLength'];
+	$excerpt        = get_the_excerpt( $block->context['postId'] );
+	if ( isset( $excerpt_length ) ) {
+		$excerpt = wp_trim_words( $excerpt, $excerpt_length );
 	}
 
 	$more_text           = ! empty( $attributes['moreText'] ) ? '<a class="wp-block-post-excerpt__more-link" href="' . esc_url( get_the_permalink( $block->context['postId'] ) ) . '">' . wp_kses_post( $attributes['moreText'] ) . '</a>' : '';
-	$filter_excerpt_more = function( $more ) use ( $more_text ) {
+	$filter_excerpt_more = static function( $more ) use ( $more_text ) {
 		return empty( $more_text ) ? $more : '';
 	};
 	/**
@@ -38,11 +44,14 @@ function render_block_core_post_excerpt( $attributes, $content, $block ) {
 	 * result in showing only one `read more` link at a time.
 	 */
 	add_filter( 'excerpt_more', $filter_excerpt_more );
-	$classes = '';
+	$classes = array();
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= "has-text-align-{$attributes['textAlign']}";
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
 	}
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	$content               = '<p class="wp-block-post-excerpt__excerpt">' . $excerpt;
 	$show_more_on_new_line = ! isset( $attributes['showMoreOnNewLine'] ) || $attributes['showMoreOnNewLine'];
@@ -67,3 +76,20 @@ function register_block_core_post_excerpt() {
 	);
 }
 add_action( 'init', 'register_block_core_post_excerpt' );
+
+/**
+ * If themes or plugins filter the excerpt_length, we need to
+ * override the filter in the editor, otherwise
+ * the excerpt length block setting has no effect.
+ * Returns 100 because 100 is the max length in the setting.
+ */
+if ( is_admin() ||
+	defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+	add_filter(
+		'excerpt_length',
+		static function() {
+			return 100;
+		},
+		PHP_INT_MAX
+	);
+}
diff --git a/src/wp-includes/blocks/post-excerpt/block.json b/src/wp-includes/blocks/post-excerpt/block.json
index 03107ff900e06..33b7818ebed9f 100644
--- a/src/wp-includes/blocks/post-excerpt/block.json
+++ b/src/wp-includes/blocks/post-excerpt/block.json
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-excerpt",
-	"title": "Post Excerpt",
+	"title": "Excerpt",
 	"category": "theme",
-	"description": "Display a post's excerpt.",
+	"description": "Display the excerpt.",
 	"textdomain": "default",
 	"attributes": {
 		"textAlign": {
@@ -16,6 +16,10 @@
 		"showMoreOnNewLine": {
 			"type": "boolean",
 			"default": true
+		},
+		"excerptLength": {
+			"type": "number",
+			"default": 55
 		}
 	},
 	"usesContext": [ "postId", "postType", "queryId" ],
diff --git a/src/wp-includes/blocks/post-featured-image.php b/src/wp-includes/blocks/post-featured-image.php
index 495c8ec534a41..6cb4110ee000e 100644
--- a/src/wp-includes/blocks/post-featured-image.php
+++ b/src/wp-includes/blocks/post-featured-image.php
@@ -19,29 +19,60 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 	}
 	$post_ID = $block->context['postId'];
 
+	// Check is needed for backward compatibility with third-party plugins
+	// that might rely on the `in_the_loop` check; calling `the_post` sets it to true.
+	if ( ! in_the_loop() && have_posts() ) {
+		the_post();
+	}
+
 	$is_link        = isset( $attributes['isLink'] ) && $attributes['isLink'];
 	$size_slug      = isset( $attributes['sizeSlug'] ) ? $attributes['sizeSlug'] : 'post-thumbnail';
-	$post_title     = trim( strip_tags( get_the_title( $post_ID ) ) );
 	$attr           = get_block_core_post_featured_image_border_attributes( $attributes );
 	$overlay_markup = get_block_core_post_featured_image_overlay_element_markup( $attributes );
 
 	if ( $is_link ) {
-		$attr['alt'] = $post_title;
+		if ( get_the_title( $post_ID ) ) {
+			$attr['alt'] = trim( strip_tags( get_the_title( $post_ID ) ) );
+		} else {
+			$attr['alt'] = sprintf(
+				// translators: %d is the post ID.
+				__( 'Untitled post %d' ),
+				$post_ID
+			);
+		}
+	}
+
+	$extra_styles = '';
+
+	// Aspect ratio with a height set needs to override the default width/height.
+	if ( ! empty( $attributes['aspectRatio'] ) ) {
+		$extra_styles .= 'width:100%;height:100%;';
+	} elseif ( ! empty( $attributes['height'] ) ) {
+		$extra_styles .= "height:{$attributes['height']};";
+	}
+
+	if ( ! empty( $attributes['scale'] ) ) {
+		$extra_styles .= "object-fit:{$attributes['scale']};";
+	}
+
+	if ( ! empty( $extra_styles ) ) {
+		$attr['style'] = empty( $attr['style'] ) ? $extra_styles : $attr['style'] . $extra_styles;
 	}
 
 	$featured_image = get_the_post_thumbnail( $post_ID, $size_slug, $attr );
 	if ( ! $featured_image ) {
 		return '';
 	}
-	$wrapper_attributes = get_block_wrapper_attributes();
 	if ( $is_link ) {
 		$link_target    = $attributes['linkTarget'];
 		$rel            = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
+		$height         = ! empty( $attributes['height'] ) ? 'style="' . esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . '"' : '';
 		$featured_image = sprintf(
-			'<a href="%1$s" target="%2$s" %3$s>%4$s%5$s</a>',
+			'<a href="%1$s" target="%2$s" %3$s %4$s>%5$s%6$s</a>',
 			get_the_permalink( $post_ID ),
 			esc_attr( $link_target ),
 			$rel,
+			$height,
 			$featured_image,
 			$overlay_markup
 		);
@@ -49,24 +80,20 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 		$featured_image = $featured_image . $overlay_markup;
 	}
 
-	$has_width  = ! empty( $attributes['width'] );
-	$has_height = ! empty( $attributes['height'] );
-	if ( ! $has_height && ! $has_width ) {
-		return "<figure {$wrapper_attributes}>{$featured_image}</figure>";
-	}
-
-	if ( $has_width ) {
-		$wrapper_attributes = get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
-	}
-
-	if ( $has_height ) {
-		$image_styles = "height:{$attributes['height']};";
-		if ( ! empty( $attributes['scale'] ) ) {
-			$image_styles .= "object-fit:{$attributes['scale']};";
-		}
-		$featured_image = str_replace( '<img ', '<img style="' . esc_attr( safecss_filter_attr( $image_styles ) ) . '" ', $featured_image );
+	$aspect_ratio = ! empty( $attributes['aspectRatio'] )
+		? esc_attr( safecss_filter_attr( 'aspect-ratio:' . $attributes['aspectRatio'] ) ) . ';'
+		: '';
+	$width        = ! empty( $attributes['width'] )
+		? esc_attr( safecss_filter_attr( 'width:' . $attributes['width'] ) ) . ';'
+		: '';
+	$height       = ! empty( $attributes['height'] )
+		? esc_attr( safecss_filter_attr( 'height:' . $attributes['height'] ) ) . ';'
+		: '';
+	if ( ! $height && ! $width && ! $aspect_ratio ) {
+		$wrapper_attributes = get_block_wrapper_attributes();
+	} else {
+		$wrapper_attributes = get_block_wrapper_attributes( array( 'style' => $aspect_ratio . $width . $height ) );
 	}
-
 	return "<figure {$wrapper_attributes}>{$featured_image}</figure>";
 }
 
diff --git a/src/wp-includes/blocks/post-featured-image/block.json b/src/wp-includes/blocks/post-featured-image/block.json
index 40f51cffa06e7..aa6428cad0c3a 100644
--- a/src/wp-includes/blocks/post-featured-image/block.json
+++ b/src/wp-includes/blocks/post-featured-image/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-featured-image",
 	"title": "Post Featured Image",
 	"category": "theme",
@@ -11,6 +11,9 @@
 			"type": "boolean",
 			"default": false
 		},
+		"aspectRatio": {
+			"type": "string"
+		},
 		"width": {
 			"type": "string"
 		},
diff --git a/src/wp-includes/blocks/post-navigation-link.php b/src/wp-includes/blocks/post-navigation-link.php
index b0677e4b3ebf3..cb1fe568bdf0e 100644
--- a/src/wp-includes/blocks/post-navigation-link.php
+++ b/src/wp-includes/blocks/post-navigation-link.php
@@ -34,6 +34,18 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 	$link   = 'next' === $navigation_type ? _x( 'Next', 'label for next post link' ) : _x( 'Previous', 'label for previous post link' );
 	$label  = '';
 
+	$arrow_map = array(
+		'none'    => '',
+		'arrow'   => array(
+			'next'     => '→',
+			'previous' => '←',
+		),
+		'chevron' => array(
+			'next'     => '»',
+			'previous' => '«',
+		),
+	);
+
 	// If a custom label is provided, make this a link.
 	// `$label` is used to prepend the provided label, if we want to show the page title as well.
 	if ( isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ) {
@@ -71,6 +83,17 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 		}
 	}
 
+	// Display arrows.
+	if ( isset( $attributes['arrow'] ) && ! empty( $attributes['arrow'] ) && 'none' !== $attributes['arrow'] ) {
+		$arrow = $arrow_map[ $attributes['arrow'] ][ $navigation_type ];
+
+		if ( 'next' === $navigation_type ) {
+			$format = '%link <span class="wp-block-post-navigation-link__arrow-next is-arrow-' . $attributes['arrow'] . '" aria-hidden="true">' . $arrow . '</span>';
+		} else {
+			$format = '<span class="wp-block-post-navigation-link__arrow-previous is-arrow-' . $attributes['arrow'] . '" aria-hidden="true">' . $arrow . '</span> %link';
+		}
+	}
+
 	// The dynamic portion of the function name, `$navigation_type`,
 	// refers to the type of adjacency, 'next' or 'previous'.
 	$get_link_function = "get_{$navigation_type}_post_link";
diff --git a/src/wp-includes/blocks/post-navigation-link/block.json b/src/wp-includes/blocks/post-navigation-link/block.json
index c7e53bdce0af3..4e7df560c69b3 100644
--- a/src/wp-includes/blocks/post-navigation-link/block.json
+++ b/src/wp-includes/blocks/post-navigation-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-navigation-link",
 	"title": "Post Navigation Link",
 	"category": "theme",
@@ -24,6 +24,10 @@
 		"linkLabel": {
 			"type": "boolean",
 			"default": false
+		},
+		"arrow": {
+			"type": "string",
+			"default": "none"
 		}
 	},
 	"supports": {
@@ -45,5 +49,6 @@
 				"fontSize": true
 			}
 		}
-	}
+	},
+	"style": "wp-block-post-navigation-link"
 }
diff --git a/src/wp-includes/blocks/post-template.php b/src/wp-includes/blocks/post-template.php
index c12a0e68b8e24..88b7c27f1c66f 100644
--- a/src/wp-includes/blocks/post-template.php
+++ b/src/wp-includes/blocks/post-template.php
@@ -34,6 +34,8 @@ function block_core_post_template_uses_featured_image( $inner_blocks ) {
 /**
  * Renders the `core/post-template` block on the server.
  *
+ * @since 6.3.0 Changed render_block_context priority to `1`.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -68,8 +70,16 @@ function render_block_core_post_template( $attributes, $content, $block ) {
 			$classnames = "is-flex-container columns-{$block->context['displayLayout']['columns']}";
 		}
 	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classnames .= ' has-link-color';
+	}
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classnames ) );
+	// Ensure backwards compatibility by flagging the number of columns via classname when using grid layout.
+	if ( isset( $attributes['layout']['type'] ) && 'grid' === $attributes['layout']['type'] && ! empty( $attributes['layout']['columnCount'] ) ) {
+		$classnames .= ' ' . sanitize_title( 'columns-' . $attributes['layout']['columnCount'] );
+	}
+
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classnames ) ) );
 
 	$content = '';
 	while ( $query->have_posts() ) {
@@ -82,17 +92,20 @@ function render_block_core_post_template( $attributes, $content, $block ) {
 		// This ensures that for the inner instances of the Post Template block, we do not render any block supports.
 		$block_instance['blockName'] = 'core/null';
 
+		$post_id              = get_the_ID();
+		$post_type            = get_post_type();
+		$filter_block_context = static function( $context ) use ( $post_id, $post_type ) {
+			$context['postType'] = $post_type;
+			$context['postId']   = $post_id;
+			return $context;
+		};
+
+		// Use an early priority to so that other 'render_block_context' filters have access to the values.
+		add_filter( 'render_block_context', $filter_block_context, 1 );
 		// Render the inner blocks of the Post Template block with `dynamic` set to `false` to prevent calling
 		// `render_callback` and ensure that no wrapper markup is included.
-		$block_content = (
-			new WP_Block(
-				$block_instance,
-				array(
-					'postType' => get_post_type(),
-					'postId'   => get_the_ID(),
-				)
-			)
-		)->render( array( 'dynamic' => false ) );
+		$block_content = ( new WP_Block( $block_instance ) )->render( array( 'dynamic' => false ) );
+		remove_filter( 'render_block_context', $filter_block_context, 1 );
 
 		// Wrap the render inner blocks in a `li` element with the appropriate post classes.
 		$post_classes = implode( ' ', get_post_class( 'wp-block-post' ) );
diff --git a/src/wp-includes/blocks/post-template/block.json b/src/wp-includes/blocks/post-template/block.json
index 380b6d55f71fa..1f0d4677e6727 100644
--- a/src/wp-includes/blocks/post-template/block.json
+++ b/src/wp-includes/blocks/post-template/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-template",
 	"title": "Post Template",
 	"category": "theme",
@@ -18,9 +18,15 @@
 	"supports": {
 		"reusable": false,
 		"html": false,
-		"align": true,
-		"__experimentalLayout": {
-			"allowEditing": false
+		"align": [ "wide", "full" ],
+		"layout": true,
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true
+			}
 		},
 		"typography": {
 			"fontSize": true,
@@ -34,6 +40,14 @@
 			"__experimentalDefaultControls": {
 				"fontSize": true
 			}
+		},
+		"spacing": {
+			"blockGap": {
+				"__experimentalDefault": "1.25em"
+			},
+			"__experimentalDefaultControls": {
+				"blockGap": true
+			}
 		}
 	},
 	"style": "wp-block-post-template",
diff --git a/src/wp-includes/blocks/post-terms.php b/src/wp-includes/blocks/post-terms.php
index f98baba65ec63..96951a9e155ed 100644
--- a/src/wp-includes/blocks/post-terms.php
+++ b/src/wp-includes/blocks/post-terms.php
@@ -27,14 +27,17 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$classes = 'taxonomy-' . $attributes['term'];
+	$classes = array( 'taxonomy-' . $attributes['term'] );
 	if ( isset( $attributes['textAlign'] ) ) {
-		$classes .= ' has-text-align-' . $attributes['textAlign'];
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
 
 	$separator = empty( $attributes['separator'] ) ? ' ' : $attributes['separator'];
 
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	$prefix = "<div $wrapper_attributes>";
 	if ( isset( $attributes['prefix'] ) && $attributes['prefix'] ) {
@@ -61,8 +64,8 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 function register_block_core_post_terms() {
 	$taxonomies = get_taxonomies(
 		array(
-			'public'       => true,
-			'show_in_rest' => true,
+			'publicly_queryable' => true,
+			'show_in_rest'       => true,
 		),
 		'objects'
 	);
@@ -84,6 +87,7 @@ function register_block_core_post_terms() {
 				'term' => $taxonomy->name,
 			),
 			'isActive'    => array( 'term' ),
+			'scope'       => array( 'inserter', 'transform' ),
 		);
 		// Set the category variation as the default one.
 		if ( 'category' === $taxonomy->name ) {
diff --git a/src/wp-includes/blocks/post-terms/block.json b/src/wp-includes/blocks/post-terms/block.json
index 26f3915d5b0e0..0da7fb02f8134 100644
--- a/src/wp-includes/blocks/post-terms/block.json
+++ b/src/wp-includes/blocks/post-terms/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-terms",
 	"title": "Post Terms",
 	"category": "theme",
@@ -38,6 +38,10 @@
 				"link": true
 			}
 		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/src/wp-includes/blocks/post-title.php b/src/wp-includes/blocks/post-title.php
index 125a2d81ddcbe..8b0e431b3a8be 100644
--- a/src/wp-includes/blocks/post-title.php
+++ b/src/wp-includes/blocks/post-title.php
@@ -8,6 +8,8 @@
 /**
  * Renders the `core/post-title` block on the server.
  *
+ * @since 6.3.0 Omitting the $post argument from the `get_the_title`.
+ *
  * @param array    $attributes Block attributes.
  * @param string   $content    Block default content.
  * @param WP_Block $block      Block instance.
@@ -19,25 +21,34 @@ function render_block_core_post_title( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$post_ID = $block->context['postId'];
-	$title   = get_the_title();
+	/**
+	 * The `$post` argument is intentionally omitted so that changes are reflected when previewing a post.
+	 * See: https://github.com/WordPress/gutenberg/pull/37622#issuecomment-1000932816.
+	 */
+	$title = get_the_title();
 
 	if ( ! $title ) {
 		return '';
 	}
 
-	$tag_name         = 'h2';
-	$align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
-
+	$tag_name = 'h2';
 	if ( isset( $attributes['level'] ) ) {
-		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
+		$tag_name = 'h' . $attributes['level'];
 	}
 
 	if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
 		$rel   = ! empty( $attributes['rel'] ) ? 'rel="' . esc_attr( $attributes['rel'] ) . '"' : '';
-		$title = sprintf( '<a href="%1$s" target="%2$s" %3$s>%4$s</a>', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
+		$title = sprintf( '<a href="%1$s" target="%2$s" %3$s>%4$s</a>', get_the_permalink( $block->context['postId'] ), esc_attr( $attributes['linkTarget'] ), $rel, $title );
+	}
+
+	$classes = array();
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
 	}
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return sprintf(
 		'<%1$s %2$s>%3$s</%1$s>',
diff --git a/src/wp-includes/blocks/post-title/block.json b/src/wp-includes/blocks/post-title/block.json
index 015896ff1bad0..eda5332f24022 100644
--- a/src/wp-includes/blocks/post-title/block.json
+++ b/src/wp-includes/blocks/post-title/block.json
@@ -1,8 +1,8 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/post-title",
-	"title": "Post Title",
+	"title": "Title",
 	"category": "theme",
 	"description": "Displays the title of a post, page, or any other content-type.",
 	"textdomain": "default",
diff --git a/src/wp-includes/blocks/preformatted/block.json b/src/wp-includes/blocks/preformatted/block.json
index bab40b94a7ec4..f781cb1125efa 100644
--- a/src/wp-includes/blocks/preformatted/block.json
+++ b/src/wp-includes/blocks/preformatted/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/preformatted",
 	"title": "Preformatted",
 	"category": "text",
diff --git a/src/wp-includes/blocks/pullquote/block.json b/src/wp-includes/blocks/pullquote/block.json
index 0732bb52f66bf..54c4175d3161b 100644
--- a/src/wp-includes/blocks/pullquote/block.json
+++ b/src/wp-includes/blocks/pullquote/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/pullquote",
 	"title": "Pullquote",
 	"category": "text",
diff --git a/src/wp-includes/blocks/query-no-results.php b/src/wp-includes/blocks/query-no-results.php
index 6d4dad48f49e0..4342ba57cccbd 100644
--- a/src/wp-includes/blocks/query-no-results.php
+++ b/src/wp-includes/blocks/query-no-results.php
@@ -40,9 +40,11 @@ function render_block_core_query_no_results( $attributes, $content, $block ) {
 		wp_reset_postdata();
 	}
 
+	$classes            = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $classes ) );
 	return sprintf(
 		'<div %1$s>%2$s</div>',
-		get_block_wrapper_attributes(),
+		$wrapper_attributes,
 		$content
 	);
 }
diff --git a/src/wp-includes/blocks/query-no-results/block.json b/src/wp-includes/blocks/query-no-results/block.json
index f042223f36aec..32088752bb060 100644
--- a/src/wp-includes/blocks/query-no-results/block.json
+++ b/src/wp-includes/blocks/query-no-results/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-no-results",
 	"title": "No results",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/query-pagination-next.php b/src/wp-includes/blocks/query-pagination-next.php
index e92b58938d53b..f0ded727ee8a9 100644
--- a/src/wp-includes/blocks/query-pagination-next.php
+++ b/src/wp-includes/blocks/query-pagination-next.php
@@ -20,10 +20,15 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
 	$max_page = isset( $block->context['query']['pages'] ) ? (int) $block->context['query']['pages'] : 0;
 
 	$wrapper_attributes = get_block_wrapper_attributes();
+	$show_label         = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
 	$default_label      = __( 'Next Page' );
-	$label              = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+	$label_text         = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+	$label              = $show_label ? $label_text : '';
 	$pagination_arrow   = get_query_pagination_arrow( $block, true );
 
+	if ( ! $label ) {
+		$wrapper_attributes .= ' aria-label="' . $label_text . '"';
+	}
 	if ( $pagination_arrow ) {
 		$label .= $pagination_arrow;
 	}
@@ -31,7 +36,7 @@ function render_block_core_query_pagination_next( $attributes, $content, $block
 
 	// Check if the pagination is for Query that inherits the global context.
 	if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
-		$filter_link_attributes = function() use ( $wrapper_attributes ) {
+		$filter_link_attributes = static function() use ( $wrapper_attributes ) {
 			return $wrapper_attributes;
 		};
 		add_filter( 'next_posts_link_attributes', $filter_link_attributes );
diff --git a/src/wp-includes/blocks/query-pagination-next/block.json b/src/wp-includes/blocks/query-pagination-next/block.json
index ad87d05b5ed99..60d44d7ca17b5 100644
--- a/src/wp-includes/blocks/query-pagination-next/block.json
+++ b/src/wp-includes/blocks/query-pagination-next/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-pagination-next",
 	"title": "Next Page",
 	"category": "theme",
@@ -12,7 +12,7 @@
 			"type": "string"
 		}
 	},
-	"usesContext": [ "queryId", "query", "paginationArrow" ],
+	"usesContext": [ "queryId", "query", "paginationArrow", "showLabel" ],
 	"supports": {
 		"reusable": false,
 		"html": false,
diff --git a/src/wp-includes/blocks/query-pagination-numbers/block.json b/src/wp-includes/blocks/query-pagination-numbers/block.json
index fd28596581961..f00b2993a75f6 100644
--- a/src/wp-includes/blocks/query-pagination-numbers/block.json
+++ b/src/wp-includes/blocks/query-pagination-numbers/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-pagination-numbers",
 	"title": "Page Numbers",
 	"category": "theme",
@@ -32,5 +32,5 @@
 			}
 		}
 	},
-	"editorStyle": "query-pagination-numbers-editor"
+	"editorStyle": "wp-block-query-pagination-numbers-editor"
 }
diff --git a/src/wp-includes/blocks/query-pagination-previous.php b/src/wp-includes/blocks/query-pagination-previous.php
index 9bb9f0d1f2bfb..5665506598f81 100644
--- a/src/wp-includes/blocks/query-pagination-previous.php
+++ b/src/wp-includes/blocks/query-pagination-previous.php
@@ -19,9 +19,14 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
 	$page     = empty( $_GET[ $page_key ] ) ? 1 : (int) $_GET[ $page_key ];
 
 	$wrapper_attributes = get_block_wrapper_attributes();
+	$show_label         = isset( $block->context['showLabel'] ) ? (bool) $block->context['showLabel'] : true;
 	$default_label      = __( 'Previous Page' );
-	$label              = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+	$label_text         = isset( $attributes['label'] ) && ! empty( $attributes['label'] ) ? esc_html( $attributes['label'] ) : $default_label;
+	$label              = $show_label ? $label_text : '';
 	$pagination_arrow   = get_query_pagination_arrow( $block, false );
+	if ( ! $label ) {
+		$wrapper_attributes .= ' aria-label="' . $label_text . '"';
+	}
 	if ( $pagination_arrow ) {
 		$label = $pagination_arrow . $label;
 	}
@@ -29,7 +34,7 @@ function render_block_core_query_pagination_previous( $attributes, $content, $bl
 	// Check if the pagination is for Query that inherits the global context
 	// and handle appropriately.
 	if ( isset( $block->context['query']['inherit'] ) && $block->context['query']['inherit'] ) {
-		$filter_link_attributes = function() use ( $wrapper_attributes ) {
+		$filter_link_attributes = static function() use ( $wrapper_attributes ) {
 			return $wrapper_attributes;
 		};
 
diff --git a/src/wp-includes/blocks/query-pagination-previous/block.json b/src/wp-includes/blocks/query-pagination-previous/block.json
index 484cefe6bbd82..d13442f831c97 100644
--- a/src/wp-includes/blocks/query-pagination-previous/block.json
+++ b/src/wp-includes/blocks/query-pagination-previous/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-pagination-previous",
 	"title": "Previous Page",
 	"category": "theme",
@@ -12,7 +12,7 @@
 			"type": "string"
 		}
 	},
-	"usesContext": [ "queryId", "query", "paginationArrow" ],
+	"usesContext": [ "queryId", "query", "paginationArrow", "showLabel" ],
 	"supports": {
 		"reusable": false,
 		"html": false,
diff --git a/src/wp-includes/blocks/query-pagination.php b/src/wp-includes/blocks/query-pagination.php
index eaa784be08e7d..9b7289ec22e0f 100644
--- a/src/wp-includes/blocks/query-pagination.php
+++ b/src/wp-includes/blocks/query-pagination.php
@@ -18,9 +18,11 @@ function render_block_core_query_pagination( $attributes, $content ) {
 		return '';
 	}
 
+	$classes            = ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) ? 'has-link-color' : '';
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
 			'aria-label' => __( 'Pagination' ),
+			'class'      => $classes,
 		)
 	);
 
diff --git a/src/wp-includes/blocks/query-pagination/block.json b/src/wp-includes/blocks/query-pagination/block.json
index f75f4077d4e13..e32a9ba9b495f 100644
--- a/src/wp-includes/blocks/query-pagination/block.json
+++ b/src/wp-includes/blocks/query-pagination/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-pagination",
 	"title": "Pagination",
 	"category": "theme",
@@ -11,11 +11,16 @@
 		"paginationArrow": {
 			"type": "string",
 			"default": "none"
+		},
+		"showLabel": {
+			"type": "boolean",
+			"default": true
 		}
 	},
 	"usesContext": [ "queryId", "query" ],
 	"providesContext": {
-		"paginationArrow": "paginationArrow"
+		"paginationArrow": "paginationArrow",
+		"showLabel": "showLabel"
 	},
 	"supports": {
 		"align": true,
@@ -30,7 +35,7 @@
 				"link": true
 			}
 		},
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"default": {
diff --git a/src/wp-includes/blocks/query-title.php b/src/wp-includes/blocks/query-title.php
index d781de3826b1d..29793e5227a79 100644
--- a/src/wp-includes/blocks/query-title.php
+++ b/src/wp-includes/blocks/query-title.php
@@ -28,12 +28,9 @@ function render_block_core_query_title( $attributes ) {
 	if ( $is_archive ) {
 		$show_prefix = isset( $attributes['showPrefix'] ) ? $attributes['showPrefix'] : true;
 		if ( ! $show_prefix ) {
-			$filter_title = function( $title, $original_title ) {
-				return $original_title;
-			};
-			add_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+			add_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
 			$title = get_the_archive_title();
-			remove_filter( 'get_the_archive_title', $filter_title, 10, 2 );
+			remove_filter( 'get_the_archive_title_prefix', '__return_empty_string', 1 );
 		} else {
 			$title = get_the_archive_title();
 		}
diff --git a/src/wp-includes/blocks/query-title/block.json b/src/wp-includes/blocks/query-title/block.json
index 33df75866bce0..2db349e55db90 100644
--- a/src/wp-includes/blocks/query-title/block.json
+++ b/src/wp-includes/blocks/query-title/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query-title",
 	"title": "Query Title",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/query/block.json b/src/wp-includes/blocks/query/block.json
index cd09e22ee57f7..e4b78b585be0e 100644
--- a/src/wp-includes/blocks/query/block.json
+++ b/src/wp-includes/blocks/query/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/query",
 	"title": "Query Loop",
 	"category": "theme",
@@ -32,12 +32,6 @@
 			"type": "string",
 			"default": "div"
 		},
-		"displayLayout": {
-			"type": "object",
-			"default": {
-				"type": "list"
-			}
-		},
 		"namespace": {
 			"type": "string"
 		}
@@ -50,15 +44,7 @@
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
-		"color": {
-			"gradients": true,
-			"link": true,
-			"__experimentalDefaultControls": {
-				"background": true,
-				"text": true
-			}
-		},
-		"__experimentalLayout": true
+		"layout": true
 	},
 	"editorStyle": "wp-block-query-editor"
 }
diff --git a/src/wp-includes/blocks/quote/block.json b/src/wp-includes/blocks/quote/block.json
index adb9fddca7873..49ee925794ce2 100644
--- a/src/wp-includes/blocks/quote/block.json
+++ b/src/wp-includes/blocks/quote/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/quote",
 	"title": "Quote",
 	"category": "text",
@@ -29,6 +29,7 @@
 	},
 	"supports": {
 		"anchor": true,
+		"html": false,
 		"__experimentalOnEnter": true,
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/read-more.php b/src/wp-includes/blocks/read-more.php
index 93013b2517d14..c59dd2bf3d408 100644
--- a/src/wp-includes/blocks/read-more.php
+++ b/src/wp-includes/blocks/read-more.php
@@ -18,16 +18,30 @@ function render_block_core_read_more( $attributes, $content, $block ) {
 		return '';
 	}
 
-	$post_ID            = $block->context['postId'];
+	$post_ID    = $block->context['postId'];
+	$post_title = get_the_title( $post_ID );
+	if ( '' === $post_title ) {
+		$post_title = sprintf(
+			/* translators: %s is post ID to describe the link for screen readers. */
+			__( 'untitled post %s' ),
+			$post_ID
+		);
+	}
+	$screen_reader_text = sprintf(
+		/* translators: %s is either the post title or post ID to describe the link for screen readers. */
+		__( ': %s' ),
+		$post_title
+	);
 	$justify_class_name = empty( $attributes['justifyContent'] ) ? '' : "is-justified-{$attributes['justifyContent']}";
 	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $justify_class_name ) );
 	$more_text          = ! empty( $attributes['content'] ) ? wp_kses_post( $attributes['content'] ) : __( 'Read more' );
 	return sprintf(
-		'<a %1s href="%2s" target="%3s">%4s</a>',
+		'<a %1s href="%2s" target="%3s">%4s<span class="screen-reader-text">%5s</span></a>',
 		$wrapper_attributes,
 		get_the_permalink( $post_ID ),
 		esc_attr( $attributes['linkTarget'] ),
-		$more_text
+		$more_text,
+		$screen_reader_text
 	);
 }
 
diff --git a/src/wp-includes/blocks/read-more/block.json b/src/wp-includes/blocks/read-more/block.json
index 61b0452c7c80e..d3386a49d66b8 100644
--- a/src/wp-includes/blocks/read-more/block.json
+++ b/src/wp-includes/blocks/read-more/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/read-more",
 	"title": "Read More",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/require-dynamic-blocks.php b/src/wp-includes/blocks/require-dynamic-blocks.php
index 4841d214c84ce..229a0311b8b6d 100644
--- a/src/wp-includes/blocks/require-dynamic-blocks.php
+++ b/src/wp-includes/blocks/require-dynamic-blocks.php
@@ -21,7 +21,9 @@
 require_once ABSPATH . WPINC . '/blocks/comments-title.php';
 require_once ABSPATH . WPINC . '/blocks/cover.php';
 require_once ABSPATH . WPINC . '/blocks/file.php';
+require_once ABSPATH . WPINC . '/blocks/footnotes.php';
 require_once ABSPATH . WPINC . '/blocks/gallery.php';
+require_once ABSPATH . WPINC . '/blocks/heading.php';
 require_once ABSPATH . WPINC . '/blocks/home-link.php';
 require_once ABSPATH . WPINC . '/blocks/image.php';
 require_once ABSPATH . WPINC . '/blocks/latest-comments.php';
@@ -31,9 +33,11 @@
 require_once ABSPATH . WPINC . '/blocks/navigation-link.php';
 require_once ABSPATH . WPINC . '/blocks/navigation-submenu.php';
 require_once ABSPATH . WPINC . '/blocks/page-list.php';
+require_once ABSPATH . WPINC . '/blocks/page-list-item.php';
 require_once ABSPATH . WPINC . '/blocks/pattern.php';
 require_once ABSPATH . WPINC . '/blocks/post-author.php';
 require_once ABSPATH . WPINC . '/blocks/post-author-biography.php';
+require_once ABSPATH . WPINC . '/blocks/post-author-name.php';
 require_once ABSPATH . WPINC . '/blocks/post-comments-form.php';
 require_once ABSPATH . WPINC . '/blocks/post-content.php';
 require_once ABSPATH . WPINC . '/blocks/post-date.php';
diff --git a/src/wp-includes/blocks/require-static-blocks.php b/src/wp-includes/blocks/require-static-blocks.php
index 9a1884e9cf09b..69f6d6841001d 100644
--- a/src/wp-includes/blocks/require-static-blocks.php
+++ b/src/wp-includes/blocks/require-static-blocks.php
@@ -9,10 +9,10 @@
 	'code',
 	'column',
 	'columns',
+	'details',
 	'embed',
 	'freeform',
 	'group',
-	'heading',
 	'html',
 	'list',
 	'list-item',
diff --git a/src/wp-includes/blocks/rss.php b/src/wp-includes/blocks/rss.php
index e32155195af1d..91cdab3f589e0 100644
--- a/src/wp-includes/blocks/rss.php
+++ b/src/wp-includes/blocks/rss.php
@@ -48,7 +48,7 @@ function render_block_core_rss( $attributes ) {
 			if ( $date ) {
 				$date = sprintf(
 					'<time datetime="%1$s" class="wp-block-rss__item-publish-date">%2$s</time> ',
-					esc_attr( date_i18n( get_option( 'c' ), $date ) ),
+					esc_attr( date_i18n( 'c', $date ) ),
 					esc_attr( date_i18n( get_option( 'date_format' ), $date ) )
 				);
 			}
diff --git a/src/wp-includes/blocks/rss/block.json b/src/wp-includes/blocks/rss/block.json
index 8a351d877a751..2535eda5946fb 100644
--- a/src/wp-includes/blocks/rss/block.json
+++ b/src/wp-includes/blocks/rss/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/rss",
 	"title": "RSS",
 	"category": "widgets",
diff --git a/src/wp-includes/blocks/search.php b/src/wp-includes/blocks/search.php
index 26b6a7585ccc7..b0fed54d2f385 100644
--- a/src/wp-includes/blocks/search.php
+++ b/src/wp-includes/blocks/search.php
@@ -8,11 +8,15 @@
 /**
  * Dynamically renders the `core/search` block.
  *
- * @param array $attributes The block attributes.
+ * @since 6.3.0 Using block.json `viewScript` to register script, and update `view_script_handles()` only when needed.
+ *
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The saved content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string The search block markup.
  */
-function render_block_core_search( $attributes ) {
+function render_block_core_search( $attributes, $content, $block ) {
 	// Older versions of the Search block defaulted the label and buttonText
 	// attributes to `__( 'Search' )` meaning that many posts contain `<!--
 	// wp:search /-->`. Support these by defaulting an undefined label and
@@ -29,11 +33,11 @@ function render_block_core_search( $attributes ) {
 	$classnames          = classnames_for_block_core_search( $attributes );
 	$show_label          = ( ! empty( $attributes['showLabel'] ) ) ? true : false;
 	$use_icon_button     = ( ! empty( $attributes['buttonUseIcon'] ) ) ? true : false;
-	$show_input          = ( ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'] ) ? false : true;
 	$show_button         = ( ! empty( $attributes['buttonPosition'] ) && 'no-button' === $attributes['buttonPosition'] ) ? false : true;
+	$button_position     = $show_button ? $attributes['buttonPosition'] : null;
 	$query_params        = ( ! empty( $attributes['query'] ) ) ? $attributes['query'] : array();
-	$input_markup        = '';
-	$button_markup       = '';
+	$button_behavior     = ( ! empty( $attributes['buttonBehavior'] ) ) ? $attributes['buttonBehavior'] : 'default';
+	$button              = '';
 	$query_params_markup = '';
 	$inline_styles       = styles_for_block_core_search( $attributes );
 	$color_classes       = get_color_classes_for_block_core_search( $attributes );
@@ -44,42 +48,53 @@ function render_block_core_search( $attributes ) {
 	$border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
 
 	$label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
-
-	$label_markup = sprintf(
-		'<label for="%1$s" class="wp-block-search__label screen-reader-text">%2$s</label>',
-		esc_attr( $input_id ),
-		$label_inner_html
-	);
-	if ( $show_label && ! empty( $attributes['label'] ) ) {
-		$label_classes = array( 'wp-block-search__label' );
-		if ( ! empty( $typography_classes ) ) {
-			$label_classes[] = $typography_classes;
+	$label            = new WP_HTML_Tag_Processor( sprintf( '<label %1$s>%2$s</label>', $inline_styles['label'], $label_inner_html ) );
+	if ( $label->next_tag() ) {
+		$label->set_attribute( 'for', $input_id );
+		$label->add_class( 'wp-block-search__label' );
+		if ( $show_label && ! empty( $attributes['label'] ) ) {
+			if ( ! empty( $typography_classes ) ) {
+				$label->add_class( $typography_classes );
+			}
+		} else {
+			$label->add_class( 'screen-reader-text' );
 		}
-		$label_markup = sprintf(
-			'<label for="%1$s" class="%2$s" %3$s>%4$s</label>',
-			esc_attr( $input_id ),
-			esc_attr( implode( ' ', $label_classes ) ),
-			$inline_styles['label'],
-			$label_inner_html
-		);
 	}
 
-	if ( $show_input ) {
-		$input_classes = array( 'wp-block-search__input' );
-		if ( $is_button_inside ) {
-			$input_classes[] = $border_color_classes;
+	$input         = new WP_HTML_Tag_Processor( sprintf( '<input type="search" name="s" required %s/>', $inline_styles['input'] ) );
+	$input_classes = array( 'wp-block-search__input' );
+	if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
+		$input_classes[] = $border_color_classes;
+	}
+	if ( ! empty( $typography_classes ) ) {
+		$input_classes[] = $typography_classes;
+	}
+	if ( $input->next_tag() ) {
+		$input->add_class( implode( ' ', $input_classes ) );
+		$input->set_attribute( 'id', $input_id );
+		$input->set_attribute( 'value', get_search_query() );
+		$input->set_attribute( 'placeholder', $attributes['placeholder'] );
+
+		$is_expandable_searchfield = 'button-only' === $button_position && 'expand-searchfield' === $button_behavior;
+		if ( $is_expandable_searchfield ) {
+			$input->set_attribute( 'aria-hidden', 'true' );
+			$input->set_attribute( 'tabindex', '-1' );
 		}
-		if ( ! empty( $typography_classes ) ) {
-			$input_classes[] = $typography_classes;
+
+		// If the script already exists, there is no point in removing it from viewScript.
+		$view_js_file = 'wp-block-search-view';
+		if ( ! wp_script_is( $view_js_file ) ) {
+			$script_handles = $block->block_type->view_script_handles;
+
+			// If the script is not needed, and it is still in the `view_script_handles`, remove it.
+			if ( ! $is_expandable_searchfield && in_array( $view_js_file, $script_handles, true ) ) {
+				$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
+			}
+			// If the script is needed, but it was previously removed, add it again.
+			if ( $is_expandable_searchfield && ! in_array( $view_js_file, $script_handles, true ) ) {
+				$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
+			}
 		}
-		$input_markup = sprintf(
-			'<input type="search" id="%s" class="wp-block-search__input %s" name="s" value="%s" placeholder="%s" %s required />',
-			$input_id,
-			esc_attr( implode( ' ', $input_classes ) ),
-			get_search_query(),
-			esc_attr( $attributes['placeholder'] ),
-			$inline_styles['input']
-		);
 	}
 
 	if ( count( $query_params ) > 0 ) {
@@ -101,7 +116,6 @@ function render_block_core_search( $attributes ) {
 		if ( ! empty( $typography_classes ) ) {
 			$button_classes[] = $typography_classes;
 		}
-		$aria_label = '';
 
 		if ( ! $is_button_inside && ! empty( $border_color_classes ) ) {
 			$button_classes[] = $border_color_classes;
@@ -111,24 +125,27 @@ function render_block_core_search( $attributes ) {
 				$button_internal_markup = wp_kses_post( $attributes['buttonText'] );
 			}
 		} else {
-			$aria_label       = sprintf( 'aria-label="%s"', esc_attr( wp_strip_all_tags( $attributes['buttonText'] ) ) );
-			$button_classes[] = 'has-icon';
-
+			$button_classes[]       = 'has-icon';
 			$button_internal_markup =
 				'<svg class="search-icon" viewBox="0 0 24 24" width="24" height="24">
-					<path d="M13.5 6C10.5 6 8 8.5 8 11.5c0 1.1.3 2.1.9 3l-3.4 3 1 1.1 3.4-2.9c1 .9 2.2 1.4 3.6 1.4 3 0 5.5-2.5 5.5-5.5C19 8.5 16.5 6 13.5 6zm0 9.5c-2.2 0-4-1.8-4-4s1.8-4 4-4 4 1.8 4 4-1.8 4-4 4z"></path>
+					<path d="M13 5c-3.3 0-6 2.7-6 6 0 1.4.5 2.7 1.3 3.7l-3.8 3.8 1.1 1.1 3.8-3.8c1 .8 2.3 1.3 3.7 1.3 3.3 0 6-2.7 6-6S16.3 5 13 5zm0 10.5c-2.5 0-4.5-2-4.5-4.5s2-4.5 4.5-4.5 4.5 2 4.5 4.5-2 4.5-4.5 4.5z"></path>
 				</svg>';
 		}
 
 		// Include the button element class.
 		$button_classes[] = wp_theme_get_element_class_name( 'button' );
-		$button_markup    = sprintf(
-			'<button type="submit" class="%s" %s %s>%s</button>',
-			esc_attr( implode( ' ', $button_classes ) ),
-			$inline_styles['button'],
-			$aria_label,
-			$button_internal_markup
-		);
+		$button           = new WP_HTML_Tag_Processor( sprintf( '<button type="submit" %s>%s</button>', $inline_styles['button'], $button_internal_markup ) );
+
+		if ( $button->next_tag() ) {
+			$button->add_class( implode( ' ', $button_classes ) );
+			if ( 'expand-searchfield' === $attributes['buttonBehavior'] && 'button-only' === $attributes['buttonPosition'] ) {
+				$button->set_attribute( 'aria-label', __( 'Expand search field' ) );
+				$button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
+				$button->set_attribute( 'aria-expanded', 'false' );
+			} else {
+				$button->set_attribute( 'aria-label', wp_strip_all_tags( $attributes['buttonText'] ) );
+			}
+		}
 	}
 
 	$field_markup_classes = $is_button_inside ? $border_color_classes : '';
@@ -136,7 +153,7 @@ function render_block_core_search( $attributes ) {
 		'<div class="wp-block-search__inside-wrapper %s" %s>%s</div>',
 		esc_attr( $field_markup_classes ),
 		$inline_styles['wrapper'],
-		$input_markup . $query_params_markup . $button_markup
+		$input . $query_params_markup . $button
 	);
 	$wrapper_attributes   = get_block_wrapper_attributes(
 		array( 'class' => $classnames )
@@ -146,7 +163,7 @@ function render_block_core_search( $attributes ) {
 		'<form role="search" method="get" action="%s" %s>%s</form>',
 		esc_url( home_url( '/' ) ),
 		$wrapper_attributes,
-		$label_markup . $field_markup
+		$label . $field_markup
 	);
 }
 
@@ -188,6 +205,9 @@ function classnames_for_block_core_search( $attributes ) {
 
 		if ( 'button-only' === $attributes['buttonPosition'] ) {
 			$classnames[] = 'wp-block-search__button-only';
+			if ( ! empty( $attributes['buttonBehavior'] ) && 'expand-searchfield' === $attributes['buttonBehavior'] ) {
+				$classnames[] = 'wp-block-search__button-behavior-expand wp-block-search__searchfield-hidden';
+			}
 		}
 	}
 
@@ -294,10 +314,9 @@ function styles_for_block_core_search( $attributes ) {
 	$show_label       = ( isset( $attributes['showLabel'] ) ) && false !== $attributes['showLabel'];
 
 	// Add width styles.
-	$has_width   = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
-	$button_only = ! empty( $attributes['buttonPosition'] ) && 'button-only' === $attributes['buttonPosition'];
+	$has_width = ! empty( $attributes['width'] ) && ! empty( $attributes['widthUnit'] );
 
-	if ( $has_width && ! $button_only ) {
+	if ( $has_width ) {
 		$wrapper_styles[] = sprintf(
 			'width: %d%s;',
 			esc_attr( $attributes['width'] ),
diff --git a/src/wp-includes/blocks/search/block.json b/src/wp-includes/blocks/search/block.json
index fbd0fa874c408..b2873bfa8e572 100644
--- a/src/wp-includes/blocks/search/block.json
+++ b/src/wp-includes/blocks/search/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/search",
 	"title": "Search",
 	"category": "widgets",
@@ -42,6 +42,14 @@
 		"query": {
 			"type": "object",
 			"default": {}
+		},
+		"buttonBehavior": {
+			"type": "string",
+			"default": "expand-searchfield"
+		},
+		"isSearchFieldHidden": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"supports": {
@@ -82,6 +90,7 @@
 		},
 		"html": false
 	},
+	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-search-editor",
 	"style": "wp-block-search"
 }
diff --git a/src/wp-includes/blocks/search/view.asset.php b/src/wp-includes/blocks/search/view.asset.php
new file mode 100644
index 0000000000000..d6d63aede2e51
--- /dev/null
+++ b/src/wp-includes/blocks/search/view.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => 'b09d25cb6ba004114a2a');
diff --git a/src/wp-includes/blocks/search/view.min.asset.php b/src/wp-includes/blocks/search/view.min.asset.php
new file mode 100644
index 0000000000000..b5f3b4cbfb0ba
--- /dev/null
+++ b/src/wp-includes/blocks/search/view.min.asset.php
@@ -0,0 +1 @@
+<?php return array('dependencies' => array(), 'version' => 'c6277d25063d1381b56e');
diff --git a/src/wp-includes/blocks/separator/block.json b/src/wp-includes/blocks/separator/block.json
index bee358d208516..970f6b5cbb582 100644
--- a/src/wp-includes/blocks/separator/block.json
+++ b/src/wp-includes/blocks/separator/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/separator",
 	"title": "Separator",
 	"category": "design",
diff --git a/src/wp-includes/blocks/shortcode/block.json b/src/wp-includes/blocks/shortcode/block.json
index 5b36d141dd93e..22d838a7198e1 100644
--- a/src/wp-includes/blocks/shortcode/block.json
+++ b/src/wp-includes/blocks/shortcode/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/shortcode",
 	"title": "Shortcode",
 	"category": "widgets",
@@ -9,7 +9,7 @@
 	"attributes": {
 		"text": {
 			"type": "string",
-			"source": "html"
+			"source": "raw"
 		}
 	},
 	"supports": {
diff --git a/src/wp-includes/blocks/site-logo.php b/src/wp-includes/blocks/site-logo.php
index 35e199d59ded0..f1819fcaac8d0 100644
--- a/src/wp-includes/blocks/site-logo.php
+++ b/src/wp-includes/blocks/site-logo.php
@@ -13,7 +13,7 @@
  * @return string The render.
  */
 function render_block_core_site_logo( $attributes ) {
-	$adjust_width_height_filter = function ( $image ) use ( $attributes ) {
+	$adjust_width_height_filter = static function ( $image ) use ( $attributes ) {
 		if ( empty( $attributes['width'] ) || empty( $image ) || ! $image[1] || ! $image[2] ) {
 			return $image;
 		}
@@ -39,8 +39,13 @@ function render_block_core_site_logo( $attributes ) {
 	if ( $attributes['isLink'] && '_blank' === $attributes['linkTarget'] ) {
 		// Add the link target after the rel="home".
 		// Add an aria-label for informing that the page opens in a new tab.
-		$aria_label  = 'aria-label="' . esc_attr__( '(Home link, opens in a new tab)' ) . '"';
-		$custom_logo = str_replace( 'rel="home"', 'rel="home" target="' . esc_attr( $attributes['linkTarget'] ) . '"' . $aria_label, $custom_logo );
+		$processor = new WP_HTML_Tag_Processor( $custom_logo );
+		$processor->next_tag( 'a' );
+		if ( 'home' === $processor->get_attribute( 'rel' ) ) {
+			$processor->set_attribute( 'aria-label', __( '(Home link, opens in a new tab)' ) );
+			$processor->set_attribute( 'target', $attributes['linkTarget'] );
+		}
+		$custom_logo = $processor->get_updated_html();
 	}
 
 	$classnames = array();
diff --git a/src/wp-includes/blocks/site-logo/block.json b/src/wp-includes/blocks/site-logo/block.json
index f7efcb72159ff..d1e3d1b20c3da 100644
--- a/src/wp-includes/blocks/site-logo/block.json
+++ b/src/wp-includes/blocks/site-logo/block.json
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/site-logo",
 	"title": "Site Logo",
 	"category": "theme",
-	"description": "Display a graphic to represent this site. Update the block, and the changes apply everywhere it’s used. This is different than the site icon, which is the smaller image visible in your dashboard, browser tabs, etc used to help others recognize this site.",
+	"description": "Display an image to represent this site. Update this block and the changes apply everywhere.",
 	"textdomain": "default",
 	"attributes": {
 		"width": {
@@ -40,7 +40,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		}
 	},
 	"styles": [
diff --git a/src/wp-includes/blocks/site-tagline/block.json b/src/wp-includes/blocks/site-tagline/block.json
index 7a69e6b1e22a9..22fb59aab5ead 100644
--- a/src/wp-includes/blocks/site-tagline/block.json
+++ b/src/wp-includes/blocks/site-tagline/block.json
@@ -1,10 +1,10 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/site-tagline",
 	"title": "Site Tagline",
 	"category": "theme",
-	"description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it's not displayed in the theme design.",
+	"description": "Describe in a few words what the site is about. The tagline can be used in search results or when sharing on social networks even if it’s not displayed in the theme design.",
 	"keywords": [ "description" ],
 	"textdomain": "default",
 	"attributes": {
@@ -12,6 +12,7 @@
 			"type": "string"
 		}
 	},
+	"example": {},
 	"supports": {
 		"align": [ "wide", "full" ],
 		"html": false,
@@ -24,7 +25,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/site-title.php b/src/wp-includes/blocks/site-title.php
index 3c3e4d8669238..255615b3a4e45 100644
--- a/src/wp-includes/blocks/site-title.php
+++ b/src/wp-includes/blocks/site-title.php
@@ -18,8 +18,11 @@ function render_block_core_site_title( $attributes ) {
 		return;
 	}
 
-	$tag_name         = 'h1';
-	$align_class_name = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+	$tag_name = 'h1';
+	$classes  = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes .= ' has-link-color';
+	}
 
 	if ( isset( $attributes['level'] ) ) {
 		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
@@ -37,7 +40,7 @@ function render_block_core_site_title( $attributes ) {
 			esc_html( $site_title )
 		);
 	}
-	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
 
 	return sprintf(
 		'<%1$s %2$s>%3$s</%1$s>',
diff --git a/src/wp-includes/blocks/site-title/block.json b/src/wp-includes/blocks/site-title/block.json
index 717db27747d7f..e936bad0e4515 100644
--- a/src/wp-includes/blocks/site-title/block.json
+++ b/src/wp-includes/blocks/site-title/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/site-title",
 	"title": "Site Title",
 	"category": "theme",
@@ -40,7 +40,11 @@
 		},
 		"spacing": {
 			"padding": true,
-			"margin": true
+			"margin": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
@@ -60,5 +64,6 @@
 			}
 		}
 	},
-	"editorStyle": "wp-block-site-title-editor"
+	"editorStyle": "wp-block-site-title-editor",
+	"style": "wp-block-site-title"
 }
diff --git a/src/wp-includes/blocks/social-link.php b/src/wp-includes/blocks/social-link.php
index 3aabd2a9a8430..51ed9374c9bcd 100644
--- a/src/wp-includes/blocks/social-link.php
+++ b/src/wp-includes/blocks/social-link.php
@@ -20,6 +20,7 @@ function render_block_core_social_link( $attributes, $content, $block ) {
 	$service     = ( isset( $attributes['service'] ) ) ? $attributes['service'] : 'Icon';
 	$url         = ( isset( $attributes['url'] ) ) ? $attributes['url'] : false;
 	$label       = ( isset( $attributes['label'] ) ) ? $attributes['label'] : block_core_social_link_get_name( $service );
+	$rel         = ( isset( $attributes['rel'] ) ) ? $attributes['rel'] : '';
 	$show_labels = array_key_exists( 'showLabels', $block->context ) ? $block->context['showLabels'] : false;
 
 	// Don't render a link if there is no URL set.
@@ -43,27 +44,30 @@ function render_block_core_social_link( $attributes, $content, $block ) {
 		$url = 'https://' . $url;
 	}
 
-	$rel_target_attributes = '';
-	if ( $open_in_new_tab ) {
-		$rel_target_attributes = 'rel="noopener nofollow" target="_blank"';
-	}
-
 	$icon               = block_core_social_link_get_icon( $service );
 	$wrapper_attributes = get_block_wrapper_attributes(
 		array(
-			'class' => 'wp-social-link wp-social-link-' . $service,
+			'class' => 'wp-social-link wp-social-link-' . $service . block_core_social_link_get_color_classes( $block->context ),
 			'style' => block_core_social_link_get_color_styles( $block->context ),
 		)
 	);
 
 	$link  = '<li ' . $wrapper_attributes . '>';
-	$link .= '<a href="' . esc_url( $url ) . '" ' . $rel_target_attributes . ' class="wp-block-social-link-anchor">';
+	$link .= '<a href="' . esc_url( $url ) . '" class="wp-block-social-link-anchor">';
 	$link .= $icon;
 	$link .= '<span class="wp-block-social-link-label' . ( $show_labels ? '' : ' screen-reader-text' ) . '">';
 	$link .= esc_html( $label );
 	$link .= '</span></a></li>';
 
-	return $link;
+	$processor = new WP_HTML_Tag_Processor( $link );
+	$processor->next_tag( 'a' );
+	if ( $open_in_new_tab ) {
+		$processor->set_attribute( 'rel', esc_attr( $rel ) . ' noopener nofollow' );
+		$processor->set_attribute( 'target', '_blank' );
+	} elseif ( '' !== $rel ) {
+		$processor->set_attribute( 'rel', esc_attr( $rel ) );
+	}
+	return $processor->get_updated_html();
 }
 
 /**
@@ -140,7 +144,7 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 		),
 		'chain'         => array(
 			'name' => 'Link',
-			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M19.647,16.706a1.134,1.134,0,0,0-.343-.833l-2.549-2.549a1.134,1.134,0,0,0-.833-.343,1.168,1.168,0,0,0-.883.392l.233.226q.2.189.264.264a2.922,2.922,0,0,1,.184.233.986.986,0,0,1,.159.312,1.242,1.242,0,0,1,.043.337,1.172,1.172,0,0,1-1.176,1.176,1.237,1.237,0,0,1-.337-.043,1,1,0,0,1-.312-.159,2.76,2.76,0,0,1-.233-.184q-.073-.068-.264-.264l-.226-.233a1.19,1.19,0,0,0-.4.895,1.134,1.134,0,0,0,.343.833L15.837,19.3a1.13,1.13,0,0,0,.833.331,1.18,1.18,0,0,0,.833-.318l1.8-1.789a1.12,1.12,0,0,0,.343-.821Zm-8.615-8.64a1.134,1.134,0,0,0-.343-.833L8.163,4.7a1.134,1.134,0,0,0-.833-.343,1.184,1.184,0,0,0-.833.331L4.7,6.473a1.12,1.12,0,0,0-.343.821,1.134,1.134,0,0,0,.343.833l2.549,2.549a1.13,1.13,0,0,0,.833.331,1.184,1.184,0,0,0,.883-.38L8.728,10.4q-.2-.189-.264-.264A2.922,2.922,0,0,1,8.28,9.9a.986.986,0,0,1-.159-.312,1.242,1.242,0,0,1-.043-.337A1.172,1.172,0,0,1,9.254,8.079a1.237,1.237,0,0,1,.337.043,1,1,0,0,1,.312.159,2.761,2.761,0,0,1,.233.184q.073.068.264.264l.226.233a1.19,1.19,0,0,0,.4-.895ZM22,16.706a3.343,3.343,0,0,1-1.042,2.488l-1.8,1.789a3.536,3.536,0,0,1-4.988-.025l-2.525-2.537a3.384,3.384,0,0,1-1.017-2.488,3.448,3.448,0,0,1,1.078-2.561l-1.078-1.078a3.434,3.434,0,0,1-2.549,1.078,3.4,3.4,0,0,1-2.5-1.029L3.029,9.794A3.4,3.4,0,0,1,2,7.294,3.343,3.343,0,0,1,3.042,4.806l1.8-1.789A3.384,3.384,0,0,1,7.331,2a3.357,3.357,0,0,1,2.5,1.042l2.525,2.537a3.384,3.384,0,0,1,1.017,2.488,3.448,3.448,0,0,1-1.078,2.561l1.078,1.078a3.551,3.551,0,0,1,5.049-.049l2.549,2.549A3.4,3.4,0,0,1,22,16.706Z"></path></svg>',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M15.6,7.2H14v1.5h1.6c2,0,3.7,1.7,3.7,3.7s-1.7,3.7-3.7,3.7H14v1.5h1.6c2.8,0,5.2-2.3,5.2-5.2,0-2.9-2.3-5.2-5.2-5.2zM4.7,12.4c0-2,1.7-3.7,3.7-3.7H10V7.2H8.4c-2.9,0-5.2,2.3-5.2,5.2,0,2.9,2.3,5.2,5.2,5.2H10v-1.5H8.4c-2,0-3.7-1.7-3.7-3.7zm4.6.9h5.3v-1.5H9.3v1.5z"></path></svg>',
 		),
 		'codepen'       => array(
 			'name' => 'CodePen',
@@ -204,7 +208,7 @@ function block_core_social_link_services( $service = '', $field = '' ) {
 		),
 		'mail'          => array(
 			'name' => 'Mail',
-			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M20,4H4C2.895,4,2,4.895,2,6v12c0,1.105,0.895,2,2,2h16c1.105,0,2-0.895,2-2V6C22,4.895,21.105,4,20,4z M20,8.236l-8,4.882 L4,8.236V6h16V8.236z"></path></svg>',
+			'icon' => '<svg width="24" height="24" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false"><path d="M19,5H5c-1.1,0-2,.9-2,2v10c0,1.1.9,2,2,2h14c1.1,0,2-.9,2-2V7c0-1.1-.9-2-2-2zm.5,12c0,.3-.2.5-.5.5H5c-.3,0-.5-.2-.5-.5V9.8l7.5,5.6,7.5-5.6V17zm0-9.1L12,13.6,4.5,7.9V7c0-.3.2-.5.5-.5h14c.3,0,.5.2.5.5v.9z"></path></svg>',
 		),
 		'mastodon'      => array(
 			'name' => 'Mastodon',
@@ -333,3 +337,24 @@ function block_core_social_link_get_color_styles( $context ) {
 
 	return implode( '', $styles );
 }
+
+/**
+ * Returns CSS classes for icon and icon background colors.
+ *
+ * @param array $context Block context passed to Social Sharing Link.
+ *
+ * @return string CSS classes for link's icon and background colors.
+ */
+function block_core_social_link_get_color_classes( $context ) {
+	$classes = array();
+
+	if ( array_key_exists( 'iconColor', $context ) ) {
+		$classes[] = 'has-' . $context['iconColor'] . '-color';
+	}
+
+	if ( array_key_exists( 'iconBackgroundColor', $context ) ) {
+		$classes[] = 'has-' . $context['iconBackgroundColor'] . '-background-color';
+	}
+
+	return ' ' . implode( ' ', $classes );
+}
diff --git a/src/wp-includes/blocks/social-link/block.json b/src/wp-includes/blocks/social-link/block.json
index 90a3f270d738d..50e95efedb630 100644
--- a/src/wp-includes/blocks/social-link/block.json
+++ b/src/wp-includes/blocks/social-link/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/social-link",
 	"title": "Social Icon",
 	"category": "widgets",
@@ -16,12 +16,17 @@
 		},
 		"label": {
 			"type": "string"
+		},
+		"rel": {
+			"type": "string"
 		}
 	},
 	"usesContext": [
 		"openInNewTab",
 		"showLabels",
+		"iconColor",
 		"iconColorValue",
+		"iconBackgroundColor",
 		"iconBackgroundColorValue"
 	],
 	"supports": {
diff --git a/src/wp-includes/blocks/social-links/block.json b/src/wp-includes/blocks/social-links/block.json
index a7707cf195134..20206511a4c96 100644
--- a/src/wp-includes/blocks/social-links/block.json
+++ b/src/wp-includes/blocks/social-links/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/social-links",
 	"title": "Social Icons",
 	"category": "widgets",
@@ -41,14 +41,16 @@
 	"providesContext": {
 		"openInNewTab": "openInNewTab",
 		"showLabels": "showLabels",
+		"iconColor": "iconColor",
 		"iconColorValue": "iconColorValue",
+		"iconBackgroundColor": "iconBackgroundColor",
 		"iconBackgroundColorValue": "iconBackgroundColorValue"
 	},
 	"supports": {
 		"align": [ "left", "center", "right" ],
 		"anchor": true,
 		"__experimentalExposeControlsToChildren": true,
-		"__experimentalLayout": {
+		"layout": {
 			"allowSwitching": false,
 			"allowInheriting": false,
 			"allowVerticalAlignment": false,
@@ -71,7 +73,9 @@
 			"padding": true,
 			"units": [ "px", "em", "rem", "vh", "vw" ],
 			"__experimentalDefaultControls": {
-				"blockGap": true
+				"blockGap": true,
+				"margin": true,
+				"padding": false
 			}
 		}
 	},
diff --git a/src/wp-includes/blocks/spacer/block.json b/src/wp-includes/blocks/spacer/block.json
index 021ff9f4a2de3..a9da8d537f1b6 100644
--- a/src/wp-includes/blocks/spacer/block.json
+++ b/src/wp-includes/blocks/spacer/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/spacer",
 	"title": "Spacer",
 	"category": "design",
diff --git a/src/wp-includes/blocks/table/block.json b/src/wp-includes/blocks/table/block.json
index 3de088e0879b7..d1139d6c55add 100644
--- a/src/wp-includes/blocks/table/block.json
+++ b/src/wp-includes/blocks/table/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/table",
 	"title": "Table",
 	"category": "text",
@@ -47,6 +47,16 @@
 							"type": "string",
 							"source": "attribute",
 							"attribute": "data-align"
+						},
+						"colspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "colspan"
+						},
+						"rowspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "rowspan"
 						}
 					}
 				}
@@ -82,6 +92,16 @@
 							"type": "string",
 							"source": "attribute",
 							"attribute": "data-align"
+						},
+						"colspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "colspan"
+						},
+						"rowspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "rowspan"
 						}
 					}
 				}
@@ -117,6 +137,16 @@
 							"type": "string",
 							"source": "attribute",
 							"attribute": "data-align"
+						},
+						"colspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "colspan"
+						},
+						"rowspan": {
+							"type": "string",
+							"source": "attribute",
+							"attribute": "rowspan"
 						}
 					}
 				}
@@ -136,7 +166,11 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		},
 		"typography": {
 			"fontSize": true,
diff --git a/src/wp-includes/blocks/tag-cloud.php b/src/wp-includes/blocks/tag-cloud.php
index a7d121f7ca632..7ff5f78400db6 100644
--- a/src/wp-includes/blocks/tag-cloud.php
+++ b/src/wp-includes/blocks/tag-cloud.php
@@ -28,14 +28,7 @@ function render_block_core_tag_cloud( $attributes ) {
 	$tag_cloud = wp_tag_cloud( $args );
 
 	if ( ! $tag_cloud ) {
-		$labels    = get_taxonomy_labels( get_taxonomy( $attributes['taxonomy'] ) );
-		$tag_cloud = esc_html(
-			sprintf(
-				/* translators: %s: taxonomy name */
-				__( 'Your site doesn&#8217;t have any %s, so there&#8217;s nothing to display here at the moment.' ),
-				strtolower( $labels->name )
-			)
-		);
+		$tag_cloud = __( 'There&#8217;s no content to show here yet.' );
 	}
 
 	$wrapper_attributes = get_block_wrapper_attributes();
diff --git a/src/wp-includes/blocks/tag-cloud/block.json b/src/wp-includes/blocks/tag-cloud/block.json
index 69e14223f70fb..9481dc945666a 100644
--- a/src/wp-includes/blocks/tag-cloud/block.json
+++ b/src/wp-includes/blocks/tag-cloud/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/tag-cloud",
 	"title": "Tag Cloud",
 	"category": "widgets",
@@ -40,6 +40,14 @@
 		"spacing": {
 			"margin": true,
 			"padding": true
+		},
+		"typography": {
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalFontWeight": true,
+			"__experimentalFontStyle": true,
+			"__experimentalTextTransform": true,
+			"__experimentalLetterSpacing": true
 		}
 	},
 	"editorStyle": "wp-block-tag-cloud-editor"
diff --git a/src/wp-includes/blocks/template-part.php b/src/wp-includes/blocks/template-part.php
index 838210480ca28..86a1feefd6dbc 100644
--- a/src/wp-includes/blocks/template-part.php
+++ b/src/wp-includes/blocks/template-part.php
@@ -22,23 +22,24 @@ function render_block_core_template_part( $attributes ) {
 	if (
 		isset( $attributes['slug'] ) &&
 		isset( $attributes['theme'] ) &&
-		wp_get_theme()->get_stylesheet() === $attributes['theme']
+		get_stylesheet() === $attributes['theme']
 	) {
 		$template_part_id    = $attributes['theme'] . '//' . $attributes['slug'];
 		$template_part_query = new WP_Query(
 			array(
-				'post_type'      => 'wp_template_part',
-				'post_status'    => 'publish',
-				'post_name__in'  => array( $attributes['slug'] ),
-				'tax_query'      => array(
+				'post_type'           => 'wp_template_part',
+				'post_status'         => 'publish',
+				'post_name__in'       => array( $attributes['slug'] ),
+				'tax_query'           => array(
 					array(
 						'taxonomy' => 'wp_theme',
 						'field'    => 'name',
 						'terms'    => $attributes['theme'],
 					),
 				),
-				'posts_per_page' => 1,
-				'no_found_rows'  => true,
+				'posts_per_page'      => 1,
+				'no_found_rows'       => true,
+				'lazy_load_term_meta' => false, // Do not lazy load term meta, as template parts only have one term.
 			)
 		);
 		$template_part_post  = $template_part_query->have_posts() ? $template_part_query->next_post() : null;
@@ -62,18 +63,19 @@ function render_block_core_template_part( $attributes ) {
 			 */
 			do_action( 'render_block_core_template_part_post', $template_part_id, $attributes, $template_part_post, $content );
 		} else {
+			$template_part_file_path = '';
 			// Else, if the template part was provided by the active theme,
 			// render the corresponding file content.
-			$parent_theme_folders        = get_block_theme_folders( get_template() );
-			$child_theme_folders         = get_block_theme_folders( get_stylesheet() );
-			$child_theme_part_file_path  = get_theme_file_path( '/' . $child_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
-			$parent_theme_part_file_path = get_theme_file_path( '/' . $parent_theme_folders['wp_template_part'] . '/' . $attributes['slug'] . '.html' );
-			$template_part_file_path     = 0 === validate_file( $attributes['slug'] ) && file_exists( $child_theme_part_file_path ) ? $child_theme_part_file_path : $parent_theme_part_file_path;
-			if ( 0 === validate_file( $attributes['slug'] ) && file_exists( $template_part_file_path ) ) {
-				$content = file_get_contents( $template_part_file_path );
-				$content = is_string( $content ) && '' !== $content
-						? _inject_theme_attribute_in_block_template_content( $content )
-						: '';
+			if ( 0 === validate_file( $attributes['slug'] ) ) {
+				$block_template_file = _get_block_template_file( 'wp_template_part', $attributes['slug'] );
+				if ( $block_template_file ) {
+					$template_part_file_path = $block_template_file['path'];
+					$content                 = (string) file_get_contents( $template_part_file_path );
+					$content                 = '' !== $content ? _inject_theme_attribute_in_block_template_content( $content ) : '';
+					if ( isset( $block_template_file['area'] ) ) {
+						$area = $block_template_file['area'];
+					}
+				}
 			}
 
 			if ( '' !== $content && null !== $content ) {
@@ -105,8 +107,7 @@ function render_block_core_template_part( $attributes ) {
 
 	// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
 	// is set in `wp_debug_mode()`.
-	$is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
-		defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
+	$is_debug = WP_DEBUG && WP_DEBUG_DISPLAY;
 
 	if ( is_null( $content ) && $is_debug ) {
 		if ( ! isset( $attributes['slug'] ) ) {
@@ -127,27 +128,39 @@ function render_block_core_template_part( $attributes ) {
 			'';
 	}
 
+	// Look up area definition.
+	$area_definition = null;
+	$defined_areas   = get_allowed_block_template_part_areas();
+	foreach ( $defined_areas as $defined_area ) {
+		if ( $defined_area['area'] === $area ) {
+			$area_definition = $defined_area;
+			break;
+		}
+	}
+
+	// If $area is not allowed, set it back to the uncategorized default.
+	if ( ! $area_definition ) {
+		$area = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
+	}
+
 	// Run through the actions that are typically taken on the_content.
+	$content                       = shortcode_unautop( $content );
+	$content                       = do_shortcode( $content );
 	$seen_ids[ $template_part_id ] = true;
 	$content                       = do_blocks( $content );
 	unset( $seen_ids[ $template_part_id ] );
 	$content = wptexturize( $content );
 	$content = convert_smilies( $content );
-	$content = shortcode_unautop( $content );
-	$content = wp_filter_content_tags( $content );
-	$content = do_shortcode( $content );
+	$content = wp_filter_content_tags( $content, "template_part_{$area}" );
 
 	// Handle embeds for block template parts.
 	global $wp_embed;
 	$content = $wp_embed->autoembed( $content );
 
 	if ( empty( $attributes['tagName'] ) ) {
-		$defined_areas = get_allowed_block_template_part_areas();
-		$area_tag      = 'div';
-		foreach ( $defined_areas as $defined_area ) {
-			if ( $defined_area['area'] === $area && isset( $defined_area['area_tag'] ) ) {
-				$area_tag = $defined_area['area_tag'];
-			}
+		$area_tag = 'div';
+		if ( $area_definition && isset( $area_definition['area_tag'] ) ) {
+			$area_tag = $area_definition['area_tag'];
 		}
 		$html_tag = $area_tag;
 	} else {
@@ -161,21 +174,34 @@ function render_block_core_template_part( $attributes ) {
 /**
  * Returns an array of area variation objects for the template part block.
  *
+ * @param array $instance_variations The variations for instances.
+ *
  * @return array Array containing the block variation objects.
  */
-function build_template_part_block_area_variations() {
+function build_template_part_block_area_variations( $instance_variations ) {
 	$variations    = array();
 	$defined_areas = get_allowed_block_template_part_areas();
+
 	foreach ( $defined_areas as $area ) {
 		if ( 'uncategorized' !== $area['area'] ) {
+			$has_instance_for_area = false;
+			foreach ( $instance_variations as $variation ) {
+				if ( $variation['attributes']['area'] === $area['area'] ) {
+					$has_instance_for_area = true;
+					break;
+				}
+			}
+
+			$scope = $has_instance_for_area ? array() : array( 'inserter' );
+
 			$variations[] = array(
-				'name'        => $area['area'],
+				'name'        => 'area_' . $area['area'],
 				'title'       => $area['label'],
 				'description' => $area['description'],
 				'attributes'  => array(
 					'area' => $area['area'],
 				),
-				'scope'       => array( 'inserter' ),
+				'scope'       => $scope,
 				'icon'        => $area['icon'],
 			);
 		}
@@ -193,6 +219,11 @@ function build_template_part_block_instance_variations() {
 	if ( wp_installing() ) {
 		return array();
 	}
+
+	if ( ! current_theme_supports( 'block-templates' ) && ! current_theme_supports( 'block-template-parts' ) ) {
+		return array();
+	}
+
 	$variations     = array();
 	$template_parts = get_block_templates(
 		array(
@@ -206,7 +237,7 @@ function build_template_part_block_instance_variations() {
 
 	foreach ( $template_parts as $template_part ) {
 		$variations[] = array(
-			'name'        => sanitize_title( $template_part->slug ),
+			'name'        => 'instance_' . sanitize_title( $template_part->slug ),
 			'title'       => $template_part->title,
 			// If there's no description for the template part don't show the
 			// block description. This is a bit hacky, but prevent the fallback
@@ -219,7 +250,7 @@ function build_template_part_block_instance_variations() {
 				'area'  => $template_part->area,
 			),
 			'scope'       => array( 'inserter' ),
-			'icon'        => $icon_by_area[ $template_part->area ],
+			'icon'        => isset( $icon_by_area[ $template_part->area ] ) ? $icon_by_area[ $template_part->area ] : null,
 			'example'     => array(
 				'attributes' => array(
 					'slug'  => $template_part->slug,
@@ -238,7 +269,9 @@ function build_template_part_block_instance_variations() {
  * @return array Array containing the block variation objects.
  */
 function build_template_part_block_variations() {
-	return array_merge( build_template_part_block_area_variations(), build_template_part_block_instance_variations() );
+	$instance_variations = build_template_part_block_instance_variations();
+	$area_variations     = build_template_part_block_area_variations( $instance_variations );
+	return array_merge( $area_variations, $instance_variations );
 }
 
 /**
diff --git a/src/wp-includes/blocks/template-part/block.json b/src/wp-includes/blocks/template-part/block.json
index 3801eee941bc9..9fe431150ae39 100644
--- a/src/wp-includes/blocks/template-part/block.json
+++ b/src/wp-includes/blocks/template-part/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/template-part",
 	"title": "Template Part",
 	"category": "theme",
diff --git a/src/wp-includes/blocks/term-description.php b/src/wp-includes/blocks/term-description.php
index 4f1cd7e518d11..011ec28f2e5e6 100644
--- a/src/wp-includes/blocks/term-description.php
+++ b/src/wp-includes/blocks/term-description.php
@@ -23,10 +23,14 @@ function render_block_core_term_description( $attributes ) {
 		return '';
 	}
 
-	$extra_attributes   = ( isset( $attributes['textAlign'] ) )
-		? array( 'class' => 'has-text-align-' . $attributes['textAlign'] )
-		: array();
-	$wrapper_attributes = get_block_wrapper_attributes( $extra_attributes );
+	$classes = array();
+	if ( isset( $attributes['textAlign'] ) ) {
+		$classes[] = 'has-text-align-' . $attributes['textAlign'];
+	}
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes[] = 'has-link-color';
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => implode( ' ', $classes ) ) );
 
 	return '<div ' . $wrapper_attributes . '>' . $term_description . '</div>';
 }
diff --git a/src/wp-includes/blocks/term-description/block.json b/src/wp-includes/blocks/term-description/block.json
index 66eb9348a4709..fc91a4aff4c48 100644
--- a/src/wp-includes/blocks/term-description/block.json
+++ b/src/wp-includes/blocks/term-description/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/term-description",
 	"title": "Term Description",
 	"category": "theme",
@@ -38,6 +38,5 @@
 				"fontSize": true
 			}
 		}
-	},
-	"editorStyle": "wp-block-term-description-editor"
+	}
 }
diff --git a/src/wp-includes/blocks/text-columns/block.json b/src/wp-includes/blocks/text-columns/block.json
index 84d5ccece038a..3af169fadbb3b 100644
--- a/src/wp-includes/blocks/text-columns/block.json
+++ b/src/wp-includes/blocks/text-columns/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/text-columns",
 	"title": "Text Columns (deprecated)",
 	"icon": "columns",
diff --git a/src/wp-includes/blocks/verse/block.json b/src/wp-includes/blocks/verse/block.json
index dc0772cc9aa52..d0fffc8ae5076 100644
--- a/src/wp-includes/blocks/verse/block.json
+++ b/src/wp-includes/blocks/verse/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/verse",
 	"title": "Verse",
 	"category": "text",
@@ -46,7 +46,17 @@
 		},
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
+		},
+		"__experimentalBorder": {
+			"radius": true,
+			"width": true,
+			"color": true,
+			"style": true
 		}
 	},
 	"style": "wp-block-verse",
diff --git a/src/wp-includes/blocks/video/block.json b/src/wp-includes/blocks/video/block.json
index 6f53246cc8801..debe6f20fe53f 100644
--- a/src/wp-includes/blocks/video/block.json
+++ b/src/wp-includes/blocks/video/block.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/video",
 	"title": "Video",
 	"category": "media",
@@ -83,7 +83,11 @@
 		"align": true,
 		"spacing": {
 			"margin": true,
-			"padding": true
+			"padding": true,
+			"__experimentalDefaultControls": {
+				"margin": false,
+				"padding": false
+			}
 		}
 	},
 	"editorStyle": "wp-block-video-editor",
diff --git a/src/wp-includes/blocks/widget-group/block.json b/src/wp-includes/blocks/widget-group/block.json
index ec48d90eda5ca..c29e811554ac1 100644
--- a/src/wp-includes/blocks/widget-group/block.json
+++ b/src/wp-includes/blocks/widget-group/block.json
@@ -1,5 +1,5 @@
 {
-	"apiVersion": 2,
+	"apiVersion": 3,
 	"name": "core/widget-group",
 	"category": "widgets",
 	"attributes": {
diff --git a/src/wp-includes/bookmark-template.php b/src/wp-includes/bookmark-template.php
index 4c9cbeebc080b..d9bca2bbd733f 100644
--- a/src/wp-includes/bookmark-template.php
+++ b/src/wp-includes/bookmark-template.php
@@ -83,7 +83,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
 		$title = $desc;
 
 		if ( $parsed_args['show_updated'] ) {
-			if ( '00' !== substr( $bookmark->link_updated_f, 0, 2 ) ) {
+			if ( ! str_starts_with( $bookmark->link_updated_f, '00' ) ) {
 				$title .= ' (';
 				$title .= sprintf(
 					/* translators: %s: Date and time of last update. */
@@ -125,7 +125,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
 		$output .= $parsed_args['link_before'];
 
 		if ( null != $bookmark->link_image && $parsed_args['show_images'] ) {
-			if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
+			if ( str_starts_with( $bookmark->link_image, 'http' ) ) {
 				$output .= "<img src=\"$bookmark->link_image\" $alt $title />";
 			} else { // If it's a relative path.
 				$output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
diff --git a/src/wp-includes/bookmark.php b/src/wp-includes/bookmark.php
index 37a25a80f61ff..47a86d865d5b2 100644
--- a/src/wp-includes/bookmark.php
+++ b/src/wp-includes/bookmark.php
@@ -71,7 +71,7 @@ function get_bookmark( $bookmark, $output = OBJECT, $filter = 'raw' ) {
  *
  * @param string $field    The name of the data field to return.
  * @param int    $bookmark The bookmark ID to get field.
- * @param string $context  Optional. The context of how the field will be used.
+ * @param string $context  Optional. The context of how the field will be used. Default 'display'.
  * @return string|WP_Error
  */
 function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
@@ -404,8 +404,10 @@ function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
 	switch ( $field ) {
 		case 'link_category': // array( ints )
 			$value = array_map( 'absint', (array) $value );
-			// We return here so that the categories aren't filtered.
-			// The 'link_category' filter is for the name of a link category, not an array of a link's link categories.
+			/*
+			 * We return here so that the categories aren't filtered.
+			 * The 'link_category' filter is for the name of a link category, not an array of a link's link categories.
+			 */
 			return $value;
 
 		case 'link_visible': // bool stored as Y|N
diff --git a/src/wp-includes/canonical.php b/src/wp-includes/canonical.php
index 9404ed6ea5d24..606973b31dbf8 100644
--- a/src/wp-includes/canonical.php
+++ b/src/wp-includes/canonical.php
@@ -46,8 +46,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		return;
 	}
 
-	// If we're not in wp-admin and the post has been published and preview nonce
-	// is non-existent or invalid then no need for preview in query.
+	/*
+	 * If we're not in wp-admin and the post has been published and preview nonce
+	 * is non-existent or invalid then no need for preview in query.
+	 */
 	if ( is_preview() && get_query_var( 'p' ) && 'publish' === get_post_status( get_query_var( 'p' ) ) ) {
 		if ( ! isset( $_GET['preview_id'] )
 			|| ! isset( $_GET['preview_nonce'] )
@@ -331,7 +333,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			$term_count = 0;
 
 			foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {
-				$term_count += count( $tax_query['terms'] );
+				if ( isset( $tax_query['terms'] ) && is_countable( $tax_query['terms'] ) ) {
+					$term_count += count( $tax_query['terms'] );
+				}
 			}
 
 			$obj = $wp_query->get_queried_object();
@@ -387,7 +391,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 					}
 				}
 			}
-		} elseif ( is_single() && strpos( $wp_rewrite->permalink_structure, '%category%' ) !== false ) {
+		} elseif ( is_single() && str_contains( $wp_rewrite->permalink_structure, '%category%' ) ) {
 			$category_name = get_query_var( 'category_name' );
 
 			if ( $category_name ) {
@@ -516,7 +520,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 			if ( ! empty( $addl_path )
 				&& $wp_rewrite->using_index_permalinks()
-				&& strpos( $redirect['path'], '/' . $wp_rewrite->index . '/' ) === false
+				&& ! str_contains( $redirect['path'], '/' . $wp_rewrite->index . '/' )
 			) {
 				$redirect['path'] = trailingslashit( $redirect['path'] ) . $wp_rewrite->index . '/';
 			}
@@ -675,7 +679,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	}
 
 	// Strip multiple slashes out of the URL.
-	if ( strpos( $redirect['path'], '//' ) > -1 ) {
+	if ( str_contains( $redirect['path'], '//' ) ) {
 		$redirect['path'] = preg_replace( '|/+|', '/', $redirect['path'] );
 	}
 
@@ -687,8 +691,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	$original_host_low = strtolower( $original['host'] );
 	$redirect_host_low = strtolower( $redirect['host'] );
 
-	// Ignore differences in host capitalization, as this can lead to infinite redirects.
-	// Only redirect no-www <=> yes-www.
+	/*
+	 * Ignore differences in host capitalization, as this can lead to infinite redirects.
+	 * Only redirect no-www <=> yes-www.
+	 */
 	if ( $original_host_low === $redirect_host_low
 		|| ( 'www.' . $original_host_low !== $redirect_host_low
 			&& 'www.' . $redirect_host_low !== $original_host_low )
@@ -734,8 +740,8 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		return;
 	}
 
-	// Hex encoded octets are case-insensitive.
-	if ( false !== strpos( $requested_url, '%' ) ) {
+	// Hex-encoded octets are case-insensitive.
+	if ( str_contains( $requested_url, '%' ) ) {
 		if ( ! function_exists( 'lowercase_octets' ) ) {
 			/**
 			 * Converts the first hex-encoded octet match to lowercase.
diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php
index d06887a2bb621..26b150fe4b03a 100644
--- a/src/wp-includes/capabilities.php
+++ b/src/wp-includes/capabilities.php
@@ -172,8 +172,10 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
 			}
 
 			break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts.
+		/*
+		 * edit_post breaks down to edit_posts, edit_published_posts, or
+		 * edit_others_posts.
+		 */
 		case 'edit_post':
 		case 'edit_page':
 			if ( ! isset( $args[0] ) ) {
@@ -617,8 +619,10 @@ function map_meta_cap( $cap, $user_id, ...$args ) {
 		case 'install_themes':
 		case 'upload_themes':
 		case 'update_core':
-			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-			// Files in uploads are excepted.
+			/*
+			 * Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			 * Files in uploads are excepted.
+			 */
 			if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
 				$caps[] = 'do_not_allow';
 			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
@@ -975,7 +979,7 @@ function user_can( $user, $capability, ...$args ) {
 	if ( empty( $user ) ) {
 		// User is logged out, create anonymous user object.
 		$user = new WP_User( 0 );
-		$user->init( new stdClass );
+		$user->init( new stdClass() );
 	}
 
 	return $user->has_cap( $capability, ...$args );
diff --git a/src/wp-includes/category-template.php b/src/wp-includes/category-template.php
index dc0dfe7ef0d20..bfb7f6d85c0c3 100644
--- a/src/wp-includes/category-template.php
+++ b/src/wp-includes/category-template.php
@@ -568,7 +568,7 @@ function wp_list_categories( $args = '' ) {
 	}
 
 	// Descendants of exclusions should be excluded too.
-	if ( true == $parsed_args['hierarchical'] ) {
+	if ( $parsed_args['hierarchical'] ) {
 		$exclude_tree = array();
 
 		if ( $parsed_args['exclude_tree'] ) {
@@ -1084,10 +1084,11 @@ function _wp_object_name_sort_cb( $a, $b ) {
  *
  * @param object $a The first object to compare.
  * @param object $b The second object to compare.
- * @return bool Whether the count value for `$a` is greater than the count value for `$b`.
+ * @return int Negative number if `$a->count` is less than `$b->count`, zero if they are equal,
+ *             or greater than zero if `$a->count` is greater than `$b->count`.
  */
 function _wp_object_count_sort_cb( $a, $b ) {
-	return ( $a->count > $b->count );
+	return ( $a->count - $b->count );
 }
 
 //
@@ -1110,7 +1111,7 @@ function _wp_object_count_sort_cb( $a, $b ) {
 function walk_category_tree( ...$args ) {
 	// The user's options are the third parameter.
 	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
-		$walker = new Walker_Category;
+		$walker = new Walker_Category();
 	} else {
 		/**
 		 * @var Walker $walker
@@ -1136,7 +1137,7 @@ function walk_category_tree( ...$args ) {
 function walk_category_dropdown_tree( ...$args ) {
 	// The user's options are the third parameter.
 	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
-		$walker = new Walker_CategoryDropdown;
+		$walker = new Walker_CategoryDropdown();
 	} else {
 		/**
 		 * @var Walker $walker
diff --git a/src/wp-includes/category.php b/src/wp-includes/category.php
index 0c06c4c6ea353..5dc35cf6b5737 100644
--- a/src/wp-includes/category.php
+++ b/src/wp-includes/category.php
@@ -149,7 +149,8 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
 	foreach ( $categories as $category ) {
 		$path        = '/' . $leaf_path;
 		$curcategory = $category;
-		while ( ( 0 != $curcategory->parent ) && ( $curcategory->parent != $curcategory->term_id ) ) {
+
+		while ( ( 0 !== $curcategory->parent ) && ( $curcategory->parent !== $curcategory->term_id ) ) {
 			$curcategory = get_term( $curcategory->parent, 'category' );
 
 			if ( is_wp_error( $curcategory ) ) {
@@ -159,7 +160,7 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
 			$path = '/' . $curcategory->slug . $path;
 		}
 
-		if ( $path == $full_path ) {
+		if ( $path === $full_path ) {
 			$category = get_term( $category->term_id, 'category', $output );
 			_make_cat_compat( $category );
 
@@ -306,7 +307,7 @@ function get_tags( $args = '' ) {
 		 *
 		 * @param WP_Term[]|int|WP_Error $tags Array of 'post_tag' term objects, a count thereof,
 		 *                                     or WP_Error if any of the taxonomies do not exist.
-		 * @param array                  $args An array of arguments. @see get_terms()
+		 * @param array                  $args An array of arguments. See {@see get_terms()}.
 		 */
 		$tags = apply_filters( 'get_tags', $tags, $args );
 	}
diff --git a/src/wp-includes/class-json.php b/src/wp-includes/class-json.php
index 9eca6f4b578cf..6091d567f54a4 100644
--- a/src/wp-includes/class-json.php
+++ b/src/wp-includes/class-json.php
@@ -54,8 +54,8 @@
  * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright   2005 Michal Migurski
  * @version     CVS: $Id: JSON.php 305040 2010-11-02 23:19:03Z alan_k $
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ * @license     https://www.opensource.org/licenses/bsd-license.php
+ * @link        https://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
 
 /**
@@ -291,7 +291,7 @@ function encode($var)
     {
         _deprecated_function( __METHOD__, '5.3.0', 'The PHP native JSON extension' );
 
-        header('Content-type: application/json');
+        header('Content-Type: application/json');
         return $this->encodeUnsafe($var);
     }
     /**
diff --git a/src/wp-includes/class-phpass.php b/src/wp-includes/class-phpass.php
index 5411b3648391e..055925b20f7f6 100644
--- a/src/wp-includes/class-phpass.php
+++ b/src/wp-includes/class-phpass.php
@@ -173,8 +173,8 @@ function gensalt_blowfish($input)
 		$itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 
 		$output = '$2a$';
-		$output .= chr(ord('0') + $this->iteration_count_log2 / 10);
-		$output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+		$output .= chr((int)(ord('0') + $this->iteration_count_log2 / 10));
+		$output .= chr((ord('0') + $this->iteration_count_log2 % 10));
 		$output .= '$';
 
 		$i = 0;
diff --git a/src/wp-includes/class-pop3.php b/src/wp-includes/class-pop3.php
index 3c89fe50669d8..7a72b1caf81a0 100644
--- a/src/wp-includes/class-pop3.php
+++ b/src/wp-includes/class-pop3.php
@@ -11,7 +11,7 @@
  * POP3 class
  *
  * @copyright 1999-2011 The SquirrelMail Project Team
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @license https://opensource.org/licenses/gpl-license.php GNU Public License
  * @package plugins
  * @subpackage mail_fetch
  */
@@ -59,7 +59,9 @@ function __construct ( $server = '', $timeout = '' ) {
         if(!empty($timeout)) {
             settype($timeout,"integer");
             $this->TIMEOUT = $timeout;
-            set_time_limit($timeout);
+            if(function_exists("set_time_limit")){
+                set_time_limit($timeout);
+            }
         }
         return true;
     }
@@ -72,7 +74,9 @@ public function POP3( $server = '', $timeout = '' ) {
 	}
 
     function update_timer () {
-        set_time_limit($this->TIMEOUT);
+        if(function_exists("set_time_limit")){
+            set_time_limit($this->TIMEOUT);
+        }
         return true;
     }
 
@@ -443,7 +447,7 @@ function send_cmd ( $cmd = "" )
         //  Sends a user defined command string to the
         //  POP server and returns the results. Useful for
         //  non-compliant or custom POP servers.
-        //  Do NOT includ the \r\n as part of your command
+        //  Do NOT include the \r\n as part of your command
         //  string - it will be appended automatically.
 
         //  The return value is a standard fgets() call, which
diff --git a/src/wp-includes/class-requests.php b/src/wp-includes/class-requests.php
index 31bbbefe11911..4b062525b9565 100644
--- a/src/wp-includes/class-requests.php
+++ b/src/wp-includes/class-requests.php
@@ -7,7 +7,30 @@
  * Based on concepts from SimplePie_File, RequestCore and WP_Http.
  *
  * @package Requests
+ *
+ * @deprecated 6.2.0
+ */
+
+/*
+ * Integrators who cannot yet upgrade to the PSR-4 class names can silence deprecations
+ * by defining a `REQUESTS_SILENCE_PSR0_DEPRECATIONS` constant and setting it to `true`.
+ * The constant needs to be defined before this class is required.
  */
+if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS') || REQUESTS_SILENCE_PSR0_DEPRECATIONS !== true) {
+	// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+	trigger_error(
+		'The PSR-0 `Requests_...` class names in the Requests library are deprecated.'
+		. ' Switch to the PSR-4 `WpOrg\Requests\...` class names at your earliest convenience.',
+		E_USER_DEPRECATED
+	);
+
+	// Prevent the deprecation notice from being thrown twice.
+	if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS')) {
+		define('REQUESTS_SILENCE_PSR0_DEPRECATIONS', true);
+	}
+}
+
+require_once __DIR__ . '/Requests/src/Requests.php';
 
 /**
  * Requests for PHP
@@ -17,985 +40,39 @@
  * Based on concepts from SimplePie_File, RequestCore and WP_Http.
  *
  * @package Requests
+ *
+ * @deprecated 6.2.0 Use `WpOrg\Requests\Requests` instead for the actual functionality and
+ *                   use `WpOrg\Requests\Autoload` for the autoloading.
  */
-class Requests {
-	/**
-	 * POST method
-	 *
-	 * @var string
-	 */
-	const POST = 'POST';
-
-	/**
-	 * PUT method
-	 *
-	 * @var string
-	 */
-	const PUT = 'PUT';
-
-	/**
-	 * GET method
-	 *
-	 * @var string
-	 */
-	const GET = 'GET';
-
-	/**
-	 * HEAD method
-	 *
-	 * @var string
-	 */
-	const HEAD = 'HEAD';
-
-	/**
-	 * DELETE method
-	 *
-	 * @var string
-	 */
-	const DELETE = 'DELETE';
-
-	/**
-	 * OPTIONS method
-	 *
-	 * @var string
-	 */
-	const OPTIONS = 'OPTIONS';
+class Requests extends WpOrg\Requests\Requests {
 
 	/**
-	 * TRACE method
+	 * Deprecated autoloader for Requests.
 	 *
-	 * @var string
-	 */
-	const TRACE = 'TRACE';
-
-	/**
-	 * PATCH method
-	 *
-	 * @link https://tools.ietf.org/html/rfc5789
-	 * @var string
-	 */
-	const PATCH = 'PATCH';
-
-	/**
-	 * Default size of buffer size to read streams
-	 *
-	 * @var integer
-	 */
-	const BUFFER_SIZE = 1160;
-
-	/**
-	 * Current version of Requests
-	 *
-	 * @var string
-	 */
-	const VERSION = '1.8.1';
-
-	/**
-	 * Registered transport classes
-	 *
-	 * @var array
-	 */
-	protected static $transports = array();
-
-	/**
-	 * Selected transport name
-	 *
-	 * Use {@see get_transport()} instead
-	 *
-	 * @var array
-	 */
-	public static $transport = array();
-
-	/**
-	 * Default certificate path.
-	 *
-	 * @see Requests::get_certificate_path()
-	 * @see Requests::set_certificate_path()
-	 *
-	 * @var string
-	 */
-	protected static $certificate_path;
-
-	/**
-	 * This is a static class, do not instantiate it
-	 *
-	 * @codeCoverageIgnore
-	 */
-	private function __construct() {}
-
-	/**
-	 * Autoloader for Requests
-	 *
-	 * Register this with {@see register_autoloader()} if you'd like to avoid
-	 * having to create your own.
-	 *
-	 * (You can also use `spl_autoload_register` directly if you'd prefer.)
+	 * @deprecated 6.2.0 Use the `WpOrg\Requests\Autoload::load()` method instead.
 	 *
 	 * @codeCoverageIgnore
 	 *
 	 * @param string $class Class name to load
 	 */
 	public static function autoloader($class) {
-		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
-			return;
+		if (class_exists('WpOrg\Requests\Autoload') === false) {
+			require_once __DIR__ . '/Requests/src/Autoload.php';
 		}
 
-		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
-			require_once dirname(__FILE__) . '/' . $file . '.php';
-		}
+		return WpOrg\Requests\Autoload::load($class);
 	}
 
 	/**
 	 * Register the built-in autoloader
 	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function register_autoloader() {
-		spl_autoload_register(array('Requests', 'autoloader'));
-	}
-
-	/**
-	 * Register a transport
-	 *
-	 * @param string $transport Transport class to add, must support the Requests_Transport interface
-	 */
-	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
-			self::$transports = array(
-				'Requests_Transport_cURL',
-				'Requests_Transport_fsockopen',
-			);
-		}
-
-		self::$transports = array_merge(self::$transports, array($transport));
-	}
-
-	/**
-	 * Get a working transport
-	 *
-	 * @throws Requests_Exception If no valid transport is found (`notransport`)
-	 * @return Requests_Transport
-	 */
-	protected static function get_transport($capabilities = array()) {
-		// Caching code, don't bother testing coverage
-		// @codeCoverageIgnoreStart
-		// array of capabilities as a string to be used as an array key
-		ksort($capabilities);
-		$cap_string = serialize($capabilities);
-
-		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
-			$class = self::$transport[$cap_string];
-			return new $class();
-		}
-		// @codeCoverageIgnoreEnd
-
-		if (empty(self::$transports)) {
-			self::$transports = array(
-				'Requests_Transport_cURL',
-				'Requests_Transport_fsockopen',
-			);
-		}
-
-		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
-				continue;
-			}
-
-			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
-				self::$transport[$cap_string] = $class;
-				break;
-			}
-		}
-		if (self::$transport[$cap_string] === null) {
-			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
-		}
-
-		$class = self::$transport[$cap_string];
-		return new $class();
-	}
-
-	/**#@+
-	 * @see request()
-	 * @param string $url
-	 * @param array $headers
-	 * @param array $options
-	 * @return Requests_Response
-	 */
-	/**
-	 * Send a GET request
-	 */
-	public static function get($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::GET, $options);
-	}
-
-	/**
-	 * Send a HEAD request
-	 */
-	public static function head($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::HEAD, $options);
-	}
-
-	/**
-	 * Send a DELETE request
-	 */
-	public static function delete($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::DELETE, $options);
-	}
-
-	/**
-	 * Send a TRACE request
-	 */
-	public static function trace($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::TRACE, $options);
-	}
-	/**#@-*/
-
-	/**#@+
-	 * @see request()
-	 * @param string $url
-	 * @param array $headers
-	 * @param array $data
-	 * @param array $options
-	 * @return Requests_Response
-	 */
-	/**
-	 * Send a POST request
-	 */
-	public static function post($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::POST, $options);
-	}
-	/**
-	 * Send a PUT request
-	 */
-	public static function put($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::PUT, $options);
-	}
-
-	/**
-	 * Send an OPTIONS request
-	 */
-	public static function options($url, $headers = array(), $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::OPTIONS, $options);
-	}
-
-	/**
-	 * Send a PATCH request
-	 *
-	 * Note: Unlike {@see post} and {@see put}, `$headers` is required, as the
-	 * specification recommends that should send an ETag
-	 *
-	 * @link https://tools.ietf.org/html/rfc5789
-	 */
-	public static function patch($url, $headers, $data = array(), $options = array()) {
-		return self::request($url, $headers, $data, self::PATCH, $options);
-	}
-	/**#@-*/
-
-	/**
-	 * Main interface for HTTP requests
-	 *
-	 * This method initiates a request and sends it via a transport before
-	 * parsing.
-	 *
-	 * The `$options` parameter takes an associative array with the following
-	 * options:
-	 *
-	 * - `timeout`: How long should we wait for a response?
-	 *    Note: for cURL, a minimum of 1 second applies, as DNS resolution
-	 *    operates at second-resolution only.
-	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
-	 * - `connect_timeout`: How long should we wait while trying to connect?
-	 *    (float, seconds with a millisecond precision, default: 10, example: 0.01)
-	 * - `useragent`: Useragent to send to the server
-	 *    (string, default: php-requests/$version)
-	 * - `follow_redirects`: Should we follow 3xx redirects?
-	 *    (boolean, default: true)
-	 * - `redirects`: How many times should we redirect before erroring?
-	 *    (integer, default: 10)
-	 * - `blocking`: Should we block processing on this request?
-	 *    (boolean, default: true)
-	 * - `filename`: File to stream the body to instead.
-	 *    (string|boolean, default: false)
-	 * - `auth`: Authentication handler or array of user/password details to use
-	 *    for Basic authentication
-	 *    (Requests_Auth|array|boolean, default: false)
-	 * - `proxy`: Proxy details to use for proxy by-passing and authentication
-	 *    (Requests_Proxy|array|string|boolean, default: false)
-	 * - `max_bytes`: Limit for the response body size.
-	 *    (integer|boolean, default: false)
-	 * - `idn`: Enable IDN parsing
-	 *    (boolean, default: true)
-	 * - `transport`: Custom transport. Either a class name, or a
-	 *    transport object. Defaults to the first working transport from
-	 *    {@see getTransport()}
-	 *    (string|Requests_Transport, default: {@see getTransport()})
-	 * - `hooks`: Hooks handler.
-	 *    (Requests_Hooker, default: new Requests_Hooks())
-	 * - `verify`: Should we verify SSL certificates? Allows passing in a custom
-	 *    certificate file as a string. (Using true uses the system-wide root
-	 *    certificate store instead, but this may have different behaviour
-	 *    across transports.)
-	 *    (string|boolean, default: library/Requests/Transport/cacert.pem)
-	 * - `verifyname`: Should we verify the common name in the SSL certificate?
-	 *    (boolean, default: true)
-	 * - `data_format`: How should we send the `$data` parameter?
-	 *    (string, one of 'query' or 'body', default: 'query' for
-	 *    HEAD/GET/DELETE, 'body' for POST/PUT/OPTIONS/PATCH)
-	 *
-	 * @throws Requests_Exception On invalid URLs (`nonhttp`)
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Extra headers to send with the request
-	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
-	 * @param string $type HTTP request type (use Requests constants)
-	 * @param array $options Options for the request (see description for more information)
-	 * @return Requests_Response
-	 */
-	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
-			$options['type'] = $type;
-		}
-		$options = array_merge(self::get_default_options(), $options);
-
-		self::set_defaults($url, $headers, $data, $type, $options);
-
-		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
-
-		if (!empty($options['transport'])) {
-			$transport = $options['transport'];
-
-			if (is_string($options['transport'])) {
-				$transport = new $transport();
-			}
-		}
-		else {
-			$need_ssl     = (stripos($url, 'https://') === 0);
-			$capabilities = array('ssl' => $need_ssl);
-			$transport    = self::get_transport($capabilities);
-		}
-		$response = $transport->request($url, $headers, $data, $options);
-
-		$options['hooks']->dispatch('requests.before_parse', array(&$response, $url, $headers, $data, $type, $options));
-
-		return self::parse_response($response, $url, $headers, $data, $options);
-	}
-
-	/**
-	 * Send multiple HTTP requests simultaneously
-	 *
-	 * The `$requests` parameter takes an associative or indexed array of
-	 * request fields. The key of each request can be used to match up the
-	 * request with the returned data, or with the request passed into your
-	 * `multiple.request.complete` callback.
-	 *
-	 * The request fields value is an associative array with the following keys:
-	 *
-	 * - `url`: Request URL Same as the `$url` parameter to
-	 *    {@see Requests::request}
-	 *    (string, required)
-	 * - `headers`: Associative array of header fields. Same as the `$headers`
-	 *    parameter to {@see Requests::request}
-	 *    (array, default: `array()`)
-	 * - `data`: Associative array of data fields or a string. Same as the
-	 *    `$data` parameter to {@see Requests::request}
-	 *    (array|string, default: `array()`)
-	 * - `type`: HTTP request type (use Requests constants). Same as the `$type`
-	 *    parameter to {@see Requests::request}
-	 *    (string, default: `Requests::GET`)
-	 * - `cookies`: Associative array of cookie name to value, or cookie jar.
-	 *    (array|Requests_Cookie_Jar)
-	 *
-	 * If the `$options` parameter is specified, individual requests will
-	 * inherit options from it. This can be used to use a single hooking system,
-	 * or set all the types to `Requests::POST`, for example.
-	 *
-	 * In addition, the `$options` parameter takes the following global options:
-	 *
-	 * - `complete`: A callback for when a request is complete. Takes two
-	 *    parameters, a Requests_Response/Requests_Exception reference, and the
-	 *    ID from the request array (Note: this can also be overridden on a
-	 *    per-request basis, although that's a little silly)
-	 *    (callback)
-	 *
-	 * @param array $requests Requests data (see description for more information)
-	 * @param array $options Global and default options (see {@see Requests::request})
-	 * @return array Responses (either Requests_Response or a Requests_Exception object)
-	 */
-	public static function request_multiple($requests, $options = array()) {
-		$options = array_merge(self::get_default_options(true), $options);
-
-		if (!empty($options['hooks'])) {
-			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
-				$options['hooks']->register('multiple.request.complete', $options['complete']);
-			}
-		}
-
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
-				$request['headers'] = array();
-			}
-			if (!isset($request['data'])) {
-				$request['data'] = array();
-			}
-			if (!isset($request['type'])) {
-				$request['type'] = self::GET;
-			}
-			if (!isset($request['options'])) {
-				$request['options']         = $options;
-				$request['options']['type'] = $request['type'];
-			}
-			else {
-				if (empty($request['options']['type'])) {
-					$request['options']['type'] = $request['type'];
-				}
-				$request['options'] = array_merge($options, $request['options']);
-			}
-
-			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
-
-			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
-				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
-					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
-				}
-			}
-		}
-		unset($request);
-
-		if (!empty($options['transport'])) {
-			$transport = $options['transport'];
-
-			if (is_string($options['transport'])) {
-				$transport = new $transport();
-			}
-		}
-		else {
-			$transport = self::get_transport();
-		}
-		$responses = $transport->request_multiple($requests, $options);
-
-		foreach ($responses as $id => &$response) {
-			// If our hook got messed with somehow, ensure we end up with the
-			// correct response
-			if (is_string($response)) {
-				$request = $requests[$id];
-				self::parse_multiple($response, $request);
-				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
-			}
-		}
-
-		return $responses;
-	}
-
-	/**
-	 * Get the default options
-	 *
-	 * @see Requests::request() for values returned by this method
-	 * @param boolean $multirequest Is this a multirequest?
-	 * @return array Default option values
-	 */
-	protected static function get_default_options($multirequest = false) {
-		$defaults = array(
-			'timeout'          => 10,
-			'connect_timeout'  => 10,
-			'useragent'        => 'php-requests/' . self::VERSION,
-			'protocol_version' => 1.1,
-			'redirected'       => 0,
-			'redirects'        => 10,
-			'follow_redirects' => true,
-			'blocking'         => true,
-			'type'             => self::GET,
-			'filename'         => false,
-			'auth'             => false,
-			'proxy'            => false,
-			'cookies'          => false,
-			'max_bytes'        => false,
-			'idn'              => true,
-			'hooks'            => null,
-			'transport'        => null,
-			'verify'           => self::get_certificate_path(),
-			'verifyname'       => true,
-		);
-		if ($multirequest !== false) {
-			$defaults['complete'] = null;
-		}
-		return $defaults;
-	}
-
-	/**
-	 * Get default certificate path.
-	 *
-	 * @return string Default certificate path.
-	 */
-	public static function get_certificate_path() {
-		if (!empty(self::$certificate_path)) {
-			return self::$certificate_path;
-		}
-
-		return dirname(__FILE__) . '/Requests/Transport/cacert.pem';
-	}
-
-	/**
-	 * Set default certificate path.
-	 *
-	 * @param string $path Certificate path, pointing to a PEM file.
-	 */
-	public static function set_certificate_path($path) {
-		self::$certificate_path = $path;
-	}
-
-	/**
-	 * Set the default values
-	 *
-	 * @param string $url URL to request
-	 * @param array $headers Extra headers to send with the request
-	 * @param array|null $data Data to send either as a query string for GET/HEAD requests, or in the body for POST requests
-	 * @param string $type HTTP request type
-	 * @param array $options Options for the request
-	 * @return array $options
-	 */
-	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
-			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
-		}
-
-		if (empty($options['hooks'])) {
-			$options['hooks'] = new Requests_Hooks();
-		}
-
-		if (is_array($options['auth'])) {
-			$options['auth'] = new Requests_Auth_Basic($options['auth']);
-		}
-		if ($options['auth'] !== false) {
-			$options['auth']->register($options['hooks']);
-		}
-
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
-			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
-		}
-		if ($options['proxy'] !== false) {
-			$options['proxy']->register($options['hooks']);
-		}
-
-		if (is_array($options['cookies'])) {
-			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
-		}
-		elseif (empty($options['cookies'])) {
-			$options['cookies'] = new Requests_Cookie_Jar();
-		}
-		if ($options['cookies'] !== false) {
-			$options['cookies']->register($options['hooks']);
-		}
-
-		if ($options['idn'] !== false) {
-			$iri       = new Requests_IRI($url);
-			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
-			$url       = $iri->uri;
-		}
-
-		// Massage the type to ensure we support it.
-		$type = strtoupper($type);
-
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE), true)) {
-				$options['data_format'] = 'query';
-			}
-			else {
-				$options['data_format'] = 'body';
-			}
-		}
-	}
-
-	/**
-	 * HTTP response parser
-	 *
-	 * @throws Requests_Exception On missing head/body separator (`requests.no_crlf_separator`)
-	 * @throws Requests_Exception On missing head/body separator (`noversion`)
-	 * @throws Requests_Exception On missing head/body separator (`toomanyredirects`)
-	 *
-	 * @param string $headers Full response text including headers and body
-	 * @param string $url Original request URL
-	 * @param array $req_headers Original $headers array passed to {@link request()}, in case we need to follow redirects
-	 * @param array $req_data Original $data array passed to {@link request()}, in case we need to follow redirects
-	 * @param array $options Original $options array passed to {@link request()}, in case we need to follow redirects
-	 * @return Requests_Response
-	 */
-	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
-		$return = new Requests_Response();
-		if (!$options['blocking']) {
-			return $return;
-		}
-
-		$return->raw  = $headers;
-		$return->url  = (string) $url;
-		$return->body = '';
-
-		if (!$options['filename']) {
-			$pos = strpos($headers, "\r\n\r\n");
-			if ($pos === false) {
-				// Crap!
-				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
-			}
-
-			$headers = substr($return->raw, 0, $pos);
-			// Headers will always be separated from the body by two new lines - `\n\r\n\r`.
-			$body = substr($return->raw, $pos + 4);
-			if (!empty($body)) {
-				$return->body = $body;
-			}
-		}
-		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
-		$headers = str_replace("\r\n", "\n", $headers);
-		// Unfold headers (replace [CRLF] 1*( SP | HT ) with SP) as per RFC 2616 (section 2.2)
-		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
-		$headers = explode("\n", $headers);
-		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
-			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
-		}
-		$return->protocol_version = (float) $matches[1];
-		$return->status_code      = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
-			$return->success = true;
-		}
-
-		foreach ($headers as $header) {
-			list($key, $value) = explode(':', $header, 2);
-			$value             = trim($value);
-			preg_replace('#(\s+)#i', ' ', $value);
-			$return->headers[$key] = $value;
-		}
-		if (isset($return->headers['transfer-encoding'])) {
-			$return->body = self::decode_chunked($return->body);
-			unset($return->headers['transfer-encoding']);
-		}
-		if (isset($return->headers['content-encoding'])) {
-			$return->body = self::decompress($return->body);
-		}
-
-		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
-			unset($return->headers['connection']);
-		}
-
-		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
-
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
-					$options['type'] = self::GET;
-				}
-				$options['redirected']++;
-				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
-					// relative redirect, for compatibility make it absolute
-					$location = Requests_IRI::absolutize($url, $location);
-					$location = $location->uri;
-				}
-
-				$hook_args = array(
-					&$location,
-					&$req_headers,
-					&$req_data,
-					&$options,
-					$return,
-				);
-				$options['hooks']->dispatch('requests.before_redirect', $hook_args);
-				$redirected            = self::request($location, $req_headers, $req_data, $options['type'], $options);
-				$redirected->history[] = $return;
-				return $redirected;
-			}
-			elseif ($options['redirected'] >= $options['redirects']) {
-				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
-			}
-		}
-
-		$return->redirects = $options['redirected'];
-
-		$options['hooks']->dispatch('requests.after_request', array(&$return, $req_headers, $req_data, $options));
-		return $return;
-	}
-
-	/**
-	 * Callback for `transport.internal.parse_response`
-	 *
-	 * Internal use only. Converts a raw HTTP response to a Requests_Response
-	 * while still executing a multiple request.
-	 *
-	 * @param string $response Full response text including headers and body (will be overwritten with Response instance)
-	 * @param array $request Request data as passed into {@see Requests::request_multiple()}
-	 * @return null `$response` is either set to a Requests_Response instance, or a Requests_Exception object
-	 */
-	public static function parse_multiple(&$response, $request) {
-		try {
-			$url      = $request['url'];
-			$headers  = $request['headers'];
-			$data     = $request['data'];
-			$options  = $request['options'];
-			$response = self::parse_response($response, $url, $headers, $data, $options);
-		}
-		catch (Requests_Exception $e) {
-			$response = $e;
-		}
-	}
-
-	/**
-	 * Decoded a chunked body as per RFC 2616
-	 *
-	 * @see https://tools.ietf.org/html/rfc2616#section-3.6.1
-	 * @param string $data Chunked body
-	 * @return string Decoded body
-	 */
-	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
-			return $data;
-		}
-
-		$decoded = '';
-		$encoded = $data;
-
-		while (true) {
-			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
-				// Looks like it's not chunked after all
-				return $data;
-			}
-
-			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
-				// Ignore trailer headers
-				return $decoded;
-			}
-
-			$chunk_length = strlen($matches[0]);
-			$decoded     .= substr($encoded, $chunk_length, $length);
-			$encoded      = substr($encoded, $chunk_length + $length + 2);
-
-			if (trim($encoded) === '0' || empty($encoded)) {
-				return $decoded;
-			}
-		}
-
-		// We'll never actually get down here
-		// @codeCoverageIgnoreStart
-	}
-	// @codeCoverageIgnoreEnd
-
-	/**
-	 * Convert a key => value array to a 'key: value' array for headers
-	 *
-	 * @param array $array Dictionary of header values
-	 * @return array List of headers
-	 */
-	public static function flatten($array) {
-		$return = array();
-		foreach ($array as $key => $value) {
-			$return[] = sprintf('%s: %s', $key, $value);
-		}
-		return $return;
-	}
-
-	/**
-	 * Convert a key => value array to a 'key: value' array for headers
+	 * @deprecated 6.2.0 Include the `WpOrg\Requests\Autoload` class and
+	 *                   call `WpOrg\Requests\Autoload::register()` instead.
 	 *
 	 * @codeCoverageIgnore
-	 * @deprecated Misspelling of {@see Requests::flatten}
-	 * @param array $array Dictionary of header values
-	 * @return array List of headers
-	 */
-	public static function flattern($array) {
-		return self::flatten($array);
-	}
-
-	/**
-	 * Decompress an encoded body
-	 *
-	 * Implements gzip, compress and deflate. Guesses which it is by attempting
-	 * to decode.
-	 *
-	 * @param string $data Compressed data in one of the above formats
-	 * @return string Decompressed string
-	 */
-	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
-			// Not actually compressed. Probably cURL ruining this for us.
-			return $data;
-		}
-
-		if (function_exists('gzdecode')) {
-			// phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.gzdecodeFound -- Wrapped in function_exists() for PHP 5.2.
-			$decoded = @gzdecode($data);
-			if ($decoded !== false) {
-				return $decoded;
-			}
-		}
-
-		if (function_exists('gzinflate')) {
-			$decoded = @gzinflate($data);
-			if ($decoded !== false) {
-				return $decoded;
-			}
-		}
-
-		$decoded = self::compatible_gzinflate($data);
-		if ($decoded !== false) {
-			return $decoded;
-		}
-
-		if (function_exists('gzuncompress')) {
-			$decoded = @gzuncompress($data);
-			if ($decoded !== false) {
-				return $decoded;
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Decompression of deflated string while staying compatible with the majority of servers.
-	 *
-	 * Certain Servers will return deflated data with headers which PHP's gzinflate()
-	 * function cannot handle out of the box. The following function has been created from
-	 * various snippets on the gzinflate() PHP documentation.
-	 *
-	 * Warning: Magic numbers within. Due to the potential different formats that the compressed
-	 * data may be returned in, some "magic offsets" are needed to ensure proper decompression
-	 * takes place. For a simple progmatic way to determine the magic offset in use, see:
-	 * https://core.trac.wordpress.org/ticket/18273
-	 *
-	 * @since 2.8.1
-	 * @link https://core.trac.wordpress.org/ticket/18273
-	 * @link https://secure.php.net/manual/en/function.gzinflate.php#70875
-	 * @link https://secure.php.net/manual/en/function.gzinflate.php#77336
-	 *
-	 * @param string $gz_data String to decompress.
-	 * @return string|bool False on failure.
 	 */
-	public static function compatible_gzinflate($gz_data) {
-		// Compressed data might contain a full zlib header, if so strip it for
-		// gzinflate()
-		if (substr($gz_data, 0, 3) === "\x1f\x8b\x08") {
-			$i   = 10;
-			$flg = ord(substr($gz_data, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
-					list($xlen) = unpack('v', substr($gz_data, $i, 2));
-					$i         += 2 + $xlen;
-				}
-				if ($flg & 8) {
-					$i = strpos($gz_data, "\0", $i) + 1;
-				}
-				if ($flg & 16) {
-					$i = strpos($gz_data, "\0", $i) + 1;
-				}
-				if ($flg & 2) {
-					$i += 2;
-				}
-			}
-			$decompressed = self::compatible_gzinflate(substr($gz_data, $i));
-			if ($decompressed !== false) {
-				return $decompressed;
-			}
-		}
-
-		// If the data is Huffman Encoded, we must first strip the leading 2
-		// byte Huffman marker for gzinflate()
-		// The response is Huffman coded by many compressors such as
-		// java.util.zip.Deflater, Ruby’s Zlib::Deflate, and .NET's
-		// System.IO.Compression.DeflateStream.
-		//
-		// See https://decompres.blogspot.com/ for a quick explanation of this
-		// data type
-		$huffman_encoded = false;
-
-		// low nibble of first byte should be 0x08
-		list(, $first_nibble) = unpack('h', $gz_data);
-
-		// First 2 bytes should be divisible by 0x1F
-		list(, $first_two_bytes) = unpack('n', $gz_data);
-
-		if ($first_nibble === 0x08 && ($first_two_bytes % 0x1F) === 0) {
-			$huffman_encoded = true;
-		}
-
-		if ($huffman_encoded) {
-			$decompressed = @gzinflate(substr($gz_data, 2));
-			if ($decompressed !== false) {
-				return $decompressed;
-			}
-		}
-
-		if (substr($gz_data, 0, 4) === "\x50\x4b\x03\x04") {
-			// ZIP file format header
-			// Offset 6: 2 bytes, General-purpose field
-			// Offset 26: 2 bytes, filename length
-			// Offset 28: 2 bytes, optional field length
-			// Offset 30: Filename field, followed by optional field, followed
-			// immediately by data
-			list(, $general_purpose_flag) = unpack('v', substr($gz_data, 6, 2));
-
-			// If the file has been compressed on the fly, 0x08 bit is set of
-			// the general purpose field. We can use this to differentiate
-			// between a compressed document, and a ZIP file
-			$zip_compressed_on_the_fly = ((0x08 & $general_purpose_flag) === 0x08);
-
-			if (!$zip_compressed_on_the_fly) {
-				// Don't attempt to decode a compressed zip file
-				return $gz_data;
-			}
-
-			// Determine the first byte of data, based on the above ZIP header
-			// offsets:
-			$first_file_start = array_sum(unpack('v2', substr($gz_data, 26, 4)));
-			$decompressed     = @gzinflate(substr($gz_data, 30 + $first_file_start));
-			if ($decompressed !== false) {
-				return $decompressed;
-			}
-			return false;
-		}
-
-		// Finally fall back to straight gzinflate
-		$decompressed = @gzinflate($gz_data);
-		if ($decompressed !== false) {
-			return $decompressed;
-		}
-
-		// Fallback for all above failing, not expected, but included for
-		// debugging and preventing regressions and to track stats
-		$decompressed = @gzinflate(substr($gz_data, 2));
-		if ($decompressed !== false) {
-			return $decompressed;
-		}
-
-		return false;
-	}
-
-	public static function match_domain($host, $reference) {
-		// Check for a direct match
-		if ($host === $reference) {
-			return true;
-		}
-
-		// Calculate the valid wildcard match if the host is not an IP address
-		// Also validates that the host has 3 parts or more, as per Firefox's
-		// ruleset.
-		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
-			$parts[0] = '*';
-			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
-				return true;
-			}
-		}
-
-		return false;
+	public static function register_autoloader() {
+		require_once __DIR__ . '/Requests/src/Autoload.php';
+		WpOrg\Requests\Autoload::register();
 	}
 }
diff --git a/src/wp-includes/class-simplepie.php b/src/wp-includes/class-simplepie.php
index a392e54cd976e..2bd27359e6bec 100644
--- a/src/wp-includes/class-simplepie.php
+++ b/src/wp-includes/class-simplepie.php
@@ -20,9 +20,11 @@
  * WordPress autoloader for SimplePie.
  *
  * @since 3.5.0
+ *
+ * @param string $class Class name.
  */
 function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
+	if ( ! str_starts_with( $class, 'SimplePie_' ) )
 		return;
 
 	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
@@ -1864,7 +1866,7 @@ public function get_encoding()
 	}
 
 	/**
-	 * Send the content-type header with correct encoding
+	 * Send the Content-Type header with correct encoding
 	 *
 	 * This method ensures that the SimplePie-enabled page is being served with
 	 * the correct {@link http://www.iana.org/assignments/media-types/ mime-type}
@@ -1886,7 +1888,7 @@ public function handle_content_type($mime = 'text/html')
 	{
 		if (!headers_sent())
 		{
-			$header = "Content-type: $mime;";
+			$header = "Content-Type: $mime;";
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
diff --git a/src/wp-includes/class-snoopy.php b/src/wp-includes/class-snoopy.php
index fb6857c525ef0..e82c673989463 100644
--- a/src/wp-includes/class-snoopy.php
+++ b/src/wp-includes/class-snoopy.php
@@ -53,7 +53,7 @@ class Snoopy
 	var $cookies		=	array();			// array of cookies to pass
 												// $cookies["username"]="joe";
 	var	$rawheaders		=	array();			// array of raw headers to send
-												// $rawheaders["Content-type"]="text/html";
+												// $rawheaders["Content-Type"]="text/html";
 
 	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
 	var $lastredirectaddr	=	"";				// contains address of last redirected address
@@ -825,13 +825,13 @@ function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
 		if(!empty($content_type)) {
-			$headers .= "Content-type: $content_type";
+			$headers .= "Content-Type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
 		if(!empty($body))
-			$headers .= "Content-length: ".strlen($body)."\r\n";
+			$headers .= "Content-Length: ".strlen($body)."\r\n";
 		if(!empty($this->user) || !empty($this->pass))
 			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
@@ -990,12 +990,12 @@ function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 		}
 		if(!empty($content_type)) {
 			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+				$headers[] = "Content-Type: $content_type; boundary=".$this->_mime_boundary;
 			else
-				$headers[] = "Content-type: $content_type";
+				$headers[] = "Content-Type: $content_type";
 		}
 		if(!empty($body))
-			$headers[] = "Content-length: ".strlen($body);
+			$headers[] = "Content-Length: ".strlen($body);
 		if(!empty($this->user) || !empty($this->pass))
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php
index dd7252cffe386..36f631c1b24fe 100644
--- a/src/wp-includes/class-walker-category.php
+++ b/src/wp-includes/class-walker-category.php
@@ -182,6 +182,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 			} else {
 				$link .= "<img src='" . esc_url( $args['feed_image'] ) . "'$alt" . ' />';
 			}
+
 			$link .= '</a>';
 
 			if ( empty( $args['feed_image'] ) ) {
@@ -192,6 +193,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 		if ( ! empty( $args['show_count'] ) ) {
 			$link .= ' (' . number_format_i18n( $category->count ) . ')';
 		}
+
 		if ( 'list' === $args['style'] ) {
 			$output     .= "\t<li";
 			$css_classes = array(
@@ -210,17 +212,19 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 				);
 
 				foreach ( $_current_terms as $_current_term ) {
-					if ( $category->term_id == $_current_term->term_id ) {
+					if ( $category->term_id === $_current_term->term_id ) {
 						$css_classes[] = 'current-cat';
 						$link          = str_replace( '<a', '<a aria-current="page"', $link );
-					} elseif ( $category->term_id == $_current_term->parent ) {
+					} elseif ( $category->term_id === $_current_term->parent ) {
 						$css_classes[] = 'current-cat-parent';
 					}
+
 					while ( $_current_term->parent ) {
-						if ( $category->term_id == $_current_term->parent ) {
+						if ( $category->term_id === $_current_term->parent ) {
 							$css_classes[] = 'current-cat-ancestor';
 							break;
 						}
+
 						$_current_term = get_term( $_current_term->parent, $category->taxonomy );
 					}
 				}
diff --git a/src/wp-includes/class-walker-nav-menu.php b/src/wp-includes/class-walker-nav-menu.php
index 47b3368141f80..4683970c61d85 100644
--- a/src/wp-includes/class-walker-nav-menu.php
+++ b/src/wp-includes/class-walker-nav-menu.php
@@ -73,9 +73,27 @@ public function start_lvl( &$output, $depth = 0, $args = null ) {
 		 * @param int      $depth   Depth of menu item. Used for padding.
 		 */
 		$class_names = implode( ' ', apply_filters( 'nav_menu_submenu_css_class', $classes, $args, $depth ) );
-		$class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
 
-		$output .= "{$n}{$indent}<ul$class_names>{$n}";
+		$atts          = array();
+		$atts['class'] = ! empty( $class_names ) ? $class_names : '';
+
+		/**
+		 * Filters the HTML attributes applied to a menu list element.
+		 *
+		 * @since 6.3.0
+		 *
+		 * @param array $atts {
+		 *     The HTML attributes applied to the `<ul>` element, empty strings are ignored.
+		 *
+		 *     @type string $class    HTML CSS class attribute.
+		 * }
+		 * @param stdClass $args      An object of `wp_nav_menu()` arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
+		 */
+		$atts       = apply_filters( 'nav_menu_submenu_attributes', $atts, $args, $depth );
+		$attributes = $this->build_atts( $atts );
+
+		$output .= "{$n}{$indent}<ul{$attributes}>{$n}";
 	}
 
 	/**
@@ -156,7 +174,6 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
 		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item, $args, $depth ) );
-		$class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
 
 		/**
 		 * Filters the ID attribute applied to a menu item's list item element.
@@ -170,9 +187,30 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 		 * @param int      $depth        Depth of menu item. Used for padding.
 		 */
 		$id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $menu_item->ID, $menu_item, $args, $depth );
-		$id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
 
-		$output .= $indent . '<li' . $id . $class_names . '>';
+		$li_atts          = array();
+		$li_atts['id']    = ! empty( $id ) ? $id : '';
+		$li_atts['class'] = ! empty( $class_names ) ? $class_names : '';
+
+		/**
+		 * Filters the HTML attributes applied to a menu's list item element.
+		 *
+		 * @since 6.3.0
+		 *
+		 * @param array $li_atts {
+		 *     The HTML attributes applied to the menu item's `<li>` element, empty strings are ignored.
+		 *
+		 *     @type string $class        HTML CSS class attribute.
+		 *     @type string $id           HTML id attribute.
+		 * }
+		 * @param WP_Post  $menu_item The current menu item object.
+		 * @param stdClass $args      An object of wp_nav_menu() arguments.
+		 * @param int      $depth     Depth of menu item. Used for padding.
+		 */
+		$li_atts       = apply_filters( 'nav_menu_item_attributes', $li_atts, $menu_item, $args, $depth );
+		$li_attributes = $this->build_atts( $li_atts );
+
+		$output .= $indent . '<li' . $li_attributes . '>';
 
 		$atts           = array();
 		$atts['title']  = ! empty( $menu_item->attr_title ) ? $menu_item->attr_title : '';
@@ -182,7 +220,17 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 		} else {
 			$atts['rel'] = $menu_item->xfn;
 		}
-		$atts['href']         = ! empty( $menu_item->url ) ? $menu_item->url : '';
+
+		if ( ! empty( $menu_item->url ) ) {
+			if ( get_privacy_policy_url() === $menu_item->url ) {
+				$atts['rel'] = empty( $atts['rel'] ) ? 'privacy-policy' : $atts['rel'] . ' privacy-policy';
+			}
+
+			$atts['href'] = $menu_item->url;
+		} else {
+			$atts['href'] = '';
+		}
+
 		$atts['aria-current'] = $menu_item->current ? 'page' : '';
 
 		/**
@@ -204,15 +252,8 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur
 		 * @param stdClass $args      An object of wp_nav_menu() arguments.
 		 * @param int      $depth     Depth of menu item. Used for padding.
 		 */
-		$atts = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
-
-		$attributes = '';
-		foreach ( $atts as $attr => $value ) {
-			if ( is_scalar( $value ) && '' !== $value && false !== $value ) {
-				$value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
-				$attributes .= ' ' . $attr . '="' . $value . '"';
-			}
-		}
+		$atts       = apply_filters( 'nav_menu_link_attributes', $atts, $menu_item, $args, $depth );
+		$attributes = $this->build_atts( $atts );
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $menu_item->title, $menu_item->ID );
@@ -276,4 +317,23 @@ public function end_el( &$output, $data_object, $depth = 0, $args = null ) {
 		$output .= "</li>{$n}";
 	}
 
+	/**
+	 * Builds a string of HTML attributes from an array of key/value pairs.
+	 * Empty values are ignored.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param  array $atts Optional. An array of HTML attribute key/value pairs. Default empty array.
+	 * @return string A string of HTML attributes.
+	 */
+	protected function build_atts( $atts = array() ) {
+		$attribute_string = '';
+		foreach ( $atts as $attr => $value ) {
+			if ( false !== $value && '' !== $value && is_scalar( $value ) ) {
+				$value             = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+				$attribute_string .= ' ' . $attr . '="' . $value . '"';
+			}
+		}
+		return $attribute_string;
+	}
 }
diff --git a/src/wp-includes/class-walker-page-dropdown.php b/src/wp-includes/class-walker-page-dropdown.php
index 5e77d2dd260d2..4c940c1722006 100644
--- a/src/wp-includes/class-walker-page-dropdown.php
+++ b/src/wp-includes/class-walker-page-dropdown.php
@@ -69,7 +69,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 		}
 
 		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . '"';
-		if ( $page->ID == $args['selected'] ) {
+		if ( $page->ID === (int) $args['selected'] ) {
 			$output .= ' selected="selected"';
 		}
 		$output .= '>';
diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php
index bec195ed43aac..3ee5bbda61301 100644
--- a/src/wp-includes/class-walker-page.php
+++ b/src/wp-includes/class-walker-page.php
@@ -133,12 +133,12 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 				$css_class[] = 'current_page_ancestor';
 			}
 
-			if ( $page->ID == $current_page_id ) {
+			if ( $page->ID === (int) $current_page_id ) {
 				$css_class[] = 'current_page_item';
 			} elseif ( $_current_page && $page->ID === $_current_page->post_parent ) {
 				$css_class[] = 'current_page_parent';
 			}
-		} elseif ( get_option( 'page_for_posts' ) == $page->ID ) {
+		} elseif ( (int) get_option( 'page_for_posts' ) === $page->ID ) {
 			$css_class[] = 'current_page_parent';
 		}
 
@@ -168,7 +168,7 @@ public function start_el( &$output, $data_object, $depth = 0, $args = array(), $
 
 		$atts                 = array();
 		$atts['href']         = get_permalink( $page->ID );
-		$atts['aria-current'] = ( $page->ID == $current_page_id ) ? 'page' : '';
+		$atts['aria-current'] = ( $page->ID === (int) $current_page_id ) ? 'page' : '';
 
 		/**
 		 * Filters the HTML attributes applied to a page menu item's anchor element.
diff --git a/src/wp-includes/class-wp-admin-bar.php b/src/wp-includes/class-wp-admin-bar.php
index 406d76459be01..ee3888edbbda1 100644
--- a/src/wp-includes/class-wp-admin-bar.php
+++ b/src/wp-includes/class-wp-admin-bar.php
@@ -19,21 +19,14 @@ class WP_Admin_Bar {
 	public $user;
 
 	/**
-	 * @since 3.3.0
+	 * Deprecated menu property.
 	 *
-	 * @param string $name
-	 * @return string|array|void
+	 * @since 3.1.0
+	 * @deprecated 3.3.0 Modify admin bar nodes with WP_Admin_Bar::get_node(),
+	 *                   WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node().
+	 * @var array
 	 */
-	public function __get( $name ) {
-		switch ( $name ) {
-			case 'proto':
-				return is_ssl() ? 'https://' : 'http://';
-
-			case 'menu':
-				_deprecated_argument( 'WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
-				return array(); // Sorry, folks.
-		}
-	}
+	public $menu = array();
 
 	/**
 	 * Initializes the admin bar.
@@ -41,7 +34,7 @@ public function __get( $name ) {
 	 * @since 3.1.0
 	 */
 	public function initialize() {
-		$this->user = new stdClass;
+		$this->user = new stdClass();
 
 		if ( is_user_logged_in() ) {
 			/* Populate settings we need for the menu based on the current user. */
@@ -320,8 +313,10 @@ final protected function _bind() {
 			return;
 		}
 
-		// Add the root node.
-		// Clear it first, just in case. Don't mess with The Root.
+		/*
+		 * Add the root node.
+		 * Clear it first, just in case. Don't mess with The Root.
+		 */
 		$this->remove_node( 'root' );
 		$this->add_node(
 			array(
@@ -369,11 +364,15 @@ final protected function _bind() {
 				$default_id = $parent->id . '-default';
 				$default    = $this->_get_node( $default_id );
 
-				// The default group is added here to allow groups that are
-				// added before standard menu items to render first.
+				/*
+				 * The default group is added here to allow groups that are
+				 * added before standard menu items to render first.
+				 */
 				if ( ! $default ) {
-					// Use _set_node because add_node can be overloaded.
-					// Make sure to specify default settings for all properties.
+					/*
+					 * Use _set_node because add_node can be overloaded.
+					 * Make sure to specify default settings for all properties.
+					 */
 					$this->_set_node(
 						array(
 							'id'       => $default_id,
@@ -392,16 +391,20 @@ final protected function _bind() {
 				}
 				$parent = $default;
 
-				// Groups in groups aren't allowed. Add a special 'container' node.
-				// The container will invisibly wrap both groups.
+				/*
+				 * Groups in groups aren't allowed. Add a special 'container' node.
+				 * The container will invisibly wrap both groups.
+				 */
 			} elseif ( 'group' === $parent->type && 'group' === $node->type ) {
 				$container_id = $parent->id . '-container';
 				$container    = $this->_get_node( $container_id );
 
 				// We need to create a container for this group, life is sad.
 				if ( ! $container ) {
-					// Use _set_node because add_node can be overloaded.
-					// Make sure to specify default settings for all properties.
+					/*
+					 * Use _set_node because add_node can be overloaded.
+					 * Make sure to specify default settings for all properties.
+					 */
 					$this->_set_node(
 						array(
 							'id'       => $container_id,
@@ -454,8 +457,10 @@ final protected function _bind() {
 	 * @param object $root
 	 */
 	final protected function _render( $root ) {
-		// Add browser classes.
-		// We have to do this here since admin bar shows on the front end.
+		/*
+		 * Add browser classes.
+		 * We have to do this here since admin bar shows on the front end.
+		 */
 		$class = 'nojq nojs';
 		if ( wp_is_mobile() ) {
 			$class .= ' mobile';
diff --git a/src/wp-includes/class-wp-application-passwords.php b/src/wp-includes/class-wp-application-passwords.php
index c4e34350fc40a..49c4e58b6b18b 100644
--- a/src/wp-includes/class-wp-application-passwords.php
+++ b/src/wp-includes/class-wp-application-passwords.php
@@ -68,8 +68,22 @@ public static function is_in_use() {
 	 *     @type string $name   The name of the application password.
 	 *     @type string $app_id A UUID provided by the application to uniquely identify it.
 	 * }
-	 * @return array|WP_Error The first key in the array is the new password, the second is its detailed information.
-	 *                        A WP_Error instance is returned on error.
+	 * @return array|WP_Error {
+	 *     Application password details, or a WP_Error instance if an error occurs.
+	 *
+	 *     @type string $0 The unhashed generated application password.
+	 *     @type array  $1 {
+	 *         The details about the created password.
+	 *
+	 *         @type string $uuid      The unique identifier for the application password.
+	 *         @type string $app_id    A UUID provided by the application to uniquely identify it.
+	 *         @type string $name      The name of the application password.
+	 *         @type string $password  A one-way hash of the password.
+	 *         @type int    $created   Unix timestamp of when the password was created.
+	 *         @type null   $last_used Null.
+	 *         @type null   $last_ip   Null.
+	 *     }
+	 * }
 	 */
 	public static function create_new_application_password( $user_id, $args = array() ) {
 		if ( ! empty( $args['name'] ) ) {
diff --git a/src/wp-includes/class-wp-block-parser-block.php b/src/wp-includes/class-wp-block-parser-block.php
new file mode 100644
index 0000000000000..28377d3ede32b
--- /dev/null
+++ b/src/wp-includes/class-wp-block-parser-block.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Block Serialization Parser
+ *
+ * @package WordPress
+ */
+
+/**
+ * Class WP_Block_Parser_Block
+ *
+ * Holds the block structure in memory
+ *
+ * @since 5.0.0
+ */
+class WP_Block_Parser_Block {
+	/**
+	 * Name of block
+	 *
+	 * @example "core/paragraph"
+	 *
+	 * @since 5.0.0
+	 * @var string
+	 */
+	public $blockName; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+	/**
+	 * Optional set of attributes from block comment delimiters
+	 *
+	 * @example null
+	 * @example array( 'columns' => 3 )
+	 *
+	 * @since 5.0.0
+	 * @var array|null
+	 */
+	public $attrs;
+
+	/**
+	 * List of inner blocks (of this same class)
+	 *
+	 * @since 5.0.0
+	 * @var WP_Block_Parser_Block[]
+	 */
+	public $innerBlocks; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+	/**
+	 * Resultant HTML from inside block comment delimiters
+	 * after removing inner blocks
+	 *
+	 * @example "...Just <!-- wp:test /--> testing..." -> "Just testing..."
+	 *
+	 * @since 5.0.0
+	 * @var string
+	 */
+	public $innerHTML; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+	/**
+	 * List of string fragments and null markers where inner blocks were found
+	 *
+	 * @example array(
+	 *   'innerHTML'    => 'BeforeInnerAfter',
+	 *   'innerBlocks'  => array( block, block ),
+	 *   'innerContent' => array( 'Before', null, 'Inner', null, 'After' ),
+	 * )
+	 *
+	 * @since 4.2.0
+	 * @var array
+	 */
+	public $innerContent; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+
+	/**
+	 * Constructor.
+	 *
+	 * Will populate object properties from the provided arguments.
+	 *
+	 * @since 5.0.0
+	 *
+	 * @param string $name          Name of block.
+	 * @param array  $attrs         Optional set of attributes from block comment delimiters.
+	 * @param array  $inner_blocks  List of inner blocks (of this same class).
+	 * @param string $inner_html    Resultant HTML from inside block comment delimiters after removing inner blocks.
+	 * @param array  $inner_content List of string fragments and null markers where inner blocks were found.
+	 */
+	public function __construct( $name, $attrs, $inner_blocks, $inner_html, $inner_content ) {
+		$this->blockName    = $name;          // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+		$this->attrs        = $attrs;
+		$this->innerBlocks  = $inner_blocks;  // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+		$this->innerHTML    = $inner_html;    // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+		$this->innerContent = $inner_content; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+	}
+}
diff --git a/src/wp-includes/class-wp-block-parser-frame.php b/src/wp-includes/class-wp-block-parser-frame.php
new file mode 100644
index 0000000000000..15938dea389aa
--- /dev/null
+++ b/src/wp-includes/class-wp-block-parser-frame.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Block Serialization Parser
+ *
+ * @package WordPress
+ */
+
+/**
+ * Class WP_Block_Parser_Frame
+ *
+ * Holds partial blocks in memory while parsing
+ *
+ * @internal
+ * @since 5.0.0
+ */
+class WP_Block_Parser_Frame {
+	/**
+	 * Full or partial block
+	 *
+	 * @since 5.0.0
+	 * @var WP_Block_Parser_Block
+	 */
+	public $block;
+
+	/**
+	 * Byte offset into document for start of parse token
+	 *
+	 * @since 5.0.0
+	 * @var int
+	 */
+	public $token_start;
+
+	/**
+	 * Byte length of entire parse token string
+	 *
+	 * @since 5.0.0
+	 * @var int
+	 */
+	public $token_length;
+
+	/**
+	 * Byte offset into document for after parse token ends
+	 * (used during reconstruction of stack into parse production)
+	 *
+	 * @since 5.0.0
+	 * @var int
+	 */
+	public $prev_offset;
+
+	/**
+	 * Byte offset into document where leading HTML before token starts
+	 *
+	 * @since 5.0.0
+	 * @var int
+	 */
+	public $leading_html_start;
+
+	/**
+	 * Constructor
+	 *
+	 * Will populate object properties from the provided arguments.
+	 *
+	 * @since 5.0.0
+	 *
+	 * @param WP_Block_Parser_Block $block              Full or partial block.
+	 * @param int                   $token_start        Byte offset into document for start of parse token.
+	 * @param int                   $token_length       Byte length of entire parse token string.
+	 * @param int                   $prev_offset        Byte offset into document for after parse token ends.
+	 * @param int                   $leading_html_start Byte offset into document where leading HTML before token starts.
+	 */
+	public function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
+		$this->block              = $block;
+		$this->token_start        = $token_start;
+		$this->token_length       = $token_length;
+		$this->prev_offset        = isset( $prev_offset ) ? $prev_offset : $token_start + $token_length;
+		$this->leading_html_start = $leading_html_start;
+	}
+}
diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php
index 95add35cbfb6f..61f287b21fc4e 100644
--- a/src/wp-includes/class-wp-block-parser.php
+++ b/src/wp-includes/class-wp-block-parser.php
@@ -5,162 +5,6 @@
  * @package WordPress
  */
 
-/**
- * Class WP_Block_Parser_Block
- *
- * Holds the block structure in memory
- *
- * @since 5.0.0
- */
-class WP_Block_Parser_Block {
-	/**
-	 * Name of block
-	 *
-	 * @example "core/paragraph"
-	 *
-	 * @since 5.0.0
-	 * @var string
-	 */
-	public $blockName;
-
-	/**
-	 * Optional set of attributes from block comment delimiters
-	 *
-	 * @example null
-	 * @example array( 'columns' => 3 )
-	 *
-	 * @since 5.0.0
-	 * @var array|null
-	 */
-	public $attrs;
-
-	/**
-	 * List of inner blocks (of this same class)
-	 *
-	 * @since 5.0.0
-	 * @var WP_Block_Parser_Block[]
-	 */
-	public $innerBlocks;
-
-	/**
-	 * Resultant HTML from inside block comment delimiters
-	 * after removing inner blocks
-	 *
-	 * @example "...Just <!-- wp:test /--> testing..." -> "Just testing..."
-	 *
-	 * @since 5.0.0
-	 * @var string
-	 */
-	public $innerHTML;
-
-	/**
-	 * List of string fragments and null markers where inner blocks were found
-	 *
-	 * @example array(
-	 *   'innerHTML'    => 'BeforeInnerAfter',
-	 *   'innerBlocks'  => array( block, block ),
-	 *   'innerContent' => array( 'Before', null, 'Inner', null, 'After' ),
-	 * )
-	 *
-	 * @since 4.2.0
-	 * @var array
-	 */
-	public $innerContent;
-
-	/**
-	 * Constructor.
-	 *
-	 * Will populate object properties from the provided arguments.
-	 *
-	 * @since 5.0.0
-	 *
-	 * @param string $name         Name of block.
-	 * @param array  $attrs        Optional set of attributes from block comment delimiters.
-	 * @param array  $innerBlocks  List of inner blocks (of this same class).
-	 * @param string $innerHTML    Resultant HTML from inside block comment delimiters after removing inner blocks.
-	 * @param array  $innerContent List of string fragments and null markers where inner blocks were found.
-	 */
-	function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
-		$this->blockName    = $name;
-		$this->attrs        = $attrs;
-		$this->innerBlocks  = $innerBlocks;
-		$this->innerHTML    = $innerHTML;
-		$this->innerContent = $innerContent;
-	}
-}
-
-/**
- * Class WP_Block_Parser_Frame
- *
- * Holds partial blocks in memory while parsing
- *
- * @internal
- * @since 5.0.0
- */
-class WP_Block_Parser_Frame {
-	/**
-	 * Full or partial block
-	 *
-	 * @since 5.0.0
-	 * @var WP_Block_Parser_Block
-	 */
-	public $block;
-
-	/**
-	 * Byte offset into document for start of parse token
-	 *
-	 * @since 5.0.0
-	 * @var int
-	 */
-	public $token_start;
-
-	/**
-	 * Byte length of entire parse token string
-	 *
-	 * @since 5.0.0
-	 * @var int
-	 */
-	public $token_length;
-
-	/**
-	 * Byte offset into document for after parse token ends
-	 * (used during reconstruction of stack into parse production)
-	 *
-	 * @since 5.0.0
-	 * @var int
-	 */
-	public $prev_offset;
-
-	/**
-	 * Byte offset into document where leading HTML before token starts
-	 *
-	 * @since 5.0.0
-	 * @var int
-	 */
-	public $leading_html_start;
-
-	/**
-	 * Constructor
-	 *
-	 * Will populate object properties from the provided arguments.
-	 *
-	 * @since 5.0.0
-	 *
-	 * @param WP_Block_Parser_Block $block              Full or partial block.
-	 * @param int                   $token_start        Byte offset into document for start of parse token.
-	 * @param int                   $token_length       Byte length of entire parse token string.
-	 * @param int                   $prev_offset        Byte offset into document for after parse token ends.
-	 * @param int                   $leading_html_start Byte offset into document where leading HTML before token starts.
-	 */
-	function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
-		$this->block              = $block;
-		$this->token_start        = $token_start;
-		$this->token_length       = $token_length;
-		$this->prev_offset        = isset( $prev_offset ) ? $prev_offset : $token_start + $token_length;
-		$this->leading_html_start = $leading_html_start;
-	}
-}
-
 /**
  * Class WP_Block_Parser
  *
@@ -224,16 +68,16 @@ class WP_Block_Parser {
 	 * @param string $document Input document being parsed.
 	 * @return array[]
 	 */
-	function parse( $document ) {
+	public function parse( $document ) {
 		$this->document    = $document;
 		$this->offset      = 0;
 		$this->output      = array();
 		$this->stack       = array();
 		$this->empty_attrs = json_decode( '{}', true );
 
-		do {
-			// twiddle our thumbs.
-		} while ( $this->proceed() );
+		while ( $this->proceed() ) {
+			continue;
+		}
 
 		return $this->output;
 	}
@@ -252,7 +96,7 @@ function parse( $document ) {
 	 * @since 5.0.0
 	 * @return bool
 	 */
-	function proceed() {
+	public function proceed() {
 		$next_token = $this->next_token();
 		list( $token_type, $block_name, $attrs, $start_offset, $token_length ) = $next_token;
 		$stack_depth = count( $this->stack );
@@ -398,7 +242,7 @@ function proceed() {
 	 * @since 4.6.1 fixed a bug in attribute parsing which caused catastrophic backtracking on invalid block comments
 	 * @return array
 	 */
-	function next_token() {
+	public function next_token() {
 		$matches = null;
 
 		/*
@@ -470,11 +314,11 @@ function next_token() {
 	 * @internal
 	 * @since 3.9.0
 	 *
-	 * @param string $innerHTML HTML content of block.
+	 * @param string $inner_html HTML content of block.
 	 * @return WP_Block_Parser_Block freeform block object.
 	 */
-	function freeform( $innerHTML ) {
-		return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
+	public function freeform( $inner_html ) {
+		return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $inner_html, array( $inner_html ) );
 	}
 
 	/**
@@ -485,7 +329,7 @@ function freeform( $innerHTML ) {
 	 * @since 5.0.0
 	 * @param null $length how many bytes of document text to output.
 	 */
-	function add_freeform( $length = null ) {
+	public function add_freeform( $length = null ) {
 		$length = $length ? $length : strlen( $this->document ) - $this->offset;
 
 		if ( 0 === $length ) {
@@ -506,7 +350,7 @@ function add_freeform( $length = null ) {
 	 * @param int                   $token_length Byte length of entire block from start of opening token to end of closing token.
 	 * @param int|null              $last_offset  Last byte offset into document if continuing form earlier output.
 	 */
-	function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
+	public function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
 		$parent                       = $this->stack[ count( $this->stack ) - 1 ];
 		$parent->block->innerBlocks[] = (array) $block;
 		$html                         = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
@@ -527,7 +371,7 @@ function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_len
 	 * @since 5.0.0
 	 * @param int|null $end_offset byte offset into document for where we should stop sending text output as HTML.
 	 */
-	function add_block_from_stack( $end_offset = null ) {
+	public function add_block_from_stack( $end_offset = null ) {
 		$stack_top   = array_pop( $this->stack );
 		$prev_offset = $stack_top->prev_offset;
 
@@ -553,3 +397,17 @@ function add_block_from_stack( $end_offset = null ) {
 		$this->output[] = (array) $stack_top->block;
 	}
 }
+
+/**
+ * WP_Block_Parser_Block class.
+ *
+ * Required for backward compatibility in WordPress Core.
+ */
+require_once __DIR__ . '/class-wp-block-parser-block.php';
+
+/**
+ * WP_Block_Parser_Frame class.
+ *
+ * Required for backward compatibility in WordPress Core.
+ */
+require_once __DIR__ . '/class-wp-block-parser-frame.php';
diff --git a/src/wp-includes/class-wp-block-patterns-registry.php b/src/wp-includes/class-wp-block-patterns-registry.php
index bfbc651341acf..a83b35185b671 100644
--- a/src/wp-includes/class-wp-block-patterns-registry.php
+++ b/src/wp-includes/class-wp-block-patterns-registry.php
@@ -43,33 +43,42 @@ final class WP_Block_Patterns_Registry {
 	 *
 	 * @since 5.5.0
 	 * @since 5.8.0 Added support for the `blockTypes` property.
+	 * @since 6.1.0 Added support for the `postTypes` property.
+	 * @since 6.2.0 Added support for the `templateTypes` property.
 	 *
 	 * @param string $pattern_name       Block pattern name including namespace.
 	 * @param array  $pattern_properties {
 	 *     List of properties for the block pattern.
 	 *
-	 *     @type string $title         Required. A human-readable title for the pattern.
-	 *     @type string $content       Required. Block HTML markup for the pattern.
-	 *     @type string $description   Optional. Visually hidden text used to describe the pattern in the
-	 *                                 inserter. A description is optional, but is strongly
-	 *                                 encouraged when the title does not fully describe what the
-	 *                                 pattern does. The description will help users discover the
-	 *                                 pattern while searching.
-	 *     @type int    $viewportWidth Optional. The intended width of the pattern to allow for a scaled
-	 *                                 preview within the pattern inserter.
-	 *     @type array  $categories    Optional. A list of registered pattern categories used to group block
-	 *                                 patterns. Block patterns can be shown on multiple categories.
-	 *                                 A category must be registered separately in order to be used
-	 *                                 here.
-	 *     @type array  $blockTypes    Optional. A list of block names including namespace that could use
-	 *                                 the block pattern in certain contexts (placeholder, transforms).
-	 *                                 The block pattern is available in the block editor inserter
-	 *                                 regardless of this list of block names.
-	 *                                 Certain blocks support further specificity besides the block name
-	 *                                 (e.g. for `core/template-part` you can specify areas
-	 *                                 like `core/template-part/header` or `core/template-part/footer`).
-	 *     @type array  $keywords      Optional. A list of aliases or keywords that help users discover the
-	 *                                 pattern while searching.
+	 *     @type string   $title         Required. A human-readable title for the pattern.
+	 *     @type string   $content       Required. Block HTML markup for the pattern.
+	 *     @type string   $description   Optional. Visually hidden text used to describe the pattern
+	 *                                   in the inserter. A description is optional, but is strongly
+	 *                                   encouraged when the title does not fully describe what the
+	 *                                   pattern does. The description will help users discover the
+	 *                                   pattern while searching.
+	 *     @type int      $viewportWidth Optional. The intended width of the pattern to allow for a scaled
+	 *                                   preview within the pattern inserter.
+	 *     @type bool     $inserter      Optional. Determines whether the pattern is visible in inserter.
+	 *                                   To hide a pattern so that it can only be inserted programmatically,
+	 *                                   set this to false. Default true.
+	 *     @type string[] $categories    Optional. A list of registered pattern categories used to group
+	 *                                   block patterns. Block patterns can be shown on multiple categories.
+	 *                                   A category must be registered separately in order to be used here.
+	 *     @type string[] $keywords      Optional. A list of aliases or keywords that help users discover
+	 *                                   the pattern while searching.
+	 *     @type string[] $blockTypes    Optional. A list of block names including namespace that could use
+	 *                                   the block pattern in certain contexts (placeholder, transforms).
+	 *                                   The block pattern is available in the block editor inserter
+	 *                                   regardless of this list of block names.
+	 *                                   Certain blocks support further specificity besides the block name
+	 *                                   (e.g. for `core/template-part` you can specify areas
+	 *                                   like `core/template-part/header` or `core/template-part/footer`).
+	 *     @type string[] $postTypes     Optional. An array of post types that the pattern is restricted
+	 *                                   to be used with. The pattern will only be available when editing one
+	 *                                   of the post types passed on the array. For all the other post types
+	 *                                   not part of the array the pattern is not available at all.
+	 *     @type string[] $templateTypes Optional. An array of template types where the pattern fits.
 	 * }
 	 * @return bool True if the pattern was registered with success and false otherwise.
 	 */
diff --git a/src/wp-includes/class-wp-block-supports.php b/src/wp-includes/class-wp-block-supports.php
index d6ef909af5d08..ee2791dd17e1e 100644
--- a/src/wp-includes/class-wp-block-supports.php
+++ b/src/wp-includes/class-wp-block-supports.php
@@ -91,7 +91,7 @@ public function register( $block_support_name, $block_support_config ) {
 	 *
 	 * @since 5.6.0
 	 *
-	 * @return string[] Array of HTML attributes.
+	 * @return string[] Array of HTML attribute values keyed by their name.
 	 */
 	public function apply_block_supports() {
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered(
@@ -181,7 +181,7 @@ function get_block_wrapper_attributes( $extra_attributes = array() ) {
 
 	// This is hardcoded on purpose.
 	// We only support a fixed list of attributes.
-	$attributes_to_merge = array( 'style', 'class' );
+	$attributes_to_merge = array( 'style', 'class', 'id' );
 	$attributes          = array();
 	foreach ( $attributes_to_merge as $attribute_name ) {
 		if ( empty( $new_attributes[ $attribute_name ] ) && empty( $extra_attributes[ $attribute_name ] ) ) {
diff --git a/src/wp-includes/class-wp-block-template.php b/src/wp-includes/class-wp-block-template.php
index 898ddf0dd316b..8149935203220 100644
--- a/src/wp-includes/class-wp-block-template.php
+++ b/src/wp-includes/class-wp-block-template.php
@@ -84,7 +84,7 @@ class WP_Block_Template {
 	 * 'custom'.
 	 *
 	 * @since 5.9.0
-	 * @var string
+	 * @var string|null
 	 */
 	public $origin;
 
@@ -127,7 +127,7 @@ class WP_Block_Template {
 	 * A value of 0 means no author.
 	 *
 	 * @since 5.9.0
-	 * @var int
+	 * @var int|null
 	 */
 	public $author;
 
@@ -135,7 +135,7 @@ class WP_Block_Template {
 	 * Post types.
 	 *
 	 * @since 5.9.0
-	 * @var array
+	 * @var string[]|null
 	 */
 	public $post_types;
 
@@ -143,7 +143,15 @@ class WP_Block_Template {
 	 * Area.
 	 *
 	 * @since 5.9.0
-	 * @var string
+	 * @var string|null
 	 */
 	public $area;
+
+	/**
+	 * Modified.
+	 *
+	 * @since 6.3.0
+	 * @var string|null
+	 */
+	public $modified;
 }
diff --git a/src/wp-includes/class-wp-block-type.php b/src/wp-includes/class-wp-block-type.php
index 505c504037439..e28bacd3b211c 100644
--- a/src/wp-includes/class-wp-block-type.php
+++ b/src/wp-includes/class-wp-block-type.php
@@ -117,6 +117,14 @@ class WP_Block_Type {
 	 */
 	public $variations = array();
 
+	/**
+	 * Custom CSS selectors for theme.json style generation.
+	 *
+	 * @since 6.3.0
+	 * @var array
+	 */
+	public $selectors = array();
+
 	/**
 	 * Supported features.
 	 *
@@ -245,6 +253,7 @@ class WP_Block_Type {
 	 * @since 6.1.0 Added the `editor_script_handles`, `script_handles`, `view_script_handles,
 	 *              `editor_style_handles`, and `style_handles` properties.
 	 *              Deprecated the `editor_script`, `script`, `view_script`, `editor_style`, and `style` properties.
+	 * @since 6.3.0 Added the `selectors` property.
 	 *
 	 * @see register_block_type()
 	 *
@@ -268,6 +277,7 @@ class WP_Block_Type {
 	 *     @type string|null   $textdomain               The translation textdomain.
 	 *     @type array[]       $styles                   Alternative block styles.
 	 *     @type array[]       $variations               Block variations.
+	 *     @type array         $selectors                Custom CSS selectors for theme.json style generation.
 	 *     @type array|null    $supports                 Supported features.
 	 *     @type array|null    $example                  Structured data for the block preview.
 	 *     @type callable|null $render_callback          Block type render callback.
@@ -299,7 +309,7 @@ public function __construct( $block_type, $args = array() ) {
 	 *                                   null when value not found, or void when unknown property name provided.
 	 */
 	public function __get( $name ) {
-		if ( ! in_array( $name, $this->deprecated_properties ) ) {
+		if ( ! in_array( $name, $this->deprecated_properties, true ) ) {
 			return;
 		}
 
@@ -323,11 +333,11 @@ public function __get( $name ) {
 	 *
 	 * @param string $name Deprecated property name.
 	 *
-	 * @return boolean Returns true when for the new property the first item in the array exists,
-	 *                     or false otherwise.
+	 * @return bool Returns true when for the new property the first item in the array exists,
+	 *              or false otherwise.
 	 */
 	public function __isset( $name ) {
-		if ( ! in_array( $name, $this->deprecated_properties ) ) {
+		if ( ! in_array( $name, $this->deprecated_properties, true ) ) {
 			return false;
 		}
 
@@ -346,7 +356,7 @@ public function __isset( $name ) {
 	 * @param mixed  $value Property value.
 	 */
 	public function __set( $name, $value ) {
-		if ( ! in_array( $name, $this->deprecated_properties ) ) {
+		if ( ! in_array( $name, $this->deprecated_properties, true ) ) {
 			$this->{$name} = $value;
 			return;
 		}
diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php
index 8a51e66085bb4..890ae5e559353 100644
--- a/src/wp-includes/class-wp-block.php
+++ b/src/wp-includes/class-wp-block.php
@@ -196,6 +196,8 @@ public function __get( $name ) {
 	 *
 	 * @since 5.5.0
 	 *
+	 * @global WP_Post $post Global post object.
+	 *
 	 * @param array $options {
 	 *     Optional options object.
 	 *
diff --git a/src/wp-includes/class-wp-classic-to-block-menu-converter.php b/src/wp-includes/class-wp-classic-to-block-menu-converter.php
new file mode 100644
index 0000000000000..6430aab6fa4a0
--- /dev/null
+++ b/src/wp-includes/class-wp-classic-to-block-menu-converter.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * WP_Classic_To_Block_Menu_Converter class
+ *
+ * @package WordPress
+ * @since 6.3.0
+ */
+
+/**
+ * Converts a Classic Menu to Block Menu blocks.
+ *
+ * @since 6.3.0
+ * @access public
+ */
+class WP_Classic_To_Block_Menu_Converter {
+
+	/**
+	 * Converts a Classic Menu to blocks.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Term $menu The Menu term object of the menu to convert.
+	 * @return string|WP_Error The serialized and normalized parsed blocks on success,
+	 *                         an empty string when there are no menus to convert,
+	 *                         or WP_Error on invalid menu.
+	 */
+	public static function convert( $menu ) {
+
+		if ( ! is_nav_menu( $menu ) ) {
+			return new WP_Error(
+				'invalid_menu',
+				__( 'The menu provided is not a valid menu.' )
+			);
+		}
+
+		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+
+		if ( empty( $menu_items ) ) {
+			return '';
+		}
+
+		// Set up the $menu_item variables.
+		// Adds the class property classes for the current context, if applicable.
+		_wp_menu_item_classes_by_context( $menu_items );
+
+		$menu_items_by_parent_id = static::group_by_parent_id( $menu_items );
+
+		$first_menu_item = isset( $menu_items_by_parent_id[0] )
+			? $menu_items_by_parent_id[0]
+			: array();
+
+		$inner_blocks = static::to_blocks(
+			$first_menu_item,
+			$menu_items_by_parent_id
+		);
+
+		return serialize_blocks( $inner_blocks );
+	}
+
+	/**
+	 * Returns an array of menu items grouped by the id of the parent menu item.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $menu_items An array of menu items.
+	 * @return array
+	 */
+	private static function group_by_parent_id( $menu_items ) {
+		$menu_items_by_parent_id = array();
+
+		foreach ( $menu_items as $menu_item ) {
+			$menu_items_by_parent_id[ $menu_item->menu_item_parent ][] = $menu_item;
+		}
+
+		return $menu_items_by_parent_id;
+	}
+
+	/**
+	 * Turns menu item data into a nested array of parsed blocks
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $menu_items              An array of menu items that represent
+	 *                                       an individual level of a menu.
+	 * @param array $menu_items_by_parent_id An array keyed by the id of the
+	 *                                       parent menu where each element is an
+	 *                                       array of menu items that belong to
+	 *                                       that parent.
+	 * @return array An array of parsed block data.
+	 */
+	private static function to_blocks( $menu_items, $menu_items_by_parent_id ) {
+
+		if ( empty( $menu_items ) ) {
+			return array();
+		}
+
+		$blocks = array();
+
+		foreach ( $menu_items as $menu_item ) {
+			$class_name       = ! empty( $menu_item->classes ) ? implode( ' ', (array) $menu_item->classes ) : null;
+			$id               = ( null !== $menu_item->object_id && 'custom' !== $menu_item->object ) ? $menu_item->object_id : null;
+			$opens_in_new_tab = null !== $menu_item->target && '_blank' === $menu_item->target;
+			$rel              = ( null !== $menu_item->xfn && '' !== $menu_item->xfn ) ? $menu_item->xfn : null;
+			$kind             = null !== $menu_item->type ? str_replace( '_', '-', $menu_item->type ) : 'custom';
+
+			$block = array(
+				'blockName' => isset( $menu_items_by_parent_id[ $menu_item->ID ] ) ? 'core/navigation-submenu' : 'core/navigation-link',
+				'attrs'     => array(
+					'className'     => $class_name,
+					'description'   => $menu_item->description,
+					'id'            => $id,
+					'kind'          => $kind,
+					'label'         => $menu_item->title,
+					'opensInNewTab' => $opens_in_new_tab,
+					'rel'           => $rel,
+					'title'         => $menu_item->attr_title,
+					'type'          => $menu_item->object,
+					'url'           => $menu_item->url,
+				),
+			);
+
+			$block['innerBlocks']  = isset( $menu_items_by_parent_id[ $menu_item->ID ] )
+			? static::to_blocks( $menu_items_by_parent_id[ $menu_item->ID ], $menu_items_by_parent_id )
+			: array();
+			$block['innerContent'] = array_map( 'serialize_block', $block['innerBlocks'] );
+
+			$blocks[] = $block;
+		}
+
+		return $blocks;
+	}
+}
diff --git a/src/wp-includes/class-wp-comment-query.php b/src/wp-includes/class-wp-comment-query.php
index dad512c419122..40f283896653e 100644
--- a/src/wp-includes/class-wp-comment-query.php
+++ b/src/wp-includes/class-wp-comment-query.php
@@ -452,7 +452,7 @@ public function get_comments() {
 		$last_changed = wp_cache_get_last_changed( 'comment' );
 
 		$cache_key   = "get_comments:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'comment' );
+		$cache_value = wp_cache_get( $cache_key, 'comment-queries' );
 		if ( false === $cache_value ) {
 			$comment_ids = $this->get_comment_ids();
 			if ( $comment_ids ) {
@@ -463,7 +463,7 @@ public function get_comments() {
 				'comment_ids'    => $comment_ids,
 				'found_comments' => $this->found_comments,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'comment' );
+			wp_cache_add( $cache_key, $cache_value, 'comment-queries' );
 		} else {
 			$comment_ids          = $cache_value['comment_ids'];
 			$this->found_comments = $cache_value['found_comments'];
@@ -481,12 +481,16 @@ public function get_comments() {
 
 		$comment_ids = array_map( 'intval', $comment_ids );
 
+		if ( $this->query_vars['update_comment_meta_cache'] ) {
+			wp_lazyload_comment_meta( $comment_ids );
+		}
+
 		if ( 'ids' === $this->query_vars['fields'] ) {
 			$this->comments = $comment_ids;
 			return $this->comments;
 		}
 
-		_prime_comment_caches( $comment_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches( $comment_ids, false );
 
 		// Fetch full comment objects from the primed cache.
 		$_comments = array();
@@ -584,8 +588,6 @@ protected function get_comment_ids() {
 		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
 			$include_unapproved = wp_parse_list( $this->query_vars['include_unapproved'] );
 
-			$unapproved_ids    = array();
-			$unapproved_emails = array();
 			foreach ( $include_unapproved as $unapproved_identifier ) {
 				// Numeric values are assumed to be user IDs.
 				if ( is_numeric( $unapproved_identifier ) ) {
@@ -675,7 +677,7 @@ protected function get_comment_ids() {
 				// If no date-related order is available, use the date from the first available clause.
 				if ( ! $comment_id_order ) {
 					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+						if ( str_contains( 'ASC', $orderby_clause ) ) {
 							$comment_id_order = 'ASC';
 						} else {
 							$comment_id_order = 'DESC';
@@ -1013,14 +1015,10 @@ private function set_found_comments() {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
 	 * @param WP_Comment[] $comments Array of top-level comments whose descendants should be filled in.
 	 * @return array
 	 */
 	protected function fill_descendants( $comments ) {
-		global $wpdb;
-
 		$levels = array(
 			0 => wp_list_pluck( $comments, 'comment_ID' ),
 		);
@@ -1036,13 +1034,19 @@ protected function fill_descendants( $comments ) {
 			$child_ids           = array();
 			$uncached_parent_ids = array();
 			$_parent_ids         = $levels[ $level ];
-			foreach ( $_parent_ids as $parent_id ) {
-				$cache_key        = "get_comment_child_ids:$parent_id:$key:$last_changed";
-				$parent_child_ids = wp_cache_get( $cache_key, 'comment' );
-				if ( false !== $parent_child_ids ) {
-					$child_ids = array_merge( $child_ids, $parent_child_ids );
-				} else {
-					$uncached_parent_ids[] = $parent_id;
+			if ( $_parent_ids ) {
+				$cache_keys = array();
+				foreach ( $_parent_ids as $parent_id ) {
+					$cache_keys[ $parent_id ] = "get_comment_child_ids:$parent_id:$key:$last_changed";
+				}
+				$cache_data = wp_cache_get_multiple( array_values( $cache_keys ), 'comment-queries' );
+				foreach ( $_parent_ids as $parent_id ) {
+					$parent_child_ids = $cache_data[ $cache_keys[ $parent_id ] ];
+					if ( false !== $parent_child_ids ) {
+						$child_ids = array_merge( $child_ids, $parent_child_ids );
+					} else {
+						$uncached_parent_ids[] = $parent_id;
+					}
 				}
 			}
 
@@ -1072,7 +1076,7 @@ protected function fill_descendants( $comments ) {
 					$cache_key          = "get_comment_child_ids:$parent_id:$key:$last_changed";
 					$data[ $cache_key ] = $children;
 				}
-				wp_cache_set_multiple( $data, 'comment' );
+				wp_cache_set_multiple( $data, 'comment-queries' );
 			}
 
 			$level++;
diff --git a/src/wp-includes/class-wp-comment.php b/src/wp-includes/class-wp-comment.php
index c5f8cc49f4076..996815939dfd0 100644
--- a/src/wp-includes/class-wp-comment.php
+++ b/src/wp-includes/class-wp-comment.php
@@ -219,7 +219,7 @@ public function __construct( $comment ) {
 	}
 
 	/**
-	 * Convert object to array.
+	 * Converts object to array.
 	 *
 	 * @since 4.4.0
 	 *
@@ -230,7 +230,7 @@ public function to_array() {
 	}
 
 	/**
-	 * Get the children of a comment.
+	 * Gets the children of a comment.
 	 *
 	 * @since 4.4.0
 	 *
@@ -302,7 +302,7 @@ public function get_children( $args = array() ) {
 	}
 
 	/**
-	 * Add a child to the comment.
+	 * Adds a child to the comment.
 	 *
 	 * Used by `WP_Comment_Query` when bulk-filling descendants.
 	 *
@@ -315,7 +315,7 @@ public function add_child( WP_Comment $child ) {
 	}
 
 	/**
-	 * Get a child comment by ID.
+	 * Gets a child comment by ID.
 	 *
 	 * @since 4.4.0
 	 *
@@ -331,7 +331,7 @@ public function get_child( $child_id ) {
 	}
 
 	/**
-	 * Set the 'populated_children' flag.
+	 * Sets the 'populated_children' flag.
 	 *
 	 * This flag is important for ensuring that calling `get_children()` on a childless comment will not trigger
 	 * unneeded database queries.
@@ -345,7 +345,7 @@ public function populated_children( $set ) {
 	}
 
 	/**
-	 * Check whether a non-public property is set.
+	 * Determines whether a non-public property is set.
 	 *
 	 * If `$name` matches a post field, the comment post will be loaded and the post's value checked.
 	 *
@@ -368,7 +368,7 @@ public function __isset( $name ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string $name
+	 * @param string $name Property name.
 	 * @return mixed
 	 */
 	public function __get( $name ) {
diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php
index 64ed528cc29fc..ab4d2523a0eb7 100644
--- a/src/wp-includes/class-wp-customize-control.php
+++ b/src/wp-includes/class-wp-customize-control.php
@@ -607,8 +607,11 @@ protected function render_content() {
 				// Hackily add in the data link parameter.
 				$dropdown = str_replace( '<select', '<select ' . $this->get_link() . ' id="' . esc_attr( $input_id ) . '" ' . $describedby_attr, $dropdown );
 
-				// Even more hacikly add auto-draft page stubs.
-				// @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call. See <https://github.com/xwp/wp-customize-posts/pull/250>.
+				/*
+				 * Even more hacikly add auto-draft page stubs.
+				 * @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call.
+				 * See <https://github.com/xwp/wp-customize-posts/pull/250>.
+				 */
 				$nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
 				if ( $nav_menus_created_posts_setting && current_user_can( 'publish_pages' ) ) {
 					$auto_draft_page_options = '';
@@ -633,7 +636,12 @@ protected function render_content() {
 						?>
 					</button>
 					<div class="new-content-item">
-						<label for="create-input-<?php echo esc_attr( $this->id ); ?>"><span class="screen-reader-text"><?php _e( 'New page title' ); ?></span></label>
+						<label for="create-input-<?php echo esc_attr( $this->id ); ?>"><span class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'New page title' );
+							?>
+						</span></label>
 						<input type="text" id="create-input-<?php echo esc_attr( $this->id ); ?>" class="create-item-input" placeholder="<?php esc_attr_e( 'New page title&hellip;' ); ?>">
 						<button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
 					</div>
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index fe03a93c1eee9..77176609bc04f 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -271,8 +271,10 @@ public function __construct( $args = array() ) {
 			$args['changeset_uuid'] = wp_generate_uuid4();
 		}
 
-		// The theme and messenger_channel should be supplied via $args,
-		// but they are also looked at in the $_REQUEST global here for back-compat.
+		/*
+		 * The theme and messenger_channel should be supplied via $args,
+		 * but they are also looked at in the $_REQUEST global here for back-compat.
+		 */
 		if ( ! isset( $args['theme'] ) ) {
 			if ( isset( $_REQUEST['customize_theme'] ) ) {
 				$args['theme'] = wp_unslash( $_REQUEST['customize_theme'] );
@@ -565,8 +567,10 @@ public function setup_theme() {
 			// Once the theme is loaded, we'll validate it.
 			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
 		} else {
-			// If the requested theme is not the active theme and the user doesn't have
-			// the switch_themes cap, bail.
+			/*
+			 * If the requested theme is not the active theme and the user doesn't have
+			 * the switch_themes cap, bail.
+			 */
 			if ( ! current_user_can( 'switch_themes' ) ) {
 				$this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
 			}
@@ -905,8 +909,10 @@ public function is_theme_active() {
 	 */
 	public function wp_loaded() {
 
-		// Unconditionally register core types for panels, sections, and controls
-		// in case plugin unhooks all customize_register actions.
+		/*
+		 * Unconditionally register core types for panels, sections, and controls
+		 * in case plugin unhooks all customize_register actions.
+		 */
 		$this->register_panel_type( 'WP_Customize_Panel' );
 		$this->register_panel_type( 'WP_Customize_Themes_Panel' );
 		$this->register_section_type( 'WP_Customize_Section' );
@@ -1903,6 +1909,7 @@ public function customize_preview_init() {
 		if ( ! headers_sent() ) {
 			nocache_headers();
 			header( 'X-Robots: noindex, nofollow, noarchive' );
+			header( 'X-Robots-Tag: noindex, nofollow, noarchive' );
 		}
 		add_filter( 'wp_robots', 'wp_robots_no_robots' );
 		add_filter( 'wp_headers', array( $this, 'filter_iframe_security_headers' ) );
@@ -1981,7 +1988,7 @@ public function add_state_query_params( $url ) {
 				&&
 				$parsed_allowed_url['host'] === $parsed_original_url['host']
 				&&
-				0 === strpos( $parsed_original_url['path'], $parsed_allowed_url['path'] )
+				str_starts_with( $parsed_original_url['path'], $parsed_allowed_url['path'] )
 			);
 			if ( $is_allowed ) {
 				break;
@@ -2134,7 +2141,7 @@ public function customize_preview_settings() {
 			$allowed_hosts[] = $host;
 		}
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_user_locale( get_current_user_id() );
 		$l10n            = array(
 			'shiftClickToEdit'  => __( 'Shift-click to edit this element.' ),
 			'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
@@ -3610,7 +3617,7 @@ public function _publish_changeset_values( $changeset_post_id ) {
 		 */
 		$revisions = wp_get_post_revisions( $changeset_post_id, array( 'check_enabled' => false ) );
 		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$changeset_post_id}-autosave" ) ) {
+			if ( str_contains( $revision->post_name, "{$changeset_post_id}-autosave" ) ) {
 				$wpdb->update(
 					$wpdb->posts,
 					array(
@@ -4285,7 +4292,12 @@ public function render_control_templates() {
 			<li class="notice notice-{{ data.type || 'info' }} {{ data.alt ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }} {{ data.containerClasses || '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
 				<div class="notification-message">{{{ data.message || data.code }}}</div>
 				<# if ( data.dismissible ) { #>
-					<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php _e( 'Dismiss' ); ?></span></button>
+					<button type="button" class="notice-dismiss"><span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Dismiss' );
+						?>
+					</span></button>
 				<# } #>
 			</li>
 		</script>
@@ -4352,10 +4364,20 @@ public function render_control_templates() {
 			<p class="description customize-control-description"><?php esc_html_e( 'See how changes would look live on your website, and share the preview with people who can\'t access the Customizer.' ); ?></p>
 			<div class="customize-control-notifications-container"></div>
 			<div class="preview-link-wrapper">
-				<label for="{{ elementPrefix }}customize-preview-link-input" class="screen-reader-text"><?php esc_html_e( 'Preview Link' ); ?></label>
+				<label for="{{ elementPrefix }}customize-preview-link-input" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					esc_html_e( 'Preview Link' );
+					?>
+				</label>
 				<a href="" target="">
 					<span class="preview-control-element" data-component="url"></span>
-					<span class="screen-reader-text"><?php _e( '(opens in a new tab)' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( '(opens in a new tab)' );
+						?>
+					</span>
 				</a>
 				<input id="{{ elementPrefix }}customize-preview-link-input" readonly tabindex="-1" class="preview-control-element" data-component="input">
 				<button class="customize-copy-preview-link preview-control-element button button-secondary" data-component="button" data-copy-text="<?php esc_attr_e( 'Copy' ); ?>" data-copied-text="<?php esc_attr_e( 'Copied' ); ?>" ><?php esc_html_e( 'Copy' ); ?></button>
@@ -5254,8 +5276,7 @@ public function register_controls() {
 			)
 		);
 
-		// Input type: checkbox.
-		// With custom value.
+		// Input type: checkbox, with custom value.
 		$this->add_control(
 			'display_header_text',
 			array(
@@ -5278,8 +5299,7 @@ public function register_controls() {
 			)
 		);
 
-		// Input type: color.
-		// With sanitize_callback.
+		// Input type: color, with sanitize_callback.
 		$this->add_setting(
 			'background_color',
 			array(
@@ -5587,8 +5607,10 @@ public function register_controls() {
 			)
 		);
 
-		// If the theme is using the default background callback, we can update
-		// the background CSS using postMessage.
+		/*
+		 * If the theme is using the default background callback, we can update
+		 * the background CSS using postMessage.
+		 */
 		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
 			foreach ( array( 'color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment' ) as $prop ) {
 				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
@@ -5674,9 +5696,9 @@ public function register_controls() {
 		$section_description .= __( 'Add your own CSS code here to customize the appearance and layout of your site.' );
 		$section_description .= sprintf(
 			' <a href="%1$s" class="external-link" target="_blank">%2$s<span class="screen-reader-text"> %3$s</span></a>',
-			esc_url( __( 'https://wordpress.org/support/article/css/' ) ),
+			esc_url( __( 'https://wordpress.org/documentation/article/css/' ) ),
 			__( 'Learn more about CSS' ),
-			/* translators: Accessibility text. */
+			/* translators: Hidden accessibility text. */
 			__( '(opens in a new tab)' )
 		);
 		$section_description .= '</p>';
@@ -5697,7 +5719,7 @@ public function register_controls() {
 				'class="external-link" target="_blank"',
 				sprintf(
 					'<span class="screen-reader-text"> %s</span>',
-					/* translators: Accessibility text. */
+					/* translators: Hidden accessibility text. */
 					__( '(opens in a new tab)' )
 				)
 			);
@@ -5764,7 +5786,15 @@ public function has_published_pages() {
 				}
 			}
 		}
-		return 0 !== count( get_pages( array( 'number' => 1 ) ) );
+
+		return 0 !== count(
+			get_pages(
+				array(
+					'number'       => 1,
+					'hierarchical' => 0,
+				)
+			)
+		);
 	}
 
 	/**
@@ -6053,7 +6083,7 @@ public function _validate_header_video( $validity, $value ) {
 					__( 'This video file is too large to use as a header video. Try a shorter video or optimize the compression settings and re-upload a file that is less than 8MB. Or, upload your video to YouTube and link it with the option below.' )
 				);
 			}
-			if ( '.mp4' !== substr( $video, -4 ) && '.mov' !== substr( $video, -4 ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
+			if ( ! str_ends_with( $video, '.mp4' ) && ! str_ends_with( $video, '.mov' ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
 				$validity->add(
 					'invalid_file_type',
 					sprintf(
diff --git a/src/wp-includes/class-wp-customize-nav-menus.php b/src/wp-includes/class-wp-customize-nav-menus.php
index d34fc59b97c2e..bbda8b51b3795 100644
--- a/src/wp-includes/class-wp-customize-nav-menus.php
+++ b/src/wp-includes/class-wp-customize-nav-menus.php
@@ -1076,7 +1076,7 @@ public function print_templates() {
 						<button type="button" class="button-link item-add">
 							<span class="screen-reader-text">
 							<?php
-								/* translators: 1: Title of a menu item, 2: Type of a menu item. */
+								/* translators: Hidden accessibility text. 1: Title of a menu item, 2: Type of a menu item. */
 								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
 							?>
 							</span>
@@ -1144,7 +1144,12 @@ public function available_items_template() {
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Back' );
+						?>
+					</span>
 				</button>
 				<h3>
 					<span class="customize-action">
@@ -1158,13 +1163,28 @@ public function available_items_template() {
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
+					<label class="screen-reader-text" for="menu-items-search">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Search Menu Items' );
+						?>
+					</label>
 					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ); ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<p class="screen-reader-text" id="menu-items-search-desc">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'The search results will be updated as you type.' );
+						?>
+					</p>
 					<span class="spinner"></span>
 				</div>
 				<div class="search-icon" aria-hidden="true"></div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
+				<button type="button" class="clear-results"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Clear Results' );
+					?>
+				</span></button>
 				<ul class="accordion-section-content available-menu-items-list" data-type="search"></ul>
 			</div>
 			<?php
@@ -1247,7 +1267,12 @@ protected function print_custom_links_available_menu_item() {
 			<h4 class="accordion-section-title" role="presentation">
 				<?php _e( 'Custom Links' ); ?>
 				<button type="button" class="button-link" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Toggle section: Custom Links' );
+						?>
+					</span>
 					<span class="toggle-indicator" aria-hidden="true"></span>
 				</button>
 			</h4>
@@ -1447,7 +1472,7 @@ public function filter_wp_nav_menu_args( $args ) {
 			(
 				! empty( $args['container'] )
 				||
-				( isset( $args['items_wrap'] ) && '<' === substr( $args['items_wrap'], 0, 1 ) )
+				( isset( $args['items_wrap'] ) && str_starts_with( $args['items_wrap'], '<' ) )
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
diff --git a/src/wp-includes/class-wp-customize-panel.php b/src/wp-includes/class-wp-customize-panel.php
index 14ec8aad467c8..f880afa8fe4a6 100644
--- a/src/wp-includes/class-wp-customize-panel.php
+++ b/src/wp-includes/class-wp-customize-panel.php
@@ -348,7 +348,12 @@ protected function render_template() {
 		<li id="accordion-panel-{{ data.id }}" class="accordion-section control-section control-panel control-panel-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
 				{{ data.title }}
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Press return or enter to open this panel' );
+					?>
+				</span>
 			</h3>
 			<ul class="accordion-sub-container control-panel-content"></ul>
 		</li>
@@ -368,7 +373,12 @@ protected function render_template() {
 	protected function content_template() {
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
-			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></button>
+			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Back' );
+				?>
+			</span></button>
 			<div class="accordion-section-title">
 				<span class="preview-notice">
 				<?php
@@ -377,7 +387,12 @@ protected function content_template() {
 				?>
 				</span>
 				<# if ( data.description ) { #>
-					<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+					<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Help' );
+						?>
+					</span></button>
 				<# } #>
 			</div>
 			<# if ( data.description ) { #>
diff --git a/src/wp-includes/class-wp-customize-section.php b/src/wp-includes/class-wp-customize-section.php
index 87b176c301719..65dbe00961dd5 100644
--- a/src/wp-includes/class-wp-customize-section.php
+++ b/src/wp-includes/class-wp-customize-section.php
@@ -357,13 +357,23 @@ protected function render_template() {
 		<li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
 			<h3 class="accordion-section-title" tabindex="0">
 				{{ data.title }}
-				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this section' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Press return or enter to open this section' );
+					?>
+				</span>
 			</h3>
 			<ul class="accordion-section-content">
 				<li class="customize-section-description-container section-meta <# if ( data.description_hidden ) { #>customize-info<# } #>">
 					<div class="customize-section-title">
 						<button class="customize-section-back" tabindex="-1">
-							<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+							<span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Back' );
+								?>
+							</span>
 						</button>
 						<h3>
 							<span class="customize-action">
@@ -372,7 +382,12 @@ protected function render_template() {
 							{{ data.title }}
 						</h3>
 						<# if ( data.description && data.description_hidden ) { #>
-							<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+							<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								_e( 'Help' );
+								?>
+							</span></button>
 							<div class="description customize-section-description">
 								{{{ data.description }}}
 							</div>
diff --git a/src/wp-includes/class-wp-customize-widgets.php b/src/wp-includes/class-wp-customize-widgets.php
index 2bf8a39a25ba5..41a57dc66bbe1 100644
--- a/src/wp-includes/class-wp-customize-widgets.php
+++ b/src/wp-includes/class-wp-customize-widgets.php
@@ -891,7 +891,12 @@ public function output_widget_control_templates() {
 		<div id="available-widgets">
 			<div class="customize-section-title">
 				<button class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Back' );
+						?>
+					</span>
 				</button>
 				<h3>
 					<span class="customize-action">
@@ -904,11 +909,26 @@ public function output_widget_control_templates() {
 				</h3>
 			</div>
 			<div id="available-widgets-filter">
-				<label class="screen-reader-text" for="widgets-search"><?php _e( 'Search Widgets' ); ?></label>
+				<label class="screen-reader-text" for="widgets-search">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search Widgets' );
+					?>
+				</label>
 				<input type="text" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ); ?>" aria-describedby="widgets-search-desc" />
 				<div class="search-icon" aria-hidden="true"></div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
-				<p class="screen-reader-text" id="widgets-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+				<button type="button" class="clear-results"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Clear Results' );
+					?>
+				</span></button>
+				<p class="screen-reader-text" id="widgets-search-desc">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'The search results will be updated as you type.' );
+					?>
+				</p>
 			</div>
 			<div id="available-widgets-list">
 			<?php foreach ( $this->get_available_widgets() as $available_widget ) : ?>
@@ -1264,7 +1284,7 @@ public function print_preview_css() {
 	public function export_preview_data() {
 		global $wp_registered_sidebars, $wp_registered_widgets;
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_user_locale( get_current_user_id() );
 
 		$l10n = array(
 			'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
@@ -2039,7 +2059,7 @@ public function render_widget_partial( $partial, $context ) {
 	 * @return bool Whether the option capture is ignored.
 	 */
 	protected function is_option_capture_ignored( $option_name ) {
-		return ( 0 === strpos( $option_name, '_transient_' ) );
+		return ( str_starts_with( $option_name, '_transient_' ) );
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-date-query.php b/src/wp-includes/class-wp-date-query.php
index 00a7554dea0b4..7abb3216b5731 100644
--- a/src/wp-includes/class-wp-date-query.php
+++ b/src/wp-includes/class-wp-date-query.php
@@ -473,6 +473,8 @@ public function validate_date_values( $date_query = array() ) {
 	 *
 	 * @since 3.7.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
 	 */
@@ -492,7 +494,7 @@ public function validate_column( $column ) {
 		);
 
 		// Attempt to detect a table prefix.
-		if ( false === strpos( $column, '.' ) ) {
+		if ( ! str_contains( $column, '.' ) ) {
 			/**
 			 * Filters the list of valid date query columns.
 			 *
@@ -683,11 +685,11 @@ protected function get_sql_for_query( $query, $depth = 0 ) {
 	 * @since 3.7.0
 	 *
 	 * @param array $query Date query arguments.
-	 * @return string[] {
+	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query.
 	 *
-	 *     @type string $join  SQL fragment to append to the main JOIN clause.
-	 *     @type string $where SQL fragment to append to the main WHERE clause.
+	 *     @type string[] $join  Array of SQL fragments to append to the main JOIN clause.
+	 *     @type string[] $where Array of SQL fragments to append to the main WHERE clause.
 	 * }
 	 */
 	protected function get_sql_for_subquery( $query ) {
@@ -699,13 +701,15 @@ protected function get_sql_for_subquery( $query ) {
 	 *
 	 * @since 4.1.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param array $query        Date query clause.
 	 * @param array $parent_query Parent query of the current date query.
-	 * @return string[] {
+	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query.
 	 *
-	 *     @type string $join  SQL fragment to append to the main JOIN clause.
-	 *     @type string $where SQL fragment to append to the main WHERE clause.
+	 *     @type string[] $join  Array of SQL fragments to append to the main JOIN clause.
+	 *     @type string[] $where Array of SQL fragments to append to the main WHERE clause.
 	 * }
 	 */
 	protected function get_sql_for_clause( $query, $parent_query ) {
@@ -961,6 +965,8 @@ public function build_mysql_datetime( $datetime, $default_to_max = false ) {
 	 *
 	 * @since 3.7.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param string   $column  The column to query against. Needs to be pre-validated!
 	 * @param string   $compare The comparison operator. Needs to be pre-validated!
 	 * @param int|null $hour    Optional. An hour value (0-23).
diff --git a/src/wp-includes/class-wp-dependencies.php b/src/wp-includes/class-wp-dependencies.php
index 68b33be395630..0bc42bb282b77 100644
--- a/src/wp-includes/class-wp-dependencies.php
+++ b/src/wp-includes/class-wp-dependencies.php
@@ -241,7 +241,7 @@ public function all_deps( $handles, $recursion = false, $group = false ) {
 	 * @param string           $handle Name of the item. Should be unique.
 	 * @param string|false     $src    Full URL of the item, or path of the item relative
 	 *                                 to the WordPress root directory. If source is set to false,
-	 *                                 item is an alias of other items it depends on.
+	 *                                 the item is an alias of other items it depends on.
 	 * @param string[]         $deps   Optional. An array of registered item handles this item depends on.
 	 *                                 Default empty array.
 	 * @param string|bool|null $ver    Optional. String specifying item version number, if it has one,
diff --git a/src/wp-includes/class-wp-dependency.php b/src/wp-includes/class-wp-dependency.php
index a018811773926..bcc780828c80c 100644
--- a/src/wp-includes/class-wp-dependency.php
+++ b/src/wp-includes/class-wp-dependency.php
@@ -29,8 +29,10 @@ class _WP_Dependency {
 	/**
 	 * The handle source.
 	 *
+	 * If source is set to false, the item is an alias of other items it depends on.
+	 *
 	 * @since 2.6.0
-	 * @var string
+	 * @var string|false
 	 */
 	public $src;
 
diff --git a/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
new file mode 100644
index 0000000000000..70d4798ba133b
--- /dev/null
+++ b/src/wp-includes/class-wp-duotone.php
@@ -0,0 +1,1298 @@
+<?php
+/**
+ * WP_Duotone class
+ *
+ * Parts of this source were derived and modified from colord,
+ * released under the MIT license.
+ *
+ * https://github.com/omgovich/colord
+ *
+ * Copyright (c) 2020 Vlad Shilov omgovich@ya.ru
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * @package WordPress
+ * @since 6.3.0
+ */
+
+/**
+ * Manages duotone block supports and global styles.
+ *
+ * @access private
+ */
+class WP_Duotone {
+	/**
+	 * Block names from global, theme, and custom styles that use duotone presets and the slug of
+	 * the preset they are using.
+	 *
+	 * Example:
+	 *  [
+	 *      'core/featured-image' => 'blue-orange',
+	 *       …
+	 *  ]
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var array
+	 */
+	private static $global_styles_block_names;
+
+	/**
+	 * An array of duotone filter data from global, theme, and custom presets.
+	 *
+	 * Example:
+	 *  [
+	 *      'wp-duotone-blue-orange' => [
+	 *          'slug'  => 'blue-orange',
+	 *          'colors' => [ '#0000ff', '#ffcc00' ],
+	 *      ],
+	 *      'wp-duotone-red-yellow' => [
+	 *          'slug'   => 'red-yellow',
+	 *          'colors' => [ '#cc0000', '#ffff33' ],
+	 *      ],
+	 *      …
+	 *  ]
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var array
+	 */
+	private static $global_styles_presets;
+
+	/**
+	 * All of the duotone filter data from presets for CSS custom properties on
+	 * the page.
+	 *
+	 * Example:
+	 *  [
+	 *      'wp-duotone-blue-orange' => [
+	 *          'slug'   => 'blue-orange',
+	 *          'colors' => [ '#0000ff', '#ffcc00' ],
+	 *      ],
+	 *      …
+	 *  ]
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var array
+	 */
+	private static $used_global_styles_presets = array();
+
+	/**
+	 * All of the duotone filter data for SVGs on the page. Includes both
+	 * presets and custom filters.
+	 *
+	 * Example:
+	 *  [
+	 *      'wp-duotone-blue-orange' => [
+	 *          'slug'   => 'blue-orange',
+	 *          'colors' => [ '#0000ff', '#ffcc00' ],
+	 *      ],
+	 *      'wp-duotone-000000-ffffff-2' => [
+	 *          'slug'   => '000000-ffffff-2',
+	 *          'colors' => [ '#000000', '#ffffff' ],
+	 *      ],
+	 *      …
+	 *  ]
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var array
+	 */
+	private static $used_svg_filter_data = array();
+
+	/**
+	 * All of the block CSS declarations for styles on the page.
+	 *
+	 * Example:
+	 *  [
+	 *      [
+	 *          'selector'     => '.wp-duotone-000000-ffffff-2.wp-block-image img',
+	 *          'declarations' => [
+	 *              'filter' => 'url(#wp-duotone-000000-ffffff-2)',
+	 *          ],
+	 *      ],
+	 *      …
+	 *  ]
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var array
+	 */
+	private static $block_css_declarations = array();
+
+	/**
+	 * Clamps a value between an upper and lower bound.
+	 *
+	 * Direct port of colord's clamp function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/helpers.ts#L23 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param float $number The number to clamp.
+	 * @param float $min    The minimum value.
+	 * @param float $max    The maximum value.
+	 * @return float The clamped value.
+	 */
+	private static function colord_clamp( $number, $min = 0, $max = 1 ) {
+		return $number > $max ? $max : ( $number > $min ? $number : $min );
+	}
+
+	/**
+	 * Processes and clamps a degree (angle) value properly.
+	 *
+	 * Direct port of colord's clampHue function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/helpers.ts#L32 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param float $degrees The hue to clamp.
+	 * @return float The clamped hue.
+	 */
+	private static function colord_clamp_hue( $degrees ) {
+		$degrees = is_finite( $degrees ) ? $degrees % 360 : 0;
+		return $degrees > 0 ? $degrees : $degrees + 360;
+	}
+
+	/**
+	 * Converts a hue value to degrees from 0 to 360 inclusive.
+	 *
+	 * Direct port of colord's parseHue function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/helpers.ts#L40 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param float  $value The hue value to parse.
+	 * @param string $unit  The unit of the hue value.
+	 * @return float The parsed hue value.
+	 */
+	private static function colord_parse_hue( $value, $unit = 'deg' ) {
+		$angle_units = array(
+			'grad' => 360 / 400,
+			'turn' => 360,
+			'rad'  => 360 / ( M_PI * 2 ),
+		);
+
+		$factor = $angle_units[ $unit ];
+		if ( ! $factor ) {
+			$factor = 1;
+		}
+
+		return (float) $value * $factor;
+	}
+
+	/**
+	 * Parses any valid Hex3, Hex4, Hex6 or Hex8 string and converts it to an RGBA object
+	 *
+	 * Direct port of colord's parseHex function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hex.ts#L8 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $hex The hex string to parse.
+	 * @return array|null An array of RGBA values or null if the hex string is invalid.
+	 */
+	private static function colord_parse_hex( $hex ) {
+		$is_match = preg_match(
+			'/^#([0-9a-f]{3,8})$/i',
+			$hex,
+			$hex_match
+		);
+
+		if ( ! $is_match ) {
+			return null;
+		}
+
+		$hex = $hex_match[1];
+
+		if ( 4 >= strlen( $hex ) ) {
+			return array(
+				'r' => (int) base_convert( $hex[0] . $hex[0], 16, 10 ),
+				'g' => (int) base_convert( $hex[1] . $hex[1], 16, 10 ),
+				'b' => (int) base_convert( $hex[2] . $hex[2], 16, 10 ),
+				'a' => 4 === strlen( $hex ) ? round( base_convert( $hex[3] . $hex[3], 16, 10 ) / 255, 2 ) : 1,
+			);
+		}
+
+		if ( 6 === strlen( $hex ) || 8 === strlen( $hex ) ) {
+			return array(
+				'r' => (int) base_convert( substr( $hex, 0, 2 ), 16, 10 ),
+				'g' => (int) base_convert( substr( $hex, 2, 2 ), 16, 10 ),
+				'b' => (int) base_convert( substr( $hex, 4, 2 ), 16, 10 ),
+				'a' => 8 === strlen( $hex ) ? round( (int) base_convert( substr( $hex, 6, 2 ), 16, 10 ) / 255, 2 ) : 1,
+			);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Clamps an array of RGBA values.
+	 *
+	 * Direct port of colord's clampRgba function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/rgb.ts#L5 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $rgba The RGBA array to clamp.
+	 * @return array The clamped RGBA array.
+	 */
+	private static function colord_clamp_rgba( $rgba ) {
+		$rgba['r'] = self::colord_clamp( $rgba['r'], 0, 255 );
+		$rgba['g'] = self::colord_clamp( $rgba['g'], 0, 255 );
+		$rgba['b'] = self::colord_clamp( $rgba['b'], 0, 255 );
+		$rgba['a'] = self::colord_clamp( $rgba['a'] );
+
+		return $rgba;
+	}
+
+	/**
+	 * Parses a valid RGB[A] CSS color function/string
+	 *
+	 * Direct port of colord's parseRgbaString function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/rgbString.ts#L18 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $input The RGBA string to parse.
+	 * @return array|null An array of RGBA values or null if the RGB string is invalid.
+	 */
+	private static function colord_parse_rgba_string( $input ) {
+		// Functional syntax.
+		$is_match = preg_match(
+			'/^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*,\s*([+-]?\d*\.?\d+)(%)?\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i',
+			$input,
+			$match
+		);
+
+		if ( ! $is_match ) {
+			// Whitespace syntax.
+			$is_match = preg_match(
+				'/^rgba?\(\s*([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s+([+-]?\d*\.?\d+)(%)?\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i',
+				$input,
+				$match
+			);
+		}
+
+		if ( ! $is_match ) {
+			return null;
+		}
+
+		/*
+		 * For some reason, preg_match doesn't include empty matches at the end
+		 * of the array, so we add them manually to make things easier later.
+		 */
+		for ( $i = 1; $i <= 8; $i++ ) {
+			if ( ! isset( $match[ $i ] ) ) {
+				$match[ $i ] = '';
+			}
+		}
+
+		if ( $match[2] !== $match[4] || $match[4] !== $match[6] ) {
+			return null;
+		}
+
+		return self::colord_clamp_rgba(
+			array(
+				'r' => (float) $match[1] / ( $match[2] ? 100 / 255 : 1 ),
+				'g' => (float) $match[3] / ( $match[4] ? 100 / 255 : 1 ),
+				'b' => (float) $match[5] / ( $match[6] ? 100 / 255 : 1 ),
+				'a' => '' === $match[7] ? 1 : (float) $match[7] / ( $match[8] ? 100 : 1 ),
+			)
+		);
+	}
+
+	/**
+	 * Clamps an array of HSLA values.
+	 *
+	 * Direct port of colord's clampHsla function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hsl.ts#L6 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $hsla The HSLA array to clamp.
+	 * @return array The clamped HSLA array.
+	 */
+	private static function colord_clamp_hsla( $hsla ) {
+		$hsla['h'] = self::colord_clamp_hue( $hsla['h'] );
+		$hsla['s'] = self::colord_clamp( $hsla['s'], 0, 100 );
+		$hsla['l'] = self::colord_clamp( $hsla['l'], 0, 100 );
+		$hsla['a'] = self::colord_clamp( $hsla['a'] );
+
+		return $hsla;
+	}
+
+	/**
+	 * Converts an HSVA array to RGBA.
+	 *
+	 * Direct port of colord's hsvaToRgba function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hsv.ts#L52 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $hsva The HSVA array to convert.
+	 * @return array The RGBA array.
+	 */
+	private static function colord_hsva_to_rgba( $hsva ) {
+		$h = ( $hsva['h'] / 360 ) * 6;
+		$s = $hsva['s'] / 100;
+		$v = $hsva['v'] / 100;
+		$a = $hsva['a'];
+
+		$hh     = floor( $h );
+		$b      = $v * ( 1 - $s );
+		$c      = $v * ( 1 - ( $h - $hh ) * $s );
+		$d      = $v * ( 1 - ( 1 - $h + $hh ) * $s );
+		$module = $hh % 6;
+
+		return array(
+			'r' => array( $v, $c, $b, $b, $d, $v )[ $module ] * 255,
+			'g' => array( $d, $v, $v, $c, $b, $b )[ $module ] * 255,
+			'b' => array( $b, $b, $d, $v, $v, $c )[ $module ] * 255,
+			'a' => $a,
+		);
+	}
+
+	/**
+	 * Converts an HSLA array to HSVA.
+	 *
+	 * Direct port of colord's hslaToHsva function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hsl.ts#L33 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $hsla The HSLA array to convert.
+	 * @return array The HSVA array.
+	 */
+	private static function colord_hsla_to_hsva( $hsla ) {
+		$h = $hsla['h'];
+		$s = $hsla['s'];
+		$l = $hsla['l'];
+		$a = $hsla['a'];
+
+		$s *= ( $l < 50 ? $l : 100 - $l ) / 100;
+
+		return array(
+			'h' => $h,
+			's' => $s > 0 ? ( ( 2 * $s ) / ( $l + $s ) ) * 100 : 0,
+			'v' => $l + $s,
+			'a' => $a,
+		);
+	}
+
+	/**
+	 * Converts an HSLA array to RGBA.
+	 *
+	 * Direct port of colord's hslaToRgba function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hsl.ts#L55 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $hsla The HSLA array to convert.
+	 * @return array The RGBA array.
+	 */
+	private static function colord_hsla_to_rgba( $hsla ) {
+		return self::colord_hsva_to_rgba( self::colord_hsla_to_hsva( $hsla ) );
+	}
+
+	/**
+	 * Parses a valid HSL[A] CSS color function/string.
+	 *
+	 * Direct port of colord's parseHslaString function.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/colorModels/hslString.ts#L17 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $input The HSLA string to parse.
+	 * @return array|null An array of RGBA values or null if the RGB string is invalid.
+	 */
+	private static function colord_parse_hsla_string( $input ) {
+		// Functional syntax.
+		$is_match = preg_match(
+			'/^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s*,\s*([+-]?\d*\.?\d+)%\s*,\s*([+-]?\d*\.?\d+)%\s*(?:,\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i',
+			$input,
+			$match
+		);
+
+		if ( ! $is_match ) {
+			// Whitespace syntax.
+			$is_match = preg_match(
+				'/^hsla?\(\s*([+-]?\d*\.?\d+)(deg|rad|grad|turn)?\s+([+-]?\d*\.?\d+)%\s+([+-]?\d*\.?\d+)%\s*(?:\/\s*([+-]?\d*\.?\d+)(%)?\s*)?\)$/i',
+				$input,
+				$match
+			);
+		}
+
+		if ( ! $is_match ) {
+			return null;
+		}
+
+		/*
+		 * For some reason, preg_match doesn't include empty matches at the end
+		 * of the array, so we add them manually to make things easier later.
+		 */
+		for ( $i = 1; $i <= 6; $i++ ) {
+			if ( ! isset( $match[ $i ] ) ) {
+				$match[ $i ] = '';
+			}
+		}
+
+		$hsla = self::colord_clamp_hsla(
+			array(
+				'h' => self::colord_parse_hue( $match[1], $match[2] ),
+				's' => (float) $match[3],
+				'l' => (float) $match[4],
+				'a' => '' === $match[5] ? 1 : (float) $match[5] / ( $match[6] ? 100 : 1 ),
+			)
+		);
+
+		return self::colord_hsla_to_rgba( $hsla );
+	}
+
+	/**
+	 * Tries to convert an incoming string into RGBA values.
+	 *
+	 * Direct port of colord's parse function simplified for our use case. This
+	 * version only supports string parsing and only returns RGBA values.
+	 *
+	 * @link https://github.com/omgovich/colord/blob/3f859e03b0ca622eb15480f611371a0f15c9427f/src/parse.ts#L37 Sourced from colord.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $input The string to parse.
+	 * @return array|null An array of RGBA values or null if the string is invalid.
+	 */
+	private static function colord_parse( $input ) {
+		$result = self::colord_parse_hex( $input );
+
+		if ( ! $result ) {
+			$result = self::colord_parse_rgba_string( $input );
+		}
+
+		if ( ! $result ) {
+			$result = self::colord_parse_hsla_string( $input );
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Takes the inline CSS duotone variable from a block and return the slug.
+	 *
+	 * Handles styles slugs like:
+	 * var:preset|duotone|blue-orange
+	 * var(--wp--preset--duotone--blue-orange)
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $duotone_attr The duotone attribute from a block.
+	 * @return string The slug of the duotone preset or an empty string if no slug is found.
+	 */
+	private static function get_slug_from_attribute( $duotone_attr ) {
+		// Uses Branch Reset Groups `(?|…)` to return one capture group.
+		preg_match( '/(?|var:preset\|duotone\|(\S+)|var\(--wp--preset--duotone--(\S+)\))/', $duotone_attr, $matches );
+
+		return ! empty( $matches[1] ) ? $matches[1] : '';
+	}
+
+	/**
+	 * Checks if we have a valid duotone preset.
+	 *
+	 * Valid presets are defined in the $global_styles_presets array.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $duotone_attr The duotone attribute from a block.
+	 * @return bool True if the duotone preset present and valid.
+	 */
+	private static function is_preset( $duotone_attr ) {
+		$slug      = self::get_slug_from_attribute( $duotone_attr );
+		$filter_id = self::get_filter_id( $slug );
+
+		return array_key_exists( $filter_id, self::get_all_global_styles_presets() );
+	}
+
+	/**
+	 * Gets the CSS variable name for a duotone preset.
+	 *
+	 * Example output:
+	 *  --wp--preset--duotone--blue-orange
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $slug The slug of the duotone preset.
+	 * @return string The CSS variable name.
+	 */
+	private static function get_css_custom_property_name( $slug ) {
+		return "--wp--preset--duotone--$slug";
+	}
+
+	/**
+	 * Get the ID of the duotone filter.
+	 *
+	 * Example output:
+	 *  wp-duotone-blue-orange
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $slug The slug of the duotone preset.
+	 * @return string The ID of the duotone filter.
+	 */
+	private static function get_filter_id( $slug ) {
+		return "wp-duotone-$slug";
+	}
+
+	/**
+	 * Get the CSS variable for a duotone preset.
+	 *
+	 * Example output:
+	 *  var(--wp--preset--duotone--blue-orange)
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $slug The slug of the duotone preset.
+	 * @return string The CSS variable.
+	 */
+	private static function get_css_var( $slug ) {
+		$name = self::get_css_custom_property_name( $slug );
+		return "var($name)";
+	}
+
+	/**
+	 * Get the URL for a duotone filter.
+	 *
+	 * Example output:
+	 *  url(#wp-duotone-blue-orange)
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $filter_id The ID of the filter.
+	 * @return string The URL for the duotone filter.
+	 */
+	private static function get_filter_url( $filter_id ) {
+		return "url(#$filter_id)";
+	}
+
+	/**
+	 * Gets the SVG for the duotone filter definition.
+	 *
+	 * Whitespace is removed when SCRIPT_DEBUG is not enabled.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $filter_id The ID of the filter.
+	 * @param array  $colors    An array of color strings.
+	 * @return string An SVG with a duotone filter definition.
+	 */
+	private static function get_filter_svg( $filter_id, $colors ) {
+		$duotone_values = array(
+			'r' => array(),
+			'g' => array(),
+			'b' => array(),
+			'a' => array(),
+		);
+
+		foreach ( $colors as $color_str ) {
+			$color = self::colord_parse( $color_str );
+
+			if ( null === $color ) {
+				$error_message = sprintf(
+					/* translators: %s: duotone colors */
+					__( '"%s" in theme.json settings.color.duotone is not a hex or rgb string.' ),
+					$color_str
+				);
+				_doing_it_wrong( __METHOD__, $error_message, '6.3.0' );
+			} else {
+				$duotone_values['r'][] = $color['r'] / 255;
+				$duotone_values['g'][] = $color['g'] / 255;
+				$duotone_values['b'][] = $color['b'] / 255;
+				$duotone_values['a'][] = $color['a'];
+			}
+		}
+
+		ob_start();
+
+		?>
+
+		<svg
+			xmlns="http://www.w3.org/2000/svg"
+			viewBox="0 0 0 0"
+			width="0"
+			height="0"
+			focusable="false"
+			role="none"
+			style="visibility: hidden; position: absolute; left: -9999px; overflow: hidden;"
+		>
+			<defs>
+				<filter id="<?php echo esc_attr( $filter_id ); ?>">
+					<feColorMatrix
+						color-interpolation-filters="sRGB"
+						type="matrix"
+						values="
+							.299 .587 .114 0 0
+							.299 .587 .114 0 0
+							.299 .587 .114 0 0
+							.299 .587 .114 0 0
+						"
+					/>
+					<feComponentTransfer color-interpolation-filters="sRGB" >
+						<feFuncR type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['r'] ) ); ?>" />
+						<feFuncG type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['g'] ) ); ?>" />
+						<feFuncB type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['b'] ) ); ?>" />
+						<feFuncA type="table" tableValues="<?php echo esc_attr( implode( ' ', $duotone_values['a'] ) ); ?>" />
+					</feComponentTransfer>
+					<feComposite in2="SourceGraphic" operator="in" />
+				</filter>
+			</defs>
+		</svg>
+
+		<?php
+
+		$svg = ob_get_clean();
+
+		if ( ! SCRIPT_DEBUG ) {
+			// Clean up the whitespace.
+			$svg = preg_replace( "/[\r\n\t ]+/", ' ', $svg );
+			$svg = str_replace( '> <', '><', $svg );
+			$svg = trim( $svg );
+		}
+
+		return $svg;
+	}
+
+	/**
+	 * Returns the prefixed id for the duotone filter for use as a CSS id.
+	 *
+	 * Exported for the deprecated function wp_get_duotone_filter_id().
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 * @deprecated 6.3.0
+	 *
+	 * @param  array $preset Duotone preset value as seen in theme.json.
+	 * @return string        Duotone filter CSS id.
+	 */
+	public static function get_filter_id_from_preset( $preset ) {
+		_deprecated_function( __FUNCTION__, '6.3.0' );
+
+		$filter_id = '';
+		if ( isset( $preset['slug'] ) ) {
+			$filter_id = self::get_filter_id( $preset['slug'] );
+		}
+		return $filter_id;
+	}
+
+	/**
+	 * Gets the SVG for the duotone filter definition from a preset.
+	 *
+	 * Exported for the deprecated function wp_get_duotone_filter_property().
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 * @deprecated 6.3.0
+	 *
+	 * @param array $preset The duotone preset.
+	 * @return string The SVG for the filter definition.
+	 */
+	public static function get_filter_svg_from_preset( $preset ) {
+		_deprecated_function( __FUNCTION__, '6.3.0' );
+
+		$filter_id = self::get_filter_id_from_preset( $preset );
+		return self::get_filter_svg( $filter_id, $preset['colors'] );
+	}
+
+	/**
+	 * Get the SVGs for the duotone filters.
+	 *
+	 * Example output:
+	 *  <svg><defs><filter id="wp-duotone-blue-orange">…</filter></defs></svg><svg>…</svg>
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $sources The duotone presets.
+	 * @return string The SVGs for the duotone filters.
+	 */
+	private static function get_svg_definitions( $sources ) {
+		$svgs = '';
+		foreach ( $sources as $filter_id => $filter_data ) {
+			$colors = $filter_data['colors'];
+			$svgs  .= self::get_filter_svg( $filter_id, $colors );
+		}
+		return $svgs;
+	}
+
+	/**
+	 * Get the CSS for global styles.
+	 *
+	 * Example output:
+	 *  body{--wp--preset--duotone--blue-orange:url('#wp-duotone-blue-orange');}
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $sources The duotone presets.
+	 * @return string The CSS for global styles.
+	 */
+	private static function get_global_styles_presets( $sources ) {
+		$css = 'body{';
+		foreach ( $sources as $filter_id => $filter_data ) {
+			$slug              = $filter_data['slug'];
+			$colors            = $filter_data['colors'];
+			$css_property_name = self::get_css_custom_property_name( $slug );
+			$declaration_value = is_string( $colors ) ? $colors : self::get_filter_url( $filter_id );
+			$css              .= "$css_property_name:$declaration_value;";
+		}
+		$css .= '}';
+		return $css;
+	}
+
+	/**
+	 * Enqueue a block CSS declaration for the page.
+	 *
+	 * This does not include any SVGs.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $filter_id        The filter ID. e.g. 'wp-duotone-000000-ffffff-2'.
+	 * @param string $duotone_selector The block's duotone selector. e.g. '.wp-block-image img'.
+	 * @param string $filter_value     The filter CSS value. e.g. 'url(#wp-duotone-000000-ffffff-2)' or 'unset'.
+	 */
+	private static function enqueue_block_css( $filter_id, $duotone_selector, $filter_value ) {
+		// Build the CSS selectors to which the filter will be applied.
+		$selectors = explode( ',', $duotone_selector );
+
+		$selectors_scoped = array();
+		foreach ( $selectors as $selector_part ) {
+			/*
+			 * Assuming the selector part is a subclass selector (not a tag name)
+			 * so we can prepend the filter id class. If we want to support elements
+			 * such as `img` or namespaces, we'll need to add a case for that here.
+			 */
+			$selectors_scoped[] = '.' . $filter_id . trim( $selector_part );
+		}
+
+		$selector = implode( ', ', $selectors_scoped );
+
+		self::$block_css_declarations[] = array(
+			'selector'     => $selector,
+			'declarations' => array(
+				'filter' => $filter_value,
+			),
+		);
+	}
+
+	/**
+	 * Enqueue custom filter assets for the page.
+	 *
+	 * Includes an SVG filter and block CSS declaration.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $filter_id        The filter ID. e.g. 'wp-duotone-000000-ffffff-2'.
+	 * @param string $duotone_selector The block's duotone selector. e.g. '.wp-block-image img'.
+	 * @param string $filter_value     The filter CSS value. e.g. 'url(#wp-duotone-000000-ffffff-2)' or 'unset'.
+	 * @param array  $filter_data      Duotone filter data with 'slug' and 'colors' keys.
+	 */
+	private static function enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $filter_data ) {
+		self::$used_svg_filter_data[ $filter_id ] = $filter_data;
+		self::enqueue_block_css( $filter_id, $duotone_selector, $filter_value );
+	}
+
+	/**
+	 * Enqueue preset assets for the page.
+	 *
+	 * Includes a CSS custom property, SVG filter, and block CSS declaration.
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $filter_id        The filter ID. e.g. 'wp-duotone-blue-orange'.
+	 * @param string $duotone_selector The block's duotone selector. e.g. '.wp-block-image img'.
+	 * @param string $filter_value     The filter CSS value. e.g. 'url(#wp-duotone-blue-orange)' or 'unset'.
+	 */
+	private static function enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value ) {
+		$global_styles_presets = self::get_all_global_styles_presets();
+		if ( ! array_key_exists( $filter_id, $global_styles_presets ) ) {
+			$error_message = sprintf(
+				/* translators: %s: duotone filter ID */
+				__( 'The duotone id "%s" is not registered in theme.json settings' ),
+				$filter_id
+			);
+			_doing_it_wrong( __METHOD__, $error_message, '6.3.0' );
+			return;
+		}
+		self::$used_global_styles_presets[ $filter_id ] = $global_styles_presets[ $filter_id ];
+		self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $global_styles_presets[ $filter_id ] );
+	}
+
+	/**
+	 * Registers the style and colors block attributes for block types that support it.
+	 *
+	 * Block support is added with `supports.filter.duotone` in block.json.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Block_Type $block_type Block Type.
+	 */
+	public static function register_duotone_support( $block_type ) {
+		/*
+		 * Previous `color.__experimentalDuotone` support flag is migrated
+		 * to `filter.duotone` via `block_type_metadata_settings` filter.
+		 */
+		if ( block_has_support( $block_type, array( 'filter', 'duotone' ), null ) ) {
+			if ( ! $block_type->attributes ) {
+				$block_type->attributes = array();
+			}
+
+			if ( ! array_key_exists( 'style', $block_type->attributes ) ) {
+				$block_type->attributes['style'] = array(
+					'type' => 'object',
+				);
+			}
+		}
+	}
+
+	/**
+	 * Get the CSS selector for a block type.
+	 *
+	 * This handles selectors defined in `color.__experimentalDuotone` support
+	 * if `filter.duotone` support is not defined.
+	 *
+	 * @internal
+	 * @since 6.3.0
+	 *
+	 * @param WP_Block_Type $block_type Block type to check for support.
+	 * @return string|null The CSS selector or null if there is no support.
+	 */
+	private static function get_selector( $block_type ) {
+		if ( ! ( $block_type instanceof WP_Block_Type ) ) {
+			return null;
+		}
+
+		/*
+		 * Backward compatibility with `supports.color.__experimentalDuotone`
+		 * is provided via the `block_type_metadata_settings` filter. If
+		 * `supports.filter.duotone` has not been set and the experimental
+		 * property has been, the experimental property value is copied into
+		 * `supports.filter.duotone`.
+		 */
+		$duotone_support = block_has_support( $block_type, array( 'filter', 'duotone' ) );
+		if ( ! $duotone_support ) {
+			return null;
+		}
+
+		/*
+		 * If the experimental duotone support was set, that value is to be
+		 * treated as a selector and requires scoping.
+		 */
+		$experimental_duotone = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
+		if ( $experimental_duotone ) {
+			$root_selector = wp_get_block_css_selector( $block_type );
+			return is_string( $experimental_duotone )
+				? WP_Theme_JSON::scope_selector( $root_selector, $experimental_duotone )
+				: $root_selector;
+		}
+
+		// Regular filter.duotone support uses filter.duotone selectors with fallbacks.
+		return wp_get_block_css_selector( $block_type, array( 'filter', 'duotone' ), true );
+	}
+
+	/**
+	 * Scrape all possible duotone presets from global and theme styles and
+	 * store them in self::$global_styles_presets.
+	 *
+	 * Used in conjunction with self::render_duotone_support for blocks that
+	 * use duotone preset filters.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array An array of global styles presets, keyed on the filter ID.
+	 */
+	private static function get_all_global_styles_presets() {
+		if ( isset( self::$global_styles_presets ) ) {
+			return self::$global_styles_presets;
+		}
+		// Get the per block settings from the theme.json.
+		$tree              = wp_get_global_settings();
+		$presets_by_origin = _wp_array_get( $tree, array( 'color', 'duotone' ), array() );
+
+		self::$global_styles_presets = array();
+		foreach ( $presets_by_origin as $presets ) {
+			foreach ( $presets as $preset ) {
+				$filter_id = self::get_filter_id( _wp_to_kebab_case( $preset['slug'] ) );
+
+				self::$global_styles_presets[ $filter_id ] = $preset;
+			}
+		}
+
+		return self::$global_styles_presets;
+	}
+
+	/**
+	 * Scrape all block names from global styles and store in self::$global_styles_block_names.
+	 *
+	 * Used in conjunction with self::render_duotone_support to output the
+	 * duotone filters defined in the theme.json global styles.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return string[] An array of global style block slugs, keyed on the block name.
+	 */
+	private static function get_all_global_style_block_names() {
+		if ( isset( self::$global_styles_block_names ) ) {
+			return self::$global_styles_block_names;
+		}
+		// Get the per block settings from the theme.json.
+		$tree        = WP_Theme_JSON_Resolver::get_merged_data();
+		$block_nodes = $tree->get_styles_block_nodes();
+		$theme_json  = $tree->get_raw_data();
+
+		self::$global_styles_block_names = array();
+
+		foreach ( $block_nodes as $block_node ) {
+			// This block definition doesn't include any duotone settings. Skip it.
+			if ( empty( $block_node['duotone'] ) ) {
+				continue;
+			}
+
+			// Value looks like this: 'var(--wp--preset--duotone--blue-orange)' or 'var:preset|duotone|blue-orange'.
+			$duotone_attr_path = array_merge( $block_node['path'], array( 'filter', 'duotone' ) );
+			$duotone_attr      = _wp_array_get( $theme_json, $duotone_attr_path, array() );
+
+			if ( empty( $duotone_attr ) ) {
+				continue;
+			}
+			// If it has a duotone filter preset, save the block name and the preset slug.
+			$slug = self::get_slug_from_attribute( $duotone_attr );
+
+			if ( $slug && $slug !== $duotone_attr ) {
+				self::$global_styles_block_names[ $block_node['name'] ] = $slug;
+			}
+		}
+		return self::$global_styles_block_names;
+	}
+
+	/**
+	 * Render out the duotone CSS styles and SVG.
+	 *
+	 * The hooks self::set_global_style_block_names and self::set_global_styles_presets
+	 * must be called before this function.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param  string   $block_content Rendered block content.
+	 * @param  array    $block         Block object.
+	 * @param  WP_Block $wp_block      The block instance.
+	 * @return string Filtered block content.
+	 */
+	public static function render_duotone_support( $block_content, $block, $wp_block ) {
+		if ( empty( $block_content ) || ! $block['blockName'] ) {
+			return $block_content;
+		}
+		$duotone_selector = self::get_selector( $wp_block->block_type );
+
+		if ( ! $duotone_selector ) {
+			return $block_content;
+		}
+
+		$global_styles_block_names = self::get_all_global_style_block_names();
+
+		// The block should have a duotone attribute or have duotone defined in its theme.json to be processed.
+		$has_duotone_attribute     = isset( $block['attrs']['style']['color']['duotone'] );
+		$has_global_styles_duotone = array_key_exists( $block['blockName'], $global_styles_block_names );
+
+		if ( ! $has_duotone_attribute && ! $has_global_styles_duotone ) {
+			return $block_content;
+		}
+
+		// Generate the pieces needed for rendering a duotone to the page.
+		if ( $has_duotone_attribute ) {
+
+			/*
+			 * Possible values for duotone attribute:
+			 * 1. Array of colors - e.g. array('#000000', '#ffffff').
+			 * 2. Variable for an existing Duotone preset - e.g. 'var:preset|duotone|blue-orange' or 'var(--wp--preset--duotone--blue-orange)''
+			 * 3. A CSS string - e.g. 'unset' to remove globally applied duotone.
+			 */
+
+			$duotone_attr = $block['attrs']['style']['color']['duotone'];
+			$is_preset    = is_string( $duotone_attr ) && self::is_preset( $duotone_attr );
+			$is_css       = is_string( $duotone_attr ) && ! $is_preset;
+			$is_custom    = is_array( $duotone_attr );
+
+			if ( $is_preset ) {
+
+				$slug         = self::get_slug_from_attribute( $duotone_attr ); // e.g. 'blue-orange'.
+				$filter_id    = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
+				$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.
+
+				// CSS custom property, SVG filter, and block CSS.
+				self::enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value );
+
+			} elseif ( $is_css ) {
+				$slug         = wp_unique_id( sanitize_key( $duotone_attr . '-' ) ); // e.g. 'unset-1'.
+				$filter_id    = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-unset-1'.
+				$filter_value = $duotone_attr; // e.g. 'unset'.
+
+				// Just block CSS.
+				self::enqueue_block_css( $filter_id, $duotone_selector, $filter_value );
+			} elseif ( $is_custom ) {
+				$slug         = wp_unique_id( sanitize_key( implode( '-', $duotone_attr ) . '-' ) ); // e.g. '000000-ffffff-2'.
+				$filter_id    = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-000000-ffffff-2'.
+				$filter_value = self::get_filter_url( $filter_id ); // e.g. 'url(#wp-duotone-filter-000000-ffffff-2)'.
+				$filter_data  = array(
+					'slug'   => $slug,
+					'colors' => $duotone_attr,
+				);
+
+				// SVG filter and block CSS.
+				self::enqueue_custom_filter( $filter_id, $duotone_selector, $filter_value, $filter_data );
+			}
+		} elseif ( $has_global_styles_duotone ) {
+			$slug         = $global_styles_block_names[ $block['blockName'] ]; // e.g. 'blue-orange'.
+			$filter_id    = self::get_filter_id( $slug ); // e.g. 'wp-duotone-filter-blue-orange'.
+			$filter_value = self::get_css_var( $slug ); // e.g. 'var(--wp--preset--duotone--blue-orange)'.
+
+			// CSS custom property, SVG filter, and block CSS.
+			self::enqueue_global_styles_preset( $filter_id, $duotone_selector, $filter_value );
+		}
+
+		// Like the layout hook, this assumes the hook only applies to blocks with a single wrapper.
+		$tags = new WP_HTML_Tag_Processor( $block_content );
+		if ( $tags->next_tag() ) {
+			$tags->add_class( $filter_id );
+		}
+		return $tags->get_updated_html();
+	}
+
+	/**
+	 * Appends the used block duotone filter declarations to the inline block supports CSS.
+	 *
+	 * Uses the declarations saved in earlier calls to self::enqueue_block_css.
+	 *
+	 * @since 6.3.0
+	 */
+	public static function output_block_styles() {
+		if ( ! empty( self::$block_css_declarations ) ) {
+			wp_style_engine_get_stylesheet_from_css_rules(
+				self::$block_css_declarations,
+				array(
+					'context' => 'block-supports',
+				)
+			);
+		}
+	}
+
+	/**
+	 * Appends the used global style duotone filter presets (CSS custom
+	 * properties) to the inline global styles CSS.
+	 *
+	 * Uses the declarations saved in earlier calls to self::enqueue_global_styles_preset.
+	 *
+	 * @since 6.3.0
+	 */
+	public static function output_global_styles() {
+		if ( ! empty( self::$used_global_styles_presets ) ) {
+			wp_add_inline_style( 'global-styles', self::get_global_styles_presets( self::$used_global_styles_presets ) );
+		}
+	}
+
+	/**
+	 * Outputs all necessary SVG for duotone filters, CSS for classic themes.
+	 *
+	 * Uses the declarations saved in earlier calls to self::enqueue_global_styles_preset
+	 * and self::enqueue_custom_filter.
+	 *
+	 * @since 6.3.0
+	 */
+	public static function output_footer_assets() {
+		if ( ! empty( self::$used_svg_filter_data ) ) {
+			echo self::get_svg_definitions( self::$used_svg_filter_data );
+		}
+
+		// In block themes, the CSS is added in the head via wp_add_inline_style in the wp_enqueue_scripts action.
+		if ( ! wp_is_block_theme() ) {
+			$style_tag_id = 'core-block-supports-duotone';
+			wp_register_style( $style_tag_id, false );
+			if ( ! empty( self::$used_global_styles_presets ) ) {
+				wp_add_inline_style( $style_tag_id, self::get_global_styles_presets( self::$used_global_styles_presets ) );
+			}
+			if ( ! empty( self::$block_css_declarations ) ) {
+				wp_add_inline_style( $style_tag_id, wp_style_engine_get_stylesheet_from_css_rules( self::$block_css_declarations ) );
+			}
+			wp_enqueue_style( $style_tag_id );
+		}
+	}
+
+	/**
+	 * Adds the duotone SVGs and CSS custom properties to the editor settings.
+	 *
+	 * This allows the properties to be pulled in by the EditorStyles component
+	 * in JS and rendered in the post editor.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $settings The block editor settings from the `block_editor_settings_all` filter.
+	 * @return array The editor settings with duotone SVGs and CSS custom properties.
+	 */
+	public static function add_editor_settings( $settings ) {
+		$global_styles_presets = self::get_all_global_styles_presets();
+		if ( ! empty( $global_styles_presets ) ) {
+			if ( ! isset( $settings['styles'] ) ) {
+				$settings['styles'] = array();
+			}
+
+			$settings['styles'][] = array(
+				// For the editor we can add all of the presets by default.
+				'assets'         => self::get_svg_definitions( $global_styles_presets ),
+				// The 'svgs' type is new in 6.3 and requires the corresponding JS changes in the EditorStyles component to work.
+				'__unstableType' => 'svgs',
+				// These styles not generated by global styles, so this must be false or they will be stripped out in wp_get_block_editor_settings.
+				'isGlobalStyles' => false,
+			);
+
+			$settings['styles'][] = array(
+				// For the editor we can add all of the presets by default.
+				'css'            => self::get_global_styles_presets( $global_styles_presets ),
+				// This must be set and must be something other than 'theme' or they will be stripped out in the post editor <Editor> component.
+				'__unstableType' => 'presets',
+				// These styles are no longer generated by global styles, so this must be false or they will be stripped out in wp_get_block_editor_settings.
+				'isGlobalStyles' => false,
+			);
+		}
+
+		return $settings;
+	}
+
+	/**
+	 * Migrates the experimental duotone support flag to the stabilized location.
+	 *
+	 * This moves `supports.color.__experimentalDuotone` to `supports.filter.duotone`.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $settings Current block type settings.
+	 * @param array $metadata Block metadata as read in via block.json.
+	 * @return array Filtered block type settings.
+	 */
+	public static function migrate_experimental_duotone_support_flag( $settings, $metadata ) {
+		$duotone_support = _wp_array_get( $metadata, array( 'supports', 'color', '__experimentalDuotone' ), null );
+
+		if ( ! isset( $settings['supports']['filter']['duotone'] ) && null !== $duotone_support ) {
+			_wp_array_set( $settings, array( 'supports', 'filter', 'duotone' ), (bool) $duotone_support );
+		}
+
+		return $settings;
+	}
+
+	/**
+	 * Gets the CSS filter property value from a preset.
+	 *
+	 * Exported for the deprecated function wp_get_duotone_filter_id().
+	 *
+	 * @internal
+	 *
+	 * @since 6.3.0
+	 * @deprecated 6.3.0
+	 *
+	 * @param array $preset The duotone preset.
+	 * @return string The CSS filter property value.
+	 */
+	public static function get_filter_css_property_value_from_preset( $preset ) {
+		_deprecated_function( __FUNCTION__, '6.3.0' );
+
+		if ( isset( $preset['colors'] ) && is_string( $preset['colors'] ) ) {
+			return $preset['colors'];
+		}
+
+		$filter_id = self::get_filter_id_from_preset( $preset );
+
+		return 'url(#' . $filter_id . ')';
+	}
+}
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index 41f379a8384b1..bd73540bc9e16 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -106,7 +106,7 @@ public static function parse_settings( $editor_id, $settings ) {
 		self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
 
 		if ( self::$this_tinymce ) {
-			if ( false !== strpos( $editor_id, '[' ) ) {
+			if ( str_contains( $editor_id, '[' ) ) {
 				self::$this_tinymce = false;
 				_deprecated_argument( 'wp_editor()', '3.9.0', 'TinyMCE editor IDs cannot have brackets.' );
 			}
@@ -329,21 +329,21 @@ public static function editor_settings( $editor_id, $set ) {
 
 		if ( self::$this_quicktags ) {
 
-			$qtInit = array(
+			$qt_init = array(
 				'id'      => $editor_id,
 				'buttons' => '',
 			);
 
 			if ( is_array( $set['quicktags'] ) ) {
-				$qtInit = array_merge( $qtInit, $set['quicktags'] );
+				$qt_init = array_merge( $qt_init, $set['quicktags'] );
 			}
 
-			if ( empty( $qtInit['buttons'] ) ) {
-				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			if ( empty( $qt_init['buttons'] ) ) {
+				$qt_init['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
 			}
 
 			if ( $set['_content_editor_dfw'] ) {
-				$qtInit['buttons'] .= ',dfw';
+				$qt_init['buttons'] .= ',dfw';
 			}
 
 			/**
@@ -351,14 +351,14 @@ public static function editor_settings( $editor_id, $set ) {
 			 *
 			 * @since 3.3.0
 			 *
-			 * @param array  $qtInit    Quicktags settings.
+			 * @param array  $qt_init   Quicktags settings.
 			 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 			 */
-			$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
+			$qt_init = apply_filters( 'quicktags_settings', $qt_init, $editor_id );
 
-			self::$qt_settings[ $editor_id ] = $qtInit;
+			self::$qt_settings[ $editor_id ] = $qt_init;
 
-			self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qtInit['buttons'] ) );
+			self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qt_init['buttons'] ) );
 		}
 
 		if ( self::$this_tinymce ) {
@@ -458,8 +458,10 @@ public static function editor_settings( $editor_id, $set ) {
 
 					$key = array_search( 'spellchecker', $plugins, true );
 					if ( false !== $key ) {
-						// Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
-						// It can be added with 'mce_external_plugins'.
+						/*
+						 * Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
+						 * It can be added with 'mce_external_plugins'.
+						 */
 						unset( $plugins[ $key ] );
 					}
 
@@ -509,9 +511,13 @@ public static function editor_settings( $editor_id, $set ) {
 							// Try to load langs/[locale].js and langs/[locale]_dlg.js.
 							if ( ! in_array( $name, $loaded_langs, true ) ) {
 								$path = str_replace( content_url(), '', $plugurl );
-								$path = WP_CONTENT_DIR . $path . '/langs/';
+								$path = realpath( WP_CONTENT_DIR . $path . '/langs/' );
+
+								if ( ! $path ) {
+									continue;
+								}
 
-								$path = trailingslashit( realpath( $path ) );
+								$path = trailingslashit( $path );
 
 								if ( @is_file( $path . $mce_locale . '.js' ) ) {
 									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
@@ -571,7 +577,7 @@ public static function editor_settings( $editor_id, $set ) {
 					if ( ! empty( $editor_styles ) ) {
 						// Force urlencoding of commas.
 						foreach ( $editor_styles as $key => $url ) {
-							if ( strpos( $url, ',' ) !== false ) {
+							if ( str_contains( $url, ',' ) ) {
 								$editor_styles[ $key ] = str_replace( ',', '%2C', $url );
 							}
 						}
@@ -753,7 +759,7 @@ public static function editor_settings( $editor_id, $set ) {
 				unset( $set['tinymce']['body_class'] );
 			}
 
-			$mceInit = array(
+			$mce_init = array(
 				'selector'          => "#$editor_id",
 				'wpautop'           => (bool) $set['wpautop'],
 				'indent'            => ! $set['wpautop'],
@@ -766,10 +772,10 @@ public static function editor_settings( $editor_id, $set ) {
 			);
 
 			// Merge with the first part of the init array.
-			$mceInit = array_merge( self::$first_init, $mceInit );
+			$mce_init = array_merge( self::$first_init, $mce_init );
 
 			if ( is_array( $set['tinymce'] ) ) {
-				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+				$mce_init = array_merge( $mce_init, $set['tinymce'] );
 			}
 
 			/*
@@ -788,10 +794,10 @@ public static function editor_settings( $editor_id, $set ) {
 				 * @since 2.7.0
 				 * @since 3.3.0 The `$editor_id` parameter was added.
 				 *
-				 * @param array  $mceInit   An array with teenyMCE config.
+				 * @param array  $mce_init  An array with teenyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mceInit = apply_filters( 'teeny_mce_before_init', $mceInit, $editor_id );
+				$mce_init = apply_filters( 'teeny_mce_before_init', $mce_init, $editor_id );
 			} else {
 
 				/**
@@ -800,19 +806,19 @@ public static function editor_settings( $editor_id, $set ) {
 				 * @since 2.5.0
 				 * @since 3.3.0 The `$editor_id` parameter was added.
 				 *
-				 * @param array  $mceInit   An array with TinyMCE config.
+				 * @param array  $mce_init  An array with TinyMCE config.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'. Accepts 'classic-block'
 				 *                          when called from block editor's Classic block.
 				 */
-				$mceInit = apply_filters( 'tiny_mce_before_init', $mceInit, $editor_id );
+				$mce_init = apply_filters( 'tiny_mce_before_init', $mce_init, $editor_id );
 			}
 
-			if ( empty( $mceInit['toolbar3'] ) && ! empty( $mceInit['toolbar4'] ) ) {
-				$mceInit['toolbar3'] = $mceInit['toolbar4'];
-				$mceInit['toolbar4'] = '';
+			if ( empty( $mce_init['toolbar3'] ) && ! empty( $mce_init['toolbar4'] ) ) {
+				$mce_init['toolbar3'] = $mce_init['toolbar4'];
+				$mce_init['toolbar4'] = '';
 			}
 
-			self::$mce_settings[ $editor_id ] = $mceInit;
+			self::$mce_settings[ $editor_id ] = $mce_init;
 		} // End if self::$this_tinymce.
 	}
 
@@ -1451,7 +1457,7 @@ private static function get_translation() {
 	 *
 	 * @param string $mce_locale The locale used for the editor.
 	 * @param bool   $json_only  Optional. Whether to include the JavaScript calls to tinymce.addI18n() and
-	 *                           tinymce.ScriptLoader.markDone().
+	 *                           tinymce.ScriptLoader.markDone(). Default false.
 	 * @return string Translation object, JSON encoded.
 	 */
 	public static function wp_mce_translation( $mce_locale = '', $json_only = false ) {
@@ -1484,7 +1490,7 @@ public static function wp_mce_translation( $mce_locale = '', $json_only = false
 				continue;
 			}
 
-			if ( false !== strpos( $value, '&' ) ) {
+			if ( str_contains( $value, '&' ) ) {
 				$mce_translation[ $key ] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
 			}
 		}
@@ -1508,8 +1514,8 @@ public static function wp_mce_translation( $mce_locale = '', $json_only = false
 	 * Force uncompressed TinyMCE when a custom theme has been defined.
 	 *
 	 * The compressed TinyMCE file cannot deal with custom themes, so this makes
-	 * sure that we use the uncompressed TinyMCE file if a theme is defined.
-	 * Even if we are on a production environment.
+	 * sure that WordPress uses the uncompressed TinyMCE file if a theme is defined.
+	 * Even if the website is running on a production environment.
 	 *
 	 * @since 5.0.0
 	 */
@@ -1567,28 +1573,28 @@ public static function print_tinymce_scripts() {
 	public static function editor_js() {
 		global $tinymce_version;
 
-		$tmce_on = ! empty( self::$mce_settings );
-		$mceInit = '';
-		$qtInit  = '';
+		$tmce_on  = ! empty( self::$mce_settings );
+		$mce_init = '';
+		$qt_init  = '';
 
 		if ( $tmce_on ) {
 			foreach ( self::$mce_settings as $editor_id => $init ) {
-				$options  = self::_parse_init( $init );
-				$mceInit .= "'$editor_id':{$options},";
+				$options   = self::_parse_init( $init );
+				$mce_init .= "'$editor_id':{$options},";
 			}
-			$mceInit = '{' . trim( $mceInit, ',' ) . '}';
+			$mce_init = '{' . trim( $mce_init, ',' ) . '}';
 		} else {
-			$mceInit = '{}';
+			$mce_init = '{}';
 		}
 
 		if ( ! empty( self::$qt_settings ) ) {
 			foreach ( self::$qt_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
-				$qtInit .= "'$editor_id':{$options},";
+				$options  = self::_parse_init( $init );
+				$qt_init .= "'$editor_id':{$options},";
 			}
-			$qtInit = '{' . trim( $qtInit, ',' ) . '}';
+			$qt_init = '{' . trim( $qt_init, ',' ) . '}';
 		} else {
-			$qtInit = '{}';
+			$qt_init = '{}';
 		}
 
 		$ref = array(
@@ -1622,8 +1628,8 @@ public static function editor_js() {
 			}
 
 			?>
-			mceInit: <?php echo $mceInit; ?>,
-			qtInit: <?php echo $qtInit; ?>,
+			mceInit: <?php echo $mce_init; ?>,
+			qtInit: <?php echo $qt_init; ?>,
 			ref: <?php echo self::_parse_init( $ref ); ?>,
 			load_ext: function(url,lang){var sl=tinymce.ScriptLoader;sl.markDone(url+'/langs/'+lang+'.js');sl.markDone(url+'/langs/'+lang+'_dlg.js');}
 		};
@@ -1751,7 +1757,12 @@ public static function wp_fullscreen_html() {
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
+	 * @param array $args {
+	 *     Optional. Array of link query arguments.
+	 *
+	 *     @type int    $pagenum Page number. Default 1.
+	 *     @type string $s       Search keywords.
+	 * }
 	 * @return array|false $results {
 	 *     An array of associative arrays of query results, false if there are none.
 	 *
@@ -1799,7 +1810,7 @@ public static function wp_link_query( $args = array() ) {
 		$query = apply_filters( 'wp_link_query_args', $query );
 
 		// Do main query.
-		$get_posts = new WP_Query;
+		$get_posts = new WP_Query();
 		$posts     = $get_posts->query( $query );
 
 		// Build results.
@@ -1866,7 +1877,12 @@ public static function wp_link_dialog() {
 		<form id="wp-link" tabindex="-1">
 		<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
 		<h1 id="link-modal-title"><?php _e( 'Insert/edit link' ); ?></h1>
-		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
+		<button type="button" id="wp-link-close"><span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Close' );
+			?>
+		</span></button>
 		<div id="link-selector">
 			<div id="link-options">
 				<p class="howto" id="wplink-enter-url"><?php _e( 'Enter the destination URL' ); ?></p>
@@ -1901,7 +1917,12 @@ public static function wp_link_dialog() {
 				<div id="most-recent-results" class="query-results" tabindex="0">
 					<div class="query-notice" id="query-notice-message">
 						<em class="query-notice-default"><?php _e( 'No search term specified. Showing recent items.' ); ?></em>
-						<em class="query-notice-hint screen-reader-text"><?php _e( 'Search or use up and down arrow keys to select an item.' ); ?></em>
+						<em class="query-notice-hint screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Search or use up and down arrow keys to select an item.' );
+							?>
+						</em>
 					</div>
 					<ul></ul>
 					<div class="river-waiting">
diff --git a/src/wp-includes/class-wp-embed.php b/src/wp-includes/class-wp-embed.php
index 8ce34832289e3..6b9eaa25db7bc 100644
--- a/src/wp-includes/class-wp-embed.php
+++ b/src/wp-includes/class-wp-embed.php
@@ -212,8 +212,10 @@ public function shortcode( $attr, $url = '' ) {
 
 		$this->last_attr = $attr;
 
-		// KSES converts & into &amp; and we need to undo this.
-		// See https://core.trac.wordpress.org/ticket/11311
+		/*
+		 * KSES converts & into &amp; and we need to undo this.
+		 * See https://core.trac.wordpress.org/ticket/11311
+		 */
 		$url = str_replace( '&amp;', '&', $url );
 
 		// Look for known internal handlers.
@@ -222,11 +224,11 @@ public function shortcode( $attr, $url = '' ) {
 			return $embed_handler_html;
 		}
 
-		$post_ID = ( ! empty( $post->ID ) ) ? $post->ID : null;
+		$post_id = ( ! empty( $post->ID ) ) ? $post->ID : null;
 
 		// Potentially set by WP_Embed::cache_oembed().
 		if ( ! empty( $this->post_ID ) ) {
-			$post_ID = $this->post_ID;
+			$post_id = $this->post_ID;
 		}
 
 		// Check for a cached result (stored as custom post or in the post meta).
@@ -242,18 +244,18 @@ public function shortcode( $attr, $url = '' ) {
 		 * @param int    $time    Time to live (in seconds).
 		 * @param string $url     The attempted embed URL.
 		 * @param array  $attr    An array of shortcode attributes.
-		 * @param int    $post_ID Post ID.
+		 * @param int    $post_id Post ID.
 		 */
-		$ttl = apply_filters( 'oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_ID );
+		$ttl = apply_filters( 'oembed_ttl', DAY_IN_SECONDS, $url, $attr, $post_id );
 
 		$cache      = '';
 		$cache_time = 0;
 
 		$cached_post_id = $this->find_oembed_post_id( $key_suffix );
 
-		if ( $post_ID ) {
-			$cache      = get_post_meta( $post_ID, $cachekey, true );
-			$cache_time = get_post_meta( $post_ID, $cachekey_time, true );
+		if ( $post_id ) {
+			$cache      = get_post_meta( $post_id, $cachekey, true );
+			$cache_time = get_post_meta( $post_id, $cachekey_time, true );
 
 			if ( ! $cache_time ) {
 				$cache_time = 0;
@@ -284,9 +286,9 @@ public function shortcode( $attr, $url = '' ) {
 				 * @param string|false $cache   The cached HTML result, stored in post meta.
 				 * @param string       $url     The attempted embed URL.
 				 * @param array        $attr    An array of shortcode attributes.
-				 * @param int          $post_ID Post ID.
+				 * @param int          $post_id Post ID.
 				 */
-				return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_ID );
+				return apply_filters( 'embed_oembed_html', $cache, $url, $attr, $post_id );
 			}
 		}
 
@@ -305,12 +307,12 @@ public function shortcode( $attr, $url = '' ) {
 		// Use oEmbed to get the HTML.
 		$html = wp_oembed_get( $url, $attr );
 
-		if ( $post_ID ) {
+		if ( $post_id ) {
 			if ( $html ) {
-				update_post_meta( $post_ID, $cachekey, $html );
-				update_post_meta( $post_ID, $cachekey_time, time() );
+				update_post_meta( $post_id, $cachekey, $html );
+				update_post_meta( $post_id, $cachekey_time, time() );
 			} elseif ( ! $cache ) {
-				update_post_meta( $post_ID, $cachekey, '{{unknown}}' );
+				update_post_meta( $post_id, $cachekey, '{{unknown}}' );
 			}
 		} else {
 			$has_kses = false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' );
@@ -369,7 +371,7 @@ public function shortcode( $attr, $url = '' ) {
 		// If there was a result, return it.
 		if ( $html ) {
 			/** This filter is documented in wp-includes/class-wp-embed.php */
-			return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_ID );
+			return apply_filters( 'embed_oembed_html', $html, $url, $attr, $post_id );
 		}
 
 		// Still unknown.
@@ -379,17 +381,17 @@ public function shortcode( $attr, $url = '' ) {
 	/**
 	 * Deletes all oEmbed caches. Unused by core as of 4.0.0.
 	 *
-	 * @param int $post_ID Post ID to delete the caches for.
+	 * @param int $post_id Post ID to delete the caches for.
 	 */
-	public function delete_oembed_caches( $post_ID ) {
-		$post_metas = get_post_custom_keys( $post_ID );
+	public function delete_oembed_caches( $post_id ) {
+		$post_metas = get_post_custom_keys( $post_id );
 		if ( empty( $post_metas ) ) {
 			return;
 		}
 
 		foreach ( $post_metas as $post_meta_key ) {
-			if ( '_oembed_' === substr( $post_meta_key, 0, 8 ) ) {
-				delete_post_meta( $post_ID, $post_meta_key );
+			if ( str_starts_with( $post_meta_key, '_oembed_' ) ) {
+				delete_post_meta( $post_id, $post_meta_key );
 			}
 		}
 	}
@@ -397,10 +399,10 @@ public function delete_oembed_caches( $post_ID ) {
 	/**
 	 * Triggers a caching of all oEmbed results.
 	 *
-	 * @param int $post_ID Post ID to do the caching for.
+	 * @param int $post_id Post ID to do the caching for.
 	 */
-	public function cache_oembed( $post_ID ) {
-		$post = get_post( $post_ID );
+	public function cache_oembed( $post_id ) {
+		$post = get_post( $post_id );
 
 		$post_types = get_post_types( array( 'show_ui' => true ) );
 
diff --git a/src/wp-includes/class-wp-error.php b/src/wp-includes/class-wp-error.php
index c8a976fb148be..de721468fdf13 100644
--- a/src/wp-includes/class-wp-error.php
+++ b/src/wp-includes/class-wp-error.php
@@ -56,7 +56,7 @@ class WP_Error {
 	 *
 	 * @param string|int $code    Error code.
 	 * @param string     $message Error message.
-	 * @param mixed      $data    Optional. Error data.
+	 * @param mixed      $data    Optional. Error data. Default empty string.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
 		if ( empty( $code ) ) {
@@ -103,7 +103,8 @@ public function get_error_code() {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param string|int $code Optional. Retrieve messages matching code, if exists.
+	 * @param string|int $code Optional. Error code to retrieve the messages for.
+	 *                         Default empty string.
 	 * @return string[] Error strings on success, or empty array if there are none.
 	 */
 	public function get_error_messages( $code = '' ) {
@@ -132,7 +133,8 @@ public function get_error_messages( $code = '' ) {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param string|int $code Optional. Error code to retrieve message.
+	 * @param string|int $code Optional. Error code to retrieve the message for.
+	 *                         Default empty string.
 	 * @return string The error message.
 	 */
 	public function get_error_message( $code = '' ) {
@@ -151,7 +153,7 @@ public function get_error_message( $code = '' ) {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param string|int $code Optional. Error code.
+	 * @param string|int $code Optional. Error code. Default empty string.
 	 * @return mixed Error data, if it exists.
 	 */
 	public function get_error_data( $code = '' ) {
@@ -185,7 +187,7 @@ public function has_errors() {
 	 *
 	 * @param string|int $code    Error code.
 	 * @param string     $message Error message.
-	 * @param mixed      $data    Optional. Error data.
+	 * @param mixed      $data    Optional. Error data. Default empty string.
 	 */
 	public function add( $code, $message, $data = '' ) {
 		$this->errors[ $code ][] = $message;
diff --git a/src/wp-includes/class-wp-fatal-error-handler.php b/src/wp-includes/class-wp-fatal-error-handler.php
index 55d328fbab31e..842182d483ac1 100644
--- a/src/wp-includes/class-wp-fatal-error-handler.php
+++ b/src/wp-includes/class-wp-fatal-error-handler.php
@@ -198,7 +198,7 @@ protected function display_default_error_template( $error, $handled ) {
 			'<p>%s</p><p><a href="%s">%s</a></p>',
 			$message,
 			/* translators: Documentation about troubleshooting. */
-			__( 'https://wordpress.org/support/article/faq-troubleshooting/' ),
+			__( 'https://wordpress.org/documentation/article/faq-troubleshooting/' ),
 			__( 'Learn more about troubleshooting WordPress.' )
 		);
 
diff --git a/src/wp-includes/class-wp-feed-cache.php b/src/wp-includes/class-wp-feed-cache.php
index d86b0fb7dbf05..f4ce15c9c02fc 100644
--- a/src/wp-includes/class-wp-feed-cache.php
+++ b/src/wp-includes/class-wp-feed-cache.php
@@ -19,8 +19,6 @@
  * Core class used to implement a feed cache.
  *
  * @since 2.8.0
- *
- * @see SimplePie_Cache
  */
 #[AllowDynamicProperties]
 class WP_Feed_Cache extends SimplePie_Cache {
diff --git a/src/wp-includes/class-wp-hook.php b/src/wp-includes/class-wp-hook.php
index 4796503dcc2a9..0f7dc4b7a3be6 100644
--- a/src/wp-includes/class-wp-hook.php
+++ b/src/wp-includes/class-wp-hook.php
@@ -290,11 +290,13 @@ public function apply_filters( $value, $args ) {
 		$nesting_level = $this->nesting_level++;
 
 		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
-		$num_args                           = count( $args );
+
+		$num_args = count( $args );
 
 		do {
 			$this->current_priority[ $nesting_level ] = current( $this->iterations[ $nesting_level ] );
-			$priority                                 = $this->current_priority[ $nesting_level ];
+
+			$priority = $this->current_priority[ $nesting_level ];
 
 			foreach ( $this->callbacks[ $priority ] as $the_ ) {
 				if ( ! $this->doing_action ) {
@@ -410,7 +412,7 @@ public static function build_preinitialized_hooks( $filters ) {
 		$normalized = array();
 
 		foreach ( $filters as $hook_name => $callback_groups ) {
-			if ( is_object( $callback_groups ) && $callback_groups instanceof WP_Hook ) {
+			if ( $callback_groups instanceof WP_Hook ) {
 				$normalized[ $hook_name ] = $callback_groups;
 				continue;
 			}
diff --git a/src/wp-includes/class-wp-http-cookie.php b/src/wp-includes/class-wp-http-cookie.php
index 7f5a64d0234fa..8f55e4486cfda 100644
--- a/src/wp-includes/class-wp-http-cookie.php
+++ b/src/wp-includes/class-wp-http-cookie.php
@@ -115,7 +115,7 @@ public function __construct( $data, $requested_url = '' ) {
 			$this->domain = $parsed_url['host'];
 		}
 		$this->path = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '/';
-		if ( '/' !== substr( $this->path, -1 ) ) {
+		if ( ! str_ends_with( $this->path, '/' ) ) {
 			$this->path = dirname( $this->path ) . '/';
 		}
 
@@ -136,7 +136,7 @@ public function __construct( $data, $requested_url = '' ) {
 			foreach ( $pairs as $pair ) {
 				$pair = rtrim( $pair );
 
-				// Handle the cookie ending in ; which results in a empty final pair.
+				// Handle the cookie ending in ; which results in an empty final pair.
 				if ( empty( $pair ) ) {
 					continue;
 				}
@@ -202,8 +202,8 @@ public function test( $url ) {
 		}
 
 		// Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
-		$domain = ( '.' === substr( $domain, 0, 1 ) ) ? substr( $domain, 1 ) : $domain;
-		if ( substr( $url['host'], -strlen( $domain ) ) !== $domain ) {
+		$domain = ( str_starts_with( $domain, '.' ) ) ? substr( $domain, 1 ) : $domain;
+		if ( ! str_ends_with( $url['host'], $domain ) ) {
 			return false;
 		}
 
@@ -213,7 +213,7 @@ public function test( $url ) {
 		}
 
 		// Path - request path must start with path restriction.
-		if ( substr( $url['path'], 0, strlen( $path ) ) !== $path ) {
+		if ( ! str_starts_with( $url['path'], $path ) ) {
 			return false;
 		}
 
diff --git a/src/wp-includes/class-wp-http-curl.php b/src/wp-includes/class-wp-http-curl.php
index 9b201af110b3b..39b38110dad34 100644
--- a/src/wp-includes/class-wp-http-curl.php
+++ b/src/wp-includes/class-wp-http-curl.php
@@ -78,6 +78,9 @@ public function request( $url, $args = array() ) {
 			'headers'     => array(),
 			'body'        => null,
 			'cookies'     => array(),
+			'decompress'  => false,
+			'stream'      => false,
+			'filename'    => null,
 		);
 
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -328,8 +331,8 @@ public function request( $url, $args = array() ) {
 	/**
 	 * Grabs the headers of the cURL request.
 	 *
-	 * Each header is sent individually to this callback, so we append to the `$header` property
-	 * for temporary storage
+	 * Each header is sent individually to this callback, and is appended to the `$header` property
+	 * for temporary storage.
 	 *
 	 * @since 3.2.0
 	 *
@@ -345,14 +348,14 @@ private function stream_headers( $handle, $headers ) {
 	/**
 	 * Grabs the body of the cURL request.
 	 *
-	 * The contents of the document are passed in chunks, so we append to the `$body`
+	 * The contents of the document are passed in chunks, and are appended to the `$body`
 	 * property for temporary storage. Returning a length shorter than the length of
 	 * `$data` passed in will cause cURL to abort the request with `CURLE_WRITE_ERROR`.
 	 *
 	 * @since 3.6.0
 	 *
-	 * @param resource $handle  cURL handle.
-	 * @param string   $data    cURL request body.
+	 * @param resource $handle cURL handle.
+	 * @param string   $data   cURL request body.
 	 * @return int Total bytes of data written.
 	 */
 	private function stream_body( $handle, $data ) {
diff --git a/src/wp-includes/class-wp-http-encoding.php b/src/wp-includes/class-wp-http-encoding.php
index 255b2114ea87f..f2f82e3801daf 100644
--- a/src/wp-includes/class-wp-http-encoding.php
+++ b/src/wp-includes/class-wp-http-encoding.php
@@ -104,7 +104,7 @@ public static function decompress( $compressed, $length = null ) {
 	public static function compatible_gzinflate( $gz_data ) {
 
 		// Compressed data might contain a full header, if so strip it for gzinflate().
-		if ( "\x1f\x8b\x08" === substr( $gz_data, 0, 3 ) ) {
+		if ( str_starts_with( $gz_data, "\x1f\x8b\x08" ) ) {
 			$i   = 10;
 			$flg = ord( substr( $gz_data, 3, 1 ) );
 			if ( $flg > 0 ) {
diff --git a/src/wp-includes/class-wp-http-proxy.php b/src/wp-includes/class-wp-http-proxy.php
index 0bc265862a921..6ec091f2ba6d3 100644
--- a/src/wp-includes/class-wp-http-proxy.php
+++ b/src/wp-includes/class-wp-http-proxy.php
@@ -209,7 +209,7 @@ public function send_through_proxy( $uri ) {
 		if ( null === $bypass_hosts ) {
 			$bypass_hosts = preg_split( '|,\s*|', WP_PROXY_BYPASS_HOSTS );
 
-			if ( false !== strpos( WP_PROXY_BYPASS_HOSTS, '*' ) ) {
+			if ( str_contains( WP_PROXY_BYPASS_HOSTS, '*' ) ) {
 				$wildcard_regex = array();
 				foreach ( $bypass_hosts as $host ) {
 					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
diff --git a/src/wp-includes/class-wp-http-requests-hooks.php b/src/wp-includes/class-wp-http-requests-hooks.php
index dac64dd6eb847..80e4eb7ef4b9f 100644
--- a/src/wp-includes/class-wp-http-requests-hooks.php
+++ b/src/wp-includes/class-wp-http-requests-hooks.php
@@ -12,10 +12,10 @@
  *
  * @since 4.7.0
  *
- * @see Requests_Hooks
+ * @see WpOrg\Requests\Hooks
  */
 #[AllowDynamicProperties]
-class WP_HTTP_Requests_Hooks extends Requests_Hooks {
+class WP_HTTP_Requests_Hooks extends WpOrg\Requests\Hooks {
 	/**
 	 * Requested URL.
 	 *
diff --git a/src/wp-includes/class-wp-http-requests-response.php b/src/wp-includes/class-wp-http-requests-response.php
index 45f83e2c7a09e..821077656c84b 100644
--- a/src/wp-includes/class-wp-http-requests-response.php
+++ b/src/wp-includes/class-wp-http-requests-response.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Core wrapper object for a Requests_Response for standardisation.
+ * Core wrapper object for a WpOrg\Requests\Response for standardisation.
  *
  * @since 4.6.0
  *
@@ -19,7 +19,7 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Requests Response object.
 	 *
 	 * @since 4.6.0
-	 * @var Requests_Response
+	 * @var \WpOrg\Requests\Response
 	 */
 	protected $response;
 
@@ -36,10 +36,10 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @param Requests_Response $response HTTP response.
-	 * @param string            $filename Optional. File name. Default empty.
+	 * @param \WpOrg\Requests\Response $response HTTP response.
+	 * @param string                   $filename Optional. File name. Default empty.
 	 */
-	public function __construct( Requests_Response $response, $filename = '' ) {
+	public function __construct( WpOrg\Requests\Response $response, $filename = '' ) {
 		$this->response = $response;
 		$this->filename = $filename;
 	}
@@ -49,7 +49,7 @@ public function __construct( Requests_Response $response, $filename = '' ) {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @return Requests_Response HTTP response.
+	 * @return WpOrg\Requests\Response HTTP response.
 	 */
 	public function get_response_object() {
 		return $this->response;
@@ -60,11 +60,11 @@ public function get_response_object() {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @return \Requests_Utility_CaseInsensitiveDictionary Map of header name to header value.
+	 * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary Map of header name to header value.
 	 */
 	public function get_headers() {
 		// Ensure headers remain case-insensitive.
-		$converted = new Requests_Utility_CaseInsensitiveDictionary();
+		$converted = new WpOrg\Requests\Utility\CaseInsensitiveDictionary();
 
 		foreach ( $this->response->headers->getAll() as $key => $value ) {
 			if ( count( $value ) === 1 ) {
@@ -85,7 +85,7 @@ public function get_headers() {
 	 * @param array $headers Map of header name to header value.
 	 */
 	public function set_headers( $headers ) {
-		$this->response->headers = new Requests_Response_Headers( $headers );
+		$this->response->headers = new WpOrg\Requests\Response\Headers( $headers );
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-http-streams.php b/src/wp-includes/class-wp-http-streams.php
index 48078cfafa5e4..f3879535f7530 100644
--- a/src/wp-includes/class-wp-http-streams.php
+++ b/src/wp-includes/class-wp-http-streams.php
@@ -37,6 +37,9 @@ public function request( $url, $args = array() ) {
 			'headers'     => array(),
 			'body'        => null,
 			'cookies'     => array(),
+			'decompress'  => false,
+			'stream'      => false,
+			'filename'    => null,
 		);
 
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -101,8 +104,9 @@ public function request( $url, $args = array() ) {
 			 * @since 2.8.0
 			 * @since 5.1.0 The `$url` parameter was added.
 			 *
-			 * @param bool   $ssl_verify Whether to verify the SSL connection. Default true.
-			 * @param string $url        The request URL.
+			 * @param bool|string $ssl_verify Boolean to control whether to verify the SSL connection
+			 *                                or path to an SSL certificate.
+			 * @param string      $url        The request URL.
 			 */
 			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify, $url );
 		} elseif ( ! $is_local ) {
@@ -125,8 +129,13 @@ public function request( $url, $args = array() ) {
 			)
 		);
 
-		$timeout         = (int) floor( $parsed_args['timeout'] );
-		$utimeout        = $timeout == $parsed_args['timeout'] ? 0 : 1000000 * $parsed_args['timeout'] % 1000000;
+		$timeout  = (int) floor( $parsed_args['timeout'] );
+		$utimeout = 0;
+
+		if ( $timeout !== (int) $parsed_args['timeout'] ) {
+			$utimeout = 1000000 * $parsed_args['timeout'] % 1000000;
+		}
+
 		$connect_timeout = max( $timeout, 1 );
 
 		// Store error number.
@@ -216,8 +225,8 @@ public function request( $url, $args = array() ) {
 
 		$include_port_in_host_header = (
 			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
-			|| ( 'http' === $parsed_url['scheme'] && 80 != $parsed_url['port'] )
-			|| ( 'https' === $parsed_url['scheme'] && 443 != $parsed_url['port'] )
+			|| ( 'http' === $parsed_url['scheme'] && 80 !== $parsed_url['port'] )
+			|| ( 'https' === $parsed_url['scheme'] && 443 !== $parsed_url['port'] )
 		);
 
 		if ( $include_port_in_host_header ) {
@@ -319,7 +328,7 @@ public function request( $url, $args = array() ) {
 
 				$bytes_written_to_file = fwrite( $stream_handle, $block );
 
-				if ( $bytes_written_to_file != $this_block_size ) {
+				if ( $bytes_written_to_file !== $this_block_size ) {
 					fclose( $handle );
 					fclose( $stream_handle );
 					return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
diff --git a/src/wp-includes/class-wp-http.php b/src/wp-includes/class-wp-http.php
index 3d4e8798aa73e..e1d37878a140f 100644
--- a/src/wp-includes/class-wp-http.php
+++ b/src/wp-includes/class-wp-http.php
@@ -7,11 +7,11 @@
  * @since 2.7.0
  */
 
-if ( ! class_exists( 'Requests' ) ) {
-	require ABSPATH . WPINC . '/class-requests.php';
+if ( ! class_exists( 'WpOrg\Requests\Autoload' ) ) {
+	require ABSPATH . WPINC . '/Requests/src/Autoload.php';
 
-	Requests::register_autoloader();
-	Requests::set_certificate_path( ABSPATH . WPINC . '/certificates/ca-bundle.crt' );
+	WpOrg\Requests\Autoload::register();
+	WpOrg\Requests\Requests::set_certificate_path( ABSPATH . WPINC . '/certificates/ca-bundle.crt' );
 }
 
 /**
@@ -251,7 +251,7 @@ public function request( $url, $args = array() ) {
 		 *
 		 * @since 2.9.0
 		 *
-		 * @param false|array|WP_Error $preempt     A preemptive return value of an HTTP request. Default false.
+		 * @param false|array|WP_Error $response    A preemptive return value of an HTTP request. Default false.
 		 * @param array                $parsed_args HTTP request arguments.
 		 * @param string               $url         The request URL.
 		 */
@@ -275,14 +275,14 @@ public function request( $url, $args = array() ) {
 		if ( empty( $url ) || empty( $parsed_url['scheme'] ) ) {
 			$response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
 			/** This action is documented in wp-includes/class-wp-http.php */
-			do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
+			do_action( 'http_api_debug', $response, 'response', 'WpOrg\Requests\Requests', $parsed_args, $url );
 			return $response;
 		}
 
 		if ( $this->block_request( $url ) ) {
 			$response = new WP_Error( 'http_request_not_executed', __( 'User has blocked requests through HTTP.' ) );
 			/** This action is documented in wp-includes/class-wp-http.php */
-			do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
+			do_action( 'http_api_debug', $response, 'response', 'WpOrg\Requests\Requests', $parsed_args, $url );
 			return $response;
 		}
 
@@ -299,7 +299,7 @@ public function request( $url, $args = array() ) {
 			if ( ! wp_is_writable( dirname( $parsed_args['filename'] ) ) ) {
 				$response = new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
 				/** This action is documented in wp-includes/class-wp-http.php */
-				do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
+				do_action( 'http_api_debug', $response, 'response', 'WpOrg\Requests\Requests', $parsed_args, $url );
 				return $response;
 			}
 		}
@@ -347,7 +347,7 @@ public function request( $url, $args = array() ) {
 			$options['max_bytes'] = $parsed_args['limit_response_size'];
 		}
 
-		// If we've got cookies, use and convert them to Requests_Cookie.
+		// If we've got cookies, use and convert them to WpOrg\Requests\Cookie.
 		if ( ! empty( $parsed_args['cookies'] ) ) {
 			$options['cookies'] = WP_Http::normalize_cookies( $parsed_args['cookies'] );
 		}
@@ -371,15 +371,16 @@ public function request( $url, $args = array() ) {
 		 * @since 2.8.0
 		 * @since 5.1.0 The `$url` parameter was added.
 		 *
-		 * @param bool   $ssl_verify Whether to verify the SSL connection. Default true.
-		 * @param string $url        The request URL.
+		 * @param bool|string $ssl_verify Boolean to control whether to verify the SSL connection
+		 *                                or path to an SSL certificate.
+		 * @param string      $url        The request URL.
 		 */
 		$options['verify'] = apply_filters( 'https_ssl_verify', $options['verify'], $url );
 
 		// Check for proxies.
 		$proxy = new WP_HTTP_Proxy();
 		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-			$options['proxy'] = new Requests_Proxy_HTTP( $proxy->host() . ':' . $proxy->port() );
+			$options['proxy'] = new WpOrg\Requests\Proxy\Http( $proxy->host() . ':' . $proxy->port() );
 
 			if ( $proxy->use_authentication() ) {
 				$options['proxy']->use_authentication = true;
@@ -392,7 +393,7 @@ public function request( $url, $args = array() ) {
 		mbstring_binary_safe_encoding();
 
 		try {
-			$requests_response = Requests::request( $url, $headers, $data, $type, $options );
+			$requests_response = WpOrg\Requests\Requests::request( $url, $headers, $data, $type, $options );
 
 			// Convert the response into an array.
 			$http_response = new WP_HTTP_Requests_Response( $requests_response, $parsed_args['filename'] );
@@ -400,7 +401,7 @@ public function request( $url, $args = array() ) {
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
-		} catch ( Requests_Exception $e ) {
+		} catch ( WpOrg\Requests\Exception $e ) {
 			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
 		}
 
@@ -417,7 +418,7 @@ public function request( $url, $args = array() ) {
 		 * @param array          $parsed_args HTTP request arguments.
 		 * @param string         $url         The request URL.
 		 */
-		do_action( 'http_api_debug', $response, 'response', 'Requests', $parsed_args, $url );
+		do_action( 'http_api_debug', $response, 'response', 'WpOrg\Requests\Requests', $parsed_args, $url );
 		if ( is_wp_error( $response ) ) {
 			return $response;
 		}
@@ -453,10 +454,10 @@ public function request( $url, $args = array() ) {
 	 * @since 4.6.0
 	 *
 	 * @param array $cookies Array of cookies to send with the request.
-	 * @return Requests_Cookie_Jar Cookie holder object.
+	 * @return WpOrg\Requests\Cookie\Jar Cookie holder object.
 	 */
 	public static function normalize_cookies( $cookies ) {
-		$cookie_jar = new Requests_Cookie_Jar();
+		$cookie_jar = new WpOrg\Requests\Cookie\Jar();
 
 		foreach ( $cookies as $name => $value ) {
 			if ( $value instanceof WP_Http_Cookie ) {
@@ -466,9 +467,9 @@ static function( $attr ) {
 						return null !== $attr;
 					}
 				);
-				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $attributes, array( 'host-only' => $value->host_only ) );
+				$cookie_jar[ $value->name ] = new WpOrg\Requests\Cookie( $value->name, $value->value, $attributes, array( 'host-only' => $value->host_only ) );
 			} elseif ( is_scalar( $value ) ) {
-				$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
+				$cookie_jar[ $name ] = new WpOrg\Requests\Cookie( $name, (string) $value );
 			}
 		}
 
@@ -484,16 +485,16 @@ static function( $attr ) {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @param string            $location URL to redirect to.
-	 * @param array             $headers  Headers for the redirect.
-	 * @param string|array      $data     Body to send with the request.
-	 * @param array             $options  Redirect request options.
-	 * @param Requests_Response $original Response object.
+	 * @param string                  $location URL to redirect to.
+	 * @param array                   $headers  Headers for the redirect.
+	 * @param string|array            $data     Body to send with the request.
+	 * @param array                   $options  Redirect request options.
+	 * @param WpOrg\Requests\Response $original Response object.
 	 */
 	public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {
 		// Browser compatibility.
 		if ( 302 === $original->status_code ) {
-			$options['type'] = Requests::GET;
+			$options['type'] = WpOrg\Requests\Requests::GET;
 		}
 	}
 
@@ -502,12 +503,12 @@ public static function browser_redirect_compatibility( $location, $headers, $dat
 	 *
 	 * @since 4.7.5
 	 *
-	 * @throws Requests_Exception On unsuccessful URL validation.
+	 * @throws WpOrg\Requests\Exception On unsuccessful URL validation.
 	 * @param string $location URL to redirect to.
 	 */
 	public static function validate_redirects( $location ) {
 		if ( ! wp_http_validate_url( $location ) ) {
-			throw new Requests_Exception( __( 'A valid URL was not provided.' ), 'wp_http.redirect_failed_validation' );
+			throw new WpOrg\Requests\Exception( __( 'A valid URL was not provided.' ), 'wp_http.redirect_failed_validation' );
 		}
 	}
 
@@ -581,7 +582,7 @@ private function _dispatch_request( $url, $args ) {
 
 		// Transport claims to support request, instantiate it and give it a whirl.
 		if ( empty( $transports[ $class ] ) ) {
-			$transports[ $class ] = new $class;
+			$transports[ $class ] = new $class();
 		}
 
 		$response = $transports[ $class ]->request( $url, $args );
@@ -720,7 +721,7 @@ public static function processHeaders( $headers, $url = '' ) { // phpcs:ignore W
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
 		for ( $i = count( $headers ) - 1; $i >= 0; $i-- ) {
-			if ( ! empty( $headers[ $i ] ) && false === strpos( $headers[ $i ], ':' ) ) {
+			if ( ! empty( $headers[ $i ] ) && ! str_contains( $headers[ $i ], ':' ) ) {
 				$headers = array_splice( $headers, $i );
 				break;
 			}
@@ -733,7 +734,7 @@ public static function processHeaders( $headers, $url = '' ) { // phpcs:ignore W
 				continue;
 			}
 
-			if ( false === strpos( $tempheader, ':' ) ) {
+			if ( ! str_contains( $tempheader, ':' ) ) {
 				$stack   = explode( ' ', $tempheader, 3 );
 				$stack[] = '';
 				list( , $response['code'], $response['message']) = $stack;
@@ -904,7 +905,7 @@ public function block_request( $uri ) {
 		if ( null === $accessible_hosts ) {
 			$accessible_hosts = preg_split( '|,\s*|', WP_ACCESSIBLE_HOSTS );
 
-			if ( false !== strpos( WP_ACCESSIBLE_HOSTS, '*' ) ) {
+			if ( str_contains( WP_ACCESSIBLE_HOSTS, '*' ) ) {
 				$wildcard_regex = array();
 				foreach ( $accessible_hosts as $host ) {
 					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
@@ -1012,6 +1013,11 @@ public static function make_absolute_url( $maybe_relative_path, $url ) {
 			$path .= '?' . $relative_url_parts['query'];
 		}
 
+		// Add the fragment.
+		if ( ! empty( $relative_url_parts['fragment'] ) ) {
+			$path .= '#' . $relative_url_parts['fragment'];
+		}
+
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
 
@@ -1074,7 +1080,7 @@ public static function handle_redirects( $url, $args, $response ) {
 	 * Determines if a specified string represents an IP address or not.
 	 *
 	 * This function also detects the type of the IP address, returning either
-	 * '4' or '6' to represent a IPv4 and IPv6 address respectively.
+	 * '4' or '6' to represent an IPv4 and IPv6 address respectively.
 	 * This does not verify if the IP is a valid IP, only that it appears to be
 	 * an IP address.
 	 *
@@ -1083,14 +1089,14 @@ public static function handle_redirects( $url, $args, $response ) {
 	 * @since 3.7.0
 	 *
 	 * @param string $maybe_ip A suspected IP address.
-	 * @return int|false Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
+	 * @return int|false Upon success, '4' or '6' to represent an IPv4 or IPv6 address, false upon failure.
 	 */
 	public static function is_ip_address( $maybe_ip ) {
 		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
 			return 4;
 		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+		if ( str_contains( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
 			return 6;
 		}
 
diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php
index 03525ce9431e3..de079357fb860 100644
--- a/src/wp-includes/class-wp-image-editor-gd.php
+++ b/src/wp-includes/class-wp-image-editor-gd.php
@@ -163,9 +163,16 @@ protected function update_size( $width = false, $height = false ) {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param int|null $max_w Image width.
-	 * @param int|null $max_h Image height.
-	 * @param bool     $crop
+	 * @param int|null   $max_w Image width.
+	 * @param int|null   $max_h Image height.
+	 * @param bool|array $crop  {
+	 *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+	 *     If true, image will be cropped to the specified dimensions using center positions.
+	 *     If an array, the image will be cropped using the array to specify the crop location:
+	 *
+	 *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+	 *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+	 * }
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
@@ -190,7 +197,14 @@ public function resize( $max_w, $max_h, $crop = false ) {
 	/**
 	 * @param int        $max_w
 	 * @param int        $max_h
-	 * @param bool|array $crop
+	 * @param bool|array $crop  {
+	 *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+	 *     If true, image will be cropped to the specified dimensions using center positions.
+	 *     If an array, the image will be cropped using the array to specify the crop location:
+	 *
+	 *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+	 *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+	 * }
 	 * @return resource|GdImage|WP_Error
 	 */
 	protected function _resize( $max_w, $max_h, $crop = false ) {
@@ -236,9 +250,9 @@ protected function _resize( $max_w, $max_h, $crop = false ) {
 	 *     @type array ...$0 {
 	 *         Array of height, width values, and whether to crop.
 	 *
-	 *         @type int  $width  Image width. Optional if `$height` is specified.
-	 *         @type int  $height Image height. Optional if `$width` is specified.
-	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
+	 *         @type int        $width  Image width. Optional if `$height` is specified.
+	 *         @type int        $height Image height. Optional if `$width` is specified.
+	 *         @type bool|array $crop   Optional. Whether to crop the image. Default false.
 	 *     }
 	 * }
 	 * @return array An array of resized images' metadata by size.
@@ -265,9 +279,9 @@ public function multi_resize( $sizes ) {
 	 * @param array $size_data {
 	 *     Array of size data.
 	 *
-	 *     @type int  $width  The maximum width in pixels.
-	 *     @type int  $height The maximum height in pixels.
-	 *     @type bool $crop   Whether to crop the image to exact dimensions.
+	 *     @type int        $width  The maximum width in pixels.
+	 *     @type int        $height The maximum height in pixels.
+	 *     @type bool|array $crop   Whether to crop the image to exact dimensions.
 	 * }
 	 * @return array|WP_Error The image data array for inclusion in the `sizes` array in the image meta,
 	 *                        WP_Error object on error.
@@ -324,8 +338,10 @@ public function make_subsize( $size_data ) {
 	 * @return true|WP_Error
 	 */
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
-		// If destination width/height isn't specified,
-		// use same as width/height from source.
+		/*
+		 * If destination width/height isn't specified,
+		 * use same as width/height from source.
+		 */
 		if ( ! $dst_w ) {
 			$dst_w = $src_w;
 		}
diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php
index f41338723350a..7229c903b40a0 100644
--- a/src/wp-includes/class-wp-image-editor-imagick.php
+++ b/src/wp-includes/class-wp-image-editor-imagick.php
@@ -102,8 +102,10 @@ public static function supports_mime_type( $mime_type ) {
 			return false;
 		}
 
-		// setIteratorIndex is optional unless mime is an animated format.
-		// Here, we just say no if you are missing it and aren't loading a jpeg.
+		/*
+		 * setIteratorIndex is optional unless mime is an animated format.
+		 * Here, we just say no if you are missing it and aren't loading a jpeg.
+		 */
 		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && 'image/jpeg' !== $mime_type ) {
 				return false;
 		}
@@ -166,6 +168,10 @@ public function load() {
 				$this->image->setIteratorIndex( 0 );
 			}
 
+			if ( 'pdf' === $file_extension ) {
+				$this->remove_pdf_alpha_channel();
+			}
+
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
 		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
@@ -253,6 +259,56 @@ protected function update_size( $width = null, $height = null ) {
 		return parent::update_size( $width, $height );
 	}
 
+	/**
+	 * Sets Imagick time limit.
+	 *
+	 * Depending on configuration, Imagick processing may take time.
+	 *
+	 * Multiple problems exist if PHP times out before ImageMagick completed:
+	 * 1. Temporary files aren't cleaned by ImageMagick garbage collection.
+	 * 2. No clear error is provided.
+	 * 3. The cause of such timeout can be hard to pinpoint.
+	 *
+	 * This function, which is expected to be run before heavy image routines, resolves
+	 * point 1 above by aligning Imagick's timeout with PHP's timeout, assuming it is set.
+	 *
+	 * However seems it introduces more problems than it fixes,
+	 * see https://core.trac.wordpress.org/ticket/58202.
+	 *
+	 * Note:
+	 *  - Imagick resource exhaustion does not issue catchable exceptions (yet).
+	 *    See https://github.com/Imagick/imagick/issues/333.
+	 *  - The resource limit is not saved/restored. It applies to subsequent
+	 *    image operations within the time of the HTTP request.
+	 *
+	 * @since 6.2.0
+	 * @since 6.3.0 This method was deprecated.
+	 *
+	 * @return int|null The new limit on success, null on failure.
+	 */
+	public static function set_imagick_time_limit() {
+		_deprecated_function( __METHOD__, '6.3.0' );
+
+		if ( ! defined( 'Imagick::RESOURCETYPE_TIME' ) ) {
+			return null;
+		}
+
+		// Returns PHP_FLOAT_MAX if unset.
+		$imagick_timeout = Imagick::getResourceLimit( Imagick::RESOURCETYPE_TIME );
+
+		// Convert to an integer, keeping in mind that: 0 === (int) PHP_FLOAT_MAX.
+		$imagick_timeout = $imagick_timeout > PHP_INT_MAX ? PHP_INT_MAX : (int) $imagick_timeout;
+
+		$php_timeout = (int) ini_get( 'max_execution_time' );
+
+		if ( $php_timeout > 1 && $php_timeout < $imagick_timeout ) {
+			$limit = (float) 0.8 * $php_timeout;
+			Imagick::setResourceLimit( Imagick::RESOURCETYPE_TIME, $limit );
+
+			return $limit;
+		}
+	}
+
 	/**
 	 * Resizes current image.
 	 *
@@ -262,9 +318,16 @@ protected function update_size( $width = null, $height = null ) {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param int|null $max_w Image width.
-	 * @param int|null $max_h Image height.
-	 * @param bool     $crop
+	 * @param int|null   $max_w Image width.
+	 * @param int|null   $max_h Image height.
+	 * @param bool|array $crop  {
+	 *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+	 *     If true, image will be cropped to the specified dimensions using center positions.
+	 *     If an array, the image will be cropped using the array to specify the crop location:
+	 *
+	 *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+	 *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+	 * }
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
@@ -447,9 +510,9 @@ protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIAN
 	 *     @type array ...$0 {
 	 *         Array of height, width values, and whether to crop.
 	 *
-	 *         @type int  $width  Image width. Optional if `$height` is specified.
-	 *         @type int  $height Image height. Optional if `$width` is specified.
-	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
+	 *         @type int        $width  Image width. Optional if `$height` is specified.
+	 *         @type int        $height Image height. Optional if `$width` is specified.
+	 *         @type bool|array $crop   Optional. Whether to crop the image. Default false.
 	 *     }
 	 * }
 	 * @return array An array of resized images' metadata by size.
@@ -476,9 +539,9 @@ public function multi_resize( $sizes ) {
 	 * @param array $size_data {
 	 *     Array of size data.
 	 *
-	 *     @type int  $width  The maximum width in pixels.
-	 *     @type int  $height The maximum height in pixels.
-	 *     @type bool $crop   Whether to crop the image to exact dimensions.
+	 *     @type int        $width  The maximum width in pixels.
+	 *     @type int        $height The maximum height in pixels.
+	 *     @type bool|array $crop   Whether to crop the image to exact dimensions.
 	 * }
 	 * @return array|WP_Error The image data array for inclusion in the `sizes` array in the image meta,
 	 *                        WP_Error object on error.
@@ -503,6 +566,10 @@ public function make_subsize( $size_data ) {
 			$size_data['crop'] = false;
 		}
 
+		if ( ( $this->size['width'] === $size_data['width'] ) && ( $this->size['height'] === $size_data['height'] ) ) {
+			return new WP_Error( 'image_subsize_create_error', __( 'The image already has the requested size.' ) );
+		}
+
 		$resized = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 
 		if ( is_wp_error( $resized ) ) {
@@ -550,8 +617,10 @@ public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = nu
 			$this->image->setImagePage( $src_w, $src_h, 0, 0 );
 
 			if ( $dst_w || $dst_h ) {
-				// If destination width/height isn't specified,
-				// use same as width/height from source.
+				/*
+				 * If destination width/height isn't specified,
+				 * use same as width/height from source.
+				 */
 				if ( ! $dst_w ) {
 					$dst_w = $src_w;
 				}
@@ -693,6 +762,24 @@ public function save( $destfilename = null, $mime_type = null ) {
 		return $saved;
 	}
 
+	/**
+	 * Removes PDF alpha after it's been read.
+	 *
+	 * @since 6.4.0
+	 */
+	protected function remove_pdf_alpha_channel() {
+		$version = Imagick::getVersion();
+		// Remove alpha channel if possible to avoid black backgrounds for Ghostscript >= 9.14. RemoveAlphaChannel added in ImageMagick 6.7.5.
+		if ( $version['versionNumber'] >= 0x675 ) {
+			try {
+				// Imagick::ALPHACHANNEL_REMOVE mapped to RemoveAlphaChannel in PHP imagick 3.2.0b2.
+				$this->image->setImageAlphaChannel( defined( 'Imagick::ALPHACHANNEL_REMOVE' ) ? Imagick::ALPHACHANNEL_REMOVE : 12 );
+			} catch ( Exception $e ) {
+				return new WP_Error( 'pdf_alpha_process_failed', $e->getMessage() );
+			}
+		}
+	}
+
 	/**
 	 * @since 3.5.0
 	 * @since 6.0.0 The `$filesize` value was added to the returned array.
@@ -905,8 +992,10 @@ protected function strip_meta() {
 	 */
 	protected function pdf_setup() {
 		try {
-			// By default, PDFs are rendered in a very low resolution.
-			// We want the thumbnail to be readable, so increase the rendering DPI.
+			/*
+			 * By default, PDFs are rendered in a very low resolution.
+			 * We want the thumbnail to be readable, so increase the rendering DPI.
+			 */
 			$this->image->setResolution( 128, 128 );
 
 			// Only load the first page.
@@ -934,12 +1023,16 @@ protected function pdf_load_source() {
 		}
 
 		try {
-			// When generating thumbnails from cropped PDF pages, Imagemagick uses the uncropped
-			// area (resulting in unnecessary whitespace) unless the following option is set.
+			/*
+			 * When generating thumbnails from cropped PDF pages, Imagemagick uses the uncropped
+			 * area (resulting in unnecessary whitespace) unless the following option is set.
+			 */
 			$this->image->setOption( 'pdf:use-cropbox', true );
 
-			// Reading image after Imagick instantiation because `setResolution`
-			// only applies correctly before the image is read.
+			/*
+			 * Reading image after Imagick instantiation because `setResolution`
+			 * only applies correctly before the image is read.
+			 */
 			$this->image->readImage( $filename );
 		} catch ( Exception $e ) {
 			// Attempt to run `gs` without the `use-cropbox` option. See #48853.
diff --git a/src/wp-includes/class-wp-image-editor.php b/src/wp-includes/class-wp-image-editor.php
index fed0fc16e8ef1..bb15a03a0747c 100644
--- a/src/wp-includes/class-wp-image-editor.php
+++ b/src/wp-includes/class-wp-image-editor.php
@@ -104,9 +104,16 @@ abstract public function save( $destfilename = null, $mime_type = null );
 	 * @since 3.5.0
 	 * @abstract
 	 *
-	 * @param int|null $max_w Image width.
-	 * @param int|null $max_h Image height.
-	 * @param bool     $crop
+	 * @param int|null   $max_w Image width.
+	 * @param int|null   $max_h Image height.
+	 * @param bool|array $crop  {
+	 *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+	 *     If true, image will be cropped to the specified dimensions using center positions.
+	 *     If an array, the image will be cropped using the array to specify the crop location:
+	 *
+	 *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+	 *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+	 * }
 	 * @return true|WP_Error
 	 */
 	abstract public function resize( $max_w, $max_h, $crop = false );
@@ -121,9 +128,9 @@ abstract public function resize( $max_w, $max_h, $crop = false );
 	 *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
 	 *
 	 *     @type array ...$0 {
-	 *         @type int  $width  Image width.
-	 *         @type int  $height Image height.
-	 *         @type bool $crop   Optional. Whether to crop the image. Default false.
+	 *         @type int        $width  Image width.
+	 *         @type int        $height Image height.
+	 *         @type bool|array $crop   Optional. Whether to crop the image. Default false.
 	 *     }
 	 * }
 	 * @return array An array of resized images metadata by size.
@@ -349,9 +356,11 @@ protected function get_output_format( $filename = null, $mime_type = null ) {
 			$file_mime = $this->mime_type;
 		}
 
-		// Check to see if specified mime-type is the same as type implied by
-		// file extension. If so, prefer extension from file.
-		if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
+		/*
+		 * Check to see if specified mime-type is the same as type implied by
+		 * file extension. If so, prefer extension from file.
+		 */
+		if ( ! $mime_type || ( $file_mime === $mime_type ) ) {
 			$mime_type = $file_mime;
 			$new_ext   = $file_ext;
 		}
@@ -384,8 +393,10 @@ protected function get_output_format( $filename = null, $mime_type = null ) {
 			$new_ext   = $this->get_extension( $mime_type );
 		}
 
-		// Double-check that the mime-type selected is supported by the editor.
-		// If not, choose a default instead.
+		/*
+		 * Double-check that the mime-type selected is supported by the editor.
+		 * If not, choose a default instead.
+		 */
 		if ( ! $this->supports_mime_type( $mime_type ) ) {
 			/**
 			 * Filters default mime type prior to getting the file extension.
@@ -400,9 +411,11 @@ protected function get_output_format( $filename = null, $mime_type = null ) {
 			$new_ext   = $this->get_extension( $mime_type );
 		}
 
-		// Ensure both $filename and $new_ext are not empty.
-		// $this->get_extension() returns false on error which would effectively remove the extension
-		// from $filename. That shouldn't happen, files without extensions are not supported.
+		/*
+		 * Ensure both $filename and $new_ext are not empty.
+		 * $this->get_extension() returns false on error which would effectively remove the extension
+		 * from $filename. That shouldn't happen, files without extensions are not supported.
+		 */
 		if ( $filename && $new_ext ) {
 			$dir = pathinfo( $filename, PATHINFO_DIRNAME );
 			$ext = pathinfo( $filename, PATHINFO_EXTENSION );
@@ -515,8 +528,10 @@ public function maybe_exif_rotate() {
 				$result = $this->flip( false, true );
 				break;
 			case 3:
-				// Rotate 180 degrees or flip horizontally and vertically.
-				// Flipping seems faster and uses less resources.
+				/*
+				 * Rotate 180 degrees or flip horizontally and vertically.
+				 * Flipping seems faster and uses less resources.
+				 */
 				$result = $this->flip( true, true );
 				break;
 			case 4:
diff --git a/src/wp-includes/class-wp-list-util.php b/src/wp-includes/class-wp-list-util.php
index a2ccfb541259f..c394f2c613b0c 100644
--- a/src/wp-includes/class-wp-list-util.php
+++ b/src/wp-includes/class-wp-list-util.php
@@ -166,8 +166,14 @@ public function pluck( $field, $index_key = null ) {
 			foreach ( $this->output as $key => $value ) {
 				if ( is_object( $value ) ) {
 					$newlist[ $key ] = $value->$field;
-				} else {
+				} elseif ( is_array( $value ) ) {
 					$newlist[ $key ] = $value[ $field ];
+				} else {
+					_doing_it_wrong(
+						__METHOD__,
+						__( 'Values for the input array must be either objects or arrays.' ),
+						'6.2.0'
+					);
 				}
 			}
 
@@ -187,12 +193,18 @@ public function pluck( $field, $index_key = null ) {
 				} else {
 					$newlist[] = $value->$field;
 				}
-			} else {
+			} elseif ( is_array( $value ) ) {
 				if ( isset( $value[ $index_key ] ) ) {
 					$newlist[ $value[ $index_key ] ] = $value[ $field ];
 				} else {
 					$newlist[] = $value[ $field ];
 				}
+			} else {
+				_doing_it_wrong(
+					__METHOD__,
+					__( 'Values for the input array must be either objects or arrays.' ),
+					'6.2.0'
+				);
 			}
 		}
 
@@ -207,9 +219,10 @@ public function pluck( $field, $index_key = null ) {
 	 * @since 4.7.0
 	 *
 	 * @param string|array $orderby       Optional. Either the field name to order by or an array
-	 *                                    of multiple orderby fields as $orderby => $order.
-	 * @param string       $order         Optional. Either 'ASC' or 'DESC'. Only used if $orderby
-	 *                                    is a string.
+	 *                                    of multiple orderby fields as `$orderby => $order`.
+	 *                                    Default empty array.
+	 * @param string       $order         Optional. Either 'ASC' or 'DESC'. Only used if `$orderby`
+	 *                                    is a string. Default 'ASC'.
 	 * @param bool         $preserve_keys Optional. Whether to preserve keys. Default false.
 	 * @return array The sorted array.
 	 */
diff --git a/src/wp-includes/class-wp-locale-switcher.php b/src/wp-includes/class-wp-locale-switcher.php
index 2e498eb3f8314..d07490f107d1d 100644
--- a/src/wp-includes/class-wp-locale-switcher.php
+++ b/src/wp-includes/class-wp-locale-switcher.php
@@ -15,12 +15,12 @@
 #[AllowDynamicProperties]
 class WP_Locale_Switcher {
 	/**
-	 * Locale stack.
+	 * Locale switching stack.
 	 *
-	 * @since 4.7.0
-	 * @var string[]
+	 * @since 6.2.0
+	 * @var array
 	 */
-	private $locales = array();
+	private $stack = array();
 
 	/**
 	 * Original locale.
@@ -36,7 +36,7 @@ class WP_Locale_Switcher {
 	 * @since 4.7.0
 	 * @var string[] An array of language codes (file names without the .mo extension).
 	 */
-	private $available_languages = array();
+	private $available_languages;
 
 	/**
 	 * Constructor.
@@ -53,12 +53,14 @@ public function __construct() {
 	/**
 	 * Initializes the locale switcher.
 	 *
-	 * Hooks into the {@see 'locale'} filter to change the locale on the fly.
+	 * Hooks into the {@see 'locale'} and {@see 'determine_locale'} filters
+	 * to change the locale on the fly.
 	 *
 	 * @since 4.7.0
 	 */
 	public function init() {
 		add_filter( 'locale', array( $this, 'filter_locale' ) );
+		add_filter( 'determine_locale', array( $this, 'filter_locale' ) );
 	}
 
 	/**
@@ -66,10 +68,11 @@ public function init() {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param string $locale The locale to switch to.
+	 * @param string    $locale  The locale to switch to.
+	 * @param int|false $user_id Optional. User ID as context. Default false.
 	 * @return bool True on success, false on failure.
 	 */
-	public function switch_to_locale( $locale ) {
+	public function switch_to_locale( $locale, $user_id = false ) {
 		$current_locale = determine_locale();
 		if ( $current_locale === $locale ) {
 			return false;
@@ -79,7 +82,7 @@ public function switch_to_locale( $locale ) {
 			return false;
 		}
 
-		$this->locales[] = $locale;
+		$this->stack[] = array( $locale, $user_id );
 
 		$this->change_locale( $locale );
 
@@ -87,14 +90,29 @@ public function switch_to_locale( $locale ) {
 		 * Fires when the locale is switched.
 		 *
 		 * @since 4.7.0
+		 * @since 6.2.0 The `$user_id` parameter was added.
 		 *
-		 * @param string $locale The new locale.
+		 * @param string    $locale  The new locale.
+		 * @param false|int $user_id User ID for context if available.
 		 */
-		do_action( 'switch_locale', $locale );
+		do_action( 'switch_locale', $locale, $user_id );
 
 		return true;
 	}
 
+	/**
+	 * Switches the translations according to the given user's locale.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param int $user_id User ID.
+	 * @return bool True on success, false on failure.
+	 */
+	public function switch_to_user_locale( $user_id ) {
+		$locale = get_user_locale( $user_id );
+		return $this->switch_to_locale( $locale, $user_id );
+	}
+
 	/**
 	 * Restores the translations according to the previous locale.
 	 *
@@ -103,14 +121,15 @@ public function switch_to_locale( $locale ) {
 	 * @return string|false Locale on success, false on failure.
 	 */
 	public function restore_previous_locale() {
-		$previous_locale = array_pop( $this->locales );
+		$previous_locale = array_pop( $this->stack );
 
 		if ( null === $previous_locale ) {
 			// The stack is empty, bail.
 			return false;
 		}
 
-		$locale = end( $this->locales );
+		$entry  = end( $this->stack );
+		$locale = is_array( $entry ) ? $entry[0] : false;
 
 		if ( ! $locale ) {
 			// There's nothing left in the stack: go back to the original locale.
@@ -127,7 +146,7 @@ public function restore_previous_locale() {
 		 * @param string $locale          The new locale.
 		 * @param string $previous_locale The previous locale.
 		 */
-		do_action( 'restore_previous_locale', $locale, $previous_locale );
+		do_action( 'restore_previous_locale', $locale, $previous_locale[0] );
 
 		return $locale;
 	}
@@ -140,11 +159,11 @@ public function restore_previous_locale() {
 	 * @return string|false Locale on success, false on failure.
 	 */
 	public function restore_current_locale() {
-		if ( empty( $this->locales ) ) {
+		if ( empty( $this->stack ) ) {
 			return false;
 		}
 
-		$this->locales = array( $this->original_locale );
+		$this->stack = array( array( $this->original_locale, false ) );
 
 		return $this->restore_previous_locale();
 	}
@@ -157,7 +176,41 @@ public function restore_current_locale() {
 	 * @return bool True if the locale has been switched, false otherwise.
 	 */
 	public function is_switched() {
-		return ! empty( $this->locales );
+		return ! empty( $this->stack );
+	}
+
+	/**
+	 * Returns the locale currently switched to.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string|false Locale if the locale has been switched, false otherwise.
+	 */
+	public function get_switched_locale() {
+		$entry = end( $this->stack );
+
+		if ( $entry ) {
+			return $entry[0];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the user ID related to the currently switched locale.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return int|false User ID if set and if the locale has been switched, false otherwise.
+	 */
+	public function get_switched_user_id() {
+		$entry = end( $this->stack );
+
+		if ( $entry ) {
+			return $entry[1];
+		}
+
+		return false;
 	}
 
 	/**
@@ -169,7 +222,7 @@ public function is_switched() {
 	 * @return string The locale currently being switched to.
 	 */
 	public function filter_locale( $locale ) {
-		$switched_locale = end( $this->locales );
+		$switched_locale = $this->get_switched_locale();
 
 		if ( $switched_locale ) {
 			return $switched_locale;
@@ -202,8 +255,10 @@ private function load_translations( $locale ) {
 				continue;
 			}
 
-			// Unload current text domain but allow them to be reloaded
-			// after switching back or to another locale.
+			/*
+			 * Unload current text domain but allow them to be reloaded
+			 * after switching back or to another locale.
+			 */
 			unload_textdomain( $domain, true );
 			get_translations_for_domain( $domain );
 		}
diff --git a/src/wp-includes/class-wp-locale.php b/src/wp-includes/class-wp-locale.php
index ca98f9d301fcd..36be8ee37a661 100644
--- a/src/wp-includes/class-wp-locale.php
+++ b/src/wp-includes/class-wp-locale.php
@@ -19,9 +19,10 @@ class WP_Locale {
 	 * Stores the translated strings for the full weekday names.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $weekday;
+	public $weekday = array();
 
 	/**
 	 * Stores the translated strings for the one character weekday names.
@@ -32,41 +33,46 @@ class WP_Locale {
 	 * @see WP_Locale::init() for how to handle the hack.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $weekday_initial;
+	public $weekday_initial = array();
 
 	/**
 	 * Stores the translated strings for the abbreviated weekday names.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $weekday_abbrev;
+	public $weekday_abbrev = array();
 
 	/**
 	 * Stores the translated strings for the full month names.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $month;
+	public $month = array();
 
 	/**
 	 * Stores the translated strings for the month names in genitive case, if the locale specifies.
 	 *
 	 * @since 4.4.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $month_genitive;
+	public $month_genitive = array();
 
 	/**
 	 * Stores the translated strings for the abbreviated month names.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $month_abbrev;
+	public $month_abbrev = array();
 
 	/**
 	 * Stores the translated strings for 'am' and 'pm'.
@@ -74,9 +80,10 @@ class WP_Locale {
 	 * Also the capitalized versions.
 	 *
 	 * @since 2.1.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var string[]
 	 */
-	public $meridiem;
+	public $meridiem = array();
 
 	/**
 	 * The text direction of the locale language.
@@ -92,9 +99,10 @@ class WP_Locale {
 	 * The thousands separator and decimal point values used for localizing numbers.
 	 *
 	 * @since 2.3.0
+	 * @since 6.2.0 Initialized to an empty array.
 	 * @var array
 	 */
-	public $number_format;
+	public $number_format = array();
 
 	/**
 	 * The separator string used for localizing list item separator.
@@ -104,6 +112,16 @@ class WP_Locale {
 	 */
 	public $list_item_separator;
 
+	/**
+	 * The word count type of the locale language.
+	 *
+	 * Default is 'words'.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	public $word_count_type;
+
 	/**
 	 * Constructor which calls helper methods to set up object variables.
 	 *
@@ -124,7 +142,6 @@ public function __construct() {
 	 * @since 2.1.0
 	 *
 	 * @global string $text_direction
-	 * @global string $wp_version     The WordPress version string.
 	 */
 	public function init() {
 		// The weekdays.
@@ -202,8 +219,10 @@ public function init() {
 		$this->meridiem['AM'] = __( 'AM' );
 		$this->meridiem['PM'] = __( 'PM' );
 
-		// Numbers formatting.
-		// See https://www.php.net/number_format
+		/*
+		 * Numbers formatting.
+		 * See https://www.php.net/number_format
+		 */
 
 		/* translators: $thousands_sep argument for https://www.php.net/number_format, default is ',' */
 		$thousands_sep = __( 'number_format_thousands_sep' );
@@ -218,7 +237,7 @@ public function init() {
 
 		$this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point;
 
-		/* translators: used between list items, there is a space after the comma */
+		/* translators: Used between list items, there is a space after the comma. */
 		$this->list_item_separator = __( ', ' );
 
 		// Set text direction.
@@ -229,6 +248,9 @@ public function init() {
 		} elseif ( 'rtl' === _x( 'ltr', 'text direction' ) ) {
 			$this->text_direction = 'rtl';
 		}
+
+		// Set the word count type.
+		$this->word_count_type = $this->get_word_count_type();
 	}
 
 	/**
@@ -389,4 +411,30 @@ public function _strings_for_pot() {
 	public function get_list_item_separator() {
 		return $this->list_item_separator;
 	}
+
+	/**
+	 * Retrieves the localized word count type.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string Localized word count type. Possible values are `characters_excluding_spaces`,
+	 *                `characters_including_spaces`, or `words`. Defaults to `words`.
+	 */
+	public function get_word_count_type() {
+
+		/*
+		 * translators: If your word count is based on single characters (e.g. East Asian characters),
+		 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
+		 * Do not translate into your own language.
+		 */
+		$word_count_type = is_null( $this->word_count_type ) ? _x( 'words', 'Word count type. Do not translate!' ) : $this->word_count_type;
+
+		// Check for valid types.
+		if ( 'characters_excluding_spaces' !== $word_count_type && 'characters_including_spaces' !== $word_count_type ) {
+			// Defaults to 'words'.
+			$word_count_type = 'words';
+		}
+
+		return $word_count_type;
+	}
 }
diff --git a/src/wp-includes/class-wp-meta-query.php b/src/wp-includes/class-wp-meta-query.php
index 41b5f02f089ec..0c6867d84ee2a 100644
--- a/src/wp-includes/class-wp-meta-query.php
+++ b/src/wp-includes/class-wp-meta-query.php
@@ -180,7 +180,7 @@ public function __construct( $meta_query = false ) {
 	}
 
 	/**
-	 * Ensure the 'meta_query' argument passed to the class constructor is well-formed.
+	 * Ensures the 'meta_query' argument passed to the class constructor is well-formed.
 	 *
 	 * Eliminates empty items and ensures that a 'relation' is set.
 	 *
@@ -247,7 +247,7 @@ public function sanitize_query( $queries ) {
 	}
 
 	/**
-	 * Determine whether a query clause is first-order.
+	 * Determines whether a query clause is first-order.
 	 *
 	 * A first-order meta query clause is one that has either a 'key' or
 	 * a 'value' array key.
@@ -266,7 +266,7 @@ protected function is_first_order_clause( $query ) {
 	 *
 	 * @since 3.2.0
 	 *
-	 * @param array $qv The query variables
+	 * @param array $qv The query variables.
 	 */
 	public function parse_query_vars( $qv ) {
 		$meta_query = array();
@@ -309,7 +309,7 @@ public function parse_query_vars( $qv ) {
 	}
 
 	/**
-	 * Return the appropriate alias for the given meta type if applicable.
+	 * Returns the appropriate alias for the given meta type if applicable.
 	 *
 	 * @since 3.7.0
 	 *
@@ -345,6 +345,7 @@ public function get_cast_for_type( $type = '' ) {
 	 * @param string $primary_id_column ID column for the filtered object in $primary_table.
 	 * @param object $context           Optional. The main query object that corresponds to the type, for
 	 *                                  example a `WP_Query`, `WP_User_Query`, or `WP_Site_Query`.
+	 *                                  Default null.
 	 * @return string[]|false {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query,
 	 *     or false if no table exists for the requested meta type.
@@ -373,7 +374,7 @@ public function get_sql( $type, $primary_table, $primary_id_column, $context = n
 		 * If any JOINs are LEFT JOINs (as in the case of NOT EXISTS), then all JOINs should
 		 * be LEFT. Otherwise posts with no metadata will be excluded from results.
 		 */
-		if ( false !== strpos( $sql['join'], 'LEFT JOIN' ) ) {
+		if ( str_contains( $sql['join'], 'LEFT JOIN' ) ) {
 			$sql['join'] = str_replace( 'INNER JOIN', 'LEFT JOIN', $sql['join'] );
 		}
 
@@ -395,7 +396,7 @@ public function get_sql( $type, $primary_table, $primary_id_column, $context = n
 	}
 
 	/**
-	 * Generate SQL clauses to be appended to a main query.
+	 * Generates SQL clauses to be appended to a main query.
 	 *
 	 * Called by the public WP_Meta_Query::get_sql(), this method is abstracted
 	 * out to maintain parity with the other Query classes.
@@ -425,7 +426,7 @@ protected function get_sql_clauses() {
 	}
 
 	/**
-	 * Generate SQL clauses for a single query array.
+	 * Generates SQL clauses for a single query array.
 	 *
 	 * If nested subqueries are found, this method recurses the tree to
 	 * produce the properly nested SQL.
@@ -509,7 +510,7 @@ protected function get_sql_for_query( &$query, $depth = 0 ) {
 	}
 
 	/**
-	 * Generate SQL JOIN and WHERE clauses for a first-order query clause.
+	 * Generates SQL JOIN and WHERE clauses for a first-order query clause.
 	 *
 	 * "First-order" means that it's an array with a 'key' or 'value'.
 	 *
@@ -521,11 +522,12 @@ protected function get_sql_for_query( &$query, $depth = 0 ) {
 	 * @param array  $parent_query Parent query array.
 	 * @param string $clause_key   Optional. The array key used to name the clause in the original `$meta_query`
 	 *                             parameters. If not provided, a key will be generated automatically.
-	 * @return string[] {
+	 *                             Default empty string.
+	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to a first-order query.
 	 *
-	 *     @type string $join  SQL fragment to append to the main JOIN clause.
-	 *     @type string $where SQL fragment to append to the main WHERE clause.
+	 *     @type string[] $join  Array of SQL fragments to append to the main JOIN clause.
+	 *     @type string[] $where Array of SQL fragments to append to the main WHERE clause.
 	 * }
 	 */
 	public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' ) {
@@ -792,7 +794,7 @@ public function get_sql_for_clause( &$clause, $parent_query, $clause_key = '' )
 	}
 
 	/**
-	 * Get a flattened list of sanitized meta clauses.
+	 * Gets a flattened list of sanitized meta clauses.
 	 *
 	 * This array should be used for clause lookup, as when the table alias and CAST type must be determined for
 	 * a value of 'orderby' corresponding to a meta clause.
@@ -806,7 +808,7 @@ public function get_clauses() {
 	}
 
 	/**
-	 * Identify an existing table alias that is compatible with the current
+	 * Identifies an existing table alias that is compatible with the current
 	 * query clause.
 	 *
 	 * We avoid unnecessary table joins by allowing each clause to look for
diff --git a/src/wp-includes/class-wp-metadata-lazyloader.php b/src/wp-includes/class-wp-metadata-lazyloader.php
index 4a03633de0abf..f9c02391d2b1d 100644
--- a/src/wp-includes/class-wp-metadata-lazyloader.php
+++ b/src/wp-includes/class-wp-metadata-lazyloader.php
@@ -55,11 +55,15 @@ public function __construct() {
 		$this->settings = array(
 			'term'    => array(
 				'filter'   => 'get_term_metadata',
-				'callback' => array( $this, 'lazyload_term_meta' ),
+				'callback' => array( $this, 'lazyload_meta_callback' ),
 			),
 			'comment' => array(
 				'filter'   => 'get_comment_metadata',
-				'callback' => array( $this, 'lazyload_comment_meta' ),
+				'callback' => array( $this, 'lazyload_meta_callback' ),
+			),
+			'blog'    => array(
+				'filter'   => 'get_blog_metadata',
+				'callback' => array( $this, 'lazyload_meta_callback' ),
 			),
 		);
 	}
@@ -91,7 +95,7 @@ public function queue_objects( $object_type, $object_ids ) {
 			}
 		}
 
-		add_filter( $type_settings['filter'], $type_settings['callback'] );
+		add_filter( $type_settings['filter'], $type_settings['callback'], 10, 5 );
 
 		/**
 		 * Fires after objects are added to the metadata lazy-load queue.
@@ -131,20 +135,15 @@ public function reset_queue( $object_type ) {
 	 * is no need to invoke it directly.
 	 *
 	 * @since 4.5.0
+	 * @deprecated 6.3.0 Use WP_Metadata_Lazyloader::lazyload_meta_callback() instead.
 	 *
 	 * @param mixed $check The `$check` param passed from the 'get_term_metadata' hook.
 	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
 	 *               another value if filtered by a plugin.
 	 */
 	public function lazyload_term_meta( $check ) {
-		if ( ! empty( $this->pending_objects['term'] ) ) {
-			update_termmeta_cache( array_keys( $this->pending_objects['term'] ) );
-
-			// No need to run again for this set of terms.
-			$this->reset_queue( 'term' );
-		}
-
-		return $check;
+		_deprecated_function( __METHOD__, '6.3.0', 'WP_Metadata_Lazyloader::lazyload_meta_callback' );
+		return $this->lazyload_meta_callback( $check, 0, '', false, 'term' );
 	}
 
 	/**
@@ -154,18 +153,48 @@ public function lazyload_term_meta( $check ) {
 	 * directly, from either inside or outside the `WP_Query` object.
 	 *
 	 * @since 4.5.0
+	 * @deprecated 6.3.0 Use WP_Metadata_Lazyloader::lazyload_meta_callback() instead.
 	 *
 	 * @param mixed $check The `$check` param passed from the {@see 'get_comment_metadata'} hook.
 	 * @return mixed The original value of `$check`, so as not to short-circuit `get_comment_metadata()`.
 	 */
 	public function lazyload_comment_meta( $check ) {
-		if ( ! empty( $this->pending_objects['comment'] ) ) {
-			update_meta_cache( 'comment', array_keys( $this->pending_objects['comment'] ) );
+		_deprecated_function( __METHOD__, '6.3.0', 'WP_Metadata_Lazyloader::lazyload_meta_callback' );
+		return $this->lazyload_meta_callback( $check, 0, '', false, 'comment' );
+	}
 
-			// No need to run again for this set of comments.
-			$this->reset_queue( 'comment' );
+	/**
+	 * Lazy-loads meta for queued objects.
+	 *
+	 * This method is public so that it can be used as a filter callback. As a rule, there
+	 * is no need to invoke it directly.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param mixed  $check     The `$check` param passed from the 'get_*_metadata' hook.
+	 * @param int    $object_id ID of the object metadata is for.
+	 * @param string $meta_key  Unused.
+	 * @param bool   $single    Unused.
+	 * @param string $meta_type Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
+	 *                          or any other object type with an associated meta table.
+	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
+	 *               another value if filtered by a plugin.
+	 */
+	public function lazyload_meta_callback( $check, $object_id, $meta_key, $single, $meta_type ) {
+		if ( empty( $this->pending_objects[ $meta_type ] ) ) {
+			return $check;
 		}
 
+		$object_ids = array_keys( $this->pending_objects[ $meta_type ] );
+		if ( $object_id && ! in_array( $object_id, $object_ids, true ) ) {
+			$object_ids[] = $object_id;
+		}
+
+		update_meta_cache( $meta_type, $object_ids );
+
+		// No need to run again for this set of objects.
+		$this->reset_queue( $meta_type );
+
 		return $check;
 	}
 }
diff --git a/src/wp-includes/class-wp-navigation-fallback.php b/src/wp-includes/class-wp-navigation-fallback.php
new file mode 100644
index 0000000000000..fb97c643bbcd4
--- /dev/null
+++ b/src/wp-includes/class-wp-navigation-fallback.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * WP_Navigation_Fallback class
+ *
+ * Manages fallback behavior for Navigation menus.
+ *
+ * @package WordPress
+ * @subpackage Navigation
+ * @since 6.3.0
+ */
+
+/**
+ * Manages fallback behavior for Navigation menus.
+ *
+ * @access public
+ * @since 6.3.0
+ */
+class WP_Navigation_Fallback {
+
+	/**
+	 * Gets (and/or creates) an appropriate fallback Navigation Menu.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return WP_Post|null the fallback Navigation Post or null.
+	 */
+	public static function get_fallback() {
+
+		/**
+		 * Filters whether or not a fallback should be created.
+		 *
+		 * @since 6.3.0
+		 *
+		 * @param bool $create Whether to create a fallback navigation menu. Default true.
+		 */
+		$should_create_fallback = apply_filters( 'wp_navigation_should_create_fallback', true );
+
+		$fallback = static::get_most_recently_published_navigation();
+
+		if ( $fallback || ! $should_create_fallback ) {
+			return $fallback;
+		}
+
+		$fallback = static::create_classic_menu_fallback();
+
+		if ( $fallback && ! is_wp_error( $fallback ) ) {
+			// Return the newly created fallback post object which will now be the most recently created navigation menu.
+			return $fallback instanceof WP_Post ? $fallback : static::get_most_recently_published_navigation();
+		}
+
+		$fallback = static::create_default_fallback();
+
+		if ( $fallback && ! is_wp_error( $fallback ) ) {
+			// Return the newly created fallback post object which will now be the most recently created navigation menu.
+			return $fallback instanceof WP_Post ? $fallback : static::get_most_recently_published_navigation();
+		}
+
+		return null;
+	}
+
+	/**
+	 * Finds the most recently published `wp_navigation` post type.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return WP_Post|null the first non-empty Navigation or null.
+	 */
+	private static function get_most_recently_published_navigation() {
+
+		$parsed_args = array(
+			'post_type'              => 'wp_navigation',
+			'no_found_rows'          => true,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+			'order'                  => 'DESC',
+			'orderby'                => 'date',
+			'post_status'            => 'publish',
+			'posts_per_page'         => 1,
+		);
+
+		$navigation_post = new WP_Query( $parsed_args );
+
+		if ( count( $navigation_post->posts ) > 0 ) {
+			return $navigation_post->posts[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Creates a Navigation Menu post from a Classic Menu.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return int|WP_Error The post ID of the default fallback menu or a WP_Error object.
+	 */
+	private static function create_classic_menu_fallback() {
+		// See if we have a classic menu.
+		$classic_nav_menu = static::get_fallback_classic_menu();
+
+		if ( ! $classic_nav_menu ) {
+			return new WP_Error( 'no_classic_menus', __( 'No Classic Menus found.' ) );
+		}
+
+		// If there is a classic menu then convert it to blocks.
+		$classic_nav_menu_blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
+
+		if ( is_wp_error( $classic_nav_menu_blocks ) ) {
+			return $classic_nav_menu_blocks;
+		}
+
+		if ( empty( $classic_nav_menu_blocks ) ) {
+			return new WP_Error( 'cannot_convert_classic_menu', __( 'Unable to convert Classic Menu to blocks.' ) );
+		}
+
+		// Create a new navigation menu from the classic menu.
+		$classic_menu_fallback = wp_insert_post(
+			array(
+				'post_content' => $classic_nav_menu_blocks,
+				'post_title'   => $classic_nav_menu->name,
+				'post_name'    => $classic_nav_menu->slug,
+				'post_status'  => 'publish',
+				'post_type'    => 'wp_navigation',
+			),
+			true // So that we can check whether the result is an error.
+		);
+
+		return $classic_menu_fallback;
+	}
+
+	/**
+	 * Determines the most appropriate classic navigation menu to use as a fallback.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return WP_Term|null The most appropriate classic navigation menu to use as a fallback.
+	 */
+	private static function get_fallback_classic_menu() {
+		$classic_nav_menus = wp_get_nav_menus();
+
+		if ( ! $classic_nav_menus || is_wp_error( $classic_nav_menus ) ) {
+			return null;
+		}
+
+		$nav_menu = static::get_nav_menu_at_primary_location();
+
+		if ( $nav_menu ) {
+			return $nav_menu;
+		}
+
+		$nav_menu = static::get_nav_menu_with_primary_slug( $classic_nav_menus );
+
+		if ( $nav_menu ) {
+			return $nav_menu;
+		}
+
+		return static::get_most_recently_created_nav_menu( $classic_nav_menus );
+	}
+
+
+	/**
+	 * Sorts the classic menus and returns the most recently created one.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Term[] $classic_nav_menus Array of classic nav menu term objects.
+	 * @return WP_Term The most recently created classic nav menu.
+	 */
+	private static function get_most_recently_created_nav_menu( $classic_nav_menus ) {
+		usort(
+			$classic_nav_menus,
+			static function( $a, $b ) {
+				return $b->term_id - $a->term_id;
+			}
+		);
+
+		return $classic_nav_menus[0];
+	}
+
+	/**
+	 * Returns the classic menu with the slug `primary` if it exists.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Term[] $classic_nav_menus Array of classic nav menu term objects.
+	 * @return WP_Term|null The classic nav menu with the slug `primary` or null.
+	 */
+	private static function get_nav_menu_with_primary_slug( $classic_nav_menus ) {
+		foreach ( $classic_nav_menus as $classic_nav_menu ) {
+			if ( 'primary' === $classic_nav_menu->slug ) {
+				return $classic_nav_menu;
+			}
+		}
+
+		return null;
+	}
+
+
+	/**
+	 * Gets the classic menu assigned to the `primary` navigation menu location
+	 * if it exists.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return WP_Term|null The classic nav menu assigned to the `primary` location or null.
+	 */
+	private static function get_nav_menu_at_primary_location() {
+		$locations = get_nav_menu_locations();
+
+		if ( isset( $locations['primary'] ) ) {
+			$primary_menu = wp_get_nav_menu_object( $locations['primary'] );
+
+			if ( $primary_menu ) {
+				return $primary_menu;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Creates a default Navigation Block Menu fallback.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return int|WP_Error The post ID of the default fallback menu or a WP_Error object.
+	 */
+	private static function create_default_fallback() {
+
+		$default_blocks = static::get_default_fallback_blocks();
+
+		// Create a new navigation menu from the fallback blocks.
+		$default_fallback = wp_insert_post(
+			array(
+				'post_content' => $default_blocks,
+				'post_title'   => _x( 'Navigation', 'Title of a Navigation menu' ),
+				'post_name'    => 'navigation',
+				'post_status'  => 'publish',
+				'post_type'    => 'wp_navigation',
+			),
+			true // So that we can check whether the result is an error.
+		);
+
+		return $default_fallback;
+	}
+
+	/**
+	 * Gets the rendered markup for the default fallback blocks.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return string default blocks markup to use a the fallback.
+	 */
+	private static function get_default_fallback_blocks() {
+		$registry = WP_Block_Type_Registry::get_instance();
+
+		// If `core/page-list` is not registered then use empty blocks.
+		return $registry->is_registered( 'core/page-list' ) ? '<!-- wp:page-list /-->' : '';
+	}
+}
diff --git a/src/wp-includes/class-wp-network-query.php b/src/wp-includes/class-wp-network-query.php
index 1c72322a383b9..7199ec03a1a15 100644
--- a/src/wp-includes/class-wp-network-query.php
+++ b/src/wp-includes/class-wp-network-query.php
@@ -250,7 +250,7 @@ public function get_networks() {
 		$last_changed = wp_cache_get_last_changed( 'networks' );
 
 		$cache_key   = "get_network_ids:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'networks' );
+		$cache_value = wp_cache_get( $cache_key, 'network-queries' );
 
 		if ( false === $cache_value ) {
 			$network_ids = $this->get_network_ids();
@@ -262,7 +262,7 @@ public function get_networks() {
 				'network_ids'    => $network_ids,
 				'found_networks' => $this->found_networks,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'networks' );
+			wp_cache_add( $cache_key, $cache_value, 'network-queries' );
 		} else {
 			$network_ids          = $cache_value['network_ids'];
 			$this->found_networks = $cache_value['found_networks'];
diff --git a/src/wp-includes/class-wp-network.php b/src/wp-includes/class-wp-network.php
index fd92c5ba70420..d33f210dab2fc 100644
--- a/src/wp-includes/class-wp-network.php
+++ b/src/wp-includes/class-wp-network.php
@@ -228,6 +228,7 @@ private function get_main_site_id() {
 		 * @param WP_Network $network      The network object for which the main site was detected.
 		 */
 		$main_site_id = (int) apply_filters( 'pre_get_main_site_id', null, $this );
+
 		if ( 0 < $main_site_id ) {
 			return $main_site_id;
 		}
@@ -236,8 +237,10 @@ private function get_main_site_id() {
 			return (int) $this->blog_id;
 		}
 
-		if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) && DOMAIN_CURRENT_SITE === $this->domain && PATH_CURRENT_SITE === $this->path )
-			|| ( defined( 'SITE_ID_CURRENT_SITE' ) && SITE_ID_CURRENT_SITE == $this->id ) ) {
+		if ( ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' )
+			&& DOMAIN_CURRENT_SITE === $this->domain && PATH_CURRENT_SITE === $this->path )
+			|| ( defined( 'SITE_ID_CURRENT_SITE' ) && (int) SITE_ID_CURRENT_SITE === $this->id )
+		) {
 			if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
 				$this->blog_id = (string) BLOG_ID_CURRENT_SITE;
 
@@ -306,7 +309,7 @@ private function _set_cookie_domain() {
 		}
 
 		$this->cookie_domain = $this->domain;
-		if ( 'www.' === substr( $this->cookie_domain, 0, 4 ) ) {
+		if ( str_starts_with( $this->cookie_domain, 'www.' ) ) {
 			$this->cookie_domain = substr( $this->cookie_domain, 4 );
 		}
 	}
diff --git a/src/wp-includes/class-wp-object-cache.php b/src/wp-includes/class-wp-object-cache.php
index cd84b177539a1..8136ea3ad9f30 100644
--- a/src/wp-includes/class-wp-object-cache.php
+++ b/src/wp-includes/class-wp-object-cache.php
@@ -156,7 +156,7 @@ protected function is_valid_key( $key ) {
 		$message = is_string( $key )
 			? __( 'Cache key must not be an empty string.' )
 			/* translators: %s: The type of the given cache key. */
-			: sprintf( __( 'Cache key must be integer or non-empty string, %s given.' ), $type );
+			: sprintf( __( 'Cache key must be an integer or a non-empty string, %s given.' ), $type );
 
 		_doing_it_wrong(
 			sprintf( '%s::%s', __CLASS__, debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 2 )[1]['function'] ),
diff --git a/src/wp-includes/class-wp-oembed-controller.php b/src/wp-includes/class-wp-oembed-controller.php
index 22fceb54a9aa1..a36fff987d0fe 100644
--- a/src/wp-includes/class-wp-oembed-controller.php
+++ b/src/wp-includes/class-wp-oembed-controller.php
@@ -160,13 +160,14 @@ public function get_proxy_item_permissions_check() {
 	 * @since 4.8.0
 	 *
 	 * @see WP_oEmbed::get_html()
-	 * @global WP_Embed $wp_embed
+	 * @global WP_Embed   $wp_embed
+	 * @global WP_Scripts $wp_scripts
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return object|WP_Error oEmbed response data or WP_Error on failure.
 	 */
 	public function get_proxy_item( $request ) {
-		global $wp_embed;
+		global $wp_embed, $wp_scripts;
 
 		$args = $request->get_params();
 
@@ -204,7 +205,6 @@ public function get_proxy_item( $request ) {
 			$html = $wp_embed->get_embed_handler_html( $args, $url );
 
 			if ( $html ) {
-				global $wp_scripts;
 				// Check if any scripts were enqueued by the shortcode, and include them in the response.
 				$enqueued_scripts = array();
 
diff --git a/src/wp-includes/class-wp-oembed.php b/src/wp-includes/class-wp-oembed.php
index 3fce5bdb2a38d..91f9cd68be20c 100644
--- a/src/wp-includes/class-wp-oembed.php
+++ b/src/wp-includes/class-wp-oembed.php
@@ -4,7 +4,7 @@
  *
  * Used internally by the WP_Embed class, but is designed to be generic.
  *
- * @link https://wordpress.org/support/article/embeds/
+ * @link https://wordpress.org/documentation/article/embeds/
  * @link http://oembed.com/
  *
  * @package WordPress
@@ -54,6 +54,7 @@ public function __construct() {
 			'#https?://((m|www)\.)?youtube\.com/watch.*#i' => array( 'https://www.youtube.com/oembed', true ),
 			'#https?://((m|www)\.)?youtube\.com/playlist.*#i' => array( 'https://www.youtube.com/oembed', true ),
 			'#https?://((m|www)\.)?youtube\.com/shorts/*#i' => array( 'https://www.youtube.com/oembed', true ),
+			'#https?://((m|www)\.)?youtube\.com/live/*#i'  => array( 'https://www.youtube.com/oembed', true ),
 			'#https?://youtu\.be/.*#i'                     => array( 'https://www.youtube.com/oembed', true ),
 			'#https?://(.+\.)?vimeo\.com/.*#i'             => array( 'https://vimeo.com/api/oembed.{format}', true ),
 			'#https?://(www\.)?dailymotion\.com/.*#i'      => array( 'https://www.dailymotion.com/services/oembed', true ),
@@ -63,6 +64,7 @@ public function __construct() {
 			'#https?://(.+\.)?smugmug\.com/.*#i'           => array( 'https://api.smugmug.com/services/oembed/', true ),
 			'#https?://(www\.)?scribd\.com/(doc|document)/.*#i' => array( 'https://www.scribd.com/services/oembed', true ),
 			'#https?://wordpress\.tv/.*#i'                 => array( 'https://wordpress.tv/oembed/', true ),
+			'#https?://(.+\.)?crowdsignal\.net/.*#i'       => array( 'https://api.crowdsignal.com/oembed', true ),
 			'#https?://(.+\.)?polldaddy\.com/.*#i'         => array( 'https://api.crowdsignal.com/oembed', true ),
 			'#https?://poll\.fm/.*#i'                      => array( 'https://api.crowdsignal.com/oembed', true ),
 			'#https?://(.+\.)?survey\.fm/.*#i'             => array( 'https://api.crowdsignal.com/oembed', true ),
@@ -77,10 +79,10 @@ public function __construct() {
 			'#https?://(open|play)\.spotify\.com/.*#i'     => array( 'https://embed.spotify.com/oembed/', true ),
 			'#https?://(.+\.)?imgur\.com/.*#i'             => array( 'https://api.imgur.com/oembed', true ),
 			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'    => array( 'https://issuu.com/oembed_wp', true ),
-			'#https?://(www\.)?mixcloud\.com/.*#i'         => array( 'https://www.mixcloud.com/oembed', true ),
+			'#https?://(www\.)?mixcloud\.com/.*#i'         => array( 'https://app.mixcloud.com/oembed/', true ),
 			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i' => array( 'https://www.ted.com/services/v1/oembed.{format}', true ),
 			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create', true ),
-			'#https?://(.+)\.tumblr\.com/.*#i'        => array( 'https://www.tumblr.com/oembed/1.0', true ),
+			'#https?://(.+)\.tumblr\.com/.*#i'             => array( 'https://www.tumblr.com/oembed/1.0', true ),
 			'#https?://(www\.)?kickstarter\.com/projects/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
 			'#https?://kck\.st/.*#i'                       => array( 'https://www.kickstarter.com/services/oembed', true ),
 			'#https?://cloudup\.com/.*#i'                  => array( 'https://cloudup.com/oembed', true ),
@@ -103,9 +105,11 @@ public function __construct() {
 			'#https?://www\.someecards\.com/usercards/viewcard/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://some\.ly\/.+#i'                     => array( 'https://www.someecards.com/v2/oembed/', true ),
 			'#https?://(www\.)?tiktok\.com/.*/video/.*#i'  => array( 'https://www.tiktok.com/oembed', true ),
+			'#https?://(www\.)?tiktok\.com/@.*#i'          => array( 'https://www.tiktok.com/oembed', true ),
 			'#https?://([a-z]{2}|www)\.pinterest\.com(\.(au|mx))?/.*#i' => array( 'https://www.pinterest.com/oembed.json', true ),
 			'#https?://(www\.)?wolframcloud\.com/obj/.+#i' => array( 'https://www.wolframcloud.com/oembed', true ),
 			'#https?://pca\.st/.+#i'                       => array( 'https://pca.st/oembed.json', true ),
+			'#https?://((play|www)\.)?anghami\.com/.*#i'   => array( 'https://api.anghami.com/rest/v1/oembed.view', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -184,6 +188,8 @@ public function __construct() {
 		 * | Pinterest    | pinterest.com                             | 5.9.0   |
 		 * | WolframCloud | wolframcloud.com                          | 5.9.0   |
 		 * | Pocket Casts | pocketcasts.com                           | 6.1.0   |
+		 * | Crowdsignal  | crowdsignal.net                           | 6.2.0   |
+		 * | Anghami      | anghami.com                               | 6.3.0   |
 		 *
 		 * No longer supported providers:
 		 *
@@ -233,6 +239,7 @@ public function __call( $name, $arguments ) {
 		if ( in_array( $name, $this->compat_methods, true ) ) {
 			return $this->$name( ...$arguments );
 		}
+
 		return false;
 	}
 
@@ -511,7 +518,7 @@ public function discover( $url ) {
 	}
 
 	/**
-	 * Connects to a oEmbed provider and returns the result.
+	 * Connects to an oEmbed provider and returns the result.
 	 *
 	 * @since 2.9.0
 	 *
@@ -547,8 +554,10 @@ public function fetch( $provider, $url, $args = '' ) {
 			if ( is_wp_error( $result ) && 'not-implemented' === $result->get_error_code() ) {
 				continue;
 			}
+
 			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
 		}
+
 		return false;
 	}
 
@@ -568,14 +577,18 @@ private function _fetch_with_format( $provider_url_with_args, $format ) {
 		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
 
 		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) ) {
+
+		if ( 501 === wp_remote_retrieve_response_code( $response ) ) {
 			return new WP_Error( 'not-implemented' );
 		}
+
 		$body = wp_remote_retrieve_body( $response );
 		if ( ! $body ) {
 			return false;
 		}
+
 		$parse_method = "_parse_$format";
+
 		return $this->$parse_method( $body );
 	}
 
@@ -589,6 +602,7 @@ private function _fetch_with_format( $provider_url_with_args, $format ) {
 	 */
 	private function _parse_json( $response_body ) {
 		$data = json_decode( trim( $response_body ) );
+
 		return ( $data && is_object( $data ) ) ? $data : false;
 	}
 
@@ -606,9 +620,10 @@ private function _parse_xml( $response_body ) {
 		}
 
 		if ( PHP_VERSION_ID < 80000 ) {
-			// This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading
-			// is disabled by default, so this function is no longer needed to protect against XXE attacks.
-			// phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.libxml_disable_entity_loaderDeprecated
+			/*
+			 * This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading
+			 * is disabled by default, so this function is no longer needed to protect against XXE attacks.
+			 */
 			$loader = libxml_disable_entity_loader( true );
 		}
 
@@ -639,7 +654,7 @@ private function _parse_xml_body( $response_body ) {
 			return false;
 		}
 
-		$dom     = new DOMDocument;
+		$dom     = new DOMDocument();
 		$success = $dom->loadXML( $response_body );
 		if ( ! $success ) {
 			return false;
@@ -660,7 +675,7 @@ private function _parse_xml_body( $response_body ) {
 			return false;
 		}
 
-		$return = new stdClass;
+		$return = new stdClass();
 		foreach ( $xml as $key => $value ) {
 			$return->$key = (string) $value;
 		}
@@ -740,7 +755,7 @@ public function data2html( $data, $url ) {
 	 * @return string Possibly modified $html
 	 */
 	public function _strip_newlines( $html, $data, $url ) {
-		if ( false === strpos( $html, "\n" ) ) {
+		if ( ! str_contains( $html, "\n" ) ) {
 			return $html;
 		}
 
diff --git a/src/wp-includes/class-wp-post-type.php b/src/wp-includes/class-wp-post-type.php
index 35c4e52d202fc..42b413254cd47 100644
--- a/src/wp-includes/class-wp-post-type.php
+++ b/src/wp-includes/class-wp-post-type.php
@@ -410,6 +410,7 @@ final class WP_Post_Type {
 	 *
 	 * @param string       $post_type Post type key.
 	 * @param array|string $args      Optional. Array or string of arguments for registering a post type.
+	 *                                See register_post_type() for information on accepted arguments.
 	 *                                Default empty array.
 	 */
 	public function __construct( $post_type, $args = array() ) {
@@ -736,7 +737,7 @@ public function remove_rewrite_rules() {
 			remove_rewrite_tag( "%$this->name%" );
 			remove_permastruct( $this->name );
 			foreach ( $wp_rewrite->extra_rules_top as $regex => $query ) {
-				if ( false !== strpos( $query, "index.php?post_type=$this->name" ) ) {
+				if ( str_contains( $query, "index.php?post_type=$this->name" ) ) {
 					unset( $wp_rewrite->extra_rules_top[ $regex ] );
 				}
 			}
@@ -856,6 +857,7 @@ public static function get_default_labels() {
 			'item_published'           => array( __( 'Post published.' ), __( 'Page published.' ) ),
 			'item_published_privately' => array( __( 'Post published privately.' ), __( 'Page published privately.' ) ),
 			'item_reverted_to_draft'   => array( __( 'Post reverted to draft.' ), __( 'Page reverted to draft.' ) ),
+			'item_trashed'             => array( __( 'Post trashed.' ), __( 'Page trashed.' ) ),
 			'item_scheduled'           => array( __( 'Post scheduled.' ), __( 'Page scheduled.' ) ),
 			'item_updated'             => array( __( 'Post updated.' ), __( 'Page updated.' ) ),
 			'item_link'                => array(
diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php
index 511c4a7eec81e..0aae0379fef63 100644
--- a/src/wp-includes/class-wp-query.php
+++ b/src/wp-includes/class-wp-query.php
@@ -108,6 +108,14 @@ class WP_Query {
 	 */
 	public $current_post = -1;
 
+	/**
+	 * Whether the caller is before the loop.
+	 *
+	 * @since 6.3.0
+	 * @var bool
+	 */
+	public $before_loop = true;
+
 	/**
 	 * Whether the loop has started and the caller is in the loop.
 	 *
@@ -517,6 +525,7 @@ public function init() {
 		$this->post_count   = 0;
 		$this->current_post = -1;
 		$this->in_the_loop  = false;
+		$this->before_loop  = true;
 		unset( $this->request );
 		unset( $this->post );
 		unset( $this->comments );
@@ -531,7 +540,7 @@ public function init() {
 	}
 
 	/**
-	 * Reparse the query vars.
+	 * Reparses the query vars.
 	 *
 	 * @since 1.5.0
 	 */
@@ -610,6 +619,7 @@ public function fill_query_vars( $query_vars ) {
 			'post_parent__not_in',
 			'author__in',
 			'author__not_in',
+			'search_columns',
 		);
 
 		foreach ( $array_keys as $key ) {
@@ -622,7 +632,7 @@ public function fill_query_vars( $query_vars ) {
 	}
 
 	/**
-	 * Parse a query string and set query type booleans.
+	 * Parses a query string and sets query type booleans.
 	 *
 	 * @since 1.5.0
 	 * @since 4.2.0 Introduced the ability to order by specific clauses of a `$meta_query`, by passing the clause's
@@ -637,142 +647,145 @@ public function fill_query_vars( $query_vars ) {
 	 * @since 5.1.0 Introduced the `$meta_compare_key` parameter.
 	 * @since 5.3.0 Introduced the `$meta_type_key` parameter.
 	 * @since 6.1.0 Introduced the `$update_menu_item_cache` parameter.
+	 * @since 6.2.0 Introduced the `$search_columns` parameter.
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or string of Query parameters.
 	 *
-	 *     @type int             $attachment_id           Attachment post ID. Used for 'attachment' post_type.
-	 *     @type int|string      $author                  Author ID, or comma-separated list of IDs.
-	 *     @type string          $author_name             User 'user_nicename'.
-	 *     @type int[]           $author__in              An array of author IDs to query from.
-	 *     @type int[]           $author__not_in          An array of author IDs not to query from.
-	 *     @type bool            $cache_results           Whether to cache post information. Default true.
-	 *     @type int|string      $cat                     Category ID or comma-separated list of IDs (this or any children).
-	 *     @type int[]           $category__and           An array of category IDs (AND in).
-	 *     @type int[]           $category__in            An array of category IDs (OR in, no children).
-	 *     @type int[]           $category__not_in        An array of category IDs (NOT in).
-	 *     @type string          $category_name           Use category slug (not name, this or any children).
-	 *     @type array|int       $comment_count           Filter results by comment count. Provide an integer to match
-	 *                                                    comment count exactly. Provide an array with integer 'value'
-	 *                                                    and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to
-	 *                                                    compare against comment_count in a specific way.
-	 *     @type string          $comment_status          Comment status.
-	 *     @type int             $comments_per_page       The number of comments to return per page.
-	 *                                                    Default 'comments_per_page' option.
-	 *     @type array           $date_query              An associative array of WP_Date_Query arguments.
-	 *                                                    See WP_Date_Query::__construct().
-	 *     @type int             $day                     Day of the month. Default empty. Accepts numbers 1-31.
-	 *     @type bool            $exact                   Whether to search by exact keyword. Default false.
-	 *     @type string          $fields                  Post fields to query for. Accepts:
-	 *                                                    - '' Returns an array of complete post objects (`WP_Post[]`).
-	 *                                                    - 'ids' Returns an array of post IDs (`int[]`).
-	 *                                                    - 'id=>parent' Returns an associative array of parent post IDs,
-	 *                                                      keyed by post ID (`int[]`).
-	 *                                                    Default ''.
-	 *     @type int             $hour                    Hour of the day. Default empty. Accepts numbers 0-23.
-	 *     @type int|bool        $ignore_sticky_posts     Whether to ignore sticky posts or not. Setting this to false
-	 *                                                    excludes stickies from 'post__in'. Accepts 1|true, 0|false.
-	 *                                                    Default false.
-	 *     @type int             $m                       Combination YearMonth. Accepts any four-digit year and month
-	 *                                                    numbers 01-12. Default empty.
-	 *     @type string|string[] $meta_key                Meta key or keys to filter by.
-	 *     @type string|string[] $meta_value              Meta value or values to filter by.
-	 *     @type string          $meta_compare            MySQL operator used for comparing the meta value.
-	 *                                                    See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_compare_key        MySQL operator used for comparing the meta key.
-	 *                                                    See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_type               MySQL data type that the meta_value column will be CAST to for comparisons.
-	 *                                                    See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type string          $meta_type_key           MySQL data type that the meta_key column will be CAST to for comparisons.
-	 *                                                    See WP_Meta_Query::__construct() for accepted values and default value.
-	 *     @type array           $meta_query              An associative array of WP_Meta_Query arguments.
-	 *                                                    See WP_Meta_Query::__construct() for accepted values.
-	 *     @type int             $menu_order              The menu order of the posts.
-	 *     @type int             $minute                  Minute of the hour. Default empty. Accepts numbers 0-59.
-	 *     @type int             $monthnum                The two-digit month. Default empty. Accepts numbers 1-12.
-	 *     @type string          $name                    Post slug.
-	 *     @type bool            $nopaging                Show all posts (true) or paginate (false). Default false.
-	 *     @type bool            $no_found_rows           Whether to skip counting the total rows found. Enabling can improve
-	 *                                                    performance. Default false.
-	 *     @type int             $offset                  The number of posts to offset before retrieval.
-	 *     @type string          $order                   Designates ascending or descending order of posts. Default 'DESC'.
-	 *                                                    Accepts 'ASC', 'DESC'.
-	 *     @type string|array    $orderby                 Sort retrieved posts by parameter. One or more options may be passed.
-	 *                                                    To use 'meta_value', or 'meta_value_num', 'meta_key=keyname' must be
-	 *                                                    also be defined. To sort by a specific `$meta_query` clause, use that
-	 *                                                    clause's array key. Accepts:
-	 *                                                    - 'none'
-	 *                                                    - 'name'
-	 *                                                    - 'author'
-	 *                                                    - 'date'
-	 *                                                    - 'title'
-	 *                                                    - 'modified'
-	 *                                                    - 'menu_order'
-	 *                                                    - 'parent'
-	 *                                                    - 'ID'
-	 *                                                    - 'rand'
-	 *                                                    - 'relevance'
-	 *                                                    - 'RAND(x)' (where 'x' is an integer seed value)
-	 *                                                    - 'comment_count'
-	 *                                                    - 'meta_value'
-	 *                                                    - 'meta_value_num'
-	 *                                                    - 'post__in'
-	 *                                                    - 'post_name__in'
-	 *                                                    - 'post_parent__in'
-	 *                                                    - The array keys of `$meta_query`.
-	 *                                                    Default is 'date', except when a search is being performed, when
-	 *                                                    the default is 'relevance'.
-	 *     @type int             $p                       Post ID.
-	 *     @type int             $page                    Show the number of posts that would show up on page X of a
-	 *                                                    static front page.
-	 *     @type int             $paged                   The number of the current page.
-	 *     @type int             $page_id                 Page ID.
-	 *     @type string          $pagename                Page slug.
-	 *     @type string          $perm                    Show posts if user has the appropriate capability.
-	 *     @type string          $ping_status             Ping status.
-	 *     @type int[]           $post__in                An array of post IDs to retrieve, sticky posts will be included.
-	 *     @type int[]           $post__not_in            An array of post IDs not to retrieve. Note: a string of comma-
-	 *                                                    separated IDs will NOT work.
-	 *     @type string          $post_mime_type          The mime type of the post. Used for 'attachment' post_type.
-	 *     @type string[]        $post_name__in           An array of post slugs that results must match.
-	 *     @type int             $post_parent             Page ID to retrieve child pages for. Use 0 to only retrieve
-	 *                                                    top-level pages.
-	 *     @type int[]           $post_parent__in         An array containing parent page IDs to query child pages from.
-	 *     @type int[]           $post_parent__not_in     An array containing parent page IDs not to query child pages from.
-	 *     @type string|string[] $post_type               A post type slug (string) or array of post type slugs.
-	 *                                                    Default 'any' if using 'tax_query'.
-	 *     @type string|string[] $post_status             A post status (string) or array of post statuses.
-	 *     @type int             $posts_per_page          The number of posts to query for. Use -1 to request all posts.
-	 *     @type int             $posts_per_archive_page  The number of posts to query for by archive page. Overrides
-	 *                                                    'posts_per_page' when is_archive(), or is_search() are true.
-	 *     @type string          $s                       Search keyword(s). Prepending a term with a hyphen will
-	 *                                                    exclude posts matching that term. Eg, 'pillow -sofa' will
-	 *                                                    return posts containing 'pillow' but not 'sofa'. The
-	 *                                                    character used for exclusion can be modified using the
-	 *                                                    the 'wp_query_search_exclusion_prefix' filter.
-	 *     @type int             $second                  Second of the minute. Default empty. Accepts numbers 0-59.
-	 *     @type bool            $sentence                Whether to search by phrase. Default false.
-	 *     @type bool            $suppress_filters        Whether to suppress filters. Default false.
-	 *     @type string          $tag                     Tag slug. Comma-separated (either), Plus-separated (all).
-	 *     @type int[]           $tag__and                An array of tag IDs (AND in).
-	 *     @type int[]           $tag__in                 An array of tag IDs (OR in).
-	 *     @type int[]           $tag__not_in             An array of tag IDs (NOT in).
-	 *     @type int             $tag_id                  Tag id or comma-separated list of IDs.
-	 *     @type string[]        $tag_slug__and           An array of tag slugs (AND in).
-	 *     @type string[]        $tag_slug__in            An array of tag slugs (OR in). unless 'ignore_sticky_posts' is
-	 *                                                    true. Note: a string of comma-separated IDs will NOT work.
-	 *     @type array           $tax_query               An associative array of WP_Tax_Query arguments.
-	 *                                                    See WP_Tax_Query::__construct().
-	 *     @type string          $title                   Post title.
-	 *     @type bool            $update_post_meta_cache  Whether to update the post meta cache. Default true.
-	 *     @type bool            $update_post_term_cache  Whether to update the post term cache. Default true.
-	 *     @type bool            $update_menu_item_cache  Whether to update the menu item cache. Default false.
-	 *     @type bool            $lazy_load_term_meta     Whether to lazy-load term meta. Setting to false will
-	 *                                                    disable cache priming for term meta, so that each
-	 *                                                    get_term_meta() call will hit the database.
-	 *                                                    Defaults to the value of `$update_post_term_cache`.
-	 *     @type int             $w                       The week number of the year. Default empty. Accepts numbers 0-53.
-	 *     @type int             $year                    The four-digit year. Default empty. Accepts any four-digit year.
+	 *     @type int             $attachment_id          Attachment post ID. Used for 'attachment' post_type.
+	 *     @type int|string      $author                 Author ID, or comma-separated list of IDs.
+	 *     @type string          $author_name            User 'user_nicename'.
+	 *     @type int[]           $author__in             An array of author IDs to query from.
+	 *     @type int[]           $author__not_in         An array of author IDs not to query from.
+	 *     @type bool            $cache_results          Whether to cache post information. Default true.
+	 *     @type int|string      $cat                    Category ID or comma-separated list of IDs (this or any children).
+	 *     @type int[]           $category__and          An array of category IDs (AND in).
+	 *     @type int[]           $category__in           An array of category IDs (OR in, no children).
+	 *     @type int[]           $category__not_in       An array of category IDs (NOT in).
+	 *     @type string          $category_name          Use category slug (not name, this or any children).
+	 *     @type array|int       $comment_count          Filter results by comment count. Provide an integer to match
+	 *                                                   comment count exactly. Provide an array with integer 'value'
+	 *                                                   and 'compare' operator ('=', '!=', '>', '>=', '<', '<=' ) to
+	 *                                                   compare against comment_count in a specific way.
+	 *     @type string          $comment_status         Comment status.
+	 *     @type int             $comments_per_page      The number of comments to return per page.
+	 *                                                   Default 'comments_per_page' option.
+	 *     @type array           $date_query             An associative array of WP_Date_Query arguments.
+	 *                                                   See WP_Date_Query::__construct().
+	 *     @type int             $day                    Day of the month. Default empty. Accepts numbers 1-31.
+	 *     @type bool            $exact                  Whether to search by exact keyword. Default false.
+	 *     @type string          $fields                 Post fields to query for. Accepts:
+	 *                                                   - '' Returns an array of complete post objects (`WP_Post[]`).
+	 *                                                   - 'ids' Returns an array of post IDs (`int[]`).
+	 *                                                   - 'id=>parent' Returns an associative array of parent post IDs,
+	 *                                                     keyed by post ID (`int[]`).
+	 *                                                   Default ''.
+	 *     @type int             $hour                   Hour of the day. Default empty. Accepts numbers 0-23.
+	 *     @type int|bool        $ignore_sticky_posts    Whether to ignore sticky posts or not. Setting this to false
+	 *                                                   excludes stickies from 'post__in'. Accepts 1|true, 0|false.
+	 *                                                   Default false.
+	 *     @type int             $m                      Combination YearMonth. Accepts any four-digit year and month
+	 *                                                   numbers 01-12. Default empty.
+	 *     @type string|string[] $meta_key               Meta key or keys to filter by.
+	 *     @type string|string[] $meta_value             Meta value or values to filter by.
+	 *     @type string          $meta_compare           MySQL operator used for comparing the meta value.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
+	 *     @type string          $meta_compare_key       MySQL operator used for comparing the meta key.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
+	 *     @type string          $meta_type              MySQL data type that the meta_value column will be CAST to for comparisons.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
+	 *     @type string          $meta_type_key          MySQL data type that the meta_key column will be CAST to for comparisons.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values and default value.
+	 *     @type array           $meta_query             An associative array of WP_Meta_Query arguments.
+	 *                                                   See WP_Meta_Query::__construct() for accepted values.
+	 *     @type int             $menu_order             The menu order of the posts.
+	 *     @type int             $minute                 Minute of the hour. Default empty. Accepts numbers 0-59.
+	 *     @type int             $monthnum               The two-digit month. Default empty. Accepts numbers 1-12.
+	 *     @type string          $name                   Post slug.
+	 *     @type bool            $nopaging               Show all posts (true) or paginate (false). Default false.
+	 *     @type bool            $no_found_rows          Whether to skip counting the total rows found. Enabling can improve
+	 *                                                   performance. Default false.
+	 *     @type int             $offset                 The number of posts to offset before retrieval.
+	 *     @type string          $order                  Designates ascending or descending order of posts. Default 'DESC'.
+	 *                                                   Accepts 'ASC', 'DESC'.
+	 *     @type string|array    $orderby                Sort retrieved posts by parameter. One or more options may be passed.
+	 *                                                   To use 'meta_value', or 'meta_value_num', 'meta_key=keyname' must be
+	 *                                                   also be defined. To sort by a specific `$meta_query` clause, use that
+	 *                                                   clause's array key. Accepts:
+	 *                                                   - 'none'
+	 *                                                   - 'name'
+	 *                                                   - 'author'
+	 *                                                   - 'date'
+	 *                                                   - 'title'
+	 *                                                   - 'modified'
+	 *                                                   - 'menu_order'
+	 *                                                   - 'parent'
+	 *                                                   - 'ID'
+	 *                                                   - 'rand'
+	 *                                                   - 'relevance'
+	 *                                                   - 'RAND(x)' (where 'x' is an integer seed value)
+	 *                                                   - 'comment_count'
+	 *                                                   - 'meta_value'
+	 *                                                   - 'meta_value_num'
+	 *                                                   - 'post__in'
+	 *                                                   - 'post_name__in'
+	 *                                                   - 'post_parent__in'
+	 *                                                   - The array keys of `$meta_query`.
+	 *                                                   Default is 'date', except when a search is being performed, when
+	 *                                                   the default is 'relevance'.
+	 *     @type int             $p                      Post ID.
+	 *     @type int             $page                   Show the number of posts that would show up on page X of a
+	 *                                                   static front page.
+	 *     @type int             $paged                  The number of the current page.
+	 *     @type int             $page_id                Page ID.
+	 *     @type string          $pagename               Page slug.
+	 *     @type string          $perm                   Show posts if user has the appropriate capability.
+	 *     @type string          $ping_status            Ping status.
+	 *     @type int[]           $post__in               An array of post IDs to retrieve, sticky posts will be included.
+	 *     @type int[]           $post__not_in           An array of post IDs not to retrieve. Note: a string of comma-
+	 *                                                   separated IDs will NOT work.
+	 *     @type string          $post_mime_type         The mime type of the post. Used for 'attachment' post_type.
+	 *     @type string[]        $post_name__in          An array of post slugs that results must match.
+	 *     @type int             $post_parent            Page ID to retrieve child pages for. Use 0 to only retrieve
+	 *                                                   top-level pages.
+	 *     @type int[]           $post_parent__in        An array containing parent page IDs to query child pages from.
+	 *     @type int[]           $post_parent__not_in    An array containing parent page IDs not to query child pages from.
+	 *     @type string|string[] $post_type              A post type slug (string) or array of post type slugs.
+	 *                                                   Default 'any' if using 'tax_query'.
+	 *     @type string|string[] $post_status            A post status (string) or array of post statuses.
+	 *     @type int             $posts_per_page         The number of posts to query for. Use -1 to request all posts.
+	 *     @type int             $posts_per_archive_page The number of posts to query for by archive page. Overrides
+	 *                                                   'posts_per_page' when is_archive(), or is_search() are true.
+	 *     @type string          $s                      Search keyword(s). Prepending a term with a hyphen will
+	 *                                                   exclude posts matching that term. Eg, 'pillow -sofa' will
+	 *                                                   return posts containing 'pillow' but not 'sofa'. The
+	 *                                                   character used for exclusion can be modified using the
+	 *                                                   the 'wp_query_search_exclusion_prefix' filter.
+	 *     @type string[]        $search_columns         Array of column names to be searched. Accepts 'post_title',
+	 *                                                   'post_excerpt' and 'post_content'. Default empty array.
+	 *     @type int             $second                 Second of the minute. Default empty. Accepts numbers 0-59.
+	 *     @type bool            $sentence               Whether to search by phrase. Default false.
+	 *     @type bool            $suppress_filters       Whether to suppress filters. Default false.
+	 *     @type string          $tag                    Tag slug. Comma-separated (either), Plus-separated (all).
+	 *     @type int[]           $tag__and               An array of tag IDs (AND in).
+	 *     @type int[]           $tag__in                An array of tag IDs (OR in).
+	 *     @type int[]           $tag__not_in            An array of tag IDs (NOT in).
+	 *     @type int             $tag_id                 Tag id or comma-separated list of IDs.
+	 *     @type string[]        $tag_slug__and          An array of tag slugs (AND in).
+	 *     @type string[]        $tag_slug__in           An array of tag slugs (OR in). unless 'ignore_sticky_posts' is
+	 *                                                   true. Note: a string of comma-separated IDs will NOT work.
+	 *     @type array           $tax_query              An associative array of WP_Tax_Query arguments.
+	 *                                                   See WP_Tax_Query::__construct().
+	 *     @type string          $title                  Post title.
+	 *     @type bool            $update_post_meta_cache Whether to update the post meta cache. Default true.
+	 *     @type bool            $update_post_term_cache Whether to update the post term cache. Default true.
+	 *     @type bool            $update_menu_item_cache Whether to update the menu item cache. Default false.
+	 *     @type bool            $lazy_load_term_meta    Whether to lazy-load term meta. Setting to false will
+	 *                                                   disable cache priming for term meta, so that each
+	 *                                                   get_term_meta() call will hit the database.
+	 *                                                   Defaults to the value of `$update_post_term_cache`.
+	 *     @type int             $w                      The week number of the year. Default empty. Accepts numbers 0-53.
+	 *     @type int             $year                   The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
 	public function parse_query( $query = '' ) {
@@ -1002,7 +1015,7 @@ public function parse_query( $query = '' ) {
 			$this->is_admin = true;
 		}
 
-		if ( false !== strpos( $qv['feed'], 'comments-' ) ) {
+		if ( str_contains( $qv['feed'], 'comments-' ) ) {
 			$qv['feed']         = str_replace( 'comments-', '', $qv['feed'] );
 			$qv['withcomments'] = 1;
 		}
@@ -1172,7 +1185,7 @@ public function parse_tax_query( &$q ) {
 					$term = implode( ',', $term );
 				}
 
-				if ( strpos( $term, '+' ) !== false ) {
+				if ( str_contains( $term, '+' ) ) {
 					$terms = preg_split( '/[+]+/', $term );
 					foreach ( $terms as $term ) {
 						$tax_query[] = array_merge(
@@ -1285,7 +1298,7 @@ public function parse_tax_query( &$q ) {
 		// Tag stuff.
 
 		if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
-			if ( strpos( $q['tag'], ',' ) !== false ) {
+			if ( str_contains( $q['tag'], ',' ) ) {
 				$tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
 				foreach ( (array) $tags as $tag ) {
 					$tag                 = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
@@ -1410,6 +1423,32 @@ protected function parse_search( &$q ) {
 		$searchand                 = '';
 		$q['search_orderby_title'] = array();
 
+		$default_search_columns = array( 'post_title', 'post_excerpt', 'post_content' );
+		$search_columns         = ! empty( $q['search_columns'] ) ? $q['search_columns'] : $default_search_columns;
+		if ( ! is_array( $search_columns ) ) {
+			$search_columns = array( $search_columns );
+		}
+
+		/**
+		 * Filters the columns to search in a WP_Query search.
+		 *
+		 * The supported columns are `post_title`, `post_excerpt` and `post_content`.
+		 * They are all included by default.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param string[] $search_columns Array of column names to be searched.
+		 * @param string   $search         Text being searched.
+		 * @param WP_Query $query          The current WP_Query instance.
+		 */
+		$search_columns = (array) apply_filters( 'post_search_columns', $search_columns, $q['s'], $this );
+
+		// Use only supported search columns.
+		$search_columns = array_intersect( $search_columns, $default_search_columns );
+		if ( empty( $search_columns ) ) {
+			$search_columns = $default_search_columns;
+		}
+
 		/**
 		 * Filters the prefix that indicates that a search term should be excluded from results.
 		 *
@@ -1422,7 +1461,7 @@ protected function parse_search( &$q ) {
 
 		foreach ( $q['search_terms'] as $term ) {
 			// If there is an $exclusion_prefix, terms prefixed with it should be excluded.
-			$exclude = $exclusion_prefix && ( substr( $term, 0, 1 ) === $exclusion_prefix );
+			$exclude = $exclusion_prefix && str_starts_with( $term, $exclusion_prefix );
 			if ( $exclude ) {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
@@ -1439,11 +1478,17 @@ protected function parse_search( &$q ) {
 
 			$like = $n . $wpdb->esc_like( $term ) . $n;
 
+			$search_columns_parts = array();
+			foreach ( $search_columns as $search_column ) {
+				$search_columns_parts[ $search_column ] = $wpdb->prepare( "({$wpdb->posts}.$search_column $like_op %s)", $like );
+			}
+
 			if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
-				$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
-			} else {
-				$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+				$search_columns_parts['attachment'] = $wpdb->prepare( "(sq1.meta_value $like_op %s)", $like );
 			}
+
+			$search .= "$searchand(" . implode( " $andor_op ", $search_columns_parts ) . ')';
+
 			$searchand = ' AND ';
 		}
 
@@ -1458,7 +1503,7 @@ protected function parse_search( &$q ) {
 	}
 
 	/**
-	 * Check if the terms are suitable for searching.
+	 * Checks if the terms are suitable for searching.
 	 *
 	 * Uses an array of stopwords (terms) that are excluded from the separate
 	 * term matching when searching for posts. The list of English stopwords is
@@ -1499,7 +1544,7 @@ protected function parse_search_terms( $terms ) {
 	}
 
 	/**
-	 * Retrieve stopwords used when parsing search terms.
+	 * Retrieves stopwords used when parsing search terms.
 	 *
 	 * @since 3.7.0
 	 *
@@ -1571,8 +1616,10 @@ protected function parse_search_order( &$q ) {
 				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
 			}
 
-			// Sanity limit, sort as sentence when more than 6 terms
-			// (few searches are longer than 6 terms and most titles are not).
+			/*
+			 * Sanity limit, sort as sentence when more than 6 terms
+			 * (few searches are longer than 6 terms and most titles are not).
+			 */
 			if ( $num_terms < 7 ) {
 				// All words in title.
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
@@ -1779,7 +1826,8 @@ public function set_404() {
 	 * @since 3.9.0 The `$default_value` argument was introduced.
 	 *
 	 * @param string $query_var     Query variable key.
-	 * @param mixed  $default_value Optional. Value to return if the query variable is not set. Default empty string.
+	 * @param mixed  $default_value Optional. Value to return if the query variable is not set.
+	 *                              Default empty string.
 	 * @return mixed Contents of the query variable.
 	 */
 	public function get( $query_var, $default_value = '' ) {
@@ -1911,6 +1959,8 @@ public function get_posts() {
 
 		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
+		} elseif ( $q['lazy_load_term_meta'] ) { // Lazy loading term meta only works if term caches are primed.
+			$q['update_post_term_cache'] = true;
 		}
 
 		if ( ! isset( $q['update_post_meta_cache'] ) ) {
@@ -2213,7 +2263,7 @@ public function get_posts() {
 				}
 				if ( ! $post_type ) {
 					$post_type = 'any';
-				} elseif ( count( $post_type ) == 1 ) {
+				} elseif ( count( $post_type ) === 1 ) {
 					$post_type = $post_type[0];
 				}
 
@@ -2306,7 +2356,7 @@ public function get_posts() {
 		// Author stuff for nice URLs.
 
 		if ( '' !== $q['author_name'] ) {
-			if ( strpos( $q['author_name'], '/' ) !== false ) {
+			if ( str_contains( $q['author_name'], '/' ) ) {
 				$q['author_name'] = explode( '/', $q['author_name'] );
 				if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
 					$q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // No trailing slash.
@@ -2769,12 +2819,12 @@ public function get_posts() {
 			$last_changed = wp_cache_get_last_changed( 'comment' ) . ':' . wp_cache_get_last_changed( 'posts' );
 
 			$cache_key   = "comment_feed:$key:$last_changed";
-			$comment_ids = wp_cache_get( $cache_key, 'comment' );
+			$comment_ids = wp_cache_get( $cache_key, 'comment-queries' );
 			if ( false === $comment_ids ) {
 				$comment_ids = $wpdb->get_col( $comments_request );
-				wp_cache_add( $cache_key, $comment_ids, 'comment' );
+				wp_cache_add( $cache_key, $comment_ids, 'comment-queries' );
 			}
-			_prime_comment_caches( $comment_ids, false );
+			_prime_comment_caches( $comment_ids );
 
 			// Convert to WP_Comment.
 			/** @var WP_Comment[] */
@@ -3103,15 +3153,30 @@ public function get_posts() {
 		 * cannot be cached. Note the space before `RAND` in the string
 		 * search, that to ensure against a collision with another
 		 * function.
+		 *
+		 * If `$fields` has been modified by the `posts_fields`,
+		 * `posts_fields_request`, `post_clauses` or `posts_clauses_request`
+		 * filters, then caching is disabled to prevent caching collisions.
 		 */
 		$id_query_is_cacheable = ! str_contains( strtoupper( $orderby ), ' RAND(' );
+
+		$cacheable_field_values = array(
+			"{$wpdb->posts}.*",
+			"{$wpdb->posts}.ID, {$wpdb->posts}.post_parent",
+			"{$wpdb->posts}.ID",
+		);
+
+		if ( ! in_array( $fields, $cacheable_field_values, true ) ) {
+			$id_query_is_cacheable = false;
+		}
+
 		if ( $q['cache_results'] && $id_query_is_cacheable ) {
 			$new_request = str_replace( $fields, "{$wpdb->posts}.*", $this->request );
 			$cache_key   = $this->generate_cache_key( $q, $new_request );
 
 			$cache_found = false;
 			if ( null === $this->posts ) {
-				$cached_results = wp_cache_get( $cache_key, 'posts', false, $cache_found );
+				$cached_results = wp_cache_get( $cache_key, 'post-queries', false, $cache_found );
 
 				if ( $cached_results ) {
 					if ( 'ids' === $q['fields'] ) {
@@ -3166,7 +3231,7 @@ public function get_posts() {
 					'max_num_pages' => $this->max_num_pages,
 				);
 
-				wp_cache_set( $cache_key, $cache_value, 'posts' );
+				wp_cache_set( $cache_key, $cache_value, 'post-queries' );
 			}
 
 			return $this->posts;
@@ -3199,7 +3264,7 @@ public function get_posts() {
 					'max_num_pages' => $this->max_num_pages,
 				);
 
-				wp_cache_set( $cache_key, $cache_value, 'posts' );
+				wp_cache_set( $cache_key, $cache_value, 'post-queries' );
 			}
 
 			return $post_parents;
@@ -3274,7 +3339,7 @@ public function get_posts() {
 				'max_num_pages' => $this->max_num_pages,
 			);
 
-			wp_cache_set( $cache_key, $cache_value, 'posts' );
+			wp_cache_set( $cache_key, $cache_value, 'post-queries' );
 		}
 
 		if ( ! $q['suppress_filters'] ) {
@@ -3313,12 +3378,12 @@ public function get_posts() {
 			$comment_last_changed = wp_cache_get_last_changed( 'comment' );
 
 			$comment_cache_key = "comment_feed:$comment_key:$comment_last_changed";
-			$comment_ids       = wp_cache_get( $comment_cache_key, 'comment' );
+			$comment_ids       = wp_cache_get( $comment_cache_key, 'comment-queries' );
 			if ( false === $comment_ids ) {
 				$comment_ids = $wpdb->get_col( $comments_request );
-				wp_cache_add( $comment_cache_key, $comment_ids, 'comment' );
+				wp_cache_add( $comment_cache_key, $comment_ids, 'comment-queries' );
 			}
-			_prime_comment_caches( $comment_ids, false );
+			_prime_comment_caches( $comment_ids );
 
 			// Convert to WP_Comment.
 			/** @var WP_Comment[] */
@@ -3433,11 +3498,6 @@ public function get_posts() {
 			}
 		}
 
-		// If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
-		if ( ! empty( $this->comments ) ) {
-			wp_queue_comments_for_comment_meta_lazyload( $this->comments );
-		}
-
 		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the array of retrieved posts after they've been fetched and
@@ -3451,8 +3511,10 @@ public function get_posts() {
 			$this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
 		}
 
-		// Ensure that any posts added/modified via one of the filters above are
-		// of the type WP_Post and are filtered.
+		/*
+		 * Ensure that any posts added/modified via one of the filters above are
+		 * of the type WP_Post and are filtered.
+		 */
 		if ( $this->posts ) {
 			$this->post_count = count( $this->posts );
 
@@ -3460,8 +3522,7 @@ public function get_posts() {
 			$this->posts = array_map( 'get_post', $this->posts );
 
 			if ( $q['cache_results'] ) {
-				$post_ids = wp_list_pluck( $this->posts, 'ID' );
-				_prime_post_caches( $post_ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				update_post_caches( $this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
 			}
 
 			/** @var WP_Post */
@@ -3483,7 +3544,7 @@ public function get_posts() {
 	}
 
 	/**
-	 * Set up the amount of found posts and the number of pages (if limit clause was used)
+	 * Sets up the amount of found posts and the number of pages (if limit clause was used)
 	 * for the current query.
 	 *
 	 * @since 3.5.0
@@ -3496,8 +3557,10 @@ public function get_posts() {
 	private function set_found_posts( $q, $limits ) {
 		global $wpdb;
 
-		// Bail if posts is an empty array. Continue if posts is an empty string,
-		// null, or false to accommodate caching plugins that fill posts later.
+		/*
+		 * Bail if posts is an empty array. Continue if posts is an empty string,
+		 * null, or false to accommodate caching plugins that fill posts later.
+		 */
 		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
 			return;
 		}
@@ -3542,7 +3605,7 @@ private function set_found_posts( $q, $limits ) {
 	}
 
 	/**
-	 * Set up the next post and iterate current post index.
+	 * Sets up the next post and iterate current post index.
 	 *
 	 * @since 1.5.0
 	 *
@@ -3571,10 +3634,19 @@ public function the_post() {
 		global $post;
 
 		if ( ! $this->in_the_loop ) {
-			update_post_author_caches( $this->posts );
+			// Only prime the post cache for queries limited to the ID field.
+			$post_ids = array_filter( $this->posts, 'is_numeric' );
+			// Exclude any falsey values, such as 0.
+			$post_ids = array_filter( $post_ids );
+			if ( $post_ids ) {
+				_prime_post_caches( $post_ids, $this->query_vars['update_post_term_cache'], $this->query_vars['update_post_meta_cache'] );
+			}
+			$post_objects = array_map( 'get_post', $this->posts );
+			update_post_author_caches( $post_objects );
 		}
 
 		$this->in_the_loop = true;
+		$this->before_loop = false;
 
 		if ( -1 == $this->current_post ) { // Loop has just started.
 			/**
@@ -3615,6 +3687,8 @@ public function have_posts() {
 			// Do some cleaning up after the loop.
 			$this->rewind_posts();
 		} elseif ( 0 === $this->post_count ) {
+			$this->before_loop = false;
+
 			/**
 			 * Fires if no results are found in a post query.
 			 *
@@ -3630,7 +3704,7 @@ public function have_posts() {
 	}
 
 	/**
-	 * Rewind the posts and reset post index.
+	 * Rewinds the posts and resets post index.
 	 *
 	 * @since 1.5.0
 	 */
@@ -3642,7 +3716,7 @@ public function rewind_posts() {
 	}
 
 	/**
-	 * Iterate current comment index and return WP_Comment object.
+	 * Iterates current comment index and returns WP_Comment object.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3679,7 +3753,7 @@ public function the_comment() {
 	}
 
 	/**
-	 * Whether there are more comments available.
+	 * Determines whether there are more comments available.
 	 *
 	 * Automatically rewinds comments when finished.
 	 *
@@ -3698,7 +3772,7 @@ public function have_comments() {
 	}
 
 	/**
-	 * Rewind the comments, resets the comment index and comment to first.
+	 * Rewinds the comments, resets the comment index and comment to first.
 	 *
 	 * @since 2.2.0
 	 */
@@ -3860,7 +3934,7 @@ public function __construct( $query = '' ) {
 	}
 
 	/**
-	 * Make private properties readable for backward compatibility.
+	 * Makes private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
@@ -3874,7 +3948,7 @@ public function __get( $name ) {
 	}
 
 	/**
-	 * Make private properties checkable for backward compatibility.
+	 * Makes private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
@@ -3888,7 +3962,7 @@ public function __isset( $name ) {
 	}
 
 	/**
-	 * Make private/protected methods readable for backward compatibility.
+	 * Makes private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
@@ -3904,7 +3978,7 @@ public function __call( $name, $arguments ) {
 	}
 
 	/**
-	 * Is the query for an existing archive page?
+	 * Determines whether the query is for an existing archive page.
 	 *
 	 * Archive pages include category, tag, author, date, custom post type,
 	 * and custom taxonomy based archives.
@@ -3925,7 +3999,7 @@ public function is_archive() {
 	}
 
 	/**
-	 * Is the query for an existing post type archive page?
+	 * Determines whether the query is for an existing post type archive page.
 	 *
 	 * @since 3.1.0
 	 *
@@ -3952,7 +4026,7 @@ public function is_post_type_archive( $post_types = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing attachment page?
+	 * Determines whether the query is for an existing attachment page.
 	 *
 	 * @since 3.1.0
 	 *
@@ -3987,7 +4061,7 @@ public function is_attachment( $attachment = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing author archive page?
+	 * Determines whether the query is for an existing author archive page.
 	 *
 	 * If the $author parameter is specified, this function will additionally
 	 * check if the query is for one of the authors specified.
@@ -4026,7 +4100,7 @@ public function is_author( $author = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing category archive page?
+	 * Determines whether the query is for an existing category archive page.
 	 *
 	 * If the $category parameter is specified, this function will additionally
 	 * check if the query is for one of the categories specified.
@@ -4065,7 +4139,7 @@ public function is_category( $category = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing tag archive page?
+	 * Determines whether the query is for an existing tag archive page.
 	 *
 	 * If the $tag parameter is specified, this function will additionally
 	 * check if the query is for one of the tags specified.
@@ -4104,7 +4178,7 @@ public function is_tag( $tag = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing custom taxonomy archive page?
+	 * Determines whether the query is for an existing custom taxonomy archive page.
 	 *
 	 * If the $taxonomy parameter is specified, this function will additionally
 	 * check if the query is for that specific $taxonomy.
@@ -4160,7 +4234,7 @@ public function is_tax( $taxonomy = '', $term = '' ) {
 	}
 
 	/**
-	 * Whether the current URL is within the comments popup window.
+	 * Determines whether the current URL is within the comments popup window.
 	 *
 	 * @since 3.1.0
 	 * @deprecated 4.5.0
@@ -4174,7 +4248,7 @@ public function is_comments_popup() {
 	}
 
 	/**
-	 * Is the query for an existing date archive?
+	 * Determines whether the query is for an existing date archive.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4185,7 +4259,7 @@ public function is_date() {
 	}
 
 	/**
-	 * Is the query for an existing day archive?
+	 * Determines whether the query is for an existing day archive.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4196,7 +4270,7 @@ public function is_day() {
 	}
 
 	/**
-	 * Is the query for a feed?
+	 * Determines whether the query is for a feed.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4218,7 +4292,7 @@ public function is_feed( $feeds = '' ) {
 	}
 
 	/**
-	 * Is the query for a comments feed?
+	 * Determines whether the query is for a comments feed.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4229,7 +4303,7 @@ public function is_comment_feed() {
 	}
 
 	/**
-	 * Is the query for the front page of the site?
+	 * Determines whether the query is for the front page of the site.
 	 *
 	 * This is for what is displayed at your site's main URL.
 	 *
@@ -4238,7 +4312,7 @@ public function is_comment_feed() {
 	 * If you set a static page for the front page of your site, this function will return
 	 * true when viewing that page.
 	 *
-	 * Otherwise the same as @see WP_Query::is_home()
+	 * Otherwise the same as {@see WP_Query::is_home()}.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4258,7 +4332,7 @@ public function is_front_page() {
 	}
 
 	/**
-	 * Is the query for the blog homepage?
+	 * Determines whether the query is for the blog homepage.
 	 *
 	 * This is the page which shows the time based blog content of your site.
 	 *
@@ -4278,7 +4352,7 @@ public function is_home() {
 	}
 
 	/**
-	 * Is the query for the Privacy Policy page?
+	 * Determines whether the query is for the Privacy Policy page.
 	 *
 	 * This is the page which shows the Privacy Policy content of your site.
 	 *
@@ -4301,7 +4375,7 @@ public function is_privacy_policy() {
 	}
 
 	/**
-	 * Is the query for an existing month archive?
+	 * Determines whether the query is for an existing month archive.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4312,7 +4386,7 @@ public function is_month() {
 	}
 
 	/**
-	 * Is the query for an existing single page?
+	 * Determines whether the query is for an existing single page.
 	 *
 	 * If the $page parameter is specified, this function will additionally
 	 * check if the query is for one of the pages specified.
@@ -4365,7 +4439,7 @@ public function is_page( $page = '' ) {
 	}
 
 	/**
-	 * Is the query for a paged result and not for the first page?
+	 * Determines whether the query is for a paged result and not for the first page.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4376,7 +4450,7 @@ public function is_paged() {
 	}
 
 	/**
-	 * Is the query for a post or page preview?
+	 * Determines whether the query is for a post or page preview.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4387,7 +4461,7 @@ public function is_preview() {
 	}
 
 	/**
-	 * Is the query for the robots.txt file?
+	 * Determines whether the query is for the robots.txt file.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4398,7 +4472,7 @@ public function is_robots() {
 	}
 
 	/**
-	 * Is the query for the favicon.ico file?
+	 * Determines whether the query is for the favicon.ico file.
 	 *
 	 * @since 5.4.0
 	 *
@@ -4409,7 +4483,7 @@ public function is_favicon() {
 	}
 
 	/**
-	 * Is the query for a search?
+	 * Determines whether the query is for a search.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4420,7 +4494,7 @@ public function is_search() {
 	}
 
 	/**
-	 * Is the query for an existing single post?
+	 * Determines whether the query is for an existing single post.
 	 *
 	 * Works for any post type excluding pages.
 	 *
@@ -4474,8 +4548,8 @@ public function is_single( $post = '' ) {
 	}
 
 	/**
-	 * Is the query for an existing single post of any post type (post, attachment, page,
-	 * custom post types)?
+	 * Determines whether the query is for an existing single post of any post type
+	 * (post, attachment, page, custom post types).
 	 *
 	 * If the $post_types parameter is specified, this function will additionally
 	 * check if the query is for one of the Posts Types specified.
@@ -4504,7 +4578,7 @@ public function is_singular( $post_types = '' ) {
 	}
 
 	/**
-	 * Is the query for a specific time?
+	 * Determines whether the query is for a specific time.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4515,7 +4589,7 @@ public function is_time() {
 	}
 
 	/**
-	 * Is the query for a trackback endpoint call?
+	 * Determines whether the query is for a trackback endpoint call.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4526,7 +4600,7 @@ public function is_trackback() {
 	}
 
 	/**
-	 * Is the query for an existing year archive?
+	 * Determines whether the query is for an existing year archive.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4537,7 +4611,7 @@ public function is_year() {
 	}
 
 	/**
-	 * Is the query a 404 (returns no results)?
+	 * Determines whether the query is a 404 (returns no results).
 	 *
 	 * @since 3.1.0
 	 *
@@ -4548,7 +4622,7 @@ public function is_404() {
 	}
 
 	/**
-	 * Is the query for an embedded post?
+	 * Determines whether the query is for an embedded post.
 	 *
 	 * @since 4.4.0
 	 *
@@ -4559,7 +4633,7 @@ public function is_embed() {
 	}
 
 	/**
-	 * Is the query the main query?
+	 * Determines whether the query is the main query.
 	 *
 	 * @since 3.3.0
 	 *
@@ -4573,7 +4647,7 @@ public function is_main_query() {
 	}
 
 	/**
-	 * Set up global post data.
+	 * Sets up global post data.
 	 *
 	 * @since 4.1.0
 	 * @since 4.4.0 Added the ability to pass a post ID to `$post`.
@@ -4632,7 +4706,7 @@ public function setup_postdata( $post ) {
 	}
 
 	/**
-	 * Generate post data.
+	 * Generates post data.
 	 *
 	 * @since 5.2.0
 	 *
@@ -4653,11 +4727,22 @@ public function generate_postdata( $post ) {
 
 		$authordata = get_userdata( $post->post_author );
 
-		$currentday   = mysql2date( 'd.m.y', $post->post_date, false );
-		$currentmonth = mysql2date( 'm', $post->post_date, false );
-		$numpages     = 1;
-		$multipage    = 0;
-		$page         = $this->get( 'page' );
+		$currentday   = false;
+		$currentmonth = false;
+
+		$post_date = $post->post_date;
+		if ( ! empty( $post_date ) && '0000-00-00 00:00:00' !== $post_date ) {
+			// Avoid using mysql2date for performance reasons.
+			$currentmonth = substr( $post_date, 5, 2 );
+			$day          = substr( $post_date, 8, 2 );
+			$year         = substr( $post_date, 2, 2 );
+
+			$currentday = sprintf( '%s.%s.%s', $day, $currentmonth, $year );
+		}
+
+		$numpages  = 1;
+		$multipage = 0;
+		$page      = $this->get( 'page' );
 		if ( ! $page ) {
 			$page = 1;
 		}
@@ -4675,7 +4760,7 @@ public function generate_postdata( $post ) {
 		}
 
 		$content = $post->post_content;
-		if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
+		if ( str_contains( $content, '<!--nextpage-->' ) ) {
 			$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
 			$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
@@ -4685,7 +4770,7 @@ public function generate_postdata( $post ) {
 			$content = str_replace( '<!-- /wp:nextpage -->', '', $content );
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
+			if ( str_starts_with( $content, '<!--nextpage-->' ) ) {
 				$content = substr( $content, 15 );
 			}
 
@@ -4724,7 +4809,7 @@ public function generate_postdata( $post ) {
 	}
 
 	/**
-	 * Generate cache key.
+	 * Generates cache key.
 	 *
 	 * @since 6.1.0
 	 *
@@ -4732,7 +4817,6 @@ public function generate_postdata( $post ) {
 	 *
 	 * @param array  $args Query arguments.
 	 * @param string $sql  SQL statement.
-	 *
 	 * @return string Cache key.
 	 */
 	protected function generate_cache_key( array $args, $sql ) {
@@ -4759,7 +4843,7 @@ protected function generate_cache_key( array $args, $sql ) {
 			 * $value is passed by reference to allow it to be modified.
 			 * array_walk_recursive() does not return an array.
 			 */
-			function ( &$value ) use ( $wpdb, $placeholder ) {
+			static function ( &$value ) use ( $wpdb, $placeholder ) {
 				if ( is_string( $value ) && str_contains( $value, $placeholder ) ) {
 					$value = $wpdb->remove_placeholder_escape( $value );
 				}
@@ -4794,7 +4878,7 @@ public function reset_postdata() {
 	}
 
 	/**
-	 * Lazyload term meta for posts in the loop.
+	 * Lazyloads term meta for posts in the loop.
 	 *
 	 * @since 4.4.0
 	 * @deprecated 4.5.0 See wp_queue_posts_for_term_meta_lazyload().
@@ -4809,10 +4893,10 @@ public function lazyload_term_meta( $check, $term_id ) {
 	}
 
 	/**
-	 * Lazyload comment meta for comments in the loop.
+	 * Lazyloads comment meta for comments in the loop.
 	 *
 	 * @since 4.4.0
-	 * @deprecated 4.5.0 See wp_queue_comments_for_comment_meta_lazyload().
+	 * @deprecated 4.5.0 See wp_lazyload_comment_meta().
 	 *
 	 * @param mixed $check
 	 * @param int   $comment_id
diff --git a/src/wp-includes/class-wp-recovery-mode-email-service.php b/src/wp-includes/class-wp-recovery-mode-email-service.php
index 013901f90e7d4..fb329da21cb9b 100644
--- a/src/wp-includes/class-wp-recovery-mode-email-service.php
+++ b/src/wp-includes/class-wp-recovery-mode-email-service.php
@@ -116,12 +116,7 @@ private function send_recovery_mode_email( $rate_limit, $error, $extension ) {
 		$url      = $this->link_service->generate_url();
 		$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
-		$switched_locale = false;
-
-		// The switch_to_locale() function is loaded before it can actually be used.
-		if ( function_exists( 'switch_to_locale' ) && isset( $GLOBALS['wp_locale_switcher'] ) ) {
-			$switched_locale = switch_to_locale( get_locale() );
-		}
+		$switched_locale = switch_to_locale( get_locale() );
 
 		if ( $extension ) {
 			$cause   = $this->get_cause( $extension );
@@ -158,7 +153,7 @@ private function send_recovery_mode_email( $rate_limit, $error, $extension ) {
 		$message = __(
 			'Howdy!
 
-Since WordPress 5.2 there is a built-in feature that detects when a plugin or theme causes a fatal error on your site, and notifies you with this automated email.
+WordPress has a built-in feature that detects when a plugin or theme causes a fatal error on your site, and notifies you with this automated email.
 ###CAUSE###
 First, visit your website (###SITEURL###) and check for any visible issues. Next, visit the page where the error was caught (###PAGEURL###) and check for any visible issues.
 
@@ -319,7 +314,7 @@ private function get_plugin( $extension ) {
 			return $plugins[ "{$extension['slug']}/{$extension['slug']}.php" ];
 		} else {
 			foreach ( $plugins as $file => $plugin_data ) {
-				if ( 0 === strpos( $file, "{$extension['slug']}/" ) || $file === $extension['slug'] ) {
+				if ( str_starts_with( $file, "{$extension['slug']}/" ) || $file === $extension['slug'] ) {
 					return $plugin_data;
 				}
 			}
diff --git a/src/wp-includes/class-wp-recovery-mode-key-service.php b/src/wp-includes/class-wp-recovery-mode-key-service.php
index 5ab0f8c3f9fc8..73713caeb9686 100644
--- a/src/wp-includes/class-wp-recovery-mode-key-service.php
+++ b/src/wp-includes/class-wp-recovery-mode-key-service.php
@@ -85,12 +85,15 @@ public function generate_and_store_recovery_mode_key( $token ) {
 	 *
 	 * @since 5.2.0
 	 *
+	 * @global PasswordHash $wp_hasher
+	 *
 	 * @param string $token The token used when generating the given key.
 	 * @param string $key   The unhashed key.
 	 * @param int    $ttl   Time in seconds for the key to be valid for.
 	 * @return true|WP_Error True on success, error object on failure.
 	 */
 	public function validate_recovery_mode_key( $token, $key, $ttl ) {
+		global $wp_hasher;
 
 		$records = $this->get_keys();
 
@@ -106,7 +109,12 @@ public function validate_recovery_mode_key( $token, $key, $ttl ) {
 			return new WP_Error( 'invalid_recovery_key_format', __( 'Invalid recovery key format.' ) );
 		}
 
-		if ( ! wp_check_password( $key, $record['hashed_key'] ) ) {
+		if ( empty( $wp_hasher ) ) {
+			require_once ABSPATH . WPINC . '/class-phpass.php';
+			$wp_hasher = new PasswordHash( 8, true );
+		}
+
+		if ( ! $wp_hasher->CheckPassword( $key, $record['hashed_key'] ) ) {
 			return new WP_Error( 'hash_mismatch', __( 'Invalid recovery key.' ) );
 		}
 
diff --git a/src/wp-includes/class-wp-recovery-mode.php b/src/wp-includes/class-wp-recovery-mode.php
index b30eb408e3500..bed00d4ef8419 100644
--- a/src/wp-includes/class-wp-recovery-mode.php
+++ b/src/wp-includes/class-wp-recovery-mode.php
@@ -362,7 +362,7 @@ protected function get_extension_for_error( $error ) {
 		$error_file    = wp_normalize_path( $error['file'] );
 		$wp_plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
 
-		if ( 0 === strpos( $error_file, $wp_plugin_dir ) ) {
+		if ( str_starts_with( $error_file, $wp_plugin_dir ) ) {
 			$path  = str_replace( $wp_plugin_dir . '/', '', $error_file );
 			$parts = explode( '/', $path );
 
@@ -379,7 +379,7 @@ protected function get_extension_for_error( $error ) {
 		foreach ( $wp_theme_directories as $theme_directory ) {
 			$theme_directory = wp_normalize_path( $theme_directory );
 
-			if ( 0 === strpos( $error_file, $theme_directory ) ) {
+			if ( str_starts_with( $error_file, $theme_directory ) ) {
 				$path  = str_replace( $theme_directory . '/', '', $error_file );
 				$parts = explode( '/', $path );
 
@@ -413,7 +413,7 @@ protected function is_network_plugin( $extension ) {
 		$network_plugins = wp_get_active_network_plugins();
 
 		foreach ( $network_plugins as $plugin ) {
-			if ( 0 === strpos( $plugin, $extension['slug'] . '/' ) ) {
+			if ( str_starts_with( $plugin, $extension['slug'] . '/' ) ) {
 				return true;
 			}
 		}
diff --git a/src/wp-includes/class-wp-rewrite.php b/src/wp-includes/class-wp-rewrite.php
index 7288d0ef57ebb..150eabcbd8de1 100644
--- a/src/wp-includes/class-wp-rewrite.php
+++ b/src/wp-includes/class-wp-rewrite.php
@@ -509,7 +509,7 @@ public function get_date_permastruct() {
 		$date_endian          = '';
 
 		foreach ( $endians as $endian ) {
-			if ( false !== strpos( $this->permalink_structure, $endian ) ) {
+			if ( str_contains( $this->permalink_structure, $endian ) ) {
 				$date_endian = $endian;
 				break;
 			}
@@ -1060,13 +1060,18 @@ public function generate_rewrite_rules( $permalink_structure, $ep_mask = EP_NONE
 				 * 2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
 				 * minute all present). Set these flags now as we need them for the endpoints.
 				 */
-				if ( strpos( $struct, '%postname%' ) !== false
-						|| strpos( $struct, '%post_id%' ) !== false
-						|| strpos( $struct, '%pagename%' ) !== false
-						|| ( strpos( $struct, '%year%' ) !== false && strpos( $struct, '%monthnum%' ) !== false && strpos( $struct, '%day%' ) !== false && strpos( $struct, '%hour%' ) !== false && strpos( $struct, '%minute%' ) !== false && strpos( $struct, '%second%' ) !== false )
-						) {
+				if ( str_contains( $struct, '%postname%' )
+					|| str_contains( $struct, '%post_id%' )
+					|| str_contains( $struct, '%pagename%' )
+					|| ( str_contains( $struct, '%year%' )
+						&& str_contains( $struct, '%monthnum%' )
+						&& str_contains( $struct, '%day%' )
+						&& str_contains( $struct, '%hour%' )
+						&& str_contains( $struct, '%minute%' )
+						&& str_contains( $struct, '%second%' ) )
+				) {
 					$post = true;
-					if ( strpos( $struct, '%pagename%' ) !== false ) {
+					if ( str_contains( $struct, '%pagename%' ) ) {
 						$page = true;
 					}
 				}
@@ -1074,7 +1079,7 @@ public function generate_rewrite_rules( $permalink_structure, $ep_mask = EP_NONE
 				if ( ! $post ) {
 					// For custom post types, we need to add on endpoints as well.
 					foreach ( get_post_types( array( '_builtin' => false ) ) as $ptype ) {
-						if ( strpos( $struct, "%$ptype%" ) !== false ) {
+						if ( str_contains( $struct, "%$ptype%" ) ) {
 							$post = true;
 
 							// This is for page style attachment URLs.
@@ -1399,7 +1404,7 @@ public function rewrite_rules() {
 		// Extra permastructs.
 		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
 			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 ) {
+				if ( count( $struct ) === 2 ) {
 					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
 				} else {
 					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
@@ -1485,18 +1490,35 @@ public function rewrite_rules() {
 	public function wp_rewrite_rules() {
 		$this->rules = get_option( 'rewrite_rules' );
 		if ( empty( $this->rules ) ) {
-			$this->matches = 'matches';
-			$this->rewrite_rules();
-			if ( ! did_action( 'wp_loaded' ) ) {
-				add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
-				return $this->rules;
-			}
-			update_option( 'rewrite_rules', $this->rules );
+			$this->refresh_rewrite_rules();
 		}
 
 		return $this->rules;
 	}
 
+	/**
+	 * Refreshes the rewrite rules, saving the fresh value to the database.
+	 * If the `wp_loaded` action has not occurred yet, will postpone saving to the database.
+	 *
+	 * @since 6.4.0
+	 */
+	private function refresh_rewrite_rules() {
+		$this->rules   = '';
+		$this->matches = 'matches';
+
+		$this->rewrite_rules();
+
+		if ( ! did_action( 'wp_loaded' ) ) {
+			/*
+			 * Is not safe to save the results right now, as the rules may be partial.
+			 * Need to give all rules the chance to register.
+			 */
+			add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
+		} else {
+			update_option( 'rewrite_rules', $this->rules );
+		}
+	}
+
 	/**
 	 * Retrieves mod_rewrite-formatted rewrite rules to write to .htaccess.
 	 *
@@ -1555,7 +1577,7 @@ public function mod_rewrite_rules() {
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
 				$match = str_replace( '.+?', '.+', $match );
 
-				if ( strpos( $query, $this->index ) !== false ) {
+				if ( str_contains( $query, $this->index ) ) {
 					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
 				} else {
 					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
@@ -1660,10 +1682,10 @@ public function add_rule( $regex, $query, $after = 'bottom' ) {
 			$external = false;
 			$query    = add_query_arg( $query, 'index.php' );
 		} else {
-			$index = false === strpos( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
+			$index = ! str_contains( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
 			$front = substr( $query, 0, $index );
 
-			$external = $front != $this->index;
+			$external = $front !== $this->index;
 		}
 
 		// "external" = it doesn't correspond to index.php.
@@ -1794,7 +1816,8 @@ public function add_permastruct( $name, $struct, $args = array() ) {
 		if ( ! is_array( $args ) ) {
 			$args = array( 'with_front' => $args );
 		}
-		if ( func_num_args() == 4 ) {
+
+		if ( func_num_args() === 4 ) {
 			$args['ep_mask'] = func_get_arg( 3 );
 		}
 
@@ -1807,14 +1830,16 @@ public function add_permastruct( $name, $struct, $args = array() ) {
 			'walk_dirs'   => true,
 			'endpoints'   => true,
 		);
-		$args     = array_intersect_key( $args, $defaults );
-		$args     = wp_parse_args( $args, $defaults );
+
+		$args = array_intersect_key( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 
 		if ( $args['with_front'] ) {
 			$struct = $this->front . $struct;
 		} else {
 			$struct = $this->root . $struct;
 		}
+
 		$args['struct'] = $struct;
 
 		$this->extra_permastructs[ $name ] = $args;
@@ -1856,8 +1881,7 @@ public function flush_rules( $hard = true ) {
 			unset( $do_hard_later );
 		}
 
-		update_option( 'rewrite_rules', '' );
-		$this->wp_rewrite_rules();
+		$this->refresh_rewrite_rules();
 
 		/**
 		 * Filters whether a "hard" rewrite rule flush should be performed when requested.
@@ -1907,7 +1931,7 @@ public function init() {
 		unset( $this->feed_structure );
 		unset( $this->comment_feed_structure );
 
-		$this->use_trailing_slashes = ( '/' === substr( $this->permalink_structure, -1, 1 ) );
+		$this->use_trailing_slashes = str_ends_with( $this->permalink_structure, '/' );
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
 		if ( preg_match( '/^[^%]*%(?:postname|category|tag|author)%/', $this->permalink_structure ) ) {
@@ -1932,7 +1956,7 @@ public function init() {
 	 * @param string $permalink_structure Permalink structure.
 	 */
 	public function set_permalink_structure( $permalink_structure ) {
-		if ( $permalink_structure != $this->permalink_structure ) {
+		if ( $this->permalink_structure !== $permalink_structure ) {
 			$old_permalink_structure = $this->permalink_structure;
 			update_option( 'permalink_structure', $permalink_structure );
 
diff --git a/src/wp-includes/class-wp-roles.php b/src/wp-includes/class-wp-roles.php
index f224250fa27b7..245aa2b05a4b6 100644
--- a/src/wp-includes/class-wp-roles.php
+++ b/src/wp-includes/class-wp-roles.php
@@ -192,7 +192,7 @@ public function remove_role( $role ) {
 			update_option( $this->role_key, $this->roles );
 		}
 
-		if ( get_option( 'default_role' ) == $role ) {
+		if ( get_option( 'default_role' ) === $role ) {
 			update_option( 'default_role', 'subscriber' );
 		}
 	}
@@ -359,7 +359,7 @@ protected function get_roles_data() {
 			return $wp_user_roles;
 		}
 
-		if ( is_multisite() && get_current_blog_id() != $this->site_id ) {
+		if ( is_multisite() && get_current_blog_id() !== $this->site_id ) {
 			remove_action( 'switch_blog', 'wp_switch_roles_and_user', 1 );
 
 			$roles = get_blog_option( $this->site_id, $this->role_key, array() );
diff --git a/src/wp-includes/class-wp-scripts.php b/src/wp-includes/class-wp-scripts.php
index 5374aa912a757..cf0259c3c4d49 100644
--- a/src/wp-includes/class-wp-scripts.php
+++ b/src/wp-includes/class-wp-scripts.php
@@ -133,6 +133,24 @@ class WP_Scripts extends WP_Dependencies {
 	 */
 	private $type_attr = '';
 
+	/**
+	 * Holds a mapping of dependents (as handles) for a given script handle.
+	 * Used to optimize recursive dependency tree checks.
+	 *
+	 * @since 6.3.0
+	 * @var array
+	 */
+	private $dependents_map = array();
+
+	/**
+	 * Holds a reference to the delayed (non-blocking) script loading strategies.
+	 * Used by methods that validate loading strategies.
+	 *
+	 * @since 6.3.0
+	 * @var string[]
+	 */
+	private $delayed_strategies = array( 'defer', 'async' );
+
 	/**
 	 * Constructor.
 	 *
@@ -284,29 +302,27 @@ public function do_item( $handle, $group = false ) {
 			$ver = $ver ? $ver . '&amp;' . $this->args[ $handle ] : $this->args[ $handle ];
 		}
 
-		$src         = $obj->src;
-		$cond_before = '';
-		$cond_after  = '';
-		$conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
+		$src               = $obj->src;
+		$strategy          = $this->get_eligible_loading_strategy( $handle );
+		$intended_strategy = (string) $this->get_data( $handle, 'strategy' );
+		$cond_before       = '';
+		$cond_after        = '';
+		$conditional       = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
+
+		if ( ! $this->is_delayed_strategy( $intended_strategy ) ) {
+			$intended_strategy = '';
+		}
 
 		if ( $conditional ) {
 			$cond_before = "<!--[if {$conditional}]>\n";
 			$cond_after  = "<![endif]-->\n";
 		}
 
-		$before_handle = $this->print_inline_script( $handle, 'before', false );
-		$after_handle  = $this->print_inline_script( $handle, 'after', false );
-
-		if ( $before_handle ) {
-			$before_handle = sprintf( "<script%s id='%s-js-before'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $before_handle );
-		}
-
-		if ( $after_handle ) {
-			$after_handle = sprintf( "<script%s id='%s-js-after'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $after_handle );
-		}
+		$before_script = $this->get_inline_script_tag( $handle, 'before' );
+		$after_script  = $this->get_inline_script_tag( $handle, 'after' );
 
-		if ( $before_handle || $after_handle ) {
-			$inline_script_tag = $cond_before . $before_handle . $after_handle . $cond_after;
+		if ( $before_script || $after_script ) {
+			$inline_script_tag = $cond_before . $before_script . $after_script . $cond_after;
 		} else {
 			$inline_script_tag = '';
 		}
@@ -333,7 +349,10 @@ public function do_item( $handle, $group = false ) {
 			 */
 			$srce = apply_filters( 'script_loader_src', $src, $handle );
 
-			if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle || $translations_stop_concat ) ) {
+			if (
+				$this->in_default_dir( $srce )
+				&& ( $before_script || $after_script || $translations_stop_concat || $this->is_delayed_strategy( $strategy ) )
+			) {
 				$this->do_concat = false;
 
 				// Have to print the so-far concatenated scripts right away to maintain the right order.
@@ -375,7 +394,7 @@ public function do_item( $handle, $group = false ) {
 			return true;
 		}
 
-		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
+		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
 
@@ -390,9 +409,16 @@ public function do_item( $handle, $group = false ) {
 			return true;
 		}
 
-		$tag  = $translations . $cond_before . $before_handle;
-		$tag .= sprintf( "<script%s src='%s' id='%s-js'></script>\n", $this->type_attr, $src, esc_attr( $handle ) );
-		$tag .= $after_handle . $cond_after;
+		$tag  = $translations . $cond_before . $before_script;
+		$tag .= sprintf(
+			"<script%s src='%s' id='%s-js'%s%s></script>\n",
+			$this->type_attr,
+			$src, // Value is escaped above.
+			esc_attr( $handle ),
+			$strategy ? " {$strategy}" : '',
+			$intended_strategy ? " data-wp-strategy='{$intended_strategy}'" : ''
+		);
+		$tag .= $after_script . $cond_after;
 
 		/**
 		 * Filters the HTML script tag of an enqueued script.
@@ -445,31 +471,99 @@ public function add_inline_script( $handle, $data, $position = 'after' ) {
 	 * Prints inline scripts registered for a specific handle.
 	 *
 	 * @since 4.5.0
+	 * @deprecated 6.3.0 Use methods get_inline_script_tag() or get_inline_script_data() instead.
 	 *
-	 * @param string $handle   Name of the script to add the inline script to.
+	 * @param string $handle   Name of the script to print inline scripts for.
 	 *                         Must be lowercase.
 	 * @param string $position Optional. Whether to add the inline script
 	 *                         before the handle or after. Default 'after'.
-	 * @param bool   $display  Optional. Whether to print the script
-	 *                         instead of just returning it. Default true.
-	 * @return string|false Script on success, false otherwise.
+	 * @param bool   $display  Optional. Whether to print the script tag
+	 *                         instead of just returning the script data. Default true.
+	 * @return string|false Script data on success, false otherwise.
 	 */
 	public function print_inline_script( $handle, $position = 'after', $display = true ) {
-		$output = $this->get_data( $handle, $position );
+		_deprecated_function( __METHOD__, '6.3.0', 'WP_Scripts::get_inline_script_data() or WP_Scripts::get_inline_script_tag()' );
 
+		$output = $this->get_inline_script_data( $handle, $position );
 		if ( empty( $output ) ) {
 			return false;
 		}
 
-		$output = trim( implode( "\n", $output ), "\n" );
-
 		if ( $display ) {
-			printf( "<script%s id='%s-js-%s'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), esc_attr( $position ), $output );
+			echo $this->get_inline_script_tag( $handle, $position );
 		}
-
 		return $output;
 	}
 
+	/**
+	 * Gets data for inline scripts registered for a specific handle.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle   Name of the script to get data for.
+	 *                         Must be lowercase.
+	 * @param string $position Optional. Whether to add the inline script
+	 *                         before the handle or after. Default 'after'.
+	 * @return string Inline script, which may be empty string.
+	 */
+	public function get_inline_script_data( $handle, $position = 'after' ) {
+		$data = $this->get_data( $handle, $position );
+		if ( empty( $data ) || ! is_array( $data ) ) {
+			return '';
+		}
+
+		return trim( implode( "\n", $data ), "\n" );
+	}
+
+	/**
+	 * Gets unaliased dependencies.
+	 *
+	 * An alias is a dependency whose src is false. It is used as a way to bundle multiple dependencies in a single
+	 * handle. This in effect flattens an alias dependency tree.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string[] $deps Dependency handles.
+	 * @return string[] Unaliased handles.
+	 */
+	private function get_unaliased_deps( array $deps ) {
+		$flattened = array();
+		foreach ( $deps as $dep ) {
+			if ( ! isset( $this->registered[ $dep ] ) ) {
+				continue;
+			}
+
+			if ( $this->registered[ $dep ]->src ) {
+				$flattened[] = $dep;
+			} elseif ( $this->registered[ $dep ]->deps ) {
+				array_push( $flattened, ...$this->get_unaliased_deps( $this->registered[ $dep ]->deps ) );
+			}
+		}
+		return $flattened;
+	}
+
+	/**
+	 * Gets tags for inline scripts registered for a specific handle.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle   Name of the script to get associated inline script tag for.
+	 *                         Must be lowercase.
+	 * @param string $position Optional. Whether to get tag for inline
+	 *                         scripts in the before or after position. Default 'after'.
+	 * @return string Inline script, which may be empty string.
+	 */
+	public function get_inline_script_tag( $handle, $position = 'after' ) {
+		$js = $this->get_inline_script_data( $handle, $position );
+		if ( empty( $js ) ) {
+			return '';
+		}
+
+		$id = "{$handle}-js-{$position}";
+
+		return wp_get_inline_script_tag( $js, compact( 'id' ) );
+	}
+
 	/**
 	 * Localizes a script, only if the script has already been added.
 	 *
@@ -702,18 +796,224 @@ public function in_default_dir( $src ) {
 			return true;
 		}
 
-		if ( 0 === strpos( $src, '/' . WPINC . '/js/l10n' ) ) {
+		if ( str_starts_with( $src, '/' . WPINC . '/js/l10n' ) ) {
 			return false;
 		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos( $src, $test ) ) {
+			if ( str_starts_with( $src, $test ) ) {
 				return true;
 			}
 		}
 		return false;
 	}
 
+	/**
+	 * This overrides the add_data method from WP_Dependencies, to support normalizing of $args.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle Name of the item. Should be unique.
+	 * @param string $key    The data key.
+	 * @param mixed  $value  The data value.
+	 * @return bool True on success, false on failure.
+	 */
+	public function add_data( $handle, $key, $value ) {
+		if ( ! isset( $this->registered[ $handle ] ) ) {
+			return false;
+		}
+
+		if ( 'strategy' === $key ) {
+			if ( ! empty( $value ) && ! $this->is_delayed_strategy( $value ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					sprintf(
+						/* translators: 1: $strategy, 2: $handle */
+						__( 'Invalid strategy `%1$s` defined for `%2$s` during script registration.' ),
+						$value,
+						$handle
+					),
+					'6.3.0'
+				);
+				return false;
+			} elseif ( ! $this->registered[ $handle ]->src && $this->is_delayed_strategy( $value ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					sprintf(
+						/* translators: 1: $strategy, 2: $handle */
+						__( 'Cannot supply a strategy `%1$s` for script `%2$s` because it is an alias (it lacks a `src` value).' ),
+						$value,
+						$handle
+					),
+					'6.3.0'
+				);
+				return false;
+			}
+		}
+		return parent::add_data( $handle, $key, $value );
+	}
+
+	/**
+	 * Gets all dependents of a script.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle The script handle.
+	 * @return string[] Script handles.
+	 */
+	private function get_dependents( $handle ) {
+		// Check if dependents map for the handle in question is present. If so, use it.
+		if ( isset( $this->dependents_map[ $handle ] ) ) {
+			return $this->dependents_map[ $handle ];
+		}
+
+		$dependents = array();
+
+		// Iterate over all registered scripts, finding dependents of the script passed to this method.
+		foreach ( $this->registered as $registered_handle => $args ) {
+			if ( in_array( $handle, $args->deps, true ) ) {
+				$dependents[] = $registered_handle;
+			}
+		}
+
+		// Add the handles dependents to the map to ease future lookups.
+		$this->dependents_map[ $handle ] = $dependents;
+
+		return $dependents;
+	}
+
+	/**
+	 * Checks if the strategy passed is a valid delayed (non-blocking) strategy.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $strategy The strategy to check.
+	 * @return bool True if $strategy is one of the delayed strategies, otherwise false.
+	 */
+	private function is_delayed_strategy( $strategy ) {
+		return in_array(
+			$strategy,
+			$this->delayed_strategies,
+			true
+		);
+	}
+
+	/**
+	 * Gets the best eligible loading strategy for a script.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle The script handle.
+	 * @return string The best eligible loading strategy.
+	 */
+	private function get_eligible_loading_strategy( $handle ) {
+		$intended = (string) $this->get_data( $handle, 'strategy' );
+
+		// Bail early if there is no intended strategy.
+		if ( ! $intended ) {
+			return '';
+		}
+
+		/*
+		 * If the intended strategy is 'defer', limit the initial list of eligible
+		 * strategies, since 'async' can fallback to 'defer', but not vice-versa.
+		 */
+		$initial = ( 'defer' === $intended ) ? array( 'defer' ) : null;
+
+		$eligible = $this->filter_eligible_strategies( $handle, $initial );
+
+		// Return early once we know the eligible strategy is blocking.
+		if ( empty( $eligible ) ) {
+			return '';
+		}
+
+		return in_array( 'async', $eligible, true ) ? 'async' : 'defer';
+	}
+
+	/**
+	 * Filter the list of eligible loading strategies for a script.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string              $handle   The script handle.
+	 * @param string[]|null       $eligible Optional. The list of strategies to filter. Default null.
+	 * @param array<string, true> $checked  Optional. An array of already checked script handles, used to avoid recursive loops.
+	 * @return string[] A list of eligible loading strategies that could be used.
+	 */
+	private function filter_eligible_strategies( $handle, $eligible = null, $checked = array() ) {
+		// If no strategies are being passed, all strategies are eligible.
+		if ( null === $eligible ) {
+			$eligible = $this->delayed_strategies;
+		}
+
+		// If this handle was already checked, return early.
+		if ( isset( $checked[ $handle ] ) ) {
+			return $eligible;
+		}
+
+		// Mark this handle as checked.
+		$checked[ $handle ] = true;
+
+		// If this handle isn't registered, don't filter anything and return.
+		if ( ! isset( $this->registered[ $handle ] ) ) {
+			return $eligible;
+		}
+
+		// If the handle is not enqueued, don't filter anything and return.
+		if ( ! $this->query( $handle, 'enqueued' ) ) {
+			return $eligible;
+		}
+
+		$is_alias          = (bool) ! $this->registered[ $handle ]->src;
+		$intended_strategy = $this->get_data( $handle, 'strategy' );
+
+		// For non-alias handles, an empty intended strategy filters all strategies.
+		if ( ! $is_alias && empty( $intended_strategy ) ) {
+			return array();
+		}
+
+		// Handles with inline scripts attached in the 'after' position cannot be delayed.
+		if ( $this->has_inline_script( $handle, 'after' ) ) {
+			return array();
+		}
+
+		// If the intended strategy is 'defer', filter out 'async'.
+		if ( 'defer' === $intended_strategy ) {
+			$eligible = array( 'defer' );
+		}
+
+		$dependents = $this->get_dependents( $handle );
+
+		// Recursively filter eligible strategies for dependents.
+		foreach ( $dependents as $dependent ) {
+			// Bail early once we know the eligible strategy is blocking.
+			if ( empty( $eligible ) ) {
+				return array();
+			}
+
+			$eligible = $this->filter_eligible_strategies( $dependent, $eligible, $checked );
+		}
+
+		return $eligible;
+	}
+
+	/**
+	 * Gets data for inline scripts registered for a specific handle.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $handle   Name of the script to get data for. Must be lowercase.
+	 * @param string $position The position of the inline script.
+	 * @return bool Whether the handle has an inline script (either before or after).
+	 */
+	private function has_inline_script( $handle, $position = null ) {
+		if ( $position && in_array( $position, array( 'before', 'after' ), true ) ) {
+			return (bool) $this->get_data( $handle, $position );
+		}
+
+		return (bool) ( $this->get_data( $handle, 'before' ) || $this->get_data( $handle, 'after' ) );
+	}
+
 	/**
 	 * Resets class properties.
 	 *
diff --git a/src/wp-includes/class-wp-simplepie-file.php b/src/wp-includes/class-wp-simplepie-file.php
index a0125aaf1dcee..0ad48fb5edfe1 100644
--- a/src/wp-includes/class-wp-simplepie-file.php
+++ b/src/wp-includes/class-wp-simplepie-file.php
@@ -14,8 +14,6 @@
  * to hook into the process.
  *
  * @since 2.8.0
- *
- * @see SimplePie_File
  */
 #[AllowDynamicProperties]
 class WP_SimplePie_File extends SimplePie_File {
@@ -64,7 +62,7 @@ public function __construct( $url, $timeout = 10, $redirects = 5, $headers = nul
 				$args['headers'] = $this->headers;
 			}
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) { // Use default WP user agent unless custom has been specified.
+			if ( SIMPLEPIE_USERAGENT !== $this->useragent ) { // Use default WP user agent unless custom has been specified.
 				$args['user-agent'] = $this->useragent;
 			}
 
diff --git a/src/wp-includes/class-wp-simplepie-sanitize-kses.php b/src/wp-includes/class-wp-simplepie-sanitize-kses.php
index 4e7602cda435b..c300cf2280762 100644
--- a/src/wp-includes/class-wp-simplepie-sanitize-kses.php
+++ b/src/wp-includes/class-wp-simplepie-sanitize-kses.php
@@ -14,8 +14,6 @@
  * we cannot universally count on DOMDocument being available.
  *
  * @since 3.5.0
- *
- * @see SimplePie_Sanitize
  */
 #[AllowDynamicProperties]
 class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
diff --git a/src/wp-includes/class-wp-site-query.php b/src/wp-includes/class-wp-site-query.php
index 83bb52405ec67..6598866162445 100644
--- a/src/wp-includes/class-wp-site-query.php
+++ b/src/wp-includes/class-wp-site-query.php
@@ -358,7 +358,7 @@ public function get_sites() {
 		$last_changed = wp_cache_get_last_changed( 'sites' );
 
 		$cache_key   = "get_sites:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'sites' );
+		$cache_value = wp_cache_get( $cache_key, 'site-queries' );
 
 		if ( false === $cache_value ) {
 			$site_ids = $this->get_site_ids();
@@ -370,7 +370,7 @@ public function get_sites() {
 				'site_ids'    => $site_ids,
 				'found_sites' => $this->found_sites,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'sites' );
+			wp_cache_add( $cache_key, $cache_value, 'site-queries' );
 		} else {
 			$site_ids          = $cache_value['site_ids'];
 			$this->found_sites = $cache_value['found_sites'];
@@ -388,6 +388,10 @@ public function get_sites() {
 
 		$site_ids = array_map( 'intval', $site_ids );
 
+		if ( $this->query_vars['update_site_meta_cache'] ) {
+			wp_lazyload_site_meta( $site_ids );
+		}
+
 		if ( 'ids' === $this->query_vars['fields'] ) {
 			$this->sites = $site_ids;
 
@@ -396,7 +400,7 @@ public function get_sites() {
 
 		// Prime site network caches.
 		if ( $this->query_vars['update_site_cache'] ) {
-			_prime_site_caches( $site_ids, $this->query_vars['update_site_meta_cache'] );
+			_prime_site_caches( $site_ids, false );
 		}
 
 		// Fetch full site objects from the primed cache.
@@ -749,7 +753,7 @@ private function set_found_sites() {
 	protected function get_search_sql( $search, $columns ) {
 		global $wpdb;
 
-		if ( false !== strpos( $search, '*' ) ) {
+		if ( str_contains( $search, '*' ) ) {
 			$like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $search ) ) ) . '%';
 		} else {
 			$like = '%' . $wpdb->esc_like( $search ) . '%';
diff --git a/src/wp-includes/class-wp-styles.php b/src/wp-includes/class-wp-styles.php
index b14ad7cbefb5f..76883b54ca98a 100644
--- a/src/wp-includes/class-wp-styles.php
+++ b/src/wp-includes/class-wp-styles.php
@@ -393,7 +393,7 @@ public function all_deps( $handles, $recursion = false, $group = false ) {
 	 * @return string Style's fully-qualified URL.
 	 */
 	public function _css_href( $src, $ver, $handle ) {
-		if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
+		if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && str_starts_with( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
 
@@ -427,7 +427,7 @@ public function in_default_dir( $src ) {
 		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos( $src, $test ) ) {
+			if ( str_starts_with( $src, $test ) ) {
 				return true;
 			}
 		}
diff --git a/src/wp-includes/class-wp-tax-query.php b/src/wp-includes/class-wp-tax-query.php
index e7b1e2a95a551..38841c42b06de 100644
--- a/src/wp-includes/class-wp-tax-query.php
+++ b/src/wp-includes/class-wp-tax-query.php
@@ -374,11 +374,11 @@ protected function get_sql_for_query( &$query, $depth = 0 ) {
 	 *
 	 * @param array $clause       Query clause (passed by reference).
 	 * @param array $parent_query Parent query array.
-	 * @return string[] {
+	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to a first-order query.
 	 *
-	 *     @type string $join  SQL fragment to append to the main JOIN clause.
-	 *     @type string $where SQL fragment to append to the main WHERE clause.
+	 *     @type string[] $join  Array of SQL fragments to append to the main JOIN clause.
+	 *     @type string[] $where Array of SQL fragments to append to the main WHERE clause.
 	 * }
 	 */
 	public function get_sql_for_clause( &$clause, $parent_query ) {
@@ -466,13 +466,13 @@ public function get_sql_for_clause( &$clause, $parent_query ) {
 
 			$where = $wpdb->prepare(
 				"$operator (
-				SELECT 1
-				FROM $wpdb->term_relationships
-				INNER JOIN $wpdb->term_taxonomy
-				ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
-				WHERE $wpdb->term_taxonomy.taxonomy = %s
-				AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
-			)",
+					SELECT 1
+					FROM $wpdb->term_relationships
+					INNER JOIN $wpdb->term_taxonomy
+					ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
+					WHERE $wpdb->term_taxonomy.taxonomy = %s
+					AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
+				)",
 				$clause['taxonomy']
 			);
 
@@ -589,8 +589,6 @@ private function clean_query( &$query ) {
 	 *
 	 * @since 3.2.0
 	 *
-	 * @global wpdb $wpdb The WordPress database abstraction object.
-	 *
 	 * @param array  $query           The single query. Passed by reference.
 	 * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
 	 *                                or 'term_id'. Default 'term_id'.
@@ -600,7 +598,7 @@ public function transform_query( &$query, $resulting_field ) {
 			return;
 		}
 
-		if ( $query['field'] == $resulting_field ) {
+		if ( $query['field'] === $resulting_field ) {
 			return;
 		}
 
diff --git a/src/wp-includes/class-wp-taxonomy.php b/src/wp-includes/class-wp-taxonomy.php
index 1f7eed96f6b51..254ea6a15c98b 100644
--- a/src/wp-includes/class-wp-taxonomy.php
+++ b/src/wp-includes/class-wp-taxonomy.php
@@ -278,11 +278,10 @@ final class WP_Taxonomy {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @global WP $wp Current WordPress environment instance.
-	 *
 	 * @param string       $taxonomy    Taxonomy key, must not exceed 32 characters.
 	 * @param array|string $object_type Name of the object type for the taxonomy object.
 	 * @param array|string $args        Optional. Array or query string of arguments for registering a taxonomy.
+	 *                                  See register_taxonomy() for information on accepted arguments.
 	 *                                  Default empty array.
 	 */
 	public function __construct( $taxonomy, $object_type, $args = array() ) {
diff --git a/src/wp-includes/class-wp-term-query.php b/src/wp-includes/class-wp-term-query.php
index 18c85e89b28d7..d1cc69d96ca49 100644
--- a/src/wp-includes/class-wp-term-query.php
+++ b/src/wp-includes/class-wp-term-query.php
@@ -774,19 +774,8 @@ public function get_terms() {
 			return $this->terms;
 		}
 
-		// $args can be anything. Only use the args defined in defaults to compute the key.
-		$cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) );
-
-		unset( $cache_args['update_term_meta_cache'] );
-
-		if ( 'count' !== $_fields && 'all_with_object_id' !== $_fields ) {
-			$cache_args['fields'] = 'all';
-		}
-
-		$key          = md5( serialize( $cache_args ) . serialize( $taxonomies ) . $this->request );
-		$last_changed = wp_cache_get_last_changed( 'terms' );
-		$cache_key    = "get_terms:$key:$last_changed";
-		$cache        = wp_cache_get( $cache_key, 'terms' );
+		$cache_key = $this->generate_cache_key( $args, $this->request );
+		$cache     = wp_cache_get( $cache_key, 'term-queries' );
 
 		if ( false !== $cache ) {
 			if ( 'ids' === $_fields ) {
@@ -812,14 +801,14 @@ public function get_terms() {
 
 		if ( 'count' === $_fields ) {
 			$count = $wpdb->get_var( $this->request ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
-			wp_cache_set( $cache_key, $count, 'terms' );
+			wp_cache_set( $cache_key, $count, 'term-queries' );
 			return $count;
 		}
 
 		$terms = $wpdb->get_results( $this->request ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
 		if ( empty( $terms ) ) {
-			wp_cache_add( $cache_key, array(), 'terms' );
+			wp_cache_add( $cache_key, array(), 'term-queries' );
 			return array();
 		}
 
@@ -876,7 +865,7 @@ public function get_terms() {
 		// Prime termmeta cache.
 		if ( $args['update_term_meta_cache'] ) {
 			$term_ids = wp_list_pluck( $term_objects, 'term_id' );
-			update_termmeta_cache( $term_ids );
+			wp_lazyload_term_meta( $term_ids );
 		}
 
 		if ( 'all_with_object_id' === $_fields && ! empty( $args['object_ids'] ) ) {
@@ -899,7 +888,7 @@ public function get_terms() {
 			$term_cache = wp_list_pluck( $term_objects, 'term_id' );
 		}
 
-		wp_cache_add( $cache_key, $term_cache, 'terms' );
+		wp_cache_add( $cache_key, $term_cache, 'term-queries' );
 		$this->terms = $this->format_terms( $term_objects, $_fields );
 
 		return $this->terms;
@@ -910,8 +899,6 @@ public function get_terms() {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
 	 * @param string $orderby_raw Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
@@ -1144,4 +1131,36 @@ protected function populate_terms( $terms ) {
 
 		return $term_objects;
 	}
+
+	/**
+	 * Generate cache key.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param array  $args WP_Term_Query arguments.
+	 * @param string $sql  SQL statement.
+	 *
+	 * @return string Cache key.
+	 */
+	protected function generate_cache_key( array $args, $sql ) {
+		global $wpdb;
+		// $args can be anything. Only use the args defined in defaults to compute the key.
+		$cache_args = wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) );
+
+		unset( $cache_args['update_term_meta_cache'] );
+
+		if ( 'count' !== $args['fields'] && 'all_with_object_id' !== $args['fields'] ) {
+			$cache_args['fields'] = 'all';
+		}
+		$taxonomies = (array) $args['taxonomy'];
+
+		// Replace wpdb placeholder in the SQL statement used by the cache key.
+		$sql = $wpdb->remove_placeholder_escape( $sql );
+
+		$key          = md5( serialize( $cache_args ) . serialize( $taxonomies ) . $sql );
+		$last_changed = wp_cache_get_last_changed( 'terms' );
+		return "get_terms:$key:$last_changed";
+	}
 }
diff --git a/src/wp-includes/class-wp-text-diff-renderer-inline.php b/src/wp-includes/class-wp-text-diff-renderer-inline.php
index eaba1b61edd94..19a00d83c7eaa 100644
--- a/src/wp-includes/class-wp-text-diff-renderer-inline.php
+++ b/src/wp-includes/class-wp-text-diff-renderer-inline.php
@@ -24,7 +24,7 @@ class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline {
 	 * @param string $newlineEscape
 	 * @return string
 	 */
-	public function _splitOnWords( $string, $newlineEscape = "\n" ) {
+	public function _splitOnWords( $string, $newlineEscape = "\n" ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound
 		$string = str_replace( "\0", '', $string );
 		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
 		$words  = str_replace( "\n", $newlineEscape, $words );
diff --git a/src/wp-includes/class-wp-text-diff-renderer-table.php b/src/wp-includes/class-wp-text-diff-renderer-table.php
index a74b8019f4eb8..b54aa6c368bb7 100644
--- a/src/wp-includes/class-wp-text-diff-renderer-table.php
+++ b/src/wp-includes/class-wp-text-diff-renderer-table.php
@@ -114,7 +114,10 @@ public function _lines( $lines, $prefix = ' ' ) {
 	 * @return string
 	 */
 	public function addedLine( $line ) {
-		return "<td class='diff-addedline'><span aria-hidden='true' class='dashicons dashicons-plus'></span><span class='screen-reader-text'>" . __( 'Added:' ) . " </span>{$line}</td>";
+		return "<td class='diff-addedline'><span aria-hidden='true' class='dashicons dashicons-plus'></span><span class='screen-reader-text'>" .
+			/* translators: Hidden accessibility text. */
+			__( 'Added:' ) .
+		" </span>{$line}</td>";
 
 	}
 
@@ -125,7 +128,10 @@ public function addedLine( $line ) {
 	 * @return string
 	 */
 	public function deletedLine( $line ) {
-		return "<td class='diff-deletedline'><span aria-hidden='true' class='dashicons dashicons-minus'></span><span class='screen-reader-text'>" . __( 'Deleted:' ) . " </span>{$line}</td>";
+		return "<td class='diff-deletedline'><span aria-hidden='true' class='dashicons dashicons-minus'></span><span class='screen-reader-text'>" .
+			/* translators: Hidden accessibility text. */
+			__( 'Deleted:' ) .
+		" </span>{$line}</td>";
 	}
 
 	/**
@@ -135,7 +141,10 @@ public function deletedLine( $line ) {
 	 * @return string
 	 */
 	public function contextLine( $line ) {
-		return "<td class='diff-context'><span class='screen-reader-text'>" . __( 'Unchanged:' ) . " </span>{$line}</td>";
+		return "<td class='diff-context'><span class='screen-reader-text'>" .
+			/* translators: Hidden accessibility text. */
+			__( 'Unchanged:' ) .
+		" </span>{$line}</td>";
 	}
 
 	/**
@@ -247,7 +256,7 @@ public function _context( $lines, $encode = true ) {
 	 * @param array $final
 	 * @return string
 	 */
-	public function _changed( $orig, $final ) {
+	public function _changed( $orig, $final ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.finalFound
 		$r = '';
 
 		/*
@@ -269,15 +278,17 @@ public function _changed( $orig, $final ) {
 		foreach ( $orig_matches as $o => $f ) {
 			if ( is_numeric( $o ) && is_numeric( $f ) ) {
 				$text_diff = new Text_Diff( 'auto', array( array( $orig[ $o ] ), array( $final[ $f ] ) ) );
-				$renderer  = new $this->inline_diff_renderer;
+				$renderer  = new $this->inline_diff_renderer();
 				$diff      = $renderer->render( $text_diff );
 
 				// If they're too different, don't include any <ins> or <del>'s.
 				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
 					// Length of all text between <ins> or <del>.
 					$stripped_matches = strlen( strip_tags( implode( ' ', $diff_matches[0] ) ) );
-					// Since we count length of text between <ins> or <del> (instead of picking just one),
-					// we double the length of chars not in those tags.
+					/*
+					 * Since we count length of text between <ins> or <del> (instead of picking just one),
+					 * we double the length of chars not in those tags.
+					 */
 					$stripped_diff = strlen( strip_tags( $diff ) ) * 2 - $stripped_matches;
 					$diff_ratio    = $stripped_matches / $stripped_diff;
 					if ( $diff_ratio > $this->_diff_threshold ) {
@@ -358,7 +369,7 @@ public function _changed( $orig, $final ) {
 	 *                                Value < 0 indicates a blank row.
 	 * }
 	 */
-	public function interleave_changed_lines( $orig, $final ) {
+	public function interleave_changed_lines( $orig, $final ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.finalFound
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
@@ -407,8 +418,10 @@ public function interleave_changed_lines( $orig, $final ) {
 		$orig_rows_copy = $orig_rows;
 		$final_rows     = array_keys( $final_matches );
 
-		// Interleaves rows with blanks to keep matches aligned.
-		// We may end up with some extraneous blank rows, but we'll just ignore them later.
+		/*
+		 * Interleaves rows with blanks to keep matches aligned.
+		 * We may end up with some extraneous blank rows, but we'll just ignore them later.
+		 */
 		foreach ( $orig_rows_copy as $orig_row ) {
 			$final_pos = array_search( $orig_matches[ $orig_row ], $final_rows, true );
 			$orig_pos  = (int) array_search( $orig_row, $orig_rows, true );
@@ -498,35 +511,51 @@ public function difference( $a, $b ) {
 	 * Make private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Getting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to get.
-	 * @return mixed Property.
+	 * @return mixed A declared property's value, else null.
 	 */
 	public function __get( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return $this->$name;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Getting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
+		return null;
 	}
 
 	/**
 	 * Make private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Setting a dynamic property is deprecated.
 	 *
 	 * @param string $name  Property to check if set.
 	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
 	 */
 	public function __set( $name, $value ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
-			return $this->$name = $value;
+			$this->$name = $value;
+			return;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Setting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 
 	/**
 	 * Make private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Checking a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -535,18 +564,33 @@ public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return isset( $this->$name );
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Checking `isset()` on a dynamic property " .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
+		return false;
 	}
 
 	/**
 	 * Make private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Unsetting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to unset.
 	 */
 	public function __unset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			unset( $this->$name );
+			return;
 		}
+
+		trigger_error(
+			"A property `{$name}` is not declared. Unsetting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 }
diff --git a/src/wp-includes/class-wp-textdomain-registry.php b/src/wp-includes/class-wp-textdomain-registry.php
index d06d87c4db068..99d72eb7a3084 100644
--- a/src/wp-includes/class-wp-textdomain-registry.php
+++ b/src/wp-includes/class-wp-textdomain-registry.php
@@ -1,6 +1,9 @@
 <?php
 /**
- * Locale API: WP_Textdomain_Registry class
+ * Locale API: WP_Textdomain_Registry class.
+ *
+ * This file uses rtrim() instead of untrailingslashit() and trailingslashit()
+ * to avoid formatting.php dependency.
  *
  * @package WordPress
  * @subpackage i18n
@@ -51,7 +54,16 @@ class WP_Textdomain_Registry {
 	 *
 	 * @var array
 	 */
-	protected $cached_mo_files;
+	protected $cached_mo_files = array();
+
+	/**
+	 * Holds a cached list of domains with translations to improve performance.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var string[]
+	 */
+	protected $domains_with_translations = array();
 
 	/**
 	 * Returns the languages directory path for a specific domain and locale.
@@ -84,7 +96,11 @@ public function get( $domain, $locale ) {
 	 * @return bool Whether any MO file paths are available for the domain.
 	 */
 	public function has( $domain ) {
-		return ! empty( $this->current[ $domain ] ) || empty( $this->all[ $domain ] );
+		return (
+			isset( $this->current[ $domain ] ) ||
+			empty( $this->all[ $domain ] ) ||
+			in_array( $domain, $this->domains_with_translations, true )
+		);
 	}
 
 	/**
@@ -100,7 +116,7 @@ public function has( $domain ) {
 	 * @param string|false $path   Language directory path or false if there is none available.
 	 */
 	public function set( $domain, $locale, $path ) {
-		$this->all[ $domain ][ $locale ] = $path ? trailingslashit( $path ) : false;
+		$this->all[ $domain ][ $locale ] = $path ? rtrim( $path, '/' ) . '/' : false;
 		$this->current[ $domain ]        = $this->all[ $domain ][ $locale ];
 	}
 
@@ -109,11 +125,34 @@ public function set( $domain, $locale, $path ) {
 	 *
 	 * Used by {@see load_plugin_textdomain()} and {@see load_theme_textdomain()}.
 	 *
+	 * @since 6.1.0
+	 *
 	 * @param string $domain Text domain.
 	 * @param string $path   Language directory path.
 	 */
 	public function set_custom_path( $domain, $path ) {
-		$this->custom_paths[ $domain ] = untrailingslashit( $path );
+		$this->custom_paths[ $domain ] = rtrim( $path, '/' );
+	}
+
+	/**
+	 * Returns possible language directory paths for a given text domain.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $domain Text domain.
+	 * @return string[] Array of language directory paths.
+	 */
+	private function get_paths_for_domain( $domain ) {
+		$locations = array(
+			WP_LANG_DIR . '/plugins',
+			WP_LANG_DIR . '/themes',
+		);
+
+		if ( isset( $this->custom_paths[ $domain ] ) ) {
+			$locations[] = $this->custom_paths[ $domain ];
+		}
+
+		return $locations;
 	}
 
 	/**
@@ -131,37 +170,45 @@ public function set_custom_path( $domain, $path ) {
 	 * @return string|false Language directory path or false if there is none available.
 	 */
 	private function get_path_from_lang_dir( $domain, $locale ) {
-		$locations = array(
-			WP_LANG_DIR . '/plugins',
-			WP_LANG_DIR . '/themes',
-		);
+		$locations = $this->get_paths_for_domain( $domain );
 
-		if ( isset( $this->custom_paths[ $domain ] ) ) {
-			$locations[] = $this->custom_paths[ $domain ];
-		}
-
-		$mofile = "$domain-$locale.mo";
+		$found_location = false;
 
 		foreach ( $locations as $location ) {
 			if ( ! isset( $this->cached_mo_files[ $location ] ) ) {
 				$this->set_cached_mo_files( $location );
 			}
 
-			$path = $location . '/' . $mofile;
+			$path = "$location/$domain-$locale.mo";
 
-			if ( in_array( $path, $this->cached_mo_files[ $location ], true ) ) {
-				$this->set( $domain, $locale, $location );
+			foreach ( $this->cached_mo_files[ $location ] as $mo_path ) {
+				if (
+					! in_array( $domain, $this->domains_with_translations, true ) &&
+					str_starts_with( str_replace( "$location/", '', $mo_path ), "$domain-" )
+				) {
+					$this->domains_with_translations[] = $domain;
+				}
 
-				return trailingslashit( $location );
+				if ( $mo_path === $path ) {
+					$found_location = rtrim( $location, '/' ) . '/';
+				}
 			}
 		}
 
-		// If no path is found for the given locale and a custom path has been set
-		// using load_plugin_textdomain/load_theme_textdomain, use that one.
+		if ( $found_location ) {
+			$this->set( $domain, $locale, $found_location );
+
+			return $found_location;
+		}
+
+		/*
+		 * If no path is found for the given locale and a custom path has been set
+		 * using load_plugin_textdomain/load_theme_textdomain, use that one.
+		 */
 		if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) {
-			$path = trailingslashit( $this->custom_paths[ $domain ] );
-			$this->set( $domain, $locale, $path );
-			return $path;
+			$fallback_location = rtrim( $this->custom_paths[ $domain ], '/' ) . '/';
+			$this->set( $domain, $locale, $fallback_location );
+			return $fallback_location;
 		}
 
 		$this->set( $domain, $locale, false );
diff --git a/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index ee153eb657abe..50d6e09443b2a 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -13,7 +13,7 @@
  *
  * This class is for internal core usage and is not supposed to be used by extenders (plugins and/or themes).
  * This is a low-level API that may need to do breaking changes. Please,
- * use get_global_settings, get_global_styles, and get_global_stylesheet instead.
+ * use get_global_settings(), get_global_styles(), and get_global_stylesheet() instead.
  *
  * @access private
  */
@@ -57,14 +57,6 @@ class WP_Theme_JSON_Resolver {
 	 */
 	protected static $theme = null;
 
-	/**
-	 * Whether or not the theme supports theme.json.
-	 *
-	 * @since 5.8.0
-	 * @var bool
-	 */
-	protected static $theme_has_support = null;
-
 	/**
 	 * Container for data coming from the user.
 	 *
@@ -178,7 +170,7 @@ public static function get_core_data() {
 		 *
 		 * @since 6.1.0
 		 *
-		 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+		 * @param WP_Theme_JSON_Data $theme_json Class to access and update the underlying data.
 		 */
 		$theme_json   = apply_filters( 'wp_theme_json_data_default', new WP_Theme_JSON_Data( $config, 'default' ) );
 		$config       = $theme_json->get_data();
@@ -246,33 +238,42 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 		$options = wp_parse_args( $options, array( 'with_supports' => true ) );
 
 		if ( null === static::$theme || ! static::has_same_registered_blocks( 'theme' ) ) {
-			$theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) );
-			$theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) );
+			$wp_theme        = wp_get_theme();
+			$theme_json_file = $wp_theme->get_file_path( 'theme.json' );
+			if ( is_readable( $theme_json_file ) ) {
+				$theme_json_data = static::read_json_file( $theme_json_file );
+				$theme_json_data = static::translate( $theme_json_data, $wp_theme->get( 'TextDomain' ) );
+			} else {
+				$theme_json_data = array();
+			}
 
 			/**
 			 * Filters the data provided by the theme for global styles and settings.
 			 *
 			 * @since 6.1.0
 			 *
-			 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+			 * @param WP_Theme_JSON_Data $theme_json Class to access and update the underlying data.
 			 */
 			$theme_json      = apply_filters( 'wp_theme_json_data_theme', new WP_Theme_JSON_Data( $theme_json_data, 'theme' ) );
 			$theme_json_data = $theme_json->get_data();
 			static::$theme   = new WP_Theme_JSON( $theme_json_data );
-		}
 
-		if ( wp_get_theme()->parent() ) {
-			// Get parent theme.json.
-			$parent_theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json', true ) );
-			$parent_theme_json_data = static::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) );
-			$parent_theme           = new WP_Theme_JSON( $parent_theme_json_data );
-
-			/*
-			 * Merge the child theme.json into the parent theme.json.
-			 * The child theme takes precedence over the parent.
-			 */
-			$parent_theme->merge( static::$theme );
-			static::$theme = $parent_theme;
+			if ( $wp_theme->parent() ) {
+				// Get parent theme.json.
+				$parent_theme_json_file = $wp_theme->parent()->get_file_path( 'theme.json' );
+				if ( $theme_json_file !== $parent_theme_json_file && is_readable( $parent_theme_json_file ) ) {
+					$parent_theme_json_data = static::read_json_file( $parent_theme_json_file );
+					$parent_theme_json_data = static::translate( $parent_theme_json_data, $wp_theme->parent()->get( 'TextDomain' ) );
+					$parent_theme           = new WP_Theme_JSON( $parent_theme_json_data );
+
+					/*
+					 * Merge the child theme.json into the parent theme.json.
+					 * The child theme takes precedence over the parent.
+					 */
+					$parent_theme->merge( static::$theme );
+					static::$theme = $parent_theme;
+				}
+			}
 		}
 
 		if ( ! $options['with_supports'] ) {
@@ -285,8 +286,8 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 		 * So we take theme supports, transform it to theme.json shape
 		 * and merge the static::$theme upon that.
 		 */
-		$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
-		if ( ! static::theme_has_support() ) {
+		$theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
+		if ( ! wp_theme_has_theme_json() ) {
 			if ( ! isset( $theme_support_data['settings']['color'] ) ) {
 				$theme_support_data['settings']['color'] = array();
 			}
@@ -313,6 +314,19 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 
 			// Classic themes without a theme.json don't support global duotone.
 			$theme_support_data['settings']['color']['defaultDuotone'] = false;
+
+			// Allow themes to enable link color setting via theme_support.
+			if ( current_theme_supports( 'link-color' ) ) {
+				$theme_support_data['settings']['color']['link'] = true;
+			}
+
+			// Allow themes to enable all border settings via theme_support.
+			if ( current_theme_supports( 'border' ) ) {
+				$theme_support_data['settings']['border']['color']  = true;
+				$theme_support_data['settings']['border']['radius'] = true;
+				$theme_support_data['settings']['border']['style']  = true;
+				$theme_support_data['settings']['border']['width']  = true;
+			}
 		}
 		$with_theme_supports = new WP_Theme_JSON( $theme_support_data );
 		$with_theme_supports->merge( static::$theme );
@@ -344,8 +358,10 @@ public static function get_block_data() {
 				isset( $block_type->supports['spacing']['blockGap']['__experimentalDefault'] ) &&
 				null === _wp_array_get( $config, array( 'styles', 'blocks', $block_name, 'spacing', 'blockGap' ), null )
 			) {
-				// Ensure an empty placeholder value exists for the block, if it provides a default blockGap value.
-				// The real blockGap value to be used will be determined when the styles are rendered for output.
+				/*
+				 * Ensure an empty placeholder value exists for the block, if it provides a default blockGap value.
+				 * The real blockGap value to be used will be determined when the styles are rendered for output.
+				 */
 				$config['styles']['blocks'][ $block_name ]['spacing']['blockGap'] = null;
 			}
 		}
@@ -355,7 +371,7 @@ public static function get_block_data() {
 		 *
 		 * @since 6.1.0
 		 *
-		 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+		 * @param WP_Theme_JSON_Data $theme_json Class to access and update the underlying data.
 		 */
 		$theme_json = apply_filters( 'wp_theme_json_data_blocks', new WP_Theme_JSON_Data( $config, 'blocks' ) );
 		$config     = $theme_json->get_data();
@@ -367,23 +383,25 @@ public static function get_block_data() {
 	/**
 	 * When given an array, this will remove any keys with the name `//`.
 	 *
-	 * @param array $array The array to filter.
+	 * @since 6.1.0
+	 *
+	 * @param array $input_array The array to filter.
 	 * @return array The filtered array.
 	 */
-	private static function remove_json_comments( $array ) {
-		unset( $array['//'] );
-		foreach ( $array as $k => $v ) {
+	private static function remove_json_comments( $input_array ) {
+		unset( $input_array['//'] );
+		foreach ( $input_array as $k => $v ) {
 			if ( is_array( $v ) ) {
-				$array[ $k ] = static::remove_json_comments( $v );
+				$input_array[ $k ] = static::remove_json_comments( $v );
 			}
 		}
 
-		return $array;
+		return $input_array;
 	}
 
 	/**
 	 * Returns the custom post type that contains the user's origin config
-	 * for the active theme or a void array if none are found.
+	 * for the active theme or an empty array if none are found.
 	 *
 	 * This can also create and return a new draft custom post type.
 	 *
@@ -403,18 +421,32 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 		if ( ! $theme instanceof WP_Theme ) {
 			$theme = wp_get_theme();
 		}
+
+		/*
+		 * Bail early if the theme does not support a theme.json.
+		 *
+		 * Since wp_theme_has_theme_json() only supports the active
+		 * theme, the extra condition for whether $theme is the active theme is
+		 * present here.
+		 */
+		if ( $theme->get_stylesheet() === get_stylesheet() && ! wp_theme_has_theme_json() ) {
+			return array();
+		}
+
 		$user_cpt         = array();
 		$post_type_filter = 'wp_global_styles';
 		$stylesheet       = $theme->get_stylesheet();
 		$args             = array(
-			'posts_per_page'      => 1,
-			'orderby'             => 'post_date',
-			'order'               => 'desc',
-			'post_type'           => $post_type_filter,
-			'post_status'         => $post_status_filter,
-			'ignore_sticky_posts' => true,
-			'no_found_rows'       => true,
-			'tax_query'           => array(
+			'posts_per_page'         => 1,
+			'orderby'                => 'date',
+			'order'                  => 'desc',
+			'post_type'              => $post_type_filter,
+			'post_status'            => $post_status_filter,
+			'ignore_sticky_posts'    => true,
+			'no_found_rows'          => true,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+			'tax_query'              => array(
 				array(
 					'taxonomy' => 'wp_theme',
 					'field'    => 'name',
@@ -426,7 +458,7 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 		$global_style_query = new WP_Query();
 		$recent_posts       = $global_style_query->query( $args );
 		if ( count( $recent_posts ) === 1 ) {
-			$user_cpt = get_post( $recent_posts[0], ARRAY_A );
+			$user_cpt = get_object_vars( $recent_posts[0] );
 		} elseif ( $create_post ) {
 			$cpt_post_id = wp_insert_post(
 				array(
@@ -442,7 +474,7 @@ public static function get_user_data_from_wp_global_styles( $theme, $create_post
 				true
 			);
 			if ( ! is_wp_error( $cpt_post_id ) ) {
-				$user_cpt = get_post( $cpt_post_id, ARRAY_A );
+				$user_cpt = get_object_vars( get_post( $cpt_post_id ) );
 			}
 		}
 
@@ -475,15 +507,17 @@ public static function get_user_data() {
 				 *
 				 * @since 6.1.0
 				 *
-				 * @param WP_Theme_JSON_Data Class to access and update the underlying data.
+				 * @param WP_Theme_JSON_Data $theme_json Class to access and update the underlying data.
 				 */
 				$theme_json = apply_filters( 'wp_theme_json_data_user', new WP_Theme_JSON_Data( $config, 'custom' ) );
 				$config     = $theme_json->get_data();
 				return new WP_Theme_JSON( $config, 'custom' );
 			}
 
-			// Very important to verify that the flag isGlobalStylesUserThemeJSON is true.
-			// If it's not true then the content was not escaped and is not safe.
+			/*
+			 * Very important to verify that the flag isGlobalStylesUserThemeJSON is true.
+			 * If it's not true then the content was not escaped and is not safe.
+			 */
 			if (
 				is_array( $decoded_data ) &&
 				isset( $decoded_data['isGlobalStylesUserThemeJSON'] ) &&
@@ -505,9 +539,15 @@ public static function get_user_data() {
 	/**
 	 * Returns the data merged from multiple origins.
 	 *
-	 * There are three sources of data (origins) for a site:
-	 * default, theme, and custom. The custom's has higher priority
-	 * than the theme's, and the theme's higher than default's.
+	 * There are four sources of data (origins) for a site:
+	 *
+	 * - default => WordPress
+	 * - blocks  => each one of the blocks provides data for itself
+	 * - theme   => the active theme
+	 * - custom  => data provided by the user
+	 *
+	 * The custom's has higher priority than the theme's, the theme's higher than blocks',
+	 * and block's higher than default's.
 	 *
 	 * Unlike the getters
 	 * {@link https://developer.wordpress.org/reference/classes/wp_theme_json_resolver/get_core_data/ get_core_data},
@@ -515,7 +555,7 @@ public static function get_user_data() {
 	 * and {@link https://developer.wordpress.org/reference/classes/wp_theme_json_resolver/get_user_data/ get_user_data},
 	 * this method returns data after it has been merged with the previous origins.
 	 * This means that if the same piece of data is declared in different origins
-	 * (user, theme, and core), the last origin overrides the previous.
+	 * (default, blocks, theme, custom), the last origin overrides the previous.
 	 *
 	 * For example, if the user has set a background color
 	 * for the paragraph block, and the theme has done it as well,
@@ -525,9 +565,10 @@ public static function get_user_data() {
 	 * @since 5.9.0 Added user data, removed the `$settings` parameter,
 	 *              added the `$origin` parameter.
 	 * @since 6.1.0 Added block data and generation of spacingSizes array.
+	 * @since 6.2.0 Changed ' $origin' parameter values to 'default', 'blocks', 'theme' or 'custom'.
 	 *
-	 * @param string $origin Optional. To what level should we merge data.
-	 *                       Valid values are 'theme' or 'custom'. Default 'custom'.
+	 * @param string $origin Optional. To what level should we merge data: 'default', 'blocks', 'theme' or 'custom'.
+	 *                       'custom' is used as default value as well as fallback value if the origin is unknown.
 	 * @return WP_Theme_JSON
 	 */
 	public static function get_merged_data( $origin = 'custom' ) {
@@ -535,15 +576,25 @@ public static function get_merged_data( $origin = 'custom' ) {
 			_deprecated_argument( __FUNCTION__, '5.9.0' );
 		}
 
-		$result = static::get_core_data();
+		$result = new WP_Theme_JSON();
+		$result->merge( static::get_core_data() );
+		if ( 'default' === $origin ) {
+			$result->set_spacing_sizes();
+			return $result;
+		}
+
 		$result->merge( static::get_block_data() );
-		$result->merge( static::get_theme_data() );
+		if ( 'blocks' === $origin ) {
+			return $result;
+		}
 
-		if ( 'custom' === $origin ) {
-			$result->merge( static::get_user_data() );
+		$result->merge( static::get_theme_data() );
+		if ( 'theme' === $origin ) {
+			$result->set_spacing_sizes();
+			return $result;
 		}
 
-		// Generate the default spacingSizes array based on the merged spacingScale settings.
+		$result->merge( static::get_user_data() );
 		$result->set_spacing_sizes();
 
 		return $result;
@@ -576,18 +627,14 @@ public static function get_user_global_styles_post_id() {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Added a check in the parent theme.
+	 * @deprecated 6.2.0 Use wp_theme_has_theme_json() instead.
 	 *
 	 * @return bool
 	 */
 	public static function theme_has_support() {
-		if ( ! isset( static::$theme_has_support ) ) {
-			static::$theme_has_support = (
-				is_readable( static::get_file_path_from_theme( 'theme.json' ) ) ||
-				is_readable( static::get_file_path_from_theme( 'theme.json', true ) )
-			);
-		}
+		_deprecated_function( __METHOD__, '6.2.0', 'wp_theme_has_theme_json()' );
 
-		return static::$theme_has_support;
+		return wp_theme_has_theme_json();
 	}
 
 	/**
@@ -630,37 +677,64 @@ public static function clean_cached_data() {
 		static::$theme                    = null;
 		static::$user                     = null;
 		static::$user_custom_post_type_id = null;
-		static::$theme_has_support        = null;
 		static::$i18n_schema              = null;
 	}
 
+	/**
+	 * Returns an array of all nested JSON files within a given directory.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $dir The directory to recursively iterate and list files of.
+	 * @return array The merged array.
+	 */
+	private static function recursively_iterate_json( $dir ) {
+		$nested_files      = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $dir ) );
+		$nested_json_files = iterator_to_array( new RegexIterator( $nested_files, '/^.+\.json$/i', RecursiveRegexIterator::GET_MATCH ) );
+		return $nested_json_files;
+	}
+
+
 	/**
 	 * Returns the style variations defined by the theme.
 	 *
 	 * @since 6.0.0
+	 * @since 6.2.0 Returns parent theme variations if theme is a child.
 	 *
 	 * @return array
 	 */
 	public static function get_style_variations() {
-		$variations     = array();
-		$base_directory = get_stylesheet_directory() . '/styles';
+		$variation_files    = array();
+		$variations         = array();
+		$base_directory     = get_stylesheet_directory() . '/styles';
+		$template_directory = get_template_directory() . '/styles';
 		if ( is_dir( $base_directory ) ) {
-			$nested_files      = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $base_directory ) );
-			$nested_html_files = iterator_to_array( new RegexIterator( $nested_files, '/^.+\.json$/i', RecursiveRegexIterator::GET_MATCH ) );
-			ksort( $nested_html_files );
-			foreach ( $nested_html_files as $path => $file ) {
-				$decoded_file = wp_json_file_decode( $path, array( 'associative' => true ) );
-				if ( is_array( $decoded_file ) ) {
-					$translated = static::translate( $decoded_file, wp_get_theme()->get( 'TextDomain' ) );
-					$variation  = ( new WP_Theme_JSON( $translated ) )->get_raw_data();
-					if ( empty( $variation['title'] ) ) {
-						$variation['title'] = basename( $path, '.json' );
+			$variation_files = static::recursively_iterate_json( $base_directory );
+		}
+		if ( is_dir( $template_directory ) && $template_directory !== $base_directory ) {
+			$variation_files_parent = static::recursively_iterate_json( $template_directory );
+			// If the child and parent variation file basename are the same, only include the child theme's.
+			foreach ( $variation_files_parent as $parent_path => $parent ) {
+				foreach ( $variation_files as $child_path => $child ) {
+					if ( basename( $parent_path ) === basename( $child_path ) ) {
+						unset( $variation_files_parent[ $parent_path ] );
 					}
-					$variations[] = $variation;
 				}
 			}
+			$variation_files = array_merge( $variation_files, $variation_files_parent );
+		}
+		ksort( $variation_files );
+		foreach ( $variation_files as $path => $file ) {
+			$decoded_file = wp_json_file_decode( $path, array( 'associative' => true ) );
+			if ( is_array( $decoded_file ) ) {
+				$translated = static::translate( $decoded_file, wp_get_theme()->get( 'TextDomain' ) );
+				$variation  = ( new WP_Theme_JSON( $translated ) )->get_raw_data();
+				if ( empty( $variation['title'] ) ) {
+					$variation['title'] = basename( $path, '.json' );
+				}
+				$variations[] = $variation;
+			}
 		}
 		return $variations;
 	}
-
 }
diff --git a/src/wp-includes/class-wp-theme-json-schema.php b/src/wp-includes/class-wp-theme-json-schema.php
index 2e35a12c2ba5d..63c45005bc155 100644
--- a/src/wp-includes/class-wp-theme-json-schema.php
+++ b/src/wp-includes/class-wp-theme-json-schema.php
@@ -138,8 +138,6 @@ private static function rename_settings( &$settings, $paths_to_rename ) {
 	 *
 	 * @param array $settings Reference to the current settings array.
 	 * @param array $path Path to the property to be removed.
-	 *
-	 * @return void
 	 */
 	private static function unset_setting_by_path( &$settings, $path ) {
 		$tmp_settings = &$settings; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index 555898370f863..d4b50cd953d88 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -66,15 +66,13 @@ class WP_Theme_JSON {
 	 *
 	 * They are a unkeyed array of values such as:
 	 *
-	 * ```php
-	 * array(
-	 *   array(
-	 *     'slug'      => 'unique-name-within-the-set',
-	 *     'name'      => 'Name for the UI',
-	 *     <value_key> => 'value'
-	 *   ),
-	 * )
-	 * ```
+	 *     array(
+	 *       array(
+	 *         'slug'      => 'unique-name-within-the-set',
+	 *         'name'      => 'Name for the UI',
+	 *         <value_key> => 'value'
+	 *       ),
+	 *     )
 	 *
 	 * This contains the necessary metadata to process them:
 	 *
@@ -82,8 +80,8 @@ class WP_Theme_JSON {
 	 * - prevent_override => Disables override of default presets by theme presets.
 	 *                       The relationship between whether to override the defaults
 	 *                       and whether the defaults are enabled is inverse:
-	 *                         - If defaults are enabled  => theme presets should not be overriden
-	 *                         - If defaults are disabled => theme presets should be overriden
+	 *                         - If defaults are enabled  => theme presets should not be overridden
+	 *                         - If defaults are disabled => theme presets should be overridden
 	 *                       For example, a theme sets defaultPalette to false,
 	 *                       making the default palette hidden from the user.
 	 *                       In that case, we want all the theme presets to be present,
@@ -114,7 +112,9 @@ class WP_Theme_JSON {
 	 * @since 5.9.0 Added the `color.duotone` and `typography.fontFamilies` presets,
 	 *              `use_default_names` preset key, and simplified the metadata structure.
 	 * @since 6.0.0 Replaced `override` with `prevent_override` and updated the
-	 *              `prevent_overried` value for `color.duotone` to use `color.defaultDuotone`.
+	 *              `prevent_override` value for `color.duotone` to use `color.defaultDuotone`.
+	 * @since 6.2.0 Added 'shadow' presets.
+	 * @since 6.3.0 Replaced value_func for duotone with `null`. Custom properties are handled by class-wp-duotone.php.
 	 * @var array
 	 */
 	const PRESETS_METADATA = array(
@@ -144,8 +144,8 @@ class WP_Theme_JSON {
 			'path'              => array( 'color', 'duotone' ),
 			'prevent_override'  => array( 'color', 'defaultDuotone' ),
 			'use_default_names' => false,
-			'value_func'        => 'wp_get_duotone_filter_property',
-			'css_vars'          => '--wp--preset--duotone--$slug',
+			'value_func'        => null, // CSS Custom Properties for duotone are handled by block supports in class-wp-duotone.php.
+			'css_vars'          => null,
 			'classes'           => array(),
 			'properties'        => array( 'filter' ),
 		),
@@ -176,6 +176,15 @@ class WP_Theme_JSON {
 			'classes'           => array(),
 			'properties'        => array( 'padding', 'margin' ),
 		),
+		array(
+			'path'              => array( 'shadow', 'presets' ),
+			'prevent_override'  => array( 'shadow', 'defaultPresets' ),
+			'use_default_names' => false,
+			'value_key'         => 'shadow',
+			'css_vars'          => '--wp--preset--shadow--$slug',
+			'classes'           => array(),
+			'properties'        => array( 'box-shadow' ),
+		),
 	);
 
 	/**
@@ -192,6 +201,9 @@ class WP_Theme_JSON {
 	 * @since 6.1.0 Added the `border-*-color`, `border-*-width`, `border-*-style`,
 	 *              `--wp--style--root--padding-*`, and `box-shadow` properties,
 	 *              removed the `--wp--style--block-gap` property.
+	 * @since 6.2.0 Added `outline-*`, and `min-height` properties.
+	 * @since 6.3.0 Added `column-count` property.
+	 *
 	 * @var array
 	 */
 	const PROPERTIES_METADATA = array(
@@ -218,6 +230,7 @@ class WP_Theme_JSON {
 		'border-left-width'                 => array( 'border', 'left', 'width' ),
 		'border-left-style'                 => array( 'border', 'left', 'style' ),
 		'color'                             => array( 'color', 'text' ),
+		'column-count'                      => array( 'typography', 'textColumns' ),
 		'font-family'                       => array( 'typography', 'fontFamily' ),
 		'font-size'                         => array( 'typography', 'fontSize' ),
 		'font-style'                        => array( 'typography', 'fontStyle' ),
@@ -229,6 +242,11 @@ class WP_Theme_JSON {
 		'margin-right'                      => array( 'spacing', 'margin', 'right' ),
 		'margin-bottom'                     => array( 'spacing', 'margin', 'bottom' ),
 		'margin-left'                       => array( 'spacing', 'margin', 'left' ),
+		'min-height'                        => array( 'dimensions', 'minHeight' ),
+		'outline-color'                     => array( 'outline', 'color' ),
+		'outline-offset'                    => array( 'outline', 'offset' ),
+		'outline-style'                     => array( 'outline', 'style' ),
+		'outline-width'                     => array( 'outline', 'width' ),
 		'padding'                           => array( 'spacing', 'padding' ),
 		'padding-top'                       => array( 'spacing', 'padding', 'top' ),
 		'padding-right'                     => array( 'spacing', 'padding', 'right' ),
@@ -245,6 +263,36 @@ class WP_Theme_JSON {
 		'box-shadow'                        => array( 'shadow' ),
 	);
 
+	/**
+	 * Indirect metadata for style properties that are not directly output.
+	 *
+	 * Each element maps from a CSS property name to an array of
+	 * paths to the value in theme.json & block attributes.
+	 *
+	 * Indirect properties are not output directly by `compute_style_properties`,
+	 * but are used elsewhere in the processing of global styles. The indirect
+	 * property is used to validate whether or not a style value is allowed.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var array
+	 */
+	const INDIRECT_PROPERTIES_METADATA = array(
+		'gap'        => array(
+			array( 'spacing', 'blockGap' ),
+		),
+		'column-gap' => array(
+			array( 'spacing', 'blockGap', 'left' ),
+		),
+		'row-gap'    => array(
+			array( 'spacing', 'blockGap', 'top' ),
+		),
+		'max-width'  => array(
+			array( 'layout', 'contentSize' ),
+			array( 'layout', 'wideSize' ),
+		),
+	);
+
 	/**
 	 * Protected style properties.
 	 *
@@ -266,16 +314,18 @@ class WP_Theme_JSON {
 	 * @since 5.8.0 As `ALLOWED_TOP_LEVEL_KEYS`.
 	 * @since 5.9.0 Renamed from `ALLOWED_TOP_LEVEL_KEYS` to `VALID_TOP_LEVEL_KEYS`,
 	 *              added the `customTemplates` and `templateParts` values.
+	 * @since 6.3.0 Added the `description` value.
 	 * @var string[]
 	 */
 	const VALID_TOP_LEVEL_KEYS = array(
 		'customTemplates',
+		'description',
 		'patterns',
 		'settings',
 		'styles',
 		'templateParts',
-		'version',
 		'title',
+		'version',
 	);
 
 	/**
@@ -287,6 +337,10 @@ class WP_Theme_JSON {
 	 *              and `typography`, and renamed others according to the new schema.
 	 * @since 6.0.0 Added `color.defaultDuotone`.
 	 * @since 6.1.0 Added `layout.definitions` and `useRootPaddingAwareAlignments`.
+	 * @since 6.2.0 Added `dimensions.minHeight`, 'shadow.presets', 'shadow.defaultPresets',
+	 *              `position.fixed` and `position.sticky`.
+	 * @since 6.3.0 Added support for `typography.textColumns`, removed `layout.definitions`.
+	 *
 	 * @var array
 	 */
 	const VALID_SETTINGS = array(
@@ -309,15 +363,24 @@ class WP_Theme_JSON {
 			'duotone'          => null,
 			'gradients'        => null,
 			'link'             => null,
+			'heading'          => null,
+			'button'           => null,
+			'caption'          => null,
 			'palette'          => null,
 			'text'             => null,
 		),
 		'custom'                        => null,
+		'dimensions'                    => array(
+			'minHeight' => null,
+		),
 		'layout'                        => array(
 			'contentSize' => null,
-			'definitions' => null,
 			'wideSize'    => null,
 		),
+		'position'                      => array(
+			'fixed'  => null,
+			'sticky' => null,
+		),
 		'spacing'                       => array(
 			'customSpacingSize' => null,
 			'spacingSizes'      => null,
@@ -327,6 +390,10 @@ class WP_Theme_JSON {
 			'padding'           => null,
 			'units'             => null,
 		),
+		'shadow'                        => array(
+			'presets'        => null,
+			'defaultPresets' => null,
+		),
 		'typography'                    => array(
 			'fluid'          => null,
 			'customFontSize' => null,
@@ -337,6 +404,7 @@ class WP_Theme_JSON {
 			'fontWeight'     => null,
 			'letterSpacing'  => null,
 			'lineHeight'     => null,
+			'textColumns'    => null,
 			'textDecoration' => null,
 			'textTransform'  => null,
 		),
@@ -352,6 +420,9 @@ class WP_Theme_JSON {
 	 * @since 6.1.0 Added new side properties for `border`,
 	 *              added new property `shadow`,
 	 *              updated `blockGap` to be allowed at any level.
+	 * @since 6.2.0 Added `outline`, and `minHeight` properties.
+	 * @since 6.3.0 Added support for `typography.textColumns`.
+	 *
 	 * @var array
 	 */
 	const VALID_STYLES = array(
@@ -370,9 +441,18 @@ class WP_Theme_JSON {
 			'gradient'   => null,
 			'text'       => null,
 		),
+		'dimensions' => array(
+			'minHeight' => null,
+		),
 		'filter'     => array(
 			'duotone' => null,
 		),
+		'outline'    => array(
+			'color'  => null,
+			'offset' => null,
+			'style'  => null,
+			'width'  => null,
+		),
 		'shadow'     => null,
 		'spacing'    => array(
 			'margin'   => null,
@@ -386,28 +466,37 @@ class WP_Theme_JSON {
 			'fontWeight'     => null,
 			'letterSpacing'  => null,
 			'lineHeight'     => null,
+			'textColumns'    => null,
 			'textDecoration' => null,
 			'textTransform'  => null,
 		),
+		'css'        => null,
 	);
 
 	/**
 	 * Defines which pseudo selectors are enabled for which elements.
 	 *
+	 * The order of the selectors should be: link, any-link, visited, hover, focus, active.
+	 * This is to ensure the user action (hover, focus and active) styles have a higher
+	 * specificity than the visited styles, which in turn have a higher specificity than
+	 * the unvisited styles.
+	 *
+	 * See https://core.trac.wordpress.org/ticket/56928.
 	 * Note: this will affect both top-level and block-level elements.
 	 *
 	 * @since 6.1.0
+	 * @since 6.2.0 Added support for ':link' and ':any-link'.
 	 */
 	const VALID_ELEMENT_PSEUDO_SELECTORS = array(
-		'link'   => array( ':hover', ':focus', ':active', ':visited' ),
-		'button' => array( ':hover', ':focus', ':active', ':visited' ),
+		'link'   => array( ':link', ':any-link', ':visited', ':hover', ':focus', ':active' ),
+		'button' => array( ':link', ':any-link', ':visited', ':hover', ':focus', ':active' ),
 	);
 
 	/**
 	 * The valid elements that can be found under styles.
 	 *
 	 * @since 5.8.0
-	 * @since 6.1.0 Added `heading`, `button`. and `caption` elements.
+	 * @since 6.1.0 Added `heading`, `button`, and `caption` elements.
 	 * @var string[]
 	 */
 	const ELEMENTS = array(
@@ -456,7 +545,7 @@ class WP_Theme_JSON {
 	public static function get_element_class_name( $element ) {
 		$class_name = '';
 
-		if ( array_key_exists( $element, static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES ) ) {
+		if ( isset( static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $element ] ) ) {
 			$class_name = static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $element ];
 		}
 
@@ -467,6 +556,7 @@ public static function get_element_class_name( $element ) {
 	 * Options that settings.appearanceTools enables.
 	 *
 	 * @since 6.0.0
+	 * @since 6.2.0 Added `dimensions.minHeight` and `position.sticky`.
 	 * @var array
 	 */
 	const APPEARANCE_TOOLS_OPT_INS = array(
@@ -475,6 +565,11 @@ public static function get_element_class_name( $element ) {
 		array( 'border', 'style' ),
 		array( 'border', 'width' ),
 		array( 'color', 'link' ),
+		array( 'color', 'heading' ),
+		array( 'color', 'button' ),
+		array( 'color', 'caption' ),
+		array( 'dimensions', 'minHeight' ),
+		array( 'position', 'sticky' ),
 		array( 'spacing', 'blockGap' ),
 		array( 'spacing', 'margin' ),
 		array( 'spacing', 'padding' ),
@@ -507,14 +602,24 @@ public function __construct( $theme_json = array(), $origin = 'theme' ) {
 		$this->theme_json    = WP_Theme_JSON_Schema::migrate( $theme_json );
 		$valid_block_names   = array_keys( static::get_blocks_metadata() );
 		$valid_element_names = array_keys( static::ELEMENTS );
-		$theme_json          = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names );
-		$this->theme_json    = static::maybe_opt_in_into_settings( $theme_json );
+		$valid_variations    = array();
+		foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
+			if ( ! isset( $block_meta['styleVariations'] ) ) {
+				continue;
+			}
+			$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
+		}
+		$theme_json       = static::sanitize( $this->theme_json, $valid_block_names, $valid_element_names, $valid_variations );
+		$this->theme_json = static::maybe_opt_in_into_settings( $theme_json );
 
 		// Internally, presets are keyed by origin.
 		$nodes = static::get_setting_nodes( $this->theme_json );
 		foreach ( $nodes as $node ) {
 			foreach ( static::PRESETS_METADATA as $preset_metadata ) {
-				$path   = array_merge( $node['path'], $preset_metadata['path'] );
+				$path = $node['path'];
+				foreach ( $preset_metadata['path'] as $subpath ) {
+					$path[] = $subpath;
+				}
 				$preset = _wp_array_get( $this->theme_json, $path, null );
 				if ( null !== $preset ) {
 					// If the preset is not already keyed by origin.
@@ -564,8 +669,10 @@ protected static function maybe_opt_in_into_settings( $theme_json ) {
 	 */
 	protected static function do_opt_in_into_settings( &$context ) {
 		foreach ( static::APPEARANCE_TOOLS_OPT_INS as $path ) {
-			// Use "unset prop" as a marker instead of "null" because
-			// "null" can be a valid value for some props (e.g. blockGap).
+			/*
+			 * Use "unset prop" as a marker instead of "null" because
+			 * "null" can be a valid value for some props (e.g. blockGap).
+			 */
 			if ( 'unset prop' === _wp_array_get( $context, $path, 'unset prop' ) ) {
 				_wp_array_set( $context, $path, true );
 			}
@@ -579,13 +686,15 @@ protected static function do_opt_in_into_settings( &$context ) {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$valid_block_names` and `$valid_element_name` parameters.
+	 * @since 6.3.0 Added the `$valid_variations` parameter.
 	 *
 	 * @param array $input               Structure to sanitize.
 	 * @param array $valid_block_names   List of valid block names.
 	 * @param array $valid_element_names List of valid element names.
+	 * @param array $valid_variations    List of valid variations per block.
 	 * @return array The sanitized output.
 	 */
-	protected static function sanitize( $input, $valid_block_names, $valid_element_names ) {
+	protected static function sanitize( $input, $valid_block_names, $valid_element_names, $valid_variations ) {
 
 		$output = array();
 
@@ -603,6 +712,7 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 		 */
 		$styles_non_top_level = static::VALID_STYLES;
 		foreach ( array_keys( $styles_non_top_level ) as $section ) {
+			// array_key_exists() needs to be used instead of isset() because the value can be null.
 			if ( array_key_exists( $section, $styles_non_top_level ) && is_array( $styles_non_top_level[ $section ] ) ) {
 				foreach ( array_keys( $styles_non_top_level[ $section ] ) as $prop ) {
 					if ( 'top' === $styles_non_top_level[ $section ][ $prop ] ) {
@@ -626,7 +736,7 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 		foreach ( $valid_element_names as $element ) {
 			$schema_styles_elements[ $element ] = $styles_non_top_level;
 
-			if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
+			if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
 				foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
 					$schema_styles_elements[ $element ][ $pseudo_selector ] = $styles_non_top_level;
 				}
@@ -636,9 +746,28 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 		$schema_styles_blocks   = array();
 		$schema_settings_blocks = array();
 		foreach ( $valid_block_names as $block ) {
-			$schema_settings_blocks[ $block ]           = static::VALID_SETTINGS;
-			$schema_styles_blocks[ $block ]             = $styles_non_top_level;
-			$schema_styles_blocks[ $block ]['elements'] = $schema_styles_elements;
+			// Build the schema for each block style variation.
+			$style_variation_names = array();
+			if (
+				! empty( $input['styles']['blocks'][ $block ]['variations'] ) &&
+				is_array( $input['styles']['blocks'][ $block ]['variations'] ) &&
+				isset( $valid_variations[ $block ] )
+			) {
+				$style_variation_names = array_intersect(
+					array_keys( $input['styles']['blocks'][ $block ]['variations'] ),
+					$valid_variations[ $block ]
+				);
+			}
+
+			$schema_styles_variations = array();
+			if ( ! empty( $style_variation_names ) ) {
+				$schema_styles_variations = array_fill_keys( $style_variation_names, $styles_non_top_level );
+			}
+
+			$schema_settings_blocks[ $block ]             = static::VALID_SETTINGS;
+			$schema_styles_blocks[ $block ]               = $styles_non_top_level;
+			$schema_styles_blocks[ $block ]['elements']   = $schema_styles_elements;
+			$schema_styles_blocks[ $block ]['variations'] = $schema_styles_variations;
 		}
 
 		$schema['styles']             = static::VALID_STYLES;
@@ -663,7 +792,7 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 			if ( empty( $result ) ) {
 				unset( $output[ $subtree ] );
 			} else {
-				$output[ $subtree ] = $result;
+				$output[ $subtree ] = static::resolve_custom_css_format( $result );
 			}
 		}
 
@@ -679,17 +808,45 @@ protected static function sanitize( $input, $valid_block_names, $valid_element_n
 	 *
 	 * @since 5.8.0
 	 * @since 6.1.0 Added append position.
+	 * @since 6.3.0 Removed append position parameter.
 	 *
 	 * @param string $selector  Original selector.
 	 * @param string $to_append Selector to append.
-	 * @param string $position  A position sub-selector should be appended. Default 'right'.
 	 * @return string The new selector.
 	 */
-	protected static function append_to_selector( $selector, $to_append, $position = 'right' ) {
+	protected static function append_to_selector( $selector, $to_append ) {
+		if ( ! str_contains( $selector, ',' ) ) {
+			return $selector . $to_append;
+		}
 		$new_selectors = array();
 		$selectors     = explode( ',', $selector );
 		foreach ( $selectors as $sel ) {
-			$new_selectors[] = 'right' === $position ? $sel . $to_append : $to_append . $sel;
+			$new_selectors[] = $sel . $to_append;
+		}
+		return implode( ',', $new_selectors );
+	}
+
+	/**
+	 * Prepends a sub-selector to an existing one.
+	 *
+	 * Given the compounded $selector "h1, h2, h3"
+	 * and the $to_prepend selector ".some-class " the result will be
+	 * ".some-class h1, .some-class  h2, .some-class  h3".
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $selector   Original selector.
+	 * @param string $to_prepend Selector to prepend.
+	 * @return string The new selector.
+	 */
+	protected static function prepend_to_selector( $selector, $to_prepend ) {
+		if ( ! str_contains( $selector, ',' ) ) {
+			return $to_prepend . $selector;
+		}
+		$new_selectors = array();
+		$selectors     = explode( ',', $selector );
+		foreach ( $selectors as $sel ) {
+			$new_selectors[] = $to_prepend . $sel;
 		}
 		return implode( ',', $new_selectors );
 	}
@@ -721,6 +878,7 @@ protected static function append_to_selector( $selector, $to_append, $position =
 	 * @since 5.8.0
 	 * @since 5.9.0 Added `duotone` key with CSS selector.
 	 * @since 6.1.0 Added `features` key with block support feature level selectors.
+	 * @since 6.3.0 Refactored and stabilized selectors API.
 	 *
 	 * @return array Block metadata.
 	 */
@@ -735,55 +893,41 @@ protected static function get_blocks_metadata() {
 		}
 
 		foreach ( $blocks as $block_name => $block_type ) {
-			if (
-				isset( $block_type->supports['__experimentalSelector'] ) &&
-				is_string( $block_type->supports['__experimentalSelector'] )
-			) {
-				static::$blocks_metadata[ $block_name ]['selector'] = $block_type->supports['__experimentalSelector'];
-			} else {
-				static::$blocks_metadata[ $block_name ]['selector'] = '.wp-block-' . str_replace( '/', '-', str_replace( 'core/', '', $block_name ) );
-			}
+			$root_selector = wp_get_block_css_selector( $block_type );
 
-			if (
-				isset( $block_type->supports['color']['__experimentalDuotone'] ) &&
-				is_string( $block_type->supports['color']['__experimentalDuotone'] )
-			) {
-				static::$blocks_metadata[ $block_name ]['duotone'] = $block_type->supports['color']['__experimentalDuotone'];
+			static::$blocks_metadata[ $block_name ]['selector']  = $root_selector;
+			static::$blocks_metadata[ $block_name ]['selectors'] = static::get_block_selectors( $block_type, $root_selector );
+
+			$elements = static::get_block_element_selectors( $root_selector );
+			if ( ! empty( $elements ) ) {
+				static::$blocks_metadata[ $block_name ]['elements'] = $elements;
 			}
 
-			// Generate block support feature level selectors if opted into
-			// for the current block.
-			$features = array();
-			foreach ( static::BLOCK_SUPPORT_FEATURE_LEVEL_SELECTORS as $key => $feature ) {
-				if (
-					isset( $block_type->supports[ $key ]['__experimentalSelector'] ) &&
-					$block_type->supports[ $key ]['__experimentalSelector']
-				) {
-					$features[ $feature ] = static::scope_selector(
-						static::$blocks_metadata[ $block_name ]['selector'],
-						$block_type->supports[ $key ]['__experimentalSelector']
-					);
+			// The block may or may not have a duotone selector.
+			$duotone_selector = wp_get_block_css_selector( $block_type, 'filter.duotone' );
+
+			// Keep backwards compatibility for support.color.__experimentalDuotone.
+			if ( null === $duotone_selector ) {
+				$duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), null );
+
+				if ( $duotone_support ) {
+					$root_selector    = wp_get_block_css_selector( $block_type );
+					$duotone_selector = WP_Theme_JSON::scope_selector( $root_selector, $duotone_support );
 				}
 			}
 
-			if ( ! empty( $features ) ) {
-				static::$blocks_metadata[ $block_name ]['features'] = $features;
+			if ( null !== $duotone_selector ) {
+				static::$blocks_metadata[ $block_name ]['duotone'] = $duotone_selector;
 			}
 
-			// Assign defaults, then overwrite those that the block sets by itself.
-			// If the block selector is compounded, will append the element to each
-			// individual block selector.
-			$block_selectors = explode( ',', static::$blocks_metadata[ $block_name ]['selector'] );
-			foreach ( static::ELEMENTS as $el_name => $el_selector ) {
-				$element_selector = array();
-				foreach ( $block_selectors as $selector ) {
-					if ( $selector === $el_selector ) {
-						$element_selector = array( $el_selector );
-						break;
-					}
-					$element_selector[] = static::append_to_selector( $el_selector, $selector . ' ', 'left' );
+			// If the block has style variations, append their selectors to the block metadata.
+			if ( ! empty( $block_type->styles ) ) {
+				$style_selectors = array();
+				foreach ( $block_type->styles as $style ) {
+					// The style variation classname is duplicated in the selector to ensure that it overrides core block styles.
+					$style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'] . '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
 				}
-				static::$blocks_metadata[ $block_name ]['elements'][ $el_name ] = implode( ',', $element_selector );
+				static::$blocks_metadata[ $block_name ]['styleVariations'] = $style_selectors;
 			}
 		}
 
@@ -858,16 +1002,21 @@ public function get_settings() {
 	 * the theme.json structure this object represents.
 	 *
 	 * @since 5.8.0
-	 * @since 5.9.0 Removed the `$type` parameter`, added the `$types` and `$origins` parameters.
-	 *
-	 * @param array $types   Types of styles to load. Will load all by default. It accepts:
-	 *                       - `variables`: only the CSS Custom Properties for presets & custom ones.
-	 *                       - `styles`: only the styles section in theme.json.
-	 *                       - `presets`: only the classes for the presets.
-	 * @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
+	 * @since 5.9.0 Removed the `$type` parameter, added the `$types` and `$origins` parameters.
+	 * @since 6.3.0 Add fallback layout styles for Post Template when block gap support isn't available.
+	 *
+	 * @param string[] $types   Types of styles to load. Will load all by default. It accepts:
+	 *                          - `variables`: only the CSS Custom Properties for presets & custom ones.
+	 *                          - `styles`: only the styles section in theme.json.
+	 *                          - `presets`: only the classes for the presets.
+	 * @param string[] $origins A list of origins to include. By default it includes VALID_ORIGINS.
+	 * @param array    $options An array of options for now used for internal purposes only (may change without notice).
+	 *                          The options currently supported are 'scope' that makes sure all style are scoped to a
+	 *                          given selector, and root_selector which overwrites and forces a given selector to be
+	 *                          used on the root node.
 	 * @return string The resulting stylesheet.
 	 */
-	public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null ) {
+	public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null, $options = array() ) {
 		if ( null === $origins ) {
 			$origins = static::VALID_ORIGINS;
 		}
@@ -888,6 +1037,27 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		$style_nodes     = static::get_style_nodes( $this->theme_json, $blocks_metadata );
 		$setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
 
+		$root_style_key    = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $style_nodes, 'selector' ), true );
+		$root_settings_key = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $setting_nodes, 'selector' ), true );
+
+		if ( ! empty( $options['scope'] ) ) {
+			foreach ( $setting_nodes as &$node ) {
+				$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
+			}
+			foreach ( $style_nodes as &$node ) {
+				$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
+			}
+		}
+
+		if ( ! empty( $options['root_selector'] ) ) {
+			if ( false !== $root_settings_key ) {
+				$setting_nodes[ $root_settings_key ]['selector'] = $options['root_selector'];
+			}
+			if ( false !== $root_style_key ) {
+				$setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
+			}
+		}
+
 		$stylesheet = '';
 
 		if ( in_array( 'variables', $types, true ) ) {
@@ -895,25 +1065,41 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		}
 
 		if ( in_array( 'styles', $types, true ) ) {
-			$root_block_key = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $style_nodes, 'selector' ), true );
-
-			if ( false !== $root_block_key ) {
-				$stylesheet .= $this->get_root_layout_rules( static::ROOT_BLOCK_SELECTOR, $style_nodes[ $root_block_key ] );
+			if ( false !== $root_style_key ) {
+				$stylesheet .= $this->get_root_layout_rules( $style_nodes[ $root_style_key ]['selector'], $style_nodes[ $root_style_key ] );
 			}
 			$stylesheet .= $this->get_block_classes( $style_nodes );
 		} elseif ( in_array( 'base-layout-styles', $types, true ) ) {
-			// Base layout styles are provided as part of `styles`, so only output separately if explicitly requested.
-			// For backwards compatibility, the Columns block is explicitly included, to support a different default gap value.
+			$root_selector          = static::ROOT_BLOCK_SELECTOR;
+			$columns_selector       = '.wp-block-columns';
+			$post_template_selector = '.wp-block-post-template';
+			if ( ! empty( $options['scope'] ) ) {
+				$root_selector          = static::scope_selector( $options['scope'], $root_selector );
+				$columns_selector       = static::scope_selector( $options['scope'], $columns_selector );
+				$post_template_selector = static::scope_selector( $options['scope'], $post_template_selector );
+			}
+			if ( ! empty( $options['root_selector'] ) ) {
+				$root_selector = $options['root_selector'];
+			}
+			/*
+			 * Base layout styles are provided as part of `styles`, so only output separately if explicitly requested.
+			 * For backwards compatibility, the Columns block is explicitly included, to support a different default gap value.
+			 */
 			$base_styles_nodes = array(
 				array(
 					'path'     => array( 'styles' ),
-					'selector' => static::ROOT_BLOCK_SELECTOR,
+					'selector' => $root_selector,
 				),
 				array(
 					'path'     => array( 'styles', 'blocks', 'core/columns' ),
-					'selector' => '.wp-block-columns',
+					'selector' => $columns_selector,
 					'name'     => 'core/columns',
 				),
+				array(
+					'path'     => array( 'styles', 'blocks', 'core/post-template' ),
+					'selector' => $post_template_selector,
+					'name'     => 'core/post-template',
+				),
 			);
 
 			foreach ( $base_styles_nodes as $base_style_node ) {
@@ -928,6 +1114,53 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		return $stylesheet;
 	}
 
+	/**
+	 * Processes the CSS, to apply nesting.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $css      The CSS to process.
+	 * @param string $selector The selector to nest.
+	 * @return string The processed CSS.
+	 */
+	protected function process_blocks_custom_css( $css, $selector ) {
+		$processed_css = '';
+
+		// Split CSS nested rules.
+		$parts = explode( '&', $css );
+		foreach ( $parts as $part ) {
+			$processed_css .= ( ! str_contains( $part, '{' ) )
+				? trim( $selector ) . '{' . trim( $part ) . '}' // If the part doesn't contain braces, it applies to the root level.
+				: trim( $selector . $part ); // Prepend the selector, which effectively replaces the "&" character.
+		}
+		return $processed_css;
+	}
+
+	/**
+	 * Returns the global styles custom CSS.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string The global styles custom CSS.
+	 */
+	public function get_custom_css() {
+		// Add the global styles root CSS.
+		$stylesheet = _wp_array_get( $this->theme_json, array( 'styles', 'css' ), '' );
+
+		// Add the global styles block CSS.
+		if ( isset( $this->theme_json['styles']['blocks'] ) ) {
+			foreach ( $this->theme_json['styles']['blocks'] as $name => $node ) {
+				$custom_block_css = _wp_array_get( $this->theme_json, array( 'styles', 'blocks', $name, 'css' ) );
+				if ( $custom_block_css ) {
+					$selector    = static::$blocks_metadata[ $name ]['selector'];
+					$stylesheet .= $this->process_blocks_custom_css( $custom_block_css, $selector );
+				}
+			}
+		}
+
+		return $stylesheet;
+	}
+
 	/**
 	 * Returns the page templates of the active theme.
 	 *
@@ -1014,6 +1247,7 @@ protected function get_block_classes( $style_nodes ) {
 	 * Gets the CSS layout rules for a particular block from theme.json layout definitions.
 	 *
 	 * @since 6.1.0
+	 * @since 6.3.0 Reduced specificity for layout margin rules.
 	 *
 	 * @param array $block_metadata Metadata about the block to get styles for.
 	 * @return string Layout styles for the block.
@@ -1029,7 +1263,7 @@ protected function get_layout_styles( $block_metadata ) {
 
 		if ( isset( $block_metadata['name'] ) ) {
 			$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_metadata['name'] );
-			if ( ! block_has_support( $block_type, array( '__experimentalLayout' ), false ) ) {
+			if ( ! block_has_support( $block_type, 'layout', false ) && ! block_has_support( $block_type, '__experimentalLayout', false ) ) {
 				return $block_rules;
 			}
 		}
@@ -1038,11 +1272,13 @@ protected function get_layout_styles( $block_metadata ) {
 		$has_block_gap_support    = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null;
 		$has_fallback_gap_support = ! $has_block_gap_support; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback gap styles support.
 		$node                     = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
-		$layout_definitions       = _wp_array_get( $this->theme_json, array( 'settings', 'layout', 'definitions' ), array() );
+		$layout_definitions       = wp_get_layout_definitions();
 		$layout_selector_pattern  = '/^[a-zA-Z0-9\-\.\ *+>:\(\)]*$/'; // Allow alphanumeric classnames, spaces, wildcard, sibling, child combinator and pseudo class selectors.
 
-		// Gap styles will only be output if the theme has block gap support, or supports a fallback gap.
-		// Default layout gap styles will be skipped for themes that do not explicitly opt-in to blockGap with a `true` or `false` value.
+		/*
+		 * Gap styles will only be output if the theme has block gap support, or supports a fallback gap.
+		 * Default layout gap styles will be skipped for themes that do not explicitly opt-in to blockGap with a `true` or `false` value.
+		 */
 		if ( $has_block_gap_support || $has_fallback_gap_support ) {
 			$block_gap_value = null;
 			// Use a fallback gap value if block gap support is not available.
@@ -1070,8 +1306,8 @@ protected function get_layout_styles( $block_metadata ) {
 			// If the block should have custom gap, add the gap styles.
 			if ( null !== $block_gap_value && false !== $block_gap_value && '' !== $block_gap_value ) {
 				foreach ( $layout_definitions as $layout_definition_key => $layout_definition ) {
-					// Allow outputting fallback gap styles for flex layout type when block gap support isn't available.
-					if ( ! $has_block_gap_support && 'flex' !== $layout_definition_key ) {
+					// Allow outputting fallback gap styles for flex and grid layout types when block gap support isn't available.
+					if ( ! $has_block_gap_support && 'flex' !== $layout_definition_key && 'grid' !== $layout_definition_key ) {
 						continue;
 					}
 
@@ -1110,7 +1346,7 @@ protected function get_layout_styles( $block_metadata ) {
 										$spacing_rule['selector']
 									);
 								} else {
-									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? '%s .%s%s' : '%s.%s%s';
+									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? ':where(%s .%s) %s' : '%s-%s%s';
 									$layout_selector = sprintf(
 										$format,
 										$selector,
@@ -1137,7 +1373,7 @@ protected function get_layout_styles( $block_metadata ) {
 
 				if (
 					! empty( $class_name ) &&
-					! empty( $base_style_rules )
+					is_array( $base_style_rules )
 				) {
 					// Output display mode. This requires special handling as `display` is not exposed in `safe_style_css_filter`.
 					if (
@@ -1218,8 +1454,8 @@ protected function get_layout_styles( $block_metadata ) {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array $setting_nodes Nodes with settings.
-	 * @param array $origins       List of origins to process presets from.
+	 * @param array    $setting_nodes Nodes with settings.
+	 * @param string[] $origins       List of origins to process presets from.
 	 * @return string The new stylesheet.
 	 */
 	protected function get_preset_classes( $setting_nodes, $origins ) {
@@ -1255,8 +1491,8 @@ protected function get_preset_classes( $setting_nodes, $origins ) {
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$origins` parameter.
 	 *
-	 * @param array $nodes   Nodes with settings.
-	 * @param array $origins List of origins to process.
+	 * @param array    $nodes   Nodes with settings.
+	 * @param string[] $origins List of origins to process.
 	 * @return string The new stylesheet.
 	 */
 	protected function get_css_variables( $nodes, $origins ) {
@@ -1268,8 +1504,12 @@ protected function get_css_variables( $nodes, $origins ) {
 
 			$selector = $metadata['selector'];
 
-			$node         = _wp_array_get( $this->theme_json, $metadata['path'], array() );
-			$declarations = array_merge( static::compute_preset_vars( $node, $origins ), static::compute_theme_vars( $node ) );
+			$node                    = _wp_array_get( $this->theme_json, $metadata['path'], array() );
+			$declarations            = static::compute_preset_vars( $node, $origins );
+			$theme_vars_declarations = static::compute_theme_vars( $node );
+			foreach ( $theme_vars_declarations as $theme_vars_declaration ) {
+				$declarations[] = $theme_vars_declaration;
+			}
 
 			$stylesheet .= static::to_ruleset( $selector, $declarations );
 		}
@@ -1309,15 +1549,17 @@ static function ( $carry, $element ) {
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$origins` parameter.
 	 *
-	 * @param array  $settings Settings to process.
-	 * @param string $selector Selector wrapping the classes.
-	 * @param array  $origins  List of origins to process.
+	 * @param array    $settings Settings to process.
+	 * @param string   $selector Selector wrapping the classes.
+	 * @param string[] $origins  List of origins to process.
 	 * @return string The result of processing the presets.
 	 */
 	protected static function compute_preset_classes( $settings, $selector, $origins ) {
 		if ( static::ROOT_BLOCK_SELECTOR === $selector ) {
-			// Classes at the global level do not need any CSS prefixed,
-			// and we don't want to increase its specificity.
+			/*
+			 * Classes at the global level do not need any CSS prefixed,
+			 * and we don't want to increase its specificity.
+			 */
 			$selector = '';
 		}
 
@@ -1326,10 +1568,13 @@ protected static function compute_preset_classes( $settings, $selector, $origins
 			$slugs = static::get_settings_slugs( $settings, $preset_metadata, $origins );
 			foreach ( $preset_metadata['classes'] as $class => $property ) {
 				foreach ( $slugs as $slug ) {
-					$css_var     = static::replace_slug_in_string( $preset_metadata['css_vars'], $slug );
-					$class_name  = static::replace_slug_in_string( $class, $slug );
-					$stylesheet .= static::to_ruleset(
-						static::append_to_selector( $selector, $class_name ),
+					$css_var    = static::replace_slug_in_string( $preset_metadata['css_vars'], $slug );
+					$class_name = static::replace_slug_in_string( $class, $slug );
+
+					// $selector is often empty, so we can save ourselves the `append_to_selector()` call then.
+					$new_selector = '' === $selector ? $class_name : static::append_to_selector( $selector, $class_name );
+					$stylesheet  .= static::to_ruleset(
+						$new_selector,
 						array(
 							array(
 								'name'  => $property,
@@ -1361,18 +1606,27 @@ protected static function compute_preset_classes( $settings, $selector, $origins
 	 * @param string $selector Original selector.
 	 * @return string Scoped selector.
 	 */
-	protected static function scope_selector( $scope, $selector ) {
+	public static function scope_selector( $scope, $selector ) {
 		$scopes    = explode( ',', $scope );
 		$selectors = explode( ',', $selector );
 
 		$selectors_scoped = array();
 		foreach ( $scopes as $outer ) {
 			foreach ( $selectors as $inner ) {
-				$selectors_scoped[] = trim( $outer ) . ' ' . trim( $inner );
+				$outer = trim( $outer );
+				$inner = trim( $inner );
+				if ( ! empty( $outer ) && ! empty( $inner ) ) {
+					$selectors_scoped[] = $outer . ' ' . $inner;
+				} elseif ( empty( $outer ) ) {
+					$selectors_scoped[] = $inner;
+				} elseif ( empty( $inner ) ) {
+					$selectors_scoped[] = $outer;
+				}
 			}
 		}
 
-		return implode( ', ', $selectors_scoped );
+		$result = implode( ', ', $selectors_scoped );
+		return $result;
 	}
 
 	/**
@@ -1406,9 +1660,9 @@ protected static function scope_selector( $scope, $selector ) {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array $settings        Settings to process.
-	 * @param array $preset_metadata One of the PRESETS_METADATA values.
-	 * @param array $origins         List of origins to process.
+	 * @param array    $settings        Settings to process.
+	 * @param array    $preset_metadata One of the PRESETS_METADATA values.
+	 * @param string[] $origins         List of origins to process.
 	 * @return array Array of presets where each key is a slug and each value is the preset value.
 	 */
 	protected static function get_settings_values_by_slug( $settings, $preset_metadata, $origins ) {
@@ -1448,9 +1702,9 @@ protected static function get_settings_values_by_slug( $settings, $preset_metada
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array $settings        Settings to process.
-	 * @param array $preset_metadata One of the PRESETS_METADATA values.
-	 * @param array $origins         List of origins to process.
+	 * @param array    $settings        Settings to process.
+	 * @param array    $preset_metadata One of the PRESETS_METADATA values.
+	 * @param string[] $origins         List of origins to process.
 	 * @return array Array of presets where the key and value are both the slug.
 	 */
 	protected static function get_settings_slugs( $settings, $preset_metadata, $origins = null ) {
@@ -1501,8 +1755,8 @@ protected static function replace_slug_in_string( $input, $slug ) {
 	 * @since 5.8.0
 	 * @since 5.9.0 Added the `$origins` parameter.
 	 *
-	 * @param array $settings Settings to process.
-	 * @param array $origins  List of origins to process.
+	 * @param array    $settings Settings to process.
+	 * @param string[] $origins  List of origins to process.
 	 * @return array The modified $declarations.
 	 */
 	protected static function compute_preset_vars( $settings, $origins ) {
@@ -1596,11 +1850,11 @@ protected static function flatten_tree( $tree, $prefix = '', $token = '--' ) {
 			);
 
 			if ( is_array( $value ) ) {
-				$new_prefix = $new_key . $token;
-				$result     = array_merge(
-					$result,
-					static::flatten_tree( $value, $new_prefix, $token )
-				);
+				$new_prefix        = $new_key . $token;
+				$flattened_subtree = static::flatten_tree( $value, $new_prefix, $token );
+				foreach ( $flattened_subtree as $subtree_key => $subtree_value ) {
+					$result[ $subtree_key ] = $subtree_value;
+				}
 			} else {
 				$result[ $new_key ] = $value;
 			}
@@ -1647,8 +1901,10 @@ protected static function compute_style_properties( $styles, $settings = array()
 			if ( str_starts_with( $css_property, '--wp--style--root--' ) && ( static::ROOT_BLOCK_SELECTOR !== $selector || ! $use_root_padding ) ) {
 				continue;
 			}
-			// Root-level padding styles don't currently support strings with CSS shorthand values.
-			// This may change: https://github.com/WordPress/gutenberg/issues/40132.
+			/*
+			 * Root-level padding styles don't currently support strings with CSS shorthand values.
+			 * This may change: https://github.com/WordPress/gutenberg/issues/40132.
+			 */
 			if ( '--wp--style--root--padding' === $css_property && is_string( $value ) ) {
 				continue;
 			}
@@ -1657,12 +1913,14 @@ protected static function compute_style_properties( $styles, $settings = array()
 				$root_variable_duplicates[] = substr( $css_property, strlen( '--wp--style--root--' ) );
 			}
 
-			// Look up protected properties, keyed by value path.
-			// Skip protected properties that are explicitly set to `null`.
+			/*
+			 * Look up protected properties, keyed by value path.
+			 * Skip protected properties that are explicitly set to `null`.
+			 */
 			if ( is_array( $value_path ) ) {
 				$path_string = implode( '.', $value_path );
 				if (
-					array_key_exists( $path_string, static::PROTECTED_PROPERTIES ) &&
+					isset( static::PROTECTED_PROPERTIES[ $path_string ] ) &&
 					_wp_array_get( $settings, static::PROTECTED_PROPERTIES[ $path_string ], null ) === null
 				) {
 					continue;
@@ -1707,10 +1965,6 @@ protected static function compute_style_properties( $styles, $settings = array()
 	/**
 	 * Returns the style property for the given path.
 	 *
-	 * It also converts CSS Custom Property stored as
-	 * "var:preset|color|secondary" to the form
-	 * "--wp--preset--color--secondary".
-	 *
 	 * It also converts references to a path to the value
 	 * stored at that location, e.g.
 	 * { "ref": "style.color.background" } => "#fff".
@@ -1718,6 +1972,10 @@ protected static function compute_style_properties( $styles, $settings = array()
 	 * @since 5.8.0
 	 * @since 5.9.0 Added support for values of array type, which are returned as is.
 	 * @since 6.1.0 Added the `$theme_json` parameter.
+	 * @since 6.3.0 It no longer converts the internal format "var:preset|color|secondary"
+	 *              to the standard form "--wp--preset--color--secondary".
+	 *              This is already done by the sanitize method,
+	 *              so every property will be in the standard form.
 	 *
 	 * @param array $styles Styles subtree.
 	 * @param array $path   Which property to process.
@@ -1737,7 +1995,7 @@ protected static function get_property_value( $styles, $path, $theme_json = null
 		 * where the values is an array with a "ref" key, pointing to a path.
 		 * For example: { "ref": "style.color.background" } => "#fff".
 		 */
-		if ( is_array( $value ) && array_key_exists( 'ref', $value ) ) {
+		if ( is_array( $value ) && isset( $value['ref'] ) ) {
 			$value_path = explode( '.', $value['ref'] );
 			$ref_value  = _wp_array_get( $theme_json, $value_path );
 			// Only use the ref value if we find anything.
@@ -1745,7 +2003,7 @@ protected static function get_property_value( $styles, $path, $theme_json = null
 				$value = $ref_value;
 			}
 
-			if ( is_array( $ref_value ) && array_key_exists( 'ref', $ref_value ) ) {
+			if ( is_array( $ref_value ) && isset( $ref_value['ref'] ) ) {
 				$path_string      = json_encode( $path );
 				$ref_value_string = json_encode( $ref_value );
 				_doing_it_wrong(
@@ -1767,20 +2025,6 @@ protected static function get_property_value( $styles, $path, $theme_json = null
 			return $value;
 		}
 
-		// Convert custom CSS properties.
-		$prefix     = 'var:';
-		$prefix_len = strlen( $prefix );
-		$token_in   = '|';
-		$token_out  = '--';
-		if ( 0 === strncmp( $value, $prefix, $prefix_len ) ) {
-			$unwrapped_name = str_replace(
-				$token_in,
-				$token_out,
-				substr( $value, $prefix_len )
-			);
-			$value          = "var(--wp--$unwrapped_name)";
-		}
-
 		return $value;
 	}
 
@@ -1881,7 +2125,7 @@ protected static function get_style_nodes( $theme_json, $selectors = array() ) {
 				);
 
 				// Handle any pseudo selectors for the element.
-				if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
+				if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
 					foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
 
 						if ( isset( $theme_json['styles']['elements'][ $element ][ $pseudo_selector ] ) ) {
@@ -1900,7 +2144,10 @@ protected static function get_style_nodes( $theme_json, $selectors = array() ) {
 			return $nodes;
 		}
 
-		$nodes = array_merge( $nodes, static::get_block_nodes( $theme_json ) );
+		$block_nodes = static::get_block_nodes( $theme_json );
+		foreach ( $block_nodes as $block_node ) {
+			$nodes[] = $block_node;
+		}
 
 		/**
 		 * Filters the list of style nodes with metadata.
@@ -1925,10 +2172,49 @@ public function get_styles_block_nodes() {
 		return static::get_block_nodes( $this->theme_json );
 	}
 
+	/**
+	 * Returns a filtered declarations array if there is a separator block with only a background
+	 * style defined in theme.json by adding a color attribute to reflect the changes in the front.
+	 *
+	 * @since 6.1.1
+	 *
+	 * @param array $declarations List of declarations.
+	 * @return array $declarations List of declarations filtered.
+	 */
+	private static function update_separator_declarations( $declarations ) {
+		$background_color     = '';
+		$border_color_matches = false;
+		$text_color_matches   = false;
+
+		foreach ( $declarations as $declaration ) {
+			if ( 'background-color' === $declaration['name'] && ! $background_color && isset( $declaration['value'] ) ) {
+				$background_color = $declaration['value'];
+			} elseif ( 'border-color' === $declaration['name'] ) {
+				$border_color_matches = true;
+			} elseif ( 'color' === $declaration['name'] ) {
+				$text_color_matches = true;
+			}
+
+			if ( $background_color && $border_color_matches && $text_color_matches ) {
+				break;
+			}
+		}
+
+		if ( $background_color && ! $border_color_matches && ! $text_color_matches ) {
+			$declarations[] = array(
+				'name'  => 'color',
+				'value' => $background_color,
+			);
+		}
+
+		return $declarations;
+	}
+
 	/**
 	 * An internal method to get the block nodes from a theme.json file.
 	 *
 	 * @since 6.1.0
+	 * @since 6.3.0 Refactored and stabilized selectors API.
 	 *
 	 * @param array $theme_json The theme.json converted to an array.
 	 * @return array The block nodes in theme.json.
@@ -1957,16 +2243,28 @@ private static function get_block_nodes( $theme_json ) {
 			}
 
 			$feature_selectors = null;
-			if ( isset( $selectors[ $name ]['features'] ) ) {
-				$feature_selectors = $selectors[ $name ]['features'];
+			if ( isset( $selectors[ $name ]['selectors'] ) ) {
+				$feature_selectors = $selectors[ $name ]['selectors'];
+			}
+
+			$variation_selectors = array();
+			if ( isset( $node['variations'] ) ) {
+				foreach ( $node['variations'] as $variation => $node ) {
+					$variation_selectors[] = array(
+						'path'     => array( 'styles', 'blocks', $name, 'variations', $variation ),
+						'selector' => $selectors[ $name ]['styleVariations'][ $variation ],
+					);
+				}
 			}
 
 			$nodes[] = array(
-				'name'     => $name,
-				'path'     => array( 'styles', 'blocks', $name ),
-				'selector' => $selector,
-				'duotone'  => $duotone_selector,
-				'features' => $feature_selectors,
+				'name'       => $name,
+				'path'       => array( 'styles', 'blocks', $name ),
+				'selector'   => $selector,
+				'selectors'  => $feature_selectors,
+				'duotone'    => $duotone_selector,
+				'features'   => $feature_selectors,
+				'variations' => $variation_selectors,
 			);
 
 			if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'] ) ) {
@@ -1977,7 +2275,7 @@ private static function get_block_nodes( $theme_json ) {
 					);
 
 					// Handle any pseudo selectors for the element.
-					if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
+					if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
 						foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
 							if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'][ $element ][ $pseudo_selector ] ) ) {
 								$nodes[] = array(
@@ -2004,44 +2302,45 @@ private static function get_block_nodes( $theme_json ) {
 	 * @return string Styles for the block.
 	 */
 	public function get_styles_for_block( $block_metadata ) {
-		$node             = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
-		$use_root_padding = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
-		$selector         = $block_metadata['selector'];
-		$settings         = _wp_array_get( $this->theme_json, array( 'settings' ) );
-
-		/*
-		 * Process style declarations for block support features the current
-		 * block contains selectors for. Values for a feature with a custom
-		 * selector are filtered from the theme.json node before it is
-		 * processed as normal.
-		*/
-		$feature_declarations = array();
-
-		if ( ! empty( $block_metadata['features'] ) ) {
-			foreach ( $block_metadata['features'] as $feature_name => $feature_selector ) {
-				if ( ! empty( $node[ $feature_name ] ) ) {
-					// Create temporary node containing only the feature data
-					// to leverage existing `compute_style_properties` function.
-					$feature = array( $feature_name => $node[ $feature_name ] );
-					// Generate the feature's declarations only.
-					$new_feature_declarations = static::compute_style_properties( $feature, $settings, null, $this->theme_json );
-
-					// Merge new declarations with any that already exist for
-					// the feature selector. This may occur when multiple block
-					// support features use the same custom selector.
-					if ( isset( $feature_declarations[ $feature_selector ] ) ) {
-						$feature_declarations[ $feature_selector ] = array_merge( $feature_declarations[ $feature_selector ], $new_feature_declarations );
-					} else {
-						$feature_declarations[ $feature_selector ] = $new_feature_declarations;
-					}
+		$node                 = _wp_array_get( $this->theme_json, $block_metadata['path'], array() );
+		$use_root_padding     = isset( $this->theme_json['settings']['useRootPaddingAwareAlignments'] ) && true === $this->theme_json['settings']['useRootPaddingAwareAlignments'];
+		$selector             = $block_metadata['selector'];
+		$settings             = _wp_array_get( $this->theme_json, array( 'settings' ) );
+		$feature_declarations = static::get_feature_declarations_for_node( $block_metadata, $node );
+
+		// If there are style variations, generate the declarations for them, including any feature selectors the block may have.
+		$style_variation_declarations = array();
+		if ( ! empty( $block_metadata['variations'] ) ) {
+			foreach ( $block_metadata['variations'] as $style_variation ) {
+				$style_variation_node           = _wp_array_get( $this->theme_json, $style_variation['path'], array() );
+				$clean_style_variation_selector = trim( $style_variation['selector'] );
+
+				// Generate any feature/subfeature style declarations for the current style variation.
+				$variation_declarations = static::get_feature_declarations_for_node( $block_metadata, $style_variation_node );
+
+				// Combine selectors with style variation's selector and add to overall style variation declarations.
+				foreach ( $variation_declarations as $current_selector => $new_declarations ) {
+					// If current selector includes block classname, remove it but leave the whitespace in.
+					$shortened_selector = str_replace( $block_metadata['selector'] . ' ', ' ', $current_selector );
+
+					// Prepend the variation selector to the current selector.
+					$split_selectors    = explode( ',', $shortened_selector );
+					$updated_selectors  = array_map(
+						static function( $split_selector ) use ( $clean_style_variation_selector ) {
+							return $clean_style_variation_selector . $split_selector;
+						},
+						$split_selectors
+					);
+					$combined_selectors = implode( ',', $updated_selectors );
 
-					// Remove the feature from the block's node now the
-					// styles will be included under the feature level selector.
-					unset( $node[ $feature_name ] );
+					// Add the new declarations to the overall results under the modified selector.
+					$style_variation_declarations[ $combined_selectors ] = $new_declarations;
 				}
+
+				// Compute declarations for remaining styles not covered by feature level selectors.
+				$style_variation_declarations[ $style_variation['selector'] ] = static::compute_style_properties( $style_variation_node, $settings, null, $this->theme_json );
 			}
 		}
-
 		/*
 		 * Get a reference to element name from path.
 		 * $block_metadata['path'] = array( 'styles','elements','link' );
@@ -2054,7 +2353,7 @@ public function get_styles_for_block( $block_metadata ) {
 
 		$element_pseudo_allowed = array();
 
-		if ( array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
+		if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
 			$element_pseudo_allowed = static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ];
 		}
 
@@ -2065,7 +2364,7 @@ public function get_styles_for_block( $block_metadata ) {
 		$pseudo_matches = array_values(
 			array_filter(
 				$element_pseudo_allowed,
-				function( $pseudo_selector ) use ( $selector ) {
+				static function( $pseudo_selector ) use ( $selector ) {
 					return str_contains( $selector, $pseudo_selector );
 				}
 			)
@@ -2079,7 +2378,7 @@ function( $pseudo_selector ) use ( $selector ) {
 		 * Otherwise just compute the styles for the default selector as normal.
 		 */
 		if ( $pseudo_selector && isset( $node[ $pseudo_selector ] ) &&
-			array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS )
+			isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] )
 			&& in_array( $pseudo_selector, static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ], true )
 		) {
 			$declarations = static::compute_style_properties( $node[ $pseudo_selector ], $settings, null, $this->theme_json, $selector, $use_root_padding );
@@ -2101,13 +2400,17 @@ function( $pseudo_selector ) use ( $selector ) {
 			}
 		}
 
+		// Update declarations if there are separators with only background color defined.
+		if ( '.wp-block-separator' === $selector ) {
+			$declarations = static::update_separator_declarations( $declarations );
+		}
+
 		// 2. Generate and append the rules that use the general selector.
 		$block_rules .= static::to_ruleset( $selector, $declarations );
 
 		// 3. Generate and append the rules that use the duotone selector.
 		if ( isset( $block_metadata['duotone'] ) && ! empty( $declarations_duotone ) ) {
-			$selector_duotone = static::scope_selector( $block_metadata['selector'], $block_metadata['duotone'] );
-			$block_rules     .= static::to_ruleset( $selector_duotone, $declarations_duotone );
+			$block_rules .= static::to_ruleset( $block_metadata['duotone'], $declarations_duotone );
 		}
 
 		// 4. Generate Layout block gap styles.
@@ -2123,6 +2426,11 @@ function( $pseudo_selector ) use ( $selector ) {
 			$block_rules .= static::to_ruleset( $feature_selector, $individual_feature_declarations );
 		}
 
+		// 6. Generate and append the style variation rulesets.
+		foreach ( $style_variation_declarations as $style_variation_selector => $individual_style_variation_declarations ) {
+			$block_rules .= static::to_ruleset( $style_variation_selector, $individual_style_variation_declarations );
+		}
+
 		return $block_rules;
 	}
 
@@ -2190,8 +2498,9 @@ public function get_root_layout_rules( $selector, $block_metadata ) {
 		$has_block_gap_support = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null;
 		if ( $has_block_gap_support ) {
 			$block_gap_value = static::get_property_value( $this->theme_json, array( 'styles', 'spacing', 'blockGap' ) );
-			$css            .= '.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }';
-			$css            .= ".wp-site-blocks > * + * { margin-block-start: $block_gap_value; }";
+			$css            .= ":where(.wp-site-blocks) > * { margin-block-start: $block_gap_value; margin-block-end: 0; }";
+			$css            .= ':where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }';
+			$css            .= ':where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }';
 
 			// For backwards compatibility, ensure the legacy block gap CSS variable is still available.
 			$css .= "$selector { --wp--style--block-gap: $block_gap_value; }";
@@ -2204,29 +2513,27 @@ public function get_root_layout_rules( $selector, $block_metadata ) {
 	/**
 	 * For metadata values that can either be booleans or paths to booleans, gets the value.
 	 *
-	 * ```php
-	 * $data = array(
-	 *   'color' => array(
-	 *     'defaultPalette' => true
-	 *   )
-	 * );
+	 *     $data = array(
+	 *       'color' => array(
+	 *         'defaultPalette' => true
+	 *       )
+	 *     );
 	 *
-	 * static::get_metadata_boolean( $data, false );
-	 * // => false
+	 *     static::get_metadata_boolean( $data, false );
+	 *     // => false
 	 *
-	 * static::get_metadata_boolean( $data, array( 'color', 'defaultPalette' ) );
-	 * // => true
-	 * ```
+	 *     static::get_metadata_boolean( $data, array( 'color', 'defaultPalette' ) );
+	 *     // => true
 	 *
 	 * @since 6.0.0
 	 *
-	 * @param array      $data    The data to inspect.
-	 * @param bool|array $path    Boolean or path to a boolean.
-	 * @param bool       $default Default value if the referenced path is missing.
-	 *                            Default false.
+	 * @param array      $data          The data to inspect.
+	 * @param bool|array $path          Boolean or path to a boolean.
+	 * @param bool       $default_value Default value if the referenced path is missing.
+	 *                                  Default false.
 	 * @return bool Value of boolean metadata.
 	 */
-	protected static function get_metadata_boolean( $data, $path, $default = false ) {
+	protected static function get_metadata_boolean( $data, $path, $default_value = false ) {
 		if ( is_bool( $path ) ) {
 			return $path;
 		}
@@ -2238,7 +2545,7 @@ protected static function get_metadata_boolean( $data, $path, $default = false )
 			}
 		}
 
-		return $default;
+		return $default_value;
 	}
 
 	/**
@@ -2278,11 +2585,11 @@ public function merge( $incoming ) {
 		$nodes        = static::get_setting_nodes( $incoming_data );
 		$slugs_global = static::get_default_slugs( $this->theme_json, array( 'settings' ) );
 		foreach ( $nodes as $node ) {
-			$slugs_node = static::get_default_slugs( $this->theme_json, $node['path'] );
-			$slugs      = array_merge_recursive( $slugs_global, $slugs_node );
-
 			// Replace the spacing.units.
-			$path    = array_merge( $node['path'], array( 'spacing', 'units' ) );
+			$path   = $node['path'];
+			$path[] = 'spacing';
+			$path[] = 'units';
+
 			$content = _wp_array_get( $incoming_data, $path, null );
 			if ( isset( $content ) ) {
 				_wp_array_set( $this->theme_json, $path, $content );
@@ -2293,19 +2600,25 @@ public function merge( $incoming ) {
 				$override_preset = ! static::get_metadata_boolean( $this->theme_json['settings'], $preset['prevent_override'], true );
 
 				foreach ( static::VALID_ORIGINS as $origin ) {
-					$base_path = array_merge( $node['path'], $preset['path'] );
-					$path      = array_merge( $base_path, array( $origin ) );
-					$content   = _wp_array_get( $incoming_data, $path, null );
+					$base_path = $node['path'];
+					foreach ( $preset['path'] as $leaf ) {
+						$base_path[] = $leaf;
+					}
+
+					$path   = $base_path;
+					$path[] = $origin;
+
+					$content = _wp_array_get( $incoming_data, $path, null );
 					if ( ! isset( $content ) ) {
 						continue;
 					}
 
 					if ( 'theme' === $origin && $preset['use_default_names'] ) {
-						foreach ( $content as &$item ) {
-							if ( ! array_key_exists( 'name', $item ) ) {
+						foreach ( $content as $key => $item ) {
+							if ( ! isset( $item['name'] ) ) {
 								$name = static::get_name_from_defaults( $item['slug'], $base_path );
 								if ( null !== $name ) {
-									$item['name'] = $name;
+									$content[ $key ]['name'] = $name;
 								}
 							}
 						}
@@ -2317,6 +2630,9 @@ public function merge( $incoming ) {
 					) {
 						_wp_array_set( $this->theme_json, $path, $content );
 					} else {
+						$slugs_node = static::get_default_slugs( $this->theme_json, $node['path'] );
+						$slugs      = array_merge_recursive( $slugs_global, $slugs_node );
+
 						$slugs_for_preset = _wp_array_get( $slugs, $preset['path'], array() );
 						$content          = static::filter_slugs( $content, $slugs_for_preset );
 						_wp_array_set( $this->theme_json, $path, $content );
@@ -2369,7 +2685,7 @@ public function get_svg_filters( $origins ) {
 	 * @param array      $theme_json The theme.json like structure to inspect.
 	 * @param array      $path       Path to inspect.
 	 * @param bool|array $override   Data to compute whether to override the preset.
-	 * @return boolean
+	 * @return bool
 	 */
 	protected static function should_override_preset( $theme_json, $path, $override ) {
 		_deprecated_function( __METHOD__, '6.0.0', 'get_metadata_boolean' );
@@ -2412,12 +2728,12 @@ protected static function should_override_preset( $theme_json, $path, $override
 	 *
 	 * For example:
 	 *
-	 *  array(
-	 *   'color' => array(
-	 *     'palette'   => array( 'slug-1', 'slug-2' ),
-	 *     'gradients' => array( 'slug-3', 'slug-4' ),
-	 *   ),
-	 * )
+	 *     array(
+	 *       'color' => array(
+	 *         'palette'   => array( 'slug-1', 'slug-2' ),
+	 *         'gradients' => array( 'slug-3', 'slug-4' ),
+	 *       ),
+	 *     )
 	 *
 	 * @since 5.9.0
 	 *
@@ -2429,7 +2745,12 @@ protected static function get_default_slugs( $data, $node_path ) {
 		$slugs = array();
 
 		foreach ( static::PRESETS_METADATA as $metadata ) {
-			$path   = array_merge( $node_path, $metadata['path'], array( 'default' ) );
+			$path = $node_path;
+			foreach ( $metadata['path'] as $leaf ) {
+				$path[] = $leaf;
+			}
+			$path[] = 'default';
+
 			$preset = _wp_array_get( $data, $path, null );
 			if ( ! isset( $preset ) ) {
 				continue;
@@ -2458,7 +2779,8 @@ protected static function get_default_slugs( $data, $node_path ) {
 	 * @return string|null
 	 */
 	protected function get_name_from_defaults( $slug, $base_path ) {
-		$path            = array_merge( $base_path, array( 'default' ) );
+		$path            = $base_path;
+		$path[]          = 'default';
 		$default_content = _wp_array_get( $this->theme_json, $path, null );
 		if ( ! $default_content ) {
 			return null;
@@ -2510,8 +2832,15 @@ public static function remove_insecure_properties( $theme_json ) {
 
 		$valid_block_names   = array_keys( static::get_blocks_metadata() );
 		$valid_element_names = array_keys( static::ELEMENTS );
+		$valid_variations    = array();
+		foreach ( self::get_blocks_metadata() as $block_name => $block_meta ) {
+			if ( ! isset( $block_meta['styleVariations'] ) ) {
+				continue;
+			}
+			$valid_variations[ $block_name ] = array_keys( $block_meta['styleVariations'] );
+		}
 
-		$theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names );
+		$theme_json = static::sanitize( $theme_json, $valid_block_names, $valid_element_names, $valid_variations );
 
 		$blocks_metadata = static::get_blocks_metadata();
 		$style_nodes     = static::get_style_nodes( $theme_json, $blocks_metadata );
@@ -2522,7 +2851,12 @@ public static function remove_insecure_properties( $theme_json ) {
 				continue;
 			}
 
-			$output = static::remove_insecure_styles( $input );
+			// The global styles custom CSS is not sanitized, but can only be edited by users with 'edit_css' capability.
+			if ( isset( $input['css'] ) && current_user_can( 'edit_css' ) ) {
+				$output = $input;
+			} else {
+				$output = static::remove_insecure_styles( $input );
+			}
 
 			/*
 			 * Get a reference to element name from path.
@@ -2534,7 +2868,7 @@ public static function remove_insecure_properties( $theme_json ) {
 			 * $output is stripped of pseudo selectors. Re-add and process them
 			 * or insecure styles here.
 			 */
-			if ( array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
+			if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
 				foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] as $pseudo_selector ) {
 					if ( isset( $input[ $pseudo_selector ] ) ) {
 						$output[ $pseudo_selector ] = static::remove_insecure_styles( $input[ $pseudo_selector ] );
@@ -2588,8 +2922,9 @@ protected static function remove_insecure_settings( $input ) {
 		$output = array();
 		foreach ( static::PRESETS_METADATA as $preset_metadata ) {
 			foreach ( static::VALID_ORIGINS as $origin ) {
-				$path_with_origin = array_merge( $preset_metadata['path'], array( $origin ) );
-				$presets          = _wp_array_get( $input, $path_with_origin, null );
+				$path_with_origin   = $preset_metadata['path'];
+				$path_with_origin[] = $origin;
+				$presets            = _wp_array_get( $input, $path_with_origin, null );
 				if ( null === $presets ) {
 					continue;
 				}
@@ -2629,6 +2964,10 @@ protected static function remove_insecure_settings( $input ) {
 				}
 			}
 		}
+
+		// Ensure indirect properties not included in any `PRESETS_METADATA` value are allowed.
+		static::remove_indirect_properties( $input, $output );
+
 		return $output;
 	}
 
@@ -2649,14 +2988,20 @@ protected static function remove_insecure_styles( $input ) {
 			if ( static::is_safe_css_declaration( $declaration['name'], $declaration['value'] ) ) {
 				$path = static::PROPERTIES_METADATA[ $declaration['name'] ];
 
-				// Check the value isn't an array before adding so as to not
-				// double up shorthand and longhand styles.
+				/*
+				 * Check the value isn't an array before adding so as to not
+				 * double up shorthand and longhand styles.
+				 */
 				$value = _wp_array_get( $input, $path, array() );
 				if ( ! is_array( $value ) ) {
 					_wp_array_set( $output, $path, $value );
 				}
 			}
 		}
+
+		// Ensure indirect properties not handled by `compute_style_properties` are allowed.
+		static::remove_indirect_properties( $input, $output );
+
 		return $output;
 	}
 
@@ -2675,6 +3020,29 @@ protected static function is_safe_css_declaration( $property_name, $property_val
 		return ! empty( trim( $filtered ) );
 	}
 
+	/**
+	 * Removes indirect properties from the given input node and
+	 * sets in the given output node.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array $input  Node to process.
+	 * @param array $output The processed node. Passed by reference.
+	 */
+	private static function remove_indirect_properties( $input, &$output ) {
+		foreach ( static::INDIRECT_PROPERTIES_METADATA as $property => $paths ) {
+			foreach ( $paths as $path ) {
+				$value = _wp_array_get( $input, $path );
+				if (
+					is_string( $value ) &&
+					static::is_safe_css_declaration( $property, $value )
+				) {
+					_wp_array_set( $output, $path, $value );
+				}
+			}
+		}
+	}
+
 	/**
 	 * Returns the raw data.
 	 *
@@ -2834,7 +3202,10 @@ public function get_data() {
 		 */
 		foreach ( $nodes as $node ) {
 			foreach ( static::PRESETS_METADATA as $preset_metadata ) {
-				$path   = array_merge( $node['path'], $preset_metadata['path'] );
+				$path = $node['path'];
+				foreach ( $preset_metadata['path'] as $preset_metadata_path ) {
+					$path[] = $preset_metadata_path;
+				}
 				$preset = _wp_array_get( $output, $path, null );
 				if ( null === $preset ) {
 					continue;
@@ -2863,14 +3234,21 @@ public function get_data() {
 			}
 		}
 
-		// If all of the static::APPEARANCE_TOOLS_OPT_INS are true,
-		// this code unsets them and sets 'appearanceTools' instead.
+		/*
+		 * If all of the static::APPEARANCE_TOOLS_OPT_INS are true,
+		 * this code unsets them and sets 'appearanceTools' instead.
+		 */
 		foreach ( $nodes as $node ) {
 			$all_opt_ins_are_set = true;
 			foreach ( static::APPEARANCE_TOOLS_OPT_INS as $opt_in_path ) {
-				$full_path = array_merge( $node['path'], $opt_in_path );
-				// Use "unset prop" as a marker instead of "null" because
-				// "null" can be a valid value for some props (e.g. blockGap).
+				$full_path = $node['path'];
+				foreach ( $opt_in_path as $opt_in_path_item ) {
+					$full_path[] = $opt_in_path_item;
+				}
+				/*
+				 * Use "unset prop" as a marker instead of "null" because
+				 * "null" can be a valid value for some props (e.g. blockGap).
+				 */
 				$opt_in_value = _wp_array_get( $output, $full_path, 'unset prop' );
 				if ( 'unset prop' === $opt_in_value ) {
 					$all_opt_ins_are_set = false;
@@ -2879,21 +3257,30 @@ public function get_data() {
 			}
 
 			if ( $all_opt_ins_are_set ) {
-				_wp_array_set( $output, array_merge( $node['path'], array( 'appearanceTools' ) ), true );
+				$node_path_with_appearance_tools   = $node['path'];
+				$node_path_with_appearance_tools[] = 'appearanceTools';
+				_wp_array_set( $output, $node_path_with_appearance_tools, true );
 				foreach ( static::APPEARANCE_TOOLS_OPT_INS as $opt_in_path ) {
-					$full_path = array_merge( $node['path'], $opt_in_path );
-					// Use "unset prop" as a marker instead of "null" because
-					// "null" can be a valid value for some props (e.g. blockGap).
+					$full_path = $node['path'];
+					foreach ( $opt_in_path as $opt_in_path_item ) {
+						$full_path[] = $opt_in_path_item;
+					}
+					/*
+					 * Use "unset prop" as a marker instead of "null" because
+					 * "null" can be a valid value for some props (e.g. blockGap).
+					 */
 					$opt_in_value = _wp_array_get( $output, $full_path, 'unset prop' );
 					if ( true !== $opt_in_value ) {
 						continue;
 					}
 
-					// The following could be improved to be path independent.
-					// At the moment it relies on a couple of assumptions:
-					//
-					// - all opt-ins having a path of size 2.
-					// - there's two sources of settings: the top-level and the block-level.
+					/*
+					 * The following could be improved to be path independent.
+					 * At the moment it relies on a couple of assumptions:
+					 *
+					 * - all opt-ins having a path of size 2.
+					 * - there's two sources of settings: the top-level and the block-level.
+					 */
 					if (
 						( 1 === count( $node['path'] ) ) &&
 						( 'settings' === $node['path'][0] )
@@ -2934,7 +3321,8 @@ public function get_data() {
 	public function set_spacing_sizes() {
 		$spacing_scale = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'spacingScale' ), array() );
 
-		if ( ! is_numeric( $spacing_scale['steps'] )
+		if ( ! isset( $spacing_scale['steps'] )
+			|| ! is_numeric( $spacing_scale['steps'] )
 			|| ! isset( $spacing_scale['mediumStep'] )
 			|| ! isset( $spacing_scale['unit'] )
 			|| ! isset( $spacing_scale['operator'] )
@@ -3031,9 +3419,12 @@ public function set_spacing_sizes() {
 			$slug += 10;
 		}
 
-		$spacing_sizes = array_merge( $below_sizes, $above_sizes );
+		$spacing_sizes = $below_sizes;
+		foreach ( $above_sizes as $above_sizes_item ) {
+			$spacing_sizes[] = $above_sizes_item;
+		}
 
-		// If there are 7 or less steps in the scale revert to numbers for labels instead of t-shirt sizes.
+		// If there are 7 or fewer steps in the scale revert to numbers for labels instead of t-shirt sizes.
 		if ( $spacing_scale['steps'] <= 7 ) {
 			for ( $spacing_sizes_count = 0; $spacing_sizes_count < count( $spacing_sizes ); $spacing_sizes_count++ ) {
 				$spacing_sizes[ $spacing_sizes_count ]['name'] = (string) ( $spacing_sizes_count + 1 );
@@ -3042,4 +3433,292 @@ public function set_spacing_sizes() {
 
 		_wp_array_set( $this->theme_json, array( 'settings', 'spacing', 'spacingSizes', 'default' ), $spacing_sizes );
 	}
+
+	/**
+	 * This is used to convert the internal representation of variables to the CSS representation.
+	 * For example, `var:preset|color|vivid-green-cyan` becomes `var(--wp--preset--color--vivid-green-cyan)`.
+	 *
+	 * @since 6.3.0
+	 * @param string $value The variable such as var:preset|color|vivid-green-cyan to convert.
+	 * @return string The converted variable.
+	 */
+	private static function convert_custom_properties( $value ) {
+		$prefix     = 'var:';
+		$prefix_len = strlen( $prefix );
+		$token_in   = '|';
+		$token_out  = '--';
+		if ( str_starts_with( $value, $prefix ) ) {
+			$unwrapped_name = str_replace(
+				$token_in,
+				$token_out,
+				substr( $value, $prefix_len )
+			);
+			$value          = "var(--wp--$unwrapped_name)";
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Given a tree, converts the internal representation of variables to the CSS representation.
+	 * It is recursive and modifies the input in-place.
+	 *
+	 * @since 6.3.0
+	 * @param array $tree   Input to process.
+	 * @return array The modified $tree.
+	 */
+	private static function resolve_custom_css_format( $tree ) {
+		$prefix = 'var:';
+
+		foreach ( $tree as $key => $data ) {
+			if ( is_string( $data ) && str_starts_with( $data, $prefix ) ) {
+				$tree[ $key ] = self::convert_custom_properties( $data );
+			} elseif ( is_array( $data ) ) {
+				$tree[ $key ] = self::resolve_custom_css_format( $data );
+			}
+		}
+
+		return $tree;
+	}
+
+	/**
+	 * Returns the selectors metadata for a block.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param object $block_type    The block type.
+	 * @param string $root_selector The block's root selector.
+	 *
+	 * @return array The custom selectors set by the block.
+	 */
+	protected static function get_block_selectors( $block_type, $root_selector ) {
+		if ( ! empty( $block_type->selectors ) ) {
+			return $block_type->selectors;
+		}
+
+		$selectors = array( 'root' => $root_selector );
+		foreach ( static::BLOCK_SUPPORT_FEATURE_LEVEL_SELECTORS as $key => $feature ) {
+			$feature_selector = wp_get_block_css_selector( $block_type, $key );
+			if ( null !== $feature_selector ) {
+				$selectors[ $feature ] = array( 'root' => $feature_selector );
+			}
+		}
+
+		return $selectors;
+	}
+
+	/**
+	 * Generates all the element selectors for a block.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $root_selector The block's root CSS selector.
+	 * @return array The block's element selectors.
+	 */
+	protected static function get_block_element_selectors( $root_selector ) {
+		/*
+		 * Assign defaults, then override those that the block sets by itself.
+		 * If the block selector is compounded, will append the element to each
+		 * individual block selector.
+		 */
+		$block_selectors   = explode( ',', $root_selector );
+		$element_selectors = array();
+		foreach ( static::ELEMENTS as $el_name => $el_selector ) {
+			$element_selector = array();
+			foreach ( $block_selectors as $selector ) {
+				if ( $selector === $el_selector ) {
+					$element_selector = array( $el_selector );
+					break;
+				}
+				$element_selector[] = static::prepend_to_selector( $el_selector, $selector . ' ' );
+			}
+			$element_selectors[ $el_name ] = implode( ',', $element_selector );
+		}
+
+		return $element_selectors;
+	}
+
+	/**
+	 * Generates style declarations for a node's features e.g., color, border,
+	 * typography etc. that have custom selectors in their related block's
+	 * metadata.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param object $metadata The related block metadata containing selectors.
+	 * @param object $node     A merged theme.json node for block or variation.
+	 *
+	 * @return array The style declarations for the node's features with custom
+	 * selectors.
+	 */
+	protected function get_feature_declarations_for_node( $metadata, &$node ) {
+		$declarations = array();
+
+		if ( ! isset( $metadata['selectors'] ) ) {
+			return $declarations;
+		}
+
+		$settings = _wp_array_get( $this->theme_json, array( 'settings' ) );
+
+		foreach ( $metadata['selectors'] as $feature => $feature_selectors ) {
+			/*
+			 * Skip if this is the block's root selector or the block doesn't
+			 * have any styles for the feature.
+			 */
+			if ( 'root' === $feature || empty( $node[ $feature ] ) ) {
+				continue;
+			}
+
+			if ( is_array( $feature_selectors ) ) {
+				foreach ( $feature_selectors as $subfeature => $subfeature_selector ) {
+					if ( 'root' === $subfeature || empty( $node[ $feature ][ $subfeature ] ) ) {
+						continue;
+					}
+
+					/*
+					 * Create temporary node containing only the subfeature data
+					 * to leverage existing `compute_style_properties` function.
+					 */
+					$subfeature_node = array(
+						$feature => array(
+							$subfeature => $node[ $feature ][ $subfeature ],
+						),
+					);
+
+					// Generate style declarations.
+					$new_declarations = static::compute_style_properties( $subfeature_node, $settings, null, $this->theme_json );
+
+					// Merge subfeature declarations into feature declarations.
+					if ( isset( $declarations[ $subfeature_selector ] ) ) {
+						foreach ( $new_declarations as $new_declaration ) {
+							$declarations[ $subfeature_selector ][] = $new_declaration;
+						}
+					} else {
+						$declarations[ $subfeature_selector ] = $new_declarations;
+					}
+
+					/*
+					 * Remove the subfeature from the block's node now its
+					 * styles will be included under its own selector not the
+					 * block's.
+					 */
+					unset( $node[ $feature ][ $subfeature ] );
+				}
+			}
+
+			/*
+			 * Now subfeatures have been processed and removed we can process
+			 * feature root selector or simple string selector.
+			 */
+			if (
+				is_string( $feature_selectors ) ||
+				( isset( $feature_selectors['root'] ) && $feature_selectors['root'] )
+			) {
+				$feature_selector = is_string( $feature_selectors ) ? $feature_selectors : $feature_selectors['root'];
+
+				/*
+				 * Create temporary node containing only the feature data
+				 * to leverage existing `compute_style_properties` function.
+				 */
+				$feature_node = array( $feature => $node[ $feature ] );
+
+				// Generate the style declarations.
+				$new_declarations = static::compute_style_properties( $feature_node, $settings, null, $this->theme_json );
+
+				/*
+				 * Merge new declarations with any that already exist for
+				 * the feature selector. This may occur when multiple block
+				 * support features use the same custom selector.
+				 */
+				if ( isset( $declarations[ $feature_selector ] ) ) {
+					foreach ( $new_declarations as $new_declaration ) {
+						$declarations[ $feature_selector ][] = $new_declaration;
+					}
+				} else {
+					$declarations[ $feature_selector ] = $new_declarations;
+				}
+
+				/*
+				 * Remove the feature from the block's node now its styles
+				 * will be included under its own selector not the block's.
+				 */
+				unset( $node[ $feature ] );
+			}
+		}
+
+		return $declarations;
+	}
+
+	/**
+	 * Replaces CSS variables with their values in place.
+	 *
+	 * @since 6.3.0
+	 * @param array $styles CSS declarations to convert.
+	 * @param array $values key => value pairs to use for replacement.
+	 * @return array
+	 */
+	private static function convert_variables_to_value( $styles, $values ) {
+		foreach ( $styles as $key => $style ) {
+			if ( is_array( $style ) ) {
+				$styles[ $key ] = self::convert_variables_to_value( $style, $values );
+				continue;
+			}
+
+			if ( 0 <= strpos( $style, 'var(' ) ) {
+				// find all the variables in the string in the form of var(--variable-name, fallback), with fallback in the second capture group.
+
+				$has_matches = preg_match_all( '/var\(([^),]+)?,?\s?(\S+)?\)/', $style, $var_parts );
+
+				if ( $has_matches ) {
+					$resolved_style = $styles[ $key ];
+					foreach ( $var_parts[1] as $index => $var_part ) {
+						$key_in_values   = 'var(' . $var_part . ')';
+						$rule_to_replace = $var_parts[0][ $index ]; // the css rule to replace e.g. var(--wp--preset--color--vivid-green-cyan).
+						$fallback        = $var_parts[2][ $index ]; // the fallback value.
+						$resolved_style  = str_replace(
+							array(
+								$rule_to_replace,
+								$fallback,
+							),
+							array(
+								isset( $values[ $key_in_values ] ) ? $values[ $key_in_values ] : $rule_to_replace,
+								isset( $values[ $fallback ] ) ? $values[ $fallback ] : $fallback,
+							),
+							$resolved_style
+						);
+					}
+					$styles[ $key ] = $resolved_style;
+				}
+			}
+		}
+
+		return $styles;
+	}
+
+	/**
+	 * Resolves the values of CSS variables in the given styles.
+	 *
+	 * @since 6.3.0
+	 * @param WP_Theme_JSON $theme_json The theme json resolver.
+	 *
+	 * @return WP_Theme_JSON The $theme_json with resolved variables.
+	 */
+	public static function resolve_variables( $theme_json ) {
+		$settings    = $theme_json->get_settings();
+		$styles      = $theme_json->get_raw_data()['styles'];
+		$preset_vars = static::compute_preset_vars( $settings, static::VALID_ORIGINS );
+		$theme_vars  = static::compute_theme_vars( $settings );
+		$vars        = array_reduce(
+			array_merge( $preset_vars, $theme_vars ),
+			function( $carry, $item ) {
+				$name                    = $item['name'];
+				$carry[ "var({$name})" ] = $item['value'];
+				return $carry;
+			},
+			array()
+		);
+
+		$theme_json->theme_json['styles'] = self::convert_variables_to_value( $styles, $vars );
+		return $theme_json;
+	}
 }
diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
index f95f49e2057a0..5841ec3d9d002 100644
--- a/src/wp-includes/class-wp-theme.php
+++ b/src/wp-includes/class-wp-theme.php
@@ -58,6 +58,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 5.3.0 Added the Twenty Twenty theme.
 	 * @since 5.6.0 Added the Twenty Twenty-One theme.
 	 * @since 5.9.0 Added the Twenty Twenty-Two theme.
+	 * @since 6.1.0 Added the Twenty Twenty-Three theme.
 	 * @var string[]
 	 */
 	private static $default_themes = array(
@@ -113,6 +114,14 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	private $headers_sanitized;
 
+	/**
+	 * Is this theme a block theme.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	private $block_theme;
+
 	/**
 	 * Header name from the theme's style.css after being translated.
 	 *
@@ -233,6 +242,9 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 			}
 		}
 
+		// Handle a numeric theme directory as a string.
+		$theme_dir = (string) $theme_dir;
+
 		$this->theme_root = $theme_root;
 		$this->stylesheet = $theme_dir;
 
@@ -250,7 +262,7 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 		$cache = $this->cache_get( 'theme' );
 
 		if ( is_array( $cache ) ) {
-			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
+			foreach ( array( 'block_theme', 'errors', 'headers', 'template' ) as $key ) {
 				if ( isset( $cache[ $key ] ) ) {
 					$this->$key = $cache[ $key ];
 				}
@@ -275,14 +287,16 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 			} else {
 				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
 			}
-			$this->template = $this->stylesheet;
+			$this->template    = $this->stylesheet;
+			$this->block_theme = false;
 			$this->cache_add(
 				'theme',
 				array(
-					'headers'    => $this->headers,
-					'errors'     => $this->errors,
-					'stylesheet' => $this->stylesheet,
-					'template'   => $this->template,
+					'block_theme' => $this->block_theme,
+					'headers'     => $this->headers,
+					'errors'      => $this->errors,
+					'stylesheet'  => $this->stylesheet,
+					'template'    => $this->template,
 				)
 			);
 			if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one.
@@ -293,20 +307,24 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 			$this->headers['Name'] = $this->stylesheet;
 			$this->errors          = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
 			$this->template        = $this->stylesheet;
+			$this->block_theme     = false;
 			$this->cache_add(
 				'theme',
 				array(
-					'headers'    => $this->headers,
-					'errors'     => $this->errors,
-					'stylesheet' => $this->stylesheet,
-					'template'   => $this->template,
+					'block_theme' => $this->block_theme,
+					'headers'     => $this->headers,
+					'errors'      => $this->errors,
+					'stylesheet'  => $this->stylesheet,
+					'template'    => $this->template,
 				)
 			);
 			return;
 		} else {
 			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
-			// Default themes always trump their pretenders.
-			// Properly identify default themes that are inside a directory within wp-content/themes.
+			/*
+			 * Default themes always trump their pretenders.
+			 * Properly identify default themes that are inside a directory within wp-content/themes.
+			 */
 			$default_theme_slug = array_search( $this->headers['Name'], self::$default_themes, true );
 			if ( $default_theme_slug ) {
 				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
@@ -327,9 +345,10 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 			$this->cache_add(
 				'theme',
 				array(
-					'headers'    => $this->headers,
-					'errors'     => $this->errors,
-					'stylesheet' => $this->stylesheet,
+					'block_theme' => $this->is_block_theme(),
+					'headers'     => $this->headers,
+					'errors'      => $this->errors,
+					'stylesheet'  => $this->stylesheet,
 				)
 			);
 
@@ -345,11 +364,7 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 			$this->template = $this->stylesheet;
 			$theme_path     = $this->theme_root . '/' . $this->stylesheet;
 
-			if (
-				! file_exists( $theme_path . '/templates/index.html' )
-				&& ! file_exists( $theme_path . '/block-templates/index.html' ) // Deprecated path support since 5.9.0.
-				&& ! file_exists( $theme_path . '/index.php' )
-			) {
+			if ( ! $this->is_block_theme() && ! file_exists( $theme_path . '/index.php' ) ) {
 				$error_message = sprintf(
 					/* translators: 1: templates/index.html, 2: index.php, 3: Documentation URL, 4: Template, 5: style.css */
 					__( 'Template is missing. Standalone themes need to have a %1$s or %2$s template file. <a href="%3$s">Child themes</a> need to have a %4$s header in the %5$s stylesheet.' ),
@@ -363,10 +378,11 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 				$this->cache_add(
 					'theme',
 					array(
-						'headers'    => $this->headers,
-						'errors'     => $this->errors,
-						'stylesheet' => $this->stylesheet,
-						'template'   => $this->template,
+						'block_theme' => $this->block_theme,
+						'headers'     => $this->headers,
+						'errors'      => $this->errors,
+						'stylesheet'  => $this->stylesheet,
+						'template'    => $this->template,
 					)
 				);
 				return;
@@ -375,16 +391,20 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 
 		// If we got our data from cache, we can assume that 'template' is pointing to the right place.
 		if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) {
-			// If we're in a directory of themes inside /themes, look for the parent nearby.
-			// wp-content/themes/directory-of-themes/*
+			/*
+			 * If we're in a directory of themes inside /themes, look for the parent nearby.
+			 * wp-content/themes/directory-of-themes/*
+			 */
 			$parent_dir  = dirname( $this->stylesheet );
 			$directories = search_theme_directories();
 
 			if ( '.' !== $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
 				$this->template = $parent_dir . '/' . $this->template;
 			} elseif ( $directories && isset( $directories[ $this->template ] ) ) {
-				// Look for the template in the search_theme_directories() results, in case it is in another theme root.
-				// We don't look into directories of themes, just the theme root.
+				/*
+				 * Look for the template in the search_theme_directories() results, in case it is in another theme root.
+				 * We don't look into directories of themes, just the theme root.
+				 */
 				$theme_root_template = $directories[ $this->template ]['theme_root'];
 			} else {
 				// Parent theme is missing.
@@ -399,10 +419,11 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 				$this->cache_add(
 					'theme',
 					array(
-						'headers'    => $this->headers,
-						'errors'     => $this->errors,
-						'stylesheet' => $this->stylesheet,
-						'template'   => $this->template,
+						'block_theme' => $this->is_block_theme(),
+						'headers'     => $this->headers,
+						'errors'      => $this->errors,
+						'stylesheet'  => $this->stylesheet,
+						'template'    => $this->template,
 					)
 				);
 				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
@@ -426,10 +447,11 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 				$_child->cache_add(
 					'theme',
 					array(
-						'headers'    => $_child->headers,
-						'errors'     => $_child->errors,
-						'stylesheet' => $_child->stylesheet,
-						'template'   => $_child->template,
+						'block_theme' => $_child->is_block_theme(),
+						'headers'     => $_child->headers,
+						'errors'      => $_child->errors,
+						'stylesheet'  => $_child->stylesheet,
+						'template'    => $_child->template,
 					)
 				);
 				// The two themes actually reference each other with the Template header.
@@ -445,10 +467,11 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 					$this->cache_add(
 						'theme',
 						array(
-							'headers'    => $this->headers,
-							'errors'     => $this->errors,
-							'stylesheet' => $this->stylesheet,
-							'template'   => $this->template,
+							'block_theme' => $this->is_block_theme(),
+							'headers'     => $this->headers,
+							'errors'      => $this->errors,
+							'stylesheet'  => $this->stylesheet,
+							'template'    => $this->template,
 						)
 					);
 				}
@@ -465,10 +488,11 @@ public function __construct( $theme_dir, $theme_root, $_child = null ) {
 		// We're good. If we didn't retrieve from cache, set it.
 		if ( ! is_array( $cache ) ) {
 			$cache = array(
-				'headers'    => $this->headers,
-				'errors'     => $this->errors,
-				'stylesheet' => $this->stylesheet,
-				'template'   => $this->template,
+				'block_theme' => $this->is_block_theme(),
+				'headers'     => $this->headers,
+				'errors'      => $this->errors,
+				'stylesheet'  => $this->stylesheet,
+				'template'    => $this->template,
 			);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
 			if ( isset( $theme_root_template ) ) {
@@ -762,6 +786,7 @@ public function cache_delete() {
 		$this->errors            = null;
 		$this->headers_sanitized = null;
 		$this->name_translated   = null;
+		$this->block_theme       = null;
 		$this->headers           = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
 	}
@@ -1264,24 +1289,24 @@ public function get_post_templates() {
 				}
 			}
 
-			if ( current_theme_supports( 'block-templates' ) ) {
-				$block_templates = get_block_templates( array(), 'wp_template' );
-				foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
-					foreach ( $block_templates as $block_template ) {
-						if ( ! $block_template->is_custom ) {
-							continue;
-						}
+			$this->cache_add( 'post_templates', $post_templates );
+		}
 
-						if ( isset( $block_template->post_types ) && ! in_array( $type, $block_template->post_types, true ) ) {
-							continue;
-						}
+		if ( current_theme_supports( 'block-templates' ) ) {
+			$block_templates = get_block_templates( array(), 'wp_template' );
+			foreach ( get_post_types( array( 'public' => true ) ) as $type ) {
+				foreach ( $block_templates as $block_template ) {
+					if ( ! $block_template->is_custom ) {
+						continue;
+					}
 
-						$post_templates[ $type ][ $block_template->slug ] = $block_template->title;
+					if ( isset( $block_template->post_types ) && ! in_array( $type, $block_template->post_types, true ) ) {
+						continue;
 					}
+
+					$post_templates[ $type ][ $block_template->slug ] = $block_template->title;
 				}
 			}
-
-			$this->cache_add( 'post_templates', $post_templates );
 		}
 
 		if ( $this->load_textdomain() ) {
@@ -1491,18 +1516,25 @@ public function is_allowed( $check = 'both', $blog_id = null ) {
 	 * @return bool
 	 */
 	public function is_block_theme() {
+		if ( isset( $this->block_theme ) ) {
+			return $this->block_theme;
+		}
+
 		$paths_to_index_block_template = array(
-			$this->get_file_path( '/block-templates/index.html' ),
 			$this->get_file_path( '/templates/index.html' ),
+			$this->get_file_path( '/block-templates/index.html' ),
 		);
 
+		$this->block_theme = false;
+
 		foreach ( $paths_to_index_block_template as $path_to_index_block_template ) {
 			if ( is_file( $path_to_index_block_template ) && is_readable( $path_to_index_block_template ) ) {
-				return true;
+				$this->block_theme = true;
+				break;
 			}
 		}
 
-		return false;
+		return $this->block_theme;
 	}
 
 	/**
@@ -1639,8 +1671,10 @@ public static function get_allowed_on_site( $blog_id = null ) {
 			restore_current_blog();
 		}
 
-		// This is all super old MU back compat joy.
-		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
+		/*
+		 * This is all super old MU back compat joy.
+		 * 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
+		 */
 		if ( false === $allowed_themes[ $blog_id ] ) {
 			if ( $current ) {
 				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
@@ -1738,7 +1772,7 @@ public static function network_disable_theme( $stylesheets ) {
 	 * @param WP_Theme[] $themes Array of theme objects to sort (passed by reference).
 	 */
 	public static function sort_by_name( &$themes ) {
-		if ( 0 === strpos( get_user_locale(), 'en_' ) ) {
+		if ( str_starts_with( get_user_locale(), 'en_' ) ) {
 			uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
 		} else {
 			foreach ( $themes as $key => $theme ) {
diff --git a/src/wp-includes/class-wp-user-query.php b/src/wp-includes/class-wp-user-query.php
index 330882494e3b9..c5d66404ea658 100644
--- a/src/wp-includes/class-wp-user-query.php
+++ b/src/wp-includes/class-wp-user-query.php
@@ -67,11 +67,12 @@ class WP_User_Query {
 	public $query_limit;
 
 	/**
-	 * PHP5 constructor.
+	 * Constructor.
 	 *
 	 * @since 3.1.0
 	 *
 	 * @param null|string|array $query Optional. The query variables.
+	 *                                 See WP_User_Query::prepare_query() for information on accepted arguments.
 	 */
 	public function __construct( $query = null ) {
 		if ( ! empty( $query ) ) {
@@ -85,7 +86,7 @@ public function __construct( $query = null ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param array $args Query vars, as passed to `WP_User_Query`.
+	 * @param string|array $args Query vars, as passed to `WP_User_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
 	public static function fill_query_vars( $args ) {
@@ -119,6 +120,7 @@ public static function fill_query_vars( $args ) {
 			'login'               => '',
 			'login__in'           => array(),
 			'login__not_in'       => array(),
+			'cache_results'       => true,
 		);
 
 		return wp_parse_args( $args, $defaults );
@@ -140,12 +142,13 @@ public static function fill_query_vars( $args ) {
 	 * @since 5.1.0 Introduced the 'meta_compare_key' parameter.
 	 * @since 5.3.0 Introduced the 'meta_type_key' parameter.
 	 * @since 5.9.0 Added 'capability', 'capability__in', and 'capability__not_in' parameters.
+	 * @since 6.3.0 Added 'cache_results' parameter.
 	 *
 	 * @global wpdb     $wpdb     WordPress database abstraction object.
 	 * @global WP_Roles $wp_roles WordPress role management object.
 	 *
 	 * @param string|array $query {
-	 *     Optional. Array or string of Query parameters.
+	 *     Optional. Array or string of query parameters.
 	 *
 	 *     @type int             $blog_id             The site ID. Default is the current site.
 	 *     @type string|string[] $role                An array or a comma-separated list of role names that users must match
@@ -254,6 +257,7 @@ public static function fill_query_vars( $args ) {
 	 *                                                logins will be included in results. Default empty array.
 	 *     @type string[]        $login__not_in       An array of logins to exclude. Users matching one of these
 	 *                                                logins will not be included in results. Default empty array.
+	 *     @type bool            $cache_results       Whether to cache user information. Default true.
 	 * }
 	 */
 	public function prepare_query( $query = array() ) {
@@ -689,8 +693,8 @@ public function prepare_query( $query = array() ) {
 		}
 
 		if ( $search ) {
-			$leading_wild  = ( ltrim( $search, '*' ) != $search );
-			$trailing_wild = ( rtrim( $search, '*' ) != $search );
+			$leading_wild  = ( ltrim( $search, '*' ) !== $search );
+			$trailing_wild = ( rtrim( $search, '*' ) !== $search );
 			if ( $leading_wild && $trailing_wild ) {
 				$wild = 'both';
 			} elseif ( $leading_wild ) {
@@ -709,7 +713,7 @@ public function prepare_query( $query = array() ) {
 				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename', 'display_name' ) );
 			}
 			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@' ) ) {
+				if ( str_contains( $search, '@' ) ) {
 					$search_columns = array( 'user_email' );
 				} elseif ( is_numeric( $search ) ) {
 					$search_columns = array( 'user_login', 'ID' );
@@ -776,8 +780,25 @@ public function prepare_query( $query = array() ) {
 	public function query() {
 		global $wpdb;
 
+		if ( ! did_action( 'plugins_loaded' ) ) {
+			_doing_it_wrong(
+				'WP_User_Query::query',
+				sprintf(
+				/* translators: %s: plugins_loaded */
+					__( 'User queries should not be run before the %s hook.' ),
+					'<code>plugins_loaded</code>'
+				),
+				'6.1.1'
+			);
+		}
+
 		$qv =& $this->query_vars;
 
+		// Do not cache results if more than 3 fields are requested.
+		if ( is_array( $qv['fields'] ) && count( $qv['fields'] ) > 3 ) {
+			$qv['cache_results'] = false;
+		}
+
 		/**
 		 * Filters the users array before the query takes place.
 		 *
@@ -804,28 +825,47 @@ public function query() {
 				{$this->query_orderby}
 				{$this->query_limit}
 			";
-
-			if ( is_array( $qv['fields'] ) ) {
-				$this->results = $wpdb->get_results( $this->request );
-			} else {
-				$this->results = $wpdb->get_col( $this->request );
+			$cache_value   = false;
+			$cache_key     = $this->generate_cache_key( $qv, $this->request );
+			$cache_group   = 'user-queries';
+			if ( $qv['cache_results'] ) {
+				$cache_value = wp_cache_get( $cache_key, $cache_group );
 			}
+			if ( false !== $cache_value ) {
+				$this->results     = $cache_value['user_data'];
+				$this->total_users = $cache_value['total_users'];
+			} else {
+
+				if ( is_array( $qv['fields'] ) ) {
+					$this->results = $wpdb->get_results( $this->request );
+				} else {
+					$this->results = $wpdb->get_col( $this->request );
+				}
+
+				if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					/**
+					 * Filters SELECT FOUND_ROWS() query for the current WP_User_Query instance.
+					 *
+					 * @since 3.2.0
+					 * @since 5.1.0 Added the `$this` parameter.
+					 *
+					 * @global wpdb $wpdb WordPress database abstraction object.
+					 *
+					 * @param string        $sql   The SELECT FOUND_ROWS() query for the current WP_User_Query.
+					 * @param WP_User_Query $query The current WP_User_Query instance.
+					 */
+					$found_users_query = apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()', $this );
+
+					$this->total_users = (int) $wpdb->get_var( $found_users_query );
+				}
 
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				/**
-				 * Filters SELECT FOUND_ROWS() query for the current WP_User_Query instance.
-				 *
-				 * @since 3.2.0
-				 * @since 5.1.0 Added the `$this` parameter.
-				 *
-				 * @global wpdb $wpdb WordPress database abstraction object.
-				 *
-				 * @param string        $sql   The SELECT FOUND_ROWS() query for the current WP_User_Query.
-				 * @param WP_User_Query $query The current WP_User_Query instance.
-				 */
-				$found_users_query = apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()', $this );
-
-				$this->total_users = (int) $wpdb->get_var( $found_users_query );
+				if ( $qv['cache_results'] ) {
+					$cache_value = array(
+						'user_data'   => $this->results,
+						'total_users' => $this->total_users,
+					);
+					wp_cache_add( $cache_key, $cache_value, $cache_group );
+				}
 			}
 		}
 
@@ -840,7 +880,9 @@ public function query() {
 				$result->id = $result->ID;
 			}
 		} elseif ( 'all_with_meta' === $qv['fields'] || 'all' === $qv['fields'] ) {
-			cache_users( $this->results );
+			if ( function_exists( 'cache_users' ) ) {
+				cache_users( $this->results );
+			}
 
 			$r = array();
 			foreach ( $this->results as $userid ) {
@@ -967,12 +1009,11 @@ protected function parse_orderby( $orderby ) {
 				FROM $wpdb->posts
 				$where
 				GROUP BY post_author
-			) p ON ({$wpdb->users}.ID = p.post_author)
-			";
+			) p ON ({$wpdb->users}.ID = p.post_author)";
 			$_orderby          = 'post_count';
 		} elseif ( 'ID' === $orderby || 'id' === $orderby ) {
 			$_orderby = 'ID';
-		} elseif ( 'meta_value' === $orderby || $this->get( 'meta_key' ) == $orderby ) {
+		} elseif ( 'meta_value' === $orderby || $this->get( 'meta_key' ) === $orderby ) {
 			$_orderby = "$wpdb->usermeta.meta_value";
 		} elseif ( 'meta_value_num' === $orderby ) {
 			$_orderby = "$wpdb->usermeta.meta_value+0";
@@ -996,6 +1037,57 @@ protected function parse_orderby( $orderby ) {
 		return $_orderby;
 	}
 
+	/**
+	 * Generate cache key.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param array  $args Query arguments.
+	 * @param string $sql  SQL statement.
+	 * @return string Cache key.
+	 */
+	protected function generate_cache_key( array $args, $sql ) {
+		global $wpdb;
+
+		// Replace wpdb placeholder in the SQL statement used by the cache key.
+		$sql = $wpdb->remove_placeholder_escape( $sql );
+
+		$key          = md5( $sql );
+		$last_changed = wp_cache_get_last_changed( 'users' );
+
+		if ( empty( $args['orderby'] ) ) {
+			// Default order is by 'user_login'.
+			$ordersby = array( 'user_login' => '' );
+		} elseif ( is_array( $args['orderby'] ) ) {
+			$ordersby = $args['orderby'];
+		} else {
+			// 'orderby' values may be a comma- or space-separated list.
+			$ordersby = preg_split( '/[,\s]+/', $args['orderby'] );
+		}
+
+		$blog_id = 0;
+		if ( isset( $args['blog_id'] ) ) {
+			$blog_id = absint( $args['blog_id'] );
+		}
+
+		if ( $args['has_published_posts'] || in_array( 'post_count', $ordersby, true ) ) {
+			$switch = $blog_id && get_current_blog_id() !== $blog_id;
+			if ( $switch ) {
+				switch_to_blog( $blog_id );
+			}
+
+			$last_changed .= wp_cache_get_last_changed( 'posts' );
+
+			if ( $switch ) {
+				restore_current_blog();
+			}
+		}
+
+		return "get_users:$key:$last_changed";
+	}
+
 	/**
 	 * Parses an 'order' query variable and casts it to ASC or DESC as necessary.
 	 *
@@ -1020,6 +1112,7 @@ protected function parse_order( $order ) {
 	 * Makes private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Getting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -1028,27 +1121,42 @@ public function __get( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return $this->$name;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Getting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
+		return null;
 	}
 
 	/**
 	 * Makes private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Setting a dynamic property is deprecated.
 	 *
 	 * @param string $name  Property to check if set.
 	 * @param mixed  $value Property value.
-	 * @return mixed Newly-set property.
 	 */
 	public function __set( $name, $value ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
-			return $this->$name = $value;
+			$this->$name = $value;
+			return;
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Setting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 
 	/**
 	 * Makes private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Checking a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -1057,19 +1165,34 @@ public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			return isset( $this->$name );
 		}
+
+		trigger_error(
+			"The property `{$name}` is not declared. Checking `isset()` on a dynamic property " .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
+		return false;
 	}
 
 	/**
 	 * Makes private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
+	 * @since 6.4.0 Unsetting a dynamic property is deprecated.
 	 *
 	 * @param string $name Property to unset.
 	 */
 	public function __unset( $name ) {
 		if ( in_array( $name, $this->compat_fields, true ) ) {
 			unset( $this->$name );
+			return;
 		}
+
+		trigger_error(
+			"A property `{$name}` is not declared. Unsetting a dynamic property is " .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.',
+			E_USER_DEPRECATED
+		);
 	}
 
 	/**
diff --git a/src/wp-includes/class-wp-user.php b/src/wp-includes/class-wp-user.php
index b190960009575..aa759804c8827 100644
--- a/src/wp-includes/class-wp-user.php
+++ b/src/wp-includes/class-wp-user.php
@@ -156,7 +156,7 @@ public function __construct( $id = 0, $name = '', $site_id = '' ) {
 		if ( $data ) {
 			$this->init( $data, $site_id );
 		} else {
-			$this->data = new stdClass;
+			$this->data = new stdClass();
 		}
 	}
 
@@ -199,8 +199,7 @@ public static function get_data_by( $field, $value ) {
 		}
 
 		if ( 'id' === $field ) {
-			// Make sure the value is numeric to avoid casting objects, for example,
-			// to int 1.
+			// Make sure the value is numeric to avoid casting objects, for example, to int 1.
 			if ( ! is_numeric( $value ) ) {
 				return false;
 			}
@@ -501,7 +500,7 @@ protected function _init_caps( $cap_key = '' ) {
 	 */
 	public function get_role_caps() {
 		$switch_site = false;
-		if ( is_multisite() && get_current_blog_id() != $this->site_id ) {
+		if ( is_multisite() && get_current_blog_id() !== $this->site_id ) {
 			$switch_site = true;
 
 			switch_to_blog( $this->site_id );
@@ -603,7 +602,7 @@ public function remove_role( $role ) {
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
-		if ( 1 === count( $this->roles ) && current( $this->roles ) == $role ) {
+		if ( 1 === count( $this->roles ) && current( $this->roles ) === $role ) {
 			return;
 		}
 
@@ -894,7 +893,7 @@ public function get_site_id() {
 	 * @since 4.9.0
 	 *
 	 * @return bool[] List of capabilities keyed by the capability name,
-	 *                e.g. array( 'edit_posts' => true, 'delete_posts' => false ).
+	 *                e.g. `array( 'edit_posts' => true, 'delete_posts' => false )`.
 	 */
 	private function get_caps_data() {
 		$caps = get_user_meta( $this->ID, $this->cap_key, true );
diff --git a/src/wp-includes/class-wp-widget.php b/src/wp-includes/class-wp-widget.php
index 79a1efe1bf93f..f7557a0e3bb44 100644
--- a/src/wp-includes/class-wp-widget.php
+++ b/src/wp-includes/class-wp-widget.php
@@ -152,7 +152,7 @@ public function form( $instance ) {
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param string $id_base         Optional. Base ID for the widget, lowercase and unique. If left empty,
+	 * @param string $id_base         Base ID for the widget, lowercase and unique. If left empty,
 	 *                                a portion of the widget's PHP class name will be used. Has to be unique.
 	 * @param string $name            Name for the widget displayed on the configuration page.
 	 * @param array  $widget_options  Optional. Widget options. See wp_register_sidebar_widget() for
@@ -188,7 +188,7 @@ public function __construct( $id_base, $name, $widget_options = array(), $contro
 	 *
 	 * @see WP_Widget::__construct()
 	 *
-	 * @param string $id_base         Optional. Base ID for the widget, lowercase and unique. If left empty,
+	 * @param string $id_base         Base ID for the widget, lowercase and unique. If left empty,
 	 *                                a portion of the widget's PHP class name will be used. Has to be unique.
 	 * @param string $name            Name for the widget displayed on the configuration page.
 	 * @param array  $widget_options  Optional. Widget options. See wp_register_sidebar_widget() for
@@ -429,14 +429,14 @@ public function update_callback( $deprecated = 1 ) {
 			if ( isset( $wp_registered_widgets[ $del_id ]['params'][0]['number'] ) ) {
 				$number = $wp_registered_widgets[ $del_id ]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id ) {
+				if ( $this->id_base . '-' . $number === $del_id ) {
 					unset( $all_instances[ $number ] );
 				}
 			}
 		} else {
 			if ( isset( $_POST[ 'widget-' . $this->id_base ] ) && is_array( $_POST[ 'widget-' . $this->id_base ] ) ) {
 				$settings = $_POST[ 'widget-' . $this->id_base ];
-			} elseif ( isset( $_POST['id_base'] ) && $_POST['id_base'] == $this->id_base ) {
+			} elseif ( isset( $_POST['id_base'] ) && $_POST['id_base'] === $this->id_base ) {
 				$num      = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
 				$settings = array( $num => array() );
 			} else {
@@ -508,7 +508,7 @@ public function form_callback( $widget_args = 1 ) {
 		$widget_args   = wp_parse_args( $widget_args, array( 'number' => -1 ) );
 		$all_instances = $this->get_settings();
 
-		if ( -1 == $widget_args['number'] ) {
+		if ( -1 === $widget_args['number'] ) {
 			// We echo out a form where 'number' can be set later.
 			$this->_set( '__i__' );
 			$instance = array();
diff --git a/src/wp-includes/class-wp-xmlrpc-server.php b/src/wp-includes/class-wp-xmlrpc-server.php
index 9723488083a76..d1aec3693248f 100644
--- a/src/wp-includes/class-wp-xmlrpc-server.php
+++ b/src/wp-includes/class-wp-xmlrpc-server.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * XML-RPC protocol support for WordPress
+ * XML-RPC protocol support for WordPress.
  *
  * @package WordPress
  * @subpackage Publishing
@@ -60,9 +60,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Registers all of the XMLRPC methods that XMLRPC server understands.
 	 *
-	 * Sets up server and method property. Passes XMLRPC
-	 * methods through the {@see 'xmlrpc_methods'} filter to allow plugins to extend
-	 * or replace XML-RPC methods.
+	 * Sets up server and method property. Passes XMLRPC methods through the
+	 * {@see 'xmlrpc_methods'} filter to allow plugins to extend or replace
+	 * XML-RPC methods.
 	 *
 	 * @since 1.5.0
 	 */
@@ -137,8 +137,10 @@ public function __construct() {
 			'metaWeblog.getCategories'         => 'this:mw_getCategories',
 			'metaWeblog.newMediaObject'        => 'this:mw_newMediaObject',
 
-			// MetaWeblog API aliases for Blogger API.
-			// See http://www.xmlrpc.com/stories/storyReader$2460
+			/*
+			 * MetaWeblog API aliases for Blogger API.
+			 * See http://www.xmlrpc.com/stories/storyReader$2460
+			 */
 			'metaWeblog.deletePost'            => 'this:blogger_deletePost',
 			'metaWeblog.getUsersBlogs'         => 'this:blogger_getUsersBlogs',
 
@@ -177,9 +179,9 @@ public function __construct() {
 	}
 
 	/**
-	 * Set wp_xmlrpc_server::$is_enabled property.
+	 * Sets wp_xmlrpc_server::$is_enabled property.
 	 *
-	 * Determine whether the xmlrpc server is enabled on this WordPress install
+	 * Determines whether the xmlrpc server is enabled on this WordPress install
 	 * and set the is_enabled property accordingly.
 	 *
 	 * @since 5.7.3
@@ -198,8 +200,8 @@ private function set_is_enabled() {
 		 * Filters whether XML-RPC methods requiring authentication are enabled.
 		 *
 		 * Contrary to the way it's named, this filter does not control whether XML-RPC is *fully*
-		 * enabled, rather, it only controls whether XML-RPC methods requiring authentication - such
-		 * as for publishing purposes - are enabled.
+		 * enabled, rather, it only controls whether XML-RPC methods requiring authentication -
+		 * such as for publishing purposes - are enabled.
 		 *
 		 * Further, the filter does not control whether pingbacks or other custom endpoints that don't
 		 * require authentication are enabled. This behavior is expected, and due to how parity was matched
@@ -220,7 +222,7 @@ private function set_is_enabled() {
 	}
 
 	/**
-	 * Make private/protected methods readable for backward compatibility.
+	 * Makes private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
 	 *
@@ -245,7 +247,7 @@ public function serve_request() {
 	}
 
 	/**
-	 * Test XMLRPC API by saying, "Hello!" to client.
+	 * Tests XMLRPC API by saying, "Hello!" to client.
 	 *
 	 * @since 1.5.0
 	 *
@@ -256,7 +258,7 @@ public function sayHello() {
 	}
 
 	/**
-	 * Test XMLRPC API by adding two numbers for client.
+	 * Tests XMLRPC API by adding two numbers for client.
 	 *
 	 * @since 1.5.0
 	 *
@@ -275,13 +277,13 @@ public function addTwoNumbers( $args ) {
 	}
 
 	/**
-	 * Log user in.
+	 * Logs user in.
 	 *
 	 * @since 2.8.0
 	 *
 	 * @param string $username User's username.
 	 * @param string $password User's password.
-	 * @return WP_User|false WP_User object if authentication passed, false otherwise
+	 * @return WP_User|false WP_User object if authentication passed, false otherwise.
 	 */
 	public function login( $username, $password ) {
 		if ( ! $this->is_enabled ) {
@@ -318,7 +320,7 @@ public function login( $username, $password ) {
 	}
 
 	/**
-	 * Check user's credentials. Deprecated.
+	 * Checks user's credentials. Deprecated.
 	 *
 	 * @since 1.5.0
 	 * @deprecated 2.8.0 Use wp_xmlrpc_server::login()
@@ -333,7 +335,7 @@ public function login_pass_ok( $username, $password ) {
 	}
 
 	/**
-	 * Escape string or array of strings for database.
+	 * Escapes string or array of strings for database.
 	 *
 	 * @since 1.5.2
 	 *
@@ -356,9 +358,9 @@ public function escape( &$data ) {
 	}
 
 	/**
-	 * Send error response to client.
+	 * Sends error response to client.
 	 *
-	 * Send an XML error response to the client. If the endpoint is enabled
+	 * Sends an XML error response to the client. If the endpoint is enabled
 	 * an HTTP 200 response is always sent per the XML-RPC specification.
 	 *
 	 * @since 5.7.3
@@ -380,7 +382,7 @@ public function error( $error, $message = false ) {
 	}
 
 	/**
-	 * Retrieve custom fields for post.
+	 * Retrieves custom fields for post.
 	 *
 	 * @since 2.5.0
 	 *
@@ -409,7 +411,7 @@ public function get_custom_fields( $post_id ) {
 	}
 
 	/**
-	 * Set custom fields for post.
+	 * Sets custom fields for post.
 	 *
 	 * @since 2.5.0
 	 *
@@ -447,7 +449,7 @@ public function set_custom_fields( $post_id, $fields ) {
 	}
 
 	/**
-	 * Retrieve custom fields for a term.
+	 * Retrieves custom fields for a term.
 	 *
 	 * @since 4.9.0
 	 *
@@ -476,7 +478,7 @@ public function get_term_custom_fields( $term_id ) {
 	}
 
 	/**
-	 * Set custom fields for a term.
+	 * Sets custom fields for a term.
 	 *
 	 * @since 4.9.0
 	 *
@@ -509,7 +511,7 @@ public function set_term_custom_fields( $term_id, $fields ) {
 	}
 
 	/**
-	 * Set up blog options property.
+	 * Sets up blog options property.
 	 *
 	 * Passes property through {@see 'xmlrpc_blog_options'} filter.
 	 *
@@ -678,7 +680,7 @@ public function initialise_blog_option_info() {
 	}
 
 	/**
-	 * Retrieve the blogs of the user.
+	 * Retrieves the blogs of the user.
 	 *
 	 * @since 2.6.0
 	 *
@@ -868,7 +870,7 @@ protected function _prepare_term( $term ) {
 	}
 
 	/**
-	 * Convert a WordPress date string to an IXR_Date object.
+	 * Converts a WordPress date string to an IXR_Date object.
 	 *
 	 * @param string $date Date string to convert.
 	 * @return IXR_Date IXR_Date object.
@@ -881,7 +883,7 @@ protected function _convert_date( $date ) {
 	}
 
 	/**
-	 * Convert a WordPress GMT date string to an IXR_Date object.
+	 * Converts a WordPress GMT date string to an IXR_Date object.
 	 *
 	 * @param string $date_gmt WordPress GMT date string.
 	 * @param string $date     Date string.
@@ -1261,7 +1263,7 @@ protected function _prepare_user( $user, $fields ) {
 	}
 
 	/**
-	 * Create a new post for any registered post type.
+	 * Creates a new post for any registered post type.
 	 *
 	 * @since 3.4.0
 	 *
@@ -1361,8 +1363,8 @@ private function _is_greater_than_one( $count ) {
 	}
 
 	/**
-	 * Encapsulate the logic for sticking a post
-	 * and determining if the user has permission to do so
+	 * Encapsulates the logic for sticking a post and determining if
+	 * the user has permission to do so.
 	 *
 	 * @since 4.3.0
 	 *
@@ -1529,7 +1531,7 @@ protected function _insert_post( $user, $content_struct ) {
 		if ( ! isset( $post_data['ID'] ) ) {
 			$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
 		}
-		$post_ID = $post_data['ID'];
+		$post_id = $post_data['ID'];
 
 		if ( 'post' === $post_data['post_type'] ) {
 			$error = $this->_toggle_sticky( $post_data, $update );
@@ -1541,16 +1543,16 @@ protected function _insert_post( $user, $content_struct ) {
 		if ( isset( $post_data['post_thumbnail'] ) ) {
 			// Empty value deletes, non-empty value adds/updates.
 			if ( ! $post_data['post_thumbnail'] ) {
-				delete_post_thumbnail( $post_ID );
+				delete_post_thumbnail( $post_id );
 			} elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) ) {
 				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
 			}
-			set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
+			set_post_thumbnail( $post_id, $post_data['post_thumbnail'] );
 			unset( $content_struct['post_thumbnail'] );
 		}
 
 		if ( isset( $post_data['custom_fields'] ) ) {
-			$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+			$this->set_custom_fields( $post_id, $post_data['custom_fields'] );
 		}
 
 		if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
@@ -1656,7 +1658,7 @@ protected function _insert_post( $user, $content_struct ) {
 		}
 
 		if ( isset( $post_data['post_format'] ) ) {
-			$format = set_post_format( $post_ID, $post_data['post_format'] );
+			$format = set_post_format( $post_id, $post_data['post_format'] );
 
 			if ( is_wp_error( $format ) ) {
 				return new IXR_Error( 500, $format->get_error_message() );
@@ -1667,9 +1669,9 @@ protected function _insert_post( $user, $content_struct ) {
 
 		// Handle enclosures.
 		$enclosure = isset( $post_data['enclosure'] ) ? $post_data['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_ID, $enclosure );
+		$this->add_enclosure_if_new( $post_id, $enclosure );
 
-		$this->attach_uploads( $post_ID, $post_data['post_content'] );
+		$this->attach_uploads( $post_id, $post_data['post_content'] );
 
 		/**
 		 * Filters post data array to be inserted via XML-RPC.
@@ -1689,12 +1691,12 @@ static function ( $value ) {
 			}
 		);
 
-		$post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
-		if ( is_wp_error( $post_ID ) ) {
-			return new IXR_Error( 500, $post_ID->get_error_message() );
+		$post_id = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
+		if ( is_wp_error( $post_id ) ) {
+			return new IXR_Error( 500, $post_id->get_error_message() );
 		}
 
-		if ( ! $post_ID ) {
+		if ( ! $post_id ) {
 			if ( $update ) {
 				return new IXR_Error( 401, __( 'Sorry, the post could not be updated.' ) );
 			} else {
@@ -1702,11 +1704,11 @@ static function ( $value ) {
 			}
 		}
 
-		return (string) $post_ID;
+		return (string) $post_id;
 	}
 
 	/**
-	 * Edit a post for any registered post type.
+	 * Edits a post for any registered post type.
 	 *
 	 * The $content_struct parameter only needs to contain fields that
 	 * should be changed. All other fields will retain their existing values.
@@ -1792,7 +1794,7 @@ public function wp_editPost( $args ) {
 	}
 
 	/**
-	 * Delete a post for any registered post type.
+	 * Deletes a post for any registered post type.
 	 *
 	 * @since 3.4.0
 	 *
@@ -1846,7 +1848,7 @@ public function wp_deletePost( $args ) {
 	}
 
 	/**
-	 * Retrieve a post.
+	 * Retrieves a post.
 	 *
 	 * @since 3.4.0
 	 *
@@ -1909,11 +1911,12 @@ public function wp_getPost( $args ) {
 			$fields = $args[4];
 		} else {
 			/**
-			 * Filters the list of post query fields used by the given XML-RPC method.
+			 * Filters the default post query fields used by the given XML-RPC method.
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param array  $fields Array of post fields. Default array contains 'post', 'terms', and 'custom_fields'.
+			 * @param array  $fields An array of post fields to retrieve. By default,
+			 *                       contains 'post', 'terms', and 'custom_fields'.
 			 * @param string $method Method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
@@ -1941,7 +1944,7 @@ public function wp_getPost( $args ) {
 	}
 
 	/**
-	 * Retrieve posts.
+	 * Retrieves posts.
 	 *
 	 * @since 3.4.0
 	 *
@@ -1960,7 +1963,7 @@ public function wp_getPost( $args ) {
 	 *                     Default empty array.
 	 *     @type array  $4 Optional. The subset of post type fields to return in the response array.
 	 * }
-	 * @return array|IXR_Error Array contains a collection of posts.
+	 * @return array|IXR_Error Array containing a collection of posts.
 	 */
 	public function wp_getPosts( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) ) {
@@ -2050,7 +2053,7 @@ public function wp_getPosts( $args ) {
 	}
 
 	/**
-	 * Create a new term.
+	 * Creates a new term.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2153,7 +2156,7 @@ public function wp_newTerm( $args ) {
 	}
 
 	/**
-	 * Edit a term.
+	 * Edits a term.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2271,7 +2274,7 @@ public function wp_editTerm( $args ) {
 	}
 
 	/**
-	 * Delete a term.
+	 * Deletes a term.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2341,7 +2344,7 @@ public function wp_deleteTerm( $args ) {
 	}
 
 	/**
-	 * Retrieve a term.
+	 * Retrieves a term.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2411,7 +2414,7 @@ public function wp_getTerm( $args ) {
 	}
 
 	/**
-	 * Retrieve all terms for a taxonomy.
+	 * Retrieves all terms for a taxonomy.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2506,7 +2509,7 @@ public function wp_getTerms( $args ) {
 	}
 
 	/**
-	 * Retrieve a taxonomy.
+	 * Retrieves a taxonomy.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2540,11 +2543,12 @@ public function wp_getTaxonomy( $args ) {
 			$fields = $args[4];
 		} else {
 			/**
-			 * Filters the taxonomy query fields used by the given XML-RPC method.
+			 * Filters the default taxonomy query fields used by the given XML-RPC method.
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param array  $fields An array of taxonomy fields to retrieve.
+			 * @param array  $fields An array of taxonomy fields to retrieve. By default,
+			 *                       contains 'labels', 'cap', and 'object_type'.
 			 * @param string $method The method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
@@ -2572,7 +2576,7 @@ public function wp_getTaxonomy( $args ) {
 	}
 
 	/**
-	 * Retrieve all taxonomies.
+	 * Retrieves all taxonomies.
 	 *
 	 * @since 3.4.0
 	 *
@@ -2634,7 +2638,7 @@ public function wp_getTaxonomies( $args ) {
 	}
 
 	/**
-	 * Retrieve a user.
+	 * Retrieves a user.
 	 *
 	 * The optional $fields parameter specifies what fields will be included
 	 * in the response array. This should be a list of field names. 'user_id' will
@@ -2688,7 +2692,7 @@ public function wp_getUser( $args ) {
 			 *
 			 * @since 3.5.0
 			 *
-			 * @param array  $fields User query fields for given method. Default 'all'.
+			 * @param array  $fields An array of user fields to retrieve. By default, contains 'all'.
 			 * @param string $method The method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
@@ -2716,7 +2720,7 @@ public function wp_getUser( $args ) {
 	}
 
 	/**
-	 * Retrieve users.
+	 * Retrieves users.
 	 *
 	 * The optional $filter parameter modifies the query used to retrieve users.
 	 * Accepted keys are 'number' (default: 50), 'offset' (default: 0), 'role',
@@ -2806,7 +2810,7 @@ public function wp_getUsers( $args ) {
 	}
 
 	/**
-	 * Retrieve information about the requesting user.
+	 * Retrieves information about the requesting user.
 	 *
 	 * @uses get_userdata()
 	 *
@@ -2855,7 +2859,7 @@ public function wp_getProfile( $args ) {
 	}
 
 	/**
-	 * Edit user's profile.
+	 * Edits user's profile.
 	 *
 	 * @uses wp_update_user()
 	 *
@@ -2946,7 +2950,7 @@ public function wp_editProfile( $args ) {
 	}
 
 	/**
-	 * Retrieve page.
+	 * Retrieves a page.
 	 *
 	 * @since 2.2.0
 	 *
@@ -2994,7 +2998,7 @@ public function wp_getPage( $args ) {
 	}
 
 	/**
-	 * Retrieve Pages.
+	 * Retrieves Pages.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3053,7 +3057,7 @@ public function wp_getPages( $args ) {
 	}
 
 	/**
-	 * Create new page.
+	 * Creates a new page.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3090,7 +3094,7 @@ public function wp_newPage( $args ) {
 	}
 
 	/**
-	 * Delete page.
+	 * Deletes a page.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3119,8 +3123,10 @@ public function wp_deletePage( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deletePage', $args, $this );
 
-		// Get the current page based on the 'page_id' and
-		// make sure it is a page and not a post.
+		/*
+		 * Get the current page based on the 'page_id' and
+		 * make sure it is a page and not a post.
+		 */
 		$actual_page = get_post( $page_id, ARRAY_A );
 		if ( ! $actual_page || ( 'page' !== $actual_page['post_type'] ) ) {
 			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
@@ -3151,7 +3157,7 @@ public function wp_deletePage( $args ) {
 	}
 
 	/**
-	 * Edit page.
+	 * Edits a page.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3214,7 +3220,7 @@ public function wp_editPage( $args ) {
 	}
 
 	/**
-	 * Retrieve page list.
+	 * Retrieves page list.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3279,7 +3285,7 @@ public function wp_getPageList( $args ) {
 	}
 
 	/**
-	 * Retrieve authors list.
+	 * Retrieves authors list.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3323,7 +3329,7 @@ public function wp_getAuthors( $args ) {
 	}
 
 	/**
-	 * Get list of all tags
+	 * Gets the list of all tags.
 	 *
 	 * @since 2.7.0
 	 *
@@ -3375,7 +3381,7 @@ public function wp_getTags( $args ) {
 	}
 
 	/**
-	 * Create new category.
+	 * Creates a new category.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3409,14 +3415,18 @@ public function wp_newCategory( $args ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a category.' ) );
 		}
 
-		// If no slug was provided, make it empty
-		// so that WordPress will generate one.
+		/*
+		 * If no slug was provided, make it empty
+		 * so that WordPress will generate one.
+		 */
 		if ( empty( $category['slug'] ) ) {
 			$category['slug'] = '';
 		}
 
-		// If no parent_id was provided, make it empty
-		// so that it will be a top-level page (no parent).
+		/*
+		 * If no parent_id was provided, make it empty
+		 * so that it will be a top-level page (no parent).
+		 */
 		if ( ! isset( $category['parent_id'] ) ) {
 			$category['parent_id'] = '';
 		}
@@ -3458,7 +3468,7 @@ public function wp_newCategory( $args ) {
 	}
 
 	/**
-	 * Remove category.
+	 * Deletes a category.
 	 *
 	 * @since 2.5.0
 	 *
@@ -3509,7 +3519,7 @@ public function wp_deleteCategory( $args ) {
 	}
 
 	/**
-	 * Retrieve category list.
+	 * Retrieves category list.
 	 *
 	 * @since 2.2.0
 	 *
@@ -3561,7 +3571,7 @@ public function wp_suggestCategories( $args ) {
 	}
 
 	/**
-	 * Retrieve comment.
+	 * Retrieves a comment.
 	 *
 	 * @since 2.7.0
 	 *
@@ -3603,18 +3613,19 @@ public function wp_getComment( $args ) {
 	}
 
 	/**
-	 * Retrieve comments.
+	 * Retrieves comments.
 	 *
-	 * Besides the common blog_id (unused), username, and password arguments, it takes a filter
-	 * array as last argument.
+	 * Besides the common blog_id (unused), username, and password arguments,
+	 * it takes a filter array as the last argument.
 	 *
 	 * Accepted 'filter' keys are 'status', 'post_id', 'offset', and 'number'.
 	 *
 	 * The defaults are as follows:
-	 * - 'status' - Default is ''. Filter by status (e.g., 'approve', 'hold')
-	 * - 'post_id' - Default is ''. The post where the comment is posted. Empty string shows all comments.
-	 * - 'number' - Default is 10. Total number of media items to retrieve.
-	 * - 'offset' - Default is 0. See WP_Query::query() for more.
+	 * - 'status'  - Default is ''. Filter by status (e.g., 'approve', 'hold')
+	 * - 'post_id' - Default is ''. The post where the comment is posted.
+	 *               Empty string shows all comments.
+	 * - 'number'  - Default is 10. Total number of media items to retrieve.
+	 * - 'offset'  - Default is 0. See WP_Query::query() for more.
 	 *
 	 * @since 2.7.0
 	 *
@@ -3626,7 +3637,9 @@ public function wp_getComment( $args ) {
 	 *     @type string $2 Password.
 	 *     @type array  $3 Optional. Query arguments.
 	 * }
-	 * @return array|IXR_Error Contains a collection of comments. See wp_xmlrpc_server::wp_getComment() for a description of each item contents
+	 * @return array|IXR_Error Array containing a collection of comments.
+	 *                         See wp_xmlrpc_server::wp_getComment() for a description
+	 *                         of each item contents.
 	 */
 	public function wp_getComments( $args ) {
 		$this->escape( $args );
@@ -3698,7 +3711,7 @@ public function wp_getComments( $args ) {
 	}
 
 	/**
-	 * Delete a comment.
+	 * Deletes a comment.
 	 *
 	 * By default, the comment will be moved to the Trash instead of deleted.
 	 * See wp_delete_comment() for more information on this behavior.
@@ -3720,25 +3733,25 @@ public function wp_deleteComment( $args ) {
 
 		$username   = $args[1];
 		$password   = $args[2];
-		$comment_ID = (int) $args[3];
+		$comment_id = (int) $args[3];
 
 		$user = $this->login( $username, $password );
 		if ( ! $user ) {
 			return $this->error;
 		}
 
-		if ( ! get_comment( $comment_ID ) ) {
+		if ( ! get_comment( $comment_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to delete this comment.' ) );
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteComment', $args, $this );
 
-		$status = wp_delete_comment( $comment_ID );
+		$status = wp_delete_comment( $comment_id );
 
 		if ( $status ) {
 			/**
@@ -3746,20 +3759,20 @@ public function wp_deleteComment( $args ) {
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param int   $comment_ID ID of the deleted comment.
+			 * @param int   $comment_id ID of the deleted comment.
 			 * @param array $args       An array of arguments to delete the comment.
 			 */
-			do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+			do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 		}
 
 		return $status;
 	}
 
 	/**
-	 * Edit comment.
+	 * Edits a comment.
 	 *
-	 * Besides the common blog_id (unused), username, and password arguments, it takes a
-	 * comment_id integer and a content_struct array as last argument.
+	 * Besides the common blog_id (unused), username, and password arguments,
+	 * it takes a comment_id integer and a content_struct array as the last argument.
 	 *
 	 * The allowed keys in the content_struct array are:
 	 *  - 'author'
@@ -3767,7 +3780,7 @@ public function wp_deleteComment( $args ) {
 	 *  - 'author_email'
 	 *  - 'content'
 	 *  - 'date_created_gmt'
-	 *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See get_comment_statuses() for more details
+	 *  - 'status'. Common statuses are 'approve', 'hold', 'spam'. See get_comment_statuses() for more details.
 	 *
 	 * @since 2.7.0
 	 *
@@ -3787,7 +3800,7 @@ public function wp_editComment( $args ) {
 
 		$username       = $args[1];
 		$password       = $args[2];
-		$comment_ID     = (int) $args[3];
+		$comment_id     = (int) $args[3];
 		$content_struct = $args[4];
 
 		$user = $this->login( $username, $password );
@@ -3795,18 +3808,18 @@ public function wp_editComment( $args ) {
 			return $this->error;
 		}
 
-		if ( ! get_comment( $comment_ID ) ) {
+		if ( ! get_comment( $comment_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid comment ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_comment', $comment_ID ) ) {
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to moderate or edit this comment.' ) );
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editComment', $args, $this );
 		$comment = array(
-			'comment_ID' => $comment_ID,
+			'comment_ID' => $comment_id,
 		);
 
 		if ( isset( $content_struct['status'] ) ) {
@@ -3858,16 +3871,16 @@ public function wp_editComment( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $comment_ID ID of the updated comment.
+		 * @param int   $comment_id ID of the updated comment.
 		 * @param array $args       An array of arguments to update the comment.
 		 */
-		do_action( 'xmlrpc_call_success_wp_editComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_wp_editComment', $comment_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
 		return true;
 	}
 
 	/**
-	 * Create new comment.
+	 * Creates a new comment.
 	 *
 	 * @since 2.7.0
 	 *
@@ -3999,12 +4012,12 @@ public function wp_newComment( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newComment', $args, $this );
 
-		$comment_ID = wp_new_comment( $comment, true );
-		if ( is_wp_error( $comment_ID ) ) {
-			return new IXR_Error( 403, $comment_ID->get_error_message() );
+		$comment_id = wp_new_comment( $comment, true );
+		if ( is_wp_error( $comment_id ) ) {
+			return new IXR_Error( 403, $comment_id->get_error_message() );
 		}
 
-		if ( ! $comment_ID ) {
+		if ( ! $comment_id ) {
 			return new IXR_Error( 403, __( 'Something went wrong.' ) );
 		}
 
@@ -4013,16 +4026,16 @@ public function wp_newComment( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $comment_ID ID of the new comment.
+		 * @param int   $comment_id ID of the new comment.
 		 * @param array $args       An array of new comment arguments.
 		 */
-		do_action( 'xmlrpc_call_success_wp_newComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_wp_newComment', $comment_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
-		return $comment_ID;
+		return $comment_id;
 	}
 
 	/**
-	 * Retrieve all of the comment status.
+	 * Retrieves all of the comment status.
 	 *
 	 * @since 2.7.0
 	 *
@@ -4057,7 +4070,7 @@ public function wp_getCommentStatusList( $args ) {
 	}
 
 	/**
-	 * Retrieve comment count.
+	 * Retrieves comment counts.
 	 *
 	 * @since 2.5.0
 	 *
@@ -4106,7 +4119,7 @@ public function wp_getCommentCount( $args ) {
 	}
 
 	/**
-	 * Retrieve post statuses.
+	 * Retrieves post statuses.
 	 *
 	 * @since 2.5.0
 	 *
@@ -4141,7 +4154,7 @@ public function wp_getPostStatusList( $args ) {
 	}
 
 	/**
-	 * Retrieve page statuses.
+	 * Retrieves page statuses.
 	 *
 	 * @since 2.5.0
 	 *
@@ -4176,7 +4189,7 @@ public function wp_getPageStatusList( $args ) {
 	}
 
 	/**
-	 * Retrieve page templates.
+	 * Retrieves page templates.
 	 *
 	 * @since 2.6.0
 	 *
@@ -4211,7 +4224,7 @@ public function wp_getPageTemplates( $args ) {
 	}
 
 	/**
-	 * Retrieve blog options.
+	 * Retrieves blog options.
 	 *
 	 * @since 2.6.0
 	 *
@@ -4238,7 +4251,7 @@ public function wp_getOptions( $args ) {
 		}
 
 		// If no specific options where asked for, return all of them.
-		if ( count( $options ) == 0 ) {
+		if ( count( $options ) === 0 ) {
 			$options = array_keys( $this->blog_options );
 		}
 
@@ -4246,7 +4259,7 @@ public function wp_getOptions( $args ) {
 	}
 
 	/**
-	 * Retrieve blog options value from list.
+	 * Retrieves blog options value from list.
 	 *
 	 * @since 2.6.0
 	 *
@@ -4275,7 +4288,7 @@ public function _getOptions( $options ) {
 	}
 
 	/**
-	 * Update blog options.
+	 * Updates blog options.
 	 *
 	 * @since 2.6.0
 	 *
@@ -4324,7 +4337,7 @@ public function wp_setOptions( $args ) {
 	}
 
 	/**
-	 * Retrieve a media item by ID
+	 * Retrieves a media item by ID.
 	 *
 	 * @since 3.1.0
 	 *
@@ -4374,17 +4387,18 @@ public function wp_getMediaItem( $args ) {
 	}
 
 	/**
-	 * Retrieves a collection of media library items (or attachments)
+	 * Retrieves a collection of media library items (or attachments).
 	 *
-	 * Besides the common blog_id (unused), username, and password arguments, it takes a filter
-	 * array as last argument.
+	 * Besides the common blog_id (unused), username, and password arguments,
+	 * it takes a filter array as the last argument.
 	 *
 	 * Accepted 'filter' keys are 'parent_id', 'mime_type', 'offset', and 'number'.
 	 *
 	 * The defaults are as follows:
-	 * - 'number' - Default is 5. Total number of media items to retrieve.
-	 * - 'offset' - Default is 0. See WP_Query::query() for more.
-	 * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
+	 * - 'number'    - Default is 5. Total number of media items to retrieve.
+	 * - 'offset'    - Default is 0. See WP_Query::query() for more.
+	 * - 'parent_id' - Default is ''. The post where the media item is attached.
+	 *                 Empty string shows all media items. 0 shows unattached media items.
 	 * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
 	 *
 	 * @since 3.1.0
@@ -4395,9 +4409,11 @@ public function wp_getMediaItem( $args ) {
 	 *     @type int    $0 Blog ID (unused).
 	 *     @type string $1 Username.
 	 *     @type string $2 Password.
-	 *     @type array  $3 Query arguments.
+	 *     @type array  $3 Optional. Query arguments.
 	 * }
-	 * @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
+	 * @return array|IXR_Error Array containing a collection of media items.
+	 *                         See wp_xmlrpc_server::wp_getMediaItem() for a description
+	 *                         of each item contents.
 	 */
 	public function wp_getMediaLibrary( $args ) {
 		$this->escape( $args );
@@ -4495,7 +4511,7 @@ public function wp_getPostFormats( $args ) {
 	}
 
 	/**
-	 * Retrieves a post type
+	 * Retrieves a post type.
 	 *
 	 * @since 3.4.0
 	 *
@@ -4536,11 +4552,12 @@ public function wp_getPostType( $args ) {
 			$fields = $args[4];
 		} else {
 			/**
-			 * Filters the default query fields used by the given XML-RPC method.
+			 * Filters the default post type query fields used by the given XML-RPC method.
 			 *
 			 * @since 3.4.0
 			 *
-			 * @param array  $fields An array of post type query fields for the given method.
+			 * @param array  $fields An array of post type fields to retrieve. By default,
+			 *                       contains 'labels', 'cap', and 'taxonomies'.
 			 * @param string $method The method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
@@ -4568,7 +4585,7 @@ public function wp_getPostType( $args ) {
 	}
 
 	/**
-	 * Retrieves a post types
+	 * Retrieves post types.
 	 *
 	 * @since 3.4.0
 	 *
@@ -4627,7 +4644,7 @@ public function wp_getPostTypes( $args ) {
 	}
 
 	/**
-	 * Retrieve revisions for a specific post.
+	 * Retrieves revisions for a specific post.
 	 *
 	 * @since 3.5.0
 	 *
@@ -4646,7 +4663,7 @@ public function wp_getPostTypes( $args ) {
 	 *     @type int    $3 Post ID.
 	 *     @type array  $4 Optional. Fields to fetch.
 	 * }
-	 * @return array|IXR_Error contains a collection of posts.
+	 * @return array|IXR_Error Array containing a collection of posts.
 	 */
 	public function wp_getRevisions( $args ) {
 		if ( ! $this->minimum_args( $args, 4 ) ) {
@@ -4667,7 +4684,8 @@ public function wp_getRevisions( $args ) {
 			 *
 			 * @since 3.5.0
 			 *
-			 * @param array  $field  An array of revision query fields.
+			 * @param array  $field  An array of revision fields to retrieve. By default,
+			 *                       contains 'post_date' and 'post_date_gmt'.
 			 * @param string $method The method name.
 			 */
 			$fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
@@ -4720,7 +4738,7 @@ public function wp_getRevisions( $args ) {
 	}
 
 	/**
-	 * Restore a post revision
+	 * Restores a post revision.
 	 *
 	 * @since 3.5.0
 	 *
@@ -4789,7 +4807,7 @@ public function wp_restoreRevision( $args ) {
 	 */
 
 	/**
-	 * Retrieve blogs that user owns.
+	 * Retrieves blogs that user owns.
 	 *
 	 * Will make more sense once we support multiple blogs.
 	 *
@@ -4840,7 +4858,7 @@ public function blogger_getUsersBlogs( $args ) {
 	}
 
 	/**
-	 * Private function for retrieving a users blogs for multisite setups
+	 * Private function for retrieving a users blogs for multisite setups.
 	 *
 	 * @since 3.0.0
 	 *
@@ -4868,7 +4886,7 @@ protected function _multisite_getUsersBlogs( $args ) {
 			return $blogs;
 		} else {
 			foreach ( (array) $blogs as $blog ) {
-				if ( strpos( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
+				if ( str_contains( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
 					return array( $blog );
 				}
 			}
@@ -4877,7 +4895,7 @@ protected function _multisite_getUsersBlogs( $args ) {
 	}
 
 	/**
-	 * Retrieve user's data.
+	 * Retrieves user's data.
 	 *
 	 * Gives your client some info about you, so you don't have to.
 	 *
@@ -4922,7 +4940,7 @@ public function blogger_getUserInfo( $args ) {
 	}
 
 	/**
-	 * Retrieve post.
+	 * Retrieves a post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -4939,7 +4957,7 @@ public function blogger_getUserInfo( $args ) {
 	public function blogger_getPost( $args ) {
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[1];
+		$post_id  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 
@@ -4948,19 +4966,19 @@ public function blogger_getPost( $args ) {
 			return $this->error;
 		}
 
-		$post_data = get_post( $post_ID, ARRAY_A );
+		$post_data = get_post( $post_id, ARRAY_A );
 		if ( ! $post_data ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getPost', $args, $this );
 
-		$categories = implode( ',', wp_get_post_categories( $post_ID ) );
+		$categories = implode( ',', wp_get_post_categories( $post_id ) );
 
 		$content  = '<title>' . wp_unslash( $post_data['post_title'] ) . '</title>';
 		$content .= '<category>' . $categories . '</category>';
@@ -4977,7 +4995,7 @@ public function blogger_getPost( $args ) {
 	}
 
 	/**
-	 * Retrieve list of recent posts.
+	 * Retrieves the list of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
@@ -5075,7 +5093,7 @@ public function blogger_setTemplate( $args ) {
 	}
 
 	/**
-	 * Creates new post.
+	 * Creates a new post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -5125,32 +5143,32 @@ public function blogger_newPost( $args ) {
 
 		$post_data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status' );
 
-		$post_ID = wp_insert_post( $post_data );
-		if ( is_wp_error( $post_ID ) ) {
-			return new IXR_Error( 500, $post_ID->get_error_message() );
+		$post_id = wp_insert_post( $post_data );
+		if ( is_wp_error( $post_id ) ) {
+			return new IXR_Error( 500, $post_id->get_error_message() );
 		}
 
-		if ( ! $post_ID ) {
+		if ( ! $post_id ) {
 			return new IXR_Error( 500, __( 'Sorry, the post could not be created.' ) );
 		}
 
-		$this->attach_uploads( $post_ID, $post_content );
+		$this->attach_uploads( $post_id, $post_content );
 
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC Blogger API.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $post_ID ID of the new post.
+		 * @param int   $post_id ID of the new post.
 		 * @param array $args    An array of new post arguments.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_blogger_newPost', $post_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
-		return $post_ID;
+		return $post_id;
 	}
 
 	/**
-	 * Edit a post.
+	 * Edits a post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -5170,7 +5188,7 @@ public function blogger_editPost( $args ) {
 
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[1];
+		$post_id  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 		$content  = $args[4];
@@ -5184,7 +5202,7 @@ public function blogger_editPost( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.editPost', $args, $this );
 
-		$actual_post = get_post( $post_ID, ARRAY_A );
+		$actual_post = get_post( $post_id, ARRAY_A );
 
 		if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
@@ -5192,7 +5210,7 @@ public function blogger_editPost( $args ) {
 
 		$this->escape( $actual_post );
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 		if ( 'publish' === $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
@@ -5220,16 +5238,16 @@ public function blogger_editPost( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $post_ID ID of the updated post.
+		 * @param int   $post_id ID of the updated post.
 		 * @param array $args    An array of arguments for the post to edit.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_editPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_blogger_editPost', $post_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
 		return true;
 	}
 
 	/**
-	 * Remove a post.
+	 * Deletes a post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -5246,7 +5264,7 @@ public function blogger_editPost( $args ) {
 	public function blogger_deletePost( $args ) {
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[1];
+		$post_id  = (int) $args[1];
 		$username = $args[2];
 		$password = $args[3];
 
@@ -5258,17 +5276,17 @@ public function blogger_deletePost( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.deletePost', $args, $this );
 
-		$actual_post = get_post( $post_ID, ARRAY_A );
+		$actual_post = get_post( $post_id, ARRAY_A );
 
 		if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		}
 
-		if ( ! current_user_can( 'delete_post', $post_ID ) ) {
+		if ( ! current_user_can( 'delete_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this post.' ) );
 		}
 
-		$result = wp_delete_post( $post_ID );
+		$result = wp_delete_post( $post_id );
 
 		if ( ! $result ) {
 			return new IXR_Error( 500, __( 'Sorry, the post could not be deleted.' ) );
@@ -5279,10 +5297,10 @@ public function blogger_deletePost( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $post_ID ID of the deleted post.
+		 * @param int   $post_id ID of the deleted post.
 		 * @param array $args    An array of arguments to delete the post.
 		 */
-		do_action( 'xmlrpc_call_success_blogger_deletePost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_blogger_deletePost', $post_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
 		return true;
 	}
@@ -5293,7 +5311,7 @@ public function blogger_deletePost( $args ) {
 	 */
 
 	/**
-	 * Create a new post.
+	 * Creates a new post.
 	 *
 	 * The 'content_struct' argument must contain:
 	 *  - title
@@ -5577,8 +5595,8 @@ public function mw_newPost( $args ) {
 
 		$postdata = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template' );
 
-		$post_ID        = get_default_post_to_edit( $post_type, true )->ID;
-		$postdata['ID'] = $post_ID;
+		$post_id        = get_default_post_to_edit( $post_type, true )->ID;
+		$postdata['ID'] = $post_id;
 
 		// Only posts can be sticky.
 		if ( 'post' === $post_type && isset( $content_struct['sticky'] ) ) {
@@ -5591,11 +5609,11 @@ public function mw_newPost( $args ) {
 		}
 
 		if ( isset( $content_struct['custom_fields'] ) ) {
-			$this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+			$this->set_custom_fields( $post_id, $content_struct['custom_fields'] );
 		}
 
 		if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
-			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
+			if ( set_post_thumbnail( $post_id, $content_struct['wp_post_thumbnail'] ) === false ) {
 				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
 			}
 
@@ -5604,22 +5622,24 @@ public function mw_newPost( $args ) {
 
 		// Handle enclosures.
 		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_ID, $thisEnclosure );
+		$this->add_enclosure_if_new( $post_id, $thisEnclosure );
 
-		$this->attach_uploads( $post_ID, $post_content );
+		$this->attach_uploads( $post_id, $post_content );
 
-		// Handle post formats if assigned, value is validated earlier
-		// in this function.
+		/*
+		 * Handle post formats if assigned, value is validated earlier
+		 * in this function.
+		 */
 		if ( isset( $content_struct['wp_post_format'] ) ) {
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+			set_post_format( $post_id, $content_struct['wp_post_format'] );
 		}
 
-		$post_ID = wp_insert_post( $postdata, true );
-		if ( is_wp_error( $post_ID ) ) {
-			return new IXR_Error( 500, $post_ID->get_error_message() );
+		$post_id = wp_insert_post( $postdata, true );
+		if ( is_wp_error( $post_id ) ) {
+			return new IXR_Error( 500, $post_id->get_error_message() );
 		}
 
-		if ( ! $post_ID ) {
+		if ( ! $post_id ) {
 			return new IXR_Error( 500, __( 'Sorry, the post could not be created.' ) );
 		}
 
@@ -5628,12 +5648,12 @@ public function mw_newPost( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $post_ID ID of the new post.
+		 * @param int   $post_id ID of the new post.
 		 * @param array $args    An array of arguments to create the new post.
 		 */
-		do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_mw_newPost', $post_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
-		return (string) $post_ID;
+		return (string) $post_id;
 	}
 
 	/**
@@ -5641,55 +5661,55 @@ public function mw_newPost( $args ) {
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param int   $post_ID   Post ID.
+	 * @param int   $post_id   Post ID.
 	 * @param array $enclosure Enclosure data.
 	 */
-	public function add_enclosure_if_new( $post_ID, $enclosure ) {
+	public function add_enclosure_if_new( $post_id, $enclosure ) {
 		if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
 			$encstring  = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
 			$found      = false;
-			$enclosures = get_post_meta( $post_ID, 'enclosure' );
+			$enclosures = get_post_meta( $post_id, 'enclosure' );
 			if ( $enclosures ) {
 				foreach ( $enclosures as $enc ) {
 					// This method used to omit the trailing new line. #23219
-					if ( rtrim( $enc, "\n" ) == rtrim( $encstring, "\n" ) ) {
+					if ( rtrim( $enc, "\n" ) === rtrim( $encstring, "\n" ) ) {
 						$found = true;
 						break;
 					}
 				}
 			}
 			if ( ! $found ) {
-				add_post_meta( $post_ID, 'enclosure', $encstring );
+				add_post_meta( $post_id, 'enclosure', $encstring );
 			}
 		}
 	}
 
 	/**
-	 * Attach upload to a post.
+	 * Attaches an upload to a post.
 	 *
 	 * @since 2.1.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int    $post_ID      Post ID.
+	 * @param int    $post_id      Post ID.
 	 * @param string $post_content Post Content for attachment.
 	 */
-	public function attach_uploads( $post_ID, $post_content ) {
+	public function attach_uploads( $post_id, $post_content ) {
 		global $wpdb;
 
 		// Find any unattached files.
 		$attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
 		if ( is_array( $attachments ) ) {
 			foreach ( $attachments as $file ) {
-				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
-					$wpdb->update( $wpdb->posts, array( 'post_parent' => $post_ID ), array( 'ID' => $file->ID ) );
+				if ( ! empty( $file->guid ) && str_contains( $post_content, $file->guid ) ) {
+					$wpdb->update( $wpdb->posts, array( 'post_parent' => $post_id ), array( 'ID' => $file->ID ) );
 				}
 			}
 		}
 	}
 
 	/**
-	 * Edit a post.
+	 * Edits a post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -5707,7 +5727,7 @@ public function attach_uploads( $post_ID, $post_content ) {
 	public function mw_editPost( $args ) {
 		$this->escape( $args );
 
-		$post_ID        = (int) $args[0];
+		$post_id        = (int) $args[0];
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
@@ -5721,7 +5741,7 @@ public function mw_editPost( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.editPost', $args, $this );
 
-		$postdata = get_post( $post_ID, ARRAY_A );
+		$postdata = get_post( $post_id, ARRAY_A );
 
 		/*
 		 * If there is no post data for the give post ID, stop now and return an error.
@@ -5731,7 +5751,7 @@ public function mw_editPost( $args ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 
@@ -5980,16 +6000,16 @@ public function mw_editPost( $args ) {
 		}
 
 		if ( isset( $content_struct['custom_fields'] ) ) {
-			$this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+			$this->set_custom_fields( $post_id, $content_struct['custom_fields'] );
 		}
 
 		if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
 
 			// Empty value deletes, non-empty value adds/updates.
 			if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
-				delete_post_thumbnail( $post_ID );
+				delete_post_thumbnail( $post_id );
 			} else {
-				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
+				if ( set_post_thumbnail( $post_id, $content_struct['wp_post_thumbnail'] ) === false ) {
 					return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
 				}
 			}
@@ -5998,13 +6018,13 @@ public function mw_editPost( $args ) {
 
 		// Handle enclosures.
 		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new( $post_ID, $thisEnclosure );
+		$this->add_enclosure_if_new( $post_id, $thisEnclosure );
 
 		$this->attach_uploads( $ID, $post_content );
 
 		// Handle post formats if assigned, validation is handled earlier in this function.
 		if ( isset( $content_struct['wp_post_format'] ) ) {
-			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+			set_post_format( $post_id, $content_struct['wp_post_format'] );
 		}
 
 		/**
@@ -6012,16 +6032,16 @@ public function mw_editPost( $args ) {
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param int   $post_ID ID of the updated post.
+		 * @param int   $post_id ID of the updated post.
 		 * @param array $args    An array of arguments to update the post.
 		 */
-		do_action( 'xmlrpc_call_success_mw_editPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+		do_action( 'xmlrpc_call_success_mw_editPost', $post_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 
 		return true;
 	}
 
 	/**
-	 * Retrieve post.
+	 * Retrieves a post.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6037,7 +6057,7 @@ public function mw_editPost( $args ) {
 	public function mw_getPost( $args ) {
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[0];
+		$post_id  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
@@ -6046,12 +6066,12 @@ public function mw_getPost( $args ) {
 			return $this->error;
 		}
 
-		$postdata = get_post( $post_ID, ARRAY_A );
+		$postdata = get_post( $post_id, ARRAY_A );
 		if ( ! $postdata ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 
@@ -6065,13 +6085,13 @@ public function mw_getPost( $args ) {
 			$post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
 
 			$categories = array();
-			$catids     = wp_get_post_categories( $post_ID );
+			$catids     = wp_get_post_categories( $post_id );
 			foreach ( $catids as $catid ) {
 				$categories[] = get_cat_name( $catid );
 			}
 
 			$tagnames = array();
-			$tags     = wp_get_post_tags( $post_ID );
+			$tags     = wp_get_post_tags( $post_id );
 			if ( ! empty( $tags ) ) {
 				foreach ( $tags as $tag ) {
 					$tagnames[] = $tag->name;
@@ -6096,18 +6116,18 @@ public function mw_getPost( $args ) {
 			}
 
 			// Get post format.
-			$post_format = get_post_format( $post_ID );
+			$post_format = get_post_format( $post_id );
 			if ( empty( $post_format ) ) {
 				$post_format = 'standard';
 			}
 
 			$sticky = false;
-			if ( is_sticky( $post_ID ) ) {
+			if ( is_sticky( $post_id ) ) {
 				$sticky = true;
 			}
 
 			$enclosure = array();
-			foreach ( (array) get_post_custom( $post_ID ) as $key => $val ) {
+			foreach ( (array) get_post_custom( $post_id ) as $key => $val ) {
 				if ( 'enclosure' === $key ) {
 					foreach ( (array) $val as $enc ) {
 						$encdata             = explode( "\n", $enc );
@@ -6142,7 +6162,7 @@ public function mw_getPost( $args ) {
 				'wp_author_display_name' => $author->display_name,
 				'date_created_gmt'       => $post_date_gmt,
 				'post_status'            => $postdata['post_status'],
-				'custom_fields'          => $this->get_custom_fields( $post_ID ),
+				'custom_fields'          => $this->get_custom_fields( $post_id ),
 				'wp_post_format'         => $post_format,
 				'sticky'                 => $sticky,
 				'date_modified'          => $post_modified,
@@ -6162,7 +6182,7 @@ public function mw_getPost( $args ) {
 	}
 
 	/**
-	 * Retrieve list of recent posts.
+	 * Retrieves list of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6289,7 +6309,7 @@ public function mw_getRecentPosts( $args ) {
 	}
 
 	/**
-	 * Retrieve the list of categories on a given blog.
+	 * Retrieves the list of categories on a given blog.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6463,11 +6483,11 @@ public function mw_newMediaObject( $args ) {
 
 	/*
 	 * MovableType API functions.
-	 * Specs on http://www.movabletype.org/docs/mtmanual_programmatic.html
+	 * Specs archive on http://web.archive.org/web/20050220091302/http://www.movabletype.org:80/docs/mtmanual_programmatic.html
 	 */
 
 	/**
-	 * Retrieve the post titles of recent posts.
+	 * Retrieves the post titles of recent posts.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6531,7 +6551,7 @@ public function mt_getRecentPostTitles( $args ) {
 	}
 
 	/**
-	 * Retrieve list of all categories on blog.
+	 * Retrieves the list of all categories on a blog.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6584,7 +6604,7 @@ public function mt_getCategoryList( $args ) {
 	}
 
 	/**
-	 * Retrieve post categories.
+	 * Retrieves post categories.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6600,7 +6620,7 @@ public function mt_getCategoryList( $args ) {
 	public function mt_getPostCategories( $args ) {
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[0];
+		$post_id  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
@@ -6609,11 +6629,11 @@ public function mt_getPostCategories( $args ) {
 			return $this->error;
 		}
 
-		if ( ! get_post( $post_ID ) ) {
+		if ( ! get_post( $post_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 
@@ -6621,7 +6641,7 @@ public function mt_getPostCategories( $args ) {
 		do_action( 'xmlrpc_call', 'mt.getPostCategories', $args, $this );
 
 		$categories = array();
-		$catids     = wp_get_post_categories( (int) $post_ID );
+		$catids     = wp_get_post_categories( (int) $post_id );
 		// First listed category will be the primary category.
 		$isPrimary = true;
 		foreach ( $catids as $catid ) {
@@ -6654,7 +6674,7 @@ public function mt_getPostCategories( $args ) {
 	public function mt_setPostCategories( $args ) {
 		$this->escape( $args );
 
-		$post_ID    = (int) $args[0];
+		$post_id    = (int) $args[0];
 		$username   = $args[1];
 		$password   = $args[2];
 		$categories = $args[3];
@@ -6667,11 +6687,11 @@ public function mt_setPostCategories( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.setPostCategories', $args, $this );
 
-		if ( ! get_post( $post_ID ) ) {
+		if ( ! get_post( $post_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 
@@ -6680,13 +6700,13 @@ public function mt_setPostCategories( $args ) {
 			$catids[] = $cat['categoryId'];
 		}
 
-		wp_set_post_categories( $post_ID, $catids );
+		wp_set_post_categories( $post_id, $catids );
 
 		return true;
 	}
 
 	/**
-	 * Retrieve an array of methods supported by this server.
+	 * Retrieves an array of methods supported by this server.
 	 *
 	 * @since 1.5.0
 	 *
@@ -6700,7 +6720,7 @@ public function mt_supportedMethods() {
 	}
 
 	/**
-	 * Retrieve an empty array because we don't support per-post text filters.
+	 * Retrieves an empty array because we don't support per-post text filters.
 	 *
 	 * @since 1.5.0
 	 */
@@ -6719,28 +6739,28 @@ public function mt_supportedTextFilters() {
 	}
 
 	/**
-	 * Retrieve trackbacks sent to a given post.
+	 * Retrieves trackbacks sent to a given post.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int $post_ID
+	 * @param int $post_id
 	 * @return array|IXR_Error
 	 */
-	public function mt_getTrackbackPings( $post_ID ) {
+	public function mt_getTrackbackPings( $post_id ) {
 		global $wpdb;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
-		do_action( 'xmlrpc_call', 'mt.getTrackbackPings', $post_ID, $this );
+		do_action( 'xmlrpc_call', 'mt.getTrackbackPings', $post_id, $this );
 
-		$actual_post = get_post( $post_ID, ARRAY_A );
+		$actual_post = get_post( $post_id, ARRAY_A );
 
 		if ( ! $actual_post ) {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		}
 
-		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID ) );
+		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ) );
 
 		if ( ! $comments ) {
 			return array();
@@ -6779,7 +6799,7 @@ public function mt_getTrackbackPings( $post_ID ) {
 	public function mt_publishPost( $args ) {
 		$this->escape( $args );
 
-		$post_ID  = (int) $args[0];
+		$post_id  = (int) $args[0];
 		$username = $args[1];
 		$password = $args[2];
 
@@ -6791,19 +6811,19 @@ public function mt_publishPost( $args ) {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.publishPost', $args, $this );
 
-		$postdata = get_post( $post_ID, ARRAY_A );
+		$postdata = get_post( $post_id, ARRAY_A );
 		if ( ! $postdata ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
 		}
 
-		if ( ! current_user_can( 'publish_posts' ) || ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! current_user_can( 'publish_posts' ) || ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
 		}
 
 		$postdata['post_status'] = 'publish';
 
 		// Retain old categories.
-		$postdata['post_category'] = wp_get_post_categories( $post_ID );
+		$postdata['post_category'] = wp_get_post_categories( $post_id );
 		$this->escape( $postdata );
 
 		return wp_update_post( $postdata );
@@ -6819,6 +6839,8 @@ public function mt_publishPost( $args ) {
 	 *
 	 * @since 1.5.0
 	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param array $args {
 	 *     Method arguments. Note: arguments must be ordered as documented.
 	 *
@@ -6865,31 +6887,31 @@ public function pingback_ping( $args ) {
 		 * If so, then let's use it and drop the old code.
 		 */
 		$urltest = parse_url( $pagelinkedto );
-		$post_ID = url_to_postid( $pagelinkedto );
-		if ( $post_ID ) {
+		$post_id = url_to_postid( $pagelinkedto );
+		if ( $post_id ) {
 			// $way
 		} elseif ( isset( $urltest['path'] ) && preg_match( '#p/[0-9]{1,}#', $urltest['path'], $match ) ) {
 			// The path defines the post_ID (archives/p/XXXX).
 			$blah    = explode( '/', $match[0] );
-			$post_ID = (int) $blah[1];
+			$post_id = (int) $blah[1];
 		} elseif ( isset( $urltest['query'] ) && preg_match( '#p=[0-9]{1,}#', $urltest['query'], $match ) ) {
 			// The query string defines the post_ID (?p=XXXX).
 			$blah    = explode( '=', $match[0] );
-			$post_ID = (int) $blah[1];
+			$post_id = (int) $blah[1];
 		} elseif ( isset( $urltest['fragment'] ) ) {
 			// An #anchor is there, it's either...
 			if ( (int) $urltest['fragment'] ) {
 				// ...an integer #XXXX (simplest case),
-				$post_ID = (int) $urltest['fragment'];
+				$post_id = (int) $urltest['fragment'];
 			} elseif ( preg_match( '/post-[0-9]+/', $urltest['fragment'] ) ) {
 				// ...a post ID in the form 'post-###',
-				$post_ID = preg_replace( '/[^0-9]+/', '', $urltest['fragment'] );
+				$post_id = preg_replace( '/[^0-9]+/', '', $urltest['fragment'] );
 			} elseif ( is_string( $urltest['fragment'] ) ) {
 				// ...or a string #title, a little more complicated.
 				$title   = preg_replace( '/[^a-z0-9]/i', '.', $urltest['fragment'] );
 				$sql     = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
-				$post_ID = $wpdb->get_var( $sql );
-				if ( ! $post_ID ) {
+				$post_id = $wpdb->get_var( $sql );
+				if ( ! $post_id ) {
 					// Returning unknown error '0' is better than die()'ing.
 					return $this->pingback_error( 0, '' );
 				}
@@ -6898,15 +6920,15 @@ public function pingback_ping( $args ) {
 			// TODO: Attempt to extract a post ID from the given URL.
 			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) );
 		}
-		$post_ID = (int) $post_ID;
+		$post_id = (int) $post_id;
 
-		$post = get_post( $post_ID );
+		$post = get_post( $post_id );
 
 		if ( ! $post ) { // Post not found.
 			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) );
 		}
 
-		if ( url_to_postid( $pagelinkedfrom ) == $post_ID ) {
+		if ( url_to_postid( $pagelinkedfrom ) == $post_id ) {
 			return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
 		}
 
@@ -6916,7 +6938,7 @@ public function pingback_ping( $args ) {
 		}
 
 		// Let's check that the remote site didn't already pingback this entry.
-		if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom ) ) ) {
+		if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_id, $pagelinkedfrom ) ) ) {
 			return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
 		}
 
@@ -6978,7 +7000,7 @@ public function pingback_ping( $args ) {
 		$preg_target = preg_quote( $pagelinkedto, '|' );
 
 		foreach ( $p as $para ) {
-			if ( strpos( $para, $pagelinkedto ) !== false ) { // It exists, but is it a link?
+			if ( str_contains( $para, $pagelinkedto ) ) { // It exists, but is it a link?
 				preg_match( '|<a[^>]+?' . $preg_target . '[^>]*>([^>]+?)</a>|', $para, $context );
 
 				// If the URL isn't in a link context, keep looking.
@@ -6986,8 +7008,10 @@ public function pingback_ping( $args ) {
 					continue;
 				}
 
-				// We're going to use this fake tag to mark the context in a bit.
-				// The marker is needed in case the link text appears more than once in the paragraph.
+				/*
+				 * We're going to use this fake tag to mark the context in a bit.
+				 * The marker is needed in case the link text appears more than once in the paragraph.
+				 */
 				$excerpt = preg_replace( '|\</?wpcontext\>|', '', $para );
 
 				// prevent really long link text
@@ -7015,7 +7039,7 @@ public function pingback_ping( $args ) {
 		$context        = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
 		$pagelinkedfrom = $this->escape( $pagelinkedfrom );
 
-		$comment_post_id      = (int) $post_ID;
+		$comment_post_id      = (int) $post_id;
 		$comment_author       = $title;
 		$comment_author_email = '';
 		$this->escape( $comment_author );
@@ -7038,10 +7062,10 @@ public function pingback_ping( $args ) {
 			'remote_source_original'
 		);
 
-		$comment_ID = wp_new_comment( $commentdata );
+		$comment_id = wp_new_comment( $commentdata );
 
-		if ( is_wp_error( $comment_ID ) ) {
-			return $this->pingback_error( 0, $comment_ID->get_error_message() );
+		if ( is_wp_error( $comment_id ) ) {
+			return $this->pingback_error( 0, $comment_id->get_error_message() );
 		}
 
 		/**
@@ -7049,16 +7073,16 @@ public function pingback_ping( $args ) {
 		 *
 		 * @since 0.71
 		 *
-		 * @param int $comment_ID Comment ID.
+		 * @param int $comment_id Comment ID.
 		 */
-		do_action( 'pingback_post', $comment_ID );
+		do_action( 'pingback_post', $comment_id );
 
 		/* translators: 1: URL of the page linked from, 2: URL of the page linked to. */
 		return sprintf( __( 'Pingback from %1$s to %2$s registered. Keep the web talking! :-)' ), $pagelinkedfrom, $pagelinkedto );
 	}
 
 	/**
-	 * Retrieve array of URLs that pingbacked the given URL.
+	 * Retrieves an array of URLs that pingbacked the given URL.
 	 *
 	 * Specs on http://www.aquarionics.com/misc/archives/blogite/0198.html
 	 *
@@ -7077,20 +7101,20 @@ public function pingback_extensions_getPingbacks( $url ) {
 
 		$url = $this->escape( $url );
 
-		$post_ID = url_to_postid( $url );
-		if ( ! $post_ID ) {
+		$post_id = url_to_postid( $url );
+		if ( ! $post_id ) {
 			// We aren't sure that the resource is available and/or pingback enabled.
 			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either does not exist, or it is not a pingback-enabled resource.' ) );
 		}
 
-		$actual_post = get_post( $post_ID, ARRAY_A );
+		$actual_post = get_post( $post_id, ARRAY_A );
 
 		if ( ! $actual_post ) {
 			// No such post = resource not found.
 			return $this->pingback_error( 32, __( 'The specified target URL does not exist.' ) );
 		}
 
-		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID ) );
+		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ) );
 
 		if ( ! $comments ) {
 			return array();
diff --git a/src/wp-includes/class-wp.php b/src/wp-includes/class-wp.php
index 67985c147b871..ce88c102cfade 100644
--- a/src/wp-includes/class-wp.php
+++ b/src/wp-includes/class-wp.php
@@ -200,17 +200,18 @@ public function parse_request( $extra_query_vars = '' ) {
 				$self     = trim( $self, '/' );
 			}
 
-			// The requested permalink is in $pathinfo for path info requests and
-			// $req_uri for other requests.
+			// The requested permalink is in $pathinfo for path info requests and $req_uri for other requests.
 			if ( ! empty( $pathinfo ) && ! preg_match( '|^.*' . $wp_rewrite->index . '$|', $pathinfo ) ) {
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index ) {
+				if ( $req_uri === $wp_rewrite->index ) {
 					$req_uri = '';
 				}
+
 				$requested_path = $req_uri;
 			}
+
 			$requested_file = $req_uri;
 
 			$this->request = $requested_path;
@@ -227,23 +228,32 @@ public function parse_request( $extra_query_vars = '' ) {
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty( $requested_file ) && strpos( $match, $requested_file ) === 0 && $requested_file != $requested_path ) {
+					if ( ! empty( $requested_file )
+						&& str_starts_with( $match, $requested_file )
+						&& $requested_file !== $requested_path
+					) {
 						$request_match = $requested_file . '/' . $requested_path;
 					}
 
-					if ( preg_match( "#^$match#", $request_match, $matches ) ||
-						preg_match( "#^$match#", urldecode( $request_match ), $matches ) ) {
+					if ( preg_match( "#^$match#", $request_match, $matches )
+						|| preg_match( "#^$match#", urldecode( $request_match ), $matches )
+					) {
 
-						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+						if ( $wp_rewrite->use_verbose_page_rules
+							&& preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch )
+						) {
 							// This is a verbose page match, let's check to be sure about it.
 							$page = get_page_by_path( $matches[ $varmatch[1] ] );
+
 							if ( ! $page ) {
 								continue;
 							}
 
 							$post_status_obj = get_post_status_object( $page->post_status );
+
 							if ( ! $post_status_obj->public && ! $post_status_obj->protected
-								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search
+							) {
 								continue;
 							}
 						}
@@ -268,16 +278,18 @@ public function parse_request( $extra_query_vars = '' ) {
 				parse_str( $query, $perma_query_vars );
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error ) {
+				if ( '404' === $error ) {
 					unset( $error, $_GET['error'] );
 				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty( $requested_path ) || $requested_file == $self || strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+			if ( empty( $requested_path ) || $requested_file === $self
+				|| str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' )
+			) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
+				if ( isset( $perma_query_vars ) && str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' ) ) {
 					unset( $perma_query_vars );
 				}
 
@@ -307,8 +319,14 @@ public function parse_request( $extra_query_vars = '' ) {
 		foreach ( $this->public_query_vars as $wpvar ) {
 			if ( isset( $this->extra_query_vars[ $wpvar ] ) ) {
 				$this->query_vars[ $wpvar ] = $this->extra_query_vars[ $wpvar ];
-			} elseif ( isset( $_GET[ $wpvar ] ) && isset( $_POST[ $wpvar ] ) && $_GET[ $wpvar ] !== $_POST[ $wpvar ] ) {
-				wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
+			} elseif ( isset( $_GET[ $wpvar ] ) && isset( $_POST[ $wpvar ] )
+				&& $_GET[ $wpvar ] !== $_POST[ $wpvar ]
+			) {
+				wp_die(
+					__( 'A variable mismatch has been detected.' ),
+					__( 'Sorry, you are not allowed to view this item.' ),
+					400
+				);
 			} elseif ( isset( $_POST[ $wpvar ] ) ) {
 				$this->query_vars[ $wpvar ] = $_POST[ $wpvar ];
 			} elseif ( isset( $_GET[ $wpvar ] ) ) {
@@ -358,6 +376,7 @@ public function parse_request( $extra_query_vars = '' ) {
 		// Limit publicly queried post_types to those that are 'publicly_queryable'.
 		if ( isset( $this->query_vars['post_type'] ) ) {
 			$queryable_post_types = get_post_types( array( 'publicly_queryable' => true ) );
+
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
 				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types, true ) ) {
 					unset( $this->query_vars['post_type'] );
@@ -435,10 +454,12 @@ public function send_headers() {
 		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
+
 			if ( 404 === $status ) {
 				if ( ! is_user_logged_in() ) {
 					$headers = array_merge( $headers, wp_get_nocache_headers() );
 				}
+
 				$headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ), true ) ) {
 				$exit_required = true;
@@ -451,11 +472,12 @@ public function send_headers() {
 			if ( 'feed' === $this->query_vars['feed'] ) {
 				$type = get_default_feed();
 			}
+
 			$headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
 
 			// We're showing a feed, so WP is indeed the only thing that last changed.
 			if ( ! empty( $this->query_vars['withcomments'] )
-				|| false !== strpos( $this->query_vars['feed'], 'comments-' )
+				|| str_contains( $this->query_vars['feed'], 'comments-' )
 				|| ( empty( $this->query_vars['withoutcomments'] )
 					&& ( ! empty( $this->query_vars['p'] )
 						|| ! empty( $this->query_vars['name'] )
@@ -468,6 +490,7 @@ public function send_headers() {
 			) {
 				$wp_last_modified_post    = mysql2date( $date_format, get_lastpostmodified( 'GMT' ), false );
 				$wp_last_modified_comment = mysql2date( $date_format, get_lastcommentmodified( 'GMT' ), false );
+
 				if ( strtotime( $wp_last_modified_post ) > strtotime( $wp_last_modified_comment ) ) {
 					$wp_last_modified = $wp_last_modified_post;
 				} else {
@@ -482,8 +505,8 @@ public function send_headers() {
 			}
 
 			$wp_last_modified .= ' GMT';
+			$wp_etag           = '"' . md5( $wp_last_modified ) . '"';
 
-			$wp_etag                  = '"' . md5( $wp_last_modified ) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag']          = $wp_etag;
 
@@ -491,19 +514,25 @@ public function send_headers() {
 			if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ) {
 				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
 			} else {
-				$client_etag = false;
+				$client_etag = '';
+			}
+
+			if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+				$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
+			} else {
+				$client_last_modified = '';
 			}
 
-			$client_last_modified = empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ? '' : trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 			// If string is empty, return 0. If not, attempt to parse into a timestamp.
 			$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
 
-			// Make a timestamp for our most recent modification..
+			// Make a timestamp for our most recent modification.
 			$wp_modified_timestamp = strtotime( $wp_last_modified );
 
-			if ( ( $client_last_modified && $client_etag ) ?
-					( ( $client_modified_timestamp >= $wp_modified_timestamp ) && ( $client_etag == $wp_etag ) ) :
-					( ( $client_modified_timestamp >= $wp_modified_timestamp ) || ( $client_etag == $wp_etag ) ) ) {
+			if ( ( $client_last_modified && $client_etag )
+				? ( ( $client_modified_timestamp >= $wp_modified_timestamp ) && ( $client_etag === $wp_etag ) )
+				: ( ( $client_modified_timestamp >= $wp_modified_timestamp ) || ( $client_etag === $wp_etag ) )
+			) {
 				$status        = 304;
 				$exit_required = true;
 			}
@@ -571,12 +600,15 @@ public function send_headers() {
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
+
 		foreach ( (array) array_keys( $this->query_vars ) as $wpvar ) {
-			if ( '' != $this->query_vars[ $wpvar ] ) {
+			if ( '' !== $this->query_vars[ $wpvar ] ) {
 				$this->query_string .= ( strlen( $this->query_string ) < 1 ) ? '' : '&';
+
 				if ( ! is_scalar( $this->query_vars[ $wpvar ] ) ) { // Discard non-scalars.
 					continue;
 				}
+
 				$this->query_string .= $wpvar . '=' . rawurlencode( $this->query_vars[ $wpvar ] );
 			}
 		}
@@ -596,6 +628,7 @@ public function build_query_string() {
 				'2.1.0',
 				'query_vars, request'
 			);
+
 			parse_str( $this->query_string, $this->query_vars );
 		}
 	}
@@ -720,7 +753,7 @@ public function handle_404() {
 				// Check for paged content that exceeds the max number of pages.
 				if ( $post && ! empty( $this->query_vars['page'] ) ) {
 					// Check if content is actually intended to be paged.
-					if ( false !== strpos( $post->post_content, $next ) ) {
+					if ( str_contains( $post->post_content, $next ) ) {
 						$page          = trim( $this->query_vars['page'], '/' );
 						$content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );
 					} else {
diff --git a/src/wp-includes/class-wpdb.php b/src/wp-includes/class-wpdb.php
index 5260130ffde03..4fe5ea5bd4be3 100644
--- a/src/wp-includes/class-wpdb.php
+++ b/src/wp-includes/class-wpdb.php
@@ -654,6 +654,45 @@ class wpdb {
 		'ANSI',
 	);
 
+	/**
+	 * Backward compatibility, where wpdb::prepare() has not quoted formatted/argnum placeholders.
+	 *
+	 * This is often used for table/field names (before %i was supported), and sometimes string formatting, e.g.
+	 *
+	 *     $wpdb->prepare( 'WHERE `%1$s` = "%2$s something %3$s" OR %1$s = "%4$-10s"', 'field_1', 'a', 'b', 'c' );
+	 *
+	 * But it's risky, e.g. forgetting to add quotes, resulting in SQL Injection vulnerabilities:
+	 *
+	 *     $wpdb->prepare( 'WHERE (id = %1s) OR (id = %2$s)', $_GET['id'], $_GET['id'] ); // ?id=id
+	 *
+	 * This feature is preserved while plugin authors update their code to use safer approaches:
+	 *
+	 *     $_GET['key'] = 'a`b';
+	 *
+	 *     $wpdb->prepare( 'WHERE %1s = %s',        $_GET['key'], $_GET['value'] ); // WHERE a`b = 'value'
+	 *     $wpdb->prepare( 'WHERE `%1$s` = "%2$s"', $_GET['key'], $_GET['value'] ); // WHERE `a`b` = "value"
+	 *
+	 *     $wpdb->prepare( 'WHERE %i = %s',         $_GET['key'], $_GET['value'] ); // WHERE `a``b` = 'value'
+	 *
+	 * While changing to false will be fine for queries not using formatted/argnum placeholders,
+	 * any remaining cases are most likely going to result in SQL errors (good, in a way):
+	 *
+	 *     $wpdb->prepare( 'WHERE %1$s = "%2$-10s"', 'my_field', 'my_value' );
+	 *     true  = WHERE my_field = "my_value  "
+	 *     false = WHERE 'my_field' = "'my_value  '"
+	 *
+	 * But there may be some queries that result in an SQL Injection vulnerability:
+	 *
+	 *     $wpdb->prepare( 'WHERE id = %1$s', $_GET['id'] ); // ?id=id
+	 *
+	 * So there may need to be a `_doing_it_wrong()` phase, after we know everyone can use
+	 * identifier placeholders (%i), but before this feature is disabled or removed.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	private $allow_unsafe_unquoted_parameters = true;
+
 	/**
 	 * Whether to use mysqli over mysql. Default false.
 	 *
@@ -763,6 +802,7 @@ public function __set( $name, $value ) {
 			'col_meta',
 			'table_charset',
 			'check_current_query',
+			'allow_unsafe_unquoted_parameters',
 		);
 		if ( in_array( $name, $protected_members, true ) ) {
 			return;
@@ -1032,7 +1072,7 @@ public function set_prefix( $prefix, $set_table_names = true ) {
 	 * @since 3.0.0
 	 *
 	 * @param int $blog_id
-	 * @param int $network_id Optional.
+	 * @param int $network_id Optional. Network ID. Default 0.
 	 * @return int Previous blog ID.
 	 */
 	public function set_blog_id( $blog_id, $network_id = 0 ) {
@@ -1061,7 +1101,8 @@ public function set_blog_id( $blog_id, $network_id = 0 ) {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param int $blog_id Optional.
+	 * @param int $blog_id Optional. Blog ID to retrieve the table prefix for.
+	 *                     Defaults to the current blog ID.
 	 * @return string Blog prefix.
 	 */
 	public function get_blog_prefix( $blog_id = null ) {
@@ -1180,7 +1221,8 @@ public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
 	 * @since 0.71
 	 *
 	 * @param string          $db  Database name.
-	 * @param mysqli|resource $dbh Optional database connection.
+	 * @param mysqli|resource $dbh Optional. Database connection.
+	 *                             Defaults to the current database handle.
 	 */
 	public function select( $db, $dbh = null ) {
 		if ( is_null( $dbh ) ) {
@@ -1225,7 +1267,7 @@ public function select( $db, $dbh = null ) {
 
 				$message .= '<p>' . sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'If you do not know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ),
+					__( 'If you do not know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress support forums</a>.' ),
 					__( 'https://wordpress.org/support/forums/' )
 				) . "</p>\n";
 
@@ -1244,14 +1286,14 @@ public function select( $db, $dbh = null ) {
 	 * @see wpdb::prepare()
 	 * @see esc_sql()
 	 *
-	 * @param string $string
+	 * @param string $data
 	 * @return string
 	 */
-	public function _weak_escape( $string ) {
+	public function _weak_escape( $data ) {
 		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
 			_deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' );
 		}
-		return addslashes( $string );
+		return addslashes( $data );
 	}
 
 	/**
@@ -1262,19 +1304,19 @@ public function _weak_escape( $string ) {
 	 * @see mysqli_real_escape_string()
 	 * @see mysql_real_escape_string()
 	 *
-	 * @param string $string String to escape.
+	 * @param string $data String to escape.
 	 * @return string Escaped string.
 	 */
-	public function _real_escape( $string ) {
-		if ( ! is_scalar( $string ) ) {
+	public function _real_escape( $data ) {
+		if ( ! is_scalar( $data ) ) {
 			return '';
 		}
 
 		if ( $this->dbh ) {
 			if ( $this->use_mysqli ) {
-				$escaped = mysqli_real_escape_string( $this->dbh, $string );
+				$escaped = mysqli_real_escape_string( $this->dbh, $data );
 			} else {
-				$escaped = mysql_real_escape_string( $string, $this->dbh );
+				$escaped = mysql_real_escape_string( $data, $this->dbh );
 			}
 		} else {
 			$class = get_class( $this );
@@ -1283,7 +1325,7 @@ public function _real_escape( $string ) {
 			/* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */
 			_doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' );
 
-			$escaped = addslashes( $string );
+			$escaped = addslashes( $data );
 		}
 
 		return $this->add_placeholder_escape( $escaped );
@@ -1354,22 +1396,53 @@ public function escape( $data ) {
 	 *
 	 * @since 2.3.0
 	 *
-	 * @param string $string String to escape.
+	 * @param string $data String to escape.
 	 */
-	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) ) {
-			$string = $this->_real_escape( $string );
+	public function escape_by_ref( &$data ) {
+		if ( ! is_float( $data ) ) {
+			$data = $this->_real_escape( $data );
 		}
 	}
 
+	/**
+	 * Quotes an identifier for a MySQL database, e.g. table/field names.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $identifier Identifier to escape.
+	 * @return string Escaped identifier.
+	 */
+	public function quote_identifier( $identifier ) {
+		return '`' . $this->_escape_identifier_value( $identifier ) . '`';
+	}
+
+	/**
+	 * Escapes an identifier value without adding the surrounding quotes.
+	 *
+	 * - Permitted characters in quoted identifiers include the full Unicode
+	 *   Basic Multilingual Plane (BMP), except U+0000.
+	 * - To quote the identifier itself, you need to double the character, e.g. `a``b`.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @link https://dev.mysql.com/doc/refman/8.0/en/identifiers.html
+	 *
+	 * @param string $identifier Identifier to escape.
+	 * @return string Escaped identifier.
+	 */
+	private function _escape_identifier_value( $identifier ) {
+		return str_replace( '`', '``', $identifier );
+	}
+
 	/**
 	 * Prepares a SQL query for safe execution.
 	 *
-	 * Uses sprintf()-like syntax. The following placeholders can be used in the query string:
+	 * Uses `sprintf()`-like syntax. The following placeholders can be used in the query string:
 	 *
-	 * - %d (integer)
-	 * - %f (float)
-	 * - %s (string)
+	 * - `%d` (integer)
+	 * - `%f` (float)
+	 * - `%s` (string)
+	 * - `%i` (identifier, e.g. table/field names)
 	 *
 	 * All placeholders MUST be left unquoted in the query string. A corresponding argument
 	 * MUST be passed for each placeholder.
@@ -1402,10 +1475,14 @@ public function escape_by_ref( &$string ) {
 	 * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
 	 *              by updating the function signature. The second parameter was changed
 	 *              from `$args` to `...$args`.
+	 * @since 6.2.0 Added `%i` for identifiers, e.g. table or field names.
+	 *              Check support via `wpdb::has_cap( 'identifier_placeholders' )`.
+	 *              This preserves compatibility with `sprintf()`, as the C version uses
+	 *              `%d` and `$i` as a signed integer, whereas PHP only supports `%d`.
 	 *
 	 * @link https://www.php.net/sprintf Description of syntax.
 	 *
-	 * @param string      $query   Query statement with sprintf()-like placeholders.
+	 * @param string      $query   Query statement with `sprintf()`-like placeholders.
 	 * @param array|mixed $args    The array of variables to substitute into the query's placeholders
 	 *                             if being called with an array of arguments, or the first variable
 	 *                             to substitute into the query's placeholders if being called with
@@ -1419,8 +1496,14 @@ public function prepare( $query, ...$args ) {
 			return;
 		}
 
-		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
-		if ( strpos( $query, '%' ) === false ) {
+		/*
+		 * This is not meant to be foolproof -- but it will catch obviously incorrect usage.
+		 *
+		 * Note: str_contains() is not used here, as this file can be included
+		 * directly outside of WordPress core, e.g. by HyperDB, in which case
+		 * the polyfills from wp-includes/compat.php are not loaded.
+		 */
+		if ( false === strpos( $query, '%' ) ) {
 			wp_load_translations_early();
 			_doing_it_wrong(
 				'wpdb::prepare',
@@ -1433,28 +1516,6 @@ public function prepare( $query, ...$args ) {
 			);
 		}
 
-		// If args were passed as an array (as in vsprintf), move them up.
-		$passed_as_array = false;
-		if ( isset( $args[0] ) && is_array( $args[0] ) && 1 === count( $args ) ) {
-			$passed_as_array = true;
-			$args            = $args[0];
-		}
-
-		foreach ( $args as $arg ) {
-			if ( ! is_scalar( $arg ) && ! is_null( $arg ) ) {
-				wp_load_translations_early();
-				_doing_it_wrong(
-					'wpdb::prepare',
-					sprintf(
-						/* translators: %s: Value type. */
-						__( 'Unsupported value type (%s).' ),
-						gettype( $arg )
-					),
-					'4.8.2'
-				);
-			}
-		}
-
 		/*
 		 * Specify the formatting allowed in a placeholder. The following are allowed:
 		 *
@@ -1475,20 +1536,183 @@ public function prepare( $query, ...$args ) {
 		 */
 		$query = str_replace( "'%s'", '%s', $query ); // Strip any existing single quotes.
 		$query = str_replace( '"%s"', '%s', $query ); // Strip any existing double quotes.
-		$query = preg_replace( '/(?<!%)%s/', "'%s'", $query ); // Quote the strings, avoiding escaped strings like %%s.
 
-		$query = preg_replace( "/(?<!%)(%($allowed_format)?f)/", '%\\2F', $query ); // Force floats to be locale-unaware.
+		// Escape any unescaped percents (i.e. anything unrecognised).
+		$query = preg_replace( "/%(?:%|$|(?!($allowed_format)?[sdfFi]))/", '%%\\1', $query );
+
+		// Extract placeholders from the query.
+		$split_query = preg_split( "/(^|[^%]|(?:%%)+)(%(?:$allowed_format)?[sdfFi])/", $query, -1, PREG_SPLIT_DELIM_CAPTURE );
+
+		$split_query_count = count( $split_query );
+
+		/*
+		 * Split always returns with 1 value before the first placeholder (even with $query = "%s"),
+		 * then 3 additional values per placeholder.
+		 */
+		$placeholder_count = ( ( $split_query_count - 1 ) / 3 );
+
+		// If args were passed as an array, as in vsprintf(), move them up.
+		$passed_as_array = ( isset( $args[0] ) && is_array( $args[0] ) && 1 === count( $args ) );
+		if ( $passed_as_array ) {
+			$args = $args[0];
+		}
+
+		$new_query       = '';
+		$key             = 2; // Keys 0 and 1 in $split_query contain values before the first placeholder.
+		$arg_id          = 0;
+		$arg_identifiers = array();
+		$arg_strings     = array();
 
-		$query = preg_replace( "/%(?:%|$|(?!($allowed_format)?[sdF]))/", '%%\\1', $query ); // Escape any unescaped percents.
+		while ( $key < $split_query_count ) {
+			$placeholder = $split_query[ $key ];
 
-		// Count the number of valid placeholders in the query.
-		$placeholders = preg_match_all( "/(^|[^%]|(%%)+)%($allowed_format)?[sdF]/", $query, $matches );
+			$format = substr( $placeholder, 1, -1 );
+			$type   = substr( $placeholder, -1 );
+
+			if ( 'f' === $type && true === $this->allow_unsafe_unquoted_parameters
+				/*
+				 * Note: str_ends_with() is not used here, as this file can be included
+				 * directly outside of WordPress core, e.g. by HyperDB, in which case
+				 * the polyfills from wp-includes/compat.php are not loaded.
+				 */
+				&& '%' === substr( $split_query[ $key - 1 ], -1, 1 )
+			) {
+
+				/*
+				 * Before WP 6.2 the "force floats to be locale-unaware" RegEx didn't
+				 * convert "%%%f" to "%%%F" (note the uppercase F).
+				 * This was because it didn't check to see if the leading "%" was escaped.
+				 * And because the "Escape any unescaped percents" RegEx used "[sdF]" in its
+				 * negative lookahead assertion, when there was an odd number of "%", it added
+				 * an extra "%", to give the fully escaped "%%%%f" (not a placeholder).
+				 */
+
+				$s = $split_query[ $key - 2 ] . $split_query[ $key - 1 ];
+				$k = 1;
+				$l = strlen( $s );
+				while ( $k <= $l && '%' === $s[ $l - $k ] ) {
+					$k++;
+				}
+
+				$placeholder = '%' . ( $k % 2 ? '%' : '' ) . $format . $type;
+
+				--$placeholder_count;
+
+			} else {
+
+				// Force floats to be locale-unaware.
+				if ( 'f' === $type ) {
+					$type        = 'F';
+					$placeholder = '%' . $format . $type;
+				}
+
+				if ( 'i' === $type ) {
+					$placeholder = '`%' . $format . 's`';
+					// Using a simple strpos() due to previous checking (e.g. $allowed_format).
+					$argnum_pos = strpos( $format, '$' );
+
+					if ( false !== $argnum_pos ) {
+						// sprintf() argnum starts at 1, $arg_id from 0.
+						$arg_identifiers[] = ( ( (int) substr( $format, 0, $argnum_pos ) ) - 1 );
+					} else {
+						$arg_identifiers[] = $arg_id;
+					}
+				} elseif ( 'd' !== $type && 'F' !== $type ) {
+					/*
+					 * i.e. ( 's' === $type ), where 'd' and 'F' keeps $placeholder unchanged,
+					 * and we ensure string escaping is used as a safe default (e.g. even if 'x').
+					 */
+					$argnum_pos = strpos( $format, '$' );
+
+					if ( false !== $argnum_pos ) {
+						$arg_strings[] = ( ( (int) substr( $format, 0, $argnum_pos ) ) - 1 );
+					} else {
+						$arg_strings[] = $arg_id;
+					}
+
+					/*
+					 * Unquoted strings for backward compatibility (dangerous).
+					 * First, "numbered or formatted string placeholders (eg, %1$s, %5s)".
+					 * Second, if "%s" has a "%" before it, even if it's unrelated (e.g. "LIKE '%%%s%%'").
+					 */
+					if ( true !== $this->allow_unsafe_unquoted_parameters
+						/*
+						 * Note: str_ends_with() is not used here, as this file can be included
+						 * directly outside of WordPress core, e.g. by HyperDB, in which case
+						 * the polyfills from wp-includes/compat.php are not loaded.
+						 */
+						|| ( '' === $format && '%' !== substr( $split_query[ $key - 1 ], -1, 1 ) )
+					) {
+						$placeholder = "'%" . $format . "s'";
+					}
+				}
+			}
+
+			// Glue (-2), any leading characters (-1), then the new $placeholder.
+			$new_query .= $split_query[ $key - 2 ] . $split_query[ $key - 1 ] . $placeholder;
+
+			$key += 3;
+			$arg_id++;
+		}
+
+		// Replace $query; and add remaining $query characters, or index 0 if there were no placeholders.
+		$query = $new_query . $split_query[ $key - 2 ];
+
+		$dual_use = array_intersect( $arg_identifiers, $arg_strings );
+
+		if ( count( $dual_use ) > 0 ) {
+			wp_load_translations_early();
+
+			$used_placeholders = array();
+
+			$key    = 2;
+			$arg_id = 0;
+			// Parse again (only used when there is an error).
+			while ( $key < $split_query_count ) {
+				$placeholder = $split_query[ $key ];
+
+				$format = substr( $placeholder, 1, -1 );
+
+				$argnum_pos = strpos( $format, '$' );
+
+				if ( false !== $argnum_pos ) {
+					$arg_pos = ( ( (int) substr( $format, 0, $argnum_pos ) ) - 1 );
+				} else {
+					$arg_pos = $arg_id;
+				}
+
+				$used_placeholders[ $arg_pos ][] = $placeholder;
+
+				$key += 3;
+				$arg_id++;
+			}
+
+			$conflicts = array();
+			foreach ( $dual_use as $arg_pos ) {
+				$conflicts[] = implode( ' and ', $used_placeholders[ $arg_pos ] );
+			}
+
+			_doing_it_wrong(
+				'wpdb::prepare',
+				sprintf(
+					/* translators: %s: A list of placeholders found to be a problem. */
+					__( 'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %s' ),
+					implode( ', ', $conflicts )
+				),
+				'6.2.0'
+			);
+
+			return;
+		}
 
 		$args_count = count( $args );
 
-		if ( $args_count !== $placeholders ) {
-			if ( 1 === $placeholders && $passed_as_array ) {
-				// If the passed query only expected one argument, but the wrong number of arguments were sent as an array, bail.
+		if ( $args_count !== $placeholder_count ) {
+			if ( 1 === $placeholder_count && $passed_as_array ) {
+				/*
+				 * If the passed query only expected one argument,
+				 * but the wrong number of arguments was sent as an array, bail.
+				 */
 				wp_load_translations_early();
 				_doing_it_wrong(
 					'wpdb::prepare',
@@ -1509,7 +1733,7 @@ public function prepare( $query, ...$args ) {
 					sprintf(
 						/* translators: 1: Number of placeholders, 2: Number of arguments passed. */
 						__( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
-						$placeholders,
+						$placeholder_count,
 						$args_count
 					),
 					'4.8.3'
@@ -1519,8 +1743,17 @@ public function prepare( $query, ...$args ) {
 				 * If we don't have enough arguments to match the placeholders,
 				 * return an empty string to avoid a fatal error on PHP 8.
 				 */
-				if ( $args_count < $placeholders ) {
-					$max_numbered_placeholder = ! empty( $matches[3] ) ? max( array_map( 'intval', $matches[3] ) ) : 0;
+				if ( $args_count < $placeholder_count ) {
+					$max_numbered_placeholder = 0;
+
+					for ( $i = 2, $l = $split_query_count; $i < $l; $i += 3 ) {
+						// Assume a leading number is for a numbered placeholder, e.g. '%3$s'.
+						$argnum = (int) substr( $split_query[ $i ], 1 );
+
+						if ( $max_numbered_placeholder < $argnum ) {
+							$max_numbered_placeholder = $argnum;
+						}
+					}
 
 					if ( ! $max_numbered_placeholder || $args_count < $max_numbered_placeholder ) {
 						return '';
@@ -1529,8 +1762,35 @@ public function prepare( $query, ...$args ) {
 			}
 		}
 
-		array_walk( $args, array( $this, 'escape_by_ref' ) );
-		$query = vsprintf( $query, $args );
+		$args_escaped = array();
+
+		foreach ( $args as $i => $value ) {
+			if ( in_array( $i, $arg_identifiers, true ) ) {
+				$args_escaped[] = $this->_escape_identifier_value( $value );
+			} elseif ( is_int( $value ) || is_float( $value ) ) {
+				$args_escaped[] = $value;
+			} else {
+				if ( ! is_scalar( $value ) && ! is_null( $value ) ) {
+					wp_load_translations_early();
+					_doing_it_wrong(
+						'wpdb::prepare',
+						sprintf(
+							/* translators: %s: Value type. */
+							__( 'Unsupported value type (%s).' ),
+							gettype( $value )
+						),
+						'4.8.2'
+					);
+
+					// Preserving old behavior, where values are escaped as strings.
+					$value = '';
+				}
+
+				$args_escaped[] = $this->_real_escape( $value );
+			}
+		}
+
+		$query = vsprintf( $query, $args_escaped );
 
 		return $this->add_placeholder_escape( $query );
 	}
@@ -1837,7 +2097,7 @@ public function db_connect( $allow_bail = true ) {
 
 			$message .= '<p>' . sprintf(
 				/* translators: %s: Support forums URL. */
-				__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
+				__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress support forums</a>.' ),
 				__( 'https://wordpress.org/support/forums/' )
 			) . "</p>\n";
 
@@ -1895,8 +2155,10 @@ public function parse_db_host( $host ) {
 			$host   = substr( $host, 0, $socket_pos );
 		}
 
-		// We need to check for an IPv6 address first.
-		// An IPv6 address will always contain at least two colons.
+		/*
+		 * We need to check for an IPv6 address first.
+		 * An IPv6 address will always contain at least two colons.
+		 */
 		if ( substr_count( $host, ':' ) > 1 ) {
 			$pattern = '#^(?:\[)?(?P<host>[0-9a-fA-F:]+)(?:\]:(?P<port>[\d]+))?#';
 			$is_ipv6 = true;
@@ -1953,8 +2215,10 @@ public function check_connection( $allow_bail = true ) {
 		}
 
 		for ( $tries = 1; $tries <= $this->reconnect_retries; $tries++ ) {
-			// On the last try, re-enable warnings. We want to see a single instance
-			// of the "unable to connect" message on the bail() screen, if it appears.
+			/*
+			 * On the last try, re-enable warnings. We want to see a single instance
+			 * of the "unable to connect" message on the bail() screen, if it appears.
+			 */
 			if ( $this->reconnect_retries === $tries && WP_DEBUG ) {
 				error_reporting( $error_reporting );
 			}
@@ -1970,8 +2234,10 @@ public function check_connection( $allow_bail = true ) {
 			sleep( 1 );
 		}
 
-		// If template_redirect has already happened, it's too late for wp_die()/dead_db().
-		// Let's just return and hope for the best.
+		/*
+		 * If template_redirect has already happened, it's too late for wp_die()/dead_db().
+		 * Let's just return and hope for the best.
+		 */
 		if ( did_action( 'template_redirect' ) ) {
 			return false;
 		}
@@ -1997,15 +2263,17 @@ public function check_connection( $allow_bail = true ) {
 
 		$message .= '<p>' . sprintf(
 			/* translators: %s: Support forums URL. */
-			__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
+			__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress support forums</a>.' ),
 			__( 'https://wordpress.org/support/forums/' )
 		) . "</p>\n";
 
 		// We weren't able to reconnect, so we better bail.
 		$this->bail( $message, 'db_connect_fail' );
 
-		// Call dead_db() if bail didn't die, because this database is no more.
-		// It has ceased to be (at least temporarily).
+		/*
+		 * Call dead_db() if bail didn't die, because this database is no more.
+		 * It has ceased to be (at least temporarily).
+		 */
 		dead_db();
 	}
 
@@ -2053,8 +2321,10 @@ public function query( $query ) {
 		// If we're writing to the database, make sure the query will write safely.
 		if ( $this->check_current_query && ! $this->check_ascii( $query ) ) {
 			$stripped_query = $this->strip_invalid_text_from_query( $query );
-			// strip_invalid_text_from_query() can perform queries, so we need
-			// to flush again, just to make sure everything is clear.
+			/*
+			 * strip_invalid_text_from_query() can perform queries, so we need
+			 * to flush again, just to make sure everything is clear.
+			 */
 			$this->flush();
 			if ( $stripped_query !== $query ) {
 				$this->insert_id  = 0;
@@ -2082,8 +2352,10 @@ public function query( $query ) {
 				if ( $this->dbh instanceof mysqli ) {
 					$mysql_errno = mysqli_errno( $this->dbh );
 				} else {
-					// $dbh is defined, but isn't a real connection.
-					// Something has gone horribly wrong, let's try a reconnect.
+					/*
+					 * $dbh is defined, but isn't a real connection.
+					 * Something has gone horribly wrong, let's try a reconnect.
+					 */
 					$mysql_errno = 2006;
 				}
 			} else {
@@ -2312,14 +2584,14 @@ public function remove_placeholder_escape( $query ) {
 	 *
 	 * @param string       $table  Table name.
 	 * @param array        $data   Data to insert (in column => value pairs).
-	 *                             Both $data columns and $data values should be "raw" (neither should be SQL escaped).
+	 *                             Both `$data` columns and `$data` values should be "raw" (neither should be SQL escaped).
 	 *                             Sending a null value will cause the column to be set to NULL - the corresponding
 	 *                             format is ignored in this case.
-	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data.
-	 *                             If string, that format will be used for all of the values in $data.
+	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in `$data`.
+	 *                             If string, that format will be used for all of the values in `$data`.
 	 *                             A format is one of '%d', '%f', '%s' (integer, float, string).
-	 *                             If omitted, all values in $data will be treated as strings unless otherwise
-	 *                             specified in wpdb::$field_types.
+	 *                             If omitted, all values in `$data` will be treated as strings unless otherwise
+	 *                             specified in wpdb::$field_types. Default null.
 	 * @return int|false The number of rows inserted, or false on error.
 	 */
 	public function insert( $table, $data, $format = null ) {
@@ -2342,14 +2614,14 @@ public function insert( $table, $data, $format = null ) {
 	 *
 	 * @param string       $table  Table name.
 	 * @param array        $data   Data to insert (in column => value pairs).
-	 *                             Both $data columns and $data values should be "raw" (neither should be SQL escaped).
+	 *                             Both `$data` columns and `$data` values should be "raw" (neither should be SQL escaped).
 	 *                             Sending a null value will cause the column to be set to NULL - the corresponding
 	 *                             format is ignored in this case.
-	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data.
-	 *                             If string, that format will be used for all of the values in $data.
+	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in `$data`.
+	 *                             If string, that format will be used for all of the values in `$data`.
 	 *                             A format is one of '%d', '%f', '%s' (integer, float, string).
-	 *                             If omitted, all values in $data will be treated as strings unless otherwise
-	 *                             specified in wpdb::$field_types.
+	 *                             If omitted, all values in `$data` will be treated as strings unless otherwise
+	 *                             specified in wpdb::$field_types. Default null.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
 	public function replace( $table, $data, $format = null ) {
@@ -2359,7 +2631,7 @@ public function replace( $table, $data, $format = null ) {
 	/**
 	 * Helper function for insert and replace.
 	 *
-	 * Runs an insert or replace query based on $type argument.
+	 * Runs an insert or replace query based on `$type` argument.
 	 *
 	 * @since 3.0.0
 	 *
@@ -2369,15 +2641,15 @@ public function replace( $table, $data, $format = null ) {
 	 *
 	 * @param string       $table  Table name.
 	 * @param array        $data   Data to insert (in column => value pairs).
-	 *                             Both $data columns and $data values should be "raw" (neither should be SQL escaped).
+	 *                             Both `$data` columns and `$data` values should be "raw" (neither should be SQL escaped).
 	 *                             Sending a null value will cause the column to be set to NULL - the corresponding
 	 *                             format is ignored in this case.
-	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data.
-	 *                             If string, that format will be used for all of the values in $data.
+	 * @param array|string $format Optional. An array of formats to be mapped to each of the value in `$data`.
+	 *                             If string, that format will be used for all of the values in `$data`.
 	 *                             A format is one of '%d', '%f', '%s' (integer, float, string).
-	 *                             If omitted, all values in $data will be treated as strings unless otherwise
-	 *                             specified in wpdb::$field_types.
-	 * @param string       $type   Optional. Type of operation. Possible values include 'INSERT' or 'REPLACE'.
+	 *                             If omitted, all values in `$data` will be treated as strings unless otherwise
+	 *                             specified in wpdb::$field_types. Default null.
+	 * @param string       $type   Optional. Type of operation. Either 'INSERT' or 'REPLACE'.
 	 *                             Default 'INSERT'.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
@@ -2442,11 +2714,11 @@ public function _insert_replace_helper( $table, $data, $format = null, $type = '
 	 *                                   If string, that format will be used for all of the values in $data.
 	 *                                   A format is one of '%d', '%f', '%s' (integer, float, string).
 	 *                                   If omitted, all values in $data will be treated as strings unless otherwise
-	 *                                   specified in wpdb::$field_types.
+	 *                                   specified in wpdb::$field_types. Default null.
 	 * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where.
 	 *                                   If string, that format will be used for all of the items in $where.
 	 *                                   A format is one of '%d', '%f', '%s' (integer, float, string).
-	 *                                   If omitted, all values in $where will be treated as strings.
+	 *                                   If omitted, all values in $where will be treated as strings. Default null.
 	 * @return int|false The number of rows updated, or false on error.
 	 */
 	public function update( $table, $data, $where, $format = null, $where_format = null ) {
@@ -2518,7 +2790,7 @@ public function update( $table, $data, $where, $format = null, $where_format = n
 	 *                                   If string, that format will be used for all of the items in $where.
 	 *                                   A format is one of '%d', '%f', '%s' (integer, float, string).
 	 *                                   If omitted, all values in $data will be treated as strings unless otherwise
-	 *                                   specified in wpdb::$field_types.
+	 *                                   specified in wpdb::$field_types. Default null.
 	 * @return int|false The number of rows deleted, or false on error.
 	 */
 	public function delete( $table, $where, $where_format = null ) {
@@ -2725,8 +2997,8 @@ protected function process_field_lengths( $data, $table ) {
 	 * @since 0.71
 	 *
 	 * @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query.
-	 * @param int         $x     Optional. Column of value to return. Indexed from 0.
-	 * @param int         $y     Optional. Row of value to return. Indexed from 0.
+	 * @param int         $x     Optional. Column of value to return. Indexed from 0. Default 0.
+	 * @param int         $y     Optional. Row of value to return. Indexed from 0. Default 0.
 	 * @return string|null Database query result (as string), or null on failure.
 	 */
 	public function get_var( $query = null, $x = 0, $y = 0 ) {
@@ -2760,7 +3032,7 @@ public function get_var( $query = null, $x = 0, $y = 0 ) {
 	 * @param string      $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
 	 *                            correspond to an stdClass object, an associative array, or a numeric array,
 	 *                            respectively. Default OBJECT.
-	 * @param int         $y      Optional. Row to return. Indexed from 0.
+	 * @param int         $y      Optional. Row to return. Indexed from 0. Default 0.
 	 * @return array|object|null|void Database query result in format specified by $output or null on failure.
 	 */
 	public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
@@ -2804,7 +3076,7 @@ public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
 	 * @since 0.71
 	 *
 	 * @param string|null $query Optional. SQL query. Defaults to previous query.
-	 * @param int         $x     Optional. Column to return. Indexed from 0.
+	 * @param int         $x     Optional. Column to return. Indexed from 0. Default 0.
 	 * @return array Database query result. Array indexed from 0 by SQL result row number.
 	 */
 	public function get_col( $query = null, $x = 0 ) {
@@ -2841,6 +3113,7 @@ public function get_col( $query = null, $x = 0 ) {
 	 *                       or an object ( ->column = value ), respectively. With OBJECT_K,
 	 *                       return an associative array of row objects keyed by the value
 	 *                       of each row's first column's value. Duplicate keys are discarded.
+	 *                       Default OBJECT.
 	 * @return array|object|null Database query results.
 	 */
 	public function get_results( $query = null, $output = OBJECT ) {
@@ -2861,8 +3134,10 @@ public function get_results( $query = null, $output = OBJECT ) {
 			// Return an integer-keyed array of row objects.
 			return $this->last_result;
 		} elseif ( OBJECT_K === $output ) {
-			// Return an array of row objects with keys from column 1.
-			// (Duplicates are discarded.)
+			/*
+			 * Return an array of row objects with keys from column 1.
+			 * (Duplicates are discarded.)
+			 */
 			if ( $this->last_result ) {
 				foreach ( $this->last_result as $row ) {
 					$var_by_ref = get_object_vars( $row );
@@ -2876,11 +3151,13 @@ public function get_results( $query = null, $output = OBJECT ) {
 		} elseif ( ARRAY_A === $output || ARRAY_N === $output ) {
 			// Return an integer-keyed array of...
 			if ( $this->last_result ) {
-				foreach ( (array) $this->last_result as $row ) {
-					if ( ARRAY_N === $output ) {
+				if ( ARRAY_N === $output ) {
+					foreach ( (array) $this->last_result as $row ) {
 						// ...integer-keyed row arrays.
 						$new_array[] = array_values( get_object_vars( $row ) );
-					} else {
+					}
+				} else {
+					foreach ( (array) $this->last_result as $row ) {
 						// ...column name-keyed row arrays.
 						$new_array[] = get_object_vars( $row );
 					}
@@ -3074,6 +3351,7 @@ public function get_col_charset( $table, $column ) {
 	 *
 	 *     @type int    $length The column length.
 	 *     @type string $type   One of 'byte' or 'char'.
+	 * }
 	 */
 	public function get_col_length( $table, $column ) {
 		$tablekey  = strtolower( $table );
@@ -3161,15 +3439,15 @@ public function get_col_length( $table, $column ) {
 	 *
 	 * @since 4.2.0
 	 *
-	 * @param string $string String to check.
+	 * @param string $input_string String to check.
 	 * @return bool True if ASCII, false if not.
 	 */
-	protected function check_ascii( $string ) {
+	protected function check_ascii( $input_string ) {
 		if ( function_exists( 'mb_check_encoding' ) ) {
-			if ( mb_check_encoding( $string, 'ASCII' ) ) {
+			if ( mb_check_encoding( $input_string, 'ASCII' ) ) {
 				return true;
 			}
-		} elseif ( ! preg_match( '/[^\x00-\x7F]/', $string ) ) {
+		} elseif ( ! preg_match( '/[^\x00-\x7F]/', $input_string ) ) {
 			return true;
 		}
 
@@ -3265,8 +3543,10 @@ protected function strip_invalid_text( $data ) {
 				$truncate_by_byte_length = 'byte' === $value['length']['type'];
 			} else {
 				$length = false;
-				// Since we have no length, we'll never truncate. Initialize the variable to false.
-				// True would take us through an unnecessary (for this case) codepath below.
+				/*
+				 * Since we have no length, we'll never truncate. Initialize the variable to false.
+				 * True would take us through an unnecessary (for this case) codepath below.
+				 */
 				$truncate_by_byte_length = false;
 			}
 
@@ -3779,19 +4059,27 @@ public function get_charset_collate() {
 	 * @since 2.7.0
 	 * @since 4.1.0 Added support for the 'utf8mb4' feature.
 	 * @since 4.6.0 Added support for the 'utf8mb4_520' feature.
+	 * @since 6.2.0 Added support for the 'identifier_placeholders' feature.
 	 *
 	 * @see wpdb::db_version()
 	 *
 	 * @param string $db_cap The feature to check for. Accepts 'collation', 'group_concat',
-	 *                       'subqueries', 'set_charset', 'utf8mb4', or 'utf8mb4_520'.
+	 *                       'subqueries', 'set_charset', 'utf8mb4', 'utf8mb4_520',
+	 *                       or 'identifier_placeholders'.
 	 * @return bool True when the database feature is supported, false otherwise.
 	 */
 	public function has_cap( $db_cap ) {
 		$db_version     = $this->db_version();
 		$db_server_info = $this->db_server_info();
 
-		// Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
-		if ( '5.5.5' === $db_version && str_contains( $db_server_info, 'MariaDB' )
+		/*
+		 * Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
+		 *
+		 * Note: str_contains() is not used here, as this file can be included
+		 * directly outside of WordPress core, e.g. by HyperDB, in which case
+		 * the polyfills from wp-includes/compat.php are not loaded.
+		 */
+		if ( '5.5.5' === $db_version && false !== strpos( $db_server_info, 'MariaDB' )
 			&& PHP_VERSION_ID < 80016 // PHP 8.0.15 or older.
 		) {
 			// Strip the '5.5.5-' prefix and set the version to the correct value.
@@ -3819,6 +4107,10 @@ public function has_cap( $db_cap ) {
 				/*
 				 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
 				 * mysqlnd has supported utf8mb4 since 5.0.9.
+				 *
+				 * Note: str_contains() is not used here, as this file can be included
+				 * directly outside of WordPress core, e.g. by HyperDB, in which case
+				 * the polyfills from wp-includes/compat.php are not loaded.
 				 */
 				if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
 					$client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
@@ -3828,6 +4120,12 @@ public function has_cap( $db_cap ) {
 				}
 			case 'utf8mb4_520': // @since 4.6.0
 				return version_compare( $db_version, '5.6', '>=' );
+			case 'identifier_placeholders': // @since 6.2.0
+				/*
+				 * As of WordPress 6.2, wpdb::prepare() supports identifiers via '%i',
+				 * e.g. table/field names.
+				 */
+				return true;
 		}
 
 		return false;
diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index 63614663de818..59b2361d846d8 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/wp-includes/comment-template.php
@@ -15,86 +15,88 @@
  * assumed.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to retrieve the author.
  *                                   Default current comment.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
-	$comment    = get_comment( $comment_ID );
-	$comment_ID = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_ID;
+function get_comment_author( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : $comment_id;
 
 	if ( empty( $comment->comment_author ) ) {
 		$user = ! empty( $comment->user_id ) ? get_userdata( $comment->user_id ) : false;
 		if ( $user ) {
-			$author = $user->display_name;
+			$comment_author = $user->display_name;
 		} else {
-			$author = __( 'Anonymous' );
+			$comment_author = __( 'Anonymous' );
 		}
 	} else {
-		$author = $comment->comment_author;
+		$comment_author = $comment->comment_author;
 	}
 
 	/**
 	 * Filters the returned comment author name.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
-	 * @param string     $author     The comment author's username.
-	 * @param string     $comment_ID The comment ID as a numeric string.
-	 * @param WP_Comment $comment    The comment object.
+	 * @param string     $comment_author The comment author's username.
+	 * @param string     $comment_id     The comment ID as a numeric string.
+	 * @param WP_Comment $comment        The comment object.
 	 */
-	return apply_filters( 'get_comment_author', $author, $comment_ID, $comment );
+	return apply_filters( 'get_comment_author', $comment_author, $comment_id, $comment );
 }
 
 /**
  * Displays the author of the current comment.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to print the author.
  *                                   Default current comment.
  */
-function comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$author  = get_comment_author( $comment );
+function comment_author( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_author = get_comment_author( $comment );
 
 	/**
 	 * Filters the comment author's name for display.
 	 *
 	 * @since 1.2.0
-	 * @since 4.1.0 The `$comment_ID` parameter was added.
+	 * @since 4.1.0 The `$comment_id` parameter was added.
 	 *
-	 * @param string $author     The comment author's username.
-	 * @param string $comment_ID The comment ID as a numeric string.
+	 * @param string $comment_author The comment author's username.
+	 * @param string $comment_id     The comment ID as a numeric string.
 	 */
-	echo apply_filters( 'comment_author', $author, $comment->comment_ID );
+	echo apply_filters( 'comment_author', $comment_author, $comment->comment_ID );
 }
 
 /**
  * Retrieves the email of the author of the current comment.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to get the author's email.
  *                                   Default current comment.
  * @return string The current comment author's email
  */
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_email( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
 
 	/**
 	 * Filters the comment author's returned email address.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
 	 * @param string     $comment_author_email The comment author's email address.
-	 * @param string     $comment_ID           The comment ID as a numeric string.
+	 * @param string     $comment_id           The comment ID as a numeric string.
 	 * @param WP_Comment $comment              The comment object.
 	 */
 	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
@@ -110,25 +112,26 @@ function get_comment_author_email( $comment_ID = 0 ) {
  * address and use it for their own means good and bad.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *                                   Default current comment.
  */
-function comment_author_email( $comment_ID = 0 ) {
-	$comment      = get_comment( $comment_ID );
-	$author_email = get_comment_author_email( $comment );
+function comment_author_email( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_author_email = get_comment_author_email( $comment );
 
 	/**
 	 * Filters the comment author's email for display.
 	 *
 	 * @since 1.2.0
-	 * @since 4.1.0 The `$comment_ID` parameter was added.
+	 * @since 4.1.0 The `$comment_id` parameter was added.
 	 *
-	 * @param string $author_email The comment author's email address.
-	 * @param string $comment_ID   The comment ID as a numeric string.
+	 * @param string $comment_author_email The comment author's email address.
+	 * @param string $comment_id           The comment ID as a numeric string.
 	 */
-	echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
+	echo apply_filters( 'author_email', $comment_author_email, $comment->comment_ID );
 }
 
 /**
@@ -143,14 +146,14 @@ function comment_author_email( $comment_ID = 0 ) {
  * @since 0.71
  * @since 4.6.0 Added the `$comment` parameter.
  *
- * @param string         $linktext Optional. Text to display instead of the comment author's email address.
- *                                 Default empty.
- * @param string         $before   Optional. Text or HTML to display before the email link. Default empty.
- * @param string         $after    Optional. Text or HTML to display after the email link. Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object. Default is the current comment.
+ * @param string         $link_text Optional. Text to display instead of the comment author's email address.
+ *                                  Default empty.
+ * @param string         $before    Optional. Text or HTML to display before the email link. Default empty.
+ * @param string         $after     Optional. Text or HTML to display after the email link. Default empty.
+ * @param int|WP_Comment $comment   Optional. Comment ID or WP_Comment object. Default is the current comment.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	$link = get_comment_author_email_link( $linktext, $before, $after, $comment );
+function comment_author_email_link( $link_text = '', $before = '', $after = '', $comment = null ) {
+	$link = get_comment_author_email_link( $link_text, $before, $after, $comment );
 	if ( $link ) {
 		echo $link;
 	}
@@ -168,15 +171,15 @@ function comment_author_email_link( $linktext = '', $before = '', $after = '', $
  * @since 2.7.0
  * @since 4.6.0 Added the `$comment` parameter.
  *
- * @param string         $linktext Optional. Text to display instead of the comment author's email address.
- *                                 Default empty.
- * @param string         $before   Optional. Text or HTML to display before the email link. Default empty.
- * @param string         $after    Optional. Text or HTML to display after the email link. Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object. Default is the current comment.
+ * @param string         $link_text Optional. Text to display instead of the comment author's email address.
+ *                                  Default empty.
+ * @param string         $before    Optional. Text or HTML to display before the email link. Default empty.
+ * @param string         $after     Optional. Text or HTML to display after the email link. Default empty.
+ * @param int|WP_Comment $comment   Optional. Comment ID or WP_Comment object. Default is the current comment.
  * @return string HTML markup for the comment author email link. By default, the email address is obfuscated
  *                via the {@see 'comment_email'} filter with antispambot().
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
+function get_comment_author_email_link( $link_text = '', $before = '', $after = '', $comment = null ) {
 	$comment = get_comment( $comment );
 
 	/**
@@ -191,14 +194,18 @@ function get_comment_author_email_link( $linktext = '', $before = '', $after = '
 	 * @param string     $comment_author_email The comment author's email address.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
-
-	if ( ( ! empty( $email ) ) && ( '@' !== $email ) ) {
-		$display = ( '' !== $linktext ) ? $linktext : $email;
-		$return  = $before;
-		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
-		$return .= $after;
-		return $return;
+	$comment_author_email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
+
+	if ( ( ! empty( $comment_author_email ) ) && ( '@' !== $comment_author_email ) ) {
+		$display = ( '' !== $link_text ) ? $link_text : $comment_author_email;
+
+		$comment_author_email_link = $before . sprintf(
+			'<a href="%1$s">%2$s</a>',
+			esc_url( 'mailto:' . $comment_author_email ),
+			esc_html( $display )
+		) . $after;
+
+		return $comment_author_email_link;
 	} else {
 		return '';
 	}
@@ -208,74 +215,106 @@ function get_comment_author_email_link( $linktext = '', $before = '', $after = '
  * Retrieves the HTML link to the URL of the author of the current comment.
  *
  * Both get_comment_author_url() and get_comment_author() rely on get_comment(),
- * which falls back to the global comment variable if the $comment_ID argument is empty.
+ * which falls back to the global comment variable if the $comment_id argument is empty.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to get the author's link.
  *                                   Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
-function get_comment_author_link( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$url     = get_comment_author_url( $comment );
-	$author  = get_comment_author( $comment );
+function get_comment_author_link( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : (string) $comment_id;
+
+	$comment_author_url = get_comment_author_url( $comment );
+	$comment_author     = get_comment_author( $comment );
 
-	if ( empty( $url ) || 'http://' === $url ) {
-		$return = $author;
+	if ( empty( $comment_author_url ) || 'http://' === $comment_author_url ) {
+		$comment_author_link = $comment_author;
 	} else {
-		$return = "<a href='$url' rel='external nofollow ugc' class='url'>$author</a>";
+		$rel_parts = array( 'ugc' );
+		if ( ! wp_is_internal_link( $comment_author_url ) ) {
+			$rel_parts = array_merge(
+				$rel_parts,
+				array( 'external', 'nofollow' )
+			);
+		}
+
+		/**
+		 * Filters the rel attributes of the comment author's link.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param string[]   $rel_parts An array of strings representing the rel tags
+		 *                              which will be joined into the anchor's rel attribute.
+		 * @param WP_Comment $comment   The comment object.
+		 */
+		$rel_parts = apply_filters( 'comment_author_link_rel', $rel_parts, $comment );
+
+		$rel = implode( ' ', $rel_parts );
+		$rel = esc_attr( $rel );
+		// Empty space before 'rel' is necessary for later sprintf().
+		$rel = ! empty( $rel ) ? sprintf( ' rel="%s"', $rel ) : '';
+
+		$comment_author_link = sprintf(
+			'<a href="%1$s" class="url"%2$s>%3$s</a>',
+			$comment_author_url,
+			$rel,
+			$comment_author
+		);
 	}
 
 	/**
 	 * Filters the comment author's link for display.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$author` and `$comment_ID` parameters were added.
+	 * @since 4.1.0 The `$comment_author` and `$comment_id` parameters were added.
 	 *
-	 * @param string $return     The HTML-formatted comment author link.
-	 *                           Empty for an invalid URL.
-	 * @param string $author     The comment author's username.
-	 * @param string $comment_ID The comment ID as a numeric string.
+	 * @param string $comment_author_link The HTML-formatted comment author link.
+	 *                                    Empty for an invalid URL.
+	 * @param string $comment_author      The comment author's username.
+	 * @param string $comment_id          The comment ID as a numeric string.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
+	return apply_filters( 'get_comment_author_link', $comment_author_link, $comment_author, $comment_id );
 }
 
 /**
  * Displays the HTML link to the URL of the author of the current comment.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *                                   Default current comment.
  */
-function comment_author_link( $comment_ID = 0 ) {
-	echo get_comment_author_link( $comment_ID );
+function comment_author_link( $comment_id = 0 ) {
+	echo get_comment_author_link( $comment_id );
 }
 
 /**
  * Retrieves the IP address of the author of the current comment.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
  *                                   Default current comment.
  * @return string Comment author's IP address, or an empty string if it's not available.
  */
-function get_comment_author_IP( $comment_ID = 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	$comment = get_comment( $comment_ID );
+function get_comment_author_IP( $comment_id = 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+	$comment = get_comment( $comment_id );
 
 	/**
 	 * Filters the comment author's returned IP address.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
 	 * @param string     $comment_author_ip The comment author's IP address, or an empty string if it's not available.
-	 * @param string     $comment_ID        The comment ID as a numeric string.
+	 * @param string     $comment_id        The comment ID as a numeric string.
 	 * @param WP_Comment $comment           The comment object.
 	 */
 	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
@@ -285,79 +324,82 @@ function get_comment_author_IP( $comment_ID = 0 ) { // phpcs:ignore WordPress.Na
  * Displays the IP address of the author of the current comment.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *                                   Default current comment.
  */
-function comment_author_IP( $comment_ID = 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	echo esc_html( get_comment_author_IP( $comment_ID ) );
+function comment_author_IP( $comment_id = 0 ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+	echo esc_html( get_comment_author_IP( $comment_id ) );
 }
 
 /**
  * Retrieves the URL of the author of the current comment, not linked.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to get the author's URL.
  *                                   Default current comment.
  * @return string Comment author URL, if provided, an empty string otherwise.
  */
-function get_comment_author_url( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$url     = '';
-	$id      = 0;
+function get_comment_author_url( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_author_url = '';
+	$comment_id         = 0;
 
 	if ( ! empty( $comment ) ) {
-		$author_url = ( 'http://' === $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-		$url        = esc_url( $author_url, array( 'http', 'https' ) );
-		$id         = $comment->comment_ID;
+		$comment_author_url = ( 'http://' === $comment->comment_author_url ) ? '' : $comment->comment_author_url;
+		$comment_author_url = esc_url( $comment_author_url, array( 'http', 'https' ) );
+
+		$comment_id = $comment->comment_ID;
 	}
 
 	/**
 	 * Filters the comment author's URL.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
-	 * @param string          $url        The comment author's URL, or an empty string.
-	 * @param string|int      $comment_ID The comment ID as a numeric string, or 0 if not found.
-	 * @param WP_Comment|null $comment    The comment object, or null if not found.
+	 * @param string          $comment_author_url The comment author's URL, or an empty string.
+	 * @param string|int      $comment_id         The comment ID as a numeric string, or 0 if not found.
+	 * @param WP_Comment|null $comment            The comment object, or null if not found.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $id, $comment );
+	return apply_filters( 'get_comment_author_url', $comment_author_url, $comment_id, $comment );
 }
 
 /**
  * Displays the URL of the author of the current comment, not linked.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *                                   Default current comment.
  */
-function comment_author_url( $comment_ID = 0 ) {
-	$comment    = get_comment( $comment_ID );
-	$author_url = get_comment_author_url( $comment );
+function comment_author_url( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	$comment_author_url = get_comment_author_url( $comment );
 
 	/**
 	 * Filters the comment author's URL for display.
 	 *
 	 * @since 1.2.0
-	 * @since 4.1.0 The `$comment_ID` parameter was added.
+	 * @since 4.1.0 The `$comment_id` parameter was added.
 	 *
-	 * @param string $author_url The comment author's URL.
-	 * @param string $comment_ID The comment ID as a numeric string.
+	 * @param string $comment_author_url The comment author's URL.
+	 * @param string $comment_id         The comment ID as a numeric string.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
+	echo apply_filters( 'comment_url', $comment_author_url, $comment->comment_ID );
 }
 
 /**
  * Retrieves the HTML link of the URL of the author of the current comment.
  *
- * $linktext parameter is only used if the URL does not exist for the comment
- * author. If the URL does exist then the URL will be used and the $linktext
+ * $link_text parameter is only used if the URL does not exist for the comment
+ * author. If the URL does exist then the URL will be used and the $link_text
  * will be ignored.
  *
  * Encapsulate the HTML link between the $before and $after. So it will appear
@@ -366,36 +408,41 @@ function comment_author_url( $comment_ID = 0 ) {
  * @since 1.5.0
  * @since 4.6.0 Added the `$comment` parameter.
  *
- * @param string         $linktext Optional. The text to display instead of the comment
- *                                 author's email address. Default empty.
- * @param string         $before   Optional. The text or HTML to display before the email link.
- *                                 Default empty.
- * @param string         $after    Optional. The text or HTML to display after the email link.
- *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
- *                                 Default is the current comment.
+ * @param string         $link_text Optional. The text to display instead of the comment
+ *                                  author's email address. Default empty.
+ * @param string         $before    Optional. The text or HTML to display before the email link.
+ *                                  Default empty.
+ * @param string         $after     Optional. The text or HTML to display after the email link.
+ *                                  Default empty.
+ * @param int|WP_Comment $comment   Optional. Comment ID or WP_Comment object.
+ *                                  Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url     = get_comment_author_url( $comment );
-	$display = ( '' !== $linktext ) ? $linktext : $url;
+function get_comment_author_url_link( $link_text = '', $before = '', $after = '', $comment = 0 ) {
+	$comment_author_url = get_comment_author_url( $comment );
+
+	$display = ( '' !== $link_text ) ? $link_text : $comment_author_url;
 	$display = str_replace( 'http://www.', '', $display );
 	$display = str_replace( 'http://', '', $display );
 
-	if ( '/' === substr( $display, -1 ) ) {
+	if ( str_ends_with( $display, '/' ) ) {
 		$display = substr( $display, 0, -1 );
 	}
 
-	$return = "$before<a href='$url' rel='external'>$display</a>$after";
+	$comment_author_url_link = $before . sprintf(
+		'<a href="%1$s" rel="external">%2$s</a>',
+		$comment_author_url,
+		$display
+	) . $after;
 
 	/**
 	 * Filters the comment author's returned URL link.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param string $return The HTML-formatted comment author URL link.
+	 * @param string $comment_author_url_link The HTML-formatted comment author URL link.
 	 */
-	return apply_filters( 'get_comment_author_url_link', $return );
+	return apply_filters( 'get_comment_author_url_link', $comment_author_url_link );
 }
 
 /**
@@ -404,17 +451,17 @@ function get_comment_author_url_link( $linktext = '', $before = '', $after = '',
  * @since 0.71
  * @since 4.6.0 Added the `$comment` parameter.
  *
- * @param string         $linktext Optional. Text to display instead of the comment author's
- *                                 email address. Default empty.
- * @param string         $before   Optional. Text or HTML to display before the email link.
- *                                 Default empty.
- * @param string         $after    Optional. Text or HTML to display after the email link.
- *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
- *                                 Default is the current comment.
+ * @param string         $link_text Optional. Text to display instead of the comment author's
+ *                                  email address. Default empty.
+ * @param string         $before    Optional. Text or HTML to display before the email link.
+ *                                  Default empty.
+ * @param string         $after     Optional. Text or HTML to display after the email link.
+ *                                  Default empty.
+ * @param int|WP_Comment $comment   Optional. Comment ID or WP_Comment object.
+ *                                  Default is the current comment.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	echo get_comment_author_url_link( $linktext, $before, $after, $comment );
+function comment_author_url_link( $link_text = '', $before = '', $after = '', $comment = 0 ) {
+	echo get_comment_author_url_link( $link_text, $before, $after, $comment );
 }
 
 /**
@@ -425,8 +472,8 @@ function comment_author_url_link( $linktext = '', $before = '', $after = '', $co
  *
  * @param string|string[] $css_class Optional. One or more classes to add to the class list.
  *                                   Default empty.
- * @param int|WP_Comment  $comment   Comment ID or WP_Comment object. Default current comment.
- * @param int|WP_Post     $post      Post ID or WP_Post object. Default current post.
+ * @param int|WP_Comment  $comment   Optional. Comment ID or WP_Comment object. Default current comment.
+ * @param int|WP_Post     $post      Optional. Post ID or WP_Post object. Default current post.
  * @param bool            $display   Optional. Whether to print or return the output.
  *                                   Default true.
  * @return void|string Void if `$display` argument is true, comment classes if `$display` is false.
@@ -452,9 +499,10 @@ function comment_class( $css_class = '', $comment = null, $post = null, $display
  * @global int $comment_depth
  * @global int $comment_thread_alt
  *
- * @param string|string[] $css_class  Optional. One or more classes to add to the class list. Default empty.
- * @param int|WP_Comment  $comment_id Comment ID or WP_Comment object. Default current comment.
- * @param int|WP_Post     $post       Post ID or WP_Post object. Default current post.
+ * @param string|string[] $css_class  Optional. One or more classes to add to the class list.
+ *                                    Default empty.
+ * @param int|WP_Comment  $comment_id Optional. Comment ID or WP_Comment object. Default current comment.
+ * @param int|WP_Post     $post       Optional. Post ID or WP_Post object. Default current post.
  * @return string[] An array of classes.
  */
 function get_comment_class( $css_class = '', $comment_id = null, $post = null ) {
@@ -543,44 +591,44 @@ function get_comment_class( $css_class = '', $comment_id = null, $post = null )
  * Retrieves the comment date of the current comment.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
  * @param string         $format     Optional. PHP date format. Defaults to the 'date_format' option.
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to get the date.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to get the date.
  *                                   Default current comment.
  * @return string The comment's date.
  */
-function get_comment_date( $format = '', $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_date( $format = '', $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
 
 	$_format = ! empty( $format ) ? $format : get_option( 'date_format' );
 
-	$date = mysql2date( $_format, $comment->comment_date );
+	$comment_date = mysql2date( $_format, $comment->comment_date );
 
 	/**
 	 * Filters the returned comment date.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param string|int $date    Formatted date string or Unix timestamp.
-	 * @param string     $format  PHP date format.
-	 * @param WP_Comment $comment The comment object.
+	 * @param string|int $comment_date Formatted date string or Unix timestamp.
+	 * @param string     $format       PHP date format.
+	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_date', $date, $format, $comment );
+	return apply_filters( 'get_comment_date', $comment_date, $format, $comment );
 }
 
 /**
  * Displays the comment date of the current comment.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
  * @param string         $format     Optional. PHP date format. Defaults to the 'date_format' option.
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
+ * @param int|WP_Comment $comment_id WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
-function comment_date( $format = '', $comment_ID = 0 ) {
-	echo get_comment_date( $format, $comment_ID );
+function comment_date( $format = '', $comment_id = 0 ) {
+	echo get_comment_date( $format, $comment_id );
 }
 
 /**
@@ -589,14 +637,14 @@ function comment_date( $format = '', $comment_ID = 0 ) {
  * Returns a maximum of 20 words with an ellipsis appended if necessary.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
- *                                    Default current comment.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to get the excerpt.
+ *                                   Default current comment.
  * @return string The possibly truncated comment excerpt.
  */
-function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_excerpt( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
 
 	if ( ! post_password_required( $comment->comment_post_ID ) ) {
 		$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
@@ -616,42 +664,43 @@ function get_comment_excerpt( $comment_ID = 0 ) {
 	 */
 	$comment_excerpt_length = apply_filters( 'comment_excerpt_length', $comment_excerpt_length );
 
-	$excerpt = wp_trim_words( $comment_text, $comment_excerpt_length, '&hellip;' );
+	$comment_excerpt = wp_trim_words( $comment_text, $comment_excerpt_length, '&hellip;' );
 
 	/**
 	 * Filters the retrieved comment excerpt.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
-	 * @param string     $excerpt    The comment excerpt text.
-	 * @param string     $comment_ID The comment ID as a numeric string.
-	 * @param WP_Comment $comment    The comment object.
+	 * @param string     $comment_excerpt The comment excerpt text.
+	 * @param string     $comment_id      The comment ID as a numeric string.
+	 * @param WP_Comment $comment         The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
+	return apply_filters( 'get_comment_excerpt', $comment_excerpt, $comment->comment_ID, $comment );
 }
 
 /**
  * Displays the excerpt of the current comment.
  *
  * @since 1.2.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
- *                                    Default current comment.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to print the excerpt.
+ *                                   Default current comment.
  */
-function comment_excerpt( $comment_ID = 0 ) {
-	$comment         = get_comment( $comment_ID );
+function comment_excerpt( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
 	$comment_excerpt = get_comment_excerpt( $comment );
 
 	/**
 	 * Filters the comment excerpt for display.
 	 *
 	 * @since 1.2.0
-	 * @since 4.1.0 The `$comment_ID` parameter was added.
+	 * @since 4.1.0 The `$comment_id` parameter was added.
 	 *
 	 * @param string $comment_excerpt The comment excerpt text.
-	 * @param string $comment_ID      The comment ID as a numeric string.
+	 * @param string $comment_id      The comment ID as a numeric string.
 	 */
 	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
 }
@@ -664,8 +713,9 @@ function comment_excerpt( $comment_ID = 0 ) {
  * @return string The comment ID as a numeric string.
  */
 function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	$comment    = get_comment();
-	$comment_ID = ! empty( $comment->comment_ID ) ? $comment->comment_ID : '0';
+	$comment = get_comment();
+
+	$comment_id = ! empty( $comment->comment_ID ) ? $comment->comment_ID : '0';
 
 	/**
 	 * Filters the returned comment ID.
@@ -673,10 +723,10 @@ function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFun
 	 * @since 1.5.0
 	 * @since 4.1.0 The `$comment` parameter was added.
 	 *
-	 * @param string     $comment_ID The current comment ID as a numeric string.
+	 * @param string     $comment_id The current comment ID as a numeric string.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_ID', $comment_ID, $comment );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
+	return apply_filters( 'get_comment_ID', $comment_id, $comment );  // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
 }
 
 /**
@@ -699,7 +749,7 @@ function comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctio
  * @global WP_Rewrite $wp_rewrite      WordPress rewrite component.
  * @global bool       $in_comment_loop
  *
- * @param WP_Comment|int|null $comment Comment to retrieve. Default current comment.
+ * @param WP_Comment|int|null $comment Optional. Comment to retrieve. Default current comment.
  * @param array               $args {
  *     An array of optional arguments to override the defaults.
  *
@@ -730,9 +780,10 @@ function get_comment_link( $comment = null, $args = array() ) {
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args     = wp_parse_args( $args, $defaults );
 
-	$link = get_permalink( $comment->comment_post_ID );
+	$args = wp_parse_args( $args, $defaults );
+
+	$comment_link = get_permalink( $comment->comment_post_ID );
 
 	// The 'cpage' param takes precedence.
 	if ( ! is_null( $args['cpage'] ) ) {
@@ -772,20 +823,20 @@ function get_comment_link( $comment = null, $args = array() ) {
 	if ( $cpage && get_option( 'page_comments' ) ) {
 		if ( $wp_rewrite->using_permalinks() ) {
 			if ( $cpage ) {
-				$link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
+				$comment_link = trailingslashit( $comment_link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
 			}
 
-			$link = user_trailingslashit( $link, 'comment' );
+			$comment_link = user_trailingslashit( $comment_link, 'comment' );
 		} elseif ( $cpage ) {
-			$link = add_query_arg( 'cpage', $cpage, $link );
+			$comment_link = add_query_arg( 'cpage', $cpage, $comment_link );
 		}
 	}
 
 	if ( $wp_rewrite->using_permalinks() ) {
-		$link = user_trailingslashit( $link, 'comment' );
+		$comment_link = user_trailingslashit( $comment_link, 'comment' );
 	}
 
-	$link = $link . '#comment-' . $comment->comment_ID;
+	$comment_link = $comment_link . '#comment-' . $comment->comment_ID;
 
 	/**
 	 * Filters the returned single comment permalink.
@@ -795,12 +846,12 @@ function get_comment_link( $comment = null, $args = array() ) {
 	 *
 	 * @see get_page_of_comment()
 	 *
-	 * @param string     $link    The comment permalink with '#comment-$id' appended.
-	 * @param WP_Comment $comment The current comment object.
-	 * @param array      $args    An array of arguments to override the defaults.
-	 * @param int        $cpage   The calculated 'cpage' value.
+	 * @param string     $comment_link The comment permalink with '#comment-$id' appended.
+	 * @param WP_Comment $comment      The current comment object.
+	 * @param array      $args         An array of arguments to override the defaults.
+	 * @param int        $cpage        The calculated 'cpage' value.
 	 */
-	return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
+	return apply_filters( 'get_comment_link', $comment_link, $comment, $args, $cpage );
 }
 
 /**
@@ -856,18 +907,18 @@ function comments_link( $deprecated = '', $deprecated_2 = '' ) {
 function get_comments_number( $post = 0 ) {
 	$post = get_post( $post );
 
-	$count   = $post ? $post->comment_count : 0;
-	$post_id = $post ? $post->ID : 0;
+	$comments_number = $post ? $post->comment_count : 0;
+	$post_id         = $post ? $post->ID : 0;
 
 	/**
 	 * Filters the returned comment count for a post.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param string|int $count   A string representing the number of comments a post has, otherwise 0.
+	 * @param string|int $comments_number A string representing the number of comments a post has, otherwise 0.
 	 * @param int        $post_id Post ID.
 	 */
-	return apply_filters( 'get_comments_number', $count, $post_id );
+	return apply_filters( 'get_comments_number', $comments_number, $post_id );
 }
 
 /**
@@ -898,12 +949,15 @@ function comments_number( $zero = false, $one = false, $more = false, $post = 0
  * @return string Language string for the number of comments a post has.
  */
 function get_comments_number_text( $zero = false, $one = false, $more = false, $post = 0 ) {
-	$number = get_comments_number( $post );
+	$comments_number = get_comments_number( $post );
 
-	if ( $number > 1 ) {
+	if ( $comments_number > 1 ) {
 		if ( false === $more ) {
-			/* translators: %s: Number of comments. */
-			$output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
+			$comments_number_text = sprintf(
+				/* translators: %s: Number of comments. */
+				_n( '%s Comment', '%s Comments', $comments_number ),
+				number_format_i18n( $comments_number )
+			);
 		} else {
 			// % Comments
 			/*
@@ -912,29 +966,30 @@ function get_comments_number_text( $zero = false, $one = false, $more = false, $
 			 */
 			if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {
 				$text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );
-				$text = preg_replace( '/&.+?;/', '', $text ); // Kill entities.
+				$text = preg_replace( '/&.+?;/', '', $text ); // Remove HTML entities.
 				$text = trim( strip_tags( $text ), '% ' );
 
 				// Replace '% Comments' with a proper plural form.
-				if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+				if ( $text && ! preg_match( '/[0-9]+/', $text ) && str_contains( $more, '%' ) ) {
 					/* translators: %s: Number of comments. */
-					$new_text = _n( '%s Comment', '%s Comments', $number );
+					$new_text = _n( '%s Comment', '%s Comments', $comments_number );
 					$new_text = trim( sprintf( $new_text, '' ) );
 
 					$more = str_replace( $text, $new_text, $more );
-					if ( false === strpos( $more, '%' ) ) {
+					if ( ! str_contains( $more, '%' ) ) {
 						$more = '% ' . $more;
 					}
 				}
 			}
 
-			$output = str_replace( '%', number_format_i18n( $number ), $more );
+			$comments_number_text = str_replace( '%', number_format_i18n( $comments_number ), $more );
 		}
-	} elseif ( 0 == $number ) {
-		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
+	} elseif ( 0 == $comments_number ) {
+		$comments_number_text = ( false === $zero ) ? __( 'No Comments' ) : $zero;
 	} else { // Must be one.
-		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
+		$comments_number_text = ( false === $one ) ? __( '1 Comment' ) : $one;
 	}
+
 	/**
 	 * Filters the comments count for display.
 	 *
@@ -942,31 +997,31 @@ function get_comments_number_text( $zero = false, $one = false, $more = false, $
 	 *
 	 * @see _n()
 	 *
-	 * @param string $output A translatable string formatted based on whether the count
-	 *                       is equal to 0, 1, or 1+.
-	 * @param int    $number The number of post comments.
+	 * @param string $comments_number_text A translatable string formatted based on whether the count
+	 *                                     is equal to 0, 1, or 1+.
+	 * @param int    $comments_number      The number of post comments.
 	 */
-	return apply_filters( 'comments_number', $output, $number );
+	return apply_filters( 'comments_number', $comments_number_text, $comments_number );
 }
 
 /**
  * Retrieves the text of the current comment.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  * @since 5.4.0 Added 'In reply to %s.' prefix to child comments in comments feed.
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to get the text.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to get the text.
  *                                   Default current comment.
  * @param array          $args       Optional. An array of arguments. Default empty array.
  * @return string The comment content.
  */
-function get_comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_text( $comment_id = 0, $args = array() ) {
+	$comment = get_comment( $comment_id );
 
-	$comment_content = $comment->comment_content;
+	$comment_text = $comment->comment_content;
 
 	if ( is_comment_feed() && $comment->comment_parent ) {
 		$parent = get_comment( $comment->comment_parent );
@@ -974,11 +1029,11 @@ function get_comment_text( $comment_ID = 0, $args = array() ) {
 			$parent_link = esc_url( get_comment_link( $parent ) );
 			$name        = get_comment_author( $parent );
 
-			$comment_content = sprintf(
+			$comment_text = sprintf(
 				/* translators: %s: Comment link. */
 				ent2ncr( __( 'In reply to %s.' ) ),
 				'<a href="' . $parent_link . '">' . $name . '</a>'
-			) . "\n\n" . $comment_content;
+			) . "\n\n" . $comment_text;
 		}
 	}
 
@@ -989,29 +1044,30 @@ function get_comment_text( $comment_ID = 0, $args = array() ) {
 	 *
 	 * @see Walker_Comment::comment()
 	 *
-	 * @param string     $comment_content Text of the comment.
-	 * @param WP_Comment $comment         The comment object.
-	 * @param array      $args            An array of arguments.
+	 * @param string     $comment_text Text of the comment.
+	 * @param WP_Comment $comment      The comment object.
+	 * @param array      $args         An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment_content, $comment, $args );
+	return apply_filters( 'get_comment_text', $comment_text, $comment, $args );
 }
 
 /**
  * Displays the text of the current comment.
  *
  * @since 0.71
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the text.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to print the text.
  *                                   Default current comment.
  * @param array          $args       Optional. An array of arguments. Default empty array.
  */
-function comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function comment_text( $comment_id = 0, $args = array() ) {
+	$comment = get_comment( $comment_id );
 
 	$comment_text = get_comment_text( $comment, $args );
+
 	/**
 	 * Filters the text of a comment to be displayed.
 	 *
@@ -1019,7 +1075,7 @@ function comment_text( $comment_ID = 0, $args = array() ) {
 	 *
 	 * @see Walker_Comment::comment()
 	 *
-	 * @param string          $comment_text Text of the current comment.
+	 * @param string          $comment_text Text of the comment.
 	 * @param WP_Comment|null $comment      The comment object. Null if not found.
 	 * @param array           $args         An array of arguments.
 	 */
@@ -1030,59 +1086,69 @@ function comment_text( $comment_ID = 0, $args = array() ) {
  * Retrieves the comment time of the current comment.
  *
  * @since 1.5.0
+ * @since 6.2.0 Added the `$comment_id` parameter.
  *
- * @param string $format    Optional. PHP time format. Defaults to the 'time_format' option.
- * @param bool   $gmt       Optional. Whether to use the GMT date. Default false.
- * @param bool   $translate Optional. Whether to translate the time (for use in feeds).
- *                          Default true.
+ * @param string         $format     Optional. PHP date format. Defaults to the 'time_format' option.
+ * @param bool           $gmt        Optional. Whether to use the GMT date. Default false.
+ * @param bool           $translate  Optional. Whether to translate the time (for use in feeds).
+ *                                   Default true.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to get the time.
+ *                                   Default current comment.
  * @return string The formatted time.
  */
-function get_comment_time( $format = '', $gmt = false, $translate = true ) {
-	$comment = get_comment();
+function get_comment_time( $format = '', $gmt = false, $translate = true, $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
+
+	if ( null === $comment ) {
+		return '';
+	}
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
 
 	$_format = ! empty( $format ) ? $format : get_option( 'time_format' );
 
-	$date = mysql2date( $_format, $comment_date, $translate );
+	$comment_time = mysql2date( $_format, $comment_date, $translate );
 
 	/**
 	 * Filters the returned comment time.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param string|int $date      The comment time, formatted as a date string or Unix timestamp.
-	 * @param string     $format    PHP date format.
-	 * @param bool       $gmt       Whether the GMT date is in use.
-	 * @param bool       $translate Whether the time is translated.
-	 * @param WP_Comment $comment   The comment object.
+	 * @param string|int $comment_time The comment time, formatted as a date string or Unix timestamp.
+	 * @param string     $format       PHP date format.
+	 * @param bool       $gmt          Whether the GMT date is in use.
+	 * @param bool       $translate    Whether the time is translated.
+	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_time', $date, $format, $gmt, $translate, $comment );
+	return apply_filters( 'get_comment_time', $comment_time, $format, $gmt, $translate, $comment );
 }
 
 /**
  * Displays the comment time of the current comment.
  *
  * @since 0.71
+ * @since 6.2.0 Added the `$comment_id` parameter.
  *
- * @param string $format Optional. PHP time format. Defaults to the 'time_format' option.
+ * @param string         $format     Optional. PHP time format. Defaults to the 'time_format' option.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to print the time.
+ *                                   Default current comment.
  */
-function comment_time( $format = '' ) {
-	echo get_comment_time( $format );
+function comment_time( $format = '', $comment_id = 0 ) {
+	echo get_comment_time( $format, false, true, $comment_id );
 }
 
 /**
  * Retrieves the comment type of the current comment.
  *
  * @since 1.5.0
- * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
+ * @since 4.4.0 Added the ability for `$comment_id` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
+ * @param int|WP_Comment $comment_id Optional. WP_Comment or ID of the comment for which to get the type.
  *                                   Default current comment.
  * @return string The comment type.
  */
-function get_comment_type( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_type( $comment_id = 0 ) {
+	$comment = get_comment( $comment_id );
 
 	if ( '' === $comment->comment_type ) {
 		$comment->comment_type = 'comment';
@@ -1092,10 +1158,10 @@ function get_comment_type( $comment_ID = 0 ) {
 	 * Filters the returned comment type.
 	 *
 	 * @since 1.5.0
-	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
+	 * @since 4.1.0 The `$comment_id` and `$comment` parameters were added.
 	 *
 	 * @param string     $comment_type The type of comment, such as 'comment', 'pingback', or 'trackback'.
-	 * @param string     $comment_ID   The comment ID as a numeric string.
+	 * @param string     $comment_id   The comment ID as a numeric string.
 	 * @param WP_Comment $comment      The comment object.
 	 */
 	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
@@ -1231,24 +1297,24 @@ function trackback_rdf( $deprecated = '' ) {
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Post ID or WP_Post object. Default current post.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return bool True if the comments are open.
  */
 function comments_open( $post = null ) {
 	$_post = get_post( $post );
 
-	$post_id = $_post ? $_post->ID : 0;
-	$open    = ( $_post && ( 'open' === $_post->comment_status ) );
+	$post_id       = $_post ? $_post->ID : 0;
+	$comments_open = ( $_post && ( 'open' === $_post->comment_status ) );
 
 	/**
 	 * Filters whether the current post is open for comments.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param bool $open    Whether the current post is open for comments.
-	 * @param int  $post_id The post ID.
+	 * @param bool $comments_open Whether the current post is open for comments.
+	 * @param int  $post_id       The post ID.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters( 'comments_open', $comments_open, $post_id );
 }
 
 /**
@@ -1260,24 +1326,24 @@ function comments_open( $post = null ) {
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Post ID or WP_Post object. Default current post.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return bool True if pings are accepted
  */
 function pings_open( $post = null ) {
 	$_post = get_post( $post );
 
-	$post_id = $_post ? $_post->ID : 0;
-	$open    = ( $_post && ( 'open' === $_post->ping_status ) );
+	$post_id    = $_post ? $_post->ID : 0;
+	$pings_open = ( $_post && ( 'open' === $_post->ping_status ) );
 
 	/**
 	 * Filters whether the current post is open for pings.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param bool $open    Whether the current post is open for pings.
-	 * @param int  $post_id The post ID.
+	 * @param bool $pings_open Whether the current post is open for pings.
+	 * @param int  $post_id    The post ID.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters( 'pings_open', $pings_open, $post_id );
 }
 
 /**
@@ -1374,12 +1440,11 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	$comment_author_url = esc_url( $commenter['comment_author_url'] );
 
 	$comment_args = array(
-		'orderby'                   => 'comment_date_gmt',
-		'order'                     => 'ASC',
-		'status'                    => 'approve',
-		'post_id'                   => $post->ID,
-		'no_found_rows'             => false,
-		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
+		'orderby'       => 'comment_date_gmt',
+		'order'         => 'ASC',
+		'status'        => 'approve',
+		'post_id'       => $post->ID,
+		'no_found_rows' => false,
 	);
 
 	if ( get_option( 'thread_comments' ) ) {
@@ -1567,9 +1632,9 @@ function comments_template( $file = '/comments.php', $separate_comments = false
  * @param false|string $none      Optional. String to display when comments have been turned off. Default false.
  */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-	$post_id    = get_the_ID();
-	$post_title = get_the_title();
-	$number     = get_comments_number( $post_id );
+	$post_id         = get_the_ID();
+	$post_title      = get_the_title();
+	$comments_number = get_comments_number( $post_id );
 
 	if ( false === $zero ) {
 		/* translators: %s: Post title. */
@@ -1583,8 +1648,12 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 
 	if ( false === $more ) {
 		/* translators: 1: Number of comments, 2: Post title. */
-		$more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
-		$more = sprintf( $more, number_format_i18n( $number ), $post_title );
+		$more = _n(
+			'%1$s Comment<span class="screen-reader-text"> on %2$s</span>',
+			'%1$s Comments<span class="screen-reader-text"> on %2$s</span>',
+			$comments_number
+		);
+		$more = sprintf( $more, number_format_i18n( $comments_number ), $post_title );
 	}
 
 	if ( false === $none ) {
@@ -1592,8 +1661,12 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $post_title );
 	}
 
-	if ( 0 == $number && ! comments_open() && ! pings_open() ) {
-		echo '<span' . ( ( ! empty( $css_class ) ) ? ' class="' . esc_attr( $css_class ) . '"' : '' ) . '>' . $none . '</span>';
+	if ( 0 == $comments_number && ! comments_open() && ! pings_open() ) {
+		printf(
+			'<span%1$s>%2$s</span>',
+			! empty( $css_class ) ? ' class="' . esc_attr( $css_class ) . '"' : '',
+			$none
+		);
 		return;
 	}
 
@@ -1602,8 +1675,7 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 		return;
 	}
 
-	echo '<a href="';
-	if ( 0 == $number ) {
+	if ( 0 == $comments_number ) {
 		$respond_link = get_permalink() . '#respond';
 		/**
 		 * Filters the respond link when a post has no comments.
@@ -1613,29 +1685,29 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 		 * @param string $respond_link The default response link.
 		 * @param int    $post_id      The post ID.
 		 */
-		echo apply_filters( 'respond_link', $respond_link, $post_id );
+		$comments_link = apply_filters( 'respond_link', $respond_link, $post_id );
 	} else {
-		comments_link();
+		$comments_link = get_comments_link();
 	}
-	echo '"';
 
-	if ( ! empty( $css_class ) ) {
-		echo ' class="' . $css_class . '" ';
-	}
+	$link_attributes = '';
 
-	$attributes = '';
 	/**
 	 * Filters the comments link attributes for display.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $attributes The comments link attributes. Default empty.
+	 * @param string $link_attributes The comments link attributes. Default empty.
 	 */
-	echo apply_filters( 'comments_popup_link_attributes', $attributes );
-
-	echo '>';
-	comments_number( $zero, $one, $more );
-	echo '</a>';
+	$link_attributes = apply_filters( 'comments_popup_link_attributes', $link_attributes );
+
+	printf(
+		'<a href="%1$s"%2$s%3$s>%4$s</a>',
+		esc_url( $comments_link ),
+		! empty( $css_class ) ? ' class="' . $css_class . '" ' : '',
+		$link_attributes,
+		get_comments_number_text( $zero, $one, $more )
+	);
 }
 
 /**
@@ -1661,8 +1733,8 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
  *     @type string $before     The text or HTML to add before the reply link. Default empty.
  *     @type string $after      The text or HTML to add after the reply link. Default empty.
  * }
- * @param int|WP_Comment $comment Comment being replied to. Default current comment.
- * @param int|WP_Post    $post    Post ID or WP_Post object the comment is going to be displayed on.
+ * @param int|WP_Comment $comment Optional. Comment being replied to. Default current comment.
+ * @param int|WP_Post    $post    Optional. Post ID or WP_Post object the comment is going to be displayed on.
  *                                Default current post.
  * @return string|false|null Link to show comment form, if successful. False, if comments are closed.
  */
@@ -1761,17 +1833,19 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
 		);
 	}
 
+	$comment_reply_link = $args['before'] . $link . $args['after'];
+
 	/**
 	 * Filters the comment reply link.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string     $link    The HTML markup for the comment reply link.
-	 * @param array      $args    An array of arguments overriding the defaults.
-	 * @param WP_Comment $comment The object of the comment being replied.
-	 * @param WP_Post    $post    The WP_Post object.
+	 * @param string     $comment_reply_link The HTML markup for the comment reply link.
+	 * @param array      $args               An array of arguments overriding the defaults.
+	 * @param WP_Comment $comment            The object of the comment being replied.
+	 * @param WP_Post    $post               The WP_Post object.
 	 */
-	return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
+	return apply_filters( 'comment_reply_link', $comment_reply_link, $args, $comment, $post );
 }
 
 /**
@@ -1782,8 +1856,8 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
  * @see get_comment_reply_link()
  *
  * @param array          $args    Optional. Override default options. Default empty array.
- * @param int|WP_Comment $comment Comment being replied to. Default current comment.
- * @param int|WP_Post    $post    Post ID or WP_Post object the comment is going to be displayed on.
+ * @param int|WP_Comment $comment Optional. Comment being replied to. Default current comment.
+ * @param int|WP_Post    $post    Optional. Post ID or WP_Post object the comment is going to be displayed on.
  *                                Default current post.
  */
 function comment_reply_link( $args = array(), $comment = null, $post = null ) {
@@ -1852,17 +1926,18 @@ function get_post_reply_link( $args = array(), $post = null ) {
 			$args['reply_text']
 		);
 	}
-	$formatted_link = $args['before'] . $link . $args['after'];
+
+	$post_reply_link = $args['before'] . $link . $args['after'];
 
 	/**
 	 * Filters the formatted post comments link HTML.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string      $formatted The HTML-formatted post comments link.
-	 * @param int|WP_Post $post      The post ID or WP_Post object.
+	 * @param string      $post_reply_link The HTML-formatted post comments link.
+	 * @param int|WP_Post $post            The post ID or WP_Post object.
 	 */
-	return apply_filters( 'post_comments_link', $formatted_link, $post );
+	return apply_filters( 'post_comments_link', $post_reply_link, $post );
 }
 
 /**
@@ -1873,7 +1948,7 @@ function get_post_reply_link( $args = array(), $post = null ) {
  * @see get_post_reply_link()
  *
  * @param array       $args Optional. Override default options. Default empty array.
- * @param int|WP_Post $post Post ID or WP_Post object the comment is going to be displayed on.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object the comment is going to be displayed on.
  *                          Default current post.
  */
 function post_reply_link( $args = array(), $post = null ) {
@@ -1884,31 +1959,41 @@ function post_reply_link( $args = array(), $post = null ) {
  * Retrieves HTML content for cancel comment reply link.
  *
  * @since 2.7.0
+ * @since 6.2.0 Added the `$post` parameter.
  *
- * @param string $text Optional. Text to display for cancel reply link. If empty,
- *                     defaults to 'Click here to cancel reply'. Default empty.
+ * @param string           $link_text Optional. Text to display for cancel reply link. If empty,
+ *                                    defaults to 'Click here to cancel reply'. Default empty.
+ * @param int|WP_Post|null $post      Optional. The post the comment thread is being
+ *                                    displayed for. Defaults to the current global post.
  * @return string
  */
-function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty( $text ) ) {
-		$text = __( 'Click here to cancel reply.' );
+function get_cancel_comment_reply_link( $link_text = '', $post = null ) {
+	if ( empty( $link_text ) ) {
+		$link_text = __( 'Click here to cancel reply.' );
 	}
 
-	$style = isset( $_GET['replytocom'] ) ? '' : ' style="display:none;"';
-	$link  = esc_html( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
+	$post        = get_post( $post );
+	$reply_to_id = $post ? _get_comment_reply_id( $post->ID ) : 0;
+	$link_style  = 0 !== $reply_to_id ? '' : ' style="display:none;"';
+	$link_url    = esc_url( remove_query_arg( array( 'replytocom', 'unapproved', 'moderation-hash' ) ) ) . '#respond';
 
-	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+	$cancel_comment_reply_link = sprintf(
+		'<a rel="nofollow" id="cancel-comment-reply-link" href="%1$s"%2$s>%3$s</a>',
+		$link_url,
+		$link_style,
+		$link_text
+	);
 
 	/**
 	 * Filters the cancel comment reply link HTML.
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string $formatted_link The HTML-formatted cancel comment reply link.
-	 * @param string $link           Cancel comment reply link URL.
-	 * @param string $text           Cancel comment reply link text.
+	 * @param string $cancel_comment_reply_link The HTML-formatted cancel comment reply link.
+	 * @param string $link_url                  Cancel comment reply link URL.
+	 * @param string $link_text                 Cancel comment reply link text.
 	 */
-	return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
+	return apply_filters( 'cancel_comment_reply_link', $cancel_comment_reply_link, $link_url, $link_text );
 }
 
 /**
@@ -1916,40 +2001,45 @@ function get_cancel_comment_reply_link( $text = '' ) {
  *
  * @since 2.7.0
  *
- * @param string $text Optional. Text to display for cancel reply link. If empty,
+ * @param string $link_text Optional. Text to display for cancel reply link. If empty,
  *                     defaults to 'Click here to cancel reply'. Default empty.
  */
-function cancel_comment_reply_link( $text = '' ) {
-	echo get_cancel_comment_reply_link( $text );
+function cancel_comment_reply_link( $link_text = '' ) {
+	echo get_cancel_comment_reply_link( $link_text );
 }
 
 /**
  * Retrieves hidden input HTML for replying to comments.
  *
  * @since 3.0.0
+ * @since 6.2.0 Renamed `$post_id` to `$post` and added WP_Post support.
  *
- * @param int $post_id Optional. Post ID. Defaults to the current post ID.
+ * @param int|WP_Post|null $post Optional. The post the comment is being displayed for.
+ *                               Defaults to the current global post.
  * @return string Hidden input HTML for replying to comments.
  */
-function get_comment_id_fields( $post_id = 0 ) {
-	if ( empty( $post_id ) ) {
-		$post_id = get_the_ID();
+function get_comment_id_fields( $post = null ) {
+	$post = get_post( $post );
+	if ( ! $post ) {
+		return '';
 	}
 
-	$reply_to_id = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
-	$result      = "<input type='hidden' name='comment_post_ID' value='$post_id' id='comment_post_ID' />\n";
-	$result     .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$reply_to_id' />\n";
+	$post_id     = $post->ID;
+	$reply_to_id = _get_comment_reply_id( $post_id );
+
+	$comment_id_fields  = "<input type='hidden' name='comment_post_ID' value='$post_id' id='comment_post_ID' />\n";
+	$comment_id_fields .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$reply_to_id' />\n";
 
 	/**
 	 * Filters the returned comment ID fields.
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param string $result      The HTML-formatted hidden ID field comment elements.
-	 * @param int    $post_id     The post ID.
-	 * @param int    $reply_to_id The ID of the comment being replied to.
+	 * @param string $comment_id_fields The HTML-formatted hidden ID field comment elements.
+	 * @param int    $post_id           The post ID.
+	 * @param int    $reply_to_id       The ID of the comment being replied to.
 	 */
-	return apply_filters( 'comment_id_fields', $result, $post_id, $reply_to_id );
+	return apply_filters( 'comment_id_fields', $comment_id_fields, $post_id, $reply_to_id );
 }
 
 /**
@@ -1961,13 +2051,15 @@ function get_comment_id_fields( $post_id = 0 ) {
  * This tag must be within the `<form>` section of the `comments.php` template.
  *
  * @since 2.7.0
+ * @since 6.2.0 Renamed `$post_id` to `$post` and added WP_Post support.
  *
  * @see get_comment_id_fields()
  *
- * @param int $post_id Optional. Post ID. Defaults to the current post ID.
+ * @param int|WP_Post|null $post Optional. The post the comment is being displayed for.
+ *                               Defaults to the current global post.
  */
-function comment_id_fields( $post_id = 0 ) {
-	echo get_comment_id_fields( $post_id );
+function comment_id_fields( $post = null ) {
+	echo get_comment_id_fields( $post );
 }
 
 /**
@@ -1979,18 +2071,21 @@ function comment_id_fields( $post_id = 0 ) {
  *           comment. See https://core.trac.wordpress.org/changeset/36512.
  *
  * @since 2.7.0
+ * @since 6.2.0 Added the `$post` parameter.
  *
  * @global WP_Comment $comment Global comment object.
  *
- * @param string|false $no_reply_text  Optional. Text to display when not replying to a comment.
- *                                     Default false.
- * @param string|false $reply_text     Optional. Text to display when replying to a comment.
- *                                     Default false. Accepts "%s" for the author of the comment
- *                                     being replied to.
- * @param bool         $link_to_parent Optional. Boolean to control making the author's name a link
- *                                     to their comment. Default true.
+ * @param string|false      $no_reply_text  Optional. Text to display when not replying to a comment.
+ *                                          Default false.
+ * @param string|false      $reply_text     Optional. Text to display when replying to a comment.
+ *                                          Default false. Accepts "%s" for the author of the comment
+ *                                          being replied to.
+ * @param bool              $link_to_parent Optional. Boolean to control making the author's name a link
+ *                                          to their comment. Default true.
+ * @param int|WP_Post|null  $post           Optional. The post that the comment form is being displayed for.
+ *                                          Defaults to the current global post.
  */
-function comment_form_title( $no_reply_text = false, $reply_text = false, $link_to_parent = true ) {
+function comment_form_title( $no_reply_text = false, $reply_text = false, $link_to_parent = true, $post = null ) {
 	global $comment;
 
 	if ( false === $no_reply_text ) {
@@ -2002,22 +2097,71 @@ function comment_form_title( $no_reply_text = false, $reply_text = false, $link_
 		$reply_text = __( 'Leave a Reply to %s' );
 	}
 
-	$reply_to_id = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
+	$post = get_post( $post );
+	if ( ! $post ) {
+		echo $no_reply_text;
+		return;
+	}
+
+	$reply_to_id = _get_comment_reply_id( $post->ID );
 
-	if ( 0 == $reply_to_id ) {
+	if ( 0 === $reply_to_id ) {
 		echo $no_reply_text;
+		return;
+	}
+
+	// Sets the global so that template tags can be used in the comment form.
+	$comment = get_comment( $reply_to_id );
+
+	if ( $link_to_parent ) {
+		$comment_author = sprintf(
+			'<a href="#comment-%1$s">%2$s</a>',
+			get_comment_ID(),
+			get_comment_author( $reply_to_id )
+		);
 	} else {
-		// Sets the global so that template tags can be used in the comment form.
-		$comment = get_comment( $reply_to_id );
+		$comment_author = get_comment_author( $reply_to_id );
+	}
 
-		if ( $link_to_parent ) {
-			$author = '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>';
-		} else {
-			$author = get_comment_author( $comment );
-		}
+	printf( $reply_text, $comment_author );
+}
 
-		printf( $reply_text, $author );
+/**
+ * Gets the comment's reply to ID from the $_GET['replytocom'].
+ *
+ * @since 6.2.0
+ *
+ * @access private
+ *
+ * @param int|WP_Post $post The post the comment is being displayed for.
+ *                          Defaults to the current global post.
+ * @return int Comment's reply to ID.
+ */
+function _get_comment_reply_id( $post = null ) {
+	$post = get_post( $post );
+
+	if ( ! $post || ! isset( $_GET['replytocom'] ) || ! is_numeric( $_GET['replytocom'] ) ) {
+		return 0;
 	}
+
+	$reply_to_id = (int) $_GET['replytocom'];
+
+	/*
+	 * Validate the comment.
+	 * Bail out if it does not exist, is not approved, or its
+	 * `comment_post_ID` does not match the given post ID.
+	 */
+	$comment = get_comment( $reply_to_id );
+
+	if (
+		! $comment instanceof WP_Comment ||
+		0 === (int) $comment->comment_approved ||
+		$post->ID !== (int) $comment->comment_post_ID
+	) {
+		return 0;
+	}
+
+	return $reply_to_id;
 }
 
 /**
@@ -2058,7 +2202,7 @@ function comment_form_title( $no_reply_text = false, $reply_text = false, $link_
  *     @type bool     $short_ping        Whether to output short pings. Default false.
  *     @type bool     $echo              Whether to echo the output or return it. Default true.
  * }
- * @param WP_Comment[] $comments Optional. Array of WP_Comment objects.
+ * @param WP_Comment[] $comments Optional. Array of WP_Comment objects. Default null.
  * @return void|string Void if 'echo' argument is true, or no comments to list.
  *                     Otherwise, HTML list of comments.
  */
@@ -2235,10 +2379,8 @@ function wp_list_comments( $args = array(), $comments = null ) {
 		$parsed_args['reverse_top_level'] = ( 'desc' === get_option( 'comment_order' ) );
 	}
 
-	wp_queue_comments_for_comment_meta_lazyload( $_comments );
-
 	if ( empty( $parsed_args['walker'] ) ) {
-		$walker = new Walker_Comment;
+		$walker = new Walker_Comment();
 	} else {
 		$walker = $parsed_args['walker'];
 	}
@@ -2319,7 +2461,7 @@ function wp_list_comments( $args = array(), $comments = null ) {
  *                                        submit button markup and %2$s is the comment hidden fields.
  *     @type string $format               The comment form format. Default 'xhtml'. Accepts 'xhtml', 'html5'.
  * }
- * @param int|WP_Post $post Post ID or WP_Post object to generate the form for. Default current post.
+ * @param int|WP_Post $post Optional. Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post = null ) {
 	$post = get_post( $post );
@@ -2509,7 +2651,7 @@ function comment_form( $args = array(), $post = null ) {
 	$args = array_merge( $defaults, $args );
 
 	// Remove `aria-describedby` from the email field if there's no associated description.
-	if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
+	if ( isset( $args['fields']['email'] ) && ! str_contains( $args['comment_notes_before'], 'id="email-notes"' ) ) {
 		$args['fields']['email'] = str_replace(
 			' aria-describedby="email-notes"',
 			'',
@@ -2528,7 +2670,7 @@ function comment_form( $args = array(), $post = null ) {
 		<?php
 		echo $args['title_reply_before'];
 
-		comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+		comment_form_title( $args['title_reply'], $args['title_reply_to'], true, $post_id );
 
 		if ( get_option( 'thread_comments' ) ) {
 			echo $args['cancel_reply_before'];
diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php
index b5be18ed7a749..604ede7c876a7 100644
--- a/src/wp-includes/comment.php
+++ b/src/wp-includes/comment.php
@@ -97,7 +97,7 @@ function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent,
 			 * Check the comment fields for moderation keywords. If any are found,
 			 * fail the check for the given field by returning false.
 			 */
-			$pattern = "#$word#i";
+			$pattern = "#$word#iu";
 			if ( preg_match( $pattern, $author ) ) {
 				return false;
 			}
@@ -136,7 +136,7 @@ function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent,
 				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
 			}
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty( $mod_keys ) || false === strpos( $email, $mod_keys ) ) ) {
+				( empty( $mod_keys ) || ! str_contains( $email, $mod_keys ) ) ) {
 					return true;
 			} else {
 				return false;
@@ -155,7 +155,13 @@ function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent,
  * @since 4.1.0 Refactored to leverage WP_Comment_Query over a direct query.
  *
  * @param int   $post_id The ID of the post.
- * @param array $args    Optional. See WP_Comment_Query::__construct() for information on accepted arguments.
+ * @param array $args    {
+ *     Optional. See WP_Comment_Query::__construct() for information on accepted arguments.
+ *
+ *     @type int    $status  Comment status to limit results by. Defaults to approved comments.
+ *     @type int    $post_id Limit results to those affiliated with a given post ID.
+ *     @type string $order   How to order retrieved comments. Default 'ASC'.
+ * }
  * @return WP_Comment[]|int[]|int The approved comments, or number of comments if `$count`
  *                                argument is true.
  */
@@ -171,7 +177,7 @@ function get_approved_comments( $post_id, $args = array() ) {
 	);
 	$parsed_args = wp_parse_args( $args, $defaults );
 
-	$query = new WP_Comment_Query;
+	$query = new WP_Comment_Query();
 	return $query->query( $parsed_args );
 }
 
@@ -236,11 +242,11 @@ function get_comment( $comment = null, $output = OBJECT ) {
  * @since 2.7.0
  *
  * @param string|array $args Optional. Array or string of arguments. See WP_Comment_Query::__construct()
- *                           for information on accepted arguments. Default empty.
+ *                           for information on accepted arguments. Default empty string.
  * @return WP_Comment[]|int[]|int List of comments or number of found comments if `$count` argument is true.
  */
 function get_comments( $args = '' ) {
-	$query = new WP_Comment_Query;
+	$query = new WP_Comment_Query();
 	return $query->query( $args );
 }
 
@@ -449,7 +455,7 @@ function add_comment_meta( $comment_id, $meta_key, $meta_value, $unique = false
  * @param string $meta_key   Metadata name.
  * @param mixed  $meta_value Optional. Metadata value. If provided,
  *                           rows will only be removed that match the value.
- *                           Must be serializable if non-scalar. Default empty.
+ *                           Must be serializable if non-scalar. Default empty string.
  * @return bool True on success, false on failure.
  */
 function delete_comment_meta( $comment_id, $meta_key, $meta_value = '' ) {
@@ -465,7 +471,7 @@ function delete_comment_meta( $comment_id, $meta_key, $meta_value = '' ) {
  *
  * @param int    $comment_id Comment ID.
  * @param string $key        Optional. The meta key to retrieve. By default,
- *                           returns data for all keys.
+ *                           returns data for all keys. Default empty string.
  * @param bool   $single     Optional. Whether to return a single value.
  *                           This parameter has no effect if `$key` is not specified.
  *                           Default false.
@@ -478,6 +484,21 @@ function get_comment_meta( $comment_id, $key = '', $single = false ) {
 	return get_metadata( 'comment', $comment_id, $key, $single );
 }
 
+/**
+ * Queue comment meta for lazy-loading.
+ *
+ * @since 6.3.0
+ *
+ * @param array $comment_ids List of comment IDs.
+ */
+function wp_lazyload_comment_meta( array $comment_ids ) {
+	if ( empty( $comment_ids ) ) {
+		return;
+	}
+	$lazyloader = wp_metadata_lazyloader();
+	$lazyloader->queue_objects( 'comment', $comment_ids );
+}
+
 /**
  * Updates comment meta field based on comment ID.
  *
@@ -495,7 +516,7 @@ function get_comment_meta( $comment_id, $key = '', $single = false ) {
  * @param mixed  $meta_value Metadata value. Must be serializable if non-scalar.
  * @param mixed  $prev_value Optional. Previous value to check before updating.
  *                           If specified, only update existing metadata entries with
- *                           this value. Otherwise, update all entries. Default empty.
+ *                           this value. Otherwise, update all entries. Default empty string.
  * @return int|bool Meta ID if the key didn't exist, true on successful update,
  *                  false on failure or if the value passed to the function
  *                  is the same as the one that is already in the database.
@@ -504,30 +525,6 @@ function update_comment_meta( $comment_id, $meta_key, $meta_value, $prev_value =
 	return update_metadata( 'comment', $comment_id, $meta_key, $meta_value, $prev_value );
 }
 
-/**
- * Queues comments for metadata lazy-loading.
- *
- * @since 4.5.0
- *
- * @param WP_Comment[] $comments Array of comment objects.
- */
-function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
-	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
-	$comment_ids = array();
-	if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
-			if ( $comment instanceof WP_Comment ) {
-				$comment_ids[] = $comment->comment_ID;
-			}
-		}
-	}
-
-	if ( $comment_ids ) {
-		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'comment', $comment_ids );
-	}
-}
-
 /**
  * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
  * to recall previous comments by this commentator that are still held in moderation.
@@ -654,8 +651,10 @@ function sanitize_comment_cookies() {
 function wp_allow_comment( $commentdata, $wp_error = false ) {
 	global $wpdb;
 
-	// Simple duplicate check.
-	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
+	/*
+	 * Simple duplicate check.
+	 * expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
+	 */
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
 		wp_unslash( $commentdata['comment_post_ID'] ),
@@ -985,8 +984,10 @@ function separate_comments( &$comments ) {
  * @global WP_Query $wp_query WordPress Query object.
  *
  * @param WP_Comment[] $comments Optional. Array of WP_Comment objects. Defaults to `$wp_query->comments`.
- * @param int          $per_page Optional. Comments per page.
- * @param bool         $threaded Optional. Control over flat or threaded comments.
+ * @param int          $per_page Optional. Comments per page. Defaults to the value of `comments_per_page`
+ *                               query var, option of the same name, or 1 (in that order).
+ * @param bool         $threaded Optional. Control over flat or threaded comments. Defaults to the value
+ *                               of `thread_comments` option.
  * @return int Number of comment pages.
  */
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
@@ -1023,7 +1024,7 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
 	}
 
 	if ( $threaded ) {
-		$walker = new Walker_Comment;
+		$walker = new Walker_Comment();
 		$count  = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
 	} else {
 		$count = ceil( count( $comments ) / $per_page );
@@ -1039,7 +1040,7 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int   $comment_ID Comment ID.
+ * @param int   $comment_id Comment ID.
  * @param array $args {
  *     Array of optional arguments.
  *
@@ -1049,17 +1050,17 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
  *     @type int        $per_page  Per-page count to use when calculating pagination.
  *                                 Defaults to the value of the 'comments_per_page' option.
  *     @type int|string $max_depth If greater than 1, comment page will be determined
- *                                 for the top-level parent `$comment_ID`.
+ *                                 for the top-level parent `$comment_id`.
  *                                 Defaults to the value of the 'thread_comments_depth' option.
- * } *
+ * }
  * @return int|null Comment page number or null on error.
  */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment( $comment_id, $args = array() ) {
 	global $wpdb;
 
 	$page = null;
 
-	$comment = get_comment( $comment_ID );
+	$comment = get_comment( $comment_id );
 	if ( ! $comment ) {
 		return;
 	}
@@ -1175,7 +1176,7 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 	 * Filters the calculated page on which a comment appears.
 	 *
 	 * @since 4.4.0
-	 * @since 4.7.0 Introduced the `$comment_ID` parameter.
+	 * @since 4.7.0 Introduced the `$comment_id` parameter.
 	 *
 	 * @param int   $page          Comment page.
 	 * @param array $args {
@@ -1196,9 +1197,9 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 	 *     @type int    $per_page  Number of comments per page.
 	 *     @type int    $max_depth Maximum comment threading depth allowed.
 	 * }
-	 * @param int $comment_ID ID of the comment.
+	 * @param int $comment_id ID of the comment.
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_ID );
+	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_id );
 }
 
 /**
@@ -1353,11 +1354,10 @@ function wp_check_comment_disallowed_list( $author, $email, $url, $comment, $use
 		if ( empty( $word ) ) {
 			continue; }
 
-		// Do some escaping magic so that '#' chars
-		// in the spam words don't break things:
+		// Do some escaping magic so that '#' chars in the spam words don't break things:
 		$word = preg_quote( $word, '#' );
 
-		$pattern = "#$word#i";
+		$pattern = "#$word#iu";
 		if ( preg_match( $pattern, $author )
 			|| preg_match( $pattern, $email )
 			|| preg_match( $pattern, $url )
@@ -1837,7 +1837,7 @@ function wp_transition_comment_status( $new_status, $old_status, $comment ) {
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string     $comment_ID The comment ID as a numeric string.
+	 * @param string     $comment_id The comment ID as a numeric string.
 	 * @param WP_Comment $comment    Comment object.
 	 */
 	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
@@ -2281,9 +2281,9 @@ function wp_new_comment( $commentdata, $wp_error = false ) {
 		return $commentdata['comment_approved'];
 	}
 
-	$comment_ID = wp_insert_comment( $commentdata );
+	$comment_id = wp_insert_comment( $commentdata );
 
-	if ( ! $comment_ID ) {
+	if ( ! $comment_id ) {
 		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
 
 		foreach ( $fields as $field ) {
@@ -2299,8 +2299,8 @@ function wp_new_comment( $commentdata, $wp_error = false ) {
 			return $commentdata['comment_approved'];
 		}
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_id = wp_insert_comment( $commentdata );
+		if ( ! $comment_id ) {
 			return false;
 		}
 	}
@@ -2311,13 +2311,13 @@ function wp_new_comment( $commentdata, $wp_error = false ) {
 	 * @since 1.2.0
 	 * @since 4.5.0 The `$commentdata` parameter was added.
 	 *
-	 * @param int        $comment_ID       The comment ID.
+	 * @param int        $comment_id       The comment ID.
 	 * @param int|string $comment_approved 1 if the comment is approved, 0 if not, 'spam' if spam.
 	 * @param array      $commentdata      Comment data.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata );
+	do_action( 'comment_post', $comment_id, $commentdata['comment_approved'], $commentdata );
 
-	return $comment_ID;
+	return $comment_id;
 }
 
 /**
@@ -2325,23 +2325,23 @@ function wp_new_comment( $commentdata, $wp_error = false ) {
  *
  * @since 4.4.0
  *
- * @param int $comment_ID ID of the comment.
+ * @param int $comment_id ID of the comment.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_moderator( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_moderator( $comment_id ) {
+	$comment = get_comment( $comment_id );
 
 	// Only send notifications for pending comments.
 	$maybe_notify = ( '0' == $comment->comment_approved );
 
-	/** This filter is documented in wp-includes/comment.php */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+	/** This filter is documented in wp-includes/pluggable.php */
+	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
 
 	if ( ! $maybe_notify ) {
 		return false;
 	}
 
-	return wp_notify_moderator( $comment_ID );
+	return wp_notify_moderator( $comment_id );
 }
 
 /**
@@ -2352,11 +2352,11 @@ function wp_new_comment_notify_moderator( $comment_ID ) {
  * Uses the {@see 'notify_post_author'} filter to determine whether the post author
  * should be notified when a new comment is added, overriding site setting.
  *
- * @param int $comment_ID Comment ID.
+ * @param int $comment_id Comment ID.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_postauthor( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_postauthor( $comment_id ) {
+	$comment = get_comment( $comment_id );
 
 	$maybe_notify = get_option( 'comments_notify' );
 
@@ -2367,9 +2367,9 @@ function wp_new_comment_notify_postauthor( $comment_ID ) {
 	 * @since 4.4.0
 	 *
 	 * @param bool $maybe_notify Whether to notify the post author about the new comment.
-	 * @param int  $comment_ID   The ID of the comment for the notification.
+	 * @param int  $comment_id   The ID of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_id );
 
 	/*
 	 * wp_notify_postauthor() checks if notifying the author of their own comment.
@@ -2384,7 +2384,7 @@ function wp_new_comment_notify_postauthor( $comment_ID ) {
 		return false;
 	}
 
-	return wp_notify_postauthor( $comment_ID );
+	return wp_notify_postauthor( $comment_id );
 }
 
 /**
@@ -2781,9 +2781,9 @@ function wp_update_comment_count_now( $post_id ) {
 /**
  * Finds a pingback server URI based on the given URL.
  *
- * Checks the HTML for the rel="pingback" link and x-pingback headers. It does
- * a check for the x-pingback headers first and returns that, if available. The
- * check for the rel="pingback" has more overhead than just the header.
+ * Checks the HTML for the rel="pingback" link and X-Pingback headers. It does
+ * a check for the X-Pingback headers first and returns that, if available.
+ * The check for the rel="pingback" has more overhead than just the header.
  *
  * @since 1.5.0
  *
@@ -2808,7 +2808,7 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) {
 
 	// Do not search for a pingback server on our own uploads.
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos( $url, $uploads_dir['baseurl'] ) ) {
+	if ( str_starts_with( $url, $uploads_dir['baseurl'] ) ) {
 		return false;
 	}
 
@@ -2824,12 +2824,12 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) {
 		return false;
 	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if ( wp_remote_retrieve_header( $response, 'X-Pingback' ) ) {
+		return wp_remote_retrieve_header( $response, 'X-Pingback' );
 	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
+	if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'Content-Type' ) ) ) {
 		return false;
 	}
 
@@ -2958,6 +2958,7 @@ function do_all_trackbacks() {
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|WP_Post $post Post ID or object to do trackbacks on.
+ * @return void|false Returns false on failure.
  */
 function do_trackbacks( $post ) {
 	global $wpdb;
@@ -3043,8 +3044,8 @@ function generic_ping( $post_id = 0 ) {
  * @param int|WP_Post $post    Post ID or object.
  */
 function pingback( $content, $post ) {
-	include_once ABSPATH . WPINC . '/class-IXR.php';
-	include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+	require_once ABSPATH . WPINC . '/class-IXR.php';
+	require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
 
 	// Original code by Mort (http://mort.mine.nu:8080).
 	$post_links = array();
@@ -3111,7 +3112,10 @@ function pingback( $content, $post ) {
 		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
 
 		if ( $pingback_server_url ) {
-			set_time_limit( 60 );
+			if ( function_exists( 'set_time_limit' ) ) {
+				set_time_limit( 60 );
+			}
+
 			// Now, the RPC call.
 			$pagelinkedfrom = get_permalink( $post );
 
@@ -3207,8 +3211,8 @@ function trackback( $trackback_url, $title, $excerpt, $ID ) {
  * @param string $path Path to send the ping.
  */
 function weblog_ping( $server = '', $path = '' ) {
-	include_once ABSPATH . WPINC . '/class-IXR.php';
-	include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
+	require_once ABSPATH . WPINC . '/class-IXR.php';
+	require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
 
 	// Using a timeout of 3 seconds should be enough to cover slow servers.
 	$client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' === $path ) ) ? false : $path ) );
@@ -3282,7 +3286,7 @@ function clean_comment_cache( $ids ) {
 		do_action( 'clean_comment_cache', $id );
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set_comments_last_changed();
 }
 
 /**
@@ -3320,6 +3324,7 @@ function update_comment_cache( $comments, $update_meta_cache = true ) {
  *
  * @since 4.4.0
  * @since 6.1.0 This function is no longer marked as "private".
+ * @since 6.3.0 Use wp_lazyload_comment_meta() for lazy-loading of comment meta.
  *
  * @see update_comment_cache()
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -3334,7 +3339,11 @@ function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
 	if ( ! empty( $non_cached_ids ) ) {
 		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
-		update_comment_cache( $fresh_comments, $update_meta_cache );
+		update_comment_cache( $fresh_comments, false );
+	}
+
+	if ( $update_meta_cache ) {
+		wp_lazyload_comment_meta( $comment_ids );
 	}
 }
 
@@ -3472,7 +3481,28 @@ function wp_handle_comment_submission( $comment_data ) {
 		$comment_content = trim( $comment_data['comment'] );
 	}
 	if ( isset( $comment_data['comment_parent'] ) ) {
-		$comment_parent = absint( $comment_data['comment_parent'] );
+		$comment_parent        = absint( $comment_data['comment_parent'] );
+		$comment_parent_object = get_comment( $comment_parent );
+
+		if (
+			0 !== $comment_parent &&
+			(
+				! $comment_parent_object instanceof WP_Comment ||
+				0 === (int) $comment_parent_object->comment_approved
+			)
+		) {
+			/**
+			 * Fires when a comment reply is attempted to an unapproved comment.
+			 *
+			 * @since 6.2.0
+			 *
+			 * @param int $comment_post_id Post ID.
+			 * @param int $comment_parent  Parent comment ID.
+			 */
+			do_action( 'comment_reply_to_unapproved_comment', $comment_post_id, $comment_parent );
+
+			return new WP_Error( 'comment_reply_to_unapproved_comment', __( 'Sorry, replies to unapproved comments are not allowed.' ), 403 );
+		}
 	}
 
 	$post = get_post( $comment_post_id );
@@ -3557,7 +3587,6 @@ function wp_handle_comment_submission( $comment_data ) {
 		return new WP_Error( 'comment_on_password_protected' );
 
 	} else {
-
 		/**
 		 * Fires before a comment is posted.
 		 *
@@ -3566,7 +3595,6 @@ function wp_handle_comment_submission( $comment_data ) {
 		 * @param int $comment_post_id Post ID.
 		 */
 		do_action( 'pre_comment_on_post', $comment_post_id );
-
 	}
 
 	// If the user is logged in.
@@ -3689,7 +3717,7 @@ function wp_comments_personal_data_exporter( $email_address, $page = 1 ) {
 			'author_email'              => $email_address,
 			'number'                    => $number,
 			'paged'                     => $page,
-			'order_by'                  => 'comment_ID',
+			'orderby'                   => 'comment_ID',
 			'order'                     => 'ASC',
 			'update_comment_meta_cache' => false,
 		)
@@ -3783,6 +3811,8 @@ function wp_register_comment_personal_data_eraser( $erasers ) {
  *
  * @since 4.9.6
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $email_address The comment author email address.
  * @param int    $page          Comment page.
  * @return array
@@ -3810,7 +3840,7 @@ function wp_comments_personal_data_eraser( $email_address, $page = 1 ) {
 			'author_email'       => $email_address,
 			'number'             => $number,
 			'paged'              => $page,
-			'order_by'           => 'comment_ID',
+			'orderby'            => 'comment_ID',
 			'order'              => 'ASC',
 			'include_unapproved' => true,
 		)
@@ -3886,7 +3916,7 @@ function wp_comments_personal_data_eraser( $email_address, $page = 1 ) {
  * @since 5.0.0
  */
 function wp_cache_set_comments_last_changed() {
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set_last_changed( 'comment' );
 }
 
 /**
diff --git a/src/wp-includes/compat.php b/src/wp-includes/compat.php
index 60e8c0772b1d0..2b8de57bd7b9b 100644
--- a/src/wp-includes/compat.php
+++ b/src/wp-includes/compat.php
@@ -56,7 +56,7 @@ function _wp_can_use_pcre_u( $set = null ) {
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return string Extracted substring.
 	 */
-	function mb_substr( $string, $start, $length = null, $encoding = null ) {
+	function mb_substr( $string, $start, $length = null, $encoding = null ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound
 		return _mb_substr( $string, $start, $length, $encoding );
 	}
 endif;
@@ -148,7 +148,7 @@ function _mb_substr( $str, $start, $length = null, $encoding = null ) {
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return int String length of `$string`.
 	 */
-	function mb_strlen( $string, $encoding = null ) {
+	function mb_strlen( $string, $encoding = null ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound
 		return _mb_strlen( $string, $encoding );
 	}
 endif;
@@ -156,7 +156,7 @@ function mb_strlen( $string, $encoding = null ) {
 /**
  * Internal compat function to mimic mb_strlen().
  *
- * Only understands UTF-8 and 8bit.  All other character sets will be treated as 8bit.
+ * Only understands UTF-8 and 8bit. All other character sets will be treated as 8bit.
  * For `$encoding === UTF-8`, the `$str` input is expected to be a valid UTF-8 byte
  * sequence. The behavior of this function for invalid inputs is undefined.
  *
@@ -333,10 +333,6 @@ function hash_equals( $known_string, $user_string ) {
 	}
 endif;
 
-// random_int() was introduced in PHP 7.0.
-if ( ! function_exists( 'random_int' ) ) {
-	require ABSPATH . WPINC . '/random_compat/random.php';
-}
 // sodium_crypto_box() was introduced in PHP 7.2.
 if ( ! function_exists( 'sodium_crypto_box' ) ) {
 	require ABSPATH . WPINC . '/sodium_compat/autoload.php';
@@ -393,7 +389,7 @@ function is_iterable( $value ) {
 	 * @return string|int|null The first key of array if the array
 	 *                         is not empty; `null` otherwise.
 	 */
-	function array_key_first( array $array ) {
+	function array_key_first( array $array ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.arrayFound
 		foreach ( $array as $key => $value ) {
 			return $key;
 		}
@@ -413,7 +409,7 @@ function array_key_first( array $array ) {
 	 * @return string|int|null The last key of array if the array
 	 *.                        is not empty; `null` otherwise.
 	 */
-	function array_key_last( array $array ) {
+	function array_key_last( array $array ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.arrayFound
 		if ( empty( $array ) ) {
 			return null;
 		}
@@ -434,11 +430,15 @@ function array_key_last( array $array ) {
 	 * @since 5.9.0
 	 *
 	 * @param string $haystack The string to search in.
-	 * @param string $needle   The substring to search for in the haystack.
+	 * @param string $needle   The substring to search for in the `$haystack`.
 	 * @return bool True if `$needle` is in `$haystack`, otherwise false.
 	 */
 	function str_contains( $haystack, $needle ) {
-		return ( '' === $needle || false !== strpos( $haystack, $needle ) );
+		if ( '' === $needle ) {
+			return true;
+		}
+
+		return false !== strpos( $haystack, $needle );
 	}
 }
 
@@ -478,13 +478,13 @@ function str_starts_with( $haystack, $needle ) {
 	 * @return bool True if `$haystack` ends with `$needle`, otherwise false.
 	 */
 	function str_ends_with( $haystack, $needle ) {
-		if ( '' === $haystack && '' !== $needle ) {
-			return false;
+		if ( '' === $haystack ) {
+			return '' === $needle;
 		}
 
 		$len = strlen( $needle );
 
-		return 0 === substr_compare( $haystack, $needle, -$len, $len );
+		return substr( $haystack, -$len, $len ) === $needle;
 	}
 }
 
diff --git a/src/wp-includes/cron.php b/src/wp-includes/cron.php
index 8660e322673fe..c3a281a626dd5 100644
--- a/src/wp-includes/cron.php
+++ b/src/wp-includes/cron.php
@@ -57,7 +57,7 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error
 	);
 
 	/**
-	 * Filter to preflight or hijack scheduling an event.
+	 * Filter to override scheduling an event.
 	 *
 	 * Returning a non-null value will short-circuit adding the event to the
 	 * cron array, causing the function to return the filtered value instead.
@@ -76,15 +76,15 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error
 	 * @since 5.1.0
 	 * @since 5.7.0 The `$wp_error` parameter was added, and a `WP_Error` object can now be returned.
 	 *
-	 * @param null|bool|WP_Error $pre      Value to return instead. Default null to continue adding the event.
-	 * @param stdClass           $event    {
+	 * @param null|bool|WP_Error $result   The value to return instead. Default null to continue adding the event.
+	 * @param object             $event    {
 	 *     An object containing an event's data.
 	 *
 	 *     @type string       $hook      Action hook to execute when the event is run.
 	 *     @type int          $timestamp Unix timestamp (UTC) for when to next run the event.
 	 *     @type string|false $schedule  How often the event should subsequently recur.
 	 *     @type array        $args      Array containing each separate argument to pass to the hook's callback function.
-	 *     @type int          $interval  The interval time in seconds for the schedule. Only present for recurring events.
+	 *     @type int          $interval  Optional. The interval time in seconds for the schedule. Only present for recurring events.
 	 * }
 	 * @param bool               $wp_error Whether to return a WP_Error on failure.
 	 */
@@ -139,9 +139,11 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error
 		if ( $event_timestamp < $min_timestamp ) {
 			continue;
 		}
+
 		if ( $event_timestamp > $max_timestamp ) {
 			break;
 		}
+
 		if ( isset( $cron[ $event->hook ][ $key ] ) ) {
 			$duplicate = true;
 			break;
@@ -164,14 +166,14 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array(), $wp_error
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param stdClass|false $event {
+	 * @param object|false $event {
 	 *     An object containing an event's data, or boolean false to prevent the event from being scheduled.
 	 *
 	 *     @type string       $hook      Action hook to execute when the event is run.
 	 *     @type int          $timestamp Unix timestamp (UTC) for when to next run the event.
 	 *     @type string|false $schedule  How often the event should subsequently recur.
 	 *     @type array        $args      Array containing each separate argument to pass to the hook's callback function.
-	 *     @type int          $interval  The interval time in seconds for the schedule. Only present for recurring events.
+	 *     @type int          $interval  Optional. The interval time in seconds for the schedule. Only present for recurring events.
 	 * }
 	 */
 	$event = apply_filters( 'schedule_event', $event );
@@ -359,6 +361,7 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 	// Now we try to get it from the saved interval in case the schedule disappears.
 	if ( 0 === $interval ) {
 		$scheduled_event = wp_get_scheduled_event( $hook, $args, $timestamp );
+
 		if ( $scheduled_event && isset( $scheduled_event->interval ) ) {
 			$interval = $scheduled_event->interval;
 		}
@@ -373,7 +376,7 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 	);
 
 	/**
-	 * Filter to preflight or hijack rescheduling of a recurring event.
+	 * Filter to override rescheduling of a recurring event.
 	 *
 	 * Returning a non-null value will short-circuit the normal rescheduling
 	 * process, causing the function to return the filtered value instead.
@@ -385,7 +388,7 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 	 * @since 5.7.0 The `$wp_error` parameter was added, and a `WP_Error` object can now be returned.
 	 *
 	 * @param null|bool|WP_Error $pre      Value to return instead. Default null to continue adding the event.
-	 * @param stdClass           $event    {
+	 * @param object             $event    {
 	 *     An object containing an event's data.
 	 *
 	 *     @type string $hook      Action hook to execute when the event is run.
@@ -414,7 +417,7 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 	}
 
 	// Now we assume something is wrong and fail to schedule.
-	if ( 0 == $interval ) {
+	if ( 0 === $interval ) {
 		if ( $wp_error ) {
 			return new WP_Error(
 				'invalid_schedule',
@@ -437,9 +440,9 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array(), $
 }
 
 /**
- * Unschedule a previously scheduled event.
+ * Unschedules a previously scheduled event.
  *
- * The $timestamp and $hook parameters are required so that the event can be
+ * The `$timestamp` and `$hook` parameters are required so that the event can be
  * identified.
  *
  * @since 2.1.0
@@ -470,7 +473,7 @@ function wp_unschedule_event( $timestamp, $hook, $args = array(), $wp_error = fa
 	}
 
 	/**
-	 * Filter to preflight or hijack unscheduling of events.
+	 * Filter to override unscheduling of events.
 	 *
 	 * Returning a non-null value will short-circuit the normal unscheduling
 	 * process, causing the function to return the filtered value instead.
@@ -506,10 +509,13 @@ function wp_unschedule_event( $timestamp, $hook, $args = array(), $wp_error = fa
 
 	$crons = _get_cron_array();
 	$key   = md5( serialize( $args ) );
+
 	unset( $crons[ $timestamp ][ $hook ][ $key ] );
+
 	if ( empty( $crons[ $timestamp ][ $hook ] ) ) {
 		unset( $crons[ $timestamp ][ $hook ] );
 	}
+
 	if ( empty( $crons[ $timestamp ] ) ) {
 		unset( $crons[ $timestamp ] );
 	}
@@ -520,8 +526,8 @@ function wp_unschedule_event( $timestamp, $hook, $args = array(), $wp_error = fa
 /**
  * Unschedules all events attached to the hook with the specified arguments.
  *
- * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
- * value which evaluates to FALSE. For information about casting to booleans see the
+ * Warning: This function may return boolean false, but may also return a non-boolean
+ * value which evaluates to false. For information about casting to booleans see the
  * {@link https://www.php.net/manual/en/language.types.boolean.php PHP documentation}. Use
  * the `===` operator for testing the return value of this function.
  *
@@ -541,16 +547,23 @@ function wp_unschedule_event( $timestamp, $hook, $args = array(), $wp_error = fa
  *                            if unscheduling one or more events fail.
  */
 function wp_clear_scheduled_hook( $hook, $args = array(), $wp_error = false ) {
-	// Backward compatibility.
-	// Previously, this function took the arguments as discrete vars rather than an array like the rest of the API.
+	/*
+	 * Backward compatibility.
+	 * Previously, this function took the arguments as discrete vars rather than an array like the rest of the API.
+	 */
 	if ( ! is_array( $args ) ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', __( 'This argument has changed to an array to match the behavior of the other cron functions.' ) );
+		_deprecated_argument(
+			__FUNCTION__,
+			'3.0.0',
+			__( 'This argument has changed to an array to match the behavior of the other cron functions.' )
+		);
+
 		$args     = array_slice( func_get_args(), 1 ); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
 		$wp_error = false;
 	}
 
 	/**
-	 * Filter to preflight or hijack clearing a scheduled hook.
+	 * Filter to override clearing a scheduled hook.
 	 *
 	 * Returning a non-null value will short-circuit the normal unscheduling
 	 * process, causing the function to return the filtered value instead.
@@ -624,8 +637,8 @@ function wp_clear_scheduled_hook( $hook, $args = array(), $wp_error = false ) {
  *
  * Can be useful for plugins when deactivating to clean up the cron queue.
  *
- * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
- * value which evaluates to FALSE. For information about casting to booleans see the
+ * Warning: This function may return boolean false, but may also return a non-boolean
+ * value which evaluates to false. For information about casting to booleans see the
  * {@link https://www.php.net/manual/en/language.types.boolean.php PHP documentation}. Use
  * the `===` operator for testing the return value of this function.
  *
@@ -640,7 +653,7 @@ function wp_clear_scheduled_hook( $hook, $args = array(), $wp_error = false ) {
  */
 function wp_unschedule_hook( $hook, $wp_error = false ) {
 	/**
-	 * Filter to preflight or hijack clearing all events attached to the hook.
+	 * Filter to override clearing all events attached to the hook.
 	 *
 	 * Returning a non-null value will short-circuit the normal unscheduling
 	 * process, causing the function to return the filtered value instead.
@@ -679,10 +692,12 @@ function wp_unschedule_hook( $hook, $wp_error = false ) {
 	}
 
 	$results = array();
+
 	foreach ( $crons as $timestamp => $args ) {
 		if ( ! empty( $crons[ $timestamp ][ $hook ] ) ) {
 			$results[] = count( $crons[ $timestamp ][ $hook ] );
 		}
+
 		unset( $crons[ $timestamp ][ $hook ] );
 
 		if ( empty( $crons[ $timestamp ] ) ) {
@@ -708,9 +723,9 @@ function wp_unschedule_hook( $hook, $wp_error = false ) {
 }
 
 /**
- * Retrieve a scheduled event.
+ * Retrieves a scheduled event.
  *
- * Retrieve the full event object for a given event, if no timestamp is specified the next
+ * Retrieves the full event object for a given event, if no timestamp is specified the next
  * scheduled event is returned.
  *
  * @since 5.1.0
@@ -722,11 +737,19 @@ function wp_unschedule_hook( $hook, $wp_error = false ) {
  *                            Default empty array.
  * @param int|null $timestamp Optional. Unix timestamp (UTC) of the event. If not specified, the next scheduled event
  *                            is returned. Default null.
- * @return object|false The event object. False if the event does not exist.
+ * @return object|false {
+ *     The event object. False if the event does not exist.
+ *
+ *     @type string       $hook      Action hook to execute when the event is run.
+ *     @type int          $timestamp Unix timestamp (UTC) for when to next run the event.
+ *     @type string|false $schedule  How often the event should subsequently recur.
+ *     @type array        $args      Array containing each separate argument to pass to the hook's callback function.
+ *     @type int          $interval  Optional. The interval time in seconds for the schedule. Only present for recurring events.
+ * }
  */
 function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
 	/**
-	 * Filter to preflight or hijack retrieving a scheduled event.
+	 * Filter to override retrieving a scheduled event.
 	 *
 	 * Returning a non-null value will short-circuit the normal process,
 	 * returning the filtered value instead.
@@ -744,6 +767,7 @@ function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
 	 * @param int|null  $timestamp Unix timestamp (UTC) of the event. Null to retrieve next scheduled event.
 	 */
 	$pre = apply_filters( 'pre_get_scheduled_event', null, $hook, $args, $timestamp );
+
 	if ( null !== $pre ) {
 		return $pre;
 	}
@@ -768,6 +792,7 @@ function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
 				break;
 			}
 		}
+
 		if ( ! $next ) {
 			return false;
 		}
@@ -792,7 +817,7 @@ function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
 }
 
 /**
- * Retrieve the next timestamp for an event.
+ * Retrieves the next timestamp for an event.
  *
  * @since 2.1.0
  *
@@ -805,6 +830,7 @@ function wp_get_scheduled_event( $hook, $args = array(), $timestamp = null ) {
  */
 function wp_next_scheduled( $hook, $args = array() ) {
 	$next_event = wp_get_scheduled_event( $hook, $args );
+
 	if ( ! $next_event ) {
 		return false;
 	}
@@ -875,7 +901,7 @@ function spawn_cron( $gmt_time = 0 ) {
 		wp_ob_end_flush_all();
 		flush();
 
-		include_once ABSPATH . 'wp-cron.php';
+		require_once ABSPATH . 'wp-cron.php';
 		return true;
 	}
 
@@ -920,11 +946,12 @@ function spawn_cron( $gmt_time = 0 ) {
 	);
 
 	$result = wp_remote_post( $cron_request['url'], $cron_request['args'] );
+
 	return ! is_wp_error( $result );
 }
 
 /**
- * Register _wp_cron() to run on the {@see 'wp_loaded'} action.
+ * Registers _wp_cron() to run on the {@see 'wp_loaded'} action.
  *
  * If the {@see 'wp_loaded'} action has already fired, this function calls
  * _wp_cron() directly.
@@ -938,9 +965,9 @@ function spawn_cron( $gmt_time = 0 ) {
  * @since 5.1.0 Return value added to indicate success or failure.
  * @since 5.7.0 Functionality moved to _wp_cron() to which this becomes a wrapper.
  *
- * @return bool|int|void On success an integer indicating number of events spawned (0 indicates no
- *                       events needed to be spawned), false if spawning fails for one or more events or
- *                       void if the function registered _wp_cron() to run on the action.
+ * @return false|int|void On success an integer indicating number of events spawned (0 indicates no
+ *                        events needed to be spawned), false if spawning fails for one or more events or
+ *                        void if the function registered _wp_cron() to run on the action.
  */
 function wp_cron() {
 	if ( did_action( 'wp_loaded' ) ) {
@@ -951,7 +978,7 @@ function wp_cron() {
 }
 
 /**
- * Run scheduled callbacks or spawn cron for all scheduled events.
+ * Runs scheduled callbacks or spawns cron for all scheduled events.
  *
  * Warning: This function may return Boolean FALSE, but may also return a non-Boolean
  * value which evaluates to FALSE. For information about casting to booleans see the
@@ -966,7 +993,9 @@ function wp_cron() {
  */
 function _wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php.
-	if ( strpos( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) !== false || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
+	if ( str_contains( $_SERVER['REQUEST_URI'], '/wp-cron.php' )
+		|| ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON )
+	) {
 		return 0;
 	}
 
@@ -983,14 +1012,19 @@ function _wp_cron() {
 
 	$schedules = wp_get_schedules();
 	$results   = array();
+
 	foreach ( $crons as $timestamp => $cronhooks ) {
 		if ( $timestamp > $gmt_time ) {
 			break;
 		}
+
 		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset( $schedules[ $hook ]['callback'] ) && ! call_user_func( $schedules[ $hook ]['callback'] ) ) {
+			if ( isset( $schedules[ $hook ]['callback'] )
+				&& ! call_user_func( $schedules[ $hook ]['callback'] )
+			) {
 				continue;
 			}
+
 			$results[] = spawn_cron( $gmt_time );
 			break 2;
 		}
@@ -999,11 +1033,12 @@ function _wp_cron() {
 	if ( in_array( false, $results, true ) ) {
 		return false;
 	}
+
 	return count( $results );
 }
 
 /**
- * Retrieve supported event recurrence schedules.
+ * Retrieves supported event recurrence schedules.
  *
  * The default supported recurrences are 'hourly', 'twicedaily', 'daily', and 'weekly'.
  * A plugin may add more by hooking into the {@see 'cron_schedules'} filter.
@@ -1030,7 +1065,16 @@ function _wp_cron() {
  * @since 2.1.0
  * @since 5.4.0 The 'weekly' schedule was added.
  *
- * @return array[]
+ * @return array {
+ *     The array of cron schedules keyed by the schedule name.
+ *
+ *     @type array ...$0 {
+ *         Cron schedule information.
+ *
+ *         @type int    $interval The schedule interval in seconds.
+ *         @type string $display  The schedule display name.
+ *     }
+ * }
  */
 function wp_get_schedules() {
 	$schedules = array(
@@ -1057,13 +1101,22 @@ function wp_get_schedules() {
 	 *
 	 * @since 2.1.0
 	 *
-	 * @param array[] $new_schedules An array of non-default cron schedule arrays. Default empty.
+	 * @param array $new_schedules {
+	 *     An array of non-default cron schedules keyed by the schedule name. Default empty array.
+	 *
+	 *     @type array ...$0 {
+	 *         Cron schedule information.
+	 *
+	 *         @type int    $interval The schedule interval in seconds.
+	 *         @type string $display  The schedule display name.
+	 *     }
+	 * }
 	 */
 	return array_merge( apply_filters( 'cron_schedules', array() ), $schedules );
 }
 
 /**
- * Retrieve the recurrence schedule for an event.
+ * Retrieves the name of the recurrence schedule for an event.
  *
  * @see wp_get_schedules() for available schedules.
  *
@@ -1084,7 +1137,7 @@ function wp_get_schedule( $hook, $args = array() ) {
 	}
 
 	/**
-	 * Filters the schedule for a hook.
+	 * Filters the schedule name for a hook.
 	 *
 	 * @since 5.1.0
 	 *
@@ -1096,7 +1149,7 @@ function wp_get_schedule( $hook, $args = array() ) {
 }
 
 /**
- * Retrieve cron jobs ready to be run.
+ * Retrieves cron jobs ready to be run.
  *
  * Returns the results of _get_cron_array() limited to events ready to be run,
  * ie, with a timestamp in the past.
@@ -1107,7 +1160,7 @@ function wp_get_schedule( $hook, $args = array() ) {
  */
 function wp_get_ready_cron_jobs() {
 	/**
-	 * Filter to preflight or hijack retrieving ready cron jobs.
+	 * Filter to override retrieving ready cron jobs.
 	 *
 	 * Returning an array will short-circuit the normal retrieval of ready
 	 * cron jobs, causing the function to return the filtered value instead.
@@ -1143,7 +1196,7 @@ function wp_get_ready_cron_jobs() {
 //
 
 /**
- * Retrieve cron info array option.
+ * Retrieves cron info array option.
  *
  * @since 2.1.0
  * @since 6.1.0 Return type modified to consistently return an array.
@@ -1185,7 +1238,8 @@ function _set_cron_array( $cron, $wp_error = false ) {
 	}
 
 	$cron['version'] = 2;
-	$result          = update_option( 'cron', $cron );
+
+	$result = update_option( 'cron', $cron );
 
 	if ( $wp_error && ! $result ) {
 		return new WP_Error(
@@ -1198,7 +1252,7 @@ function _set_cron_array( $cron, $wp_error = false ) {
 }
 
 /**
- * Upgrade a cron info array.
+ * Upgrades a cron info array.
  *
  * This function upgrades the cron info array to version 2.
  *
@@ -1209,7 +1263,7 @@ function _set_cron_array( $cron, $wp_error = false ) {
  * @return array An upgraded cron info array.
  */
 function _upgrade_cron_array( $cron ) {
-	if ( isset( $cron['version'] ) && 2 == $cron['version'] ) {
+	if ( isset( $cron['version'] ) && 2 === $cron['version'] ) {
 		return $cron;
 	}
 
@@ -1217,12 +1271,15 @@ function _upgrade_cron_array( $cron ) {
 
 	foreach ( (array) $cron as $timestamp => $hooks ) {
 		foreach ( (array) $hooks as $hook => $args ) {
-			$key                                     = md5( serialize( $args['args'] ) );
+			$key = md5( serialize( $args['args'] ) );
+
 			$new_cron[ $timestamp ][ $hook ][ $key ] = $args;
 		}
 	}
 
 	$new_cron['version'] = 2;
+
 	update_option( 'cron', $new_cron );
+
 	return $new_cron;
 }
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 062517fac7d78..8f73274b03364 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -719,11 +719,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 #wpadminbar .screen-reader-shortcut {
 	position: absolute;
 	top: -1000em;
-}
-
-#wpadminbar .screen-reader-shortcut:focus {
 	left: 6px;
-	top: 7px;
 	height: auto;
 	width: auto;
 	display: block;
@@ -735,6 +731,11 @@ html:lang(he-il) .rtl #wpadminbar * {
 	z-index: 100000;
 	line-height: normal;
 	text-decoration: none;
+}
+
+#wpadminbar .screen-reader-shortcut:focus {
+	top: 7px;
+	background: #f0f0f1;
 	box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
 }
 
diff --git a/src/wp-includes/css/classic-themes.css b/src/wp-includes/css/classic-themes.css
index d77a25a3b95a4..4d54a1891ec52 100644
--- a/src/wp-includes/css/classic-themes.css
+++ b/src/wp-includes/css/classic-themes.css
@@ -16,3 +16,9 @@
 
 	font-size: 1.125em;
 }
+
+.wp-block-file__button {
+	background: #32373c;
+	color: #ffffff;
+	text-decoration: none;
+}
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index c445a32b43910..969b880873bcd 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -1845,7 +1845,6 @@ html:lang(he-il) .rtl .quicktags-toolbar input {
 
 /* HiDPI */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 	.wp-media-buttons .add_media span.wp-media-buttons-icon {
 		background: none;
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 27658f9dd5b55..2f046cecb76c7 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -281,10 +281,6 @@
 	width: calc(48% - 12px);
 }
 
-.media-modal-content .attachments-browser .search {
-	width: 100%;
-}
-
 /* higher specificity */
 .wp-core-ui .media-modal-icon {
 	background-image: url(../images/uploader-icons.png);
@@ -371,7 +367,7 @@
 }
 
 .media-sidebar h2,
-.image-details h2:not(.media-attachments-filter-heading) {
+.image-details .media-embed h2 {
 	position: relative;
 	font-weight: 600;
 	text-transform: uppercase;
@@ -906,8 +902,6 @@
 
 .media-frame select.attachment-filters:last-of-type {
 	margin-right: 0;
-	width: auto;
-	max-width: 100%;
 }
 
 /**
@@ -926,7 +920,7 @@
 	max-width: 100%;
 }
 
-.media-frame .media-search-input-label {
+.media-modal .media-frame .media-search-input-label {
 	position: absolute;
 	left: 0;
 	top: 10px;
@@ -1219,6 +1213,7 @@
 .mode-grid .attachments-browser .media-toolbar-primary {
 	display: flex;
 	align-items: center;
+	column-gap: .5rem;
 }
 
 .mode-grid .attachments-browser .media-toolbar-mode-select .media-toolbar-primary {
@@ -1959,32 +1954,7 @@
 
 .media-modal .imgedit-wrap .imgedit-panel-content {
 	padding: 16px 16px 0;
-	position: absolute;
-	top: 0;
-	right: 282px;
-	bottom: 0;
-	left: 0;
-	overflow: auto;
-}
-
-/*
- * Implementation of bottom padding in overflow content differs across browsers.
- * We need a different method. See https://github.com/w3c/csswg-drafts/issues/129
- */
-.media-modal .imgedit-wrap .imgedit-submit {
-	margin-bottom: 16px;
-}
-
-.media-modal .imgedit-wrap .imgedit-settings {
-	background: #f6f7f7;
-	border-left: 1px solid #dcdcde;
-	padding: 20px 16px 0;
-	position: absolute;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	width: 250px;
-	overflow: auto;
+	overflow: visible;
 }
 
 /*
@@ -1998,19 +1968,15 @@
 .media-modal .imgedit-group {
 	background: none;
 	border: none;
-	border-bottom: 1px solid #dcdcde;
 	box-shadow: none;
 	margin: 0;
-	margin-bottom: 16px;
 	padding: 0;
-	padding-bottom: 16px;
 	position: relative; /* RTL fix, #WP29352 */
 }
 
-.media-modal .imgedit-group:last-of-type {
-	border: none;
-	margin: 0;
-	padding: 0;
+.media-modal .imgedit-group.imgedit-panel-active {
+	margin-bottom: 16px;
+	padding-bottom: 16px;
 }
 
 .media-modal .imgedit-group-top {
@@ -2079,8 +2045,7 @@
 
 .media-modal .imgedit-wrap div.updated, /* Back-compat for pre-5.5 */
 .media-modal .imgedit-wrap .notice {
-	margin: 0;
-	margin-bottom: 16px;
+	margin: 0 16px;
 }
 
 /**
@@ -2609,6 +2574,16 @@
 		right: 262px;
 	}
 
+	.attachments-browser .media-toolbar {
+		height: 82px;
+	}
+
+	.attachments-browser .attachments,
+	.attachments-browser .uploader-inline,
+	.media-frame-content .attachments-browser .attachments-wrapper {
+		top: 82px;
+	}
+
 	.media-sidebar .setting,
 	.attachment-details .setting {
 		margin: 6px 0;
@@ -2819,13 +2794,8 @@
 }
 
 @media screen and (max-width: 782px) {
-	.attachments-browser .media-toolbar {
-		height: 82px;
-	}
-
-	.attachments-browser .attachments,
-	.attachments-browser .uploader-inline {
-		top: 82px;
+	.imgedit-panel-content {
+		grid-template-columns: auto;
 	}
 
 	.media-frame-toolbar .media-toolbar {
@@ -2833,7 +2803,11 @@
 	}
 
 	.mode-grid .attachments-browser .media-toolbar-primary {
-		display: block;
+		display: flex;
+	}
+
+	.mode-grid .attachments-browser .media-toolbar-primary input[type="search"] {
+		width: 100%;
 	}
 
 	.media-sidebar .copy-to-clipboard-container .success,
@@ -2878,10 +2852,6 @@
 		right: 0;
 	}
 
-	.attachments-browser .attachments-wrapper {
-		padding-top: 12px;
-	}
-
 	.image-details .media-frame-title {
 		display: block;
 		top: 0;
@@ -2935,7 +2905,6 @@
  * HiDPI Displays
  */
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 
 	.wp-core-ui .media-modal-icon {
diff --git a/src/wp-includes/css/wp-auth-check.css b/src/wp-includes/css/wp-auth-check.css
index 8994f4933ab63..42f623e8e13ec 100644
--- a/src/wp-includes/css/wp-auth-check.css
+++ b/src/wp-includes/css/wp-auth-check.css
@@ -68,7 +68,6 @@
 }
 
 @media print,
-  (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
 
 	#wp-auth-check-form.loading:before {
diff --git a/src/wp-includes/customize/class-wp-customize-background-position-control.php b/src/wp-includes/customize/class-wp-customize-background-position-control.php
index 410a0bf59782b..05802f5366443 100644
--- a/src/wp-includes/customize/class-wp-customize-background-position-control.php
+++ b/src/wp-includes/customize/class-wp-customize-background-position-control.php
@@ -90,7 +90,12 @@ public function content_template() {
 		<# } #>
 		<div class="customize-control-content">
 			<fieldset>
-				<legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+				<legend class="screen-reader-text"><span>
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Image Position' );
+					?>
+				</span></legend>
 				<div class="background-position-control">
 				<?php foreach ( $options as $group ) : ?>
 					<div class="button-group">
diff --git a/src/wp-includes/customize/class-wp-customize-date-time-control.php b/src/wp-includes/customize/class-wp-customize-date-time-control.php
index 55bf64dbe2c03..1b445af37f764 100644
--- a/src/wp-includes/customize/class-wp-customize-date-time-control.php
+++ b/src/wp-includes/customize/class-wp-customize-date-time-control.php
@@ -127,7 +127,12 @@ public function content_template() {
 				<legend class="title-day {{ ! data.includeTime ? 'screen-reader-text' : '' }}"><?php esc_html_e( 'Date' ); ?></legend>
 				<div class="day-fields clear">
 					<?php ob_start(); ?>
-					<label for="{{ idPrefix }}date-time-month" class="screen-reader-text"><?php esc_html_e( 'Month' ); ?></label>
+					<label for="{{ idPrefix }}date-time-month" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						esc_html_e( 'Month' );
+						?>
+					</label>
 					<select id="{{ idPrefix }}date-time-month" class="date-input month" data-component="month">
 						<# _.each( data.month_choices, function( choice ) {
 							if ( _.isObject( choice ) && ! _.isUndefined( choice.text ) && ! _.isUndefined( choice.value ) ) {
@@ -143,12 +148,22 @@ public function content_template() {
 					<?php $month_field = trim( ob_get_clean() ); ?>
 
 					<?php ob_start(); ?>
-					<label for="{{ idPrefix }}date-time-day" class="screen-reader-text"><?php esc_html_e( 'Day' ); ?></label>
+					<label for="{{ idPrefix }}date-time-day" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						esc_html_e( 'Day' );
+						?>
+					</label>
 					<input id="{{ idPrefix }}date-time-day" type="number" size="2" autocomplete="off" class="date-input day" data-component="day" min="1" max="31" />
 					<?php $day_field = trim( ob_get_clean() ); ?>
 
 					<?php ob_start(); ?>
-					<label for="{{ idPrefix }}date-time-year" class="screen-reader-text"><?php esc_html_e( 'Year' ); ?></label>
+					<label for="{{ idPrefix }}date-time-year" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						esc_html_e( 'Year' );
+						?>
+					</label>
 					<input id="{{ idPrefix }}date-time-year" type="number" size="4" autocomplete="off" class="date-input year" data-component="year" min="{{ data.minYear }}" max="{{ data.maxYear }}">
 					<?php $year_field = trim( ob_get_clean() ); ?>
 
@@ -159,15 +174,30 @@ public function content_template() {
 				<fieldset class="time-row clear">
 					<legend class="title-time"><?php esc_html_e( 'Time' ); ?></legend>
 					<div class="time-fields clear">
-						<label for="{{ idPrefix }}date-time-hour" class="screen-reader-text"><?php esc_html_e( 'Hour' ); ?></label>
+						<label for="{{ idPrefix }}date-time-hour" class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							esc_html_e( 'Hour' );
+							?>
+						</label>
 						<# var maxHour = data.twelveHourFormat ? 12 : 23; #>
 						<# var minHour = data.twelveHourFormat ? 1 : 0; #>
 						<input id="{{ idPrefix }}date-time-hour" type="number" size="2" autocomplete="off" class="date-input hour" data-component="hour" min="{{ minHour }}" max="{{ maxHour }}">
 						:
-						<label for="{{ idPrefix }}date-time-minute" class="screen-reader-text"><?php esc_html_e( 'Minute' ); ?></label>
+						<label for="{{ idPrefix }}date-time-minute" class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							esc_html_e( 'Minute' );
+							?>
+						</label>
 						<input id="{{ idPrefix }}date-time-minute" type="number" size="2" autocomplete="off" class="date-input minute" data-component="minute" min="0" max="59">
 						<# if ( data.twelveHourFormat ) { #>
-							<label for="{{ idPrefix }}date-time-meridian" class="screen-reader-text"><?php esc_html_e( 'Meridian' ); ?></label>
+							<label for="{{ idPrefix }}date-time-meridian" class="screen-reader-text">
+								<?php
+								/* translators: Hidden accessibility text. */
+								esc_html_e( 'Meridian' );
+								?>
+							</label>
 							<select id="{{ idPrefix }}date-time-meridian" class="date-input meridian" data-component="meridian">
 								<option value="am"><?php esc_html_e( 'AM' ); ?></option>
 								<option value="pm"><?php esc_html_e( 'PM' ); ?></option>
@@ -234,7 +264,7 @@ public function get_timezone_info() {
 
 			if ( $tz ) {
 				$now                   = new DateTime( 'now', $tz );
-				$formatted_gmt_offset  = $this->format_gmt_offset( $tz->getOffset( $now ) / 3600 );
+				$formatted_gmt_offset  = $this->format_gmt_offset( $tz->getOffset( $now ) / HOUR_IN_SECONDS );
 				$tz_name               = str_replace( '_', ' ', $tz->getName() );
 				$timezone_info['abbr'] = $now->format( 'T' );
 
diff --git a/src/wp-includes/customize/class-wp-customize-header-image-control.php b/src/wp-includes/customize/class-wp-customize-header-image-control.php
index a48a97c996a7f..0ea73d5a0be8f 100644
--- a/src/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/src/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -133,12 +133,24 @@ public function print_header_image_template() {
 			<button type="button" class="choice thumbnail"
 				data-customize-image-value="{{data.header.url}}"
 				data-customize-header-image-data="{{JSON.stringify(data.header)}}">
-				<span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Set image' );
+					?>
+				</span>
 				<img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
 			</button>
 
 			<# if ( data.type === 'uploaded' ) { #>
-				<button type="button" class="dashicons dashicons-no close"><span class="screen-reader-text"><?php _e( 'Remove image' ); ?></span></button>
+				<button type="button" class="dashicons dashicons-no close">
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Remove image' );
+						?>
+					</span>
+				</button>
 			<# } #>
 
 			<# } #>
diff --git a/src/wp-includes/customize/class-wp-customize-header-image-setting.php b/src/wp-includes/customize/class-wp-customize-header-image-setting.php
index d3792e0d14220..80333a54128af 100644
--- a/src/wp-includes/customize/class-wp-customize-header-image-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-header-image-setting.php
@@ -45,8 +45,10 @@ public function update( $value ) {
 			$custom_image_header    = new Custom_Image_Header( $admin_head_callback, $admin_preview_callback );
 		}
 
-		// If the value doesn't exist (removed or random),
-		// use the header_image value.
+		/*
+		 * If the value doesn't exist (removed or random),
+		 * use the header_image value.
+		 */
 		if ( ! $value ) {
 			$value = $this->manager->get_setting( 'header_image' )->post_value();
 		}
diff --git a/src/wp-includes/customize/class-wp-customize-media-control.php b/src/wp-includes/customize/class-wp-customize-media-control.php
index 22bf75dad52ac..f63689292522b 100644
--- a/src/wp-includes/customize/class-wp-customize-media-control.php
+++ b/src/wp-includes/customize/class-wp-customize-media-control.php
@@ -88,8 +88,10 @@ public function to_json() {
 
 		if ( is_object( $this->setting ) ) {
 			if ( $this->setting->default ) {
-				// Fake an attachment model - needs all fields used by template.
-				// Note that the default value must be a URL, NOT an attachment ID.
+				/*
+				 * Fake an attachment model - needs all fields used by template.
+				 * Note that the default value must be a URL, NOT an attachment ID.
+				 */
 				$ext  = substr( $this->setting->default, -3 );
 				$type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp', 'webp' ), true ) ? 'image' : 'document';
 
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-control.php
index a1558cdf5d239..7b2e4396166b4 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-control.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-control.php
@@ -57,7 +57,12 @@ public function content_template() {
 				<span class="reorder-done"><?php _e( 'Done' ); ?></span>
 			</button>
 		</div>
-		<p class="screen-reader-text" id="reorder-items-desc-{{ data.menu_id }}"><?php _e( 'When in reorder mode, additional controls to reorder menu items will be available in the items list above.' ); ?></p>
+		<p class="screen-reader-text" id="reorder-items-desc-{{ data.menu_id }}">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'When in reorder mode, additional controls to reorder menu items will be available in the items list above.' );
+			?>
+		</p>
 		<?php
 	}
 
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
index b0e3ae4a5e1f0..028cd8da2040c 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
@@ -228,7 +228,7 @@ public function value() {
 		} else {
 			$value = false;
 
-			// Note that a ID of less than one indicates a nav_menu not yet inserted.
+			// Note that an ID of less than one indicates a nav_menu not yet inserted.
 			if ( $this->post_id > 0 ) {
 				$post = get_post( $this->post_id );
 				if ( $post && self::POST_TYPE === $post->post_type ) {
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php b/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
index 9a34aa1c0e964..434fcba30ac2a 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
@@ -50,11 +50,11 @@ public function content_template() {
 							printf(
 								/* translators: 1: Documentation URL, 2: Additional link attributes, 3: Accessibility text. */
 								_x( '(If you plan to use a menu <a href="%1$s" %2$s>widget%3$s</a>, skip this step.)', 'menu locations' ),
-								__( 'https://wordpress.org/support/article/wordpress-widgets/' ),
+								__( 'https://wordpress.org/documentation/article/manage-wordpress-widgets/' ),
 								' class="external-link" target="_blank"',
 								sprintf(
 									'<span class="screen-reader-text"> %s</span>',
-									/* translators: Accessibility text. */
+									/* translators: Hidden accessibility text. */
 									__( '(opens in a new tab)' )
 								)
 							);
diff --git a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php
index c0d098bc7df4c..0678fbf093c4d 100644
--- a/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php
+++ b/src/wp-includes/customize/class-wp-customize-nav-menus-panel.php
@@ -69,7 +69,12 @@ protected function content_template() {
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
 			<button type="button" class="customize-panel-back" tabindex="-1">
-				<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+				<span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Back' );
+					?>
+				</span>
 			</button>
 			<div class="accordion-section-title">
 				<span class="preview-notice">
@@ -79,10 +84,20 @@ protected function content_template() {
 					?>
 				</span>
 				<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Help' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Help' );
+						?>
+					</span>
 				</button>
 				<button type="button" class="customize-screen-options-toggle" aria-expanded="false">
-					<span class="screen-reader-text"><?php _e( 'Menu Options' ); ?></span>
+					<span class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'Menu Options' );
+						?>
+					</span>
 				</button>
 			</div>
 			<# if ( data.description ) { #>
diff --git a/src/wp-includes/customize/class-wp-customize-selective-refresh.php b/src/wp-includes/customize/class-wp-customize-selective-refresh.php
index 6119e68944bc9..f75baff3e4af0 100644
--- a/src/wp-includes/customize/class-wp-customize-selective-refresh.php
+++ b/src/wp-includes/customize/class-wp-customize-selective-refresh.php
@@ -172,7 +172,7 @@ public function export_preview_data() {
 			}
 		}
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_user_locale( get_current_user_id() );
 		$l10n            = array(
 			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
 			'clickEditMenu'    => __( 'Click to edit this menu.' ),
diff --git a/src/wp-includes/customize/class-wp-customize-themes-panel.php b/src/wp-includes/customize/class-wp-customize-themes-panel.php
index 054396e7f7bf0..42d475a5db871 100644
--- a/src/wp-includes/customize/class-wp-customize-themes-panel.php
+++ b/src/wp-includes/customize/class-wp-customize-themes-panel.php
@@ -67,7 +67,12 @@ protected function render_template() {
 	protected function content_template() {
 		?>
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
-			<button class="customize-panel-back" tabindex="-1" type="button"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></button>
+			<button class="customize-panel-back" tabindex="-1" type="button"><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Back' );
+				?>
+			</span></button>
 			<div class="accordion-section-title">
 				<span class="preview-notice">
 					<?php
@@ -80,7 +85,12 @@ protected function content_template() {
 				</span>
 				<?php if ( current_user_can( 'install_themes' ) && ! is_multisite() ) : ?>
 					<# if ( data.description ) { #>
-						<button class="customize-help-toggle dashicons dashicons-editor-help" type="button" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+						<button class="customize-help-toggle dashicons dashicons-editor-help" type="button" aria-expanded="false"><span class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Help' );
+							?>
+						</span></button>
 					<# } #>
 				<?php endif; ?>
 			</div>
diff --git a/src/wp-includes/customize/class-wp-customize-themes-section.php b/src/wp-includes/customize/class-wp-customize-themes-section.php
index 84ec56f1eac21..9d33a681d860a 100644
--- a/src/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/src/wp-includes/customize/class-wp-customize-themes-section.php
@@ -48,7 +48,7 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 	public $filter_type = 'local';
 
 	/**
-	 * Get section parameters for JS.
+	 * Gets section parameters for JS.
 	 *
 	 * @since 4.9.0
 	 * @return array Exported parameters.
@@ -62,7 +62,7 @@ public function json() {
 	}
 
 	/**
-	 * Render a themes section as a JS template.
+	 * Renders a themes section as a JS template.
 	 *
 	 * The template is only rendered by PHP once, so all actions are prepared at once on the server side.
 	 *
@@ -112,10 +112,10 @@ protected function render_template() {
 	}
 
 	/**
-	 * Render the filter bar portion of a themes section as a JS template.
+	 * Renders the filter bar portion of a themes section as a JS template.
 	 *
 	 * The template is only rendered by PHP once, so all actions are prepared at once on the server side.
-	 * The filter bar container is rendered by @see `render_template()`.
+	 * The filter bar container is rendered by {@see render_template()}.
 	 *
 	 * @since 4.9.0
 	 */
@@ -124,25 +124,45 @@ protected function filter_bar_content_template() {
 		<button type="button" class="button button-primary customize-section-back customize-themes-mobile-back"><?php _e( 'Go to theme sources' ); ?></button>
 		<# if ( 'wporg' === data.action ) { #>
 			<div class="search-form">
-				<label for="wp-filter-search-input-{{ data.id }}" class="screen-reader-text"><?php _e( 'Search themes&hellip;' ); ?></label>
+				<label for="wp-filter-search-input-{{ data.id }}" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search themes&hellip;' );
+					?>
+				</label>
 				<input type="search" id="wp-filter-search-input-{{ data.id }}" placeholder="<?php esc_attr_e( 'Search themes&hellip;' ); ?>" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search">
 				<div class="search-icon" aria-hidden="true"></div>
-				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text"><?php _e( 'The search results will be updated as you type.' ); ?></span>
+				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'The search results will be updated as you type.' );
+					?>
+				</span>
 			</div>
 			<button type="button" class="button feature-filter-toggle">
 				<span class="filter-count-0"><?php _e( 'Filter themes' ); ?></span><span class="filter-count-filters">
-				<?php
-				/* translators: %s: Number of filters selected. */
-				printf( __( 'Filter themes (%s)' ), '<span class="theme-filter-count">0</span>' );
-				?>
+					<?php
+					/* translators: %s: Number of filters selected. */
+					printf( __( 'Filter themes (%s)' ), '<span class="theme-filter-count">0</span>' );
+					?>
 				</span>
 			</button>
 		<# } else { #>
 			<div class="themes-filter-container">
-				<label for="{{ data.id }}-themes-filter" class="screen-reader-text"><?php _e( 'Search themes&hellip;' ); ?></label>
+				<label for="{{ data.id }}-themes-filter" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Search themes&hellip;' );
+					?>
+				</label>
 				<input type="search" id="{{ data.id }}-themes-filter" placeholder="<?php esc_attr_e( 'Search themes&hellip;' ); ?>" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search wp-filter-search-themes" />
 				<div class="search-icon" aria-hidden="true"></div>
-				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text"><?php _e( 'The search results will be updated as you type.' ); ?></span>
+				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'The search results will be updated as you type.' );
+					?>
+				</span>
 			</div>
 		<# } #>
 		<div class="filter-themes-count">
@@ -157,15 +177,17 @@ protected function filter_bar_content_template() {
 	}
 
 	/**
-	 * Render the filter drawer portion of a themes section as a JS template.
+	 * Renders the filter drawer portion of a themes section as a JS template.
 	 *
-	 * The filter bar container is rendered by @see `render_template()`.
+	 * The filter bar container is rendered by {@see render_template()}.
 	 *
 	 * @since 4.9.0
 	 */
 	protected function filter_drawer_content_template() {
-		// @todo Use the .org API instead of the local core feature list.
-		// The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.
+		/*
+		 * @todo Use the .org API instead of the local core feature list.
+		 * The .org API is currently outdated and will be reconciled when the .org themes directory is next redesigned.
+		 */
 		$feature_list = get_theme_feature_list( false );
 		?>
 		<# if ( 'wporg' === data.action ) { #>
diff --git a/src/wp-includes/customize/class-wp-widget-area-customize-control.php b/src/wp-includes/customize/class-wp-widget-area-customize-control.php
index 218c3ee29449b..66162827bc8a1 100644
--- a/src/wp-includes/customize/class-wp-widget-area-customize-control.php
+++ b/src/wp-includes/customize/class-wp-widget-area-customize-control.php
@@ -60,7 +60,12 @@ public function render_content() {
 			<span class="reorder"><?php _e( 'Reorder' ); ?></span>
 			<span class="reorder-done"><?php _e( 'Done' ); ?></span>
 		</button>
-		<p class="screen-reader-text" id="<?php echo esc_attr( $id ); ?>"><?php _e( 'When in reorder mode, additional controls to reorder widgets will be available in the widgets list above.' ); ?></p>
+		<p class="screen-reader-text" id="<?php echo esc_attr( $id ); ?>">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'When in reorder mode, additional controls to reorder widgets will be available in the widgets list above.' );
+			?>
+		</p>
 		<?php
 	}
 }
diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php
index 1192ebb7d3130..a1f4eedd54274 100644
--- a/src/wp-includes/default-constants.php
+++ b/src/wp-includes/default-constants.php
@@ -77,17 +77,28 @@ function wp_initial_constants() {
 		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // No trailing slash, full paths only - WP_CONTENT_URL is defined further down.
 	}
 
+	/*
+	 * Add define( 'WP_DEVELOPMENT_MODE', 'core' ), or define( 'WP_DEVELOPMENT_MODE', 'plugin' ), or
+	 * define( 'WP_DEVELOPMENT_MODE', 'theme' ), or define( 'WP_DEVELOPMENT_MODE', 'all' ) to wp-config.php
+	 * to signify development mode for WordPress core, a plugin, a theme, or all three types respectively.
+	 */
+	if ( ! defined( 'WP_DEVELOPMENT_MODE' ) ) {
+		define( 'WP_DEVELOPMENT_MODE', '' );
+	}
+
 	// Add define( 'WP_DEBUG', true ); to wp-config.php to enable display of notices during development.
 	if ( ! defined( 'WP_DEBUG' ) ) {
-		if ( 'development' === wp_get_environment_type() ) {
+		if ( wp_get_development_mode() || 'development' === wp_get_environment_type() ) {
 			define( 'WP_DEBUG', true );
 		} else {
 			define( 'WP_DEBUG', false );
 		}
 	}
 
-	// Add define( 'WP_DEBUG_DISPLAY', null ); to wp-config.php to use the globally configured setting
-	// for 'display_errors' and not force errors to be displayed. Use false to force 'display_errors' off.
+	/*
+	 * Add define( 'WP_DEBUG_DISPLAY', null ); to wp-config.php to use the globally configured setting
+	 * for 'display_errors' and not force errors to be displayed. Use false to force 'display_errors' off.
+	 */
 	if ( ! defined( 'WP_DEBUG_DISPLAY' ) ) {
 		define( 'WP_DEBUG_DISPLAY', true );
 	}
@@ -101,11 +112,13 @@ function wp_initial_constants() {
 		define( 'WP_CACHE', false );
 	}
 
-	// Add define( 'SCRIPT_DEBUG', true ); to wp-config.php to enable loading of non-minified,
-	// non-concatenated scripts and stylesheets.
+	/*
+	 * Add define( 'SCRIPT_DEBUG', true ); to wp-config.php to enable loading of non-minified,
+	 * non-concatenated scripts and stylesheets.
+	 */
 	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
 		if ( ! empty( $wp_version ) ) {
-			$develop_src = false !== strpos( $wp_version, '-src' );
+			$develop_src = str_contains( $wp_version, '-src' );
 		} else {
 			$develop_src = false;
 		}
diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php
index e9ca31f5f7908..bf39f29b4dd93 100644
--- a/src/wp-includes/default-filters.php
+++ b/src/wp-includes/default-filters.php
@@ -115,6 +115,14 @@
 add_action( 'updated_post_meta', 'wp_cache_set_posts_last_changed' );
 add_action( 'deleted_post_meta', 'wp_cache_set_posts_last_changed' );
 
+// User meta.
+add_action( 'added_user_meta', 'wp_cache_set_users_last_changed' );
+add_action( 'updated_user_meta', 'wp_cache_set_users_last_changed' );
+add_action( 'deleted_user_meta', 'wp_cache_set_users_last_changed' );
+add_action( 'add_user_role', 'wp_cache_set_users_last_changed' );
+add_action( 'set_user_role', 'wp_cache_set_users_last_changed' );
+add_action( 'remove_user_role', 'wp_cache_set_users_last_changed' );
+
 // Term meta.
 add_action( 'added_term_meta', 'wp_cache_set_terms_last_changed' );
 add_action( 'updated_term_meta', 'wp_cache_set_terms_last_changed' );
@@ -328,7 +336,6 @@
 add_action( 'wp_head', 'feed_links', 2 );
 add_action( 'wp_head', 'feed_links_extra', 3 );
 add_action( 'wp_head', 'rsd_link' );
-add_action( 'wp_head', 'wlwmanifest_link' );
 add_action( 'wp_head', 'locale_stylesheet' );
 add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );
 add_action( 'wp_head', 'wp_robots', 1 );
@@ -346,8 +353,8 @@
 add_action( 'init', '_register_core_block_patterns_and_categories' );
 add_action( 'init', 'check_theme_switched', 99 );
 add_action( 'init', array( 'WP_Block_Supports', 'init' ), 22 );
-add_action( 'switch_theme', array( 'WP_Theme_JSON_Resolver', 'clean_cached_data' ) );
-add_action( 'start_previewing_theme', array( 'WP_Theme_JSON_Resolver', 'clean_cached_data' ) );
+add_action( 'switch_theme', 'wp_clean_theme_json_cache' );
+add_action( 'start_previewing_theme', 'wp_clean_theme_json_cache' );
 add_action( 'after_switch_theme', '_wp_menus_changed' );
 add_action( 'after_switch_theme', '_wp_sidebars_changed' );
 add_action( 'wp_print_styles', 'print_emoji_styles' );
@@ -437,9 +444,11 @@
 add_action( 'transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3 );
 add_action( 'delete_post', '_wp_delete_customize_changeset_dependent_auto_drafts' );
 
-// Post Thumbnail CSS class filtering.
+// Post Thumbnail specific image filtering.
 add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add' );
 add_action( 'end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove' );
+add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_context_filter_add' );
+add_action( 'end_fetch_post_thumbnail_html', '_wp_post_thumbnail_context_filter_remove' );
 
 // Redirect old slugs.
 add_action( 'template_redirect', 'wp_old_slug_redirect' );
@@ -562,14 +571,27 @@
 add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' );
 add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
 add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
+/*
+ * `wp_enqueue_registered_block_scripts_and_styles` is bound to both
+ * `enqueue_block_editor_assets` and `enqueue_block_assets` hooks
+ * since the introduction of the block editor in WordPress 5.0.
+ *
+ * The way this works is that the block assets are loaded before any other assets.
+ * For example, this is the order of styles for the editor:
+ *
+ * - front styles registered for blocks, via `styles` handle (block.json)
+ * - editor styles registered for blocks, via `editorStyles` handle (block.json)
+ * - editor styles enqueued via `enqueue_block_editor_assets` hook
+ * - front styles enqueued via `enqueue_block_assets` hook
+ */
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
 add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' );
 add_action( 'enqueue_block_editor_assets', 'wp_enqueue_global_styles_css_custom_properties' );
-add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
+add_action( 'wp_print_scripts', 'wp_just_in_time_script_localization' );
 add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
-add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
+add_action( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
 add_action( 'admin_head', 'wp_check_widget_editor_deps' );
 add_filter( 'block_editor_settings_all', 'wp_add_editor_classic_theme_styles' );
 
@@ -577,14 +599,13 @@
 add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles' );
 add_action( 'wp_footer', 'wp_enqueue_global_styles', 1 );
 
+// Global styles custom CSS.
+add_action( 'wp_enqueue_scripts', 'wp_enqueue_global_styles_custom_css' );
+
 // Block supports, and other styles parsed and stored in the Style Engine.
 add_action( 'wp_enqueue_scripts', 'wp_enqueue_stored_styles' );
 add_action( 'wp_footer', 'wp_enqueue_stored_styles', 1 );
 
-// SVG filters like duotone have to be loaded at the beginning of the body in both admin and the front-end.
-add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
-add_action( 'in_admin_header', 'wp_global_styles_render_svg_filters' );
-
 add_action( 'wp_default_styles', 'wp_default_styles' );
 add_filter( 'style_loader_src', 'wp_style_loader_src', 10, 2 );
 
@@ -617,11 +638,13 @@
 
 // Nav menu.
 add_filter( 'nav_menu_item_id', '_nav_menu_item_id_use_once', 10, 2 );
+add_filter( 'nav_menu_css_class', 'wp_nav_menu_remove_menu_item_has_children_class', 10, 4 );
 
 // Widgets.
 add_action( 'after_setup_theme', 'wp_setup_widgets_block_editor', 1 );
 add_action( 'init', 'wp_widgets_init', 1 );
 add_action( 'change_locale', array( 'WP_Widget_Media', 'reset_default_labels' ) );
+add_action( 'widgets_init', '_wp_block_theme_register_classic_sidebars', 1 );
 
 // Admin Bar.
 // Don't remove. Wrong way to disable.
@@ -693,4 +716,7 @@
 // User preferences.
 add_action( 'init', 'wp_register_persisted_preferences_meta' );
 
+// CPT wp_block custom postmeta field.
+add_action( 'init', 'wp_create_initial_post_meta' );
+
 unset( $filter, $action );
diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php
index 8f41b1303810b..72bf98d8321b8 100644
--- a/src/wp-includes/deprecated.php
+++ b/src/wp-includes/deprecated.php
@@ -741,12 +741,12 @@ function list_authors($optioncount = false, $exclude_admin = true, $show_fullnam
  * @see wp_get_post_categories()
  *
  * @param int $blogid Not Used
- * @param int $post_ID
+ * @param int $post_id
  * @return array
  */
-function wp_get_post_cats($blogid = '1', $post_ID = 0) {
+function wp_get_post_cats($blogid = '1', $post_id = 0) {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_get_post_categories()' );
-	return wp_get_post_categories($post_ID);
+	return wp_get_post_categories($post_id);
 }
 
 /**
@@ -758,13 +758,13 @@ function wp_get_post_cats($blogid = '1', $post_ID = 0) {
  * @see wp_set_post_categories()
  *
  * @param int $blogid Not used
- * @param int $post_ID
+ * @param int $post_id
  * @param array $post_categories
  * @return bool|mixed
  */
-function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
+function wp_set_post_cats($blogid = '1', $post_id = 0, $post_categories = array()) {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_set_post_categories()' );
-	return wp_set_post_categories($post_ID, $post_categories);
+	return wp_set_post_categories($post_id, $post_categories);
 }
 
 /**
@@ -889,7 +889,7 @@ function permalink_single_rss($deprecated = '') {
 function wp_get_links($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
 
-	if ( strpos( $args, '=' ) === false ) {
+	if ( ! str_contains( $args, '=' ) ) {
 		$cat_id = $args;
 		$args = add_query_arg( 'category', $cat_id, $args );
 	}
@@ -947,7 +947,7 @@ function get_links($category = -1, $before = '', $after = '<br />', $between = '
 	_deprecated_function( __FUNCTION__, '2.1.0', 'get_bookmarks()' );
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if ( str_starts_with($orderby, '_') ) {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
@@ -980,7 +980,7 @@ function get_links($category = -1, $before = '', $after = '<br />', $between = '
 		$title = $desc;
 
 		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+			if ( !str_starts_with($row->link_updated_f, '00') )
 				$title .= ' ('.__('Last updated') . ' ' . gmdate(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
 
 		if ( '' != $title )
@@ -995,7 +995,7 @@ function get_links($category = -1, $before = '', $after = '<br />', $between = '
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+			if ( str_contains( $row->link_image, 'http' ) )
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path.
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
@@ -1042,7 +1042,7 @@ function get_links_list($order = 'name') {
 
 	// Handle link category sorting.
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ( str_starts_with( $order, '_' ) ) {
 		$direction = 'DESC';
 		$order = substr($order,1);
 	}
@@ -1150,13 +1150,13 @@ function comments_rss_link($link_text = 'Comments RSS') {
  * @see get_category_feed_link()
  *
  * @param bool $display
- * @param int $cat_ID
+ * @param int $cat_id
  * @return string
  */
-function get_category_rss_link($display = false, $cat_ID = 1) {
+function get_category_rss_link($display = false, $cat_id = 1) {
 	_deprecated_function( __FUNCTION__, '2.5.0', 'get_category_feed_link()' );
 
-	$link = get_category_feed_link($cat_ID, 'rss2');
+	$link = get_category_feed_link($cat_id, 'rss2');
 
 	if ( $display )
 		echo $link;
@@ -1225,20 +1225,20 @@ function gzip_compression() {
 }
 
 /**
- * Retrieve an array of comment data about comment $comment_ID.
+ * Retrieve an array of comment data about comment $comment_id.
  *
  * @since 0.71
  * @deprecated 2.7.0 Use get_comment()
  * @see get_comment()
  *
- * @param int $comment_ID The ID of the comment
+ * @param int $comment_id The ID of the comment
  * @param int $no_cache Whether to use the cache (cast to bool)
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
+function get_commentdata( $comment_id, $no_cache = 0, $include_unapproved = false ) {
 	_deprecated_function( __FUNCTION__, '2.7.0', 'get_comment()' );
-	return get_comment($comment_ID, ARRAY_A);
+	return get_comment($comment_id, ARRAY_A);
 }
 
 /**
@@ -1248,12 +1248,12 @@ function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = fals
  * @deprecated 2.8.0 Use get_cat_name()
  * @see get_cat_name()
  *
- * @param int $cat_ID Category ID
+ * @param int $cat_id Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
+function get_catname( $cat_id ) {
 	_deprecated_function( __FUNCTION__, '2.8.0', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+	return get_cat_name( $cat_id );
 }
 
 /**
@@ -1739,7 +1739,7 @@ function make_url_footnote( $content ) {
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
 		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
+		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) !== 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) !== 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
 		$links_summary .= "\n" . $link_number . ' ' . $link_url;
 	}
 	$content  = strip_tags( $content );
@@ -2297,7 +2297,7 @@ function get_usermeta( $user_id, $meta_key = '' ) {
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if ( count($metas) === 1 )
 		return $metas[0];
 	else
 		return $metas;
@@ -3654,12 +3654,14 @@ function post_permalink( $post = 0 ) {
  * @param string|bool $file_path Optional. File path to write request to. Default false.
  * @param int         $red       Optional. The number of Redirects followed, Upon 5 being hit,
  *                               returns false. Default 1.
- * @return \Requests_Utility_CaseInsensitiveDictionary|false Headers on success, false on failure.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|false Headers on success, false on failure.
  */
 function wp_get_http( $url, $file_path = false, $red = 1 ) {
 	_deprecated_function( __FUNCTION__, '4.4.0', 'WP_Http' );
 
-	@set_time_limit( 60 );
+	if ( function_exists( 'set_time_limit' ) ) {
+		@set_time_limit( 60 );
+	}
 
 	if ( $red > 5 )
 		return false;
@@ -3914,7 +3916,7 @@ function _sort_nav_menu_items( $a, $b ) {
  *
  * @since 2.6.0
  * @deprecated 4.9.0
- *
+ * @return string
  */
 function get_shortcut_link() {
 	_deprecated_function( __FUNCTION__, '4.9.0' );
@@ -3933,11 +3935,11 @@ function get_shortcut_link() {
 }
 
 /**
-* Ajax handler for saving a post from Press This.
-*
-* @since 4.2.0
-* @deprecated 4.9.0
-*/
+ * Ajax handler for saving a post from Press This.
+ *
+ * @since 4.2.0
+ * @deprecated 4.9.0
+ */
 function wp_ajax_press_this_save_post() {
 	_deprecated_function( __FUNCTION__, '4.9.0' );
 	if ( is_plugin_active( 'press-this/press-this-plugin.php' ) ) {
@@ -3950,11 +3952,11 @@ function wp_ajax_press_this_save_post() {
 }
 
 /**
-* Ajax handler for creating new category from Press This.
-*
-* @since 4.2.0
-* @deprecated 4.9.0
-*/
+ * Ajax handler for creating new category from Press This.
+ *
+ * @since 4.2.0
+ * @deprecated 4.9.0
+ */
 function wp_ajax_press_this_add_category() {
 	_deprecated_function( __FUNCTION__, '4.9.0' );
 	if ( is_plugin_active( 'press-this/press-this-plugin.php' ) ) {
@@ -4444,15 +4446,15 @@ function _get_path_to_translation_from_lang_dir( $domain ) {
 }
 
 /**
-  * Allows multiple block styles.
-  *
-  * @since 5.9.0
-  * @deprecated 6.1.0
-  *
-  * @param array $metadata Metadata for registering a block type.
-  * @return array Metadata for registering a block type.
-  */
-  function _wp_multiple_block_styles( $metadata ) {
+ * Allows multiple block styles.
+ *
+ * @since 5.9.0
+ * @deprecated 6.1.0
+ *
+ * @param array $metadata Metadata for registering a block type.
+ * @return array Metadata for registering a block type.
+ */
+function _wp_multiple_block_styles( $metadata ) {
 	_deprecated_function( __FUNCTION__, '6.1.0' );
 	return $metadata;
 }
@@ -4482,7 +4484,7 @@ function wp_typography_get_css_variable_inline_style( $attributes, $feature, $cs
 	}
 
 	// If we don't have a preset CSS variable, we'll assume it's a regular CSS value.
-	if ( strpos( $style_value, "var:preset|{$css_property}|" ) === false ) {
+	if ( ! str_contains( $style_value, "var:preset|{$css_property}|" ) ) {
 		return sprintf( '%s:%s;', $css_property, $style_value );
 	}
 
@@ -4524,7 +4526,844 @@ function global_terms_enabled() {
  * @return array The unmodified clauses.
  */
 function _filter_query_attachment_filenames( $clauses ) {
-	_deprecated_function( __FUNCTION__, '4.9.9', 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )' );
+	_deprecated_function( __FUNCTION__, '6.0.3', 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )' );
 	remove_filter( 'posts_clauses', __FUNCTION__ );
 	return $clauses;
 }
+
+/**
+ * Retrieves a page given its title.
+ *
+ * If more than one post uses the same title, the post with the smallest ID will be returned.
+ * Be careful: in case of more than one post having the same title, it will check the oldest
+ * publication date, not the smallest ID.
+ *
+ * Because this function uses the MySQL '=' comparison, $page_title will usually be matched
+ * as case-insensitive with default collation.
+ *
+ * @since 2.1.0
+ * @since 3.0.0 The `$post_type` parameter was added.
+ * @deprecated 6.2.0 Use WP_Query.
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string       $page_title Page title.
+ * @param string       $output     Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
+ *                                 correspond to a WP_Post object, an associative array, or a numeric array,
+ *                                 respectively. Default OBJECT.
+ * @param string|array $post_type  Optional. Post type or array of post types. Default 'page'.
+ * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
+ */
+function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) {
+	_deprecated_function( __FUNCTION__, '6.2.0', 'WP_Query' );
+	global $wpdb;
+
+	if ( is_array( $post_type ) ) {
+		$post_type           = esc_sql( $post_type );
+		$post_type_in_string = "'" . implode( "','", $post_type ) . "'";
+		$sql                 = $wpdb->prepare(
+			"SELECT ID
+			FROM $wpdb->posts
+			WHERE post_title = %s
+			AND post_type IN ($post_type_in_string)",
+			$page_title
+		);
+	} else {
+		$sql = $wpdb->prepare(
+			"SELECT ID
+			FROM $wpdb->posts
+			WHERE post_title = %s
+			AND post_type = %s",
+			$page_title,
+			$post_type
+		);
+	}
+
+	$page = $wpdb->get_var( $sql );
+
+	if ( $page ) {
+		return get_post( $page, $output );
+	}
+
+	return null;
+}
+
+/**
+ * Returns the correct template for the site's home page.
+ *
+ * @access private
+ * @since 6.0.0
+ * @deprecated 6.2.0 Site Editor's server-side redirect for missing postType and postId
+ *                   query args is removed. Thus, this function is no longer used.
+ *
+ * @return array|null A template object, or null if none could be found.
+ */
+function _resolve_home_block_template() {
+	_deprecated_function( __FUNCTION__, '6.2.0' );
+
+	$show_on_front = get_option( 'show_on_front' );
+	$front_page_id = get_option( 'page_on_front' );
+
+	if ( 'page' === $show_on_front && $front_page_id ) {
+		return array(
+				'postType' => 'page',
+				'postId'   => $front_page_id,
+		);
+	}
+
+	$hierarchy = array( 'front-page', 'home', 'index' );
+	$template  = resolve_block_template( 'home', $hierarchy, '' );
+
+	if ( ! $template ) {
+		return null;
+	}
+
+	return array(
+			'postType' => 'wp_template',
+			'postId'   => $template->id,
+	);
+}
+
+/**
+ * Displays the link to the Windows Live Writer manifest file.
+ *
+ * @link https://msdn.microsoft.com/en-us/library/bb463265.aspx
+ * @since 2.3.1
+ * @deprecated 6.3.0 WLW manifest is no longer in use and no longer included in core,
+ *                   so the output from this function is removed.
+ */
+function wlwmanifest_link() {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+}
+
+/**
+ * Queues comments for metadata lazy-loading.
+ *
+ * @since 4.5.0
+ * @deprecated 6.3.0 Use wp_lazyload_comment_meta() instead.
+ *
+ * @param WP_Comment[] $comments Array of comment objects.
+ */
+function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
+	_deprecated_function( __FUNCTION__, '6.3.0', 'wp_lazyload_comment_meta()' );
+	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
+	$comment_ids = array();
+	if ( is_array( $comments ) ) {
+		foreach ( $comments as $comment ) {
+			if ( $comment instanceof WP_Comment ) {
+				$comment_ids[] = $comment->comment_ID;
+			}
+		}
+	}
+
+	wp_lazyload_comment_meta( $comment_ids );
+}
+
+/**
+ * Gets the default value to use for a `loading` attribute on an element.
+ *
+ * This function should only be called for a tag and context if lazy-loading is generally enabled.
+ *
+ * The function usually returns 'lazy', but uses certain heuristics to guess whether the current element is likely to
+ * appear above the fold, in which case it returns a boolean `false`, which will lead to the `loading` attribute being
+ * omitted on the element. The purpose of this refinement is to avoid lazy-loading elements that are within the initial
+ * viewport, which can have a negative performance impact.
+ *
+ * Under the hood, the function uses {@see wp_increase_content_media_count()} every time it is called for an element
+ * within the main content. If the element is the very first content element, the `loading` attribute will be omitted.
+ * This default threshold of 3 content elements to omit the `loading` attribute for can be customized using the
+ * {@see 'wp_omit_loading_attr_threshold'} filter.
+ *
+ * @since 5.9.0
+ * @deprecated 6.3.0 Use wp_get_loading_optimization_attributes() instead.
+ * @see wp_get_loading_optimization_attributes()
+ *
+ * @global WP_Query $wp_query WordPress Query object.
+ *
+ * @param string $context Context for the element for which the `loading` attribute value is requested.
+ * @return string|bool The default `loading` attribute value. Either 'lazy', 'eager', or a boolean `false`, to indicate
+ *                     that the `loading` attribute should be skipped.
+ */
+function wp_get_loading_attr_default( $context ) {
+	_deprecated_function( __FUNCTION__, '6.3.0', 'wp_get_loading_optimization_attributes()' );
+	global $wp_query;
+
+	// Skip lazy-loading for the overall block template, as it is handled more granularly.
+	if ( 'template' === $context ) {
+		return false;
+	}
+
+	/*
+	 * Do not lazy-load images in the header block template part, as they are likely above the fold.
+	 * For classic themes, this is handled in the condition below using the 'get_header' action.
+	 */
+	$header_area = WP_TEMPLATE_PART_AREA_HEADER;
+	if ( "template_part_{$header_area}" === $context ) {
+		return false;
+	}
+
+	// Special handling for programmatically created image tags.
+	if ( 'the_post_thumbnail' === $context || 'wp_get_attachment_image' === $context ) {
+		/*
+		 * Skip programmatically created images within post content as they need to be handled together with the other
+		 * images within the post content.
+		 * Without this clause, they would already be counted below which skews the number and can result in the first
+		 * post content image being lazy-loaded only because there are images elsewhere in the post content.
+		 */
+		if ( doing_filter( 'the_content' ) ) {
+			return false;
+		}
+
+		// Conditionally skip lazy-loading on images before the loop.
+		if (
+			// Only apply for main query but before the loop.
+			$wp_query->before_loop && $wp_query->is_main_query()
+			/*
+			 * Any image before the loop, but after the header has started should not be lazy-loaded,
+			 * except when the footer has already started which can happen when the current template
+			 * does not include any loop.
+			 */
+			&& did_action( 'get_header' ) && ! did_action( 'get_footer' )
+		) {
+			return false;
+		}
+	}
+
+	/*
+	 * The first elements in 'the_content' or 'the_post_thumbnail' should not be lazy-loaded,
+	 * as they are likely above the fold.
+	 */
+	if ( 'the_content' === $context || 'the_post_thumbnail' === $context ) {
+		// Only elements within the main query loop have special handling.
+		if ( is_admin() || ! in_the_loop() || ! is_main_query() ) {
+			return 'lazy';
+		}
+
+		// Increase the counter since this is a main query content element.
+		$content_media_count = wp_increase_content_media_count();
+
+		// If the count so far is below the threshold, return `false` so that the `loading` attribute is omitted.
+		if ( $content_media_count <= wp_omit_loading_attr_threshold() ) {
+			return false;
+		}
+
+		// For elements after the threshold, lazy-load them as usual.
+		return 'lazy';
+	}
+
+	// Lazy-load by default for any unknown context.
+	return 'lazy';
+}
+
+/**
+ * Adds `loading` attribute to an `img` HTML tag.
+ *
+ * @since 5.5.0
+ * @deprecated 6.3.0 Use wp_img_tag_add_loading_optimization_attrs() instead.
+ * @see wp_img_tag_add_loading_optimization_attrs()
+ *
+ * @param string $image   The HTML `img` tag where the attribute should be added.
+ * @param string $context Additional context to pass to the filters.
+ * @return string Converted `img` tag with `loading` attribute added.
+ */
+function wp_img_tag_add_loading_attr( $image, $context ) {
+	_deprecated_function( __FUNCTION__, '6.3.0', 'wp_img_tag_add_loading_optimization_attrs()' );
+	/*
+	 * Get loading attribute value to use. This must occur before the conditional check below so that even images that
+	 * are ineligible for being lazy-loaded are considered.
+	 */
+	$value = wp_get_loading_attr_default( $context );
+
+	// Images should have source and dimension attributes for the `loading` attribute to be added.
+	if ( ! str_contains( $image, ' src="' ) || ! str_contains( $image, ' width="' ) || ! str_contains( $image, ' height="' ) ) {
+		return $image;
+	}
+
+	/** This filter is documented in wp-admin/includes/media.php */
+	$value = apply_filters( 'wp_img_tag_add_loading_attr', $value, $image, $context );
+
+	if ( $value ) {
+		if ( ! in_array( $value, array( 'lazy', 'eager' ), true ) ) {
+			$value = 'lazy';
+		}
+
+		return str_replace( '<img', '<img loading="' . esc_attr( $value ) . '"', $image );
+	}
+
+	return $image;
+}
+
+/**
+ * Takes input from [0, n] and returns it as [0, 1].
+ *
+ * Direct port of TinyColor's function, lightly simplified to maintain
+ * consistency with TinyColor.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ *
+ * @since 5.8.0
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param mixed $n   Number of unknown type.
+ * @param int   $max Upper value of the range to bound to.
+ * @return float Value in the range [0, 1].
+ */
+function wp_tinycolor_bound01( $n, $max ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+	if ( 'string' === gettype( $n ) && str_contains( $n, '.' ) && 1 === (float) $n ) {
+		$n = '100%';
+	}
+
+	$n = min( $max, max( 0, (float) $n ) );
+
+	// Automatically convert percentage into number.
+	if ( 'string' === gettype( $n ) && str_contains( $n, '%' ) ) {
+		$n = (int) ( $n * $max ) / 100;
+	}
+
+	// Handle floating point rounding errors.
+	if ( ( abs( $n - $max ) < 0.000001 ) ) {
+		return 1.0;
+	}
+
+	// Convert into [0, 1] range if it isn't already.
+	return ( $n % $max ) / (float) $max;
+}
+
+/**
+ * Direct port of tinycolor's boundAlpha function to maintain consistency with
+ * how tinycolor works.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ *
+ * @since 5.9.0
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param mixed $n Number of unknown type.
+ * @return float Value in the range [0,1].
+ */
+function _wp_tinycolor_bound_alpha( $n ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	if ( is_numeric( $n ) ) {
+		$n = (float) $n;
+		if ( $n >= 0 && $n <= 1 ) {
+			return $n;
+		}
+	}
+	return 1;
+}
+
+/**
+ * Rounds and converts values of an RGB object.
+ *
+ * Direct port of TinyColor's function, lightly simplified to maintain
+ * consistency with TinyColor.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ *
+ * @since 5.8.0
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param array $rgb_color RGB object.
+ * @return array Rounded and converted RGB object.
+ */
+function wp_tinycolor_rgb_to_rgb( $rgb_color ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	return array(
+		'r' => wp_tinycolor_bound01( $rgb_color['r'], 255 ) * 255,
+		'g' => wp_tinycolor_bound01( $rgb_color['g'], 255 ) * 255,
+		'b' => wp_tinycolor_bound01( $rgb_color['b'], 255 ) * 255,
+	);
+}
+
+/**
+ * Helper function for hsl to rgb conversion.
+ *
+ * Direct port of TinyColor's function, lightly simplified to maintain
+ * consistency with TinyColor.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ *
+ * @since 5.8.0
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param float $p first component.
+ * @param float $q second component.
+ * @param float $t third component.
+ * @return float R, G, or B component.
+ */
+function wp_tinycolor_hue_to_rgb( $p, $q, $t ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	if ( $t < 0 ) {
+		++$t;
+	}
+	if ( $t > 1 ) {
+		--$t;
+	}
+	if ( $t < 1 / 6 ) {
+		return $p + ( $q - $p ) * 6 * $t;
+	}
+	if ( $t < 1 / 2 ) {
+		return $q;
+	}
+	if ( $t < 2 / 3 ) {
+		return $p + ( $q - $p ) * ( 2 / 3 - $t ) * 6;
+	}
+	return $p;
+}
+
+/**
+ * Converts an HSL object to an RGB object with converted and rounded values.
+ *
+ * Direct port of TinyColor's function, lightly simplified to maintain
+ * consistency with TinyColor.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ *
+ * @since 5.8.0
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param array $hsl_color HSL object.
+ * @return array Rounded and converted RGB object.
+ */
+function wp_tinycolor_hsl_to_rgb( $hsl_color ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	$h = wp_tinycolor_bound01( $hsl_color['h'], 360 );
+	$s = wp_tinycolor_bound01( $hsl_color['s'], 100 );
+	$l = wp_tinycolor_bound01( $hsl_color['l'], 100 );
+
+	if ( 0 === $s ) {
+		// Achromatic.
+		$r = $l;
+		$g = $l;
+		$b = $l;
+	} else {
+		$q = $l < 0.5 ? $l * ( 1 + $s ) : $l + $s - $l * $s;
+		$p = 2 * $l - $q;
+		$r = wp_tinycolor_hue_to_rgb( $p, $q, $h + 1 / 3 );
+		$g = wp_tinycolor_hue_to_rgb( $p, $q, $h );
+		$b = wp_tinycolor_hue_to_rgb( $p, $q, $h - 1 / 3 );
+	}
+
+	return array(
+		'r' => $r * 255,
+		'g' => $g * 255,
+		'b' => $b * 255,
+	);
+}
+
+/**
+ * Parses hex, hsl, and rgb CSS strings using the same regex as TinyColor v1.4.2
+ * used in the JavaScript. Only colors output from react-color are implemented.
+ *
+ * Direct port of TinyColor's function, lightly simplified to maintain
+ * consistency with TinyColor.
+ *
+ * @link https://github.com/bgrins/TinyColor
+ * @link https://github.com/casesandberg/react-color/
+ *
+ * @since 5.8.0
+ * @since 5.9.0 Added alpha processing.
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param string $color_str CSS color string.
+ * @return array RGB object.
+ */
+function wp_tinycolor_string_to_rgb( $color_str ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	$color_str = strtolower( trim( $color_str ) );
+
+	$css_integer = '[-\\+]?\\d+%?';
+	$css_number  = '[-\\+]?\\d*\\.\\d+%?';
+
+	$css_unit = '(?:' . $css_number . ')|(?:' . $css_integer . ')';
+
+	$permissive_match3 = '[\\s|\\(]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')\\s*\\)?';
+	$permissive_match4 = '[\\s|\\(]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')[,|\\s]+(' . $css_unit . ')\\s*\\)?';
+
+	$rgb_regexp = '/^rgb' . $permissive_match3 . '$/';
+	if ( preg_match( $rgb_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => $match[1],
+				'g' => $match[2],
+				'b' => $match[3],
+			)
+		);
+
+		$rgb['a'] = 1;
+
+		return $rgb;
+	}
+
+	$rgba_regexp = '/^rgba' . $permissive_match4 . '$/';
+	if ( preg_match( $rgba_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => $match[1],
+				'g' => $match[2],
+				'b' => $match[3],
+			)
+		);
+
+		$rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] );
+
+		return $rgb;
+	}
+
+	$hsl_regexp = '/^hsl' . $permissive_match3 . '$/';
+	if ( preg_match( $hsl_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_hsl_to_rgb(
+			array(
+				'h' => $match[1],
+				's' => $match[2],
+				'l' => $match[3],
+			)
+		);
+
+		$rgb['a'] = 1;
+
+		return $rgb;
+	}
+
+	$hsla_regexp = '/^hsla' . $permissive_match4 . '$/';
+	if ( preg_match( $hsla_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_hsl_to_rgb(
+			array(
+				'h' => $match[1],
+				's' => $match[2],
+				'l' => $match[3],
+			)
+		);
+
+		$rgb['a'] = _wp_tinycolor_bound_alpha( $match[4] );
+
+		return $rgb;
+	}
+
+	$hex8_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/';
+	if ( preg_match( $hex8_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => base_convert( $match[1], 16, 10 ),
+				'g' => base_convert( $match[2], 16, 10 ),
+				'b' => base_convert( $match[3], 16, 10 ),
+			)
+		);
+
+		$rgb['a'] = _wp_tinycolor_bound_alpha(
+			base_convert( $match[4], 16, 10 ) / 255
+		);
+
+		return $rgb;
+	}
+
+	$hex6_regexp = '/^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/';
+	if ( preg_match( $hex6_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => base_convert( $match[1], 16, 10 ),
+				'g' => base_convert( $match[2], 16, 10 ),
+				'b' => base_convert( $match[3], 16, 10 ),
+			)
+		);
+
+		$rgb['a'] = 1;
+
+		return $rgb;
+	}
+
+	$hex4_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/';
+	if ( preg_match( $hex4_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => base_convert( $match[1] . $match[1], 16, 10 ),
+				'g' => base_convert( $match[2] . $match[2], 16, 10 ),
+				'b' => base_convert( $match[3] . $match[3], 16, 10 ),
+			)
+		);
+
+		$rgb['a'] = _wp_tinycolor_bound_alpha(
+			base_convert( $match[4] . $match[4], 16, 10 ) / 255
+		);
+
+		return $rgb;
+	}
+
+	$hex3_regexp = '/^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})$/';
+	if ( preg_match( $hex3_regexp, $color_str, $match ) ) {
+		$rgb = wp_tinycolor_rgb_to_rgb(
+			array(
+				'r' => base_convert( $match[1] . $match[1], 16, 10 ),
+				'g' => base_convert( $match[2] . $match[2], 16, 10 ),
+				'b' => base_convert( $match[3] . $match[3], 16, 10 ),
+			)
+		);
+
+		$rgb['a'] = 1;
+
+		return $rgb;
+	}
+
+	/*
+	 * The JS color picker considers the string "transparent" to be a hex value,
+	 * so we need to handle it here as a special case.
+	 */
+	if ( 'transparent' === $color_str ) {
+		return array(
+			'r' => 0,
+			'g' => 0,
+			'b' => 0,
+			'a' => 0,
+		);
+	}
+}
+
+/**
+ * Returns the prefixed id for the duotone filter for use as a CSS id.
+ *
+ * @since 5.9.1
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone filter CSS id.
+ */
+function wp_get_duotone_filter_id( $preset ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+	return WP_Duotone::get_filter_id_from_preset( $preset );
+}
+
+/**
+ * Returns the CSS filter property url to reference the rendered SVG.
+ *
+ * @since 5.9.0
+ * @since 6.1.0 Allow unset for preset colors.
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone CSS filter property url value.
+ */
+function wp_get_duotone_filter_property( $preset ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+	return WP_Duotone::get_filter_css_property_value_from_preset( $preset );
+}
+
+/**
+ * Returns the duotone filter SVG string for the preset.
+ *
+ * @since 5.9.1
+ * @deprecated 6.3.0
+ *
+ * @access private
+ *
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone SVG filter.
+ */
+function wp_get_duotone_filter_svg( $preset ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+	return WP_Duotone::get_filter_svg_from_preset( $preset );
+}
+
+/**
+ * Registers the style and colors block attributes for block types that support it.
+ *
+ * @since 5.8.0
+ * @deprecated 6.3.0 Use WP_Duotone::register_duotone_support() instead.
+ *
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_duotone_support( $block_type ) {
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Duotone::register_duotone_support()' );
+	return WP_Duotone::register_duotone_support( $block_type );
+}
+
+/**
+ * Renders out the duotone stylesheet and SVG.
+ *
+ * @since 5.8.0
+ * @since 6.1.0 Allow unset for preset colors.
+ * @deprecated 6.3.0 Use WP_Duotone::render_duotone_support() instead.
+ *
+ * @access private
+ *
+ * @param string $block_content Rendered block content.
+ * @param array  $block         Block object.
+ * @return string Filtered block content.
+ */
+function wp_render_duotone_support( $block_content, $block ) {
+	_deprecated_function( __FUNCTION__, '6.3.0', 'WP_Duotone::render_duotone_support()' );
+	$wp_block = new WP_Block( $block );
+	return WP_Duotone::render_duotone_support( $block_content, $block, $wp_block );
+}
+
+/**
+ * Returns a string containing the SVGs to be referenced as filters (duotone).
+ *
+ * @since 5.9.1
+ * @deprecated 6.3.0 SVG generation is handled on a per-block basis in block supports.
+ *
+ * @return string
+ */
+function wp_get_global_styles_svg_filters() {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	/*
+	 * Ignore cache when the development mode is set to 'theme', so it doesn't interfere with the theme
+	 * developer's workflow.
+	 */
+	$can_use_cached = ! wp_is_development_mode( 'theme' );
+	$cache_group    = 'theme_json';
+	$cache_key      = 'wp_get_global_styles_svg_filters';
+	if ( $can_use_cached ) {
+		$cached = wp_cache_get( $cache_key, $cache_group );
+		if ( $cached ) {
+			return $cached;
+		}
+	}
+
+	$supports_theme_json = wp_theme_has_theme_json();
+
+	$origins = array( 'default', 'theme', 'custom' );
+	if ( ! $supports_theme_json ) {
+		$origins = array( 'default' );
+	}
+
+	$tree = WP_Theme_JSON_Resolver::get_merged_data();
+	$svgs = $tree->get_svg_filters( $origins );
+
+	if ( $can_use_cached ) {
+		wp_cache_set( $cache_key, $svgs, $cache_group );
+	}
+
+	return $svgs;
+}
+
+/**
+ * Renders the SVG filters supplied by theme.json.
+ *
+ * Note that this doesn't render the per-block user-defined
+ * filters which are handled by wp_render_duotone_support,
+ * but it should be rendered before the filtered content
+ * in the body to satisfy Safari's rendering quirks.
+ *
+ * @since 5.9.1
+ * @deprecated 6.3.0 SVG generation is handled on a per-block basis in block supports.
+ */
+function wp_global_styles_render_svg_filters() {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+
+	/*
+	 * When calling via the in_admin_header action, we only want to render the
+	 * SVGs on block editor pages.
+	 */
+	if (
+		is_admin() &&
+		! get_current_screen()->is_block_editor()
+	) {
+		return;
+	}
+
+	$filters = wp_get_global_styles_svg_filters();
+	if ( ! empty( $filters ) ) {
+		echo $filters;
+	}
+}
+
+/**
+ * Build an array with CSS classes and inline styles defining the colors
+ * which will be applied to the navigation markup in the front-end.
+ *
+ * @since 5.9.0
+ * @deprecated 6.3.0 This was removed from the Navigation Submenu block in favour of `wp_apply_colors_support()`.
+ *                   `wp_apply_colors_support()` returns an array with similar class and style values,
+ *                   but with different keys: `class` and `style`.
+ *
+ * @param  array $context     Navigation block context.
+ * @param  array $attributes  Block attributes.
+ * @param  bool  $is_sub_menu Whether the block is a sub-menu.
+ * @return array Colors CSS classes and inline styles.
+ */
+function block_core_navigation_submenu_build_css_colors( $context, $attributes, $is_sub_menu = false ) {
+	_deprecated_function( __FUNCTION__, '6.3.0' );
+	$colors = array(
+		'css_classes'   => array(),
+		'inline_styles' => '',
+	);
+
+	// Text color.
+	$named_text_color  = null;
+	$custom_text_color = null;
+
+	if ( $is_sub_menu && array_key_exists( 'customOverlayTextColor', $context ) ) {
+		$custom_text_color = $context['customOverlayTextColor'];
+	} elseif ( $is_sub_menu && array_key_exists( 'overlayTextColor', $context ) ) {
+		$named_text_color = $context['overlayTextColor'];
+	} elseif ( array_key_exists( 'customTextColor', $context ) ) {
+		$custom_text_color = $context['customTextColor'];
+	} elseif ( array_key_exists( 'textColor', $context ) ) {
+		$named_text_color = $context['textColor'];
+	} elseif ( isset( $context['style']['color']['text'] ) ) {
+		$custom_text_color = $context['style']['color']['text'];
+	}
+
+	// If has text color.
+	if ( ! is_null( $named_text_color ) ) {
+		// Add the color class.
+		array_push( $colors['css_classes'], 'has-text-color', sprintf( 'has-%s-color', $named_text_color ) );
+	} elseif ( ! is_null( $custom_text_color ) ) {
+		// Add the custom color inline style.
+		$colors['css_classes'][]  = 'has-text-color';
+		$colors['inline_styles'] .= sprintf( 'color: %s;', $custom_text_color );
+	}
+
+	// Background color.
+	$named_background_color  = null;
+	$custom_background_color = null;
+
+	if ( $is_sub_menu && array_key_exists( 'customOverlayBackgroundColor', $context ) ) {
+		$custom_background_color = $context['customOverlayBackgroundColor'];
+	} elseif ( $is_sub_menu && array_key_exists( 'overlayBackgroundColor', $context ) ) {
+		$named_background_color = $context['overlayBackgroundColor'];
+	} elseif ( array_key_exists( 'customBackgroundColor', $context ) ) {
+		$custom_background_color = $context['customBackgroundColor'];
+	} elseif ( array_key_exists( 'backgroundColor', $context ) ) {
+		$named_background_color = $context['backgroundColor'];
+	} elseif ( isset( $context['style']['color']['background'] ) ) {
+		$custom_background_color = $context['style']['color']['background'];
+	}
+
+	// If has background color.
+	if ( ! is_null( $named_background_color ) ) {
+		// Add the background-color class.
+		array_push( $colors['css_classes'], 'has-background', sprintf( 'has-%s-background-color', $named_background_color ) );
+	} elseif ( ! is_null( $custom_background_color ) ) {
+		// Add the custom background-color inline style.
+		$colors['css_classes'][]  = 'has-background';
+		$colors['inline_styles'] .= sprintf( 'background-color: %s;', $custom_background_color );
+	}
+
+	return $colors;
+}
diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php
index 443d399217649..d75939cce6b56 100644
--- a/src/wp-includes/embed.php
+++ b/src/wp-includes/embed.php
@@ -510,11 +510,13 @@ function get_post_embed_html( $width, $height, $post = null ) {
 		esc_attr( $secret )
 	);
 
-	// Note that the script must be placed after the <blockquote> and <iframe> due to a regexp parsing issue in
-	// `wp_filter_oembed_result()`. Because of the regex pattern starts with `|(<blockquote>.*?</blockquote>)?.*|`
-	// wherein the <blockquote> is marked as being optional, if it is not at the beginning of the string then the group
-	// will fail to match and everything will be matched by `.*` and not included in the group. This regex issue goes
-	// back to WordPress 4.4, so in order to not break older installs this script must come at the end.
+	/*
+	 * Note that the script must be placed after the <blockquote> and <iframe> due to a regexp parsing issue in
+	 * `wp_filter_oembed_result()`. Because of the regex pattern starts with `|(<blockquote>.*?</blockquote>)?.*|`
+	 * wherein the <blockquote> is marked as being optional, if it is not at the beginning of the string then the group
+	 * will fail to match and everything will be matched by `.*` and not included in the group. This regex issue goes
+	 * back to WordPress 4.4, so in order to not break older installs this script must come at the end.
+	 */
 	$output .= wp_get_inline_script_tag(
 		file_get_contents( ABSPATH . WPINC . '/js/wp-embed' . wp_scripts_get_suffix() . '.js' )
 	);
diff --git a/src/wp-includes/error-protection.php b/src/wp-includes/error-protection.php
index dea49be023ed5..08c4159665862 100644
--- a/src/wp-includes/error-protection.php
+++ b/src/wp-includes/error-protection.php
@@ -50,7 +50,7 @@ function wp_get_extension_error_description( $error ) {
 	$core_errors = array();
 
 	foreach ( $constants as $constant => $value ) {
-		if ( 0 === strpos( $constant, 'E_' ) ) {
+		if ( str_starts_with( $constant, 'E_' ) ) {
 			$core_errors[ $value ] = $constant;
 		}
 	}
diff --git a/src/wp-includes/feed-atom-comments.php b/src/wp-includes/feed-atom-comments.php
index b43f8d4eb156b..37f663a337512 100644
--- a/src/wp-includes/feed-atom-comments.php
+++ b/src/wp-includes/feed-atom-comments.php
@@ -93,7 +93,8 @@
 			<name><?php comment_author_rss(); ?></name>
 			<?php
 			if ( get_comment_author_url() ) {
-				echo '<uri>' . get_comment_author_url() . '</uri>';}
+				echo '<uri>' . get_comment_author_url() . '</uri>';
+			}
 			?>
 
 		</author>
@@ -110,7 +111,7 @@
 
 		<?php
 		// Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt).
-		if ( 0 == $comment->comment_parent ) : // This comment is top-level.
+		if ( '0' === $comment->comment_parent ) : // This comment is top-level.
 			?>
 			<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
 			<?php
diff --git a/src/wp-includes/feed-rss2-comments.php b/src/wp-includes/feed-rss2-comments.php
index bf69a4d3ae9cd..e0e664edaa014 100644
--- a/src/wp-includes/feed-rss2-comments.php
+++ b/src/wp-includes/feed-rss2-comments.php
@@ -110,8 +110,8 @@
 		 *
 		 * @since 2.1.0
 		 *
-		 * @param int $comment_ID The ID of the comment being displayed.
-		 * @param int $ID         The ID of the post the comment is connected to.
+		 * @param int $comment_id      The ID of the comment being displayed.
+		 * @param int $comment_post_id The ID of the post the comment is connected to.
 		 */
 		do_action( 'commentrss2_item', $comment->comment_ID, $comment_post->ID );
 		?>
diff --git a/src/wp-includes/feed.php b/src/wp-includes/feed.php
index 1f53aee587c90..74a4b5009a5ee 100644
--- a/src/wp-includes/feed.php
+++ b/src/wp-includes/feed.php
@@ -448,7 +448,7 @@ function the_category_rss( $type = null ) {
  */
 function html_type_rss() {
 	$type = get_bloginfo( 'html_type' );
-	if ( strpos( $type, 'xhtml' ) !== false ) {
+	if ( str_contains( $type, 'xhtml' ) ) {
 		$type = 'xhtml';
 	} else {
 		$type = 'html';
@@ -580,7 +580,7 @@ function atom_enclosure() {
  * @return array array(type, value)
  */
 function prep_atom_text_construct( $data ) {
-	if ( strpos( $data, '<' ) === false && strpos( $data, '&' ) === false ) {
+	if ( ! str_contains( $data, '<' ) && ! str_contains( $data, '&' ) ) {
 		return array( 'text', $data );
 	}
 
@@ -597,7 +597,7 @@ function prep_atom_text_construct( $data ) {
 	unset( $parser );
 
 	if ( ! $code ) {
-		if ( strpos( $data, '<' ) === false ) {
+		if ( ! str_contains( $data, '<' ) ) {
 			return array( 'text', $data );
 		} else {
 			$data = "<div xmlns='http://www.w3.org/1999/xhtml'>$data</div>";
@@ -605,7 +605,7 @@ function prep_atom_text_construct( $data ) {
 		}
 	}
 
-	if ( strpos( $data, ']]>' ) === false ) {
+	if ( ! str_contains( $data, ']]>' ) ) {
 		return array( 'html', "<![CDATA[$data]]>" );
 	} else {
 		return array( 'html', htmlspecialchars( $data ) );
@@ -747,6 +747,7 @@ function get_feed_build_date( $format ) {
  * @since 2.8.0
  *
  * @param string $type Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
+ * @return string Content type for specified feed type.
  */
 function feed_content_type( $type = '' ) {
 	if ( empty( $type ) ) {
@@ -796,8 +797,10 @@ function fetch_feed( $url ) {
 	$feed = new SimplePie();
 
 	$feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
-	// We must manually overwrite $feed->sanitize because SimplePie's constructor
-	// sets it before we have a chance to set the sanitization class.
+	/*
+	 * We must manually overwrite $feed->sanitize because SimplePie's constructor
+	 * sets it before we have a chance to set the sanitization class.
+	 */
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
 	// Register the cache handler using the recommended method for SimplePie 1.3 or later.
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index a8780b9c2afe2..be37097220129 100644
--- a/src/wp-includes/formatting.php
+++ b/src/wp-includes/formatting.php
@@ -136,8 +136,10 @@ function wptexturize( $text, $reset = false ) {
 		$static_characters   = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
 		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
 
-		// Pattern-based replacements of characters.
-		// Sort the remaining patterns into several arrays for performance tuning.
+		/*
+		 * Pattern-based replacements of characters.
+		 * Sort the remaining patterns into several arrays for performance tuning.
+		 */
 		$dynamic_characters   = array(
 			'apos'  => array(),
 			'quote' => array(),
@@ -242,7 +244,7 @@ function wptexturize( $text, $reset = false ) {
 		// Only call _wptexturize_pushpop_element if $curl is a delimiter.
 		$first = $curl[0];
 		if ( '<' === $first ) {
-			if ( '<!--' === substr( $curl, 0, 4 ) ) {
+			if ( str_starts_with( $curl, '<!--' ) ) {
 				// This is an HTML comment delimiter.
 				continue;
 			} else {
@@ -260,7 +262,7 @@ function wptexturize( $text, $reset = false ) {
 		} elseif ( '[' === $first && $found_shortcodes && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
 			// This is a shortcode delimiter.
 
-			if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+			if ( ! str_starts_with( $curl, '[[' ) && ! str_ends_with( $curl, ']]' ) ) {
 				// Looks like a normal shortcode.
 				_wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
 			} else {
@@ -272,18 +274,18 @@ function wptexturize( $text, $reset = false ) {
 
 			$curl = str_replace( $static_characters, $static_replacements, $curl );
 
-			if ( false !== strpos( $curl, "'" ) ) {
+			if ( str_contains( $curl, "'" ) ) {
 				$curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
 				$curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
 				$curl = str_replace( $apos_flag, $apos, $curl );
 				$curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
 			}
-			if ( false !== strpos( $curl, '"' ) ) {
+			if ( str_contains( $curl, '"' ) ) {
 				$curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
 				$curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
 				$curl = str_replace( $open_q_flag, $opening_quote, $curl );
 			}
-			if ( false !== strpos( $curl, '-' ) ) {
+			if ( str_contains( $curl, '-' ) ) {
 				$curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
 			}
 
@@ -326,7 +328,7 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
 	$sentences = explode( $open_quote, $haystack );
 
 	foreach ( $sentences as $key => &$sentence ) {
-		if ( false === strpos( $sentence, $needle ) ) {
+		if ( ! str_contains( $sentence, $needle ) ) {
 			continue;
 		} elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
 			$sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
@@ -340,8 +342,10 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
 						// Assume the rightmost quote-period match is the end of quotation.
 						$pos = strrpos( $sentence, "$flag." );
 					} else {
-						// When all else fails, make the rightmost candidate a closing quote.
-						// This is most likely to be problematic in the context of bug #18549.
+						/*
+						 * When all else fails, make the rightmost candidate a closing quote.
+						 * This is most likely to be problematic in the context of bug #18549.
+						 */
 						$pos = strrpos( $sentence, $flag );
 					}
 					$sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
@@ -350,7 +354,7 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
 				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
 				$sentence = preg_replace( $flag_after_digit, $prime, $sentence );
 				$sentence = str_replace( $flag, $close_quote, $sentence );
-			} elseif ( 1 == $count ) {
+			} elseif ( 1 === $count ) {
 				// Found only one closing quote candidate, so give it priority over primes.
 				$sentence = str_replace( $flag, $close_quote, $sentence );
 				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
@@ -362,7 +366,7 @@ function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quo
 			$sentence = preg_replace( $prime_pattern, $prime, $sentence );
 			$sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
 		}
-		if ( '"' === $needle && false !== strpos( $sentence, '"' ) ) {
+		if ( '"' === $needle && str_contains( $sentence, '"' ) ) {
 			$sentence = str_replace( '"', $close_quote, $sentence );
 		}
 	}
@@ -418,7 +422,7 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
 			 */
 
 			array_push( $stack, $tag );
-		} elseif ( end( $stack ) == $tag ) {
+		} elseif ( end( $stack ) === $tag ) {
 			array_pop( $stack );
 		}
 	}
@@ -453,7 +457,7 @@ function wpautop( $text, $br = true ) {
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos( $text, '<pre' ) !== false ) {
+	if ( str_contains( $text, '<pre' ) ) {
 		$text_parts = explode( '</pre>', $text );
 		$last_part  = array_pop( $text_parts );
 		$text       = '';
@@ -480,7 +484,7 @@ function wpautop( $text, $br = true ) {
 	// Change multiple <br>'s into two line breaks, which will turn into paragraphs.
 	$text = preg_replace( '|<br\s*/?>\s*<br\s*/?>|', "\n\n", $text );
 
-	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
+	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a double line break above block-level opening tags.
 	$text = preg_replace( '!(<' . $allblocks . '[\s/>])!', "\n\n$1", $text );
@@ -498,7 +502,7 @@ function wpautop( $text, $br = true ) {
 	$text = wp_replace_in_html_tags( $text, array( "\n" => ' <!-- wpnl --> ' ) );
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( strpos( $text, '<option' ) !== false ) {
+	if ( str_contains( $text, '<option' ) ) {
 		$text = preg_replace( '|\s*<option|', '<option', $text );
 		$text = preg_replace( '|</option>\s*|', '</option>', $text );
 	}
@@ -507,7 +511,7 @@ function wpautop( $text, $br = true ) {
 	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
 	 * so they don't get autop'd.
 	 */
-	if ( strpos( $text, '</object>' ) !== false ) {
+	if ( str_contains( $text, '</object>' ) ) {
 		$text = preg_replace( '|(<object[^>]*>)\s*|', '$1', $text );
 		$text = preg_replace( '|\s*</object>|', '</object>', $text );
 		$text = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $text );
@@ -517,14 +521,14 @@ function wpautop( $text, $br = true ) {
 	 * Collapse line breaks inside <audio> and <video> elements,
 	 * before and after <source> and <track> elements.
 	 */
-	if ( strpos( $text, '<source' ) !== false || strpos( $text, '<track' ) !== false ) {
+	if ( str_contains( $text, '<source' ) || str_contains( $text, '<track' ) ) {
 		$text = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $text );
 		$text = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $text );
 		$text = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $text );
 	}
 
 	// Collapse line breaks before and after <figcaption> elements.
-	if ( strpos( $text, '<figcaption' ) !== false ) {
+	if ( str_contains( $text, '<figcaption' ) ) {
 		$text = preg_replace( '|\s*(<figcaption[^>]*>)|', '$1', $text );
 		$text = preg_replace( '|</figcaption>\s*|', '</figcaption>', $text );
 	}
@@ -568,7 +572,7 @@ function wpautop( $text, $br = true ) {
 	// Optionally insert line breaks.
 	if ( $br ) {
 		// Replace newlines that shouldn't be touched with a placeholder.
-		$text = preg_replace_callback( '/<(script|style|svg).*?<\/\\1>/s', '_autop_newline_preservation_helper', $text );
+		$text = preg_replace_callback( '/<(script|style|svg|math).*?<\/\\1>/s', '_autop_newline_preservation_helper', $text );
 
 		// Normalize <br>
 		$text = str_replace( array( '<br>', '<br/>' ), '<br />', $text );
@@ -593,7 +597,7 @@ function wpautop( $text, $br = true ) {
 	}
 
 	// Restore newlines in all elements.
-	if ( false !== strpos( $text, '<!-- wpnl -->' ) ) {
+	if ( str_contains( $text, '<!-- wpnl -->' ) ) {
 		$text = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $text );
 	}
 
@@ -763,7 +767,7 @@ function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
 
 		// Loop through delimiters (elements) only.
 		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[ $i ], $needle ) ) {
+			if ( str_contains( $textarr[ $i ], $needle ) ) {
 				$textarr[ $i ] = str_replace( $needle, $replace, $textarr[ $i ] );
 				$changed       = true;
 			}
@@ -775,7 +779,7 @@ function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
 		// Loop through delimiters (elements) only.
 		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
 			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[ $i ], $needle ) ) {
+				if ( str_contains( $textarr[ $i ], $needle ) ) {
 					$textarr[ $i ] = strtr( $textarr[ $i ], $replace_pairs );
 					$changed       = true;
 					// After one strtr() break out of the foreach loop and look at next element.
@@ -880,29 +884,33 @@ function seems_utf8( $str ) {
 	mbstring_binary_safe_encoding();
 	$length = strlen( $str );
 	reset_mbstring_encoding();
+
 	for ( $i = 0; $i < $length; $i++ ) {
 		$c = ord( $str[ $i ] );
+
 		if ( $c < 0x80 ) {
 			$n = 0; // 0bbbbbbb
-		} elseif ( ( $c & 0xE0 ) == 0xC0 ) {
+		} elseif ( ( $c & 0xE0 ) === 0xC0 ) {
 			$n = 1; // 110bbbbb
-		} elseif ( ( $c & 0xF0 ) == 0xE0 ) {
+		} elseif ( ( $c & 0xF0 ) === 0xE0 ) {
 			$n = 2; // 1110bbbb
-		} elseif ( ( $c & 0xF8 ) == 0xF0 ) {
+		} elseif ( ( $c & 0xF8 ) === 0xF0 ) {
 			$n = 3; // 11110bbb
-		} elseif ( ( $c & 0xFC ) == 0xF8 ) {
+		} elseif ( ( $c & 0xFC ) === 0xF8 ) {
 			$n = 4; // 111110bb
-		} elseif ( ( $c & 0xFE ) == 0xFC ) {
+		} elseif ( ( $c & 0xFE ) === 0xFC ) {
 			$n = 5; // 1111110b
 		} else {
 			return false; // Does not match any model.
 		}
+
 		for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ?
-			if ( ( ++$i == $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) != 0x80 ) ) {
+			if ( ( ++$i === $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) !== 0x80 ) ) {
 				return false;
 			}
 		}
 	}
+
 	return true;
 }
 
@@ -918,7 +926,7 @@ function seems_utf8( $str ) {
  * @since 5.5.0 `$quote_style` also accepts `ENT_XML1`.
  * @access private
  *
- * @param string       $string        The text which is to be encoded.
+ * @param string       $text          The text which is to be encoded.
  * @param int|string   $quote_style   Optional. Converts double quotes if set to ENT_COMPAT,
  *                                    both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES.
  *                                    Converts single and double quotes, as well as converting HTML
@@ -931,16 +939,16 @@ function seems_utf8( $str ) {
  * @param bool         $double_encode Optional. Whether to encode existing HTML entities. Default false.
  * @return string The encoded text with HTML entities.
  */
-function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	$string = (string) $string;
+function _wp_specialchars( $text, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+	$text = (string) $text;
 
-	if ( 0 === strlen( $string ) ) {
+	if ( 0 === strlen( $text ) ) {
 		return '';
 	}
 
 	// Don't bother if there are no specialchars - saves some processing.
-	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
-		return $string;
+	if ( ! preg_match( '/[&<>"\']/', $text ) ) {
+		return $text;
 	}
 
 	// Account for the previous behavior of the function when the $quote_style is not an accepted value.
@@ -976,19 +984,21 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
 	}
 
 	if ( ! $double_encode ) {
-		// Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
-		// This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
-		$string = wp_kses_normalize_entities( $string, ( $quote_style & ENT_XML1 ) ? 'xml' : 'html' );
+		/*
+		 * Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
+		 * This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
+		 */
+		$text = wp_kses_normalize_entities( $text, ( $quote_style & ENT_XML1 ) ? 'xml' : 'html' );
 	}
 
-	$string = htmlspecialchars( $string, $quote_style, $charset, $double_encode );
+	$text = htmlspecialchars( $text, $quote_style, $charset, $double_encode );
 
 	// Back-compat.
 	if ( 'single' === $_quote_style ) {
-		$string = str_replace( "'", '&#039;', $string );
+		$text = str_replace( "'", '&#039;', $text );
 	}
 
-	return $string;
+	return $text;
 }
 
 /**
@@ -1001,7 +1011,7 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
  *
  * @since 2.8.0
  *
- * @param string     $string The text which is to be decoded.
+ * @param string     $text        The text which is to be decoded.
  * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
  *                                both single and double if set to ENT_QUOTES or
  *                                none if set to ENT_NOQUOTES.
@@ -1011,16 +1021,16 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
  *                                Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
-	$string = (string) $string;
+function wp_specialchars_decode( $text, $quote_style = ENT_NOQUOTES ) {
+	$text = (string) $text;
 
-	if ( 0 === strlen( $string ) ) {
+	if ( 0 === strlen( $text ) ) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing.
-	if ( strpos( $string, '&' ) === false ) {
-		return $string;
+	if ( ! str_contains( $text, '&' ) ) {
+		return $text;
 	}
 
 	// Match the previous behavior of _wp_specialchars() when the $quote_style is not an accepted value.
@@ -1079,10 +1089,10 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
 	}
 
 	// Remove zero padding on numeric entities.
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$text = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $text );
 
 	// Replace characters according to translation table.
-	return strtr( $string, $translation );
+	return strtr( $text, $translation );
 }
 
 /**
@@ -1090,14 +1100,14 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
  *
  * @since 2.8.0
  *
- * @param string $string The text which is to be checked.
+ * @param string $text   The text which is to be checked.
  * @param bool   $strip  Optional. Whether to attempt to strip out invalid UTF8. Default false.
  * @return string The checked text.
  */
-function wp_check_invalid_utf8( $string, $strip = false ) {
-	$string = (string) $string;
+function wp_check_invalid_utf8( $text, $strip = false ) {
+	$text = (string) $text;
 
-	if ( 0 === strlen( $string ) ) {
+	if ( 0 === strlen( $text ) ) {
 		return '';
 	}
 
@@ -1107,7 +1117,7 @@ function wp_check_invalid_utf8( $string, $strip = false ) {
 		$is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true );
 	}
 	if ( ! $is_utf8 ) {
-		return $string;
+		return $text;
 	}
 
 	// Check for support for utf8 in the installed PCRE library once and store the result in a static.
@@ -1118,17 +1128,17 @@ function wp_check_invalid_utf8( $string, $strip = false ) {
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases.
 	if ( ! $utf8_pcre ) {
-		return $string;
+		return $text;
 	}
 
-	// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- preg_match fails when it encounters invalid UTF8 in $string.
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
-		return $string;
+	// phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- preg_match fails when it encounters invalid UTF8 in $text.
+	if ( 1 === @preg_match( '/^./us', $text ) ) {
+		return $text;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended).
 	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+		return iconv( 'utf-8', 'utf-8', $text );
 	}
 
 	return '';
@@ -1169,7 +1179,7 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
 			$unicode        .= $encoded_char;
 			$unicode_length += $encoded_char_length;
 		} else {
-			if ( count( $values ) == 0 ) {
+			if ( count( $values ) === 0 ) {
 				if ( $value < 224 ) {
 					$num_octets = 2;
 				} elseif ( $value < 240 ) {
@@ -1184,7 +1194,7 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
 			if ( $length && ( $unicode_length + ( $num_octets * 3 ) ) > $length ) {
 				break;
 			}
-			if ( count( $values ) == $num_octets ) {
+			if ( count( $values ) === $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
 				}
@@ -1440,6 +1450,8 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
  *
  * |   Code   | Glyph | Replacement |                Description                |
  * | -------- | ----- | ----------- | ----------------------------------------- |
+ * | U+018F   | Ə     | E           | Latin capital letter Ə                    |
+ * | U+0259   | ǝ     | e           | Latin small letter ǝ                      |
  * | U+0218   | Ș     | S           | Latin capital letter S with comma below   |
  * | U+0219   | ș     | s           | Latin small letter s with comma below     |
  * | U+021A   | Ț     | T           | Latin capital letter T with comma below   |
@@ -1586,24 +1598,28 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
  * @since 6.0.0 Added the `$locale` parameter.
  * @since 6.1.0 Added Unicode NFC encoding normalization support.
  *
- * @param string $string Text that might have accent characters.
+ * @param string $text   Text that might have accent characters.
  * @param string $locale Optional. The locale to use for accent removal. Some character
  *                       replacements depend on the locale being used (e.g. 'de_DE').
  *                       Defaults to the current locale.
  * @return string Filtered string with replaced "nice" characters.
  */
-function remove_accents( $string, $locale = '' ) {
-	if ( ! preg_match( '/[\x80-\xff]/', $string ) ) {
-		return $string;
+function remove_accents( $text, $locale = '' ) {
+	if ( ! preg_match( '/[\x80-\xff]/', $text ) ) {
+		return $text;
 	}
 
-	if ( seems_utf8( $string ) ) {
+	if ( seems_utf8( $text ) ) {
 
-		// Unicode sequence normalization from NFD (Normalization Form Decomposed)
-		// to NFC (Normalization Form [Pre]Composed), the encoding used in this function.
-		if ( function_exists( 'normalizer_normalize' ) ) {
-			if ( ! normalizer_is_normalized( $string, Normalizer::FORM_C ) ) {
-				$string = normalizer_normalize( $string, Normalizer::FORM_C );
+		/*
+		 * Unicode sequence normalization from NFD (Normalization Form Decomposed)
+		 * to NFC (Normalization Form [Pre]Composed), the encoding used in this function.
+		 */
+		if ( function_exists( 'normalizer_is_normalized' )
+			&& function_exists( 'normalizer_normalize' )
+		) {
+			if ( ! normalizer_is_normalized( $text ) ) {
+				$text = normalizer_normalize( $text );
 			}
 		}
 
@@ -1803,6 +1819,8 @@ function remove_accents( $string, $locale = '' ) {
 			'ž' => 'z',
 			'ſ' => 's',
 			// Decompositions for Latin Extended-B.
+			'Ə' => 'E',
+			'ǝ' => 'e',
 			'Ș' => 'S',
 			'ș' => 's',
 			'Ț' => 'T',
@@ -1811,8 +1829,7 @@ function remove_accents( $string, $locale = '' ) {
 			'€' => 'E',
 			// GBP (Pound) sign.
 			'£' => '',
-			// Vowels with diacritic (Vietnamese).
-			// Unmarked.
+			// Vowels with diacritic (Vietnamese). Unmarked.
 			'Ơ' => 'O',
 			'ơ' => 'o',
 			'Ư' => 'U',
@@ -1968,7 +1985,7 @@ function remove_accents( $string, $locale = '' ) {
 			$chars['đ'] = 'dj';
 		}
 
-		$string = strtr( $string, $chars );
+		$text = strtr( $text, $chars );
 	} else {
 		$chars = array();
 		// Assume ISO-8859-1 if not UTF-8.
@@ -1985,14 +2002,14 @@ function remove_accents( $string, $locale = '' ) {
 
 		$chars['out'] = 'EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy';
 
-		$string              = strtr( $string, $chars['in'], $chars['out'] );
+		$text                = strtr( $text, $chars['in'], $chars['out'] );
 		$double_chars        = array();
 		$double_chars['in']  = array( "\x8c", "\x9c", "\xc6", "\xd0", "\xde", "\xdf", "\xe6", "\xf0", "\xfe" );
 		$double_chars['out'] = array( 'OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th' );
-		$string              = str_replace( $double_chars['in'], $double_chars['out'], $string );
+		$text                = str_replace( $double_chars['in'], $double_chars['out'], $text );
 	}
 
-	return $string;
+	return $text;
 }
 
 /**
@@ -2045,10 +2062,11 @@ function sanitize_file_name( $filename ) {
 
 	$filename = str_replace( $special_chars, '', $filename );
 	$filename = str_replace( array( '%20', '+' ), '-', $filename );
+	$filename = preg_replace( '/\.{2,}/', '.', $filename );
 	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
 	$filename = trim( $filename, '.-_' );
 
-	if ( false === strpos( $filename, '.' ) ) {
+	if ( ! str_contains( $filename, '.' ) ) {
 		$mime_types = wp_get_mime_types();
 		$filetype   = wp_check_filetype( 'test.' . $filename, $mime_types );
 		if ( $filetype['ext'] === $filename ) {
@@ -2108,15 +2126,15 @@ function sanitize_file_name( $filename ) {
 /**
  * Sanitizes a username, stripping out unsafe characters.
  *
- * Removes tags, octets, entities, and if strict is enabled, will only keep
- * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
- * raw username (the username in the parameter), and the value of $strict as
- * parameters for the {@see 'sanitize_user'} filter.
+ * Removes tags, percent-encoded characters, HTML entities, and if strict is enabled,
+ * will only keep alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
+ * raw username (the username in the parameter), and the value of $strict as parameters
+ * for the {@see 'sanitize_user'} filter.
  *
  * @since 2.0.0
  *
  * @param string $username The username to be sanitized.
- * @param bool   $strict   Optional. If set limits $username to specific characters.
+ * @param bool   $strict   Optional. If set to true, limits $username to specific characters.
  *                         Default false.
  * @return string The sanitized username, after passing through filters.
  */
@@ -2124,9 +2142,9 @@ function sanitize_user( $username, $strict = false ) {
 	$raw_username = $username;
 	$username     = wp_strip_all_tags( $username );
 	$username     = remove_accents( $username );
-	// Kill octets.
+	// Remove percent-encoded characters.
 	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-	// Kill entities.
+	// Remove HTML entities.
 	$username = preg_replace( '/&.+?;/', '', $username );
 
 	// If strict, reduce to ASCII for max portability.
@@ -2361,7 +2379,7 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
 		$title = str_replace( '%c3%97', 'x', $title );
 	}
 
-	// Kill entities.
+	// Remove HTML entities.
 	$title = preg_replace( '/&.+?;/', '', $title );
 	$title = str_replace( '.', '-', $title );
 
@@ -2403,14 +2421,14 @@ function sanitize_sql_orderby( $orderby ) {
  *
  * @since 2.8.0
  *
- * @param string $class    The classname to be sanitized
- * @param string $fallback Optional. The value to return if the sanitization ends up as an empty string.
- *  Defaults to an empty string.
- * @return string The sanitized value
+ * @param string $classname The classname to be sanitized.
+ * @param string $fallback  Optional. The value to return if the sanitization ends up as an empty string.
+ *                          Default empty string.
+ * @return string The sanitized value.
  */
-function sanitize_html_class( $class, $fallback = '' ) {
-	// Strip out any %-encoded octets.
-	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+function sanitize_html_class( $classname, $fallback = '' ) {
+	// Strip out any percent-encoded characters.
+	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $classname );
 
 	// Limit to A-Z, a-z, 0-9, '_', '-'.
 	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
@@ -2424,10 +2442,33 @@ function sanitize_html_class( $class, $fallback = '' ) {
 	 * @since 2.8.0
 	 *
 	 * @param string $sanitized The sanitized HTML class.
-	 * @param string $class     HTML class before sanitization.
+	 * @param string $classname HTML class before sanitization.
 	 * @param string $fallback  The fallback string.
 	 */
-	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
+	return apply_filters( 'sanitize_html_class', $sanitized, $classname, $fallback );
+}
+
+/**
+ * Strips out all characters not allowed in a locale name.
+ *
+ * @since 6.2.1
+ *
+ * @param string $locale_name The locale name to be sanitized.
+ * @return string The sanitized value.
+ */
+function sanitize_locale_name( $locale_name ) {
+	// Limit to A-Z, a-z, 0-9, '_', '-'.
+	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $locale_name );
+
+	/**
+	 * Filters a sanitized locale name string.
+	 *
+	 * @since 6.2.1
+	 *
+	 * @param string $sanitized   The sanitized locale name.
+	 * @param string $locale_name The locale name before sanitization.
+	 */
+	return apply_filters( 'sanitize_locale_name', $sanitized, $locale_name );
 }
 
 /**
@@ -2444,7 +2485,7 @@ function convert_chars( $content, $deprecated = '' ) {
 		_deprecated_argument( __FUNCTION__, '0.71' );
 	}
 
-	if ( strpos( $content, '&' ) !== false ) {
+	if ( str_contains( $content, '&' ) ) {
 		$content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content );
 	}
 
@@ -2495,7 +2536,7 @@ function convert_invalid_entities( $content ) {
 		'&#159;' => '&#376;',
 	);
 
-	if ( strpos( $content, '&#1' ) !== false ) {
+	if ( str_contains( $content, '&#1' ) ) {
 		$content = strtr( $content, $wp_htmltranswinuni );
 	}
 
@@ -2597,7 +2638,7 @@ function force_balance_tags( $text ) {
 		$is_single_tag     = in_array( $tag, $single_tags, true );
 		$pre_attribute_ws  = isset( $regex[4] ) ? $regex[4] : '';
 		$attributes        = trim( isset( $regex[5] ) ? $regex[5] : $regex[3] );
-		$has_self_closer   = '/' === substr( $attributes, -1 );
+		$has_self_closer   = str_ends_with( $attributes, '/' );
 
 		$newtext .= $tagqueue;
 
@@ -2631,17 +2672,24 @@ function force_balance_tags( $text ) {
 				$tag = '';
 			}
 		} else { // Begin tag.
-			if ( $has_self_closer ) { // If it presents itself as a self-closing tag...
-				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such
-				// and immediately close it with a closing tag (the tag will encapsulate no text as a result).
+			if ( $has_self_closer ) {
+				/*
+				 * If it presents itself as a self-closing tag, but it isn't a known single-entity self-closing tag,
+				 * then don't let it be treated as such and immediately close it with a closing tag.
+				 * The tag will encapsulate no text as a result.
+				 */
 				if ( ! $is_single_tag ) {
 					$attributes = trim( substr( $attributes, 0, -1 ) ) . "></$tag";
 				}
-			} elseif ( $is_single_tag ) { // Else if it's a known single-entity tag but it doesn't close itself, do so.
+			} elseif ( $is_single_tag ) {
+				// Else if it's a known single-entity tag but it doesn't close itself, do so.
 				$pre_attribute_ws = ' ';
 				$attributes      .= '/';
-			} else { // It's not a single-entity tag.
-				// If the top of the stack is the same as the tag we want to push, close previous tag.
+			} else {
+				/*
+				 * It's not a single-entity tag.
+				 * If the top of the stack is the same as the tag we want to push, close previous tag.
+				 */
 				if ( $stacksize > 0 && ! in_array( $tag, $nestable_tags, true ) && $tagstack[ $stacksize - 1 ] === $tag ) {
 					$tagqueue = '</' . array_pop( $tagstack ) . '>';
 					$stacksize--;
@@ -2740,14 +2788,14 @@ function zeroise( $number, $threshold ) {
  *
  * @since 0.71
  *
- * @param string $string Value to which backslashes will be added.
+ * @param string $value Value to which backslashes will be added.
  * @return string String with backslashes inserted.
  */
-function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
-		$string = '\\\\' . $string;
+function backslashit( $value ) {
+	if ( isset( $value[0] ) && $value[0] >= '0' && $value[0] <= '9' ) {
+		$value = '\\\\' . $value;
 	}
-	return addcslashes( $string, 'A..Za..z' );
+	return addcslashes( $value, 'A..Za..z' );
 }
 
 /**
@@ -2761,11 +2809,11 @@ function backslashit( $string ) {
  *
  * @since 1.2.0
  *
- * @param string $string What to add the trailing slash to.
+ * @param string $value Value to which trailing slash will be added.
  * @return string String with trailing slash added.
  */
-function trailingslashit( $string ) {
-	return untrailingslashit( $string ) . '/';
+function trailingslashit( $value ) {
+	return untrailingslashit( $value ) . '/';
 }
 
 /**
@@ -2776,11 +2824,11 @@ function trailingslashit( $string ) {
  *
  * @since 2.2.0
  *
- * @param string $string What to remove the trailing slashes from.
+ * @param string $text Value from which trailing slashes will be removed.
  * @return string String without the trailing slashes.
  */
-function untrailingslashit( $string ) {
-	return rtrim( $string, '/\\' );
+function untrailingslashit( $value ) {
+	return rtrim( $value, '/\\' );
 }
 
 /**
@@ -2866,13 +2914,15 @@ function urldecode_deep( $value ) {
  */
 function antispambot( $email_address, $hex_encoding = 0 ) {
 	$email_no_spam_address = '';
+
 	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
 		$j = rand( 0, 1 + $hex_encoding );
-		if ( 0 == $j ) {
+
+		if ( 0 === $j ) {
 			$email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
-		} elseif ( 1 == $j ) {
+		} elseif ( 1 === $j ) {
 			$email_no_spam_address .= $email_address[ $i ];
-		} elseif ( 2 == $j ) {
+		} elseif ( 2 === $j ) {
 			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
 		}
 	}
@@ -2895,8 +2945,10 @@ function _make_url_clickable_cb( $matches ) {
 	$url = $matches[2];
 
 	if ( ')' === $matches[3] && strpos( $url, '(' ) ) {
-		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it,
-		// add the closing parenthesis to the URL. Then we can let the parenthesis balancer do its thing below.
+		/*
+		 * If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it,
+		 * add the closing parenthesis to the URL. Then we can let the parenthesis balancer do its thing below.
+		 */
 		$url   .= $matches[3];
 		$suffix = '';
 	} else {
@@ -2914,24 +2966,9 @@ function _make_url_clickable_cb( $matches ) {
 		return $matches[0];
 	}
 
-	if ( 'comment_text' === current_filter() ) {
-		$rel = 'nofollow ugc';
-	} else {
-		$rel = 'nofollow';
-	}
-
-	/**
-	 * Filters the rel value that is added to URL matches converted to links.
-	 *
-	 * @since 5.3.0
-	 *
-	 * @param string $rel The rel value.
-	 * @param string $url The matched URL being converted to a link tag.
-	 */
-	$rel = apply_filters( 'make_clickable_rel', $rel, $url );
-	$rel = esc_attr( $rel );
+	$rel_attr = _make_clickable_rel_attr( $url );
 
-	return $matches[1] . "<a href=\"$url\" rel=\"$rel\">$url</a>" . $suffix;
+	return $matches[1] . "<a href=\"{$url}\"{$rel_attr}>{$url}</a>" . $suffix;
 }
 
 /**
@@ -2962,17 +2999,9 @@ function _make_web_ftp_clickable_cb( $matches ) {
 		return $matches[0];
 	}
 
-	if ( 'comment_text' === current_filter() ) {
-		$rel = 'nofollow ugc';
-	} else {
-		$rel = 'nofollow';
-	}
-
-	/** This filter is documented in wp-includes/formatting.php */
-	$rel = apply_filters( 'make_clickable_rel', $rel, $dest );
-	$rel = esc_attr( $rel );
+	$rel_attr = _make_clickable_rel_attr( $dest );
 
-	return $matches[1] . "<a href=\"$dest\" rel=\"$rel\">$dest</a>$ret";
+	return $matches[1] . "<a href=\"{$dest}\"{$rel_attr}>{$dest}</a>{$ret}";
 }
 
 /**
@@ -2988,7 +3017,48 @@ function _make_web_ftp_clickable_cb( $matches ) {
  */
 function _make_email_clickable_cb( $matches ) {
 	$email = $matches[2] . '@' . $matches[3];
-	return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+
+	return $matches[1] . "<a href=\"mailto:{$email}\">{$email}</a>";
+}
+
+/**
+ * Helper function used to build the "rel" attribute for a URL when creating an anchor using make_clickable().
+ *
+ * @since 6.2.0
+ *
+ * @param string $url The URL.
+ * @return string The rel attribute for the anchor or an empty string if no rel attribute should be added.
+ */
+function _make_clickable_rel_attr( $url ) {
+	$rel_parts        = array();
+	$scheme           = strtolower( wp_parse_url( $url, PHP_URL_SCHEME ) );
+	$nofollow_schemes = array_intersect( wp_allowed_protocols(), array( 'https', 'http' ) );
+
+	// Apply "nofollow" to external links with qualifying URL schemes (mailto:, tel:, etc... shouldn't be followed).
+	if ( ! wp_is_internal_link( $url ) && in_array( $scheme, $nofollow_schemes, true ) ) {
+		$rel_parts[] = 'nofollow';
+	}
+
+	// Apply "ugc" when in comment context.
+	if ( 'comment_text' === current_filter() ) {
+		$rel_parts[] = 'ugc';
+	}
+
+	$rel = implode( ' ', $rel_parts );
+
+	/**
+	 * Filters the rel value that is added to URL matches converted to links.
+	 *
+	 * @since 5.3.0
+	 *
+	 * @param string $rel The rel value.
+	 * @param string $url The matched URL being converted to a link tag.
+	 */
+	$rel = apply_filters( 'make_clickable_rel', $rel, $url );
+
+	$rel_attr = $rel ? ' rel="' . esc_attr( $rel ) . '"' : '';
+
+	return $rel_attr;
 }
 
 /**
@@ -3008,13 +3078,26 @@ function make_clickable( $text ) {
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>.
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {
+		if ( preg_match( '|^<code[\s>]|i', $piece )
+			|| preg_match( '|^<pre[\s>]|i', $piece )
+			|| preg_match( '|^<script[\s>]|i', $piece )
+			|| preg_match( '|^<style[\s>]|i', $piece )
+		) {
 			$nested_code_pre++;
-		} elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) ) {
+		} elseif ( $nested_code_pre
+			&& ( '</code>' === strtolower( $piece )
+				|| '</pre>' === strtolower( $piece )
+				|| '</script>' === strtolower( $piece )
+				|| '</style>' === strtolower( $piece )
+			)
+		) {
 			$nested_code_pre--;
 		}
 
-		if ( $nested_code_pre || empty( $piece ) || ( '<' === $piece[0] && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+		if ( $nested_code_pre
+			|| empty( $piece )
+			|| ( '<' === $piece[0] && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) )
+		) {
 			$r .= $piece;
 			continue;
 		}
@@ -3045,8 +3128,10 @@ function make_clickable( $text ) {
 				)
 				(\)?)                                          # 3: Trailing closing parenthesis (for parethesis balancing post processing).
 			~xS';
-			// The regex is a non-anchored pattern and does not have a single fixed starting character.
-			// Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+			/*
+			 * The regex is a non-anchored pattern and does not have a single fixed starting character.
+			 * Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+			 */
 
 			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
 
@@ -3082,20 +3167,20 @@ function make_clickable( $text ) {
  *         4 => '123456789 ',   // 10 characters: '123456789 1234567890a' was too long.
  *         5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split.
  *         6 => '   45678   ',  // 11 characters: Perfect split.
- *         7 => '1 3 5 7 90 ',  // 11 characters: End of $string.
+ *         7 => '1 3 5 7 90 ',  // 11 characters: End of $text.
  *     );
  *
  * @since 3.4.0
  * @access private
  *
- * @param string $string The string to split.
+ * @param string $text   The string to split.
  * @param int    $goal   The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace( $text, $goal ) {
 	$chunks = array();
 
-	$string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+	$string_nullspace = strtr( $text, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
 
 	while ( $goal < strlen( $string_nullspace ) ) {
 		$pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
@@ -3107,13 +3192,13 @@ function _split_str_by_whitespace( $string, $goal ) {
 			}
 		}
 
-		$chunks[]         = substr( $string, 0, $pos + 1 );
-		$string           = substr( $string, $pos + 1 );
+		$chunks[]         = substr( $text, 0, $pos + 1 );
+		$text             = substr( $text, $pos + 1 );
 		$string_nullspace = substr( $string_nullspace, $pos + 1 );
 	}
 
-	if ( $string ) {
-		$chunks[] = $string;
+	if ( $text ) {
+		$chunks[] = $text;
 	}
 
 	return $chunks;
@@ -3134,12 +3219,8 @@ function wp_rel_callback( $matches, $rel ) {
 	$text = $matches[1];
 	$atts = wp_kses_hair( $matches[1], wp_allowed_protocols() );
 
-	if ( ! empty( $atts['href'] ) ) {
-		if ( in_array( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_SCHEME ) ), array( 'http', 'https' ), true ) ) {
-			if ( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_HOST ) ) === strtolower( wp_parse_url( home_url(), PHP_URL_HOST ) ) ) {
-				return "<a $text>";
-			}
-		}
+	if ( ! empty( $atts['href'] ) && wp_is_internal_link( $atts['href']['value'] ) ) {
+		$rel = trim( str_replace( 'nofollow', '', $rel ) );
 	}
 
 	if ( ! empty( $atts['rel'] ) ) {
@@ -3159,7 +3240,10 @@ function wp_rel_callback( $matches, $rel ) {
 		}
 		$text = trim( $html );
 	}
-	return "<a $text rel=\"" . esc_attr( $rel ) . '">';
+
+	$rel_attr = $rel ? ' rel="' . esc_attr( $rel ) . '"' : '';
+
+	return "<a {$text}{$rel_attr}>";
 }
 
 /**
@@ -3371,7 +3455,7 @@ function wp_remove_targeted_link_rel_filters() {
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 ) {
+	if ( count( $matches ) === 0 ) {
 		return '';
 	}
 
@@ -3496,15 +3580,19 @@ function is_email( $email, $deprecated = false ) {
 	// Split out the local and domain parts.
 	list( $local, $domain ) = explode( '@', $email, 2 );
 
-	// LOCAL PART
-	// Test for invalid characters.
+	/*
+	 * LOCAL PART
+	 * Test for invalid characters.
+	 */
 	if ( ! preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
 	}
 
-	// DOMAIN PART
-	// Test for sequences of periods.
+	/*
+	 * DOMAIN PART
+	 * Test for sequences of periods.
+	 */
 	if ( preg_match( '/\.{2,}/', $domain ) ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );
@@ -3550,17 +3638,17 @@ function is_email( $email, $deprecated = false ) {
  *
  * @since 1.2.0
  *
- * @param string $string Subject line.
+ * @param string $subject Subject line.
  * @return string Converted string to ASCII.
  */
-function wp_iso_descrambler( $string ) {
+function wp_iso_descrambler( $subject ) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if ( ! preg_match( '#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches ) ) {
-		return $string;
-	} else {
-		$subject = str_replace( '_', ' ', $matches[2] );
-		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
+	if ( ! preg_match( '#\=\?(.+)\?Q\?(.+)\?\=#i', $subject, $matches ) ) {
+		return $subject;
 	}
+
+	$subject = str_replace( '_', ' ', $matches[2] );
+	return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
 }
 
 /**
@@ -3569,11 +3657,11 @@ function wp_iso_descrambler( $string ) {
  * @since 3.1.0
  * @access private
  *
- * @param array $match The preg_replace_callback matches array.
+ * @param array $matches The preg_replace_callback matches array.
  * @return string Converted chars.
  */
-function _wp_iso_convert( $match ) {
-	return chr( hexdec( strtolower( $match[1] ) ) );
+function _wp_iso_convert( $matches ) {
+	return chr( hexdec( strtolower( $matches[1] ) ) );
 }
 
 /**
@@ -3584,12 +3672,12 @@ function _wp_iso_convert( $match ) {
  *
  * @since 1.2.0
  *
- * @param string $string The date to be converted, in the timezone of the site.
- * @param string $format The format string for the returned date. Default 'Y-m-d H:i:s'.
+ * @param string $date_string The date to be converted, in the timezone of the site.
+ * @param string $format      The format string for the returned date. Default 'Y-m-d H:i:s'.
  * @return string Formatted version of the date, in UTC.
  */
-function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
-	$datetime = date_create( $string, wp_timezone() );
+function get_gmt_from_date( $date_string, $format = 'Y-m-d H:i:s' ) {
+	$datetime = date_create( $date_string, wp_timezone() );
 
 	if ( false === $datetime ) {
 		return gmdate( $format, 0 );
@@ -3606,12 +3694,12 @@ function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
  *
  * @since 1.2.0
  *
- * @param string $string The date to be converted, in UTC or GMT timezone.
- * @param string $format The format string for the returned date. Default 'Y-m-d H:i:s'.
+ * @param string $date_string The date to be converted, in UTC or GMT timezone.
+ * @param string $format      The format string for the returned date. Default 'Y-m-d H:i:s'.
  * @return string Formatted version of the date, in the site's timezone.
  */
-function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
-	$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
+function get_date_from_gmt( $date_string, $format = 'Y-m-d H:i:s' ) {
+	$datetime = date_create( $date_string, new DateTimeZone( 'UTC' ) );
 
 	if ( false === $datetime ) {
 		return gmdate( $format, 0 );
@@ -3633,7 +3721,7 @@ function iso8601_timezone_to_offset( $timezone ) {
 	if ( 'Z' === $timezone ) {
 		$offset = 0;
 	} else {
-		$sign    = ( '+' === substr( $timezone, 0, 1 ) ) ? 1 : -1;
+		$sign    = ( str_starts_with( $timezone, '+' ) ) ? 1 : -1;
 		$hours   = (int) substr( $timezone, 1, 2 );
 		$minutes = (int) substr( $timezone, 3, 4 ) / 60;
 		$offset  = $sign * HOUR_IN_SECONDS * ( $hours + $minutes );
@@ -3706,16 +3794,20 @@ function sanitize_email( $email ) {
 	// Split out the local and domain parts.
 	list( $local, $domain ) = explode( '@', $email, 2 );
 
-	// LOCAL PART
-	// Test for invalid characters.
+	/*
+	 * LOCAL PART
+	 * Test for invalid characters.
+	 */
 	$local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );
 	if ( '' === $local ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'sanitize_email', '', $email, 'local_invalid_chars' );
 	}
 
-	// DOMAIN PART
-	// Test for sequences of periods.
+	/*
+	 * DOMAIN PART
+	 * Test for sequences of periods.
+	 */
 	$domain = preg_replace( '/\.{2,}/', '', $domain );
 	if ( '' === $domain ) {
 		/** This filter is documented in wp-includes/formatting.php */
@@ -3775,7 +3867,7 @@ function sanitize_email( $email ) {
 /**
  * Determines the difference between two timestamps.
  *
- * The difference is returned in a human readable format such as "1 hour",
+ * The difference is returned in a human-readable format such as "1 hour",
  * "5 mins", "2 days".
  *
  * @since 1.5.0
@@ -3783,7 +3875,7 @@ function sanitize_email( $email ) {
  *
  * @param int $from Unix timestamp from which the difference begins.
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
- * @return string Human readable time difference.
+ * @return string Human-readable time difference.
  */
 function human_time_diff( $from, $to = 0 ) {
 	if ( empty( $to ) ) {
@@ -3844,11 +3936,11 @@ function human_time_diff( $from, $to = 0 ) {
 	}
 
 	/**
-	 * Filters the human readable difference between two timestamps.
+	 * Filters the human-readable difference between two timestamps.
 	 *
 	 * @since 4.0.0
 	 *
-	 * @param string $since The difference in human readable text.
+	 * @param string $since The difference in human-readable text.
 	 * @param int    $diff  The difference in seconds.
 	 * @param int    $from  Unix timestamp from which the difference begins.
 	 * @param int    $to    Unix timestamp to end the time difference.
@@ -3861,11 +3953,12 @@ function human_time_diff( $from, $to = 0 ) {
  *
  * Returns a maximum of 55 words with an ellipsis appended if necessary.
  *
- * The 55 word limit can be modified by plugins/themes using the {@see 'excerpt_length'} filter
+ * The 55-word limit can be modified by plugins/themes using the {@see 'excerpt_length'} filter
  * The ' [&hellip;]' string can be modified by plugins/themes using the {@see 'excerpt_more'} filter
  *
  * @since 1.5.0
  * @since 5.2.0 Added the `$post` parameter.
+ * @since 6.3.0 Removes footnotes markup from the excerpt content.
  *
  * @param string             $text Optional. The excerpt. If set to empty, an excerpt is generated.
  * @param WP_Post|object|int $post Optional. WP_Post instance or Post ID/object. Default null.
@@ -3880,11 +3973,28 @@ function wp_trim_excerpt( $text = '', $post = null ) {
 
 		$text = strip_shortcodes( $text );
 		$text = excerpt_remove_blocks( $text );
+		$text = excerpt_remove_footnotes( $text );
+
+		/*
+		 * Temporarily unhook wp_filter_content_tags() since any tags
+		 * within the excerpt are stripped out. Modifying the tags here
+		 * is wasteful and can lead to bugs in the image counting logic.
+		 */
+		$filter_removed = remove_filter( 'the_content', 'wp_filter_content_tags' );
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$text = apply_filters( 'the_content', $text );
 		$text = str_replace( ']]>', ']]&gt;', $text );
 
+		/**
+		 * Only restore the filter callback if it was removed above. The logic
+		 * to unhook and restore only applies on the default priority of 10,
+		 * which is generally used for the filter callback in WordPress core.
+		 */
+		if ( $filter_removed ) {
+			add_filter( 'the_content', 'wp_filter_content_tags' );
+		}
+
 		/* translators: Maximum number of words used in a post excerpt. */
 		$excerpt_length = (int) _x( '55', 'excerpt_length' );
 
@@ -3906,6 +4016,7 @@ function wp_trim_excerpt( $text = '', $post = null ) {
 		 */
 		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
 		$text         = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+
 	}
 
 	/**
@@ -3942,12 +4053,7 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) {
 	$text          = wp_strip_all_tags( $text );
 	$num_words     = (int) $num_words;
 
-	/*
-	 * translators: If your word count is based on single characters (e.g. East Asian characters),
-	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-	 * Do not translate into your own language.
-	 */
-	if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
+	if ( str_starts_with( wp_get_word_count_type(), 'characters' ) && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
 		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
 		preg_match_all( '/./u', $text, $words_array );
 		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
@@ -4303,7 +4409,7 @@ function format_for_editor( $text, $default_editor = null ) {
 /**
  * Performs a deep string replace operation to ensure the values in $search are no longer present.
  *
- * Repeats the replacement operation until it no longer replaces anything so as to remove "nested" values
+ * Repeats the replacement operation until it no longer replaces anything to remove "nested" values
  * e.g. $subject = '%0%0%0DDD', $search ='%0D', $result ='' rather than the '%0%0DD' that
  * str_replace would return
  *
@@ -4335,7 +4441,7 @@ function _deep_replace( $search, $subject ) {
  *
  * NOTE: Since 4.8.3, '%' characters will be replaced with a placeholder string,
  * this prevents certain SQLi attacks from taking place. This change in behavior
- * may cause issues for code that expects the return value of esc_sql() to be useable
+ * may cause issues for code that expects the return value of esc_sql() to be usable
  * for other purposes.
  *
  * @since 2.8.0
@@ -4392,8 +4498,9 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	 * it needs http:// prepended (unless it's a relative link
 	 * starting with /, # or ?, or a PHP file).
 	 */
-	if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
-		! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {
+	if ( ! str_contains( $url, ':' ) && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
+		! preg_match( '/^[a-z0-9-]+?\.php/i', $url )
+	) {
 		$url = 'http://' . $url;
 	}
 
@@ -4404,7 +4511,7 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 		$url = str_replace( "'", '&#039;', $url );
 	}
 
-	if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
+	if ( ( str_contains( $url, '[' ) ) || ( str_contains( $url, ']' ) ) ) {
 
 		$parsed = wp_parse_url( $url );
 		$front  = '';
@@ -4448,7 +4555,7 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 			$protocols = wp_allowed_protocols();
 		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
+		if ( strtolower( $good_protocol_url ) !== strtolower( $url ) ) {
 			return '';
 		}
 	}
@@ -4509,13 +4616,15 @@ function sanitize_url( $url, $protocols = null ) {
  *
  * @since 1.2.2
  *
- * @param string $myHTML The text to be converted.
+ * @param string $text The text to be converted.
  * @return string Converted text.
  */
-function htmlentities2( $myHTML ) {
-	$translation_table              = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+function htmlentities2( $text ) {
+	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+
 	$translation_table[ chr( 38 ) ] = '&';
-	return preg_replace( '/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/', '&amp;', strtr( $myHTML, $translation_table ) );
+
+	return preg_replace( '/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/', '&amp;', strtr( $text, $translation_table ) );
 }
 
 /**
@@ -4726,7 +4835,7 @@ function wp_make_link_relative( $link ) {
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $option The name of the option.
- * @param string $value  The unsanitised value.
+ * @param string $value  The unsanitized value.
  * @return string Sanitized value.
  */
 function sanitize_option( $option, $value ) {
@@ -4789,7 +4898,7 @@ function sanitize_option( $option, $value ) {
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed".
-			if ( '0' == $value || '' === $value ) {
+			if ( '0' === (string) $value || '' === $value ) {
 				$value = 'closed';
 			}
 			break;
@@ -4809,7 +4918,11 @@ function sanitize_option( $option, $value ) {
 			break;
 
 		case 'blog_charset':
-			$value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // Strips slashes.
+			if ( is_string( $value ) ) {
+				$value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // Strips slashes.
+			} else {
+				$value = '';
+			}
 			break;
 
 		case 'blog_public':
@@ -4844,7 +4957,11 @@ function sanitize_option( $option, $value ) {
 			break;
 
 		case 'gmt_offset':
-			$value = preg_replace( '/[^0-9:.-]/', '', $value ); // Strips slashes.
+			if ( is_numeric( $value ) ) {
+				$value = preg_replace( '/[^0-9:.-]/', '', $value ); // Strips slashes.
+			} else {
+				$value = '';
+			}
 			break;
 
 		case 'siteurl':
@@ -4948,7 +5065,7 @@ function sanitize_option( $option, $value ) {
 				$error = sprintf(
 					/* translators: %s: Documentation URL. */
 					__( 'A structure tag is required when using custom permalinks. <a href="%s">Learn more</a>' ),
-					__( 'https://wordpress.org/support/article/using-permalinks/#choosing-your-permalink-structure' )
+					__( 'https://wordpress.org/documentation/article/customize-permalinks/#choosing-your-permalink-structure' )
 				);
 			}
 			break;
@@ -5031,20 +5148,20 @@ function map_deep( $value, $callback ) {
  *
  * @since 2.2.1
  *
- * @param string $string The string to be parsed.
- * @param array  $array  Variables will be stored in this array.
+ * @param string $input_string The string to be parsed.
+ * @param array  $result       Variables will be stored in this array.
  */
-function wp_parse_str( $string, &$array ) {
-	parse_str( (string) $string, $array );
+function wp_parse_str( $input_string, &$result ) {
+	parse_str( (string) $input_string, $result );
 
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
 	 * @since 2.2.1
 	 *
-	 * @param array $array The array populated with variables.
+	 * @param array $result The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$result = apply_filters( 'wp_parse_str', $result );
 }
 
 /**
@@ -5054,11 +5171,11 @@ function wp_parse_str( $string, &$array ) {
  *
  * @since 2.3.0
  *
- * @param string $text Text to be converted.
+ * @param string $content Text to be converted.
  * @return string Converted text.
  */
-function wp_pre_kses_less_than( $text ) {
-	return preg_replace_callback( '%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text );
+function wp_pre_kses_less_than( $content ) {
+	return preg_replace_callback( '%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $content );
 }
 
 /**
@@ -5070,7 +5187,7 @@ function wp_pre_kses_less_than( $text ) {
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos( $matches[0], '>' ) ) {
+	if ( ! str_contains( $matches[0], '>' ) ) {
 		return esc_html( $matches[0] );
 	}
 	return $matches[0];
@@ -5082,27 +5199,27 @@ function wp_pre_kses_less_than_callback( $matches ) {
  *
  * @since 5.3.1
  *
- * @param string         $string            Content to be run through KSES.
+ * @param string         $content           Content to be run through KSES.
  * @param array[]|string $allowed_html      An array of allowed HTML elements
  *                                          and attributes, or a context name
  *                                          such as 'post'.
  * @param string[]       $allowed_protocols Array of allowed URL protocols.
  * @return string Filtered text to run through KSES.
  */
-function wp_pre_kses_block_attributes( $string, $allowed_html, $allowed_protocols ) {
+function wp_pre_kses_block_attributes( $content, $allowed_html, $allowed_protocols ) {
 	/*
 	 * `filter_block_content` is expected to call `wp_kses`. Temporarily remove
 	 * the filter to avoid recursion.
 	 */
 	remove_filter( 'pre_kses', 'wp_pre_kses_block_attributes', 10 );
-	$string = filter_block_content( $string, $allowed_html, $allowed_protocols );
+	$content = filter_block_content( $content, $allowed_html, $allowed_protocols );
 	add_filter( 'pre_kses', 'wp_pre_kses_block_attributes', 10, 3 );
 
-	return $string;
+	return $content;
 }
 
 /**
- * WordPress implementation of PHP sprintf() with filters.
+ * WordPress' implementation of PHP sprintf() with filters.
  *
  * @since 2.5.0
  * @since 5.3.0 Formalized the existing and already documented `...$args` parameter
@@ -5119,9 +5236,10 @@ function wp_sprintf( $pattern, ...$args ) {
 	$start     = 0;
 	$result    = '';
 	$arg_index = 0;
+
 	while ( $len > $start ) {
 		// Last character: append and break.
-		if ( strlen( $pattern ) - 1 == $start ) {
+		if ( strlen( $pattern ) - 1 === $start ) {
 			$result .= substr( $pattern, -1 );
 			break;
 		}
@@ -5163,7 +5281,8 @@ function wp_sprintf( $pattern, ...$args ) {
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment ) {
+
+			if ( $_fragment !== $fragment ) {
 				$fragment = $_fragment;
 			} else {
 				$fragment = sprintf( $fragment, (string) $arg );
@@ -5193,7 +5312,7 @@ function wp_sprintf( $pattern, ...$args ) {
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match.
-	if ( '%l' !== substr( $pattern, 0, 2 ) ) {
+	if ( ! str_starts_with( $pattern, '%l' ) ) {
 		return $pattern;
 	}
 
@@ -5227,7 +5346,7 @@ function wp_sprintf_l( $pattern, $args ) {
 
 	$args   = (array) $args;
 	$result = array_shift( $args );
-	if ( count( $args ) == 1 ) {
+	if ( count( $args ) === 1 ) {
 		$result .= $l['between_only_two'] . array_shift( $args );
 	}
 
@@ -5236,7 +5355,7 @@ function wp_sprintf_l( $pattern, $args ) {
 	while ( $i ) {
 		$arg = array_shift( $args );
 		$i--;
-		if ( 0 == $i ) {
+		if ( 0 === $i ) {
 			$result .= $l['between_last_two'] . $arg;
 		} else {
 			$result .= $l['between'] . $arg;
@@ -5270,7 +5389,8 @@ function wp_html_excerpt( $str, $count, $more = null ) {
 
 	// Remove part of an entity at the end.
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt ) {
+
+	if ( $str !== $excerpt ) {
 		$excerpt = trim( $excerpt ) . $more;
 	}
 
@@ -5280,8 +5400,8 @@ function wp_html_excerpt( $str, $count, $more = null ) {
 /**
  * Adds a base URL to relative links in passed content.
  *
- * By default it supports the 'src' and 'href' attributes. However this can be
- * changed via the 3rd param.
+ * By default, this function supports the 'src' and 'href' attributes.
+ * However, this can be modified via the `$attrs` parameter.
  *
  * @since 2.7.0
  *
@@ -5322,19 +5442,19 @@ function _links_add_base( $m ) {
 }
 
 /**
- * Adds a Target attribute to all links in passed content.
+ * Adds a target attribute to all links in passed content.
  *
- * This function by default only applies to `<a>` tags, however this can be
- * modified by the 3rd param.
+ * By default, this function only applies to `<a>` tags.
+ * However, this can be modified via the `$tags` parameter.
  *
- * *NOTE:* Any current target attributed will be stripped and replaced.
+ * *NOTE:* Any current target attribute will be stripped and replaced.
  *
  * @since 2.7.0
  *
  * @global string $_links_add_target
  *
  * @param string   $content String to search for links in.
- * @param string   $target  The Target to add to the links.
+ * @param string   $target  The target to add to the links.
  * @param string[] $tags    An array of tags to apply to.
  * @return string The processed content.
  */
@@ -5387,19 +5507,45 @@ function normalize_whitespace( $str ) {
  *
  * @since 2.9.0
  *
- * @param string $string        String containing HTML tags
+ * @param string $text          String containing HTML tags
  * @param bool   $remove_breaks Optional. Whether to remove left over line breaks and white space chars
  * @return string The processed string.
  */
-function wp_strip_all_tags( $string, $remove_breaks = false ) {
-	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
-	$string = strip_tags( $string );
+function wp_strip_all_tags( $text, $remove_breaks = false ) {
+	if ( is_null( $text ) ) {
+		return '';
+	}
+
+	if ( ! is_scalar( $text ) ) {
+		/*
+		 * To maintain consistency with pre-PHP 8 error levels,
+		 * trigger_error() is used to trigger an E_USER_WARNING,
+		 * rather than _doing_it_wrong(), which triggers an E_USER_NOTICE.
+		 */
+		trigger_error(
+			sprintf(
+				/* translators: 1: The function name, 2: The argument number, 3: The argument name, 4: The expected type, 5: The provided type. */
+				__( 'Warning: %1$s expects parameter %2$s (%3$s) to be a %4$s, %5$s given.' ),
+				__FUNCTION__,
+				'#1',
+				'$text',
+				'string',
+				gettype( $text )
+			),
+			E_USER_WARNING
+		);
+
+		return '';
+	}
+
+	$text = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $text );
+	$text = strip_tags( $text );
 
 	if ( $remove_breaks ) {
-		$string = preg_replace( '/[\r\n\t ]+/', ' ', $string );
+		$text = preg_replace( '/[\r\n\t ]+/', ' ', $text );
 	}
 
-	return trim( $string );
+	return trim( $text );
 }
 
 /**
@@ -5409,7 +5555,7 @@ function wp_strip_all_tags( $string, $remove_breaks = false ) {
  * - Converts single `<` characters to entities
  * - Strips all tags
  * - Removes line breaks, tabs, and extra whitespace
- * - Strips octets
+ * - Strips percent-encoded characters
  *
  * @since 2.9.0
  *
@@ -5481,13 +5627,15 @@ function _sanitize_text_fields( $str, $keep_newlines = false ) {
 
 	$filtered = wp_check_invalid_utf8( $str );
 
-	if ( strpos( $filtered, '<' ) !== false ) {
+	if ( str_contains( $filtered, '<' ) ) {
 		$filtered = wp_pre_kses_less_than( $filtered );
 		// This will strip extra whitespace for us.
 		$filtered = wp_strip_all_tags( $filtered, false );
 
-		// Use HTML entities in a special case to make sure no later
-		// newline stripping stage could lead to a functional tag.
+		/*
+		 * Use HTML entities in a special case to make sure that
+		 * later newline stripping stages cannot lead to a functional tag.
+		 */
 		$filtered = str_replace( "<\n", "&lt;\n", $filtered );
 	}
 
@@ -5496,6 +5644,7 @@ function _sanitize_text_fields( $str, $keep_newlines = false ) {
 	}
 	$filtered = trim( $filtered );
 
+	// Remove percent-encoded characters.
 	$found = false;
 	while ( preg_match( '/%[a-f0-9]{2}/i', $filtered, $match ) ) {
 		$filtered = str_replace( $match[0], '', $filtered );
@@ -5503,7 +5652,7 @@ function _sanitize_text_fields( $str, $keep_newlines = false ) {
 	}
 
 	if ( $found ) {
-		// Strip out the whitespace that may now exist after removing the octets.
+		// Strip out the whitespace that may now exist after removing percent-encoded characters.
 		$filtered = trim( preg_replace( '/ +/', ' ', $filtered ) );
 	}
 
@@ -5811,7 +5960,7 @@ function _print_emoji_detection_script() {
 
 	wp_print_inline_script_tag(
 		sprintf( 'window._wpemojiSettings = %s;', wp_json_encode( $settings ) ) . "\n" .
-			file_get_contents( sprintf( ABSPATH . WPINC . '/js/wp-emoji-loader' . wp_scripts_get_suffix() . '.js' ) )
+			file_get_contents( ABSPATH . WPINC . '/js/wp-emoji-loader' . wp_scripts_get_suffix() . '.js' )
 	);
 }
 
@@ -5830,7 +5979,7 @@ function wp_encode_emoji( $content ) {
 
 	foreach ( $emoji as $emojum ) {
 		$emoji_char = html_entity_decode( $emojum );
-		if ( false !== strpos( $content, $emoji_char ) ) {
+		if ( str_contains( $content, $emoji_char ) ) {
 			$content = preg_replace( "/$emoji_char/", $emojum, $content );
 		}
 	}
@@ -5847,7 +5996,7 @@ function wp_encode_emoji( $content ) {
  * @return string The encoded content.
  */
 function wp_staticize_emoji( $text ) {
-	if ( false === strpos( $text, '&#x' ) ) {
+	if ( ! str_contains( $text, '&#x' ) ) {
 		if ( ( function_exists( 'mb_check_encoding' ) && mb_check_encoding( $text, 'ASCII' ) ) || ! preg_match( '/[^\x00-\x7F]/', $text ) ) {
 			// The text doesn't contain anything that might be emoji, so we can return early.
 			return $text;
@@ -5866,7 +6015,7 @@ function wp_staticize_emoji( $text ) {
 	// Quickly narrow down the list of emoji that might be in the text and need replacing.
 	$possible_emoji = array();
 	foreach ( $emoji as $emojum ) {
-		if ( false !== strpos( $text, $emojum ) ) {
+		if ( str_contains( $text, $emojum ) ) {
 			$possible_emoji[ $emojum ] = html_entity_decode( $emojum );
 		}
 	}
@@ -5904,9 +6053,9 @@ function wp_staticize_emoji( $text ) {
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] && false !== strpos( $content, '&#x' ) ) {
+		if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] && str_contains( $content, '&#x' ) ) {
 			foreach ( $possible_emoji as $emojum => $emoji_char ) {
-				if ( false === strpos( $content, $emojum ) ) {
+				if ( ! str_contains( $content, $emojum ) ) {
 					continue;
 				}
 
@@ -5963,7 +6112,7 @@ function wp_staticize_emoji_for_email( $mail ) {
 	}
 
 	foreach ( $headers as $header ) {
-		if ( strpos( $header, ':' ) === false ) {
+		if ( ! str_contains( $header, ':' ) ) {
 			continue;
 		}
 
@@ -5975,7 +6124,7 @@ function wp_staticize_emoji_for_email( $mail ) {
 		$content = trim( $content );
 
 		if ( 'content-type' === strtolower( $name ) ) {
-			if ( strpos( $content, ';' ) !== false ) {
+			if ( str_contains( $content, ';' ) ) {
 				list( $type, $charset ) = explode( ';', $content );
 				$content_type           = trim( $type );
 			} else {
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index 65b0cb03b7ebe..d2304f4d55c53 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -32,7 +32,8 @@ function mysql2date( $format, $date, $translate = true ) {
 		return false;
 	}
 
-	$datetime = date_create( $date, wp_timezone() );
+	$timezone = wp_timezone();
+	$datetime = date_create( $date, $timezone );
 
 	if ( false === $datetime ) {
 		return false;
@@ -44,7 +45,7 @@ function mysql2date( $format, $date, $translate = true ) {
 	}
 
 	if ( $translate ) {
-		return wp_date( $format, $datetime->getTimestamp() );
+		return wp_date( $format, $datetime->getTimestamp(), $timezone );
 	}
 
 	return $datetime->format( $format );
@@ -163,8 +164,6 @@ function wp_timezone() {
  * @since 0.71
  * @since 5.3.0 Converted into a wrapper for wp_date().
  *
- * @global WP_Locale $wp_locale WordPress date and time locale object.
- *
  * @param string   $format                Format to display the date.
  * @param int|bool $timestamp_with_offset Optional. A sum of Unix timestamp and timezone offset
  *                                        in seconds. Default false.
@@ -264,7 +263,7 @@ function wp_date( $format, $timestamp = null, $timezone = null ) {
 		$month         = $wp_locale->get_month( $datetime->format( 'm' ) );
 		$weekday       = $wp_locale->get_weekday( $datetime->format( 'w' ) );
 
-		for ( $i = 0; $i < $format_length; $i ++ ) {
+		for ( $i = 0; $i < $format_length; $i++ ) {
 			switch ( $format[ $i ] ) {
 				case 'D':
 					$new_format .= addcslashes( $wp_locale->get_weekday_abbrev( $weekday ), '\\A..Za..z' );
@@ -514,7 +513,7 @@ function human_readable_duration( $duration = '' ) {
 	$duration = trim( $duration );
 
 	// Remove prepended negative sign.
-	if ( '-' === substr( $duration, 0, 1 ) ) {
+	if ( str_starts_with( $duration, '-' ) ) {
 		$duration = substr( $duration, 1 );
 	}
 
@@ -709,7 +708,7 @@ function is_serialized( $data, $strict = true ) {
 				if ( '"' !== substr( $data, -2, 1 ) ) {
 					return false;
 				}
-			} elseif ( false === strpos( $data, '"' ) ) {
+			} elseif ( ! str_contains( $data, '"' ) ) {
 				return false;
 			}
 			// Or else fall through.
@@ -744,7 +743,7 @@ function is_serialized_string( $data ) {
 		return false;
 	} elseif ( ':' !== $data[1] ) {
 		return false;
-	} elseif ( ';' !== substr( $data, -1 ) ) {
+	} elseif ( ! str_ends_with( $data, ';' ) ) {
 		return false;
 	} elseif ( 's' !== $data[0] ) {
 		return false;
@@ -883,7 +882,7 @@ function do_enclose( $content, $post ) {
 	global $wpdb;
 
 	// @todo Tidy this code and make the debug code optional.
-	include_once ABSPATH . WPINC . '/class-IXR.php';
+	require_once ABSPATH . WPINC . '/class-IXR.php';
 
 	$post = get_post( $post );
 	if ( ! $post ) {
@@ -934,7 +933,7 @@ function do_enclose( $content, $post ) {
 	 * @since 4.4.0
 	 *
 	 * @param string[] $post_links An array of enclosure links.
-	 * @param int      $post_ID    Post ID.
+	 * @param int      $post_id    Post ID.
 	 */
 	$post_links = apply_filters( 'enclosure_links', $post_links, $post->ID );
 
@@ -945,8 +944,8 @@ function do_enclose( $content, $post ) {
 
 			$headers = wp_get_http_headers( $url );
 			if ( $headers ) {
-				$len           = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type          = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
+				$len           = isset( $headers['Content-Length'] ) ? (int) $headers['Content-Length'] : 0;
+				$type          = isset( $headers['Content-Type'] ) ? $headers['Content-Type'] : '';
 				$allowed_types = array( 'video', 'audio' );
 
 				// Check to see if we can figure out the mime type from the extension.
@@ -978,7 +977,7 @@ function do_enclose( $content, $post ) {
  *
  * @param string $url        URL to retrieve HTTP headers from.
  * @param bool   $deprecated Not Used.
- * @return \Requests_Utility_CaseInsensitiveDictionary|false Headers on success, false on failure.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|false Headers on success, false on failure.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
 	if ( ! empty( $deprecated ) ) {
@@ -1051,7 +1050,7 @@ function build_query( $data ) {
  *                                Default null.
  * @param string       $sep       Optional. Argument separator; defaults to 'arg_separator.output'.
  *                                Default null.
- * @param string       $key       Optional. Used to prefix key name. Default empty.
+ * @param string       $key       Optional. Used to prefix key name. Default empty string.
  * @param bool         $urlencode Optional. Whether to use urlencode() in the result. Default true.
  * @return string The query string.
  */
@@ -1062,12 +1061,15 @@ function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urle
 		if ( $urlencode ) {
 			$k = urlencode( $k );
 		}
-		if ( is_int( $k ) && null != $prefix ) {
+
+		if ( is_int( $k ) && null !== $prefix ) {
 			$k = $prefix . $k;
 		}
+
 		if ( ! empty( $key ) ) {
 			$k = $key . '%5B' . $k . '%5D';
 		}
+
 		if ( null === $v ) {
 			continue;
 		} elseif ( false === $v ) {
@@ -1159,10 +1161,10 @@ function add_query_arg( ...$args ) {
 		$protocol = '';
 	}
 
-	if ( strpos( $uri, '?' ) !== false ) {
+	if ( str_contains( $uri, '?' ) ) {
 		list( $base, $query ) = explode( '?', $uri, 2 );
 		$base                .= '?';
-	} elseif ( $protocol || strpos( $uri, '=' ) === false ) {
+	} elseif ( $protocol || ! str_contains( $uri, '=' ) ) {
 		$base  = $uri . '?';
 		$query = '';
 	} else {
@@ -1198,6 +1200,10 @@ function add_query_arg( ...$args ) {
 /**
  * Removes an item or items from a query string.
  *
+ * Important: The return value of remove_query_arg() is not escaped by default. Output should be
+ * late-escaped with esc_url() or similar to help prevent vulnerability to cross-site scripting
+ * (XSS) attacks.
+ *
  * @since 1.5.0
  *
  * @param string|string[] $key   Query key or keys to remove.
@@ -1269,21 +1275,21 @@ function wp_removable_query_args() {
  * @since 0.71
  * @since 5.5.0 Non-string values are left untouched.
  *
- * @param array $array Array to walk while sanitizing contents.
- * @return array Sanitized $array.
+ * @param array $input_array Array to walk while sanitizing contents.
+ * @return array Sanitized $input_array.
  */
-function add_magic_quotes( $array ) {
-	foreach ( (array) $array as $k => $v ) {
+function add_magic_quotes( $input_array ) {
+	foreach ( (array) $input_array as $k => $v ) {
 		if ( is_array( $v ) ) {
-			$array[ $k ] = add_magic_quotes( $v );
+			$input_array[ $k ] = add_magic_quotes( $v );
 		} elseif ( is_string( $v ) ) {
-			$array[ $k ] = addslashes( $v );
+			$input_array[ $k ] = addslashes( $v );
 		} else {
 			continue;
 		}
 	}
 
-	return $array;
+	return $input_array;
 }
 
 /**
@@ -1440,6 +1446,7 @@ function get_status_header_desc( $code ) {
  *
  * @param int    $code        HTTP status code.
  * @param string $description Optional. A custom description for the HTTP status.
+ *                            Defaults to the result of get_status_header_desc() for the given code.
  */
 function status_header( $code, $description = '' ) {
 	if ( ! $description ) {
@@ -1473,24 +1480,30 @@ function status_header( $code, $description = '' ) {
 }
 
 /**
- * Gets the header information to prevent caching.
+ * Gets the HTTP header information to prevent caching.
  *
  * The several different headers cover the different ways cache prevention
- * is handled by different browsers
+ * is handled by different browsers.
  *
  * @since 2.8.0
+ * @since 6.3.0 The `Cache-Control` header for logged in users now includes the
+ *              `no-store` and `private` directives.
  *
  * @return array The associative array of header names and field values.
  */
 function wp_get_nocache_headers() {
+	$cache_control = ( function_exists( 'is_user_logged_in' ) && is_user_logged_in() )
+		? 'no-cache, must-revalidate, max-age=0, no-store, private'
+		: 'no-cache, must-revalidate, max-age=0';
+
 	$headers = array(
 		'Expires'       => 'Wed, 11 Jan 1984 05:00:00 GMT',
-		'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
+		'Cache-Control' => $cache_control,
 	);
 
 	if ( function_exists( 'apply_filters' ) ) {
 		/**
-		 * Filters the cache-controlling headers.
+		 * Filters the cache-controlling HTTP headers that are used to prevent caching.
 		 *
 		 * @since 2.8.0
 		 *
@@ -1505,7 +1518,7 @@ function wp_get_nocache_headers() {
 }
 
 /**
- * Sets the headers to prevent caching for the different browsers.
+ * Sets the HTTP headers to prevent caching for the different browsers.
  *
  * Different browsers support different nocache headers, so several
  * headers must be sent so that all of them get the point that no
@@ -1532,7 +1545,7 @@ function nocache_headers() {
 }
 
 /**
- * Sets the headers for caching for 10 days with JavaScript content type.
+ * Sets the HTTP headers for caching for 10 days with JavaScript content type.
  *
  * @since 2.1.0
  */
@@ -1762,15 +1775,18 @@ function is_blog_installed() {
 	}
 
 	$suppress = $wpdb->suppress_errors();
+
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
 	}
+
 	// If siteurl is not set to autoload, check it specifically.
 	if ( ! isset( $alloptions['siteurl'] ) ) {
 		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
 	} else {
 		$installed = $alloptions['siteurl'];
 	}
+
 	$wpdb->suppress_errors( $suppress );
 
 	$installed = ! empty( $installed );
@@ -1795,10 +1811,11 @@ function is_blog_installed() {
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an unwise state or prevent a clean installation.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE === $table ) {
 			continue;
 		}
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE === $table ) {
 			continue;
 		}
 
@@ -1869,10 +1886,10 @@ function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
  * @param int|string $action  Optional. Action name. Default -1.
  * @param string     $name    Optional. Nonce name. Default '_wpnonce'.
  * @param bool       $referer Optional. Whether to set the referer field for validation. Default true.
- * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
+ * @param bool       $display Optional. Whether to display or return hidden form field. Default true.
  * @return string Nonce field HTML markup.
  */
-function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $echo = true ) {
+function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $display = true ) {
 	$name        = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
@@ -1880,7 +1897,7 @@ function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $ech
 		$nonce_field .= wp_referer_field( false );
 	}
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $nonce_field;
 	}
 
@@ -1895,14 +1912,14 @@ function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $ech
  *
  * @since 2.0.4
  *
- * @param bool $echo Optional. Whether to echo or return the referer field. Default true.
+ * @param bool $display Optional. Whether to echo or return the referer field. Default true.
  * @return string Referer field HTML markup.
  */
-function wp_referer_field( $echo = true ) {
+function wp_referer_field( $display = true ) {
 	$request_url   = remove_query_arg( '_wp_http_referer' );
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="' . esc_url( $request_url ) . '" />';
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $referer_field;
 	}
 
@@ -1918,12 +1935,12 @@ function wp_referer_field( $echo = true ) {
  *
  * @since 2.0.4
  *
- * @param bool   $echo         Optional. Whether to echo the original http referer. Default true.
+ * @param bool   $display      Optional. Whether to echo the original http referer. Default true.
  * @param string $jump_back_to Optional. Can be 'previous' or page you want to jump back to.
  *                             Default 'current'.
  * @return string Original referer field.
  */
-function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
+function wp_original_referer_field( $display = true, $jump_back_to = 'current' ) {
 	$ref = wp_get_original_referer();
 
 	if ( ! $ref ) {
@@ -1932,7 +1949,7 @@ function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
 
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $orig_referer_field;
 	}
 
@@ -1949,13 +1966,16 @@ function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
  * @return string|false Referer URL on success, false on failure.
  */
 function wp_get_referer() {
+	// Return early if called before wp_validate_redirect() is defined.
 	if ( ! function_exists( 'wp_validate_redirect' ) ) {
 		return false;
 	}
 
 	$ref = wp_get_raw_referer();
 
-	if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref && home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref ) {
+	if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref
+		&& home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref
+	) {
 		return wp_validate_redirect( $ref, false );
 	}
 
@@ -1963,7 +1983,9 @@ function wp_get_referer() {
 }
 
 /**
- * Retrieves unvalidated referer from '_wp_http_referer' or HTTP referer.
+ * Retrieves unvalidated referer from the '_wp_http_referer' URL query variable or the HTTP referer.
+ *
+ * If the value of the '_wp_http_referer' URL query variable is not a string then it will be ignored.
  *
  * Do not use for redirects, use wp_get_referer() instead.
  *
@@ -1972,7 +1994,7 @@ function wp_get_referer() {
  * @return string|false Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
-	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+	if ( ! empty( $_REQUEST['_wp_http_referer'] ) && is_string( $_REQUEST['_wp_http_referer'] ) ) {
 		return wp_unslash( $_REQUEST['_wp_http_referer'] );
 	} elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
 		return wp_unslash( $_SERVER['HTTP_REFERER'] );
@@ -1989,7 +2011,12 @@ function wp_get_raw_referer() {
  * @return string|false Original referer URL on success, false on failure.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+	// Return early if called before wp_validate_redirect() is defined.
+	if ( ! function_exists( 'wp_validate_redirect' ) ) {
+		return false;
+	}
+
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) ) {
 		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
 	}
 
@@ -2036,7 +2063,7 @@ function wp_mkdir_p( $target ) {
 	}
 
 	// Do not allow path traversals.
-	if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) {
+	if ( str_contains( $target, '../' ) || str_contains( $target, '..' . DIRECTORY_SEPARATOR ) ) {
 		return false;
 	}
 
@@ -2060,7 +2087,7 @@ function wp_mkdir_p( $target ) {
 		 * If a umask is set that modifies $dir_perms, we'll have to re-set
 		 * the $dir_perms correctly with chmod()
 		 */
-		if ( ( $dir_perms & ~umask() ) != $dir_perms ) {
+		if ( ( $dir_perms & ~umask() ) !== $dir_perms ) {
 			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
 			for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
 				chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
@@ -2366,7 +2393,7 @@ function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false
 			$uploads['error'] = $tested_paths[ $path ];
 		} else {
 			if ( ! wp_mkdir_p( $path ) ) {
-				if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
+				if ( str_starts_with( $uploads['basedir'], ABSPATH ) ) {
 					$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
 				} else {
 					$error_path = wp_basename( $uploads['basedir'] ) . $uploads['subdir'];
@@ -2401,7 +2428,7 @@ function _wp_upload_dir( $time = null ) {
 
 	if ( empty( $upload_path ) || 'wp-content/uploads' === $upload_path ) {
 		$dir = WP_CONTENT_DIR . '/uploads';
-	} elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
+	} elseif ( ! str_starts_with( $upload_path, ABSPATH ) ) {
 		// $dir is absolute, $upload_path is (maybe) relative to ABSPATH.
 		$dir = path_join( ABSPATH, $upload_path );
 	} else {
@@ -2410,7 +2437,7 @@ function _wp_upload_dir( $time = null ) {
 
 	$url = get_option( 'upload_url_path' );
 	if ( ! $url ) {
-		if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path == $dir ) ) {
+		if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path === $dir ) ) {
 			$url = WP_CONTENT_URL . '/uploads';
 		} else {
 			$url = trailingslashit( $siteurl ) . $upload_path;
@@ -2563,7 +2590,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 		$file_type = wp_check_filetype( $filename );
 		$mime_type = $file_type['type'];
 
-		$is_image    = ( ! empty( $mime_type ) && 0 === strpos( $mime_type, 'image/' ) );
+		$is_image    = ( ! empty( $mime_type ) && str_starts_with( $mime_type, 'image/' ) );
 		$upload_dir  = wp_get_upload_dir();
 		$lc_filename = null;
 
@@ -2623,7 +2650,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 		$count = 10000;
 
 		// The (resized) image files would have name and extension, and will be in the uploads dir.
-		if ( $name && $ext && @is_dir( $dir ) && false !== strpos( $dir, $upload_dir['basedir'] ) ) {
+		if ( $name && $ext && @is_dir( $dir ) && str_contains( $dir, $upload_dir['basedir'] ) ) {
 			/**
 			 * Filters the file list used for calculating a unique filename for a newly added file.
 			 *
@@ -2901,7 +2928,7 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+		if ( str_starts_with( $upload['basedir'], ABSPATH ) ) {
 			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
 		} else {
 			$error_path = wp_basename( $upload['basedir'] ) . $upload['subdir'];
@@ -3000,8 +3027,9 @@ function wp_get_default_extension_for_mime_type( $mime_type ) {
  *
  * @since 2.0.4
  *
- * @param string   $filename File name or path.
- * @param string[] $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ * @param string        $filename File name or path.
+ * @param string[]|null $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ *                                Defaults to the result of get_allowed_mime_types().
  * @return array {
  *     Values for the extension and mime type.
  *
@@ -3040,10 +3068,11 @@ function wp_check_filetype( $filename, $mimes = null ) {
  *
  * @since 3.0.0
  *
- * @param string   $file     Full path to the file.
- * @param string   $filename The name of the file (may differ from $file due to $file being
- *                           in a tmp directory).
- * @param string[] $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ * @param string        $file     Full path to the file.
+ * @param string        $filename The name of the file (may differ from $file due to $file being
+ *                                in a tmp directory).
+ * @param string[]|null $mimes    Optional. Array of allowed mime types keyed by their file extension regex.
+ *                                Defaults to the result of get_allowed_mime_types().
  * @return array {
  *     Values for the extension, mime type, and corrected filename.
  *
@@ -3068,12 +3097,12 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 	$real_mime = false;
 
 	// Validate image types.
-	if ( $type && 0 === strpos( $type, 'image/' ) ) {
+	if ( $type && str_starts_with( $type, 'image/' ) ) {
 
 		// Attempt to figure out what type of image it actually is.
 		$real_mime = wp_get_image_mime( $file );
 
-		if ( $real_mime && $real_mime != $type ) {
+		if ( $real_mime && $real_mime !== $type ) {
 			/**
 			 * Filters the list mapping image mime types to their respective extensions.
 			 *
@@ -3100,9 +3129,10 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 				$filename_parts[] = $mime_to_ext[ $real_mime ];
 				$new_filename     = implode( '.', $filename_parts );
 
-				if ( $new_filename != $filename ) {
+				if ( $new_filename !== $filename ) {
 					$proper_filename = $new_filename; // Mark that it changed.
 				}
+
 				// Redefine the extension / MIME.
 				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
 				$ext         = $wp_filetype['ext'];
@@ -3139,7 +3169,7 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 				$type = false;
 				$ext  = false;
 			}
-		} elseif ( 0 === strpos( $real_mime, 'video/' ) || 0 === strpos( $real_mime, 'audio/' ) ) {
+		} elseif ( str_starts_with( $real_mime, 'video/' ) || str_starts_with( $real_mime, 'audio/' ) ) {
 			/*
 			 * For these types, only the major type must match the real value.
 			 * This means that common mismatches are forgiven: application/vnd.apple.numbers is often misidentified as application/zip,
@@ -3225,18 +3255,19 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 	 * @since 3.0.0
 	 * @since 5.1.0 The $real_mime parameter was added.
 	 *
-	 * @param array        $wp_check_filetype_and_ext {
+	 * @param array         $wp_check_filetype_and_ext {
 	 *     Values for the extension, mime type, and corrected filename.
 	 *
 	 *     @type string|false $ext             File extension, or false if the file doesn't match a mime type.
 	 *     @type string|false $type            File mime type, or false if the file doesn't match a mime type.
 	 *     @type string|false $proper_filename File name with its correct extension, or false if it cannot be determined.
 	 * }
-	 * @param string       $file                      Full path to the file.
-	 * @param string       $filename                  The name of the file (may differ from $file due to
-	 *                                                $file being in a tmp directory).
-	 * @param string[]     $mimes                     Array of mime types keyed by their file extension regex.
-	 * @param string|false $real_mime                 The actual mime type or false if the type cannot be determined.
+	 * @param string        $file                      Full path to the file.
+	 * @param string        $filename                  The name of the file (may differ from $file due to
+	 *                                                 $file being in a tmp directory).
+	 * @param string[]|null $mimes                     Array of mime types keyed by their file extension regex, or null if
+	 *                                                 none were provided.
+	 * @param string|false  $real_mime                 The actual mime type or false if the type cannot be determined.
 	 */
 	return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes, $real_mime );
 }
@@ -3297,7 +3328,7 @@ function wp_get_image_mime( $file ) {
 		$magic = bin2hex( $magic );
 		if (
 			// RIFF.
-			( 0 === strpos( $magic, '52494646' ) ) &&
+			( str_starts_with( $magic, '52494646' ) ) &&
 			// WEBP.
 			( 16 === strpos( $magic, '57454250' ) )
 		) {
@@ -3330,7 +3361,7 @@ function wp_get_mime_types() {
 	 * @since 3.5.0
 	 *
 	 * @param string[] $wp_get_mime_types Mime types keyed by the file extension regex
-	 *                                 corresponding to those types.
+	 *                                    corresponding to those types.
 	 */
 	return apply_filters(
 		'mime_types',
@@ -3567,19 +3598,23 @@ function wp_nonce_ays( $action ) {
 			__( 'You are attempting to log out of %s' ),
 			get_bloginfo( 'name' )
 		);
-		$html        = $title;
-		$html       .= '</p><p>';
+
 		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-		$html       .= sprintf(
+
+		$html  = $title;
+		$html .= '</p><p>';
+		$html .= sprintf(
 			/* translators: %s: Logout URL. */
 			__( 'Do you really want to <a href="%s">log out</a>?' ),
 			wp_logout_url( $redirect_to )
 		);
 	} else {
 		$html = __( 'The link you followed has expired.' );
+
 		if ( wp_get_referer() ) {
 			$wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
 			$wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
+
 			$html .= '</p><p>';
 			$html .= sprintf(
 				'<a href="%s">%s</a>',
@@ -3616,11 +3651,11 @@ function wp_nonce_ays( $action ) {
  *
  * @param string|WP_Error  $message Optional. Error message. If this is a WP_Error object,
  *                                  and not an Ajax or XML-RPC request, the error's messages are used.
- *                                  Default empty.
+ *                                  Default empty string.
  * @param string|int       $title   Optional. Error title. If `$message` is a `WP_Error` object,
  *                                  error data with the key 'title' may be used to specify the title.
- *                                  If `$title` is an integer, then it is treated as the response
- *                                  code. Default empty.
+ *                                  If `$title` is an integer, then it is treated as the response code.
+ *                                  Default empty string.
  * @param string|array|int $args {
  *     Optional. Arguments to control behavior. If `$args` is an integer, then it is treated
  *     as the response code. Default empty array.
@@ -3723,7 +3758,7 @@ function wp_die( $message = '', $title = '', $args = array() ) {
  * @access private
  *
  * @param string|WP_Error $message Error message or WP_Error object.
- * @param string          $title   Optional. Error title. Default empty.
+ * @param string          $title   Optional. Error title. Default empty string.
  * @param string|array    $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _default_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -3770,8 +3805,10 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		$text_direction = $parsed_args['text_direction'];
 		$dir_attr       = "dir='$text_direction'";
 
-		// If `text_direction` was not explicitly passed,
-		// use get_language_attributes() if available.
+		/*
+		 * If `text_direction` was not explicitly passed,
+		 * use get_language_attributes() if available.
+		 */
 		if ( empty( $args['text_direction'] )
 			&& function_exists( 'language_attributes' ) && function_exists( 'is_rtl' )
 		) {
@@ -3925,7 +3962,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
  * @access private
  *
  * @param string       $message Error message.
- * @param string       $title   Optional. Error title (unused). Default empty.
+ * @param string       $title   Optional. Error title (unused). Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -3967,7 +4004,7 @@ function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
  * @access private
  *
  * @param string       $message Error message.
- * @param string       $title   Optional. Error title. Default empty.
+ * @param string       $title   Optional. Error title. Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _json_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -4005,7 +4042,7 @@ function _json_wp_die_handler( $message, $title = '', $args = array() ) {
  * @access private
  *
  * @param string       $message Error message.
- * @param string       $title   Optional. Error title. Default empty.
+ * @param string       $title   Optional. Error title. Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _jsonp_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -4049,7 +4086,7 @@ function _jsonp_wp_die_handler( $message, $title = '', $args = array() ) {
  * @global wp_xmlrpc_server $wp_xmlrpc_server
  *
  * @param string       $message Error message.
- * @param string       $title   Optional. Error title. Default empty.
+ * @param string       $title   Optional. Error title. Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -4079,7 +4116,7 @@ function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
  * @access private
  *
  * @param string       $message Error message.
- * @param string       $title   Optional. Error title. Default empty.
+ * @param string       $title   Optional. Error title. Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _xml_wp_die_handler( $message, $title = '', $args = array() ) {
@@ -4123,8 +4160,8 @@ function _xml_wp_die_handler( $message, $title = '', $args = array() ) {
  * @since 5.1.0 Added the $title and $args parameters.
  * @access private
  *
- * @param string       $message Optional. Response to print. Default empty.
- * @param string       $title   Optional. Error title (unused). Default empty.
+ * @param string       $message Optional. Response to print. Default empty string.
+ * @param string       $title   Optional. Error title (unused). Default empty string.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
 function _scalar_wp_die_handler( $message = '', $title = '', $args = array() ) {
@@ -4149,7 +4186,7 @@ function _scalar_wp_die_handler( $message = '', $title = '', $args = array() ) {
  * @access private
  *
  * @param string|WP_Error $message Error message or WP_Error object.
- * @param string          $title   Optional. Error title. Default empty.
+ * @param string          $title   Optional. Error title. Default empty string.
  * @param string|array    $args    Optional. Arguments to control behavior. Default empty array.
  * @return array {
  *     Processed arguments.
@@ -4300,7 +4337,7 @@ function _wp_json_sanity_check( $data, $depth ) {
 			}
 		}
 	} elseif ( is_object( $data ) ) {
-		$output = new stdClass;
+		$output = new stdClass();
 		foreach ( $data as $id => $el ) {
 			if ( is_string( $id ) ) {
 				$clean_id = _wp_json_convert_string( $id );
@@ -4334,24 +4371,24 @@ function _wp_json_sanity_check( $data, $depth ) {
  *
  * @see _wp_json_sanity_check()
  *
- * @param string $string The string which is to be converted.
+ * @param string $input_string The string which is to be converted.
  * @return string The checked string.
  */
-function _wp_json_convert_string( $string ) {
+function _wp_json_convert_string( $input_string ) {
 	static $use_mb = null;
 	if ( is_null( $use_mb ) ) {
 		$use_mb = function_exists( 'mb_convert_encoding' );
 	}
 
 	if ( $use_mb ) {
-		$encoding = mb_detect_encoding( $string, mb_detect_order(), true );
+		$encoding = mb_detect_encoding( $input_string, mb_detect_order(), true );
 		if ( $encoding ) {
-			return mb_convert_encoding( $string, 'UTF-8', $encoding );
+			return mb_convert_encoding( $input_string, 'UTF-8', $encoding );
 		} else {
-			return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
+			return mb_convert_encoding( $input_string, 'UTF-8', 'UTF-8' );
 		}
 	} else {
-		return wp_check_invalid_utf8( $string, true );
+		return wp_check_invalid_utf8( $input_string, true );
 	}
 }
 
@@ -4516,7 +4553,7 @@ function wp_check_jsonp_callback( $callback ) {
  *     Optional. Options to be used with `json_decode()`.
  *
  *     @type bool $associative Optional. When `true`, JSON objects will be returned as associative arrays.
- *                             When `false`, JSON objects will be returned as objects.
+ *                             When `false`, JSON objects will be returned as objects. Default false.
  * }
  *
  * @return mixed Returns the value encoded in JSON in appropriate PHP type.
@@ -4631,7 +4668,7 @@ function _mce_set_direction( $mce_init ) {
 		$mce_init['directionality'] = 'rtl';
 		$mce_init['rtl_ui']         = true;
 
-		if ( ! empty( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
+		if ( ! empty( $mce_init['plugins'] ) && ! str_contains( $mce_init['plugins'], 'directionality' ) ) {
 			$mce_init['plugins'] .= ',directionality';
 		}
 
@@ -4736,7 +4773,7 @@ function smilies_init() {
 	 */
 	$wpsmiliestrans = apply_filters( 'smilies', $wpsmiliestrans );
 
-	if ( count( $wpsmiliestrans ) == 0 ) {
+	if ( count( $wpsmiliestrans ) === 0 ) {
 		return;
 	}
 
@@ -4758,16 +4795,18 @@ function smilies_init() {
 		$rest      = substr( $smiley, 1 );
 
 		// New subpattern?
-		if ( $firstchar != $subchar ) {
+		if ( $firstchar !== $subchar ) {
 			if ( '' !== $subchar ) {
 				$wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern".
 				$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
 			}
+
 			$subchar           = $firstchar;
 			$wp_smiliessearch .= preg_quote( $firstchar, '/' ) . '(?:';
 		} else {
 			$wp_smiliessearch .= '|';
 		}
+
 		$wp_smiliessearch .= preg_quote( $rest, '/' );
 	}
 
@@ -4809,18 +4848,18 @@ function wp_parse_args( $args, $defaults = array() ) {
  *
  * @since 5.1.0
  *
- * @param array|string $list List of values.
+ * @param array|string $input_list List of values.
  * @return array Array of values.
  */
-function wp_parse_list( $list ) {
-	if ( ! is_array( $list ) ) {
-		return preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
+function wp_parse_list( $input_list ) {
+	if ( ! is_array( $input_list ) ) {
+		return preg_split( '/[\s,]+/', $input_list, -1, PREG_SPLIT_NO_EMPTY );
 	}
 
 	// Validate all entries of the list are scalar.
-	$list = array_filter( $list, 'is_scalar' );
+	$input_list = array_filter( $input_list, 'is_scalar' );
 
-	return $list;
+	return $input_list;
 }
 
 /**
@@ -4829,13 +4868,13 @@ function wp_parse_list( $list ) {
  * @since 3.0.0
  * @since 5.1.0 Refactored to use wp_parse_list().
  *
- * @param array|string $list List of IDs.
+ * @param array|string $input_list List of IDs.
  * @return int[] Sanitized array of IDs.
  */
-function wp_parse_id_list( $list ) {
-	$list = wp_parse_list( $list );
+function wp_parse_id_list( $input_list ) {
+	$input_list = wp_parse_list( $input_list );
 
-	return array_unique( array_map( 'absint', $list ) );
+	return array_unique( array_map( 'absint', $input_list ) );
 }
 
 /**
@@ -4844,13 +4883,13 @@ function wp_parse_id_list( $list ) {
  * @since 4.7.0
  * @since 5.1.0 Refactored to use wp_parse_list().
  *
- * @param array|string $list List of slugs.
+ * @param array|string $input_list List of slugs.
  * @return string[] Sanitized array of slugs.
  */
-function wp_parse_slug_list( $list ) {
-	$list = wp_parse_list( $list );
+function wp_parse_slug_list( $input_list ) {
+	$input_list = wp_parse_list( $input_list );
 
-	return array_unique( array_map( 'sanitize_title', $list ) );
+	return array_unique( array_map( 'sanitize_title', $input_list ) );
 }
 
 /**
@@ -4858,22 +4897,42 @@ function wp_parse_slug_list( $list ) {
  *
  * @since 3.1.0
  *
- * @param array $array The original array.
- * @param array $keys  The list of keys.
+ * @param array $input_array The original array.
+ * @param array $keys        The list of keys.
  * @return array The array slice.
  */
-function wp_array_slice_assoc( $array, $keys ) {
+function wp_array_slice_assoc( $input_array, $keys ) {
 	$slice = array();
 
 	foreach ( $keys as $key ) {
-		if ( isset( $array[ $key ] ) ) {
-			$slice[ $key ] = $array[ $key ];
+		if ( isset( $input_array[ $key ] ) ) {
+			$slice[ $key ] = $input_array[ $key ];
 		}
 	}
 
 	return $slice;
 }
 
+/**
+ * Sorts the keys of an array alphabetically.
+ *
+ * The array is passed by reference so it doesn't get returned
+ * which mimics the behavior of `ksort()`.
+ *
+ * @since 6.0.0
+ *
+ * @param array $input_array The array to sort, passed by reference.
+ */
+function wp_recursive_ksort( &$input_array ) {
+	foreach ( $input_array as &$value ) {
+		if ( is_array( $value ) ) {
+			wp_recursive_ksort( $value );
+		}
+	}
+
+	ksort( $input_array );
+}
+
 /**
  * Accesses an array in depth based on a path of keys.
  *
@@ -4882,44 +4941,65 @@ function wp_array_slice_assoc( $array, $keys ) {
  *
  * Example usage:
  *
- *     $array = array(
+ *     $input_array = array(
  *         'a' => array(
  *             'b' => array(
  *                 'c' => 1,
  *             ),
  *         ),
  *     );
- *     _wp_array_get( $array, array( 'a', 'b', 'c' ) );
+ *     _wp_array_get( $input_array, array( 'a', 'b', 'c' ) );
  *
  * @internal
  *
  * @since 5.6.0
  * @access private
  *
- * @param array $array   An array from which we want to retrieve some information.
- * @param array $path    An array of keys describing the path with which to retrieve information.
- * @param mixed $default Optional. The return value if the path does not exist within the array,
- *                       or if `$array` or `$path` are not arrays. Default null.
+ * @param array $input_array   An array from which we want to retrieve some information.
+ * @param array $path          An array of keys describing the path with which to retrieve information.
+ * @param mixed $default_value Optional. The return value if the path does not exist within the array,
+ *                             or if `$input_array` or `$path` are not arrays. Default null.
  * @return mixed The value from the path specified.
  */
-function _wp_array_get( $array, $path, $default = null ) {
+function _wp_array_get( $input_array, $path, $default_value = null ) {
 	// Confirm $path is valid.
 	if ( ! is_array( $path ) || 0 === count( $path ) ) {
-		return $default;
+		return $default_value;
 	}
 
 	foreach ( $path as $path_element ) {
-		if (
-			! is_array( $array ) ||
-			( ! is_string( $path_element ) && ! is_integer( $path_element ) && ! is_null( $path_element ) ) ||
-			! array_key_exists( $path_element, $array )
+		if ( ! is_array( $input_array ) ) {
+			return $default_value;
+		}
+
+		if ( is_string( $path_element )
+			|| is_integer( $path_element )
+			|| null === $path_element
 		) {
-			return $default;
+			/*
+			 * Check if the path element exists in the input array.
+			 * We check with `isset()` first, as it is a lot faster
+			 * than `array_key_exists()`.
+			 */
+			if ( isset( $input_array[ $path_element ] ) ) {
+				$input_array = $input_array[ $path_element ];
+				continue;
+			}
+
+			/*
+			 * If `isset()` returns false, we check with `array_key_exists()`,
+			 * which also checks for `null` values.
+			 */
+			if ( array_key_exists( $path_element, $input_array ) ) {
+				$input_array = $input_array[ $path_element ];
+				continue;
+			}
 		}
-		$array = $array[ $path_element ];
+
+		return $default_value;
 	}
 
-	return $array;
+	return $input_array;
 }
 
 /**
@@ -4930,10 +5010,10 @@ function _wp_array_get( $array, $path, $default = null ) {
  *
  * Example usage:
  *
- *     $array = array();
- *     _wp_array_set( $array, array( 'a', 'b', 'c', 1 ) );
+ *     $input_array = array();
+ *     _wp_array_set( $input_array, array( 'a', 'b', 'c', 1 ) );
  *
- *     $array becomes:
+ *     $input_array becomes:
  *     array(
  *         'a' => array(
  *             'b' => array(
@@ -4947,13 +5027,13 @@ function _wp_array_get( $array, $path, $default = null ) {
  * @since 5.8.0
  * @access private
  *
- * @param array $array An array that we want to mutate to include a specific value in a path.
- * @param array $path  An array of keys describing the path that we want to mutate.
- * @param mixed $value The value that will be set.
+ * @param array $input_array An array that we want to mutate to include a specific value in a path.
+ * @param array $path        An array of keys describing the path that we want to mutate.
+ * @param mixed $value       The value that will be set.
  */
-function _wp_array_set( &$array, $path, $value = null ) {
-	// Confirm $array is valid.
-	if ( ! is_array( $array ) ) {
+function _wp_array_set( &$input_array, $path, $value = null ) {
+	// Confirm $input_array is valid.
+	if ( ! is_array( $input_array ) ) {
 		return;
 	}
 
@@ -4980,15 +5060,15 @@ function _wp_array_set( &$array, $path, $value = null ) {
 	for ( $i = 0; $i < $path_length - 1; ++$i ) {
 		$path_element = $path[ $i ];
 		if (
-			! array_key_exists( $path_element, $array ) ||
-			! is_array( $array[ $path_element ] )
+			! array_key_exists( $path_element, $input_array ) ||
+			! is_array( $input_array[ $path_element ] )
 		) {
-			$array[ $path_element ] = array();
+			$input_array[ $path_element ] = array();
 		}
-		$array = &$array[ $path_element ]; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
+		$input_array = &$input_array[ $path_element ]; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
 	}
 
-	$array[ $path[ $i ] ] = $value;
+	$input_array[ $path[ $i ] ] = $value;
 }
 
 /**
@@ -5012,14 +5092,13 @@ function _wp_array_set( &$array, $path, $value = null ) {
  * @link https://github.com/lodash-php/lodash-php/blob/master/src/String/kebabCase.php
  * @link https://github.com/lodash-php/lodash-php/blob/master/src/internal/unicodeWords.php
  *
- * @param string $string The string to kebab-case.
+ * @param string $input_string The string to kebab-case.
  *
  * @return string kebab-cased-string.
  */
-function _wp_to_kebab_case( $string ) {
-	//phpcs:disable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
-	// ignore the camelCase names for variables so the names are the same as lodash
-	// so comparing and porting new changes is easier.
+function _wp_to_kebab_case( $input_string ) {
+	// Ignore the camelCase names for variables so the names are the same as lodash so comparing and porting new changes is easier.
+	// phpcs:disable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 
 	/*
 	 * Some notable things we've removed compared to the lodash version are:
@@ -5063,9 +5142,9 @@ function _wp_to_kebab_case( $string ) {
 		)
 	) . '/u';
 
-	preg_match_all( $regexp, str_replace( "'", '', $string ), $matches );
+	preg_match_all( $regexp, str_replace( "'", '', $input_string ), $matches );
 	return strtolower( implode( '-', $matches[0] ) );
-	//phpcs:enable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+	// phpcs:enable WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 }
 
 /**
@@ -5104,23 +5183,23 @@ function wp_is_numeric_array( $data ) {
  * @since 3.0.0
  * @since 4.7.0 Uses `WP_List_Util` class.
  *
- * @param array       $list     An array of objects to filter.
- * @param array       $args     Optional. An array of key => value arguments to match
- *                              against each object. Default empty array.
- * @param string      $operator Optional. The logical operation to perform. 'AND' means
- *                              all elements from the array must match. 'OR' means only
- *                              one element needs to match. 'NOT' means no elements may
- *                              match. Default 'AND'.
- * @param bool|string $field    Optional. A field from the object to place instead
- *                              of the entire object. Default false.
+ * @param array       $input_list An array of objects to filter.
+ * @param array       $args       Optional. An array of key => value arguments to match
+ *                                against each object. Default empty array.
+ * @param string      $operator   Optional. The logical operation to perform. 'AND' means
+ *                                all elements from the array must match. 'OR' means only
+ *                                one element needs to match. 'NOT' means no elements may
+ *                                match. Default 'AND'.
+ * @param bool|string $field      Optional. A field from the object to place instead
+ *                                of the entire object. Default false.
  * @return array A list of objects or object fields.
  */
-function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) ) {
+function wp_filter_object_list( $input_list, $args = array(), $operator = 'and', $field = false ) {
+	if ( ! is_array( $input_list ) ) {
 		return array();
 	}
 
-	$util = new WP_List_Util( $list );
+	$util = new WP_List_Util( $input_list );
 
 	$util->filter( $args, $operator );
 
@@ -5148,17 +5227,17 @@ function wp_filter_object_list( $list, $args = array(), $operator = 'and', $fiel
  * @since 4.7.0 Uses `WP_List_Util` class.
  * @since 5.9.0 Converted into a wrapper for `wp_filter_object_list()`.
  *
- * @param array  $list     An array of objects to filter.
- * @param array  $args     Optional. An array of key => value arguments to match
- *                         against each object. Default empty array.
- * @param string $operator Optional. The logical operation to perform. 'AND' means
- *                         all elements from the array must match. 'OR' means only
- *                         one element needs to match. 'NOT' means no elements may
- *                         match. Default 'AND'.
+ * @param array  $input_list An array of objects to filter.
+ * @param array  $args       Optional. An array of key => value arguments to match
+ *                           against each object. Default empty array.
+ * @param string $operator   Optional. The logical operation to perform. 'AND' means
+ *                           all elements from the array must match. 'OR' means only
+ *                           one element needs to match. 'NOT' means no elements may
+ *                           match. Default 'AND'.
  * @return array Array of found values.
  */
-function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	return wp_filter_object_list( $list, $args, $operator );
+function wp_list_filter( $input_list, $args = array(), $operator = 'AND' ) {
+	return wp_filter_object_list( $input_list, $args, $operator );
 }
 
 /**
@@ -5171,20 +5250,20 @@ function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
  * @since 4.0.0 $index_key parameter added.
  * @since 4.7.0 Uses `WP_List_Util` class.
  *
- * @param array      $list      List of objects or arrays.
- * @param int|string $field     Field from the object to place instead of the entire object.
- * @param int|string $index_key Optional. Field from the object to use as keys for the new array.
- *                              Default null.
+ * @param array      $input_list List of objects or arrays.
+ * @param int|string $field      Field from the object to place instead of the entire object.
+ * @param int|string $index_key  Optional. Field from the object to use as keys for the new array.
+ *                               Default null.
  * @return array Array of found values. If `$index_key` is set, an array of found values with keys
  *               corresponding to `$index_key`. If `$index_key` is null, array keys from the original
- *               `$list` will be preserved in the results.
+ *               `$input_list` will be preserved in the results.
  */
-function wp_list_pluck( $list, $field, $index_key = null ) {
-	if ( ! is_array( $list ) ) {
+function wp_list_pluck( $input_list, $field, $index_key = null ) {
+	if ( ! is_array( $input_list ) ) {
 		return array();
 	}
 
-	$util = new WP_List_Util( $list );
+	$util = new WP_List_Util( $input_list );
 
 	return $util->pluck( $field, $index_key );
 }
@@ -5194,20 +5273,21 @@ function wp_list_pluck( $list, $field, $index_key = null ) {
  *
  * @since 4.7.0
  *
- * @param array        $list          An array of objects or arrays to sort.
+ * @param array        $input_list    An array of objects or arrays to sort.
  * @param string|array $orderby       Optional. Either the field name to order by or an array
- *                                    of multiple orderby fields as $orderby => $order.
- * @param string       $order         Optional. Either 'ASC' or 'DESC'. Only used if $orderby
- *                                    is a string.
+ *                                    of multiple orderby fields as `$orderby => $order`.
+ *                                    Default empty array.
+ * @param string       $order         Optional. Either 'ASC' or 'DESC'. Only used if `$orderby`
+ *                                    is a string. Default 'ASC'.
  * @param bool         $preserve_keys Optional. Whether to preserve keys. Default false.
  * @return array The sorted array.
  */
-function wp_list_sort( $list, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
-	if ( ! is_array( $list ) ) {
+function wp_list_sort( $input_list, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
+	if ( ! is_array( $input_list ) ) {
 		return array();
 	}
 
-	$util = new WP_List_Util( $list );
+	$util = new WP_List_Util( $input_list );
 
 	return $util->sort( $orderby, $order, $preserve_keys );
 }
@@ -5333,9 +5413,8 @@ function absint( $maybeint ) {
 /**
  * Marks a function as deprecated and inform when it has been used.
  *
- * There is a hook {@see 'deprecated_function_run'} that will be called that can be used
- * to get the backtrace up to what file and function called the deprecated
- * function.
+ * There is a {@see 'deprecated_function_run'} hook that will be called that can be used
+ * to get the backtrace up to what file and function called the deprecated function.
  *
  * The current behavior is to trigger a user error if `WP_DEBUG` is true.
  *
@@ -5345,22 +5424,22 @@ function absint( $maybeint ) {
  * @since 5.4.0 This function is no longer marked as "private".
  * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
  *
- * @param string $function    The function that was called.
- * @param string $version     The version of WordPress that deprecated the function.
- * @param string $replacement Optional. The function that should have been called. Default empty.
+ * @param string $function_name The function that was called.
+ * @param string $version       The version of WordPress that deprecated the function.
+ * @param string $replacement   Optional. The function that should have been called. Default empty string.
  */
-function _deprecated_function( $function, $version, $replacement = '' ) {
+function _deprecated_function( $function_name, $version, $replacement = '' ) {
 
 	/**
 	 * Fires when a deprecated function is called.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param string $function    The function that was called.
-	 * @param string $replacement The function that should have been called.
-	 * @param string $version     The version of WordPress that deprecated the function.
+	 * @param string $function_name The function that was called.
+	 * @param string $replacement   The function that should have been called.
+	 * @param string $version       The version of WordPress that deprecated the function.
 	 */
-	do_action( 'deprecated_function_run', $function, $replacement, $version );
+	do_action( 'deprecated_function_run', $function_name, $replacement, $version );
 
 	/**
 	 * Filters whether to trigger an error for deprecated functions.
@@ -5376,7 +5455,7 @@ function _deprecated_function( $function, $version, $replacement = '' ) {
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number, 3: Alternative function name. */
 						__( 'Function %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
-						$function,
+						$function_name,
 						$version,
 						$replacement
 					),
@@ -5387,7 +5466,7 @@ function _deprecated_function( $function, $version, $replacement = '' ) {
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number. */
 						__( 'Function %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
-						$function,
+						$function_name,
 						$version
 					),
 					E_USER_DEPRECATED
@@ -5398,7 +5477,7 @@ function _deprecated_function( $function, $version, $replacement = '' ) {
 				trigger_error(
 					sprintf(
 						'Function %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
-						$function,
+						$function_name,
 						$version,
 						$replacement
 					),
@@ -5408,7 +5487,7 @@ function _deprecated_function( $function, $version, $replacement = '' ) {
 				trigger_error(
 					sprintf(
 						'Function %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.',
-						$function,
+						$function_name,
 						$version
 					),
 					E_USER_DEPRECATED
@@ -5422,23 +5501,23 @@ function _deprecated_function( $function, $version, $replacement = '' ) {
  * Marks a constructor as deprecated and informs when it has been used.
  *
  * Similar to _deprecated_function(), but with different strings. Used to
- * remove PHP4 style constructors.
+ * remove PHP4-style constructors.
  *
  * The current behavior is to trigger a user error if `WP_DEBUG` is true.
  *
- * This function is to be used in every PHP4 style constructor method that is deprecated.
+ * This function is to be used in every PHP4-style constructor method that is deprecated.
  *
  * @since 4.3.0
  * @since 4.5.0 Added the `$parent_class` parameter.
  * @since 5.4.0 This function is no longer marked as "private".
  * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
  *
- * @param string $class        The class containing the deprecated constructor.
+ * @param string $class_name   The class containing the deprecated constructor.
  * @param string $version      The version of WordPress that deprecated the function.
  * @param string $parent_class Optional. The parent class calling the deprecated constructor.
  *                             Default empty string.
  */
-function _deprecated_constructor( $class, $version, $parent_class = '' ) {
+function _deprecated_constructor( $class_name, $version, $parent_class = '' ) {
 
 	/**
 	 * Fires when a deprecated constructor is called.
@@ -5446,11 +5525,11 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 	 * @since 4.3.0
 	 * @since 4.5.0 Added the `$parent_class` parameter.
 	 *
-	 * @param string $class        The class containing the deprecated constructor.
+	 * @param string $class_name   The class containing the deprecated constructor.
 	 * @param string $version      The version of WordPress that deprecated the function.
 	 * @param string $parent_class The parent class calling the deprecated constructor.
 	 */
-	do_action( 'deprecated_constructor_run', $class, $version, $parent_class );
+	do_action( 'deprecated_constructor_run', $class_name, $version, $parent_class );
 
 	/**
 	 * Filters whether to trigger an error for deprecated functions.
@@ -5468,7 +5547,7 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 					sprintf(
 						/* translators: 1: PHP class name, 2: PHP parent class name, 3: Version number, 4: __construct() method. */
 						__( 'The called constructor method for %1$s class in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
-						$class,
+						$class_name,
 						$parent_class,
 						$version,
 						'<code>__construct()</code>'
@@ -5480,7 +5559,7 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 					sprintf(
 						/* translators: 1: PHP class name, 2: Version number, 3: __construct() method. */
 						__( 'The called constructor method for %1$s class is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
-						$class,
+						$class_name,
 						$version,
 						'<code>__construct()</code>'
 					),
@@ -5492,7 +5571,7 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 				trigger_error(
 					sprintf(
 						'The called constructor method for %1$s class in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
-						$class,
+						$class_name,
 						$parent_class,
 						$version,
 						'<code>__construct()</code>'
@@ -5503,7 +5582,7 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 				trigger_error(
 					sprintf(
 						'The called constructor method for %1$s class is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
-						$class,
+						$class_name,
 						$version,
 						'<code>__construct()</code>'
 					),
@@ -5515,12 +5594,98 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 
 }
 
+/**
+ * Marks a class as deprecated and informs when it has been used.
+ *
+ * There is a {@see 'deprecated_class_run'} hook that will be called that can be used
+ * to get the backtrace up to what file and function called the deprecated class.
+ *
+ * The current behavior is to trigger a user error if `WP_DEBUG` is true.
+ *
+ * This function is to be used in the class constructor for every deprecated class.
+ * See {@see _deprecated_constructor()} for deprecating PHP4-style constructors.
+ *
+ * @since 6.4.0
+ *
+ * @param string $class       The class being instantiated.
+ * @param string $version     The version of WordPress that deprecated the class.
+ * @param string $replacement Optional. The class or function that should have been called.
+ *                            Default empty string.
+ */
+function _deprecated_class( $class, $version, $replacement = '' ) {
+
+	/**
+	 * Fires when a deprecated class is called.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $class       The class being instantiated.
+	 * @param string $replacement The class or function that should have been called.
+	 * @param string $version     The version of WordPress that deprecated the class.
+	 */
+	do_action( 'deprecated_class_run', $class, $replacement, $version );
+
+	/**
+	 * Filters whether to trigger an error for a deprecated class.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param bool $trigger Whether to trigger an error for a deprecated class. Default true.
+	 */
+	if ( WP_DEBUG && apply_filters( 'deprecated_class_trigger_error', true ) ) {
+		if ( function_exists( '__' ) ) {
+			if ( $replacement ) {
+				trigger_error(
+					sprintf(
+						/* translators: 1: PHP class name, 2: Version number, 3: Alternative class or function name. */
+						__( 'Class %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
+						$class,
+						$version,
+						$replacement
+					),
+					E_USER_DEPRECATED
+				);
+			} else {
+				trigger_error(
+					sprintf(
+						/* translators: 1: PHP class name, 2: Version number. */
+						__( 'Class %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
+						$class,
+						$version
+					),
+					E_USER_DEPRECATED
+				);
+			}
+		} else {
+			if ( $replacement ) {
+				trigger_error(
+					sprintf(
+						'Class %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+						$class,
+						$version,
+						$replacement
+					),
+					E_USER_DEPRECATED
+				);
+			} else {
+				trigger_error(
+					sprintf(
+						'Class %1$s is <strong>deprecated</strong> since version %2$s with no alternative available.',
+						$class,
+						$version
+					),
+					E_USER_DEPRECATED
+				);
+			}
+		}
+	}
+}
+
 /**
  * Marks a file as deprecated and inform when it has been used.
  *
- * There is a hook {@see 'deprecated_file_included'} that will be called that can be used
- * to get the backtrace up to what file and function included the deprecated
- * file.
+ * There is a {@see 'deprecated_file_included'} hook that will be called that can be used
+ * to get the backtrace up to what file and function included the deprecated file.
  *
  * The current behavior is to trigger a user error if `WP_DEBUG` is true.
  *
@@ -5533,8 +5698,8 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
  * @param string $file        The file that was included.
  * @param string $version     The version of WordPress that deprecated the file.
  * @param string $replacement Optional. The file that should have been included based on ABSPATH.
- *                            Default empty.
- * @param string $message     Optional. A message regarding the change. Default empty.
+ *                            Default empty string.
+ * @param string $message     Optional. A message regarding the change. Default empty string.
  */
 function _deprecated_file( $file, $version, $replacement = '', $message = '' ) {
 
@@ -5613,15 +5778,15 @@ function _deprecated_file( $file, $version, $replacement = '', $message = '' ) {
  * This function is to be used whenever a deprecated function argument is used.
  * Before this function is called, the argument must be checked for whether it was
  * used by comparing it to its default value or evaluating whether it is empty.
+ *
  * For example:
  *
  *     if ( ! empty( $deprecated ) ) {
  *         _deprecated_argument( __FUNCTION__, '3.0.0' );
  *     }
  *
- * There is a hook deprecated_argument_run that will be called that can be used
- * to get the backtrace up to what file and function used the deprecated
- * argument.
+ * There is a {@see 'deprecated_argument_run'} hook that will be called that can be used
+ * to get the backtrace up to what file and function used the deprecated argument.
  *
  * The current behavior is to trigger a user error if WP_DEBUG is true.
  *
@@ -5629,22 +5794,22 @@ function _deprecated_file( $file, $version, $replacement = '', $message = '' ) {
  * @since 5.4.0 This function is no longer marked as "private".
  * @since 5.4.0 The error type is now classified as E_USER_DEPRECATED (used to default to E_USER_NOTICE).
  *
- * @param string $function The function that was called.
- * @param string $version  The version of WordPress that deprecated the argument used.
- * @param string $message  Optional. A message regarding the change. Default empty.
+ * @param string $function_name The function that was called.
+ * @param string $version       The version of WordPress that deprecated the argument used.
+ * @param string $message       Optional. A message regarding the change. Default empty string.
  */
-function _deprecated_argument( $function, $version, $message = '' ) {
+function _deprecated_argument( $function_name, $version, $message = '' ) {
 
 	/**
 	 * Fires when a deprecated argument is called.
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param string $function The function that was called.
-	 * @param string $message  A message regarding the change.
-	 * @param string $version  The version of WordPress that deprecated the argument used.
+	 * @param string $function_name The function that was called.
+	 * @param string $message       A message regarding the change.
+	 * @param string $version       The version of WordPress that deprecated the argument used.
 	 */
-	do_action( 'deprecated_argument_run', $function, $message, $version );
+	do_action( 'deprecated_argument_run', $function_name, $message, $version );
 
 	/**
 	 * Filters whether to trigger an error for deprecated arguments.
@@ -5660,7 +5825,7 @@ function _deprecated_argument( $function, $version, $message = '' ) {
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number, 3: Optional message regarding the change. */
 						__( 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s' ),
-						$function,
+						$function_name,
 						$version,
 						$message
 					),
@@ -5671,7 +5836,7 @@ function _deprecated_argument( $function, $version, $message = '' ) {
 					sprintf(
 						/* translators: 1: PHP function name, 2: Version number. */
 						__( 'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ),
-						$function,
+						$function_name,
 						$version
 					),
 					E_USER_DEPRECATED
@@ -5682,7 +5847,7 @@ function _deprecated_argument( $function, $version, $message = '' ) {
 				trigger_error(
 					sprintf(
 						'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s',
-						$function,
+						$function_name,
 						$version,
 						$message
 					),
@@ -5692,7 +5857,7 @@ function _deprecated_argument( $function, $version, $message = '' ) {
 				trigger_error(
 					sprintf(
 						'Function %1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.',
-						$function,
+						$function_name,
 						$version
 					),
 					E_USER_DEPRECATED
@@ -5719,7 +5884,7 @@ function _deprecated_argument( $function, $version, $message = '' ) {
  *
  * @param string $hook        The hook that was used.
  * @param string $version     The version of WordPress that deprecated the hook.
- * @param string $replacement Optional. The hook that should have been used. Default empty.
+ * @param string $replacement Optional. The hook that should have been used. Default empty string.
  * @param string $message     Optional. A message regarding the change. Default empty.
  */
 function _deprecated_hook( $hook, $version, $replacement = '', $message = '' ) {
@@ -5774,44 +5939,43 @@ function _deprecated_hook( $hook, $version, $replacement = '', $message = '' ) {
 /**
  * Marks something as being incorrectly called.
  *
- * There is a hook {@see 'doing_it_wrong_run'} that will be called that can be used
- * to get the backtrace up to what file and function called the deprecated
- * function.
+ * There is a {@see 'doing_it_wrong_run'} hook that will be called that can be used
+ * to get the backtrace up to what file and function called the deprecated function.
  *
  * The current behavior is to trigger a user error if `WP_DEBUG` is true.
  *
  * @since 3.1.0
  * @since 5.4.0 This function is no longer marked as "private".
  *
- * @param string $function The function that was called.
- * @param string $message  A message explaining what has been done incorrectly.
- * @param string $version  The version of WordPress where the message was added.
+ * @param string $function_name The function that was called.
+ * @param string $message       A message explaining what has been done incorrectly.
+ * @param string $version       The version of WordPress where the message was added.
  */
-function _doing_it_wrong( $function, $message, $version ) {
+function _doing_it_wrong( $function_name, $message, $version ) {
 
 	/**
 	 * Fires when the given function is being used incorrectly.
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param string $function The function that was called.
-	 * @param string $message  A message explaining what has been done incorrectly.
-	 * @param string $version  The version of WordPress where the message was added.
+	 * @param string $function_name The function that was called.
+	 * @param string $message       A message explaining what has been done incorrectly.
+	 * @param string $version       The version of WordPress where the message was added.
 	 */
-	do_action( 'doing_it_wrong_run', $function, $message, $version );
+	do_action( 'doing_it_wrong_run', $function_name, $message, $version );
 
 	/**
 	 * Filters whether to trigger an error for _doing_it_wrong() calls.
 	 *
 	 * @since 3.1.0
-	 * @since 5.1.0 Added the $function, $message and $version parameters.
+	 * @since 5.1.0 Added the $function_name, $message and $version parameters.
 	 *
-	 * @param bool   $trigger  Whether to trigger the error for _doing_it_wrong() calls. Default true.
-	 * @param string $function The function that was called.
-	 * @param string $message  A message explaining what has been done incorrectly.
-	 * @param string $version  The version of WordPress where the message was added.
+	 * @param bool   $trigger       Whether to trigger the error for _doing_it_wrong() calls. Default true.
+	 * @param string $function_name The function that was called.
+	 * @param string $message       A message explaining what has been done incorrectly.
+	 * @param string $version       The version of WordPress where the message was added.
 	 */
-	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true, $function, $message, $version ) ) {
+	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true, $function_name, $message, $version ) ) {
 		if ( function_exists( '__' ) ) {
 			if ( $version ) {
 				/* translators: %s: Version number. */
@@ -5821,14 +5985,14 @@ function _doing_it_wrong( $function, $message, $version ) {
 			$message .= ' ' . sprintf(
 				/* translators: %s: Documentation URL. */
 				__( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
-				__( 'https://wordpress.org/support/article/debugging-in-wordpress/' )
+				__( 'https://wordpress.org/documentation/article/debugging-in-wordpress/' )
 			);
 
 			trigger_error(
 				sprintf(
 					/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: WordPress version number. */
 					__( 'Function %1$s was called <strong>incorrectly</strong>. %2$s %3$s' ),
-					$function,
+					$function_name,
 					$message,
 					$version
 				),
@@ -5841,13 +6005,13 @@ function _doing_it_wrong( $function, $message, $version ) {
 
 			$message .= sprintf(
 				' Please see <a href="%s">Debugging in WordPress</a> for more information.',
-				'https://wordpress.org/support/article/debugging-in-wordpress/'
+				'https://wordpress.org/documentation/article/debugging-in-wordpress/'
 			);
 
 			trigger_error(
 				sprintf(
 					'Function %1$s was called <strong>incorrectly</strong>. %2$s %3$s',
-					$function,
+					$function_name,
 					$message,
 					$version
 				),
@@ -5868,7 +6032,7 @@ function is_lighttpd_before_150() {
 	$server_parts    = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
 	$server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
 
-	return ( 'lighttpd' === $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' ) );
+	return ( 'lighttpd' === $server_parts[0] && -1 === version_compare( $server_parts[1], '1.5.0' ) );
 }
 
 /**
@@ -5878,11 +6042,11 @@ function is_lighttpd_before_150() {
  *
  * @global bool $is_apache
  *
- * @param string $mod     The module, e.g. mod_rewrite.
- * @param bool   $default Optional. The default return value if the module is not found. Default false.
+ * @param string $mod           The module, e.g. mod_rewrite.
+ * @param bool   $default_value Optional. The default return value if the module is not found. Default false.
  * @return bool Whether the specified module is loaded.
  */
-function apache_mod_loaded( $mod, $default = false ) {
+function apache_mod_loaded( $mod, $default_value = false ) {
 	global $is_apache;
 
 	if ( ! $is_apache ) {
@@ -5901,18 +6065,18 @@ function apache_mod_loaded( $mod, $default = false ) {
 
 	if ( empty( $loaded_mods )
 		&& function_exists( 'phpinfo' )
-		&& false === strpos( ini_get( 'disable_functions' ), 'phpinfo' )
+		&& ! str_contains( ini_get( 'disable_functions' ), 'phpinfo' )
 	) {
 		ob_start();
 		phpinfo( INFO_MODULES );
 		$phpinfo = ob_get_clean();
 
-		if ( false !== strpos( $phpinfo, $mod ) ) {
+		if ( str_contains( $phpinfo, $mod ) ) {
 			return true;
 		}
 	}
 
-	return $default;
+	return $default_value;
 }
 
 /**
@@ -5963,7 +6127,7 @@ function iis7_supports_permalinks() {
  * @since 1.2.0
  *
  * @param string   $file          File path.
- * @param string[] $allowed_files Optional. Array of allowed files.
+ * @param string[] $allowed_files Optional. Array of allowed files. Default empty array.
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = array() ) {
@@ -5982,7 +6146,7 @@ function validate_file( $file, $allowed_files = array() ) {
 	}
 
 	// `../` which does not occur at the end of the path is not allowed:
-	if ( false !== strpos( $file, '../' ) && '../' !== mb_substr( $file, -3, 3 ) ) {
+	if ( str_contains( $file, '../' ) && '../' !== mb_substr( $file, -3, 3 ) ) {
 		return 1;
 	}
 
@@ -6037,7 +6201,7 @@ function wp_guess_url() {
 		$script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
 
 		// The request is for the admin.
-		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
+		if ( str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) || str_contains( $_SERVER['REQUEST_URI'], 'wp-login.php' ) ) {
 			$path = preg_replace( '#/(wp-admin/?.*|wp-login\.php.*)#i', '', $_SERVER['REQUEST_URI'] );
 
 			// The request is for a file in ABSPATH.
@@ -6046,12 +6210,12 @@ function wp_guess_url() {
 			$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
 
 		} else {
-			if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
+			if ( str_contains( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
 				// Request is hitting a file inside ABSPATH.
 				$directory = str_replace( ABSPATH, '', $script_filename_dir );
 				// Strip off the subdirectory, and any file/query params.
 				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '', $_SERVER['REQUEST_URI'] );
-			} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
+			} elseif ( str_contains( $abspath_fix, $script_filename_dir ) ) {
 				// Request is hitting a file above ABSPATH.
 				$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
 				// Strip off any file/query params from the path, appending the subdirectory to the installation.
@@ -6081,7 +6245,8 @@ function wp_guess_url() {
  * @since 3.3.0
  *
  * @param bool $suspend Optional. Suspends additions if true, re-enables them if false.
- * @return bool The current suspend setting
+ *                      Defaults to not changing the current setting.
+ * @return bool The current suspend setting.
  */
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
@@ -6276,6 +6441,7 @@ function wp_timezone_override_offset() {
 	if ( false === $timezone_object || false === $datetime_object ) {
 		return false;
 	}
+
 	return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
 }
 
@@ -6293,36 +6459,45 @@ function _wp_timezone_choice_usort_callback( $a, $b ) {
 	// Don't use translated versions of Etc.
 	if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {
 		// Make the order of these more like the old dropdown.
-		if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {
+		if ( str_starts_with( $a['city'], 'GMT+' ) && str_starts_with( $b['city'], 'GMT+' ) ) {
 			return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
 		}
+
 		if ( 'UTC' === $a['city'] ) {
-			if ( 'GMT+' === substr( $b['city'], 0, 4 ) ) {
+			if ( str_starts_with( $b['city'], 'GMT+' ) ) {
 				return 1;
 			}
+
 			return -1;
 		}
+
 		if ( 'UTC' === $b['city'] ) {
-			if ( 'GMT+' === substr( $a['city'], 0, 4 ) ) {
+			if ( str_starts_with( $a['city'], 'GMT+' ) ) {
 				return -1;
 			}
+
 			return 1;
 		}
+
 		return strnatcasecmp( $a['city'], $b['city'] );
 	}
-	if ( $a['t_continent'] == $b['t_continent'] ) {
-		if ( $a['t_city'] == $b['t_city'] ) {
+
+	if ( $a['t_continent'] === $b['t_continent'] ) {
+		if ( $a['t_city'] === $b['t_city'] ) {
 			return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
 		}
+
 		return strnatcasecmp( $a['t_city'], $b['t_city'] );
 	} else {
 		// Force Etc to the bottom of the list.
 		if ( 'Etc' === $a['continent'] ) {
 			return 1;
 		}
+
 		if ( 'Etc' === $b['continent'] ) {
 			return -1;
 		}
+
 		return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
 	}
 }
@@ -6347,7 +6522,7 @@ function wp_timezone_choice( $selected_zone, $locale = null ) {
 		$locale_loaded = $locale ? $locale : get_locale();
 		$mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
 		unload_textdomain( 'continents-cities' );
-		load_textdomain( 'continents-cities', $mofile );
+		load_textdomain( 'continents-cities', $mofile, $locale_loaded );
 		$mo_loaded = true;
 	}
 
@@ -6612,7 +6787,7 @@ function wp_scheduled_delete() {
  * @param string $file            Absolute path to the file.
  * @param array  $default_headers List of headers, in the format `array( 'HeaderKey' => 'Header Name' )`.
  * @param string $context         Optional. If specified adds filter hook {@see 'extra_$context_headers'}.
- *                                Default empty.
+ *                                Default empty string.
  * @return string[] Array of file header values keyed by header name.
  */
 function get_file_data( $file, $default_headers, $context = '' ) {
@@ -6786,8 +6961,8 @@ function _wp_mysql_week( $column ) {
  * @param callable $callback      Function that accepts ( ID, $callback_args ) and outputs parent_ID.
  * @param int      $start         The ID to start the loop check at.
  * @param int      $start_parent  The parent_ID of $start to use instead of calling $callback( $start ).
- *                                Use null to always use $callback
- * @param array    $callback_args Optional. Additional arguments to send to $callback.
+ *                                Use null to always use $callback.
+ * @param array    $callback_args Optional. Additional arguments to send to $callback. Default empty array.
  * @return array IDs of all members of loop.
  */
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
@@ -6827,8 +7002,7 @@ function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = ar
 	$evanescent_hare = $start;
 	$return          = array();
 
-	// Set evanescent_hare to one past hare.
-	// Increment hare two steps.
+	// Set evanescent_hare to one past hare. Increment hare two steps.
 	while (
 		$tortoise
 	&&
@@ -6843,7 +7017,7 @@ function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = ar
 		}
 
 		// Tortoise got lapped - must be a loop.
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+		if ( $tortoise === $evanescent_hare || $tortoise === $hare ) {
 			return $_return_loop ? $return : $tortoise;
 		}
 
@@ -6940,7 +7114,7 @@ function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pr
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] ) {
+			if ( $check_class && $ignore_class === $call['class'] ) {
 				continue; // Filter out calls.
 			}
 
@@ -6969,13 +7143,20 @@ function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pr
  * @since 3.4.0
  * @since 6.1.0 This function is no longer marked as "private".
  *
- * @param int[]  $object_ids Array of IDs.
- * @param string $cache_key  The cache bucket to check against.
+ * @param int[]  $object_ids  Array of IDs.
+ * @param string $cache_group The cache group to check against.
  * @return int[] Array of IDs not present in the cache.
  */
-function _get_non_cached_ids( $object_ids, $cache_key ) {
+function _get_non_cached_ids( $object_ids, $cache_group ) {
+	$object_ids = array_filter( $object_ids, '_validate_cache_id' );
+	$object_ids = array_unique( array_map( 'intval', $object_ids ), SORT_NUMERIC );
+
+	if ( empty( $object_ids ) ) {
+		return array();
+	}
+
 	$non_cached_ids = array();
-	$cache_values   = wp_cache_get_multiple( $object_ids, $cache_key );
+	$cache_values   = wp_cache_get_multiple( $object_ids, $cache_group );
 
 	foreach ( $cache_values as $id => $value ) {
 		if ( ! $value ) {
@@ -6986,6 +7167,34 @@ function _get_non_cached_ids( $object_ids, $cache_key ) {
 	return $non_cached_ids;
 }
 
+/**
+ * Checks whether the given cache ID is either an integer or an integer-like string.
+ *
+ * Both `16` and `"16"` are considered valid, other numeric types and numeric strings
+ * (`16.3` and `"16.3"`) are considered invalid.
+ *
+ * @since 6.3.0
+ *
+ * @param mixed $object_id The cache ID to validate.
+ * @return bool Whether the given $object_id is a valid cache ID.
+ */
+function _validate_cache_id( $object_id ) {
+	/*
+	 * filter_var() could be used here, but the `filter` PHP extension
+	 * is considered optional and may not be available.
+	 */
+	if ( is_int( $object_id )
+		|| ( is_string( $object_id ) && (string) (int) $object_id === $object_id ) ) {
+		return true;
+	}
+
+	/* translators: %s: The type of the given object ID. */
+	$message = sprintf( __( 'Object ID must be an integer, %s given.' ), gettype( $object_id ) );
+	_doing_it_wrong( '_get_non_cached_ids', $message, '6.3.0' );
+
+	return false;
+}
+
 /**
  * Tests if the current device has the capability to upload files.
  *
@@ -7001,9 +7210,9 @@ function _device_can_upload() {
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
-	if ( strpos( $ua, 'iPhone' ) !== false
-		|| strpos( $ua, 'iPad' ) !== false
-		|| strpos( $ua, 'iPod' ) !== false ) {
+	if ( str_contains( $ua, 'iPhone' )
+		|| str_contains( $ua, 'iPad' )
+		|| str_contains( $ua, 'iPod' ) ) {
 			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
 	}
 
@@ -7108,7 +7317,7 @@ function wp_auth_check_load() {
 function wp_auth_check_html() {
 	$login_url      = wp_login_url();
 	$current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-	$same_domain    = ( strpos( $login_url, $current_domain ) === 0 );
+	$same_domain    = str_starts_with( $login_url, $current_domain );
 
 	/**
 	 * Filters whether the authentication check originated at the same domain.
@@ -7124,7 +7333,12 @@ function wp_auth_check_html() {
 	<div id="wp-auth-check-wrap" class="<?php echo $wrap_class; ?>">
 	<div id="wp-auth-check-bg"></div>
 	<div id="wp-auth-check">
-	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></button>
+	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text">
+		<?php
+		/* translators: Hidden accessibility text. */
+		_e( 'Close dialog' );
+		?>
+	</span></button>
 	<?php
 
 	if ( $same_domain ) {
@@ -7285,23 +7499,23 @@ function reset_mbstring_encoding() {
 /**
  * Filters/validates a variable as a boolean.
  *
- * Alternative to `filter_var( $var, FILTER_VALIDATE_BOOLEAN )`.
+ * Alternative to `filter_var( $value, FILTER_VALIDATE_BOOLEAN )`.
  *
  * @since 4.0.0
  *
- * @param mixed $var Boolean value to validate.
+ * @param mixed $value Boolean value to validate.
  * @return bool Whether the value is validated.
  */
-function wp_validate_boolean( $var ) {
-	if ( is_bool( $var ) ) {
-		return $var;
+function wp_validate_boolean( $value ) {
+	if ( is_bool( $value ) ) {
+		return $value;
 	}
 
-	if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
+	if ( is_string( $value ) && 'false' === strtolower( $value ) ) {
 		return false;
 	}
 
-	return (bool) $var;
+	return (bool) $value;
 }
 
 /**
@@ -7351,7 +7565,7 @@ function wp_delete_file_from_directory( $file, $directory ) {
 		$real_directory = wp_normalize_path( $real_directory );
 	}
 
-	if ( false === $real_file || false === $real_directory || strpos( $real_file, trailingslashit( $real_directory ) ) !== 0 ) {
+	if ( false === $real_file || false === $real_directory || ! str_starts_with( $real_file, trailingslashit( $real_directory ) ) ) {
 		return false;
 	}
 
@@ -7422,7 +7636,7 @@ function mysql_to_rfc3339( $date_string ) {
  * @since 4.6.0
  *
  * @param string $context Optional. Context in which the function is called. Accepts either 'admin',
- *                        'image', or an arbitrary other context. If an arbitrary context is passed,
+ *                        'image', 'cron', or an arbitrary other context. If an arbitrary context is passed,
  *                        the similarly arbitrary {@see '$context_memory_limit'} filter will be
  *                        invoked. Default 'admin'.
  * @return int|string|false The limit that was set or false on failure.
@@ -7474,7 +7688,7 @@ function wp_raise_memory_limit( $context = 'admin' ) {
 			 * @since 3.5.0
 			 * @since 4.6.0 The default now takes the original `memory_limit` into account.
 			 *
-			 * @param int|string $filtered_limit Maximum memory limit to allocate for images.
+			 * @param int|string $filtered_limit Maximum memory limit to allocate for image processing.
 			 *                                   Default `WP_MAX_MEMORY_LIMIT` or the original
 			 *                                   php.ini `memory_limit`, whichever is higher.
 			 *                                   Accepts an integer (bytes), or a shorthand string
@@ -7483,9 +7697,24 @@ function wp_raise_memory_limit( $context = 'admin' ) {
 			$filtered_limit = apply_filters( 'image_memory_limit', $filtered_limit );
 			break;
 
+		case 'cron':
+			/**
+			 * Filters the memory limit allocated for WP-Cron event processing.
+			 *
+			 * @since 6.3.0
+			 *
+			 * @param int|string $filtered_limit Maximum memory limit to allocate for WP-Cron.
+			 *                                   Default `WP_MAX_MEMORY_LIMIT` or the original
+			 *                                   php.ini `memory_limit`, whichever is higher.
+			 *                                   Accepts an integer (bytes), or a shorthand string
+			 *                                   notation, such as '256M'.
+			 */
+			$filtered_limit = apply_filters( 'cron_memory_limit', $filtered_limit );
+			break;
+
 		default:
 			/**
-			 * Filters the memory limit allocated for arbitrary contexts.
+			 * Filters the memory limit allocated for an arbitrary context.
 			 *
 			 * The dynamic portion of the hook name, `$context`, refers to an arbitrary
 			 * context passed on calling the function. This allows for plugins to define
@@ -7493,8 +7722,8 @@ function wp_raise_memory_limit( $context = 'admin' ) {
 			 *
 			 * @since 4.6.0
 			 *
-			 * @param int|string $filtered_limit Maximum memory limit to allocate for images.
-			 *                                   Default '256M' or the original php.ini `memory_limit`,
+			 * @param int|string $filtered_limit Maximum memory limit to allocate for this context.
+			 *                                   Default WP_MAX_MEMORY_LIMIT` or the original php.ini `memory_limit`,
 			 *                                   whichever is higher. Accepts an integer (bytes), or a
 			 *                                   shorthand string notation, such as '256M'.
 			 */
@@ -7600,12 +7829,42 @@ function wp_unique_id( $prefix = '' ) {
 function wp_cache_get_last_changed( $group ) {
 	$last_changed = wp_cache_get( 'last_changed', $group );
 
-	if ( ! $last_changed ) {
-		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, $group );
+	if ( $last_changed ) {
+		return $last_changed;
 	}
 
-	return $last_changed;
+	return wp_cache_set_last_changed( $group );
+}
+
+/**
+ * Sets last changed date for the specified cache group to now.
+ *
+ * @since 6.3.0
+ *
+ * @param string $group Where the cache contents are grouped.
+ * @return string UNIX timestamp when the group was last changed.
+ */
+function wp_cache_set_last_changed( $group ) {
+	$previous_time = wp_cache_get( 'last_changed', $group );
+
+	$time = microtime();
+
+	wp_cache_set( 'last_changed', $time, $group );
+
+	/**
+	 * Fires after a cache group `last_changed` time is updated.
+	 * This may occur multiple times per page load and registered
+	 * actions must be performant.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string    $group         The cache group name.
+	 * @param int       $time          The new last changed time.
+	 * @param int|false $previous_time The previous last changed time. False if not previously set.
+	 */
+	do_action( 'wp_cache_set_last_changed', $group, $time, $previous_time );
+
+	return $time;
 }
 
 /**
@@ -7785,7 +8044,7 @@ function wp_privacy_anonymize_ip( $ip_addr, $ipv6_fallback = false ) {
  * @since 4.9.6
  *
  * @param string $type The type of data to be anonymized.
- * @param string $data Optional The data to be anonymized.
+ * @param string $data Optional. The data to be anonymized. Default empty string.
  * @return string The anonymous data for the requested type.
  */
 function wp_privacy_anonymize_data( $type, $data = '' ) {
@@ -8084,10 +8343,10 @@ function wp_direct_php_update_button() {
 
 	echo '<p class="button-container">';
 	printf(
-		'<a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+		'<a class="button button-primary" href="%1$s" target="_blank" rel="noopener">%2$s<span class="screen-reader-text"> %3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 		esc_url( $direct_update_url ),
 		__( 'Update PHP' ),
-		/* translators: Accessibility text. */
+		/* translators: Hidden accessibility text. */
 		__( '(opens in a new tab)' )
 	);
 	echo '</p>';
@@ -8145,7 +8404,7 @@ function wp_get_update_https_url() {
  */
 function wp_get_default_update_https_url() {
 	/* translators: Documentation explaining HTTPS and why it should be used. */
-	return __( 'https://wordpress.org/support/article/why-should-i-use-https/' );
+	return __( 'https://wordpress.org/documentation/article/why-should-i-use-https/' );
 }
 
 /**
@@ -8194,8 +8453,10 @@ function wp_get_direct_update_https_url() {
  */
 function get_dirsize( $directory, $max_execution_time = null ) {
 
-	// Exclude individual site directories from the total when checking the main site of a network,
-	// as they are subdirectories and should not be counted.
+	/*
+	 * Exclude individual site directories from the total when checking the main site of a network,
+	 * as they are subdirectories and should not be counted.
+	 */
 	if ( is_multisite() && is_main_site() ) {
 		$size = recurse_dirsize( $directory, $directory . '/sites', $max_execution_time );
 	} else {
@@ -8218,10 +8479,13 @@ function get_dirsize( $directory, $max_execution_time = null ) {
  * @param string          $directory          Full path of a directory.
  * @param string|string[] $exclude            Optional. Full path of a subdirectory to exclude from the total,
  *                                            or array of paths. Expected without trailing slash(es).
+ *                                            Default null.
  * @param int             $max_execution_time Optional. Maximum time to run before giving up. In seconds.
  *                                            The timeout is global and is measured from the moment
- *                                            WordPress started to load.
+ *                                            WordPress started to load. Defaults to the value of
+ *                                            `max_execution_time` PHP setting.
  * @param array           $directory_cache    Optional. Array of cached directory paths.
+ *                                            Defaults to the value of `dirsize_cache` transient.
  * @return int|false|null Size in bytes if a valid directory. False if not. Null if timeout.
  */
 function recurse_dirsize( $directory, $exclude = null, $max_execution_time = null, &$directory_cache = null ) {
@@ -8354,8 +8618,8 @@ function clean_dirsize_cache( $path ) {
 	}
 
 	if (
-		strpos( $path, '/' ) === false &&
-		strpos( $path, '\\' ) === false
+		! str_contains( $path, '/' ) &&
+		! str_contains( $path, '\\' )
 	) {
 		unset( $directory_cache[ $path ] );
 		set_transient( 'dirsize_cache', $directory_cache );
@@ -8420,27 +8684,9 @@ function is_php_version_compatible( $required ) {
  *
  * @param int|float $expected  The expected value.
  * @param int|float $actual    The actual number.
- * @param int|float $precision The allowed variation.
+ * @param int|float $precision Optional. The allowed variation. Default 1.
  * @return bool Whether the numbers match within the specified precision.
  */
 function wp_fuzzy_number_match( $expected, $actual, $precision = 1 ) {
 	return abs( (float) $expected - (float) $actual ) <= $precision;
 }
-
-/**
- * Sorts the keys of an array alphabetically.
- * The array is passed by reference so it doesn't get returned
- * which mimics the behavior of ksort.
- *
- * @since 6.0.0
- *
- * @param array $array The array to sort, passed by reference.
- */
-function wp_recursive_ksort( &$array ) {
-	foreach ( $array as &$value ) {
-		if ( is_array( $value ) ) {
-			wp_recursive_ksort( $value );
-		}
-	}
-	ksort( $array );
-}
diff --git a/src/wp-includes/functions.wp-scripts.php b/src/wp-includes/functions.wp-scripts.php
index 4b2dff1c443a1..269e875e80b41 100644
--- a/src/wp-includes/functions.wp-scripts.php
+++ b/src/wp-includes/functions.wp-scripts.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * Initialize $wp_scripts if it has not been set.
+ * Initializes $wp_scripts if it has not been set.
  *
  * @global WP_Scripts $wp_scripts
  *
@@ -34,11 +34,11 @@ function wp_scripts() {
  * @since 4.2.0
  * @since 5.5.0 Added the `$handle` parameter.
  *
- * @param string $function Function name.
- * @param string $handle   Optional. Name of the script or stylesheet that was
- *                         registered or enqueued too early. Default empty.
+ * @param string $function_name Function name.
+ * @param string $handle        Optional. Name of the script or stylesheet that was
+ *                              registered or enqueued too early. Default empty.
  */
-function _wp_scripts_maybe_doing_it_wrong( $function, $handle = '' ) {
+function _wp_scripts_maybe_doing_it_wrong( $function_name, $handle = '' ) {
 	if ( did_action( 'init' ) || did_action( 'wp_enqueue_scripts' )
 		|| did_action( 'admin_enqueue_scripts' ) || did_action( 'login_enqueue_scripts' )
 	) {
@@ -62,7 +62,7 @@ function _wp_scripts_maybe_doing_it_wrong( $function, $handle = '' ) {
 	}
 
 	_doing_it_wrong(
-		$function,
+		$function_name,
 		$message,
 		'3.3.0'
 	);
@@ -73,7 +73,7 @@ function _wp_scripts_maybe_doing_it_wrong( $function, $handle = '' ) {
  *
  * Called by admin-header.php and {@see 'wp_head'} hook. Since it is called by wp_head on every page load,
  * the function does not instantiate the WP_Scripts object unless script names are explicitly passed.
- * Makes use of already-instantiated $wp_scripts global if present. Use provided {@see 'wp_print_scripts'}
+ * Makes use of already-instantiated `$wp_scripts` global if present. Use provided {@see 'wp_print_scripts'}
  * hook to register/enqueue new scripts.
  *
  * @see WP_Scripts::do_item()
@@ -81,7 +81,7 @@ function _wp_scripts_maybe_doing_it_wrong( $function, $handle = '' ) {
  *
  * @since 2.1.0
  *
- * @param string|bool|array $handles Optional. Scripts to be printed. Default 'false'.
+ * @param string|string[]|false $handles Optional. Scripts to be printed. Default 'false'.
  * @return string[] On success, an array of handles of processed WP_Dependencies items; otherwise, an empty array.
  */
 function wp_print_scripts( $handles = false ) {
@@ -113,8 +113,8 @@ function wp_print_scripts( $handles = false ) {
  * Adds extra code to a registered script.
  *
  * Code will only be added if the script is already in the queue.
- * Accepts a string $data containing the Code. If two or more code blocks
- * are added to the same script $handle, they will be printed in the order
+ * Accepts a string `$data` containing the code. If two or more code blocks
+ * are added to the same script `$handle`, they will be printed in the order
  * they were added, i.e. the latter added code can redeclare the previous.
  *
  * @since 4.5.0
@@ -148,7 +148,7 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
 }
 
 /**
- * Register a new script.
+ * Registers a new script.
  *
  * Registers a script to be enqueued later using the wp_enqueue_script() function.
  *
@@ -157,6 +157,7 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
  *
  * @since 2.1.0
  * @since 4.3.0 A return value was added.
+ * @since 6.3.0 The $in_footer parameter of type boolean was overloaded to be an $args parameter of type array.
  *
  * @param string           $handle    Name of the script. Should be unique.
  * @param string|false     $src       Full URL of the script, or path of the script relative to the WordPress root directory.
@@ -166,31 +167,43 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
  *                                    as a query string for cache busting purposes. If version is set to false, a version
  *                                    number is automatically added equal to current installed WordPress version.
  *                                    If set to null, no version is added.
- * @param bool             $in_footer Optional. Whether to enqueue the script before `</body>` instead of in the `<head>`.
- *                                    Default 'false'.
+ * @param array|bool       $args     {
+ *      Optional. An array of additional script loading strategies. Default empty array.
+ *      Otherwise, it may be a boolean in which case it determines whether the script is printed in the footer. Default false.
+ *
+ *      @type string    $strategy     Optional. If provided, may be either 'defer' or 'async'.
+ *      @type bool      $in_footer    Optional. Whether to print the script in the footer. Default 'false'.
+ * }
  * @return bool Whether the script has been registered. True on success, false on failure.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_register_script( $handle, $src, $deps = array(), $ver = false, $args = array() ) {
+	if ( ! is_array( $args ) ) {
+		$args = array(
+			'in_footer' => (bool) $args,
+		);
+	}
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
 
 	$wp_scripts = wp_scripts();
 
 	$registered = $wp_scripts->add( $handle, $src, $deps, $ver );
-	if ( $in_footer ) {
+	if ( ! empty( $args['in_footer'] ) ) {
 		$wp_scripts->add_data( $handle, 'group', 1 );
 	}
-
+	if ( ! empty( $args['strategy'] ) ) {
+		$wp_scripts->add_data( $handle, 'strategy', $args['strategy'] );
+	}
 	return $registered;
 }
 
 /**
- * Localize a script.
+ * Localizes a script.
  *
  * Works only if the script has already been registered.
  *
- * Accepts an associative array $l10n and creates a JavaScript object:
+ * Accepts an associative array `$l10n` and creates a JavaScript object:
  *
- *     "$object_name" = {
+ *     "$object_name": {
  *         key: value,
  *         key: value,
  *         ...
@@ -249,7 +262,7 @@ function wp_set_script_translations( $handle, $domain = 'default', $path = '' )
 }
 
 /**
- * Remove a registered script.
+ * Removes a registered script.
  *
  * Note: there are intentional safeguards in place to prevent critical admin scripts,
  * such as jQuery core, from being unregistered.
@@ -322,15 +335,16 @@ function wp_deregister_script( $handle ) {
 }
 
 /**
- * Enqueue a script.
+ * Enqueues a script.
  *
- * Registers the script if $src provided (does NOT overwrite), and enqueues it.
+ * Registers the script if `$src` provided (does NOT overwrite), and enqueues it.
  *
  * @see WP_Dependencies::add()
  * @see WP_Dependencies::add_data()
  * @see WP_Dependencies::enqueue()
  *
  * @since 2.1.0
+ * @since 6.3.0 The $in_footer parameter of type boolean was overloaded to be an $args parameter of type array.
  *
  * @param string           $handle    Name of the script. Should be unique.
  * @param string           $src       Full URL of the script, or path of the script relative to the WordPress root directory.
@@ -340,31 +354,43 @@ function wp_deregister_script( $handle ) {
  *                                    as a query string for cache busting purposes. If version is set to false, a version
  *                                    number is automatically added equal to current installed WordPress version.
  *                                    If set to null, no version is added.
- * @param bool             $in_footer Optional. Whether to enqueue the script before `</body>` instead of in the `<head>`.
- *                                    Default 'false'.
+ * @param array|bool       $args     {
+ *      Optional. An array of additional script loading strategies. Default empty array.
+ *      Otherwise, it may be a boolean in which case it determines whether the script is printed in the footer. Default false.
+ *
+ *      @type string    $strategy     Optional. If provided, may be either 'defer' or 'async'.
+ *      @type bool      $in_footer    Optional. Whether to print the script in the footer. Default 'false'.
+ * }
  */
-function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $args = array() ) {
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
 
 	$wp_scripts = wp_scripts();
 
-	if ( $src || $in_footer ) {
+	if ( $src || ! empty( $args ) ) {
 		$_handle = explode( '?', $handle );
+		if ( ! is_array( $args ) ) {
+			$args = array(
+				'in_footer' => (bool) $args,
+			);
+		}
 
 		if ( $src ) {
 			$wp_scripts->add( $_handle[0], $src, $deps, $ver );
 		}
-
-		if ( $in_footer ) {
+		if ( ! empty( $args['in_footer'] ) ) {
 			$wp_scripts->add_data( $_handle[0], 'group', 1 );
 		}
+		if ( ! empty( $args['strategy'] ) ) {
+			$wp_scripts->add_data( $_handle[0], 'strategy', $args['strategy'] );
+		}
 	}
 
 	$wp_scripts->enqueue( $handle );
 }
 
 /**
- * Remove a previously enqueued script.
+ * Removes a previously enqueued script.
  *
  * @see WP_Dependencies::dequeue()
  *
@@ -389,18 +415,18 @@ function wp_dequeue_script( $handle ) {
  * @since 3.5.0 'enqueued' added as an alias of the 'queue' list.
  *
  * @param string $handle Name of the script.
- * @param string $list   Optional. Status of the script to check. Default 'enqueued'.
+ * @param string $status Optional. Status of the script to check. Default 'enqueued'.
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether the script is queued.
  */
-function wp_script_is( $handle, $list = 'enqueued' ) {
+function wp_script_is( $handle, $status = 'enqueued' ) {
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
 
-	return (bool) wp_scripts()->query( $handle, $list );
+	return (bool) wp_scripts()->query( $handle, $status );
 }
 
 /**
- * Add metadata to a script.
+ * Adds metadata to a script.
  *
  * Works only if the script has already been registered.
  *
diff --git a/src/wp-includes/functions.wp-styles.php b/src/wp-includes/functions.wp-styles.php
index 4e0e538a22034..592bb41ade183 100644
--- a/src/wp-includes/functions.wp-styles.php
+++ b/src/wp-includes/functions.wp-styles.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * Initialize $wp_styles if it has not been set.
+ * Initializes $wp_styles if it has not been set.
  *
  * @global WP_Styles $wp_styles
  *
@@ -28,7 +28,7 @@ function wp_styles() {
 }
 
 /**
- * Display styles that are in the $handles queue.
+ * Displays styles that are in the $handles queue.
  *
  * Passing an empty array to $handles prints the queue,
  * passing an array with one string prints that style,
@@ -69,7 +69,7 @@ function wp_print_styles( $handles = false ) {
 }
 
 /**
- * Add extra CSS styles to a registered stylesheet.
+ * Adds extra CSS styles to a registered stylesheet.
  *
  * Styles will only be added if the stylesheet is already in the queue.
  * Accepts a string $data containing the CSS. If two or more CSS code blocks
@@ -105,7 +105,7 @@ function wp_add_inline_style( $handle, $data ) {
 }
 
 /**
- * Register a CSS stylesheet.
+ * Registers a CSS stylesheet.
  *
  * @see WP_Dependencies::add()
  * @link https://www.w3.org/TR/CSS2/media.html#media-types List of CSS media types.
@@ -133,7 +133,7 @@ function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media
 }
 
 /**
- * Remove a registered stylesheet.
+ * Removes a registered stylesheet.
  *
  * @see WP_Dependencies::remove()
  *
@@ -148,7 +148,7 @@ function wp_deregister_style( $handle ) {
 }
 
 /**
- * Enqueue a CSS stylesheet.
+ * Enqueues a CSS stylesheet.
  *
  * Registers the style if source provided (does NOT overwrite) and enqueues.
  *
@@ -184,7 +184,7 @@ function wp_enqueue_style( $handle, $src = '', $deps = array(), $ver = false, $m
 }
 
 /**
- * Remove a previously enqueued CSS stylesheet.
+ * Removes a previously enqueued CSS stylesheet.
  *
  * @see WP_Dependencies::dequeue()
  *
@@ -199,23 +199,23 @@ function wp_dequeue_style( $handle ) {
 }
 
 /**
- * Check whether a CSS stylesheet has been added to the queue.
+ * Checks whether a CSS stylesheet has been added to the queue.
  *
  * @since 2.8.0
  *
  * @param string $handle Name of the stylesheet.
- * @param string $list   Optional. Status of the stylesheet to check. Default 'enqueued'.
+ * @param string $status Optional. Status of the stylesheet to check. Default 'enqueued'.
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether style is queued.
  */
-function wp_style_is( $handle, $list = 'enqueued' ) {
+function wp_style_is( $handle, $status = 'enqueued' ) {
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
 
-	return (bool) wp_styles()->query( $handle, $list );
+	return (bool) wp_styles()->query( $handle, $status );
 }
 
 /**
- * Add metadata to a CSS stylesheet.
+ * Adds metadata to a CSS stylesheet.
  *
  * Works only if the stylesheet has already been registered.
  *
@@ -226,7 +226,7 @@ function wp_style_is( $handle, $list = 'enqueued' ) {
  * 'alt'         bool        For rel="alternate stylesheet".
  * 'title'       string      For preferred/alternate stylesheets.
  * 'path'        string      The absolute path to a stylesheet. Stylesheet will
- *                           load inline when 'path'' is set.
+ *                           load inline when 'path' is set.
  *
  * @see WP_Dependencies::add_data()
  *
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 9cae9b930d39b..a2b10290649d0 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -10,7 +10,7 @@
  * Loads header template.
  *
  * Includes the header template for a theme or if a name is specified then a
- * specialised header will be included.
+ * specialized header will be included.
  *
  * For the parameter, if the file is called "header-special.php" then specify
  * "special".
@@ -19,7 +19,7 @@
  * @since 5.5.0 A return value was added.
  * @since 5.5.0 The `$args` parameter was added.
  *
- * @param string $name The name of the specialised header.
+ * @param string $name The name of the specialized header.
  * @param array  $args Optional. Additional arguments passed to the header template.
  *                     Default empty array.
  * @return void|false Void on success, false if the template does not exist.
@@ -54,7 +54,7 @@ function get_header( $name = null, $args = array() ) {
  * Loads footer template.
  *
  * Includes the footer template for a theme or if a name is specified then a
- * specialised footer will be included.
+ * specialized footer will be included.
  *
  * For the parameter, if the file is called "footer-special.php" then specify
  * "special".
@@ -63,7 +63,7 @@ function get_header( $name = null, $args = array() ) {
  * @since 5.5.0 A return value was added.
  * @since 5.5.0 The `$args` parameter was added.
  *
- * @param string $name The name of the specialised footer.
+ * @param string $name The name of the specialized footer.
  * @param array  $args Optional. Additional arguments passed to the footer template.
  *                     Default empty array.
  * @return void|false Void on success, false if the template does not exist.
@@ -98,7 +98,7 @@ function get_footer( $name = null, $args = array() ) {
  * Loads sidebar template.
  *
  * Includes the sidebar template for a theme or if a name is specified then a
- * specialised sidebar will be included.
+ * specialized sidebar will be included.
  *
  * For the parameter, if the file is called "sidebar-special.php" then specify
  * "special".
@@ -107,7 +107,7 @@ function get_footer( $name = null, $args = array() ) {
  * @since 5.5.0 A return value was added.
  * @since 5.5.0 The `$args` parameter was added.
  *
- * @param string $name The name of the specialised sidebar.
+ * @param string $name The name of the specialized sidebar.
  * @param array  $args Optional. Additional arguments passed to the sidebar template.
  *                     Default empty array.
  * @return void|false Void on success, false if the template does not exist.
@@ -145,7 +145,7 @@ function get_sidebar( $name = null, $args = array() ) {
  * in the theme.
  *
  * Includes the named template part for a theme or if a name is specified then a
- * specialised part will be included. If the theme contains no {slug}.php file
+ * specialized part will be included. If the theme contains no {slug}.php file
  * then no template will be included.
  *
  * The template is included using require, not require_once, so you may include the
@@ -158,10 +158,10 @@ function get_sidebar( $name = null, $args = array() ) {
  * @since 5.5.0 A return value was added.
  * @since 5.5.0 The `$args` parameter was added.
  *
- * @param string $slug The slug name for the generic template.
- * @param string $name The name of the specialised template.
- * @param array  $args Optional. Additional arguments passed to the template.
- *                     Default empty array.
+ * @param string      $slug The slug name for the generic template.
+ * @param string|null $name Optional. The name of the specialized template.
+ * @param array       $args Optional. Additional arguments passed to the template.
+ *                          Default empty array.
  * @return void|false Void on success, false if the template does not exist.
  */
 function get_template_part( $slug, $name = null, $args = array() ) {
@@ -175,7 +175,8 @@ function get_template_part( $slug, $name = null, $args = array() ) {
 	 * @since 5.5.0 The `$args` parameter was added.
 	 *
 	 * @param string      $slug The slug name for the generic template.
-	 * @param string|null $name The name of the specialized template.
+	 * @param string|null $name The name of the specialized template or null if
+	 *                          there is none.
 	 * @param array       $args Additional arguments passed to the template.
 	 */
 	do_action( "get_template_part_{$slug}", $slug, $name, $args );
@@ -195,7 +196,8 @@ function get_template_part( $slug, $name = null, $args = array() ) {
 	 * @since 5.5.0 The `$args` parameter was added.
 	 *
 	 * @param string   $slug      The slug name for the generic template.
-	 * @param string   $name      The name of the specialized template.
+	 * @param string   $name      The name of the specialized template or an empty
+	 *                            string if there is none.
 	 * @param string[] $templates Array of template files to search for, in order.
 	 * @param array    $args      Additional arguments passed to the template.
 	 */
@@ -322,7 +324,10 @@ function get_search_form( $args = array() ) {
 		if ( 'html5' === $format ) {
 			$form = '<form role="search" ' . $aria_label . 'method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
 				<label>
-					<span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
+					<span class="screen-reader-text">' .
+					/* translators: Hidden accessibility text. */
+					_x( 'Search for:', 'label' ) .
+					'</span>
 					<input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" />
 				</label>
 				<input type="submit" class="search-submit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
@@ -330,7 +335,10 @@ function get_search_form( $args = array() ) {
 		} else {
 			$form = '<form role="search" ' . $aria_label . 'method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
 				<div>
-					<label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
+					<label class="screen-reader-text" for="s">' .
+					/* translators: Hidden accessibility text. */
+					_x( 'Search for:', 'label' ) .
+					'</label>
 					<input type="text" value="' . get_search_query() . '" name="s" id="s" />
 					<input type="submit" id="searchsubmit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
 				</div>
@@ -370,17 +378,17 @@ function get_search_form( $args = array() ) {
  * @since 1.5.0
  *
  * @param string $redirect Optional path to redirect to on login/logout.
- * @param bool   $echo     Default to echo and not return the link.
- * @return void|string Void if `$echo` argument is true, log in/out link if `$echo` is false.
+ * @param bool   $display  Default to echo and not return the link.
+ * @return void|string Void if `$display` argument is true, log in/out link if `$display` is false.
  */
-function wp_loginout( $redirect = '', $echo = true ) {
+function wp_loginout( $redirect = '', $display = true ) {
 	if ( ! is_user_logged_in() ) {
 		$link = '<a href="' . esc_url( wp_login_url( $redirect ) ) . '">' . __( 'Log in' ) . '</a>';
 	} else {
 		$link = '<a href="' . esc_url( wp_logout_url( $redirect ) ) . '">' . __( 'Log out' ) . '</a>';
 	}
 
-	if ( $echo ) {
+	if ( $display ) {
 		/**
 		 * Filters the HTML output for the Log In/Log Out link.
 		 *
@@ -595,7 +603,7 @@ function wp_login_form( $args = array() ) {
 		sprintf(
 			'<p class="login-password">
 				<label for="%1$s">%2$s</label>
-				<input type="password" name="pwd" id="%1$s" autocomplete="current-password" class="input" value="" size="20" />
+				<input type="password" name="pwd" id="%1$s" autocomplete="current-password" spellcheck="false" class="input" value="" size="20" />
 			</p>',
 			esc_attr( $args['id_password'] ),
 			esc_html( $args['label_password'] )
@@ -646,7 +654,7 @@ function wp_lostpassword_url( $redirect = '' ) {
 	}
 
 	if ( is_multisite() ) {
-		$blog_details  = get_blog_details();
+		$blog_details  = get_site();
 		$wp_login_path = $blog_details->path . 'wp-login.php';
 	} else {
 		$wp_login_path = 'wp-login.php';
@@ -673,13 +681,13 @@ function wp_lostpassword_url( $redirect = '' ) {
  *
  * @since 1.5.0
  *
- * @param string $before Text to output before the link. Default `<li>`.
- * @param string $after  Text to output after the link. Default `</li>`.
- * @param bool   $echo   Default to echo and not return the link.
- * @return void|string Void if `$echo` argument is true, registration or admin link
- *                     if `$echo` is false.
+ * @param string $before  Text to output before the link. Default `<li>`.
+ * @param string $after   Text to output after the link. Default `</li>`.
+ * @param bool   $display Default to echo and not return the link.
+ * @return void|string Void if `$display` argument is true, registration or admin link
+ *                     if `$display` is false.
  */
-function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
+function wp_register( $before = '<li>', $after = '</li>', $display = true ) {
 	if ( ! is_user_logged_in() ) {
 		if ( get_option( 'users_can_register' ) ) {
 			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __( 'Register' ) . '</a>' . $after;
@@ -704,7 +712,7 @@ function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
 	 */
 	$link = apply_filters( 'register', $link );
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $link;
 	} else {
 		return $link;
@@ -755,7 +763,7 @@ function bloginfo( $show = '' ) {
  * - 'admin_email' - Admin email (set in Settings > General)
  * - 'charset' - The "Encoding for pages and feeds"  (set in Settings > Reading)
  * - 'version' - The current WordPress version
- * - 'html_type' - The content-type (default: "text/html"). Themes and plugins
+ * - 'html_type' - The Content-Type (default: "text/html"). Themes and plugins
  *   can override the default value using the {@see 'pre_option_html_type'} filter
  * - 'text_direction' - The text direction determined by the site's language. is_rtl()
  *   should be used instead
@@ -899,9 +907,11 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 	}
 
 	$url = true;
-	if ( strpos( $show, 'url' ) === false &&
-		strpos( $show, 'directory' ) === false &&
-		strpos( $show, 'home' ) === false ) {
+
+	if ( ! str_contains( $show, 'url' )
+		&& ! str_contains( $show, 'directory' )
+		&& ! str_contains( $show, 'home' )
+	) {
 		$url = false;
 	}
 
@@ -950,7 +960,7 @@ function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
 		$switched_blog = true;
 	}
 
-	$site_icon_id = get_option( 'site_icon' );
+	$site_icon_id = (int) get_option( 'site_icon' );
 
 	if ( $site_icon_id ) {
 		if ( $size >= 512 ) {
@@ -2048,10 +2058,10 @@ function wp_get_archives( $args = '' ) {
 		$query   = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
 		$key     = md5( $query );
 		$key     = "wp_get_archives:$key:$last_changed";
-		$results = wp_cache_get( $key, 'posts' );
+		$results = wp_cache_get( $key, 'post-queries' );
 		if ( ! $results ) {
 			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+			wp_cache_set( $key, $results, 'post-queries' );
 		}
 		if ( $results ) {
 			$after = $parsed_args['after'];
@@ -2073,10 +2083,10 @@ function wp_get_archives( $args = '' ) {
 		$query   = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
 		$key     = md5( $query );
 		$key     = "wp_get_archives:$key:$last_changed";
-		$results = wp_cache_get( $key, 'posts' );
+		$results = wp_cache_get( $key, 'post-queries' );
 		if ( ! $results ) {
 			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+			wp_cache_set( $key, $results, 'post-queries' );
 		}
 		if ( $results ) {
 			$after = $parsed_args['after'];
@@ -2097,10 +2107,10 @@ function wp_get_archives( $args = '' ) {
 		$query   = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
 		$key     = md5( $query );
 		$key     = "wp_get_archives:$key:$last_changed";
-		$results = wp_cache_get( $key, 'posts' );
+		$results = wp_cache_get( $key, 'post-queries' );
 		if ( ! $results ) {
 			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+			wp_cache_set( $key, $results, 'post-queries' );
 		}
 		if ( $results ) {
 			$after = $parsed_args['after'];
@@ -2123,10 +2133,10 @@ function wp_get_archives( $args = '' ) {
 		$query   = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
 		$key     = md5( $query );
 		$key     = "wp_get_archives:$key:$last_changed";
-		$results = wp_cache_get( $key, 'posts' );
+		$results = wp_cache_get( $key, 'post-queries' );
 		if ( ! $results ) {
 			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+			wp_cache_set( $key, $results, 'post-queries' );
 		}
 		$arc_w_last = '';
 		if ( $results ) {
@@ -2162,10 +2172,10 @@ function wp_get_archives( $args = '' ) {
 		$query   = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
 		$key     = md5( $query );
 		$key     = "wp_get_archives:$key:$last_changed";
-		$results = wp_cache_get( $key, 'posts' );
+		$results = wp_cache_get( $key, 'post-queries' );
 		if ( ! $results ) {
 			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+			wp_cache_set( $key, $results, 'post-queries' );
 		}
 		if ( $results ) {
 			foreach ( (array) $results as $result ) {
@@ -2220,10 +2230,10 @@ function calendar_week_mod( $num ) {
  * @global array     $posts
  *
  * @param bool $initial Optional. Whether to use initial calendar names. Default true.
- * @param bool $echo    Optional. Whether to display the calendar output. Default true.
- * @return void|string Void if `$echo` argument is true, calendar HTML if `$echo` is false.
+ * @param bool $display Optional. Whether to display the calendar output. Default true.
+ * @return void|string Void if `$display` argument is true, calendar HTML if `$display` is false.
  */
-function get_calendar( $initial = true, $echo = true ) {
+function get_calendar( $initial = true, $display = true ) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
 	$key   = md5( $m . $monthnum . $year );
@@ -2233,7 +2243,7 @@ function get_calendar( $initial = true, $echo = true ) {
 		/** This filter is documented in wp-includes/general-template.php */
 		$output = apply_filters( 'get_calendar', $cache[ $key ] );
 
-		if ( $echo ) {
+		if ( $display ) {
 			echo $output;
 			return;
 		}
@@ -2292,16 +2302,16 @@ function get_calendar( $initial = true, $echo = true ) {
 		FROM $wpdb->posts
 		WHERE post_date < '$thisyear-$thismonth-01'
 		AND post_type = 'post' AND post_status = 'publish'
-			ORDER BY post_date DESC
-			LIMIT 1"
+		ORDER BY post_date DESC
+		LIMIT 1"
 	);
 	$next     = $wpdb->get_row(
 		"SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
 		FROM $wpdb->posts
 		WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
 		AND post_type = 'post' AND post_status = 'publish'
-			ORDER BY post_date ASC
-			LIMIT 1"
+		ORDER BY post_date ASC
+		LIMIT 1"
 	);
 
 	/* translators: Calendar caption: 1: Month name, 2: 4-digit year. */
@@ -2430,7 +2440,7 @@ function get_calendar( $initial = true, $echo = true ) {
 	$cache[ $key ] = $calendar_output;
 	wp_cache_set( 'get_calendar', $cache, 'calendar' );
 
-	if ( $echo ) {
+	if ( $display ) {
 		/**
 		 * Filters the HTML calendar output.
 		 *
@@ -2511,13 +2521,13 @@ function the_date_xml() {
  * @global string $currentday  The day of the current post in the loop.
  * @global string $previousday The day of the previous post in the loop.
  *
- * @param string $format Optional. PHP date format. Defaults to the 'date_format' option.
- * @param string $before Optional. Output before the date. Default empty.
- * @param string $after  Optional. Output after the date. Default empty.
- * @param bool   $echo   Optional. Whether to echo the date or return it. Default true.
+ * @param string $format  Optional. PHP date format. Defaults to the 'date_format' option.
+ * @param string $before  Optional. Output before the date. Default empty.
+ * @param string $after   Optional. Output after the date. Default empty.
+ * @param bool   $display Optional. Whether to echo the date or return it. Default true.
  * @return string|void String if retrieving.
  */
-function the_date( $format = '', $before = '', $after = '', $echo = true ) {
+function the_date( $format = '', $before = '', $after = '', $display = true ) {
 	global $currentday, $previousday;
 
 	$the_date = '';
@@ -2539,7 +2549,7 @@ function the_date( $format = '', $before = '', $after = '', $echo = true ) {
 	 */
 	$the_date = apply_filters( 'the_date', $the_date, $format, $before, $after );
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $the_date;
 	} else {
 		return $the_date;
@@ -2586,13 +2596,13 @@ function get_the_date( $format = '', $post = null ) {
  *
  * @since 2.1.0
  *
- * @param string $format Optional. PHP date format. Defaults to the 'date_format' option.
- * @param string $before Optional. Output before the date. Default empty.
- * @param string $after  Optional. Output after the date. Default empty.
- * @param bool   $echo   Optional. Whether to echo the date or return it. Default true.
+ * @param string $format  Optional. PHP date format. Defaults to the 'date_format' option.
+ * @param string $before  Optional. Output before the date. Default empty.
+ * @param string $after   Optional. Output after the date. Default empty.
+ * @param bool   $display Optional. Whether to echo the date or return it. Default true.
  * @return string|void String if retrieving.
  */
-function the_modified_date( $format = '', $before = '', $after = '', $echo = true ) {
+function the_modified_date( $format = '', $before = '', $after = '', $display = true ) {
 	$the_modified_date = $before . get_the_modified_date( $format ) . $after;
 
 	/**
@@ -2607,7 +2617,7 @@ function the_modified_date( $format = '', $before = '', $after = '', $echo = tru
 	 */
 	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $format, $before, $after );
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $the_modified_date;
 	} else {
 		return $the_modified_date;
@@ -3088,11 +3098,11 @@ function feed_links( $args = array() ) {
 	}
 
 	$defaults = array(
-		/* translators: Separator between blog name and feed type in feed links. */
+		/* translators: Separator between site name and feed type in feed links. */
 		'separator' => _x( '&raquo;', 'feed link' ),
-		/* translators: 1: Blog title, 2: Separator (raquo). */
+		/* translators: 1: Site title, 2: Separator (raquo). */
 		'feedtitle' => __( '%1$s %2$s Feed' ),
-		/* translators: 1: Blog title, 2: Separator (raquo). */
+		/* translators: 1: Site title, 2: Separator (raquo). */
 		'comstitle' => __( '%1$s %2$s Comments Feed' ),
 	);
 
@@ -3140,21 +3150,21 @@ function feed_links( $args = array() ) {
  */
 function feed_links_extra( $args = array() ) {
 	$defaults = array(
-		/* translators: Separator between blog name and feed type in feed links. */
+		/* translators: Separator between site name and feed type in feed links. */
 		'separator'     => _x( '&raquo;', 'feed link' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Post title. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Post title. */
 		'singletitle'   => __( '%1$s %2$s %3$s Comments Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Category name. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Category name. */
 		'cattitle'      => __( '%1$s %2$s %3$s Category Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Tag name. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Tag name. */
 		'tagtitle'      => __( '%1$s %2$s %3$s Tag Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
 		'taxtitle'      => __( '%1$s %2$s %3$s %4$s Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Author name. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Author name. */
 		'authortitle'   => __( '%1$s %2$s Posts by %3$s Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Search query. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Search query. */
 		'searchtitle'   => __( '%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed' ),
-		/* translators: 1: Blog name, 2: Separator (raquo), 3: Post type name. */
+		/* translators: 1: Site name, 2: Separator (raquo), 3: Post type name. */
 		'posttypetitle' => __( '%1$s %2$s %3$s Feed' ),
 	);
 
@@ -3366,19 +3376,6 @@ function rsd_link() {
 	);
 }
 
-/**
- * Displays the link to the Windows Live Writer manifest file.
- *
- * @link https://msdn.microsoft.com/en-us/library/bb463265.aspx
- * @since 2.3.1
- */
-function wlwmanifest_link() {
-	printf(
-		'<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="%s" />' . "\n",
-		includes_url( 'wlwmanifest.xml' )
-	);
-}
-
 /**
  * Displays a referrer `strict-origin-when-cross-origin` meta tag.
  *
@@ -3683,6 +3680,9 @@ function wp_preload_resources() {
  *
  * @since 4.6.0
  *
+ * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
+ * @global WP_Styles  $wp_styles  The WP_Styles object for printing styles.
+ *
  * @return string[] A list of unique hosts of enqueued scripts and styles.
  */
 function wp_dependencies_unique_hosts() {
@@ -3740,7 +3740,7 @@ function user_can_richedit() {
 			if ( $is_safari ) {
 				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && (int) $match[1] >= 534 );
 			} elseif ( $is_IE ) {
-				$wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' ) !== false );
+				$wp_rich_edit = str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' );
 			} elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
 				$wp_rich_edit = true;
 			}
@@ -4023,7 +4023,7 @@ function wp_get_code_editor_settings( $args ) {
 		if ( 'application/x-patch' === $type || 'text/x-patch' === $type ) {
 			$type = 'text/x-diff';
 		}
-	} elseif ( isset( $args['file'] ) && false !== strpos( basename( $args['file'] ), '.' ) ) {
+	} elseif ( isset( $args['file'] ) && str_contains( basename( $args['file'] ), '.' ) ) {
 		$extension = strtolower( pathinfo( $args['file'], PATHINFO_EXTENSION ) );
 		foreach ( wp_get_mime_types() as $exts => $mime ) {
 			if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
@@ -4159,7 +4159,7 @@ function wp_get_code_editor_settings( $args ) {
 				'matchBrackets'     => true,
 			)
 		);
-	} elseif ( false !== strpos( $type, 'json' ) ) {
+	} elseif ( str_contains( $type, 'json' ) ) {
 		$settings['codemirror'] = array_merge(
 			$settings['codemirror'],
 			array(
@@ -4176,7 +4176,7 @@ function wp_get_code_editor_settings( $args ) {
 		} else {
 			$settings['codemirror']['mode']['json'] = true;
 		}
-	} elseif ( false !== strpos( $type, 'jsx' ) ) {
+	} elseif ( str_contains( $type, 'jsx' ) ) {
 		$settings['codemirror'] = array_merge(
 			$settings['codemirror'],
 			array(
@@ -4222,7 +4222,7 @@ function wp_get_code_editor_settings( $args ) {
 				'matchBrackets'     => true,
 			)
 		);
-	} elseif ( false !== strpos( $type, 'xml' ) ) {
+	} elseif ( str_contains( $type, 'xml' ) ) {
 		$settings['codemirror'] = array_merge(
 			$settings['codemirror'],
 			array(
@@ -4864,7 +4864,7 @@ function wp_admin_css_uri( $file = 'wp-admin' ) {
  */
 function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
 	// For backward compatibility.
-	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
+	$handle = str_starts_with( $file, 'css/' ) ? substr( $file, 4 ) : $file;
 
 	if ( wp_styles()->query( $handle ) ) {
 		if ( $force_echo || did_action( 'wp_print_styles' ) ) {
@@ -5063,12 +5063,12 @@ function get_the_generator( $type = '' ) {
  * @param mixed $checked One of the values to compare.
  * @param mixed $current Optional. The other value to compare if not just true.
  *                       Default true.
- * @param bool  $echo    Optional. Whether to echo or just return the string.
+ * @param bool  $display Optional. Whether to echo or just return the string.
  *                       Default true.
  * @return string HTML attribute or empty string.
  */
-function checked( $checked, $current = true, $echo = true ) {
-	return __checked_selected_helper( $checked, $current, $echo, 'checked' );
+function checked( $checked, $current = true, $display = true ) {
+	return __checked_selected_helper( $checked, $current, $display, 'checked' );
 }
 
 /**
@@ -5081,12 +5081,12 @@ function checked( $checked, $current = true, $echo = true ) {
  * @param mixed $selected One of the values to compare.
  * @param mixed $current  Optional. The other value to compare if not just true.
  *                        Default true.
- * @param bool  $echo     Optional. Whether to echo or just return the string.
+ * @param bool  $display  Optional. Whether to echo or just return the string.
  *                        Default true.
  * @return string HTML attribute or empty string.
  */
-function selected( $selected, $current = true, $echo = true ) {
-	return __checked_selected_helper( $selected, $current, $echo, 'selected' );
+function selected( $selected, $current = true, $display = true ) {
+	return __checked_selected_helper( $selected, $current, $display, 'selected' );
 }
 
 /**
@@ -5099,12 +5099,12 @@ function selected( $selected, $current = true, $echo = true ) {
  * @param mixed $disabled One of the values to compare.
  * @param mixed $current  Optional. The other value to compare if not just true.
  *                        Default true.
- * @param bool  $echo     Optional. Whether to echo or just return the string.
+ * @param bool  $display  Optional. Whether to echo or just return the string.
  *                        Default true.
  * @return string HTML attribute or empty string.
  */
-function disabled( $disabled, $current = true, $echo = true ) {
-	return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
+function disabled( $disabled, $current = true, $display = true ) {
+	return __checked_selected_helper( $disabled, $current, $display, 'disabled' );
 }
 
 /**
@@ -5114,15 +5114,15 @@ function disabled( $disabled, $current = true, $echo = true ) {
  *
  * @since 5.9.0
  *
- * @param mixed $readonly One of the values to compare.
- * @param mixed $current  Optional. The other value to compare if not just true.
- *                        Default true.
- * @param bool  $echo     Optional. Whether to echo or just return the string.
- *                        Default true.
+ * @param mixed $readonly_value One of the values to compare.
+ * @param mixed $current        Optional. The other value to compare if not just true.
+ *                              Default true.
+ * @param bool  $display        Optional. Whether to echo or just return the string.
+ *                              Default true.
  * @return string HTML attribute or empty string.
  */
-function wp_readonly( $readonly, $current = true, $echo = true ) {
-	return __checked_selected_helper( $readonly, $current, $echo, 'readonly' );
+function wp_readonly( $readonly_value, $current = true, $display = true ) {
+	return __checked_selected_helper( $readonly_value, $current, $display, 'readonly' );
 }
 
 /*
@@ -5145,18 +5145,18 @@ function wp_readonly( $readonly, $current = true, $echo = true ) {
  *
  * @param mixed  $helper  One of the values to compare.
  * @param mixed  $current The other value to compare if not just true.
- * @param bool   $echo    Whether to echo or just return the string.
+ * @param bool   $display Whether to echo or just return the string.
  * @param string $type    The type of checked|selected|disabled|readonly we are doing.
  * @return string HTML attribute or empty string.
  */
-function __checked_selected_helper( $helper, $current, $echo, $type ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore
+function __checked_selected_helper( $helper, $current, $display, $type ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore
 	if ( (string) $helper === (string) $current ) {
 		$result = " $type='$type'";
 	} else {
 		$result = '';
 	}
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $result;
 	}
 
diff --git a/src/wp-includes/global-styles-and-settings.php b/src/wp-includes/global-styles-and-settings.php
index b6c8c91b464c0..1258f1f4e37f1 100644
--- a/src/wp-includes/global-styles-and-settings.php
+++ b/src/wp-includes/global-styles-and-settings.php
@@ -21,19 +21,67 @@
  *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
  *                              If empty or unknown, 'all' is used.
  * }
- * @return array The settings to retrieve.
+ * @return mixed The settings array or individual setting value to retrieve.
  */
 function wp_get_global_settings( $path = array(), $context = array() ) {
 	if ( ! empty( $context['block_name'] ) ) {
-		$path = array_merge( array( 'blocks', $context['block_name'] ), $path );
+		$new_path = array( 'blocks', $context['block_name'] );
+		foreach ( $path as $subpath ) {
+			$new_path[] = $subpath;
+		}
+		$path = $new_path;
 	}
 
+	/*
+	 * This is the default value when no origin is provided or when it is 'all'.
+	 *
+	 * The $origin is used as part of the cache key. Changes here need to account
+	 * for clearing the cache appropriately.
+	 */
 	$origin = 'custom';
-	if ( isset( $context['origin'] ) && 'base' === $context['origin'] ) {
+	if (
+		! wp_theme_has_theme_json() ||
+		( isset( $context['origin'] ) && 'base' === $context['origin'] )
+	) {
 		$origin = 'theme';
 	}
 
-	$settings = WP_Theme_JSON_Resolver::get_merged_data( $origin )->get_settings();
+	/*
+	 * By using the 'theme_json' group, this data is marked to be non-persistent across requests.
+	 * See `wp_cache_add_non_persistent_groups` in src/wp-includes/load.php and other places.
+	 *
+	 * The rationale for this is to make sure derived data from theme.json
+	 * is always fresh from the potential modifications done via hooks
+	 * that can use dynamic data (modify the stylesheet depending on some option,
+	 * settings depending on user permissions, etc.).
+	 * See some of the existing hooks to modify theme.json behaviour:
+	 * https://make.wordpress.org/core/2022/10/10/filters-for-theme-json-data/
+	 *
+	 * A different alternative considered was to invalidate the cache upon certain
+	 * events such as options add/update/delete, user meta, etc.
+	 * It was judged not enough, hence this approach.
+	 * See https://github.com/WordPress/gutenberg/pull/45372
+	 */
+	$cache_group = 'theme_json';
+	$cache_key   = 'wp_get_global_settings_' . $origin;
+
+	/*
+	 * Ignore cache when the development mode is set to 'theme', so it doesn't interfere with the theme
+	 * developer's workflow.
+	 */
+	$can_use_cached = ! wp_is_development_mode( 'theme' );
+
+	$settings = false;
+	if ( $can_use_cached ) {
+		$settings = wp_cache_get( $cache_key, $cache_group );
+	}
+
+	if ( false === $settings ) {
+		$settings = WP_Theme_JSON_Resolver::get_merged_data( $origin )->get_settings();
+		if ( $can_use_cached ) {
+			wp_cache_set( $cache_key, $settings, $cache_group );
+		}
+	}
 
 	return _wp_array_get( $settings, $path, $settings );
 }
@@ -42,6 +90,10 @@ function wp_get_global_settings( $path = array(), $context = array() ) {
  * Gets the styles resulting of merging core, theme, and user data.
  *
  * @since 5.9.0
+ * @since 6.3.0 the internal link format "var:preset|color|secondary" is resolved
+ *              to "var(--wp--preset--font-size--small)" so consumers don't have to.
+ * @since 6.3.0 `transforms` is now usable in the `context` parameter. In case [`transforms`]['resolve_variables']
+ *              is defined, variables are resolved to their value in the styles.
  *
  * @param array $path    Path to the specific style to retrieve. Optional.
  *                       If empty, will return all styles.
@@ -53,8 +105,11 @@ function wp_get_global_settings( $path = array(), $context = array() ) {
  *     @type string $origin     Which origin to take data from.
  *                              Valid values are 'all' (core, theme, and user) or 'base' (core and theme).
  *                              If empty or unknown, 'all' is used.
+ *     @type array $transforms Which transformation(s) to apply.
+ *                              Valid value is array( 'resolve-variables' ).
+ *                              If defined, variables are resolved to their value in the styles.
  * }
- * @return array The styles to retrieve.
+ * @return mixed The styles array or individual style value to retrieve.
  */
 function wp_get_global_styles( $path = array(), $context = array() ) {
 	if ( ! empty( $context['block_name'] ) ) {
@@ -66,35 +121,59 @@ function wp_get_global_styles( $path = array(), $context = array() ) {
 		$origin = 'theme';
 	}
 
-	$styles = WP_Theme_JSON_Resolver::get_merged_data( $origin )->get_raw_data()['styles'];
+	$resolve_variables = isset( $context['transforms'] )
+	&& is_array( $context['transforms'] )
+	&& in_array( 'resolve-variables', $context['transforms'], true );
 
+	$merged_data = WP_Theme_JSON_Resolver::get_merged_data( $origin );
+	if ( $resolve_variables ) {
+		$merged_data = WP_Theme_JSON::resolve_variables( $merged_data );
+	}
+	$styles = $merged_data->get_raw_data()['styles'];
 	return _wp_array_get( $styles, $path, $styles );
 }
 
+
 /**
  * Returns the stylesheet resulting of merging core, theme, and user data.
  *
  * @since 5.9.0
+ * @since 6.1.0 Added 'base-layout-styles' support.
  *
- * @param array $types Types of styles to load. Optional.
- *                     It accepts 'variables', 'styles', 'presets' as values.
- *                     If empty, it'll load all for themes with theme.json support
- *                     and only [ 'variables', 'presets' ] for themes without theme.json support.
+ * @param array $types Optional. Types of styles to load.
+ *                     It accepts as values 'variables', 'presets', 'styles', 'base-layout-styles'.
+ *                     If empty, it'll load the following:
+ *                     - for themes without theme.json: 'variables', 'presets', 'base-layout-styles'.
+ *                     - for themes with theme.json: 'variables', 'presets', 'styles'.
  * @return string Stylesheet.
  */
 function wp_get_global_stylesheet( $types = array() ) {
-	// Return cached value if it can be used and exists.
-	// It's cached by theme to make sure that theme switching clears the cache.
-	$can_use_cached = (
-		( empty( $types ) ) &&
-		( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
-		( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
-		( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
-		! is_admin()
-	);
-	$transient_name = 'global_styles_' . get_stylesheet();
+	/*
+	 * Ignore cache when the development mode is set to 'theme', so it doesn't interfere with the theme
+	 * developer's workflow.
+	 */
+	$can_use_cached = empty( $types ) && ! wp_is_development_mode( 'theme' );
+
+	/*
+	 * By using the 'theme_json' group, this data is marked to be non-persistent across requests.
+	 * @see `wp_cache_add_non_persistent_groups()`.
+	 *
+	 * The rationale for this is to make sure derived data from theme.json
+	 * is always fresh from the potential modifications done via hooks
+	 * that can use dynamic data (modify the stylesheet depending on some option,
+	 * settings depending on user permissions, etc.).
+	 * See some of the existing hooks to modify theme.json behavior:
+	 * @see https://make.wordpress.org/core/2022/10/10/filters-for-theme-json-data/
+	 *
+	 * A different alternative considered was to invalidate the cache upon certain
+	 * events such as options add/update/delete, user meta, etc.
+	 * It was judged not enough, hence this approach.
+	 * @see https://github.com/WordPress/gutenberg/pull/45372
+	 */
+	$cache_group = 'theme_json';
+	$cache_key   = 'wp_get_global_stylesheet';
 	if ( $can_use_cached ) {
-		$cached = get_transient( $transient_name );
+		$cached = wp_cache_get( $cache_key, $cache_group );
 		if ( $cached ) {
 			return $cached;
 		}
@@ -102,7 +181,7 @@ function wp_get_global_stylesheet( $types = array() ) {
 
 	$tree = WP_Theme_JSON_Resolver::get_merged_data();
 
-	$supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
+	$supports_theme_json = wp_theme_has_theme_json();
 	if ( empty( $types ) && ! $supports_theme_json ) {
 		$types = array( 'variables', 'presets', 'base-layout-styles' );
 	} elseif ( empty( $types ) ) {
@@ -150,56 +229,63 @@ function wp_get_global_stylesheet( $types = array() ) {
 	}
 
 	$stylesheet = $styles_variables . $styles_rest;
-
 	if ( $can_use_cached ) {
-		// Cache for a minute.
-		// This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
-		set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
+		wp_cache_set( $cache_key, $stylesheet, $cache_group );
 	}
 
 	return $stylesheet;
 }
 
 /**
- * Returns a string containing the SVGs to be referenced as filters (duotone).
+ * Gets the global styles custom CSS from theme.json.
  *
- * @since 5.9.1
+ * @since 6.2.0
  *
- * @return string
+ * @return string The global styles custom CSS.
  */
-function wp_get_global_styles_svg_filters() {
-	// Return cached value if it can be used and exists.
-	// It's cached by theme to make sure that theme switching clears the cache.
-	$can_use_cached = (
-		( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
-		( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
-		( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
-		! is_admin()
-	);
-	$transient_name = 'global_styles_svg_filters_' . get_stylesheet();
+function wp_get_global_styles_custom_css() {
+	if ( ! wp_theme_has_theme_json() ) {
+		return '';
+	}
+	/*
+	 * Ignore cache when the development mode is set to 'theme', so it doesn't interfere with the theme
+	 * developer's workflow.
+	 */
+	$can_use_cached = ! wp_is_development_mode( 'theme' );
+
+	/*
+	 * By using the 'theme_json' group, this data is marked to be non-persistent across requests.
+	 * @see `wp_cache_add_non_persistent_groups()`.
+	 *
+	 * The rationale for this is to make sure derived data from theme.json
+	 * is always fresh from the potential modifications done via hooks
+	 * that can use dynamic data (modify the stylesheet depending on some option,
+	 * settings depending on user permissions, etc.).
+	 * See some of the existing hooks to modify theme.json behavior:
+	 * @see https://make.wordpress.org/core/2022/10/10/filters-for-theme-json-data/
+	 *
+	 * A different alternative considered was to invalidate the cache upon certain
+	 * events such as options add/update/delete, user meta, etc.
+	 * It was judged not enough, hence this approach.
+	 * @see https://github.com/WordPress/gutenberg/pull/45372
+	 */
+	$cache_key   = 'wp_get_global_styles_custom_css';
+	$cache_group = 'theme_json';
 	if ( $can_use_cached ) {
-		$cached = get_transient( $transient_name );
+		$cached = wp_cache_get( $cache_key, $cache_group );
 		if ( $cached ) {
 			return $cached;
 		}
 	}
 
-	$supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
-
-	$origins = array( 'default', 'theme', 'custom' );
-	if ( ! $supports_theme_json ) {
-		$origins = array( 'default' );
-	}
-
-	$tree = WP_Theme_JSON_Resolver::get_merged_data();
-	$svgs = $tree->get_svg_filters( $origins );
+	$tree       = WP_Theme_JSON_Resolver::get_merged_data();
+	$stylesheet = $tree->get_custom_css();
 
 	if ( $can_use_cached ) {
-		// Cache for a minute, same as wp_get_global_stylesheet.
-		set_transient( $transient_name, $svgs, MINUTE_IN_SECONDS );
+		wp_cache_set( $cache_key, $stylesheet, $cache_group );
 	}
 
-	return $svgs;
+	return $stylesheet;
 }
 
 /**
@@ -234,20 +320,10 @@ function wp_add_global_styles_for_blocks() {
 
 		// The likes of block element styles from theme.json do not have  $metadata['name'] set.
 		if ( ! isset( $metadata['name'] ) && ! empty( $metadata['path'] ) ) {
-			$result = array_values(
-				array_filter(
-					$metadata['path'],
-					function ( $item ) {
-						if ( strpos( $item, 'core/' ) !== false ) {
-							return true;
-						}
-						return false;
-					}
-				)
-			);
-			if ( isset( $result[0] ) ) {
-				if ( str_starts_with( $result[0], 'core/' ) ) {
-					$block_name        = str_replace( 'core/', '', $result[0] );
+			$block_name = wp_get_block_name_from_theme_json_path( $metadata['path'] );
+			if ( $block_name ) {
+				if ( str_starts_with( $block_name, 'core/' ) ) {
+					$block_name        = str_replace( 'core/', '', $block_name );
 					$stylesheet_handle = 'wp-block-' . $block_name;
 				}
 				wp_add_inline_style( $stylesheet_handle, $block_css );
@@ -255,3 +331,260 @@ function ( $item ) {
 		}
 	}
 }
+
+/**
+ * Gets the block name from a given theme.json path.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @param array $path An array of keys describing the path to a property in theme.json.
+ * @return string Identified block name, or empty string if none found.
+ */
+function wp_get_block_name_from_theme_json_path( $path ) {
+	// Block name is expected to be the third item after 'styles' and 'blocks'.
+	if (
+		count( $path ) >= 3
+		&& 'styles' === $path[0]
+		&& 'blocks' === $path[1]
+		&& str_contains( $path[2], '/' )
+	) {
+		return $path[2];
+	}
+
+	/*
+	 * As fallback and for backward compatibility, allow any core block to be
+	 * at any position.
+	 */
+	$result = array_values(
+		array_filter(
+			$path,
+			static function ( $item ) {
+				if ( str_contains( $item, 'core/' ) ) {
+					return true;
+				}
+				return false;
+			}
+		)
+	);
+	if ( isset( $result[0] ) ) {
+		return $result[0];
+	}
+	return '';
+}
+
+/**
+ * Checks whether a theme or its parent has a theme.json file.
+ *
+ * @since 6.2.0
+ *
+ * @return bool Returns true if theme or its parent has a theme.json file, false otherwise.
+ */
+function wp_theme_has_theme_json() {
+	static $theme_has_support = array();
+
+	$stylesheet = get_stylesheet();
+
+	if (
+		isset( $theme_has_support[ $stylesheet ] ) &&
+		/*
+		 * Ignore static cache when the development mode is set to 'theme', to avoid interfering with
+		 * the theme developer's workflow.
+		 */
+		! wp_is_development_mode( 'theme' )
+	) {
+		return $theme_has_support[ $stylesheet ];
+	}
+
+	$stylesheet_directory = get_stylesheet_directory();
+	$template_directory   = get_template_directory();
+
+	// This is the same as get_theme_file_path(), which isn't available in load-styles.php context
+	if ( $stylesheet_directory !== $template_directory && file_exists( $stylesheet_directory . '/theme.json' ) ) {
+		$path = $stylesheet_directory . '/theme.json';
+	} else {
+		$path = $template_directory . '/theme.json';
+	}
+
+	/** This filter is documented in wp-includes/link-template.php */
+	$path = apply_filters( 'theme_file_path', $path, 'theme.json' );
+
+	$theme_has_support[ $stylesheet ] = file_exists( $path );
+
+	return $theme_has_support[ $stylesheet ];
+}
+
+/**
+ * Cleans the caches under the theme_json group.
+ *
+ * @since 6.2.0
+ */
+function wp_clean_theme_json_cache() {
+	wp_cache_delete( 'wp_get_global_stylesheet', 'theme_json' );
+	wp_cache_delete( 'wp_get_global_styles_svg_filters', 'theme_json' );
+	wp_cache_delete( 'wp_get_global_settings_custom', 'theme_json' );
+	wp_cache_delete( 'wp_get_global_settings_theme', 'theme_json' );
+	wp_cache_delete( 'wp_get_global_styles_custom_css', 'theme_json' );
+	wp_cache_delete( 'wp_get_theme_data_template_parts', 'theme_json' );
+	WP_Theme_JSON_Resolver::clean_cached_data();
+}
+
+/**
+ * Returns the current theme's wanted patterns (slugs) to be
+ * registered from Pattern Directory.
+ *
+ * @since 6.3.0
+ *
+ * @return string[]
+ */
+function wp_get_theme_directory_pattern_slugs() {
+	return WP_Theme_JSON_Resolver::get_theme_data( array(), array( 'with_supports' => false ) )->get_patterns();
+}
+
+/**
+ * Returns the metadata for the custom templates defined by the theme via theme.json.
+ *
+ * @since 6.4.0
+ *
+ * @return array Associative array of `$template_name => $template_data` pairs,
+ *               with `$template_data` having "title" and "postTypes" fields.
+ */
+function wp_get_theme_data_custom_templates() {
+	return WP_Theme_JSON_Resolver::get_theme_data( array(), array( 'with_supports' => false ) )->get_custom_templates();
+}
+
+/**
+ * Returns the metadata for the template parts defined by the theme.
+ *
+ * @since 6.4.0
+ *
+ * @return array Associative array of `$part_name => $part_data` pairs,
+ *               with `$part_data` having "title" and "area" fields.
+ */
+function wp_get_theme_data_template_parts() {
+	$cache_group    = 'theme_json';
+	$cache_key      = 'wp_get_theme_data_template_parts';
+	$can_use_cached = ! wp_is_development_mode( 'theme' );
+
+	$metadata = false;
+	if ( $can_use_cached ) {
+		$metadata = wp_cache_get( $cache_key, $cache_group );
+		if ( false !== $metadata ) {
+			return $metadata;
+		}
+	}
+
+	if ( false === $metadata ) {
+		$metadata = WP_Theme_JSON_Resolver::get_theme_data( array(), array( 'with_supports' => false ) )->get_template_parts();
+		if ( $can_use_cached ) {
+			wp_cache_set( $cache_key, $metadata, $cache_group );
+		}
+	}
+
+	return $metadata;
+}
+
+/**
+ * Determines the CSS selector for the block type and property provided,
+ * returning it if available.
+ *
+ * @since 6.3.0
+ *
+ * @param WP_Block_Type $block_type The block's type.
+ * @param string|array  $target     The desired selector's target, `root` or array path.
+ * @param boolean       $fallback   Whether to fall back to broader selector.
+ *
+ * @return string|null CSS selector or `null` if no selector available.
+ */
+function wp_get_block_css_selector( $block_type, $target = 'root', $fallback = false ) {
+	if ( empty( $target ) ) {
+		return null;
+	}
+
+	$has_selectors = ! empty( $block_type->selectors );
+
+	// Root Selector.
+
+	// Calculated before returning as it can be used as fallback for
+	// feature selectors later on.
+	$root_selector = null;
+
+	if ( $has_selectors && isset( $block_type->selectors['root'] ) ) {
+		// Use the selectors API if available.
+		$root_selector = $block_type->selectors['root'];
+	} elseif ( isset( $block_type->supports['__experimentalSelector'] ) && is_string( $block_type->supports['__experimentalSelector'] ) ) {
+		// Use the old experimental selector supports property if set.
+		$root_selector = $block_type->supports['__experimentalSelector'];
+	} else {
+		// If no root selector found, generate default block class selector.
+		$block_name    = str_replace( '/', '-', str_replace( 'core/', '', $block_type->name ) );
+		$root_selector = ".wp-block-{$block_name}";
+	}
+
+	// Return selector if it's the root target we are looking for.
+	if ( 'root' === $target ) {
+		return $root_selector;
+	}
+
+	// If target is not `root` we have a feature or subfeature as the target.
+	// If the target is a string convert to an array.
+	if ( is_string( $target ) ) {
+		$target = explode( '.', $target );
+	}
+
+	// Feature Selectors ( May fallback to root selector ).
+	if ( 1 === count( $target ) ) {
+		$fallback_selector = $fallback ? $root_selector : null;
+
+		// Prefer the selectors API if available.
+		if ( $has_selectors ) {
+			// Look for selector under `feature.root`.
+			$path             = array( current( $target ), 'root' );
+			$feature_selector = _wp_array_get( $block_type->selectors, $path, null );
+
+			if ( $feature_selector ) {
+				return $feature_selector;
+			}
+
+			// Check if feature selector is set via shorthand.
+			$feature_selector = _wp_array_get( $block_type->selectors, $target, null );
+
+			return is_string( $feature_selector ) ? $feature_selector : $fallback_selector;
+		}
+
+		// Try getting old experimental supports selector value.
+		$path             = array( current( $target ), '__experimentalSelector' );
+		$feature_selector = _wp_array_get( $block_type->supports, $path, null );
+
+		// Nothing to work with, provide fallback or null.
+		if ( null === $feature_selector ) {
+			return $fallback_selector;
+		}
+
+		// Scope the feature selector by the block's root selector.
+		return WP_Theme_JSON::scope_selector( $root_selector, $feature_selector );
+	}
+
+	// Subfeature selector
+	// This may fallback either to parent feature or root selector.
+	$subfeature_selector = null;
+
+	// Use selectors API if available.
+	if ( $has_selectors ) {
+		$subfeature_selector = _wp_array_get( $block_type->selectors, $target, null );
+	}
+
+	// Only return if we have a subfeature selector.
+	if ( $subfeature_selector ) {
+		return $subfeature_selector;
+	}
+
+	// To this point we don't have a subfeature selector. If a fallback
+	// has been requested, remove subfeature from target path and return
+	// results of a call for the parent feature's selector.
+	if ( $fallback ) {
+		return wp_get_block_css_selector( $block_type, $target[0], $fallback );
+	}
+
+	return null;
+}
diff --git a/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php b/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php
new file mode 100644
index 0000000000000..95989914be030
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-active-formatting-elements.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * HTML API: WP_HTML_Active_Formatting_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of active formatting elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the list of active formatting elements is empty.
+ * > It is used to handle mis-nested formatting element tags.
+ * >
+ * > The list contains elements in the formatting category, and markers.
+ * > The markers are inserted when entering applet, object, marquee,
+ * > template, td, th, and caption elements, and are used to prevent
+ * > formatting from "leaking" into applet, object, marquee, template,
+ * > td, th, and caption elements.
+ * >
+ * > In addition, each element in the list of active formatting elements
+ * > is associated with the token for which it was created, so that
+ * > further elements can be created for that token if necessary.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+ * @see WP_HTML_Processor
+ */
+class WP_HTML_Active_Formatting_Elements {
+	/**
+	 * Holds the stack of active formatting element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	private $stack = array();
+
+	/**
+	 * Reports if a specific node is in the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of active formatting elements.
+	 */
+	public function contains_node( $token ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of active formatting elements.
+	 */
+	public function count() {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of active formatting elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of active formatting elements, if one exists, otherwise null.
+	 */
+	public function current_node() {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Pushes a node onto the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#push-onto-the-list-of-active-formatting-elements
+	 *
+	 * @param WP_HTML_Token $token Push this node onto the stack.
+	 */
+	public function push( $token ) {
+		/*
+		 * > If there are already three elements in the list of active formatting elements after the last marker,
+		 * > if any, or anywhere in the list if there are no markers, that have the same tag name, namespace, and
+		 * > attributes as element, then remove the earliest such element from the list of active formatting
+		 * > elements. For these purposes, the attributes must be compared as they were when the elements were
+		 * > created by the parser; two elements have the same attributes if all their parsed attributes can be
+		 * > paired such that the two attributes in each pair have identical names, namespaces, and values
+		 * > (the order of the attributes does not matter).
+		 *
+		 * @TODO: Implement the "Noah's Ark clause" to only add up to three of any given kind of formatting elements to the stack.
+		 */
+		// > Add element to the list of active formatting elements.
+		$this->stack[] = $token;
+	}
+
+	/**
+	 * Removes a node from the stack of active formatting elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Remove this node from the stack, if it's there already.
+	 * @return bool Whether the node was found and removed from the stack of active formatting elements.
+	 */
+	public function remove_node( $token ) {
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Steps through the stack of active formatting elements, starting with the
+	 * top element (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Active_Formatting_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of active formatting elements, starting with the
+	 * bottom element (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Active_Formatting_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_up() {
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			yield $this->stack[ $i ];
+		}
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-attribute-token.php b/src/wp-includes/html-api/class-wp-html-attribute-token.php
new file mode 100644
index 0000000000000..f938609e41687
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-attribute-token.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * HTML API: WP_HTML_Attribute_Token class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor as a data structure for the attribute token,
+ * allowing to drastically improve performance.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class WP_HTML_Attribute_Token {
+	/**
+	 * Attribute name.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	public $name;
+
+	/**
+	 * Attribute value.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $value_starts_at;
+
+	/**
+	 * How many bytes the value occupies in the input HTML.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $value_length;
+
+	/**
+	 * The string offset where the attribute name starts.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * The string offset after the attribute value or its name.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $end;
+
+	/**
+	 * Whether the attribute is a boolean attribute with value `true`.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	public $is_true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name         Attribute name.
+	 * @param int    $value_start  Attribute value.
+	 * @param int    $value_length Number of bytes attribute value spans.
+	 * @param int    $start        The string offset where the attribute name starts.
+	 * @param int    $end          The string offset after the attribute value or its name.
+	 * @param bool   $is_true      Whether the attribute is a boolean attribute with true value.
+	 */
+	public function __construct( $name, $value_start, $value_length, $start, $end, $is_true ) {
+		$this->name            = $name;
+		$this->value_starts_at = $value_start;
+		$this->value_length    = $value_length;
+		$this->start           = $start;
+		$this->end             = $end;
+		$this->is_true         = $is_true;
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-open-elements.php b/src/wp-includes/html-api/class-wp-html-open-elements.php
new file mode 100644
index 0000000000000..035717b444302
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-open-elements.php
@@ -0,0 +1,432 @@
+<?php
+/**
+ * HTML API: WP_HTML_Open_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of open elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the stack of open elements is empty. The stack grows
+ * > downwards; the topmost node on the stack is the first one added
+ * > to the stack, and the bottommost node of the stack is the most
+ * > recently added node in the stack (notwithstanding when the stack
+ * > is manipulated in a random access fashion as part of the handling
+ * > for misnested tags).
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#stack-of-open-elements
+ * @see WP_HTML_Processor
+ */
+class WP_HTML_Open_Elements {
+	/**
+	 * Holds the stack of open element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	public $stack = array();
+
+	/**
+	 * Whether a P element is in button scope currently.
+	 *
+	 * This class optimizes scope lookup by pre-calculating
+	 * this value when elements are added and removed to the
+	 * stack of open elements which might change its value.
+	 * This avoids frequent iteration over the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var bool
+	 */
+	private $has_p_in_button_scope = false;
+
+	/**
+	 * Reports if a specific node is in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of open elements.
+	 */
+	public function contains_node( $token ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of open elements.
+	 */
+	public function count() {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of open elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of open elements, if one exists, otherwise null.
+	 */
+	public function current_node() {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Returns whether an element is in a specific scope.
+	 *
+	 * ## HTML Support
+	 *
+	 * This function skips checking for the termination list because there
+	 * are no supported elements which appear in the termination list.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-the-specific-scope
+	 *
+	 * @param string   $tag_name         Name of tag check.
+	 * @param string[] $termination_list List of elements that terminate the search.
+	 * @return bool Whether the element was found in a specific scope.
+	 */
+	public function has_element_in_specific_scope( $tag_name, $termination_list ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		foreach ( $this->walk_up() as $node ) {
+			if ( $node->node_name === $tag_name ) {
+				return true;
+			}
+
+			switch ( $node->node_name ) {
+				case 'HTML':
+					return false;
+			}
+
+			if ( in_array( $node->node_name, $termination_list, true ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether a particular element is in scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+
+				/*
+				 * Because it's not currently possible to encounter
+				 * one of the termination elements, they don't need
+				 * to be listed here. If they were, they would be
+				 * unreachable and only waste CPU cycles while
+				 * scanning through HTML.
+				 */
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in list item scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_list_item_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on list item scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a particular element is in button scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_button_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope( $tag_name, array( 'BUTTON' ) );
+	}
+
+	/**
+	 * Returns whether a particular element is in table scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_table_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on table scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a particular element is in select scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_select_scope( $tag_name ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a P is in BUTTON scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @return bool Whether a P is in BUTTON scope.
+	 */
+	public function has_p_in_button_scope() {
+		return $this->has_p_in_button_scope;
+	}
+
+	/**
+	 * Pops a node off of the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @return bool Whether a node was popped off of the stack.
+	 */
+	public function pop() {
+		$item = array_pop( $this->stack );
+
+		if ( null === $item ) {
+			return false;
+		}
+
+		$this->after_element_pop( $item );
+		return true;
+	}
+
+	/**
+	 * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Open_Elements::pop
+	 *
+	 * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
+	 * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
+	 */
+	public function pop_until( $tag_name ) {
+		foreach ( $this->walk_up() as $item ) {
+			$this->pop();
+
+			if ( $tag_name === $item->node_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pushes a node onto the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @param WP_HTML_Token $stack_item Item to add onto stack.
+	 */
+	public function push( $stack_item ) {
+		$this->stack[] = $stack_item;
+		$this->after_element_push( $stack_item );
+	}
+
+	/**
+	 * Removes a specific node from the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token The node to remove from the stack of open elements.
+	 * @return bool Whether the node was found and removed from the stack of open elements.
+	 */
+	public function remove_node( $token ) {
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			$this->after_element_pop( $item );
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Steps through the stack of open elements, starting with the top element
+	 * (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Open_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of open elements, starting with the bottom element
+	 * (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Open_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_up() {
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/*
+	 * Internal helpers.
+	 */
+
+	/**
+	 * Updates internal flags after adding an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was added to the stack of open elements.
+	 */
+	public function after_element_push( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = false;
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = true;
+				break;
+		}
+	}
+
+	/**
+	 * Updates internal flags after removing an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was removed from the stack of open elements.
+	 */
+	public function after_element_pop( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+		}
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-processor-state.php b/src/wp-includes/html-api/class-wp-html-processor-state.php
new file mode 100644
index 0000000000000..3fe5192431bd3
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-processor-state.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor_State class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the internal parsing state.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class WP_HTML_Processor_State {
+	/*
+	 * Insertion mode constants.
+	 *
+	 * These constants exist and are named to make it easier to
+	 * discover and recognize the supported insertion modes in
+	 * the parser.
+	 *
+	 * Out of all the possible insertion modes, only those
+	 * supported by the parser are listed here. As support
+	 * is added to the parser for more modes, add them here
+	 * following the same naming and value pattern.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-insertion-mode
+	 */
+
+	/**
+	 * Initial insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_INITIAL = 'insertion-mode-initial';
+
+	/**
+	 * In body insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_BODY = 'insertion-mode-in-body';
+
+	/**
+	 * Tracks open elements while scanning HTML.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @var WP_HTML_Open_Elements
+	 */
+	public $stack_of_open_elements = null;
+
+	/**
+	 * Tracks open formatting elements, used to handle mis-nested formatting element tags.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+	 *
+	 * @var WP_HTML_Active_Formatting_Elements
+	 */
+	public $active_formatting_elements = null;
+
+	/**
+	 * Tree construction insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insertion-mode
+	 *
+	 * @var string
+	 */
+	public $insertion_mode = self::INSERTION_MODE_INITIAL;
+
+	/**
+	 * Context node initializing fragment parser, if created as a fragment parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#concept-frag-parse-context
+	 *
+	 * @var [string, array]|null
+	 */
+	public $context_node = null;
+
+	/**
+	 * The frameset-ok flag indicates if a `FRAMESET` element is allowed in the current state.
+	 *
+	 * > The frameset-ok flag is set to "ok" when the parser is created. It is set to "not ok" after certain tokens are seen.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#frameset-ok-flag
+	 *
+	 * @var bool
+	 */
+	public $frameset_ok = true;
+
+	/**
+	 * Constructor - creates a new and empty state value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor
+	 */
+	public function __construct() {
+		$this->stack_of_open_elements     = new WP_HTML_Open_Elements();
+		$this->active_formatting_elements = new WP_HTML_Active_Formatting_Elements();
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php
new file mode 100644
index 0000000000000..6e1723494c2e9
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-processor.php
@@ -0,0 +1,1351 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used to safely parse and modify an HTML document.
+ *
+ * The HTML Processor class properly parses and modifies HTML5 documents.
+ *
+ * It supports a subset of the HTML5 specification, and when it encounters
+ * unsupported markup, it aborts early to avoid unintentionally breaking
+ * the document. The HTML Processor should never break an HTML document.
+ *
+ * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
+ * attributes on individual HTML tags, the HTML Processor is more capable
+ * and useful for the following operations:
+ *
+ *  - Querying based on nested HTML structure.
+ *
+ * Eventually the HTML Processor will also support:
+ *  - Wrapping a tag in surrounding HTML.
+ *  - Unwrapping a tag by removing its parent.
+ *  - Inserting and removing nodes.
+ *  - Reading and changing inner content.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *   1. Call a static creator method with your input HTML document.
+ *   2. Find the location in the document you are looking for.
+ *   3. Request changes to the document at that location.
+ *
+ * Example:
+ *
+ *     $processor = WP_HTML_Processor::createFragment( $html );
+ *     if ( $processor->next_tag( array( 'breadcrumbs' => array( 'DIV', 'FIGURE', 'IMG' ) ) ) ) {
+ *         $processor->add_class( 'responsive-image' );
+ *     }
+ *
+ * #### Breadcrumbs
+ *
+ * Breadcrumbs represent the stack of open elements from the root
+ * of the document or fragment down to the currently-matched node,
+ * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
+ * to inspect the breadcrumbs for a matched tag.
+ *
+ * Breadcrumbs can specify nested HTML structure and are equivalent
+ * to a CSS selector comprising tag names separated by the child
+ * combinator, such as "DIV > FIGURE > IMG".
+ *
+ * Since all elements find themselves inside a full HTML document
+ * when parsed, the return value from `get_breadcrumbs()` will always
+ * contain any implicit outermost elements. For example, when parsing
+ * with `createFragment()` in the `BODY` context (the default), any
+ * tag in the given HTML document will contain `array( 'HTML', 'BODY', … )`
+ * in its breadcrumbs.
+ *
+ * Despite containing the implied outermost elements in their breadcrumbs,
+ * tags may be found with the shortest-matching breadcrumb query. That is,
+ * `array( 'IMG' )` matches all IMG elements and `array( 'P', 'IMG' )`
+ * matches all IMG elements directly inside a P element. To ensure that no
+ * partial matches erroneously match it's possible to specify in a query
+ * the full breadcrumb match.
+ *
+ * Example:
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //               ----- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG' ) ) );
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //                                  ---- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG', 'FIGCAPTION', 'EM' ) ) );
+ *
+ *     $html = '<div><img></div><img>';
+ *     //                       ----- Matches here, because IMG must be a direct child of the implicit BODY.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'BODY', 'IMG' ) ) );
+ *
+ * ## HTML Support
+ *
+ * This class implements a small part of the HTML5 specification.
+ * It's designed to operate within its support and abort early whenever
+ * encountering circumstances it can't properly handle. This is
+ * the principle way in which this class remains as simple as possible
+ * without cutting corners and breaking compliance.
+ *
+ * ### Supported elements
+ *
+ * If any unsupported element appears in the HTML input the HTML Processor
+ * will abort early and stop all processing. This draconian measure ensures
+ * that the HTML Processor won't break any HTML it doesn't fully understand.
+ *
+ * The following list specifies the HTML tags that _are_ supported:
+ *
+ *  - Links: A.
+ *  - The formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
+ *  - Containers: DIV, FIGCAPTION, FIGURE.
+ *  - Paragraph: P.
+ *  - Void elements: IMG.
+ *
+ * ### Supported markup
+ *
+ * Some kinds of non-normative HTML involve reconstruction of formatting elements and
+ * re-parenting of mis-nested elements. For example, a DIV tag found inside a TABLE
+ * may in fact belong _before_ the table in the DOM. If the HTML Processor encounters
+ * such a case it will stop processing.
+ *
+ * The following list specifies HTML markup that _is_ supported:
+ *
+ *  - Markup involving only those tags listed above.
+ *  - Fully-balanced and non-overlapping tags.
+ *  - HTML with unexpected tag closers.
+ *  - P tags after unclosed P tags.
+ *  - A tags after unclosed A tags that don't involve any active formatting elements.
+ *
+ * @since 6.4.0
+ *
+ * @see WP_HTML_Tag_Processor
+ * @see https://html.spec.whatwg.org/
+ */
+class WP_HTML_Processor extends WP_HTML_Tag_Processor {
+	/**
+	 * HTML processing requires more bookmarks than basic tag processing.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var int
+	 */
+	const MAX_BOOKMARKS = 100;
+
+	/**
+	 * Static query for instructing the Tag Processor to visit every token.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var array
+	 */
+	const VISIT_EVERYTHING = array( 'tag_closers' => 'visit' );
+
+	/**
+	 * Holds the working state of the parser, including the stack of
+	 * open elements and the stack of active formatting elements.
+	 *
+	 * Initialized in the constructor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Processor_State
+	 */
+	private $state = null;
+
+	/**
+	 * Used to create unique bookmark names.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var int
+	 */
+	private $bookmark_counter = 0;
+
+	/**
+	 * Refers to the currently-matched tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	private $current_token = null;
+
+	/**
+	 * Stores an explanation for why something failed, if it did.
+	 *
+	 * @see self::get_last_error
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string|null
+	 */
+	private $last_error = null;
+
+	/**
+	 * Releases a bookmark when PHP garbage-collects its wrapping WP_HTML_Token instance.
+	 *
+	 * This function is created inside the class constructor so that it can be passed to
+	 * the stack of open elements and the stack of active formatting elements without
+	 * exposing it as a public method on the class.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var closure
+	 */
+	private $release_internal_bookmark = null;
+
+	/*
+	 * Public Interface Functions
+	 */
+
+	/**
+	 * Creates an HTML processor in the fragment parsing mode.
+	 *
+	 * Use this for cases where you are processing chunks of HTML that
+	 * will be found within a bigger HTML document, such as rendered
+	 * block output that exists within a post, `the_content` inside a
+	 * rendered site layout.
+	 *
+	 * Fragment parsing occurs within a context, which is an HTML element
+	 * that the document will eventually be placed in. It becomes important
+	 * when special elements have different rules than others, such as inside
+	 * a TEXTAREA or a TITLE tag where things that look like tags are text,
+	 * or inside a SCRIPT tag where things that look like HTML syntax are JS.
+	 *
+	 * The context value should be a representation of the tag into which the
+	 * HTML is found. For most cases this will be the body element. The HTML
+	 * form is provided because a context element may have attributes that
+	 * impact the parse, such as with a SCRIPT tag and its `type` attribute.
+	 *
+	 * ## Current HTML Support
+	 *
+	 *  - The only supported context is `<body>`, which is the default value.
+	 *  - The only supported document encoding is `UTF-8`, which is the default value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $html     Input HTML fragment to process.
+	 * @param string $context  Context element for the fragment, must be default of `<body>`.
+	 * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
+	 * @return WP_HTML_Processor|null The created processor if successful, otherwise null.
+	 */
+	public static function createFragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
+		if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
+			return null;
+		}
+
+		$p                        = new self( $html, self::CONSTRUCTOR_UNLOCK_CODE );
+		$p->state->context_node   = array( 'BODY', array() );
+		$p->state->insertion_mode = WP_HTML_Processor_State::INSERTION_MODE_IN_BODY;
+
+		// @TODO: Create "fake" bookmarks for non-existent but implied nodes.
+		$p->bookmarks['root-node']    = new WP_HTML_Span( 0, 0 );
+		$p->bookmarks['context-node'] = new WP_HTML_Span( 0, 0 );
+
+		$p->state->stack_of_open_elements->push(
+			new WP_HTML_Token(
+				'root-node',
+				'HTML',
+				false
+			)
+		);
+
+		$p->state->stack_of_open_elements->push(
+			new WP_HTML_Token(
+				'context-node',
+				$p->state->context_node[0],
+				false
+			)
+		);
+
+		return $p;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string      $html                                  HTML to process.
+	 * @param string|null $use_the_static_create_methods_instead This constructor should not be called manually.
+	 */
+	public function __construct( $html, $use_the_static_create_methods_instead = null ) {
+		parent::__construct( $html );
+
+		if ( self::CONSTRUCTOR_UNLOCK_CODE !== $use_the_static_create_methods_instead ) {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: WP_HTML_Processor::createFragment. */
+					__( 'Call %s to create an HTML Processor instead of calling the constructor directly.' ),
+					'<code>WP_HTML_Processor::createFragment</code>'
+				),
+				'6.4.0'
+			);
+		}
+
+		$this->state = new WP_HTML_Processor_State();
+
+		/*
+		 * Create this wrapper so that it's possible to pass
+		 * a private method into WP_HTML_Token classes without
+		 * exposing it to any public API.
+		 */
+		$this->release_internal_bookmark = function ( $name ) {
+			parent::release_bookmark( $name );
+		};
+	}
+
+	/**
+	 * Returns the last error, if any.
+	 *
+	 * Various situations lead to parsing failure but this class will
+	 * return `false` in all those cases. To determine why something
+	 * failed it's possible to request the last error. This can be
+	 * helpful to know if it's possible to fix something or to give up.
+	 *
+	 * Example
+	 *
+	 *     $p = WP_HTML_Processor::createFragment( '<template><strong><button><em><p><em>' );
+	 *     false === $p->next_tag();
+	 *     WP_HTML_Processor::ERROR_UNSUPPORTED === $p->get_last_error();
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see self::ERROR_UNSUPPORTED
+	 * @see self::ERROR_EXCEEDED_MAX_BOOKMARKS
+	 *
+	 * @return string|null The last error, if one exists, otherwise null.
+	 */
+	public function get_last_error() {
+		return $this->last_error;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @TODO: Support matching the class name and tag name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string[]    $breadcrumbs  DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ) {
+		if ( null === $query ) {
+			while ( $this->step() ) {
+				if ( ! $this->is_tag_closer() ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( is_string( $query ) ) {
+			$query = array( 'breadcrumbs' => array( $query ) );
+		}
+
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Please pass a query array to this function.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
+			while ( $this->step() ) {
+				if ( ! $this->is_tag_closer() ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( isset( $query['tag_closers'] ) && 'visit' === $query['tag_closers'] ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Cannot visit tag closers in HTML Processor.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		$breadcrumbs  = $query['breadcrumbs'];
+		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
+
+		$crumb  = end( $breadcrumbs );
+		$target = strtoupper( $crumb );
+		while ( $match_offset > 0 && $this->step() ) {
+			if ( $target !== $this->get_tag() ) {
+				continue;
+			}
+
+			// Look up the stack to see if the breadcrumbs match.
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+				if ( strtoupper( $crumb ) !== $node->node_name ) {
+					break;
+				}
+
+				$crumb = prev( $breadcrumbs );
+				if ( false === $crumb && 0 === --$match_offset && ! $this->is_tag_closer() ) {
+					return true;
+				}
+			}
+
+			$crumb = end( $breadcrumbs );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Steps through the HTML document and stop at the next tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @see self::PROCESS_NEXT_NODE
+	 * @see self::REPROCESS_CURRENT_NODE
+	 *
+	 * @param string $node_to_process Whether to parse the next node or reprocess the current node.
+	 * @return bool Whether a tag was matched.
+	 */
+	public function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
+		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
+			$top_node = $this->state->stack_of_open_elements->current_node();
+			if ( $top_node && self::is_void( $top_node->node_name ) ) {
+				$this->state->stack_of_open_elements->pop();
+			}
+
+			parent::next_tag( self::VISIT_EVERYTHING );
+		}
+
+		// Finish stepping when there are no more tokens in the document.
+		if ( null === $this->get_tag() ) {
+			return false;
+		}
+
+		$this->current_token = new WP_HTML_Token(
+			$this->bookmark_tag(),
+			$this->get_tag(),
+			$this->is_tag_closer(),
+			$this->release_internal_bookmark
+		);
+
+		try {
+			switch ( $this->state->insertion_mode ) {
+				case WP_HTML_Processor_State::INSERTION_MODE_IN_BODY:
+					return $this->step_in_body();
+
+				default:
+					$this->last_error = self::ERROR_UNSUPPORTED;
+					throw new WP_HTML_Unsupported_Exception( 'Cannot parse outside of the IN BODY insertion mode.' );
+			}
+		} catch ( WP_HTML_Unsupported_Exception $e ) {
+			/*
+			 * Exceptions are used in this class to escape deep call stacks that
+			 * otherwise might involve messier calling and return conventions.
+			 */
+			return false;
+		}
+	}
+
+	/**
+	 * Computes the HTML breadcrumbs for the currently-matched node, if matched.
+	 *
+	 * Breadcrumbs start at the outer-most parent and descend toward the matched element.
+	 *
+	 * Example
+	 *
+	 *     $p = WP_HTML_Processor::createFragment( '<p><strong><em><img></em></strong></p>' );
+	 *     $p->next_tag( 'IMG' );
+	 *     $p->get_breadcrumbs() === array( 'HTML', 'BODY', 'P', 'STRONG', 'EM', 'IMG' );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string[]|null Array of tag-names representing path to matched node, if matched, otherwise null.
+	 */
+	public function get_breadcrumbs() {
+		if ( ! $this->get_tag() ) {
+			return null;
+		}
+
+		$breadcrumbs = array();
+		foreach ( $this->state->stack_of_open_elements->walk_down() as $stack_item ) {
+			$breadcrumbs[] = $stack_item->node_name;
+		}
+
+		return $breadcrumbs;
+	}
+
+	/**
+	 * Parses next element in the 'in body' insertion mode.
+	 *
+	 * This internal function performs the 'in body' insertion mode
+	 * logic for the generalized `self::step()` function.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see self::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_body() {
+		$tag_name = $this->get_tag();
+		$op_sigil = $this->is_tag_closer() ? '-' : '+';
+		$op       = "{$op_sigil}{$tag_name}";
+
+		switch ( $op ) {
+			/*
+			 * > A start tag whose tag name is "button"
+			 */
+			case '+BUTTON':
+				if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
+					// @TODO: Indicate a parse error once it's possible. This error does not impact the logic here.
+					$this->generate_implied_end_tags();
+					$this->state->stack_of_open_elements->pop_until( 'BUTTON' );
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->current_token );
+				$this->state->frameset_ok = false;
+
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "address", "article", "aside",
+			 * > "blockquote", "center", "details", "dialog", "dir", "div", "dl",
+			 * > "fieldset", "figcaption", "figure", "footer", "header", "hgroup",
+			 * > "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul"
+			 */
+			case '+BLOCKQUOTE':
+			case '+DIV':
+			case '+FIGCAPTION':
+			case '+FIGURE':
+			case '+P':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "address", "article", "aside", "blockquote",
+			 * > "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset",
+			 * > "figcaption", "figure", "footer", "header", "hgroup", "listing", "main",
+			 * > "menu", "nav", "ol", "pre", "search", "section", "summary", "ul"
+			 */
+			case '-BLOCKQUOTE':
+			case '-BUTTON':
+			case '-DIV':
+			case '-FIGCAPTION':
+			case '-FIGURE':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $tag_name ) ) {
+					// @TODO: Report parse error.
+					// Ignore the token.
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $tag_name ) {
+					// @TODO: Record parse error: this error doesn't impact parsing.
+				}
+				$this->state->stack_of_open_elements->pop_until( $tag_name );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "p"
+			 */
+			case '-P':
+				if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->insert_html_element( $this->current_token );
+				}
+
+				$this->close_a_p_element();
+				return true;
+
+			// > A start tag whose tag name is "a"
+			case '+A':
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					switch ( $item->node_name ) {
+						case 'marker':
+							break;
+
+						case 'A':
+							$this->run_adoption_agency_algorithm();
+							$this->state->active_formatting_elements->remove_node( $item );
+							$this->state->stack_of_open_elements->remove_node( $item );
+							break;
+					}
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->current_token );
+				$this->state->active_formatting_elements->push( $this->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "b", "big", "code", "em", "font", "i",
+			 * > "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '+B':
+			case '+BIG':
+			case '+CODE':
+			case '+EM':
+			case '+FONT':
+			case '+I':
+			case '+S':
+			case '+SMALL':
+			case '+STRIKE':
+			case '+STRONG':
+			case '+TT':
+			case '+U':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->current_token );
+				$this->state->active_formatting_elements->push( $this->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "a", "b", "big", "code", "em", "font", "i",
+			 * > "nobr", "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '-A':
+			case '-B':
+			case '-BIG':
+			case '-CODE':
+			case '-EM':
+			case '-FONT':
+			case '-I':
+			case '-S':
+			case '-SMALL':
+			case '-STRIKE':
+			case '-STRONG':
+			case '-TT':
+			case '-U':
+				$this->run_adoption_agency_algorithm();
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
+			 */
+			case '+IMG':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->current_token );
+				return true;
+
+			/*
+			 * > Any other start tag
+			 */
+			case '+SPAN':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->current_token );
+				return true;
+
+			/*
+			 * Any other end tag
+			 */
+			case '-SPAN':
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					// > If node is an HTML element with the same tag name as the token, then:
+					if ( $item->node_name === $tag_name ) {
+						$this->generate_implied_end_tags( $tag_name );
+
+						// > If node is not the current node, then this is a parse error.
+
+						$this->state->stack_of_open_elements->pop_until( $tag_name );
+						return true;
+					}
+
+					// > Otherwise, if node is in the special category, then this is a parse error; ignore the token, and return.
+					if ( self::is_special( $item->node_name ) ) {
+						return $this->step();
+					}
+				}
+				// Execution should not reach here; if it does then something went wrong.
+				return false;
+
+			default:
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( "Cannot process {$tag_name} element." );
+		}
+	}
+
+	/*
+	 * Internal helpers
+	 */
+
+	/**
+	 * Creates a new bookmark for the currently-matched tag and returns generated name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate requested bookmark.
+	 *
+	 * @return string|false Name of created bookmark, or false if unable to create.
+	 */
+	private function bookmark_tag() {
+		if ( ! $this->get_tag() ) {
+			return false;
+		}
+
+		if ( ! parent::set_bookmark( ++$this->bookmark_counter ) ) {
+			$this->last_error = self::ERROR_EXCEEDED_MAX_BOOKMARKS;
+			throw new Exception( 'could not allocate bookmark' );
+		}
+
+		return "{$this->bookmark_counter}";
+	}
+
+	/*
+	 * HTML semantic overrides for Tag Processor
+	 */
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $p->next_tag() === true;
+	 *     $p->get_tag() === 'DIV';
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_tag() === null;
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag() {
+		$tag_name = parent::get_tag();
+
+		switch ( $tag_name ) {
+			case 'IMAGE':
+				/*
+				 * > A start tag whose tag name is "image"
+				 * > Change the token's tag name to "img" and reprocess it. (Don't ask.)
+				 */
+				return 'IMG';
+
+			default:
+				return $tag_name;
+		}
+	}
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $bookmark_name ) {
+		return parent::release_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Moves the internal cursor in the Tag Processor to a given bookmark's location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ) {
+		$actual_bookmark_name = "_{$bookmark_name}";
+		$processor_started_at = $this->current_token ? $this->bookmarks[ $this->current_token->bookmark_name ]->start : 0;
+		$bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
+		$direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
+
+		switch ( $direction ) {
+			case 'forward':
+				// When moving forwards, re-parse the document until reaching the same location as the original bookmark.
+				while ( $this->step() ) {
+					if ( $bookmark_starts_at === $this->bookmarks[ $this->current_token->bookmark_name ]->start ) {
+						return true;
+					}
+				}
+
+				return false;
+
+			case 'backward':
+				/*
+				 * When moving backwards, clear out all existing stack entries which appear after the destination
+				 * bookmark. These could be stored for later retrieval, but doing so would require additional
+				 * memory overhead and also demand that references and bookmarks are updated as the document
+				 * changes. In time this could be a valuable optimization, but it's okay to give up that
+				 * optimization in exchange for more CPU time to recompute the stack, to re-parse the
+				 * document that may have already been parsed once.
+				 */
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
+						break;
+					}
+
+					$this->state->stack_of_open_elements->remove_node( $item );
+				}
+
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
+						break;
+					}
+
+					$this->state->active_formatting_elements->remove_node( $item );
+				}
+
+				return parent::seek( $actual_bookmark_name );
+		}
+	}
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $bookmark_name ) {
+		return parent::set_bookmark( "_{$bookmark_name}" );
+	}
+
+	/*
+	 * HTML Parsing Algorithms
+	 */
+
+	/**
+	 * Closes a P element.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#close-a-p-element
+	 */
+	private function close_a_p_element() {
+		$this->generate_implied_end_tags( 'P' );
+		$this->state->stack_of_open_elements->pop_until( 'P' );
+	}
+
+	/**
+	 * Closes elements that have implied end tags.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 *
+	 * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
+	 */
+	private function generate_implied_end_tags( $except_for_this_element = null ) {
+		$elements_with_implied_end_tags = array(
+			'P',
+		);
+
+		$current_node = $this->state->stack_of_open_elements->current_node();
+		while (
+			$current_node && $current_node->node_name !== $except_for_this_element &&
+			in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
+		) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Closes elements that have implied end tags, thoroughly.
+	 *
+	 * See the HTML specification for an explanation why this is
+	 * different from generating end tags in the normal sense.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::generate_implied_end_tags
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 */
+	private function generate_implied_end_tags_thoroughly() {
+		$elements_with_implied_end_tags = array(
+			'P',
+		);
+
+		while ( in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true ) ) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Reconstructs the active formatting elements.
+	 *
+	 * > This has the effect of reopening all the formatting elements that were opened
+	 * > in the current body, cell, or caption (whichever is youngest) that haven't
+	 * > been explicitly closed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
+	 *
+	 * @return bool Whether any formatting elements needed to be reconstructed.
+	 */
+	private function reconstruct_active_formatting_elements() {
+		/*
+		 * > If there are no entries in the list of active formatting elements, then there is nothing
+		 * > to reconstruct; stop this algorithm.
+		 */
+		if ( 0 === $this->state->active_formatting_elements->count() ) {
+			return false;
+		}
+
+		$last_entry = $this->state->active_formatting_elements->current_node();
+		if (
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is a marker;
+			 * > stop this algorithm.
+			 */
+			'marker' === $last_entry->node_name ||
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is an
+			 * > element that is in the stack of open elements, then there is nothing to reconstruct;
+			 * > stop this algorithm.
+			 */
+			$this->state->stack_of_open_elements->contains_node( $last_entry )
+		) {
+			return false;
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot reconstruct active formatting elements when advancing and rewinding is required.' );
+	}
+
+	/**
+	 * Runs the adoption agency algorithm.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
+	 */
+	private function run_adoption_agency_algorithm() {
+		$budget       = 1000;
+		$subject      = $this->get_tag();
+		$current_node = $this->state->stack_of_open_elements->current_node();
+
+		if (
+			// > If the current node is an HTML element whose tag name is subject
+			$current_node && $subject === $current_node->node_name &&
+			// > the current node is not in the list of active formatting elements
+			! $this->state->active_formatting_elements->contains_node( $current_node )
+		) {
+			$this->state->stack_of_open_elements->pop();
+			return;
+		}
+
+		$outer_loop_counter = 0;
+		while ( $budget-- > 0 ) {
+			if ( $outer_loop_counter++ >= 8 ) {
+				return;
+			}
+
+			/*
+			 * > Let formatting element be the last element in the list of active formatting elements that:
+			 * >   - is between the end of the list and the last marker in the list,
+			 * >     if any, or the start of the list otherwise,
+			 * >   - and has the tag name subject.
+			 */
+			$formatting_element = null;
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'marker' === $item->node_name ) {
+					break;
+				}
+
+				if ( $subject === $item->node_name ) {
+					$formatting_element = $item;
+					break;
+				}
+			}
+
+			// > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
+			if ( null === $formatting_element ) {
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when "any other end tag" is required.' );
+			}
+
+			// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
+			if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
+				$this->state->active_formatting_elements->remove_node( $formatting_element->bookmark_name );
+				return;
+			}
+
+			// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
+			if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
+				return;
+			}
+
+			/*
+			 * > Let furthest block be the topmost node in the stack of open elements that is lower in the stack
+			 * > than formatting element, and is an element in the special category. There might not be one.
+			 */
+			$is_above_formatting_element = true;
+			$furthest_block              = null;
+			foreach ( $this->state->stack_of_open_elements->walk_down() as $item ) {
+				if ( $is_above_formatting_element && $formatting_element->bookmark_name !== $item->bookmark_name ) {
+					continue;
+				}
+
+				if ( $is_above_formatting_element ) {
+					$is_above_formatting_element = false;
+					continue;
+				}
+
+				if ( self::is_special( $item->node_name ) ) {
+					$furthest_block = $item;
+					break;
+				}
+			}
+
+			/*
+			 * > If there is no furthest block, then the UA must first pop all the nodes from the bottom of the
+			 * > stack of open elements, from the current node up to and including formatting element, then
+			 * > remove formatting element from the list of active formatting elements, and finally return.
+			 */
+			if ( null === $furthest_block ) {
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					$this->state->stack_of_open_elements->pop();
+
+					if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
+						$this->state->active_formatting_elements->remove_node( $formatting_element );
+						return;
+					}
+				}
+			}
+
+			$this->last_error = self::ERROR_UNSUPPORTED;
+			throw new WP_HTML_Unsupported_Exception( 'Cannot extract common ancestor in adoption agency algorithm.' );
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when looping required.' );
+	}
+
+	/**
+	 * Inserts an HTML element on the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insert-a-foreign-element
+	 *
+	 * @param WP_HTML_Token $token Name of bookmark pointing to element in original input HTML.
+	 */
+	private function insert_html_element( $token ) {
+		$this->state->stack_of_open_elements->push( $token );
+	}
+
+	/*
+	 * HTML Specification Helpers
+	 */
+
+	/**
+	 * Returns whether an element of a given name is in the HTML special category.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#special
+	 *
+	 * @param string $tag_name Name of element to check.
+	 * @return bool Whether the element of the given name is in the special category.
+	 */
+	public static function is_special( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'ADDRESS' === $tag_name ||
+			'APPLET' === $tag_name ||
+			'AREA' === $tag_name ||
+			'ARTICLE' === $tag_name ||
+			'ASIDE' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name ||
+			'BGSOUND' === $tag_name ||
+			'BLOCKQUOTE' === $tag_name ||
+			'BODY' === $tag_name ||
+			'BR' === $tag_name ||
+			'BUTTON' === $tag_name ||
+			'CAPTION' === $tag_name ||
+			'CENTER' === $tag_name ||
+			'COL' === $tag_name ||
+			'COLGROUP' === $tag_name ||
+			'DD' === $tag_name ||
+			'DETAILS' === $tag_name ||
+			'DIR' === $tag_name ||
+			'DIV' === $tag_name ||
+			'DL' === $tag_name ||
+			'DT' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FIELDSET' === $tag_name ||
+			'FIGCAPTION' === $tag_name ||
+			'FIGURE' === $tag_name ||
+			'FOOTER' === $tag_name ||
+			'FORM' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'FRAMESET' === $tag_name ||
+			'H1' === $tag_name ||
+			'H2' === $tag_name ||
+			'H3' === $tag_name ||
+			'H4' === $tag_name ||
+			'H5' === $tag_name ||
+			'H6' === $tag_name ||
+			'HEAD' === $tag_name ||
+			'HEADER' === $tag_name ||
+			'HGROUP' === $tag_name ||
+			'HR' === $tag_name ||
+			'HTML' === $tag_name ||
+			'IFRAME' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name ||
+			'LI' === $tag_name ||
+			'LINK' === $tag_name ||
+			'LISTING' === $tag_name ||
+			'MAIN' === $tag_name ||
+			'MARQUEE' === $tag_name ||
+			'MENU' === $tag_name ||
+			'META' === $tag_name ||
+			'NAV' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'NOSCRIPT' === $tag_name ||
+			'OBJECT' === $tag_name ||
+			'OL' === $tag_name ||
+			'P' === $tag_name ||
+			'PARAM' === $tag_name ||
+			'PLAINTEXT' === $tag_name ||
+			'PRE' === $tag_name ||
+			'SCRIPT' === $tag_name ||
+			'SEARCH' === $tag_name ||
+			'SECTION' === $tag_name ||
+			'SELECT' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'SUMMARY' === $tag_name ||
+			'TABLE' === $tag_name ||
+			'TBODY' === $tag_name ||
+			'TD' === $tag_name ||
+			'TEMPLATE' === $tag_name ||
+			'TEXTAREA' === $tag_name ||
+			'TFOOT' === $tag_name ||
+			'TH' === $tag_name ||
+			'THEAD' === $tag_name ||
+			'TITLE' === $tag_name ||
+			'TR' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'UL' === $tag_name ||
+			'WBR' === $tag_name ||
+			'XMP' === $tag_name ||
+
+			// MathML.
+			'MI' === $tag_name ||
+			'MO' === $tag_name ||
+			'MN' === $tag_name ||
+			'MS' === $tag_name ||
+			'MTEXT' === $tag_name ||
+			'ANNOTATION-XML' === $tag_name ||
+
+			// SVG.
+			'FOREIGNOBJECT' === $tag_name ||
+			'DESC' === $tag_name ||
+			'TITLE' === $tag_name
+		);
+	}
+
+	/**
+	 * Returns whether a given element is an HTML Void Element
+	 *
+	 * > area, base, br, col, embed, hr, img, input, link, meta, source, track, wbr
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#void-elements
+	 *
+	 * @param string $tag_name Name of HTML tag to check.
+	 * @return bool Whether the given tag is an HTML Void Element.
+	 */
+	public static function is_void( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'AREA' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BR' === $tag_name ||
+			'COL' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'HR' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'LINK' === $tag_name ||
+			'META' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'WBR' === $tag_name
+		);
+	}
+
+	/*
+	 * Constants that would pollute the top of the class if they were found there.
+	 */
+
+	/**
+	 * Indicates that the next HTML token should be parsed and processed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_NEXT_NODE = 'process-next-node';
+
+	/**
+	 * Indicates that the current HTML token should be reprocessed in the newly-selected insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const REPROCESS_CURRENT_NODE = 'reprocess-current-node';
+
+	/**
+	 * Indicates that the parser encountered unsupported markup and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_UNSUPPORTED = 'unsupported';
+
+	/**
+	 * Indicates that the parser encountered more HTML tokens than it
+	 * was able to process and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_EXCEEDED_MAX_BOOKMARKS = 'exceeded-max-bookmarks';
+
+	/**
+	 * Unlock code that must be passed into the constructor to create this class.
+	 *
+	 * This class extends the WP_HTML_Tag_Processor, which has a public class
+	 * constructor. Therefore, it's not possible to have a private constructor here.
+	 *
+	 * This unlock code is used to ensure that anyone calling the constructor is
+	 * doing so with a full understanding that it's intended to be a private API.
+	 */
+	const CONSTRUCTOR_UNLOCK_CODE = 'Use WP_HTML_Processor::createFragment instead of calling the class constructor directly.';
+}
diff --git a/src/wp-includes/html-api/class-wp-html-span.php b/src/wp-includes/html-api/class-wp-html-span.php
new file mode 100644
index 0000000000000..46227ebd02997
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-span.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * HTML API: WP_HTML_Span class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor to represent a textual span
+ * inside an HTML document.
+ *
+ * This is a two-tuple in disguise, used to avoid the memory overhead
+ * involved in using an array for the same purpose.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class WP_HTML_Span {
+	/**
+	 * Byte offset into document where span begins.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * Byte offset into document where span ends.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $end;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param int $start Byte offset into document where replacement span begins.
+	 * @param int $end   Byte offset into document where replacement span ends.
+	 */
+	public function __construct( $start, $end ) {
+		$this->start = $start;
+		$this->end   = $end;
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-tag-processor.php b/src/wp-includes/html-api/class-wp-html-tag-processor.php
new file mode 100644
index 0000000000000..2e84b3d7193a0
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-tag-processor.php
@@ -0,0 +1,2326 @@
+<?php
+/**
+ * HTML API: WP_HTML_Tag_Processor class
+ *
+ * Scans through an HTML document to find specific tags, then
+ * transforms those tags by adding, removing, or updating the
+ * values of the HTML attributes within that tag (opener).
+ *
+ * Does not fully parse HTML or _recurse_ into the HTML structure
+ * Instead this scans linearly through a document and only parses
+ * the HTML tag openers.
+ *
+ * ### Possible future direction for this module
+ *
+ *  - Prune the whitespace when removing classes/attributes: e.g. "a b c" -> "c" not " c".
+ *    This would increase the size of the changes for some operations but leave more
+ *    natural-looking output HTML.
+ *  - Decode HTML character references within class names when matching. E.g. match having
+ *    class `1<"2` needs to recognize `class="1&lt;&quot;2"`. Currently the Tag Processor
+ *    will fail to find the right tag if the class name is encoded as such.
+ *  - Properly decode HTML character references in `get_attribute()`. PHP's
+ *    `html_entity_decode()` is wrong in a couple ways: it doesn't account for the
+ *    no-ambiguous-ampersand rule, and it improperly handles the way semicolons may
+ *    or may not terminate a character reference.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used to modify attributes in an HTML document for tags matching a query.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *  1. Create a new class instance with your input HTML document.
+ *  2. Find the tag(s) you are looking for.
+ *  3. Request changes to the attributes in those tag(s).
+ *
+ * Example:
+ *
+ *     $tags = new WP_HTML_Tag_Processor( $html );
+ *     if ( $tags->next_tag( 'option' ) ) {
+ *         $tags->set_attribute( 'selected', true );
+ *     }
+ *
+ * ### Finding tags
+ *
+ * The `next_tag()` function moves the internal cursor through
+ * your input HTML document until it finds a tag meeting any of
+ * the supplied restrictions in the optional query argument. If
+ * no argument is provided then it will find the next HTML tag,
+ * regardless of what kind it is.
+ *
+ * If you want to _find whatever the next tag is_:
+ *
+ *     $tags->next_tag();
+ *
+ * | Goal                                                      | Query                                                                           |
+ * |-----------------------------------------------------------|---------------------------------------------------------------------------------|
+ * | Find any tag.                                             | `$tags->next_tag();`                                                            |
+ * | Find next image tag.                                      | `$tags->next_tag( array( 'tag_name' => 'img' ) );`                              |
+ * | Find next image tag (without passing the array).          | `$tags->next_tag( 'img' );`                                                     |
+ * | Find next tag containing the `fullwidth` CSS class.       | `$tags->next_tag( array( 'class_name' => 'fullwidth' ) );`                      |
+ * | Find next image tag containing the `fullwidth` CSS class. | `$tags->next_tag( array( 'tag_name' => 'img', 'class_name' => 'fullwidth' ) );` |
+ *
+ * If a tag was found meeting your criteria then `next_tag()`
+ * will return `true` and you can proceed to modify it. If it
+ * returns `false`, however, it failed to find the tag and
+ * moved the cursor to the end of the file.
+ *
+ * Once the cursor reaches the end of the file the processor
+ * is done and if you want to reach an earlier tag you will
+ * need to recreate the processor and start over, as it's
+ * unable to back up or move in reverse.
+ *
+ * See the section on bookmarks for an exception to this
+ * no-backing-up rule.
+ *
+ * #### Custom queries
+ *
+ * Sometimes it's necessary to further inspect an HTML tag than
+ * the query syntax here permits. In these cases one may further
+ * inspect the search results using the read-only functions
+ * provided by the processor or external state or variables.
+ *
+ * Example:
+ *
+ *     // Paint up to the first five DIV or SPAN tags marked with the "jazzy" style.
+ *     $remaining_count = 5;
+ *     while ( $remaining_count > 0 && $tags->next_tag() ) {
+ *         if (
+ *              ( 'DIV' === $tags->get_tag() || 'SPAN' === $tags->get_tag() ) &&
+ *              'jazzy' === $tags->get_attribute( 'data-style' )
+ *         ) {
+ *             $tags->add_class( 'theme-style-everest-jazz' );
+ *             $remaining_count--;
+ *         }
+ *     }
+ *
+ * `get_attribute()` will return `null` if the attribute wasn't present
+ * on the tag when it was called. It may return `""` (the empty string)
+ * in cases where the attribute was present but its value was empty.
+ * For boolean attributes, those whose name is present but no value is
+ * given, it will return `true` (the only way to set `false` for an
+ * attribute is to remove it).
+ *
+ * ### Modifying HTML attributes for a found tag
+ *
+ * Once you've found the start of an opening tag you can modify
+ * any number of the attributes on that tag. You can set a new
+ * value for an attribute, remove the entire attribute, or do
+ * nothing and move on to the next opening tag.
+ *
+ * Example:
+ *
+ *     if ( $tags->next_tag( array( 'class' => 'wp-group-block' ) ) ) {
+ *         $tags->set_attribute( 'title', 'This groups the contained content.' );
+ *         $tags->remove_attribute( 'data-test-id' );
+ *     }
+ *
+ * If `set_attribute()` is called for an existing attribute it will
+ * overwrite the existing value. Similarly, calling `remove_attribute()`
+ * for a non-existing attribute has no effect on the document. Both
+ * of these methods are safe to call without knowing if a given attribute
+ * exists beforehand.
+ *
+ * ### Modifying CSS classes for a found tag
+ *
+ * The tag processor treats the `class` attribute as a special case.
+ * Because it's a common operation to add or remove CSS classes, this
+ * interface adds helper methods to make that easier.
+ *
+ * As with attribute values, adding or removing CSS classes is a safe
+ * operation that doesn't require checking if the attribute or class
+ * exists before making changes. If removing the only class then the
+ * entire `class` attribute will be removed.
+ *
+ * Example:
+ *
+ *     // from `<span>Yippee!</span>`
+ *     //   to `<span class="is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="excited">Yippee!</span>`
+ *     //   to `<span class="excited is-active">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<span class="is-active heavy-accent">Yippee!</span>`
+ *     //   to `<span class="is-active heavy-accent">Yippee!</span>`
+ *     $tags->add_class( 'is-active' );
+ *
+ *     // from `<input type="text" class="is-active rugby not-disabled" length="24">`
+ *     //   to `<input type="text" class="is-active not-disabled" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" class="rugby" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ *     // from `<input type="text" length="24">`
+ *     //   to `<input type="text" length="24">
+ *     $tags->remove_class( 'rugby' );
+ *
+ * When class changes are enqueued but a direct change to `class` is made via
+ * `set_attribute` then the changes to `set_attribute` (or `remove_attribute`)
+ * will take precedence over those made through `add_class` and `remove_class`.
+ *
+ * ### Bookmarks
+ *
+ * While scanning through the input HTMl document it's possible to set
+ * a named bookmark when a particular tag is found. Later on, after
+ * continuing to scan other tags, it's possible to `seek` to one of
+ * the set bookmarks and then proceed again from that point forward.
+ *
+ * Because bookmarks create processing overhead one should avoid
+ * creating too many of them. As a rule, create only bookmarks
+ * of known string literal names; avoid creating "mark_{$index}"
+ * and so on. It's fine from a performance standpoint to create a
+ * bookmark and update it frequently, such as within a loop.
+ *
+ *     $total_todos = 0;
+ *     while ( $p->next_tag( array( 'tag_name' => 'UL', 'class_name' => 'todo' ) ) ) {
+ *         $p->set_bookmark( 'list-start' );
+ *         while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+ *             if ( 'UL' === $p->get_tag() && $p->is_tag_closer() ) {
+ *                 $p->set_bookmark( 'list-end' );
+ *                 $p->seek( 'list-start' );
+ *                 $p->set_attribute( 'data-contained-todos', (string) $total_todos );
+ *                 $total_todos = 0;
+ *                 $p->seek( 'list-end' );
+ *                 break;
+ *             }
+ *
+ *             if ( 'LI' === $p->get_tag() && ! $p->is_tag_closer() ) {
+ *                 $total_todos++;
+ *             }
+ *         }
+ *     }
+ *
+ * ## Design and limitations
+ *
+ * The Tag Processor is designed to linearly scan HTML documents and tokenize
+ * HTML tags and their attributes. It's designed to do this as efficiently as
+ * possible without compromising parsing integrity. Therefore it will be
+ * slower than some methods of modifying HTML, such as those incorporating
+ * over-simplified PCRE patterns, but will not introduce the defects and
+ * failures that those methods bring in, which lead to broken page renders
+ * and often to security vulnerabilities. On the other hand, it will be faster
+ * than full-blown HTML parsers such as DOMDocument and use considerably
+ * less memory. It requires a negligible memory overhead, enough to consider
+ * it a zero-overhead system.
+ *
+ * The performance characteristics are maintained by avoiding tree construction
+ * and semantic cleanups which are specified in HTML5. Because of this, for
+ * example, it's not possible for the Tag Processor to associate any given
+ * opening tag with its corresponding closing tag, or to return the inner markup
+ * inside an element. Systems may be built on top of the Tag Processor to do
+ * this, but the Tag Processor is and should be constrained so it can remain an
+ * efficient, low-level, and reliable HTML scanner.
+ *
+ * The Tag Processor's design incorporates a "garbage-in-garbage-out" philosophy.
+ * HTML5 specifies that certain invalid content be transformed into different forms
+ * for display, such as removing null bytes from an input document and replacing
+ * invalid characters with the Unicode replacement character `U+FFFD` (visually "�").
+ * Where errors or transformations exist within the HTML5 specification, the Tag Processor
+ * leaves those invalid inputs untouched, passing them through to the final browser
+ * to handle. While this implies that certain operations will be non-spec-compliant,
+ * such as reading the value of an attribute with invalid content, it also preserves a
+ * simplicity and efficiency for handling those error cases.
+ *
+ * Most operations within the Tag Processor are designed to minimize the difference
+ * between an input and output document for any given change. For example, the
+ * `add_class` and `remove_class` methods preserve whitespace and the class ordering
+ * within the `class` attribute; and when encountering tags with duplicated attributes,
+ * the Tag Processor will leave those invalid duplicate attributes where they are but
+ * update the proper attribute which the browser will read for parsing its value. An
+ * exception to this rule is that all attribute updates store their values as
+ * double-quoted strings, meaning that attributes on input with single-quoted or
+ * unquoted values will appear in the output with double-quotes.
+ *
+ * @since 6.2.0
+ */
+class WP_HTML_Tag_Processor {
+	/**
+	 * The maximum number of bookmarks allowed to exist at
+	 * any given time.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::set_bookmark()
+	 */
+	const MAX_BOOKMARKS = 10;
+
+	/**
+	 * Maximum number of times seek() can be called.
+	 * Prevents accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	const MAX_SEEK_OPS = 1000;
+
+	/**
+	 * The HTML document to parse.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	protected $html;
+
+	/**
+	 * The last query passed to next_tag().
+	 *
+	 * @since 6.2.0
+	 * @var array|null
+	 */
+	private $last_query;
+
+	/**
+	 * The tag name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_tag_name;
+
+	/**
+	 * The CSS class name this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var string|null
+	 */
+	private $sought_class_name;
+
+	/**
+	 * The match offset this processor currently scans for.
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $sought_match_offset;
+
+	/**
+	 * Whether to visit tag closers, e.g. </div>, when walking an input document.
+	 *
+	 * @since 6.2.0
+	 * @var bool
+	 */
+	private $stop_on_tag_closers;
+
+	/**
+	 * How many bytes from the original HTML document have been read and parsed.
+	 *
+	 * This value points to the latest byte offset in the input document which
+	 * has been already parsed. It is the internal cursor for the Tag Processor
+	 * and updates while scanning through the HTML tokens.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	private $bytes_already_parsed = 0;
+
+	/**
+	 * Byte offset in input document where current tag name starts.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      - tag name starts at 1
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $tag_name_starts_at;
+
+	/**
+	 * Byte length of current tag name.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     01234
+	 *      --- tag name length is 3
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $tag_name_length;
+
+	/**
+	 * Byte offset in input document where current tag token ends.
+	 *
+	 * Example:
+	 *
+	 *     <div id="test">...
+	 *     0         1   |
+	 *     01234567890123456
+	 *      --- tag name ends at 14
+	 *
+	 * @since 6.2.0
+	 * @var int|null
+	 */
+	private $tag_ends_at;
+
+	/**
+	 * Whether the current tag is an opening tag, e.g. <div>, or a closing tag, e.g. </div>.
+	 *
+	 * @var bool
+	 */
+	private $is_closing_tag;
+
+	/**
+	 * Lazily-built index of attributes found within an HTML tag, keyed by the attribute name.
+	 *
+	 * Example:
+	 *
+	 *     // Supposing the parser is working through this content
+	 *     // and stops after recognizing the `id` attribute.
+	 *     // <div id="test-4" class=outline title="data:text/plain;base64=asdk3nk1j3fo8">
+	 *     //                 ^ parsing will continue from this point.
+	 *     $this->attributes = array(
+	 *         'id' => new WP_HTML_Attribute_Match( 'id', null, 6, 17 )
+	 *     );
+	 *
+	 *     // When picking up parsing again, or when asking to find the
+	 *     // `class` attribute we will continue and add to this array.
+	 *     $this->attributes = array(
+	 *         'id'    => new WP_HTML_Attribute_Match( 'id', null, 6, 17 ),
+	 *         'class' => new WP_HTML_Attribute_Match( 'class', 'outline', 18, 32 )
+	 *     );
+	 *
+	 *     // Note that only the `class` attribute value is stored in the index.
+	 *     // That's because it is the only value used by this class at the moment.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Attribute_Token[]
+	 */
+	private $attributes = array();
+
+	/**
+	 * Which class names to add or remove from a tag.
+	 *
+	 * These are tracked separately from attribute updates because they are
+	 * semantically distinct, whereas this interface exists for the common
+	 * case of adding and removing class names while other attributes are
+	 * generally modified as with DOM `setAttribute` calls.
+	 *
+	 * When modifying an HTML document these will eventually be collapsed
+	 * into a single `set_attribute( 'class', $changes )` call.
+	 *
+	 * Example:
+	 *
+	 *     // Add the `wp-block-group` class, remove the `wp-group` class.
+	 *     $classname_updates = array(
+	 *         // Indexed by a comparable class name.
+	 *         'wp-block-group' => WP_HTML_Tag_Processor::ADD_CLASS,
+	 *         'wp-group'       => WP_HTML_Tag_Processor::REMOVE_CLASS
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var bool[]
+	 */
+	private $classname_updates = array();
+
+	/**
+	 * Tracks a semantic location in the original HTML which
+	 * shifts with updates as they are applied to the document.
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Span[]
+	 */
+	protected $bookmarks = array();
+
+	const ADD_CLASS    = true;
+	const REMOVE_CLASS = false;
+	const SKIP_CLASS   = null;
+
+	/**
+	 * Lexical replacements to apply to input HTML document.
+	 *
+	 * "Lexical" in this class refers to the part of this class which
+	 * operates on pure text _as text_ and not as HTML. There's a line
+	 * between the public interface, with HTML-semantic methods like
+	 * `set_attribute` and `add_class`, and an internal state that tracks
+	 * text offsets in the input document.
+	 *
+	 * When higher-level HTML methods are called, those have to transform their
+	 * operations (such as setting an attribute's value) into text diffing
+	 * operations (such as replacing the sub-string from indices A to B with
+	 * some given new string). These text-diffing operations are the lexical
+	 * updates.
+	 *
+	 * As new higher-level methods are added they need to collapse their
+	 * operations into these lower-level lexical updates since that's the
+	 * Tag Processor's internal language of change. Any code which creates
+	 * these lexical updates must ensure that they do not cross HTML syntax
+	 * boundaries, however, so these should never be exposed outside of this
+	 * class or any classes which intentionally expand its functionality.
+	 *
+	 * These are enqueued while editing the document instead of being immediately
+	 * applied to avoid processing overhead, string allocations, and string
+	 * copies when applying many updates to a single document.
+	 *
+	 * Example:
+	 *
+	 *     // Replace an attribute stored with a new value, indices
+	 *     // sourced from the lazily-parsed HTML recognizer.
+	 *     $start = $attributes['src']->start;
+	 *     $end   = $attributes['src']->end;
+	 *     $modifications[] = new WP_HTML_Text_Replacement( $start, $end, $new_value );
+	 *
+	 *     // Correspondingly, something like this will appear in this array.
+	 *     $lexical_updates = array(
+	 *         WP_HTML_Text_Replacement( 14, 28, 'https://my-site.my-domain/wp-content/uploads/2014/08/kittens.jpg' )
+	 *     );
+	 *
+	 * @since 6.2.0
+	 * @var WP_HTML_Text_Replacement[]
+	 */
+	protected $lexical_updates = array();
+
+	/**
+	 * Tracks and limits `seek()` calls to prevent accidental infinite loops.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 *
+	 * @see WP_HTML_Tag_Processor::seek()
+	 */
+	protected $seek_count = 0;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $html HTML to process.
+	 */
+	public function __construct( $html ) {
+		$this->html = $html;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string|null $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ) {
+		$this->parse_query( $query );
+		$already_found = 0;
+
+		do {
+			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			// Find the next tag if it exists.
+			if ( false === $this->parse_next_tag() ) {
+				$this->bytes_already_parsed = strlen( $this->html );
+
+				return false;
+			}
+
+			// Parse all of its attributes.
+			while ( $this->parse_next_attribute() ) {
+				continue;
+			}
+
+			// Ensure that the tag closes before the end of the document.
+			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
+			if ( false === $tag_ends_at ) {
+				return false;
+			}
+			$this->tag_ends_at          = $tag_ends_at;
+			$this->bytes_already_parsed = $tag_ends_at;
+
+			// Finally, check if the parsed tag and its attributes match the search query.
+			if ( $this->matches() ) {
+				++$already_found;
+			}
+
+			/*
+			 * For non-DATA sections which might contain text that looks like HTML tags but
+			 * isn't, scan with the appropriate alternative mode. Looking at the first letter
+			 * of the tag name as a pre-check avoids a string allocation when it's not needed.
+			 */
+			$t = $this->html[ $this->tag_name_starts_at ];
+			if ( ! $this->is_closing_tag && ( 's' === $t || 'S' === $t || 't' === $t || 'T' === $t ) ) {
+				$tag_name = $this->get_tag();
+
+				if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
+					$this->bytes_already_parsed = strlen( $this->html );
+					return false;
+				} elseif (
+					( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
+					! $this->skip_rcdata( $tag_name )
+				) {
+					$this->bytes_already_parsed = strlen( $this->html );
+					return false;
+				}
+			}
+		} while ( $already_found < $this->sought_match_offset );
+
+		return true;
+	}
+
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $name ) {
+		if ( null === $this->tag_name_starts_at ) {
+			return false;
+		}
+
+		if ( ! array_key_exists( $name, $this->bookmarks ) && count( $this->bookmarks ) >= static::MAX_BOOKMARKS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many bookmarks: cannot create any more.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		$this->bookmarks[ $name ] = new WP_HTML_Span(
+			$this->tag_name_starts_at - ( $this->is_closing_tag ? 2 : 1 ),
+			$this->tag_ends_at
+		);
+
+		return true;
+	}
+
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @param string $name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $name ) {
+		if ( ! array_key_exists( $name, $this->bookmarks ) ) {
+			return false;
+		}
+
+		unset( $this->bookmarks[ $name ] );
+
+		return true;
+	}
+
+
+	/**
+	 * Skips contents of title and textarea tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/parsing.html#rcdata-state
+	 *
+	 * @param string $tag_name The lowercase tag name which will close the RCDATA region.
+	 * @return bool Whether an end to the RCDATA region was found before the end of the document.
+	 */
+	private function skip_rcdata( $tag_name ) {
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$tag_length = strlen( $tag_name );
+
+		$at = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at = strpos( $this->html, '</', $at );
+
+			// If there is no possible tag closer then fail.
+			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
+				$this->bytes_already_parsed = $doc_length;
+				return false;
+			}
+
+			$closer_potentially_starts_at = $at;
+			$at                          += 2;
+
+			/*
+			 * Find a case-insensitive match to the tag name.
+			 *
+			 * Because tag names are limited to US-ASCII there is no
+			 * need to perform any kind of Unicode normalization when
+			 * comparing; any character which could be impacted by such
+			 * normalization could not be part of a tag name.
+			 */
+			for ( $i = 0; $i < $tag_length; $i++ ) {
+				$tag_char  = $tag_name[ $i ];
+				$html_char = $html[ $at + $i ];
+
+				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+					$at += $i;
+					continue 2;
+				}
+			}
+
+			$at                        += $tag_length;
+			$this->bytes_already_parsed = $at;
+
+			/*
+			 * Ensure that the tag name terminates to avoid matching on
+			 * substrings of a longer tag name. For example, the sequence
+			 * "</textarearug" should not match for "</textarea" even
+			 * though "textarea" is found within the text.
+			 */
+			$c = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				continue;
+			}
+
+			while ( $this->parse_next_attribute() ) {
+				continue;
+			}
+			$at = $this->bytes_already_parsed;
+			if ( $at >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			if ( '>' === $html[ $at ] || '/' === $html[ $at ] ) {
+				$this->bytes_already_parsed = $closer_potentially_starts_at;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Skips contents of script tags.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the script tag was closed before the end of the document.
+	 */
+	private function skip_script_data() {
+		$state      = 'unescaped';
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$at         = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at += strcspn( $html, '-<', $at );
+
+			/*
+			 * For all script states a "-->"  transitions
+			 * back into the normal unescaped script mode,
+			 * even if that's the current state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'-' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'>' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped';
+				continue;
+			}
+
+			// Everything of interest past here starts with "<".
+			if ( $at + 1 >= $doc_length || '<' !== $html[ $at++ ] ) {
+				continue;
+			}
+
+			/*
+			 * Unlike with "-->", the "<!--" only transitions
+			 * into the escaped mode if not already there.
+			 *
+			 * Inside the escaped modes it will be ignored; and
+			 * should never break out of the double-escaped
+			 * mode and back into the escaped mode.
+			 *
+			 * While this requires a mode change, it does not
+			 * impact the parsing otherwise, so continue
+			 * parsing after updating the state.
+			 */
+			if (
+				$at + 2 < $doc_length &&
+				'!' === $html[ $at ] &&
+				'-' === $html[ $at + 1 ] &&
+				'-' === $html[ $at + 2 ]
+			) {
+				$at   += 3;
+				$state = 'unescaped' === $state ? 'escaped' : $state;
+				continue;
+			}
+
+			if ( '/' === $html[ $at ] ) {
+				$closer_potentially_starts_at = $at - 1;
+				$is_closing                   = true;
+				++$at;
+			} else {
+				$is_closing = false;
+			}
+
+			/*
+			 * At this point the only remaining state-changes occur with the
+			 * <script> and </script> tags; unless one of these appears next,
+			 * proceed scanning to the next potential token in the text.
+			 */
+			if ( ! (
+				$at + 6 < $doc_length &&
+				( 's' === $html[ $at ] || 'S' === $html[ $at ] ) &&
+				( 'c' === $html[ $at + 1 ] || 'C' === $html[ $at + 1 ] ) &&
+				( 'r' === $html[ $at + 2 ] || 'R' === $html[ $at + 2 ] ) &&
+				( 'i' === $html[ $at + 3 ] || 'I' === $html[ $at + 3 ] ) &&
+				( 'p' === $html[ $at + 4 ] || 'P' === $html[ $at + 4 ] ) &&
+				( 't' === $html[ $at + 5 ] || 'T' === $html[ $at + 5 ] )
+			) ) {
+				++$at;
+				continue;
+			}
+
+			/*
+			 * Ensure that the script tag terminates to avoid matching on
+			 * substrings of a non-match. For example, the sequence
+			 * "<script123" should not end a script region even though
+			 * "<script" is found within the text.
+			 */
+			if ( $at + 6 >= $doc_length ) {
+				continue;
+			}
+			$at += 6;
+			$c   = $html[ $at ];
+			if ( ' ' !== $c && "\t" !== $c && "\r" !== $c && "\n" !== $c && '/' !== $c && '>' !== $c ) {
+				++$at;
+				continue;
+			}
+
+			if ( 'escaped' === $state && ! $is_closing ) {
+				$state = 'double-escaped';
+				continue;
+			}
+
+			if ( 'double-escaped' === $state && $is_closing ) {
+				$state = 'escaped';
+				continue;
+			}
+
+			if ( $is_closing ) {
+				$this->bytes_already_parsed = $closer_potentially_starts_at;
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					return false;
+				}
+
+				while ( $this->parse_next_attribute() ) {
+					continue;
+				}
+
+				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
+					$this->bytes_already_parsed = $closer_potentially_starts_at;
+					return true;
+				}
+			}
+
+			++$at;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the next tag.
+	 *
+	 * This will find and start parsing the next tag, including
+	 * the opening `<`, the potential closer `/`, and the tag
+	 * name. It does not parse the attributes or scan to the
+	 * closing `>`; these are left for other methods.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Support abruptly-closed comments, invalid-tag-closer-comments, and empty elements.
+	 *
+	 * @return bool Whether a tag was found before the end of the document.
+	 */
+	private function parse_next_tag() {
+		$this->after_tag();
+
+		$html       = $this->html;
+		$doc_length = strlen( $html );
+		$at         = $this->bytes_already_parsed;
+
+		while ( false !== $at && $at < $doc_length ) {
+			$at = strpos( $html, '<', $at );
+			if ( false === $at ) {
+				return false;
+			}
+
+			if ( '/' === $this->html[ $at + 1 ] ) {
+				$this->is_closing_tag = true;
+				$at++;
+			} else {
+				$this->is_closing_tag = false;
+			}
+
+			/*
+			 * HTML tag names must start with [a-zA-Z] otherwise they are not tags.
+			 * For example, "<3" is rendered as text, not a tag opener. If at least
+			 * one letter follows the "<" then _it is_ a tag, but if the following
+			 * character is anything else it _is not a tag_.
+			 *
+			 * It's not uncommon to find non-tags starting with `<` in an HTML
+			 * document, so it's good for performance to make this pre-check before
+			 * continuing to attempt to parse a tag name.
+			 *
+			 * Reference:
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#data-state
+			 * * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			$tag_name_prefix_length = strspn( $html, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', $at + 1 );
+			if ( $tag_name_prefix_length > 0 ) {
+				++$at;
+				$this->tag_name_length      = $tag_name_prefix_length + strcspn( $html, " \t\f\r\n/>", $at + $tag_name_prefix_length );
+				$this->tag_name_starts_at   = $at;
+				$this->bytes_already_parsed = $at + $this->tag_name_length;
+				return true;
+			}
+
+			/*
+			 * Abort if no tag is found before the end of
+			 * the document. There is nothing left to parse.
+			 */
+			if ( $at + 1 >= strlen( $html ) ) {
+				return false;
+			}
+
+			/*
+			 * <! transitions to markup declaration open state
+			 * https://html.spec.whatwg.org/multipage/parsing.html#markup-declaration-open-state
+			 */
+			if ( '!' === $html[ $at + 1 ] ) {
+				/*
+				 * <!-- transitions to a bogus comment state – skip to the nearest -->
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					strlen( $html ) > $at + 3 &&
+					'-' === $html[ $at + 2 ] &&
+					'-' === $html[ $at + 3 ]
+				) {
+					$closer_at = $at + 4;
+					// If it's not possible to close the comment then there is nothing more to scan.
+					if ( strlen( $html ) <= $closer_at ) {
+						return false;
+					}
+
+					// Abruptly-closed empty comments are a sequence of dashes followed by `>`.
+					$span_of_dashes = strspn( $html, '-', $closer_at );
+					if ( '>' === $html[ $closer_at + $span_of_dashes ] ) {
+						$at = $closer_at + $span_of_dashes + 1;
+						continue;
+					}
+
+					/*
+					 * Comments may be closed by either a --> or an invalid --!>.
+					 * The first occurrence closes the comment.
+					 *
+					 * See https://html.spec.whatwg.org/#parse-error-incorrectly-closed-comment
+					 */
+					$closer_at--; // Pre-increment inside condition below reduces risk of accidental infinite looping.
+					while ( ++$closer_at < strlen( $html ) ) {
+						$closer_at = strpos( $html, '--', $closer_at );
+						if ( false === $closer_at ) {
+							return false;
+						}
+
+						if ( $closer_at + 2 < strlen( $html ) && '>' === $html[ $closer_at + 2 ] ) {
+							$at = $closer_at + 3;
+							continue 2;
+						}
+
+						if ( $closer_at + 3 < strlen( $html ) && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
+							$at = $closer_at + 4;
+							continue 2;
+						}
+					}
+				}
+
+				/*
+				 * <![CDATA[ transitions to CDATA section state – skip to the nearest ]]>
+				 * The CDATA is case-sensitive.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					strlen( $html ) > $at + 8 &&
+					'[' === $html[ $at + 2 ] &&
+					'C' === $html[ $at + 3 ] &&
+					'D' === $html[ $at + 4 ] &&
+					'A' === $html[ $at + 5 ] &&
+					'T' === $html[ $at + 6 ] &&
+					'A' === $html[ $at + 7 ] &&
+					'[' === $html[ $at + 8 ]
+				) {
+					$closer_at = strpos( $html, ']]>', $at + 9 );
+					if ( false === $closer_at ) {
+						return false;
+					}
+
+					$at = $closer_at + 3;
+					continue;
+				}
+
+				/*
+				 * <!DOCTYPE transitions to DOCTYPE state – skip to the nearest >
+				 * These are ASCII-case-insensitive.
+				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+				 */
+				if (
+					strlen( $html ) > $at + 8 &&
+					( 'D' === $html[ $at + 2 ] || 'd' === $html[ $at + 2 ] ) &&
+					( 'O' === $html[ $at + 3 ] || 'o' === $html[ $at + 3 ] ) &&
+					( 'C' === $html[ $at + 4 ] || 'c' === $html[ $at + 4 ] ) &&
+					( 'T' === $html[ $at + 5 ] || 't' === $html[ $at + 5 ] ) &&
+					( 'Y' === $html[ $at + 6 ] || 'y' === $html[ $at + 6 ] ) &&
+					( 'P' === $html[ $at + 7 ] || 'p' === $html[ $at + 7 ] ) &&
+					( 'E' === $html[ $at + 8 ] || 'e' === $html[ $at + 8 ] )
+				) {
+					$closer_at = strpos( $html, '>', $at + 9 );
+					if ( false === $closer_at ) {
+						return false;
+					}
+
+					$at = $closer_at + 1;
+					continue;
+				}
+
+				/*
+				 * Anything else here is an incorrectly-opened comment and transitions
+				 * to the bogus comment state - skip to the nearest >.
+				 */
+				$at = strpos( $html, '>', $at + 1 );
+				continue;
+			}
+
+			/*
+			 * </> is a missing end tag name, which is ignored.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-missing-end-tag-name
+			 */
+			if ( '>' === $html[ $at + 1 ] ) {
+				$at++;
+				continue;
+			}
+
+			/*
+			 * <? transitions to a bogus comment state – skip to the nearest >
+			 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
+			 */
+			if ( '?' === $html[ $at + 1 ] ) {
+				$closer_at = strpos( $html, '>', $at + 2 );
+				if ( false === $closer_at ) {
+					return false;
+				}
+
+				$at = $closer_at + 1;
+				continue;
+			}
+
+			/*
+			 * If a non-alpha starts the tag name in a tag closer it's a comment.
+			 * Find the first `>`, which closes the comment.
+			 *
+			 * See https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
+			 */
+			if ( $this->is_closing_tag ) {
+				$closer_at = strpos( $html, '>', $at + 3 );
+				if ( false === $closer_at ) {
+					return false;
+				}
+
+				$at = $closer_at + 1;
+				continue;
+			}
+
+			++$at;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parses the next attribute.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether an attribute was found before the end of the document.
+	 */
+	private function parse_next_attribute() {
+		// Skip whitespace and slashes.
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n/", $this->bytes_already_parsed );
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		/*
+		 * Treat the equal sign as a part of the attribute
+		 * name if it is the first encountered byte.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#before-attribute-name-state
+		 */
+		$name_length = '=' === $this->html[ $this->bytes_already_parsed ]
+			? 1 + strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed + 1 )
+			: strcspn( $this->html, "=/> \t\f\r\n", $this->bytes_already_parsed );
+
+		// No attribute, just tag closer.
+		if ( 0 === $name_length || $this->bytes_already_parsed + $name_length >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		$attribute_start             = $this->bytes_already_parsed;
+		$attribute_name              = substr( $this->html, $attribute_start, $name_length );
+		$this->bytes_already_parsed += $name_length;
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		$this->skip_whitespace();
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		$has_value = '=' === $this->html[ $this->bytes_already_parsed ];
+		if ( $has_value ) {
+			++$this->bytes_already_parsed;
+			$this->skip_whitespace();
+			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				return false;
+			}
+
+			switch ( $this->html[ $this->bytes_already_parsed ] ) {
+				case "'":
+				case '"':
+					$quote                      = $this->html[ $this->bytes_already_parsed ];
+					$value_start                = $this->bytes_already_parsed + 1;
+					$value_length               = strcspn( $this->html, $quote, $value_start );
+					$attribute_end              = $value_start + $value_length + 1;
+					$this->bytes_already_parsed = $attribute_end;
+					break;
+
+				default:
+					$value_start                = $this->bytes_already_parsed;
+					$value_length               = strcspn( $this->html, "> \t\f\r\n", $value_start );
+					$attribute_end              = $value_start + $value_length;
+					$this->bytes_already_parsed = $attribute_end;
+			}
+		} else {
+			$value_start   = $this->bytes_already_parsed;
+			$value_length  = 0;
+			$attribute_end = $attribute_start + $name_length;
+		}
+
+		if ( $attribute_end >= strlen( $this->html ) ) {
+			return false;
+		}
+
+		if ( $this->is_closing_tag ) {
+			return true;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $attribute_name );
+
+		// If an attribute is listed many times, only use the first declaration and ignore the rest.
+		if ( ! array_key_exists( $comparable_name, $this->attributes ) ) {
+			$this->attributes[ $comparable_name ] = new WP_HTML_Attribute_Token(
+				$attribute_name,
+				$value_start,
+				$value_length,
+				$attribute_start,
+				$attribute_end,
+				! $has_value
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Move the internal cursor past any immediate successive whitespace.
+	 *
+	 * @since 6.2.0
+	 */
+	private function skip_whitespace() {
+		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n", $this->bytes_already_parsed );
+	}
+
+	/**
+	 * Applies attribute updates and cleans up once a tag is fully parsed.
+	 *
+	 * @since 6.2.0
+	 */
+	private function after_tag() {
+		$this->get_updated_html();
+		$this->tag_name_starts_at = null;
+		$this->tag_name_length    = null;
+		$this->tag_ends_at        = null;
+		$this->is_closing_tag     = null;
+		$this->attributes         = array();
+	}
+
+	/**
+	 * Converts class name updates into tag attributes updates
+	 * (they are accumulated in different data formats for performance).
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::$lexical_updates
+	 * @see WP_HTML_Tag_Processor::$classname_updates
+	 */
+	private function class_name_updates_to_attributes_updates() {
+		if ( count( $this->classname_updates ) === 0 ) {
+			return;
+		}
+
+		$existing_class = $this->get_enqueued_attribute_value( 'class' );
+		if ( null === $existing_class || true === $existing_class ) {
+			$existing_class = '';
+		}
+
+		if ( false === $existing_class && isset( $this->attributes['class'] ) ) {
+			$existing_class = substr(
+				$this->html,
+				$this->attributes['class']->value_starts_at,
+				$this->attributes['class']->value_length
+			);
+		}
+
+		if ( false === $existing_class ) {
+			$existing_class = '';
+		}
+
+		/**
+		 * Updated "class" attribute value.
+		 *
+		 * This is incrementally built while scanning through the existing class
+		 * attribute, skipping removed classes on the way, and then appending
+		 * added classes at the end. Only when finished processing will the
+		 * value contain the final new value.
+
+		 * @var string $class
+		 */
+		$class = '';
+
+		/**
+		 * Tracks the cursor position in the existing
+		 * class attribute value while parsing.
+		 *
+		 * @var int $at
+		 */
+		$at = 0;
+
+		/**
+		 * Indicates if there's any need to modify the existing class attribute.
+		 *
+		 * If a call to `add_class()` and `remove_class()` wouldn't impact
+		 * the `class` attribute value then there's no need to rebuild it.
+		 * For example, when adding a class that's already present or
+		 * removing one that isn't.
+		 *
+		 * This flag enables a performance optimization when none of the enqueued
+		 * class updates would impact the `class` attribute; namely, that the
+		 * processor can continue without modifying the input document, as if
+		 * none of the `add_class()` or `remove_class()` calls had been made.
+		 *
+		 * This flag is set upon the first change that requires a string update.
+		 *
+		 * @var bool $modified
+		 */
+		$modified = false;
+
+		// Remove unwanted classes by only copying the new ones.
+		$existing_class_length = strlen( $existing_class );
+		while ( $at < $existing_class_length ) {
+			// Skip to the first non-whitespace character.
+			$ws_at     = $at;
+			$ws_length = strspn( $existing_class, " \t\f\r\n", $ws_at );
+			$at       += $ws_length;
+
+			// Capture the class name – it's everything until the next whitespace.
+			$name_length = strcspn( $existing_class, " \t\f\r\n", $at );
+			if ( 0 === $name_length ) {
+				// If no more class names are found then that's the end.
+				break;
+			}
+
+			$name = substr( $existing_class, $at, $name_length );
+			$at  += $name_length;
+
+			// If this class is marked for removal, start processing the next one.
+			$remove_class = (
+				isset( $this->classname_updates[ $name ] ) &&
+				self::REMOVE_CLASS === $this->classname_updates[ $name ]
+			);
+
+			// If a class has already been seen then skip it; it should not be added twice.
+			if ( ! $remove_class ) {
+				$this->classname_updates[ $name ] = self::SKIP_CLASS;
+			}
+
+			if ( $remove_class ) {
+				$modified = true;
+				continue;
+			}
+
+			/*
+			 * Otherwise, append it to the new "class" attribute value.
+			 *
+			 * There are options for handling whitespace between tags.
+			 * Preserving the existing whitespace produces fewer changes
+			 * to the HTML content and should clarify the before/after
+			 * content when debugging the modified output.
+			 *
+			 * This approach contrasts normalizing the inter-class
+			 * whitespace to a single space, which might appear cleaner
+			 * in the output HTML but produce a noisier change.
+			 */
+			$class .= substr( $existing_class, $ws_at, $ws_length );
+			$class .= $name;
+		}
+
+		// Add new classes by appending those which haven't already been seen.
+		foreach ( $this->classname_updates as $name => $operation ) {
+			if ( self::ADD_CLASS === $operation ) {
+				$modified = true;
+
+				$class .= strlen( $class ) > 0 ? ' ' : '';
+				$class .= $name;
+			}
+		}
+
+		$this->classname_updates = array();
+		if ( ! $modified ) {
+			return;
+		}
+
+		if ( strlen( $class ) > 0 ) {
+			$this->set_attribute( 'class', $class );
+		} else {
+			$this->remove_attribute( 'class' );
+		}
+	}
+
+	/**
+	 * Applies attribute updates to HTML document.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Accumulates shift for internal cursor and passed pointer.
+	 * @since 6.3.0 Invalidate any bookmarks whose targets are overwritten.
+	 *
+	 * @param int $shift_this_point Accumulate and return shift for this position.
+	 * @return int How many bytes the given pointer moved in response to the updates.
+	 */
+	private function apply_attributes_updates( $shift_this_point = 0 ) {
+		if ( ! count( $this->lexical_updates ) ) {
+			return 0;
+		}
+
+		$accumulated_shift_for_given_point = 0;
+
+		/*
+		 * Attribute updates can be enqueued in any order but updates
+		 * to the document must occur in lexical order; that is, each
+		 * replacement must be made before all others which follow it
+		 * at later string indices in the input document.
+		 *
+		 * Sorting avoid making out-of-order replacements which
+		 * can lead to mangled output, partially-duplicated
+		 * attributes, and overwritten attributes.
+		 */
+		usort( $this->lexical_updates, array( self::class, 'sort_start_ascending' ) );
+
+		$bytes_already_copied = 0;
+		$output_buffer        = '';
+		foreach ( $this->lexical_updates as $diff ) {
+			$shift = strlen( $diff->text ) - ( $diff->end - $diff->start );
+
+			// Adjust the cursor position by however much an update affects it.
+			if ( $diff->start <= $this->bytes_already_parsed ) {
+				$this->bytes_already_parsed += $shift;
+			}
+
+			// Accumulate shift of the given pointer within this function call.
+			if ( $diff->start <= $shift_this_point ) {
+				$accumulated_shift_for_given_point += $shift;
+			}
+
+			$output_buffer       .= substr( $this->html, $bytes_already_copied, $diff->start - $bytes_already_copied );
+			$output_buffer       .= $diff->text;
+			$bytes_already_copied = $diff->end;
+		}
+
+		$this->html = $output_buffer . substr( $this->html, $bytes_already_copied );
+
+		/*
+		 * Adjust bookmark locations to account for how the text
+		 * replacements adjust offsets in the input document.
+		 */
+		foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
+			/*
+			 * Each lexical update which appears before the bookmark's endpoints
+			 * might shift the offsets for those endpoints. Loop through each change
+			 * and accumulate the total shift for each bookmark, then apply that
+			 * shift after tallying the full delta.
+			 */
+			$head_delta = 0;
+			$tail_delta = 0;
+
+			foreach ( $this->lexical_updates as $diff ) {
+				if ( $bookmark->start < $diff->start && $bookmark->end < $diff->start ) {
+					break;
+				}
+
+				if ( $bookmark->start >= $diff->start && $bookmark->end < $diff->end ) {
+					$this->release_bookmark( $bookmark_name );
+					continue 2;
+				}
+
+				$delta = strlen( $diff->text ) - ( $diff->end - $diff->start );
+
+				if ( $bookmark->start >= $diff->start ) {
+					$head_delta += $delta;
+				}
+
+				if ( $bookmark->end >= $diff->end ) {
+					$tail_delta += $delta;
+				}
+			}
+
+			$bookmark->start += $head_delta;
+			$bookmark->end   += $tail_delta;
+		}
+
+		$this->lexical_updates = array();
+
+		return $accumulated_shift_for_given_point;
+	}
+
+	/**
+	 * Checks whether a bookmark with the given name exists.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $bookmark_name Name to identify a bookmark that potentially exists.
+	 * @return bool Whether that bookmark exists.
+	 */
+	public function has_bookmark( $bookmark_name ) {
+		return array_key_exists( $bookmark_name, $this->bookmarks );
+	}
+
+	/**
+	 * Move the internal cursor in the Tag Processor to a given bookmark's location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ) {
+		if ( ! array_key_exists( $bookmark_name, $this->bookmarks ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Unknown bookmark name.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		if ( ++$this->seek_count > static::MAX_SEEK_OPS ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Too many calls to seek() - this can lead to performance issues.' ),
+				'6.2.0'
+			);
+			return false;
+		}
+
+		// Flush out any pending updates to the document.
+		$this->get_updated_html();
+
+		// Point this tag processor before the sought tag opener and consume it.
+		$this->bytes_already_parsed = $this->bookmarks[ $bookmark_name ]->start;
+		return $this->next_tag( array( 'tag_closers' => 'visit' ) );
+	}
+
+	/**
+	 * Compare two WP_HTML_Text_Replacement objects.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_HTML_Text_Replacement $a First attribute update.
+	 * @param WP_HTML_Text_Replacement $b Second attribute update.
+	 * @return int Comparison value for string order.
+	 */
+	private static function sort_start_ascending( $a, $b ) {
+		$by_start = $a->start - $b->start;
+		if ( 0 !== $by_start ) {
+			return $by_start;
+		}
+
+		$by_text = isset( $a->text, $b->text ) ? strcmp( $a->text, $b->text ) : 0;
+		if ( 0 !== $by_text ) {
+			return $by_text;
+		}
+
+		/*
+		 * This code should be unreachable, because it implies the two replacements
+		 * start at the same location and contain the same text.
+		 */
+		return $a->end - $b->end;
+	}
+
+	/**
+	 * Return the enqueued value for a given attribute, if one exists.
+	 *
+	 * Enqueued updates can take different data types:
+	 *  - If an update is enqueued and is boolean, the return will be `true`
+	 *  - If an update is otherwise enqueued, the return will be the string value of that update.
+	 *  - If an attribute is enqueued to be removed, the return will be `null` to indicate that.
+	 *  - If no updates are enqueued, the return will be `false` to differentiate from "removed."
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $comparable_name The attribute name in its comparable form.
+	 * @return string|boolean|null Value of enqueued update if present, otherwise false.
+	 */
+	private function get_enqueued_attribute_value( $comparable_name ) {
+		if ( ! isset( $this->lexical_updates[ $comparable_name ] ) ) {
+			return false;
+		}
+
+		$enqueued_text = $this->lexical_updates[ $comparable_name ]->text;
+
+		// Removed attributes erase the entire span.
+		if ( '' === $enqueued_text ) {
+			return null;
+		}
+
+		/*
+		 * Boolean attribute updates are just the attribute name without a corresponding value.
+		 *
+		 * This value might differ from the given comparable name in that there could be leading
+		 * or trailing whitespace, and that the casing follows the name given in `set_attribute`.
+		 *
+		 * Example:
+		 *
+		 *     $p->set_attribute( 'data-TEST-id', 'update' );
+		 *     'update' === $p->get_enqueued_attribute_value( 'data-test-id' );
+		 *
+		 * Detect this difference based on the absence of the `=`, which _must_ exist in any
+		 * attribute containing a value, e.g. `<input type="text" enabled />`.
+		 *                                            ¹           ²
+		 *                                       1. Attribute with a string value.
+		 *                                       2. Boolean attribute whose value is `true`.
+		 */
+		$equals_at = strpos( $enqueued_text, '=' );
+		if ( false === $equals_at ) {
+			return true;
+		}
+
+		/*
+		 * Finally, a normal update's value will appear after the `=` and
+		 * be double-quoted, as performed incidentally by `set_attribute`.
+		 *
+		 * e.g. `type="text"`
+		 *           ¹²    ³
+		 *        1. Equals is here.
+		 *        2. Double-quoting starts one after the equals sign.
+		 *        3. Double-quoting ends at the last character in the update.
+		 */
+		$enqueued_value = substr( $enqueued_text, $equals_at + 2, -1 );
+		return html_entity_decode( $enqueued_value );
+	}
+
+	/**
+	 * Returns the value of a requested attribute from a matched tag opener if that attribute exists.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div enabled class="test" data-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute( 'data-test-id' ) === '14';
+	 *     $p->get_attribute( 'enabled' ) === true;
+	 *     $p->get_attribute( 'aria-label' ) === null;
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute( 'class' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name Name of attribute whose value is requested.
+	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
+	 */
+	public function get_attribute( $name ) {
+		if ( null === $this->tag_name_starts_at ) {
+			return null;
+		}
+
+		$comparable = strtolower( $name );
+
+		/*
+		 * For every attribute other than `class` it's possible to perform a quick check if
+		 * there's an enqueued lexical update whose value takes priority over what's found in
+		 * the input document.
+		 *
+		 * The `class` attribute is special though because of the exposed helpers `add_class`
+		 * and `remove_class`. These form a builder for the `class` attribute, so an additional
+		 * check for enqueued class changes is required in addition to the check for any enqueued
+		 * attribute values. If any exist, those enqueued class changes must first be flushed out
+		 * into an attribute value update.
+		 */
+		if ( 'class' === $name ) {
+			$this->class_name_updates_to_attributes_updates();
+		}
+
+		// Return any enqueued attribute value updates if they exist.
+		$enqueued_value = $this->get_enqueued_attribute_value( $comparable );
+		if ( false !== $enqueued_value ) {
+			return $enqueued_value;
+		}
+
+		if ( ! isset( $this->attributes[ $comparable ] ) ) {
+			return null;
+		}
+
+		$attribute = $this->attributes[ $comparable ];
+
+		/*
+		 * This flag distinguishes an attribute with no value
+		 * from an attribute with an empty string value. For
+		 * unquoted attributes this could look very similar.
+		 * It refers to whether an `=` follows the name.
+		 *
+		 * e.g. <div boolean-attribute empty-attribute=></div>
+		 *           ¹                 ²
+		 *        1. Attribute `boolean-attribute` is `true`.
+		 *        2. Attribute `empty-attribute` is `""`.
+		 */
+		if ( true === $attribute->is_true ) {
+			return true;
+		}
+
+		$raw_value = substr( $this->html, $attribute->value_starts_at, $attribute->value_length );
+
+		return html_entity_decode( $raw_value );
+	}
+
+	/**
+	 * Gets lowercase names of all attributes matching a given prefix in the current tag.
+	 *
+	 * Note that matching is case-insensitive. This is in accordance with the spec:
+	 *
+	 * > There must never be two or more attributes on
+	 * > the same start tag whose names are an ASCII
+	 * > case-insensitive match for each other.
+	 *     - HTML 5 spec
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div data-ENABLED class="test" DATA-test-id="14">Test</div>' );
+	 *     $p->next_tag( array( 'class_name' => 'test' ) ) === true;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === array( 'data-enabled', 'data-test-id' );
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_attribute_names_with_prefix( 'data-' ) === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+	 *
+	 * @param string $prefix Prefix of requested attribute names.
+	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
+	 */
+	public function get_attribute_names_with_prefix( $prefix ) {
+		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
+			return null;
+		}
+
+		$comparable = strtolower( $prefix );
+
+		$matches = array();
+		foreach ( array_keys( $this->attributes ) as $attr_name ) {
+			if ( str_starts_with( $attr_name, $comparable ) ) {
+				$matches[] = $attr_name;
+			}
+		}
+		return $matches;
+	}
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $p->next_tag() === true;
+	 *     $p->get_tag() === 'DIV';
+	 *
+	 *     $p->next_tag() === false;
+	 *     $p->get_tag() === null;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag() {
+		if ( null === $this->tag_name_starts_at ) {
+			return null;
+		}
+
+		$tag_name = substr( $this->html, $this->tag_name_starts_at, $this->tag_name_length );
+
+		return strtoupper( $tag_name );
+	}
+
+	/**
+	 * Indicates if the currently matched tag contains the self-closing flag.
+	 *
+	 * No HTML elements ought to have the self-closing flag and for those, the self-closing
+	 * flag will be ignored. For void elements this is benign because they "self close"
+	 * automatically. For non-void HTML elements though problems will appear if someone
+	 * intends to use a self-closing element in place of that element with an empty body.
+	 * For HTML foreign elements and custom elements the self-closing flag determines if
+	 * they self-close or not.
+	 *
+	 * This function does not determine if a tag is self-closing,
+	 * but only if the self-closing flag is present in the syntax.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return bool Whether the currently matched tag contains the self-closing flag.
+	 */
+	public function has_self_closing_flag() {
+		if ( ! $this->tag_name_starts_at ) {
+			return false;
+		}
+
+		return '/' === $this->html[ $this->tag_ends_at - 1 ];
+	}
+
+	/**
+	 * Indicates if the current tag token is a tag closer.
+	 *
+	 * Example:
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( '<div></div>' );
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === false;
+	 *
+	 *     $p->next_tag( array( 'tag_name' => 'div', 'tag_closers' => 'visit' ) );
+	 *     $p->is_tag_closer() === true;
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the current tag is a tag closer.
+	 */
+	public function is_tag_closer() {
+		return $this->is_closing_tag;
+	}
+
+	/**
+	 * Updates or creates a new attribute on the currently matched tag with the passed value.
+	 *
+	 * For boolean attributes special handling is provided:
+	 *  - When `true` is passed as the value, then only the attribute name is added to the tag.
+	 *  - When `false` is passed, the attribute gets removed if it existed before.
+	 *
+	 * For string attributes, the value is escaped using the `esc_attr` function.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Fix: Only create a single update for multiple calls with case-variant attribute names.
+	 *
+	 * @param string      $name  The attribute name to target.
+	 * @param string|bool $value The new attribute value.
+	 * @return bool Whether an attribute value was set.
+	 */
+	public function set_attribute( $name, $value ) {
+		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
+			return false;
+		}
+
+		/*
+		 * WordPress rejects more characters than are strictly forbidden
+		 * in HTML5. This is to prevent additional security risks deeper
+		 * in the WordPress and plugin stack. Specifically the
+		 * less-than (<) greater-than (>) and ampersand (&) aren't allowed.
+		 *
+		 * The use of a PCRE match enables looking for specific Unicode
+		 * code points without writing a UTF-8 decoder. Whereas scanning
+		 * for one-byte characters is trivial (with `strcspn`), scanning
+		 * for the longer byte sequences would be more complicated. Given
+		 * that this shouldn't be in the hot path for execution, it's a
+		 * reasonable compromise in efficiency without introducing a
+		 * noticeable impact on the overall system.
+		 *
+		 * @see https://html.spec.whatwg.org/#attributes-2
+		 *
+		 * @TODO as the only regex pattern maybe we should take it out? are
+		 *       Unicode patterns available broadly in Core?
+		 */
+		if ( preg_match(
+			'~[' .
+				// Syntax-like characters.
+				'"\'>&</ =' .
+				// Control characters.
+				'\x{00}-\x{1F}' .
+				// HTML noncharacters.
+				'\x{FDD0}-\x{FDEF}' .
+				'\x{FFFE}\x{FFFF}\x{1FFFE}\x{1FFFF}\x{2FFFE}\x{2FFFF}\x{3FFFE}\x{3FFFF}' .
+				'\x{4FFFE}\x{4FFFF}\x{5FFFE}\x{5FFFF}\x{6FFFE}\x{6FFFF}\x{7FFFE}\x{7FFFF}' .
+				'\x{8FFFE}\x{8FFFF}\x{9FFFE}\x{9FFFF}\x{AFFFE}\x{AFFFF}\x{BFFFE}\x{BFFFF}' .
+				'\x{CFFFE}\x{CFFFF}\x{DFFFE}\x{DFFFF}\x{EFFFE}\x{EFFFF}\x{FFFFE}\x{FFFFF}' .
+				'\x{10FFFE}\x{10FFFF}' .
+			']~Ssu',
+			$name
+		) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Invalid attribute name.' ),
+				'6.2.0'
+			);
+
+			return false;
+		}
+
+		/*
+		 * > The values "true" and "false" are not allowed on boolean attributes.
+		 * > To represent a false value, the attribute has to be omitted altogether.
+		 *     - HTML5 spec, https://html.spec.whatwg.org/#boolean-attributes
+		 */
+		if ( false === $value ) {
+			return $this->remove_attribute( $name );
+		}
+
+		if ( true === $value ) {
+			$updated_attribute = $name;
+		} else {
+			$escaped_new_value = esc_attr( $value );
+			$updated_attribute = "{$name}=\"{$escaped_new_value}\"";
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$comparable_name = strtolower( $name );
+
+		if ( isset( $this->attributes[ $comparable_name ] ) ) {
+			/*
+			 * Update an existing attribute.
+			 *
+			 * Example – set attribute id to "new" in <div id="initial_id" />:
+			 *
+			 *     <div id="initial_id"/>
+			 *          ^-------------^
+			 *          start         end
+			 *     replacement: `id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$existing_attribute                        = $this->attributes[ $comparable_name ];
+			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
+				$existing_attribute->start,
+				$existing_attribute->end,
+				$updated_attribute
+			);
+		} else {
+			/*
+			 * Create a new attribute at the tag's name end.
+			 *
+			 * Example – add attribute id="new" to <div />:
+			 *
+			 *     <div/>
+			 *         ^
+			 *         start and end
+			 *     replacement: ` id="new"`
+			 *
+			 *     Result: <div id="new"/>
+			 */
+			$this->lexical_updates[ $comparable_name ] = new WP_HTML_Text_Replacement(
+				$this->tag_name_starts_at + $this->tag_name_length,
+				$this->tag_name_starts_at + $this->tag_name_length,
+				' ' . $updated_attribute
+			);
+		}
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $comparable_name && ! empty( $this->classname_updates ) ) {
+			$this->classname_updates = array();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Remove an attribute from the currently-matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $name The attribute name to remove.
+	 * @return bool Whether an attribute was removed.
+	 */
+	public function remove_attribute( $name ) {
+		if ( $this->is_closing_tag ) {
+			return false;
+		}
+
+		/*
+		 * > There must never be two or more attributes on
+		 * > the same start tag whose names are an ASCII
+		 * > case-insensitive match for each other.
+		 *     - HTML 5 spec
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/syntax.html#attributes-2:ascii-case-insensitive
+		 */
+		$name = strtolower( $name );
+
+		/*
+		 * Any calls to update the `class` attribute directly should wipe out any
+		 * enqueued class changes from `add_class` and `remove_class`.
+		 */
+		if ( 'class' === $name && count( $this->classname_updates ) !== 0 ) {
+			$this->classname_updates = array();
+		}
+
+		/*
+		 * If updating an attribute that didn't exist in the input
+		 * document, then remove the enqueued update and move on.
+		 *
+		 * For example, this might occur when calling `remove_attribute()`
+		 * after calling `set_attribute()` for the same attribute
+		 * and when that attribute wasn't originally present.
+		 */
+		if ( ! isset( $this->attributes[ $name ] ) ) {
+			if ( isset( $this->lexical_updates[ $name ] ) ) {
+				unset( $this->lexical_updates[ $name ] );
+			}
+			return false;
+		}
+
+		/*
+		 * Removes an existing tag attribute.
+		 *
+		 * Example – remove the attribute id from <div id="main"/>:
+		 *    <div id="initial_id"/>
+		 *         ^-------------^
+		 *         start         end
+		 *    replacement: ``
+		 *
+		 *    Result: <div />
+		 */
+		$this->lexical_updates[ $name ] = new WP_HTML_Text_Replacement(
+			$this->attributes[ $name ]->start,
+			$this->attributes[ $name ]->end,
+			''
+		);
+
+		return true;
+	}
+
+	/**
+	 * Adds a new class name to the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to add.
+	 * @return bool Whether the class was set to be added.
+	 */
+	public function add_class( $class_name ) {
+		if ( $this->is_closing_tag ) {
+			return false;
+		}
+
+		if ( null !== $this->tag_name_starts_at ) {
+			$this->classname_updates[ $class_name ] = self::ADD_CLASS;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Removes a class name from the currently matched tag.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $class_name The class name to remove.
+	 * @return bool Whether the class was set to be removed.
+	 */
+	public function remove_class( $class_name ) {
+		if ( $this->is_closing_tag ) {
+			return false;
+		}
+
+		if ( null !== $this->tag_name_starts_at ) {
+			$this->classname_updates[ $class_name ] = self::REMOVE_CLASS;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @see WP_HTML_Tag_Processor::get_updated_html()
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function __toString() {
+		return $this->get_updated_html();
+	}
+
+	/**
+	 * Returns the string representation of the HTML Tag Processor.
+	 *
+	 * @since 6.2.0
+	 * @since 6.2.1 Shifts the internal cursor corresponding to the applied updates.
+	 *
+	 * @return string The processed HTML.
+	 */
+	public function get_updated_html() {
+		$requires_no_updating = 0 === count( $this->classname_updates ) && 0 === count( $this->lexical_updates );
+
+		/*
+		 * When there is nothing more to update and nothing has already been
+		 * updated, return the original document and avoid a string copy.
+		 */
+		if ( $requires_no_updating ) {
+			return $this->html;
+		}
+
+		/*
+		 * Keep track of the position right before the current tag. This will
+		 * be necessary for reparsing the current tag after updating the HTML.
+		 */
+		$before_current_tag = $this->tag_name_starts_at - 1;
+
+		/*
+		 * 1. Apply the enqueued edits and update all the pointers to reflect those changes.
+		 */
+		$this->class_name_updates_to_attributes_updates();
+		$before_current_tag += $this->apply_attributes_updates( $before_current_tag );
+
+		/*
+		 * 2. Rewind to before the current tag and reparse to get updated attributes.
+		 *
+		 * At this point the internal cursor points to the end of the tag name.
+		 * Rewind before the tag name starts so that it's as if the cursor didn't
+		 * move; a call to `next_tag()` will reparse the recently-updated attributes
+		 * and additional calls to modify the attributes will apply at this same
+		 * location.
+		 *
+		 * <p>Previous HTML<em>More HTML</em></p>
+		 *                 ^  | back up by the length of the tag name plus the opening <
+		 *                 \<-/ back up by strlen("em") + 1 ==> 3
+		 */
+
+		// Store existing state so it can be restored after reparsing.
+		$previous_parsed_byte_count = $this->bytes_already_parsed;
+		$previous_query             = $this->last_query;
+
+		// Reparse attributes.
+		$this->bytes_already_parsed = $before_current_tag;
+		$this->next_tag();
+
+		// Restore previous state.
+		$this->bytes_already_parsed = $previous_parsed_byte_count;
+		$this->parse_query( $previous_query );
+
+		return $this->html;
+	}
+
+	/**
+	 * Parses tag query input into internal search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this class name to match.
+	 *     @type string      $tag_closers  "visit" or "skip": whether to stop on tag closers, e.g. </div>.
+	 * }
+	 */
+	private function parse_query( $query ) {
+		if ( null !== $query && $query === $this->last_query ) {
+			return;
+		}
+
+		$this->last_query          = $query;
+		$this->sought_tag_name     = null;
+		$this->sought_class_name   = null;
+		$this->sought_match_offset = 1;
+		$this->stop_on_tag_closers = false;
+
+		// A single string value means "find the tag of this name".
+		if ( is_string( $query ) ) {
+			$this->sought_tag_name = $query;
+			return;
+		}
+
+		// An empty query parameter applies no restrictions on the search.
+		if ( null === $query ) {
+			return;
+		}
+
+		// If not using the string interface, an associative array is required.
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'The query argument must be an array or a tag name.' ),
+				'6.2.0'
+			);
+			return;
+		}
+
+		if ( isset( $query['tag_name'] ) && is_string( $query['tag_name'] ) ) {
+			$this->sought_tag_name = $query['tag_name'];
+		}
+
+		if ( isset( $query['class_name'] ) && is_string( $query['class_name'] ) ) {
+			$this->sought_class_name = $query['class_name'];
+		}
+
+		if ( isset( $query['match_offset'] ) && is_int( $query['match_offset'] ) && 0 < $query['match_offset'] ) {
+			$this->sought_match_offset = $query['match_offset'];
+		}
+
+		if ( isset( $query['tag_closers'] ) ) {
+			$this->stop_on_tag_closers = 'visit' === $query['tag_closers'];
+		}
+	}
+
+
+	/**
+	 * Checks whether a given tag and its attributes match the search criteria.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return bool Whether the given tag and its attribute match the search criteria.
+	 */
+	private function matches() {
+		if ( $this->is_closing_tag && ! $this->stop_on_tag_closers ) {
+			return false;
+		}
+
+		// Does the tag name match the requested tag name in a case-insensitive manner?
+		if ( null !== $this->sought_tag_name ) {
+			/*
+			 * String (byte) length lookup is fast. If they aren't the
+			 * same length then they can't be the same string values.
+			 */
+			if ( strlen( $this->sought_tag_name ) !== $this->tag_name_length ) {
+				return false;
+			}
+
+			/*
+			 * Check each character to determine if they are the same.
+			 * Defer calls to `strtoupper()` to avoid them when possible.
+			 * Calling `strcasecmp()` here tested slowed than comparing each
+			 * character, so unless benchmarks show otherwise, it should
+			 * not be used.
+			 *
+			 * It's expected that most of the time that this runs, a
+			 * lower-case tag name will be supplied and the input will
+			 * contain lower-case tag names, thus normally bypassing
+			 * the case comparison code.
+			 */
+			for ( $i = 0; $i < $this->tag_name_length; $i++ ) {
+				$html_char = $this->html[ $this->tag_name_starts_at + $i ];
+				$tag_char  = $this->sought_tag_name[ $i ];
+
+				if ( $html_char !== $tag_char && strtoupper( $html_char ) !== $tag_char ) {
+					return false;
+				}
+			}
+		}
+
+		$needs_class_name = null !== $this->sought_class_name;
+
+		if ( $needs_class_name && ! isset( $this->attributes['class'] ) ) {
+			return false;
+		}
+
+		/*
+		 * Match byte-for-byte (case-sensitive and encoding-form-sensitive) on the class name.
+		 *
+		 * This will overlook certain classes that exist in other lexical variations
+		 * than was supplied to the search query, but requires more complicated searching.
+		 */
+		if ( $needs_class_name ) {
+			$class_start = $this->attributes['class']->value_starts_at;
+			$class_end   = $class_start + $this->attributes['class']->value_length;
+			$class_at    = $class_start;
+
+			/*
+			 * Ensure that boundaries surround the class name to avoid matching on
+			 * substrings of a longer name. For example, the sequence "not-odd"
+			 * should not match for the class "odd" even though "odd" is found
+			 * within the class attribute text.
+			 *
+			 * See https://html.spec.whatwg.org/#attributes-3
+			 * See https://html.spec.whatwg.org/#space-separated-tokens
+			 */
+			while (
+				// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
+				false !== ( $class_at = strpos( $this->html, $this->sought_class_name, $class_at ) ) &&
+				$class_at < $class_end
+			) {
+				/*
+				 * Verify this class starts at a boundary.
+				 */
+				if ( $class_at > $class_start ) {
+					$character = $this->html[ $class_at - 1 ];
+
+					if ( ' ' !== $character && "\t" !== $character && "\f" !== $character && "\r" !== $character && "\n" !== $character ) {
+						$class_at += strlen( $this->sought_class_name );
+						continue;
+					}
+				}
+
+				/*
+				 * Verify this class ends at a boundary as well.
+				 */
+				if ( $class_at + strlen( $this->sought_class_name ) < $class_end ) {
+					$character = $this->html[ $class_at + strlen( $this->sought_class_name ) ];
+
+					if ( ' ' !== $character && "\t" !== $character && "\f" !== $character && "\r" !== $character && "\n" !== $character ) {
+						$class_at += strlen( $this->sought_class_name );
+						continue;
+					}
+				}
+
+				return true;
+			}
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-text-replacement.php b/src/wp-includes/html-api/class-wp-html-text-replacement.php
new file mode 100644
index 0000000000000..26b7bb2d28630
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-text-replacement.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * HTML API: WP_HTML_Text_Replacement class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.2.0
+ */
+
+/**
+ * Core class used by the HTML tag processor as a data structure for replacing
+ * existing content from start to end, allowing to drastically improve performance.
+ *
+ * This class is for internal usage of the WP_HTML_Tag_Processor class.
+ *
+ * @access private
+ * @since 6.2.0
+ *
+ * @see WP_HTML_Tag_Processor
+ */
+class WP_HTML_Text_Replacement {
+	/**
+	 * Byte offset into document where replacement span begins.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $start;
+
+	/**
+	 * Byte offset into document where replacement span ends.
+	 *
+	 * @since 6.2.0
+	 * @var int
+	 */
+	public $end;
+
+	/**
+	 * Span of text to insert in document to replace existing content from start to end.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	public $text;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param int    $start Byte offset into document where replacement span begins.
+	 * @param int    $end   Byte offset into document where replacement span ends.
+	 * @param string $text  Span of text to insert in document to replace existing content from start to end.
+	 */
+	public function __construct( $start, $end, $text ) {
+		$this->start = $start;
+		$this->end   = $end;
+		$this->text  = $text;
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-token.php b/src/wp-includes/html-api/class-wp-html-token.php
new file mode 100644
index 0000000000000..f6edd5235579d
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-token.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * HTML API: WP_HTML_Token class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for referring to tokens in the input HTML string.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class WP_HTML_Token {
+	/**
+	 * Name of bookmark corresponding to source of token in input HTML string.
+	 *
+	 * Having a bookmark name does not imply that the token still exists. It
+	 * may be that the source token and underlying bookmark was wiped out by
+	 * some modification to the source HTML.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	public $bookmark_name = null;
+
+	/**
+	 * Name of node; lowercase names such as "marker" are not HTML elements.
+	 *
+	 * For HTML elements/tags this value should come from WP_HTML_Processor::get_tag().
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::get_tag()
+	 *
+	 * @var string
+	 */
+	public $node_name = null;
+
+	/**
+	 * Whether node contains the self-closing flag.
+	 *
+	 * A node may have a self-closing flag when it shouldn't. This value
+	 * only reports if the flag is present in the original HTML.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#self-closing-flag
+	 *
+	 * @var bool
+	 */
+	public $has_self_closing_flag = false;
+
+	/**
+	 * Called when token is garbage-collected or otherwise destroyed.
+	 *
+	 * @var callable|null
+	 */
+	public $on_destroy = null;
+
+	/**
+	 * Constructor - creates a reference to a token in some external HTML string.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string   $bookmark_name         Name of bookmark corresponding to location in HTML where token is found.
+	 * @param string   $node_name             Name of node token represents; if uppercase, an HTML element; if lowercase, a special value like "marker".
+	 * @param bool     $has_self_closing_flag Whether the source token contains the self-closing flag, regardless of whether it's valid.
+	 * @param callable $on_destroy            Function to call when destroying token, useful for releasing the bookmark.
+	 */
+	public function __construct( $bookmark_name, $node_name, $has_self_closing_flag, $on_destroy = null ) {
+		$this->bookmark_name         = $bookmark_name;
+		$this->node_name             = $node_name;
+		$this->has_self_closing_flag = $has_self_closing_flag;
+		$this->on_destroy            = $on_destroy;
+	}
+
+	/**
+	 * Destructor.
+	 *
+	 * @since 6.4.0
+	 */
+	public function __destruct() {
+		if ( is_callable( $this->on_destroy ) ) {
+			call_user_func( $this->on_destroy, $this->bookmark_name );
+		}
+	}
+}
diff --git a/src/wp-includes/html-api/class-wp-html-unsupported-exception.php b/src/wp-includes/html-api/class-wp-html-unsupported-exception.php
new file mode 100644
index 0000000000000..6e7228670bf8b
--- /dev/null
+++ b/src/wp-includes/html-api/class-wp-html-unsupported-exception.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * HTML API: WP_HTML_Unsupported_Exception class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for indicating that a given operation is unsupported.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * The HTML API aims to operate in compliance with the HTML5
+ * specification, but does not implement the full specification.
+ * In cases where it lacks support it should not cause breakage
+ * or unexpected behavior. In the cases where it recognizes that
+ * it cannot proceed, this class is used to abort from any
+ * operation and signify that the given HTML cannot be processed.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class WP_HTML_Unsupported_Exception extends Exception {
+
+}
diff --git a/src/wp-includes/http.php b/src/wp-includes/http.php
index f77d9a69a7b86..e1738beedffa8 100644
--- a/src/wp-includes/http.php
+++ b/src/wp-includes/http.php
@@ -39,6 +39,7 @@ function _wp_http_get_object() {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_safe_remote_request( $url, $args = array() ) {
@@ -60,6 +61,7 @@ function wp_safe_remote_request( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_safe_remote_get( $url, $args = array() ) {
@@ -81,6 +83,7 @@ function wp_safe_remote_get( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_safe_remote_post( $url, $args = array() ) {
@@ -102,6 +105,7 @@ function wp_safe_remote_post( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_safe_remote_head( $url, $args = array() ) {
@@ -125,6 +129,7 @@ function wp_safe_remote_head( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error {
  *     The response array or a WP_Error on failure.
  *
@@ -155,6 +160,7 @@ function wp_remote_request( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_remote_get( $url, $args = array() ) {
@@ -172,6 +178,7 @@ function wp_remote_get( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_remote_post( $url, $args = array() ) {
@@ -189,6 +196,7 @@ function wp_remote_post( $url, $args = array() ) {
  *
  * @param string $url  URL to retrieve.
  * @param array  $args Optional. Request arguments. Default empty array.
+ *                     See WP_Http::request() for information on accepted arguments.
  * @return array|WP_Error The response or WP_Error on failure.
  */
 function wp_remote_head( $url, $args = array() ) {
@@ -200,13 +208,13 @@ function wp_remote_head( $url, $args = array() ) {
  * Retrieve only the headers from the raw response.
  *
  * @since 2.7.0
- * @since 4.6.0 Return value changed from an array to an Requests_Utility_CaseInsensitiveDictionary instance.
+ * @since 4.6.0 Return value changed from an array to an WpOrg\Requests\Utility\CaseInsensitiveDictionary instance.
  *
- * @see \Requests_Utility_CaseInsensitiveDictionary
+ * @see \WpOrg\Requests\Utility\CaseInsensitiveDictionary
  *
  * @param array|WP_Error $response HTTP response.
- * @return \Requests_Utility_CaseInsensitiveDictionary|array The headers of the response, or empty array
- *                                                           if incorrect parameter given.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|array The headers of the response, or empty array
+ *                                                                 if incorrect parameter given.
  */
 function wp_remote_retrieve_headers( $response ) {
 	if ( is_wp_error( $response ) || ! isset( $response['headers'] ) ) {
@@ -346,7 +354,7 @@ function wp_remote_retrieve_cookie( $response, $name ) {
 function wp_remote_retrieve_cookie_value( $response, $name ) {
 	$cookie = wp_remote_retrieve_cookie( $response, $name );
 
-	if ( ! is_a( $cookie, 'WP_Http_Cookie' ) ) {
+	if ( ! ( $cookie instanceof WP_Http_Cookie ) ) {
 		return '';
 	}
 
@@ -372,7 +380,7 @@ function wp_http_supports( $capabilities = array(), $url = null ) {
 	$count = count( $capabilities );
 
 	// If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array.
-	if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) == $count ) {
+	if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) === $count ) {
 		$capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );
 	}
 
@@ -593,7 +601,7 @@ function wp_http_validate_url( $url ) {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array  $allowed_ports Array of integers for valid ports.
+	 * @param int[]  $allowed_ports Array of integers for valid ports.
 	 * @param string $host          Host name of the requested URL.
 	 * @param string $url           Requested URL.
 	 */
@@ -686,10 +694,10 @@ function wp_parse_url( $url, $component = -1 ) {
 	$to_unset = array();
 	$url      = (string) $url;
 
-	if ( '//' === substr( $url, 0, 2 ) ) {
+	if ( str_starts_with( $url, '//' ) ) {
 		$to_unset[] = 'scheme';
 		$url        = 'placeholder:' . $url;
-	} elseif ( '/' === substr( $url, 0, 1 ) ) {
+	} elseif ( str_starts_with( $url, '/' ) ) {
 		$to_unset[] = 'scheme';
 		$to_unset[] = 'host';
 		$url        = 'placeholder://placeholder' . $url;
diff --git a/src/wp-includes/https-detection.php b/src/wp-includes/https-detection.php
index 9ef7b2bdc5f41..878dd1aa382a7 100644
--- a/src/wp-includes/https-detection.php
+++ b/src/wp-includes/https-detection.php
@@ -49,9 +49,11 @@ function wp_is_home_url_using_https() {
  * @return bool True if using HTTPS, false otherwise.
  */
 function wp_is_site_url_using_https() {
-	// Use direct option access for 'siteurl' and manually run the 'site_url'
-	// filter because `site_url()` will adjust the scheme based on what the
-	// current request is using.
+	/*
+	 * Use direct option access for 'siteurl' and manually run the 'site_url'
+	 * filter because `site_url()` will adjust the scheme based on what the
+	 * current request is using.
+	 */
 	/** This filter is documented in wp-includes/link-template.php */
 	$site_url = apply_filters( 'site_url', get_option( 'siteurl' ), '', null, null );
 
@@ -205,21 +207,14 @@ function wp_is_local_html_output( $html ) {
 	// 1. Check if HTML includes the site's Really Simple Discovery link.
 	if ( has_action( 'wp_head', 'rsd_link' ) ) {
 		$pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( site_url( 'xmlrpc.php?rsd', 'rpc' ) ) ); // See rsd_link().
-		return false !== strpos( $html, $pattern );
-	}
-
-	// 2. Check if HTML includes the site's Windows Live Writer manifest link.
-	if ( has_action( 'wp_head', 'wlwmanifest_link' ) ) {
-		// Try both HTTPS and HTTP since the URL depends on context.
-		$pattern = preg_replace( '#^https?:(?=//)#', '', includes_url( 'wlwmanifest.xml' ) ); // See wlwmanifest_link().
-		return false !== strpos( $html, $pattern );
+		return str_contains( $html, $pattern );
 	}
 
-	// 3. Check if HTML includes the site's REST API link.
+	// 2. Check if HTML includes the site's REST API link.
 	if ( has_action( 'wp_head', 'rest_output_link_wp_head' ) ) {
 		// Try both HTTPS and HTTP since the URL depends on context.
 		$pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( get_rest_url() ) ); // See rest_output_link_wp_head().
-		return false !== strpos( $html, $pattern );
+		return str_contains( $html, $pattern );
 	}
 
 	// Otherwise the result cannot be determined.
diff --git a/src/wp-includes/https-migration.php b/src/wp-includes/https-migration.php
index b8b80d63f0d91..1232154bbced1 100644
--- a/src/wp-includes/https-migration.php
+++ b/src/wp-includes/https-migration.php
@@ -97,8 +97,10 @@ function wp_update_urls_to_https() {
 	update_option( 'siteurl', $siteurl );
 
 	if ( ! wp_is_using_https() ) {
-		// If this did not result in the site recognizing HTTPS as being used,
-		// revert the change and return false.
+		/*
+		 * If this did not result in the site recognizing HTTPS as being used,
+		 * revert the change and return false.
+		 */
 		update_option( 'home', $orig_home );
 		update_option( 'siteurl', $orig_siteurl );
 		return false;
diff --git a/src/wp-includes/images/wlw/wp-comments.png b/src/wp-includes/images/wlw/wp-comments.png
deleted file mode 100644
index 6bc3d523f420e..0000000000000
Binary files a/src/wp-includes/images/wlw/wp-comments.png and /dev/null differ
diff --git a/src/wp-includes/images/wlw/wp-icon.png b/src/wp-includes/images/wlw/wp-icon.png
deleted file mode 100644
index c3523833aa9b2..0000000000000
Binary files a/src/wp-includes/images/wlw/wp-icon.png and /dev/null differ
diff --git a/src/wp-includes/images/wlw/wp-watermark.png b/src/wp-includes/images/wlw/wp-watermark.png
deleted file mode 100644
index 8385c7902b138..0000000000000
Binary files a/src/wp-includes/images/wlw/wp-watermark.png and /dev/null differ
diff --git a/src/wp-includes/kses.php b/src/wp-includes/kses.php
index 9247cbcc4e837..7eeadca569944 100644
--- a/src/wp-includes/kses.php
+++ b/src/wp-includes/kses.php
@@ -736,7 +736,7 @@
  *
  * @since 1.0.0
  *
- * @param string         $string            Text content to filter.
+ * @param string         $content           Text content to filter.
  * @param array[]|string $allowed_html      An array of allowed HTML elements and attributes,
  *                                          or a context name such as 'post'. See wp_kses_allowed_html()
  *                                          for the list of accepted context names.
@@ -744,16 +744,16 @@
  *                                          Defaults to the result of wp_allowed_protocols().
  * @return string Filtered content containing only the allowed HTML.
  */
-function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
+function wp_kses( $content, $allowed_html, $allowed_protocols = array() ) {
 	if ( empty( $allowed_protocols ) ) {
 		$allowed_protocols = wp_allowed_protocols();
 	}
 
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	$string = wp_kses_normalize_entities( $string );
-	$string = wp_kses_hook( $string, $allowed_html, $allowed_protocols );
+	$content = wp_kses_no_null( $content, array( 'slash_zero' => 'keep' ) );
+	$content = wp_kses_normalize_entities( $content );
+	$content = wp_kses_hook( $content, $allowed_html, $allowed_protocols );
 
-	return wp_kses_split( $string, $allowed_html, $allowed_protocols );
+	return wp_kses_split( $content, $allowed_html, $allowed_protocols );
 }
 
 /**
@@ -763,43 +763,45 @@ function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
  *
  * @since 4.2.3
  *
- * @param string $string  The 'whole' attribute, including name and value.
+ * @param string $attr    The 'whole' attribute, including name and value.
  * @param string $element The HTML element name to which the attribute belongs.
  * @return string Filtered attribute.
  */
-function wp_kses_one_attr( $string, $element ) {
+function wp_kses_one_attr( $attr, $element ) {
 	$uris              = wp_kses_uri_attributes();
 	$allowed_html      = wp_kses_allowed_html( 'post' );
 	$allowed_protocols = wp_allowed_protocols();
-	$string            = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
+	$attr              = wp_kses_no_null( $attr, array( 'slash_zero' => 'keep' ) );
 
 	// Preserve leading and trailing whitespace.
 	$matches = array();
-	preg_match( '/^\s*/', $string, $matches );
+	preg_match( '/^\s*/', $attr, $matches );
 	$lead = $matches[0];
-	preg_match( '/\s*$/', $string, $matches );
+	preg_match( '/\s*$/', $attr, $matches );
 	$trail = $matches[0];
 	if ( empty( $trail ) ) {
-		$string = substr( $string, strlen( $lead ) );
+		$attr = substr( $attr, strlen( $lead ) );
 	} else {
-		$string = substr( $string, strlen( $lead ), -strlen( $trail ) );
+		$attr = substr( $attr, strlen( $lead ), -strlen( $trail ) );
 	}
 
 	// Parse attribute name and value from input.
-	$split = preg_split( '/\s*=\s*/', $string, 2 );
+	$split = preg_split( '/\s*=\s*/', $attr, 2 );
 	$name  = $split[0];
-	if ( count( $split ) == 2 ) {
+	if ( count( $split ) === 2 ) {
 		$value = $split[1];
 
-		// Remove quotes surrounding $value.
-		// Also guarantee correct quoting in $string for this one attribute.
+		/*
+		 * Remove quotes surrounding $value.
+		 * Also guarantee correct quoting in $attr for this one attribute.
+		 */
 		if ( '' === $value ) {
 			$quote = '';
 		} else {
 			$quote = $value[0];
 		}
 		if ( '"' === $quote || "'" === $quote ) {
-			if ( substr( $value, -1 ) != $quote ) {
+			if ( ! str_ends_with( $value, $quote ) ) {
 				return '';
 			}
 			$value = substr( $value, 1, -1 );
@@ -815,18 +817,18 @@ function wp_kses_one_attr( $string, $element ) {
 			$value = wp_kses_bad_protocol( $value, $allowed_protocols );
 		}
 
-		$string = "$name=$quote$value$quote";
-		$vless  = 'n';
+		$attr  = "$name=$quote$value$quote";
+		$vless = 'n';
 	} else {
 		$value = '';
 		$vless = 'y';
 	}
 
 	// Sanitize attribute by name.
-	wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html );
+	wp_kses_attr_check( $name, $value, $attr, $vless, $element, $allowed_html );
 
 	// Restore whitespace.
-	return $lead . $string . $trail;
+	return $lead . $attr . $trail;
 }
 
 /**
@@ -922,26 +924,26 @@ function wp_kses_allowed_html( $context = '' ) {
  *
  * @since 1.0.0
  *
- * @param string         $string            Content to filter through KSES.
+ * @param string         $content           Content to filter through KSES.
  * @param array[]|string $allowed_html      An array of allowed HTML elements and attributes,
  *                                          or a context name such as 'post'. See wp_kses_allowed_html()
  *                                          for the list of accepted context names.
  * @param string[]       $allowed_protocols Array of allowed URL protocols.
  * @return string Filtered content through {@see 'pre_kses'} hook.
  */
-function wp_kses_hook( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_hook( $content, $allowed_html, $allowed_protocols ) {
 	/**
 	 * Filters content to be run through KSES.
 	 *
 	 * @since 2.3.0
 	 *
-	 * @param string         $string            Content to filter through KSES.
+	 * @param string         $content           Content to filter through KSES.
 	 * @param array[]|string $allowed_html      An array of allowed HTML elements and attributes,
 	 *                                          or a context name such as 'post'. See wp_kses_allowed_html()
 	 *                                          for the list of accepted context names.
 	 * @param string[]       $allowed_protocols Array of allowed URL protocols.
 	 */
-	return apply_filters( 'pre_kses', $string, $allowed_html, $allowed_protocols );
+	return apply_filters( 'pre_kses', $content, $allowed_html, $allowed_protocols );
 }
 
 /**
@@ -966,20 +968,20 @@ function wp_kses_version() {
  *                                                or a context name such as 'post'.
  * @global string[]       $pass_allowed_protocols Array of allowed URL protocols.
  *
- * @param string         $string            Content to filter.
+ * @param string         $content           Content to filter.
  * @param array[]|string $allowed_html      An array of allowed HTML elements and attributes,
  *                                          or a context name such as 'post'. See wp_kses_allowed_html()
  *                                          for the list of accepted context names.
  * @param string[]       $allowed_protocols Array of allowed URL protocols.
  * @return string Content with fixed HTML tags
  */
-function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
+function wp_kses_split( $content, $allowed_html, $allowed_protocols ) {
 	global $pass_allowed_html, $pass_allowed_protocols;
 
 	$pass_allowed_html      = $allowed_html;
 	$pass_allowed_protocols = $allowed_protocols;
 
-	return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
+	return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $content );
 }
 
 /**
@@ -1043,13 +1045,13 @@ function wp_kses_uri_attributes() {
  *                                                or a context name such as 'post'.
  * @global string[]       $pass_allowed_protocols Array of allowed URL protocols.
  *
- * @param array $match preg_replace regexp matches
+ * @param array $matches preg_replace regexp matches
  * @return string
  */
-function _wp_kses_split_callback( $match ) {
+function _wp_kses_split_callback( $matches ) {
 	global $pass_allowed_html, $pass_allowed_protocols;
 
-	return wp_kses_split2( $match[0], $pass_allowed_html, $pass_allowed_protocols );
+	return wp_kses_split2( $matches[0], $pass_allowed_html, $pass_allowed_protocols );
 }
 
 /**
@@ -1068,39 +1070,43 @@ function _wp_kses_split_callback( $match ) {
  * @ignore
  * @since 1.0.0
  *
- * @param string         $string            Content to filter.
+ * @param string         $content           Content to filter.
  * @param array[]|string $allowed_html      An array of allowed HTML elements and attributes,
  *                                          or a context name such as 'post'. See wp_kses_allowed_html()
  *                                          for the list of accepted context names.
  * @param string[]       $allowed_protocols Array of allowed URL protocols.
  * @return string Fixed HTML element
  */
-function wp_kses_split2( $string, $allowed_html, $allowed_protocols ) {
-	$string = wp_kses_stripslashes( $string );
+function wp_kses_split2( $content, $allowed_html, $allowed_protocols ) {
+	$content = wp_kses_stripslashes( $content );
 
 	// It matched a ">" character.
-	if ( '<' !== substr( $string, 0, 1 ) ) {
+	if ( ! str_starts_with( $content, '<' ) ) {
 		return '&gt;';
 	}
 
 	// Allow HTML comments.
-	if ( '<!--' === substr( $string, 0, 4 ) ) {
-		$string = str_replace( array( '<!--', '-->' ), '', $string );
-		while ( ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) != $string ) {
-			$string = $newstring;
+	if ( str_starts_with( $content, '<!--' ) ) {
+		$content = str_replace( array( '<!--', '-->' ), '', $content );
+
+		while ( ( $newstring = wp_kses( $content, $allowed_html, $allowed_protocols ) ) !== $content ) {
+			$content = $newstring;
 		}
-		if ( '' === $string ) {
+
+		if ( '' === $content ) {
 			return '';
 		}
+
 		// Prevent multiple dashes in comments.
-		$string = preg_replace( '/--+/', '-', $string );
+		$content = preg_replace( '/--+/', '-', $content );
 		// Prevent three dashes closing a comment.
-		$string = preg_replace( '/-$/', '', $string );
-		return "<!--{$string}-->";
+		$content = preg_replace( '/-$/', '', $content );
+
+		return "<!--{$content}-->";
 	}
 
 	// It's seriously malformed.
-	if ( ! preg_match( '%^<\s*(/\s*)?([a-zA-Z0-9-]+)([^>]*)>?$%', $string, $matches ) ) {
+	if ( ! preg_match( '%^<\s*(/\s*)?([a-zA-Z0-9-]+)([^>]*)>?$%', $content, $matches ) ) {
 		return '';
 	}
 
@@ -1177,7 +1183,7 @@ function wp_kses_attr( $element, $attr, $allowed_html, $allowed_protocols ) {
 	// Check if there are attributes that are required.
 	$required_attrs = array_filter(
 		$allowed_html[ $element_low ],
-		function( $required_attr_limits ) {
+		static function( $required_attr_limits ) {
 			return isset( $required_attr_limits['required'] ) && true === $required_attr_limits['required'];
 		}
 	);
@@ -1260,7 +1266,7 @@ function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowe
 		 * Note: the attribute name should only contain `A-Za-z0-9_-` chars,
 		 * double hyphens `--` are not accepted by WordPress.
 		 */
-		if ( strpos( $name_low, 'data-' ) === 0 && ! empty( $allowed_attr['data-*'] )
+		if ( str_starts_with( $name_low, 'data-' ) && ! empty( $allowed_attr['data-*'] )
 			&& preg_match( '/^data(?:-[a-z0-9_]+)+$/', $name_low, $match )
 		) {
 			/*
@@ -1330,7 +1336,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 
 	// Loop through the whole attribute list.
 
-	while ( strlen( $attr ) != 0 ) {
+	while ( strlen( $attr ) !== 0 ) {
 		$working = 0; // Was the last operation successful?
 
 		switch ( $mode ) {
@@ -1355,6 +1361,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 				if ( preg_match( '/^\s+/', $attr ) ) { // Valueless.
 					$working = 1;
 					$mode    = 0;
+
 					if ( false === array_key_exists( $attrname, $attrarr ) ) {
 						$attrarr[ $attrname ] = array(
 							'name'  => $attrname,
@@ -1363,6 +1370,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 							'vless' => 'y',
 						);
 					}
+
 					$attr = preg_replace( '/^\s+/', '', $attr );
 				}
 
@@ -1384,6 +1392,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 							'vless' => 'n',
 						);
 					}
+
 					$working = 1;
 					$mode    = 0;
 					$attr    = preg_replace( '/^"[^"]*"(\s+|$)/', '', $attr );
@@ -1405,6 +1414,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 							'vless' => 'n',
 						);
 					}
+
 					$working = 1;
 					$mode    = 0;
 					$attr    = preg_replace( "/^'[^']*'(\s+|$)/", '', $attr );
@@ -1426,6 +1436,7 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 							'vless' => 'n',
 						);
 					}
+
 					// We add quotes to conform to W3C's HTML spec.
 					$working = 1;
 					$mode    = 0;
@@ -1435,15 +1446,17 @@ function wp_kses_hair( $attr, $allowed_protocols ) {
 				break;
 		} // End switch.
 
-		if ( 0 == $working ) { // Not well-formed, remove and try again.
+		if ( 0 === $working ) { // Not well-formed, remove and try again.
 			$attr = wp_kses_html_error( $attr );
 			$mode = 0;
 		}
 	} // End while.
 
-	if ( 1 == $mode && false === array_key_exists( $attrname, $attrarr ) ) {
-		// Special case, for when the attribute list ends with a valueless
-		// attribute like "selected".
+	if ( 1 === $mode && false === array_key_exists( $attrname, $attrarr ) ) {
+		/*
+		 * Special case, for when the attribute list ends with a valueless
+		 * attribute like "selected".
+		 */
 		$attrarr[ $attrname ] = array(
 			'name'  => $attrname,
 			'value' => '',
@@ -1546,8 +1559,10 @@ function wp_kses_hair_parse( $attr ) {
 		. '\s*';              // Trailing space is optional except as mentioned above.
 	// phpcs:enable
 
-	// Although it is possible to reduce this procedure to a single regexp,
-	// we must run that regexp twice to get exactly the expected result.
+	/*
+	 * Although it is possible to reduce this procedure to a single regexp,
+	 * we must run that regexp twice to get exactly the expected result.
+	 */
 
 	$validation = "%^($regex)+$%";
 	$extraction = "%$regex%";
@@ -1640,7 +1655,7 @@ function wp_kses_check_attr_val( $value, $vless, $checkname, $checkvalue ) {
 			 * If the given value is an "n" or an "N", the attribute must have a value.
 			 */
 
-			if ( strtolower( $checkvalue ) != $vless ) {
+			if ( strtolower( $checkvalue ) !== $vless ) {
 				$ok = false;
 			}
 			break;
@@ -1681,24 +1696,33 @@ function wp_kses_check_attr_val( $value, $vless, $checkname, $checkvalue ) {
  *
  * @since 1.0.0
  *
- * @param string   $string            Content to filter bad protocols from.
+ * @param string   $content           Content to filter bad protocols from.
  * @param string[] $allowed_protocols Array of allowed URL protocols.
  * @return string Filtered content.
  */
-function wp_kses_bad_protocol( $string, $allowed_protocols ) {
-	$string     = wp_kses_no_null( $string );
+function wp_kses_bad_protocol( $content, $allowed_protocols ) {
+	$content = wp_kses_no_null( $content );
+
+	// Short-circuit if the string starts with `https://` or `http://`. Most common cases.
+	if (
+		( str_starts_with( $content, 'https://' ) && in_array( 'https', $allowed_protocols, true ) ) ||
+		( str_starts_with( $content, 'http://' ) && in_array( 'http', $allowed_protocols, true ) )
+	) {
+		return $content;
+	}
+
 	$iterations = 0;
 
 	do {
-		$original_string = $string;
-		$string          = wp_kses_bad_protocol_once( $string, $allowed_protocols );
-	} while ( $original_string != $string && ++$iterations < 6 );
+		$original_content = $content;
+		$content          = wp_kses_bad_protocol_once( $content, $allowed_protocols );
+	} while ( $original_content !== $content && ++$iterations < 6 );
 
-	if ( $original_string != $string ) {
+	if ( $original_content !== $content ) {
 		return '';
 	}
 
-	return $string;
+	return $content;
 }
 
 /**
@@ -1708,21 +1732,21 @@ function wp_kses_bad_protocol( $string, $allowed_protocols ) {
  *
  * @since 1.0.0
  *
- * @param string $string  Content to filter null characters from.
+ * @param string $content Content to filter null characters from.
  * @param array  $options Set 'slash_zero' => 'keep' when '\0' is allowed. Default is 'remove'.
  * @return string Filtered content.
  */
-function wp_kses_no_null( $string, $options = null ) {
+function wp_kses_no_null( $content, $options = null ) {
 	if ( ! isset( $options['slash_zero'] ) ) {
 		$options = array( 'slash_zero' => 'remove' );
 	}
 
-	$string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string );
+	$content = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $content );
 	if ( 'remove' === $options['slash_zero'] ) {
-		$string = preg_replace( '/\\\\+0+/', '', $string );
+		$content = preg_replace( '/\\\\+0+/', '', $content );
 	}
 
-	return $string;
+	return $content;
 }
 
 /**
@@ -1733,11 +1757,11 @@ function wp_kses_no_null( $string, $options = null ) {
  *
  * @since 1.0.0
  *
- * @param string $string String to strip slashes from.
+ * @param string $content String to strip slashes from.
  * @return string Fixed string with quoted slashes.
  */
-function wp_kses_stripslashes( $string ) {
-	return preg_replace( '%\\\\"%', '"', $string );
+function wp_kses_stripslashes( $content ) {
+	return preg_replace( '%\\\\"%', '"', $content );
 }
 
 /**
@@ -1772,11 +1796,11 @@ function wp_kses_array_lc( $inarray ) {
  *
  * @since 1.0.0
  *
- * @param string $string
+ * @param string $attr
  * @return string
  */
-function wp_kses_html_error( $string ) {
-	return preg_replace( '/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string );
+function wp_kses_html_error( $attr ) {
+	return preg_replace( '/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $attr );
 }
 
 /**
@@ -1787,30 +1811,31 @@ function wp_kses_html_error( $string ) {
  *
  * @since 1.0.0
  *
- * @param string   $string            Content to check for bad protocols.
+ * @param string   $content           Content to check for bad protocols.
  * @param string[] $allowed_protocols Array of allowed URL protocols.
  * @param int      $count             Depth of call recursion to this function.
  * @return string Sanitized content.
  */
-function wp_kses_bad_protocol_once( $string, $allowed_protocols, $count = 1 ) {
-	$string  = preg_replace( '/(&#0*58(?![;0-9])|&#x0*3a(?![;a-f0-9]))/i', '$1;', $string );
-	$string2 = preg_split( '/:|&#0*58;|&#x0*3a;|&colon;/i', $string, 2 );
-	if ( isset( $string2[1] ) && ! preg_match( '%/\?%', $string2[0] ) ) {
-		$string   = trim( $string2[1] );
-		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
+function wp_kses_bad_protocol_once( $content, $allowed_protocols, $count = 1 ) {
+	$content  = preg_replace( '/(&#0*58(?![;0-9])|&#x0*3a(?![;a-f0-9]))/i', '$1;', $content );
+	$content2 = preg_split( '/:|&#0*58;|&#x0*3a;|&colon;/i', $content, 2 );
+
+	if ( isset( $content2[1] ) && ! preg_match( '%/\?%', $content2[0] ) ) {
+		$content  = trim( $content2[1] );
+		$protocol = wp_kses_bad_protocol_once2( $content2[0], $allowed_protocols );
 		if ( 'feed:' === $protocol ) {
 			if ( $count > 2 ) {
 				return '';
 			}
-			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) ) {
-				return $string;
+			$content = wp_kses_bad_protocol_once( $content, $allowed_protocols, ++$count );
+			if ( empty( $content ) ) {
+				return $content;
 			}
 		}
-		$string = $protocol . $string;
+		$content = $protocol . $content;
 	}
 
-	return $string;
+	return $content;
 }
 
 /**
@@ -1824,26 +1849,26 @@ function wp_kses_bad_protocol_once( $string, $allowed_protocols, $count = 1 ) {
  * @ignore
  * @since 1.0.0
  *
- * @param string   $string            URI scheme to check against the list of allowed protocols.
+ * @param string   $scheme            URI scheme to check against the list of allowed protocols.
  * @param string[] $allowed_protocols Array of allowed URL protocols.
  * @return string Sanitized content.
  */
-function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
-	$string2 = wp_kses_decode_entities( $string );
-	$string2 = preg_replace( '/\s/', '', $string2 );
-	$string2 = wp_kses_no_null( $string2 );
-	$string2 = strtolower( $string2 );
+function wp_kses_bad_protocol_once2( $scheme, $allowed_protocols ) {
+	$scheme = wp_kses_decode_entities( $scheme );
+	$scheme = preg_replace( '/\s/', '', $scheme );
+	$scheme = wp_kses_no_null( $scheme );
+	$scheme = strtolower( $scheme );
 
 	$allowed = false;
 	foreach ( (array) $allowed_protocols as $one_protocol ) {
-		if ( strtolower( $one_protocol ) == $string2 ) {
+		if ( strtolower( $one_protocol ) === $scheme ) {
 			$allowed = true;
 			break;
 		}
 	}
 
 	if ( $allowed ) {
-		return "$string2:";
+		return "$scheme:";
 	} else {
 		return '';
 	}
@@ -1861,25 +1886,25 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
  * @since 1.0.0
  * @since 5.5.0 Added `$context` parameter.
  *
- * @param string $string  Content to normalize entities.
+ * @param string $content Content to normalize entities.
  * @param string $context Context for normalization. Can be either 'html' or 'xml'.
  *                        Default 'html'.
  * @return string Content with normalized entities.
  */
-function wp_kses_normalize_entities( $string, $context = 'html' ) {
+function wp_kses_normalize_entities( $content, $context = 'html' ) {
 	// Disarm all entities by converting & to &amp;
-	$string = str_replace( '&', '&amp;', $string );
+	$content = str_replace( '&', '&amp;', $content );
 
 	// Change back the allowed entities in our list of allowed entities.
 	if ( 'xml' === $context ) {
-		$string = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_xml_named_entities', $string );
+		$content = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_xml_named_entities', $content );
 	} else {
-		$string = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string );
+		$content = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $content );
 	}
-	$string = preg_replace_callback( '/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string );
-	$string = preg_replace_callback( '/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string );
+	$content = preg_replace_callback( '/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $content );
+	$content = preg_replace_callback( '/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $content );
 
-	return $string;
+	return $content;
 }
 
 /**
@@ -1958,6 +1983,7 @@ function wp_kses_normalize_entities2( $matches ) {
 	}
 
 	$i = $matches[1];
+
 	if ( valid_unicode( $i ) ) {
 		$i = str_pad( ltrim( $i, '0' ), 3, '0', STR_PAD_LEFT );
 		$i = "&#$i;";
@@ -1987,6 +2013,7 @@ function wp_kses_normalize_entities3( $matches ) {
 	}
 
 	$hexchars = $matches[1];
+
 	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x' . ltrim( $hexchars, '0' ) . ';';
 }
 
@@ -1999,10 +2026,13 @@ function wp_kses_normalize_entities3( $matches ) {
  * @return bool Whether or not the codepoint is a valid Unicode codepoint.
  */
 function valid_unicode( $i ) {
-	return ( 0x9 == $i || 0xa == $i || 0xd == $i ||
-			( 0x20 <= $i && $i <= 0xd7ff ) ||
-			( 0xe000 <= $i && $i <= 0xfffd ) ||
-			( 0x10000 <= $i && $i <= 0x10ffff ) );
+	$i = (int) $i;
+
+	return ( 0x9 === $i || 0xa === $i || 0xd === $i ||
+		( 0x20 <= $i && $i <= 0xd7ff ) ||
+		( 0xe000 <= $i && $i <= 0xfffd ) ||
+		( 0x10000 <= $i && $i <= 0x10ffff )
+	);
 }
 
 /**
@@ -2014,14 +2044,14 @@ function valid_unicode( $i ) {
  *
  * @since 1.0.0
  *
- * @param string $string Content to change entities.
+ * @param string $content Content to change entities.
  * @return string Content after decoded entities.
  */
-function wp_kses_decode_entities( $string ) {
-	$string = preg_replace_callback( '/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $string );
-	$string = preg_replace_callback( '/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec', $string );
+function wp_kses_decode_entities( $content ) {
+	$content = preg_replace_callback( '/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $content );
+	$content = preg_replace_callback( '/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec', $content );
 
-	return $string;
+	return $content;
 }
 
 /**
@@ -2031,11 +2061,11 @@ function wp_kses_decode_entities( $string ) {
  * @access private
  * @ignore
  *
- * @param array $match preg match
+ * @param array $matches preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr( $match ) {
-	return chr( $match[1] );
+function _wp_kses_decode_entities_chr( $matches ) {
+	return chr( $matches[1] );
 }
 
 /**
@@ -2045,11 +2075,11 @@ function _wp_kses_decode_entities_chr( $match ) {
  * @access private
  * @ignore
  *
- * @param array $match preg match
+ * @param array $matches preg match
  * @return string
  */
-function _wp_kses_decode_entities_chr_hexdec( $match ) {
-	return chr( hexdec( $match[1] ) );
+function _wp_kses_decode_entities_chr_hexdec( $matches ) {
+	return chr( hexdec( $matches[1] ) );
 }
 
 /**
@@ -2267,6 +2297,10 @@ function kses_init() {
  *              nested `var()` values, and assigning values to CSS variables.
  *              Added support for `object-fit`, `gap`, `column-gap`, `row-gap`, and `flex-wrap`.
  *              Extended `margin-*` and `padding-*` support for logical properties.
+ * @since 6.2.0 Added support for `aspect-ratio`, `position`, `top`, `right`, `bottom`, `left`,
+ *              and `z-index` CSS properties.
+ * @since 6.3.0 Extended support for `filter` to accept a URL and added support for repeat().
+ *              Added support for `box-shadow`.
  *
  * @param string $css        A string of CSS rules.
  * @param string $deprecated Not used.
@@ -2428,6 +2462,15 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 			'overflow',
 			'vertical-align',
 
+			'position',
+			'top',
+			'right',
+			'bottom',
+			'left',
+			'z-index',
+			'box-shadow',
+			'aspect-ratio',
+
 			// Custom CSS properties.
 			'--*',
 		)
@@ -2446,6 +2489,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 		'background-image',
 
 		'cursor',
+		'filter',
 
 		'list-style',
 		'list-style-image',
@@ -2477,7 +2521,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 		$gradient_attr   = false;
 		$is_custom_var   = false;
 
-		if ( strpos( $css_item, ':' ) === false ) {
+		if ( ! str_contains( $css_item, ':' ) ) {
 			$found = true;
 		} else {
 			$parts        = explode( ':', $css_item, 2 );
@@ -2541,7 +2585,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 			 * Nested functions and parentheses are also removed, so long as the parentheses are balanced.
 			 */
 			$css_test_string = preg_replace(
-				'/\b(?:var|calc|min|max|minmax|clamp)(\((?:[^()]|(?1))*\))/',
+				'/\b(?:var|calc|min|max|minmax|clamp|repeat)(\((?:[^()]|(?1))*\))/',
 				'',
 				$css_test_string
 			);
@@ -2586,6 +2630,7 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
  * @since 3.5.0
  * @since 5.0.0 Added support for `data-*` wildcard attributes.
  * @since 6.0.0 Added `dir`, `lang`, and `xml:lang` to global attributes.
+ * @since 6.3.0 Added `aria-controls`, `aria-current`, and `aria-expanded` attributes.
  *
  * @access private
  * @ignore
@@ -2595,8 +2640,11 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
  */
 function _wp_add_global_attributes( $value ) {
 	$global_attributes = array(
+		'aria-controls'    => true,
+		'aria-current'     => true,
 		'aria-describedby' => true,
 		'aria-details'     => true,
+		'aria-expanded'    => true,
 		'aria-label'       => true,
 		'aria-labelledby'  => true,
 		'aria-hidden'      => true,
diff --git a/src/wp-includes/l10n.php b/src/wp-includes/l10n.php
index c5148a02e8c67..a085d4483f827 100644
--- a/src/wp-includes/l10n.php
+++ b/src/wp-includes/l10n.php
@@ -132,30 +132,28 @@ function determine_locale() {
 	 */
 	$determined_locale = apply_filters( 'pre_determine_locale', null );
 
-	if ( ! empty( $determined_locale ) && is_string( $determined_locale ) ) {
+	if ( $determined_locale && is_string( $determined_locale ) ) {
 		return $determined_locale;
 	}
 
-	$determined_locale = get_locale();
-
-	if ( is_admin() ) {
-		$determined_locale = get_user_locale();
-	}
-
-	if ( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() ) {
+	if (
+		isset( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] &&
+		( ! empty( $_GET['wp_lang'] ) || ! empty( $_COOKIE['wp_lang'] ) )
+	) {
+		if ( ! empty( $_GET['wp_lang'] ) ) {
+			$determined_locale = sanitize_locale_name( $_GET['wp_lang'] );
+		} else {
+			$determined_locale = sanitize_locale_name( $_COOKIE['wp_lang'] );
+		}
+	} elseif (
+		is_admin() ||
+		( isset( $_GET['_locale'] ) && 'user' === $_GET['_locale'] && wp_is_json_request() )
+	) {
 		$determined_locale = get_user_locale();
 	}
 
-	$wp_lang = '';
-
-	if ( ! empty( $_GET['wp_lang'] ) ) {
-		$wp_lang = sanitize_text_field( $_GET['wp_lang'] );
-	} elseif ( ! empty( $_COOKIE['wp_lang'] ) ) {
-		$wp_lang = sanitize_text_field( $_COOKIE['wp_lang'] );
-	}
-
-	if ( ! empty( $wp_lang ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) {
-		$determined_locale = $wp_lang;
+	if ( ! $determined_locale ) {
+		$determined_locale = get_locale();
 	}
 
 	/**
@@ -176,7 +174,7 @@ function determine_locale() {
  * *Note:* Don't use translate() directly, use __() or related functions.
  *
  * @since 2.2.0
- * @since 5.5.0 Introduced gettext-{$domain} filter.
+ * @since 5.5.0 Introduced `gettext-{$domain}` filter.
  *
  * @param string $text   Text to translate.
  * @param string $domain Optional. Text domain. Unique identifier for retrieving translated strings.
@@ -222,15 +220,15 @@ function translate( $text, $domain = 'default' ) {
  *
  * @since 2.8.0
  *
- * @param string $string A pipe-delimited string.
- * @return string Either $string or everything before the last pipe.
+ * @param string $text A pipe-delimited string.
+ * @return string Either $text or everything before the last pipe.
  */
-function before_last_bar( $string ) {
-	$last_bar = strrpos( $string, '|' );
+function before_last_bar( $text ) {
+	$last_bar = strrpos( $text, '|' );
 	if ( false === $last_bar ) {
-		return $string;
+		return $text;
 	} else {
-		return substr( $string, 0, $last_bar );
+		return substr( $text, 0, $last_bar );
 	}
 }
 
@@ -242,7 +240,7 @@ function before_last_bar( $string ) {
  * *Note:* Don't use translate_with_gettext_context() directly, use _x() or related functions.
  *
  * @since 2.8.0
- * @since 5.5.0 Introduced gettext_with_context-{$domain} filter.
+ * @since 5.5.0 Introduced `gettext_with_context-{$domain}` filter.
  *
  * @param string $text    Text to translate.
  * @param string $context Context information for the translators.
@@ -463,7 +461,7 @@ function esc_html_x( $text, $context, $domain = 'default' ) {
  *     printf( _n( '%s person', '%s people', $count, 'text-domain' ), number_format_i18n( $count ) );
  *
  * @since 2.8.0
- * @since 5.5.0 Introduced ngettext-{$domain} filter.
+ * @since 5.5.0 Introduced `ngettext-{$domain}` filter.
  *
  * @param string $single The text to be used if the number is singular.
  * @param string $plural The text to be used if the number is plural.
@@ -521,7 +519,7 @@ function _n( $single, $plural, $number, $domain = 'default' ) {
  *     printf( _nx( '%s group', '%s groups', $animals, 'group of animals', 'text-domain' ), number_format_i18n( $animals ) );
  *
  * @since 2.8.0
- * @since 5.5.0 Introduced ngettext_with_context-{$domain} filter.
+ * @since 5.5.0 Introduced `ngettext_with_context-{$domain}` filter.
  *
  * @param string $single  The text to be used if the number is singular.
  * @param string $plural  The text to be used if the number is plural.
@@ -721,16 +719,40 @@ function load_textdomain( $domain, $mofile, $locale = null ) {
 
 	$l10n_unloaded = (array) $l10n_unloaded;
 
+	/**
+	 * Filters whether to short-circuit loading .mo file.
+	 *
+	 * Returning a non-null value from the filter will effectively short-circuit
+	 * the loading, returning the passed value instead.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param bool|null   $loaded The result of loading a .mo file. Default null.
+	 * @param string      $domain Text domain. Unique identifier for retrieving translated strings.
+	 * @param string      $mofile Path to the MO file.
+	 * @param string|null $locale Locale.
+	 */
+	$loaded = apply_filters( 'pre_load_textdomain', null, $domain, $mofile, $locale );
+	if ( null !== $loaded ) {
+		if ( true === $loaded ) {
+			unset( $l10n_unloaded[ $domain ] );
+		}
+
+		return $loaded;
+	}
+
 	/**
 	 * Filters whether to override the .mo file loading.
 	 *
 	 * @since 2.9.0
+	 * @since 6.2.0 Added the `$locale` parameter.
 	 *
-	 * @param bool   $override Whether to override the .mo file loading. Default false.
-	 * @param string $domain   Text domain. Unique identifier for retrieving translated strings.
-	 * @param string $mofile   Path to the MO file.
+	 * @param bool        $override Whether to override the .mo file loading. Default false.
+	 * @param string      $domain   Text domain. Unique identifier for retrieving translated strings.
+	 * @param string      $mofile   Path to the MO file.
+	 * @param string|null $locale   Locale.
 	 */
-	$plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
+	$plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile, $locale );
 
 	if ( true === (bool) $plugin_override ) {
 		unset( $l10n_unloaded[ $domain ] );
@@ -836,6 +858,12 @@ function unload_textdomain( $domain, $reloadable = false ) {
 	do_action( 'unload_textdomain', $domain, $reloadable );
 
 	if ( isset( $l10n[ $domain ] ) ) {
+		if ( $l10n[ $domain ] instanceof NOOP_Translations ) {
+			unset( $l10n[ $domain ] );
+
+			return false;
+		}
+
 		unset( $l10n[ $domain ] );
 
 		if ( ! $reloadable ) {
@@ -1022,9 +1050,9 @@ function load_theme_textdomain( $domain, $path = false ) {
 }
 
 /**
- * Loads the child themes translated strings.
+ * Loads the child theme's translated strings.
  *
- * If the current locale exists as a .mo file in the child themes
+ * If the current locale exists as a .mo file in the child theme's
  * root directory, it will be included in the translated strings by the $domain.
  *
  * The .mo files must be named based on the locale exactly.
@@ -1082,7 +1110,7 @@ function load_script_textdomain( $handle, $domain = 'default', $path = '' ) {
 
 	$src = $wp_scripts->registered[ $handle ]->src;
 
-	if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $wp_scripts->content_url && 0 === strpos( $src, $wp_scripts->content_url ) ) ) {
+	if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $wp_scripts->content_url && str_starts_with( $src, $wp_scripts->content_url ) ) ) {
 		$src = $wp_scripts->base_url . $src;
 	}
 
@@ -1096,7 +1124,7 @@ function load_script_textdomain( $handle, $domain = 'default', $path = '' ) {
 
 	// If the host is the same or it's a relative URL.
 	if (
-		( ! isset( $content_url['path'] ) || strpos( $src_url['path'], $content_url['path'] ) === 0 ) &&
+		( ! isset( $content_url['path'] ) || str_starts_with( $src_url['path'], $content_url['path'] ) ) &&
 		( ! isset( $src_url['host'] ) || ! isset( $content_url['host'] ) || $src_url['host'] === $content_url['host'] )
 	) {
 		// Make the src relative the specific plugin or theme.
@@ -1113,7 +1141,7 @@ function load_script_textdomain( $handle, $domain = 'default', $path = '' ) {
 		$relative = array_slice( $relative, 2 ); // Remove plugins/<plugin name> or themes/<theme name>.
 		$relative = implode( '/', $relative );
 	} elseif (
-		( ! isset( $plugins_url['path'] ) || strpos( $src_url['path'], $plugins_url['path'] ) === 0 ) &&
+		( ! isset( $plugins_url['path'] ) || str_starts_with( $src_url['path'], $plugins_url['path'] ) ) &&
 		( ! isset( $src_url['host'] ) || ! isset( $plugins_url['host'] ) || $src_url['host'] === $plugins_url['host'] )
 	) {
 		// Make the src relative the specific plugin.
@@ -1132,7 +1160,7 @@ function load_script_textdomain( $handle, $domain = 'default', $path = '' ) {
 	} elseif ( ! isset( $src_url['host'] ) || ! isset( $site_url['host'] ) || $src_url['host'] === $site_url['host'] ) {
 		if ( ! isset( $site_url['path'] ) ) {
 			$relative = trim( $src_url['path'], '/' );
-		} elseif ( ( strpos( $src_url['path'], trailingslashit( $site_url['path'] ) ) === 0 ) ) {
+		} elseif ( str_starts_with( $src_url['path'], trailingslashit( $site_url['path'] ) ) ) {
 			// Make the src relative to the WP root.
 			$relative = substr( $src_url['path'], strlen( $site_url['path'] ) );
 			$relative = trim( $relative, '/' );
@@ -1155,7 +1183,7 @@ function load_script_textdomain( $handle, $domain = 'default', $path = '' ) {
 	}
 
 	// Translations are always based on the unminified filename.
-	if ( substr( $relative, -7 ) === '.min.js' ) {
+	if ( str_ends_with( $relative, '.min.js' ) ) {
 		$relative = substr( $relative, 0, -7 ) . '.js';
 	}
 
@@ -1306,9 +1334,11 @@ function get_translations_for_domain( $domain ) {
 
 	static $noop_translations = null;
 	if ( null === $noop_translations ) {
-		$noop_translations = new NOOP_Translations;
+		$noop_translations = new NOOP_Translations();
 	}
 
+	$l10n[ $domain ] = &$noop_translations;
+
 	return $noop_translations;
 }
 
@@ -1324,7 +1354,7 @@ function get_translations_for_domain( $domain ) {
  */
 function is_textdomain_loaded( $domain ) {
 	global $l10n;
-	return isset( $l10n[ $domain ] );
+	return isset( $l10n[ $domain ] ) && ! $l10n[ $domain ] instanceof NOOP_Translations;
 }
 
 /**
@@ -1361,7 +1391,8 @@ function translate_user_role( $name, $domain = 'default' ) {
  *
  * @param string $dir A directory to search for language files.
  *                    Default WP_LANG_DIR.
- * @return string[] An array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
+ * @return string[] An array of language codes or an empty array if no languages are present.
+ *                  Language codes are formed by stripping the .mo extension from the language file names.
  */
 function get_available_languages( $dir = null ) {
 	$languages = array();
@@ -1370,8 +1401,8 @@ function get_available_languages( $dir = null ) {
 	if ( $lang_files ) {
 		foreach ( $lang_files as $lang_file ) {
 			$lang_file = basename( $lang_file, '.mo' );
-			if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
-				0 !== strpos( $lang_file, 'admin-' ) ) {
+			if ( ! str_starts_with( $lang_file, 'continents-cities' ) && ! str_starts_with( $lang_file, 'ms-' ) &&
+				! str_starts_with( $lang_file, 'admin-' ) ) {
 				$languages[] = $lang_file;
 			}
 		}
@@ -1425,7 +1456,7 @@ function wp_get_installed_translations( $type ) {
 		if ( '.' === $file[0] || is_dir( WP_LANG_DIR . "$dir/$file" ) ) {
 			continue;
 		}
-		if ( substr( $file, -3 ) !== '.po' ) {
+		if ( ! str_ends_with( $file, '.po' ) ) {
 			continue;
 		}
 		if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
@@ -1486,7 +1517,7 @@ function wp_get_pomo_file_data( $po_file ) {
  *
  *     @type string   $id                           ID attribute of the select element. Default 'locale'.
  *     @type string   $name                         Name attribute of the select element. Default 'locale'.
- *     @type array    $languages                    List of installed languages, contain only the locales.
+ *     @type string[] $languages                    List of installed languages, contain only the locales.
  *                                                  Default empty array.
  *     @type array    $translations                 List of available translations. Default result of
  *                                                  wp_get_available_translations().
@@ -1664,9 +1695,34 @@ function switch_to_locale( $locale ) {
 	/* @var WP_Locale_Switcher $wp_locale_switcher */
 	global $wp_locale_switcher;
 
+	if ( ! $wp_locale_switcher ) {
+		return false;
+	}
+
 	return $wp_locale_switcher->switch_to_locale( $locale );
 }
 
+/**
+ * Switches the translations according to the given user's locale.
+ *
+ * @since 6.2.0
+ *
+ * @global WP_Locale_Switcher $wp_locale_switcher WordPress locale switcher object.
+ *
+ * @param int $user_id User ID.
+ * @return bool True on success, false on failure.
+ */
+function switch_to_user_locale( $user_id ) {
+	/* @var WP_Locale_Switcher $wp_locale_switcher */
+	global $wp_locale_switcher;
+
+	if ( ! $wp_locale_switcher ) {
+		return false;
+	}
+
+	return $wp_locale_switcher->switch_to_user_locale( $user_id );
+}
+
 /**
  * Restores the translations according to the previous locale.
  *
@@ -1680,6 +1736,10 @@ function restore_previous_locale() {
 	/* @var WP_Locale_Switcher $wp_locale_switcher */
 	global $wp_locale_switcher;
 
+	if ( ! $wp_locale_switcher ) {
+		return false;
+	}
+
 	return $wp_locale_switcher->restore_previous_locale();
 }
 
@@ -1696,6 +1756,10 @@ function restore_current_locale() {
 	/* @var WP_Locale_Switcher $wp_locale_switcher */
 	global $wp_locale_switcher;
 
+	if ( ! $wp_locale_switcher ) {
+		return false;
+	}
+
 	return $wp_locale_switcher->restore_current_locale();
 }
 
@@ -1771,5 +1835,32 @@ function translate_settings_using_i18n_schema( $i18n_schema, $settings, $textdom
 function wp_get_list_item_separator() {
 	global $wp_locale;
 
+	if ( ! ( $wp_locale instanceof WP_Locale ) ) {
+		// Default value of WP_Locale::get_list_item_separator().
+		/* translators: Used between list items, there is a space after the comma. */
+		return __( ', ' );
+	}
+
 	return $wp_locale->get_list_item_separator();
 }
+
+/**
+ * Retrieves the word count type based on the locale.
+ *
+ * @since 6.2.0
+ *
+ * @global WP_Locale $wp_locale WordPress date and time locale object.
+ *
+ * @return string Locale-specific word count type. Possible values are `characters_excluding_spaces`,
+ *                `characters_including_spaces`, or `words`. Defaults to `words`.
+ */
+function wp_get_word_count_type() {
+	global $wp_locale;
+
+	if ( ! ( $wp_locale instanceof WP_Locale ) ) {
+		// Default value of WP_Locale::get_word_count_type().
+		return 'words';
+	}
+
+	return $wp_locale->get_word_count_type();
+}
diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php
index de9988be1f319..c0437f6de9ff1 100644
--- a/src/wp-includes/link-template.php
+++ b/src/wp-includes/link-template.php
@@ -39,17 +39,17 @@ function the_permalink( $post = 0 ) {
  *
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
  *
- * @param string $string      URL with or without a trailing slash.
+ * @param string $url         URL with or without a trailing slash.
  * @param string $type_of_url Optional. The type of URL being considered (e.g. single, category, etc)
  *                            for use in the filter. Default empty string.
  * @return string The URL with the trailing slash appended or stripped.
  */
-function user_trailingslashit( $string, $type_of_url = '' ) {
+function user_trailingslashit( $url, $type_of_url = '' ) {
 	global $wp_rewrite;
 	if ( $wp_rewrite->use_trailing_slashes ) {
-		$string = trailingslashit( $string );
+		$url = trailingslashit( $url );
 	} else {
-		$string = untrailingslashit( $string );
+		$url = untrailingslashit( $url );
 	}
 
 	/**
@@ -57,12 +57,12 @@ function user_trailingslashit( $string, $type_of_url = '' ) {
 	 *
 	 * @since 2.2.0
 	 *
-	 * @param string $string      URL with or without a trailing slash.
+	 * @param string $url         URL with or without a trailing slash.
 	 * @param string $type_of_url The type of URL being considered. Accepts 'single', 'single_trackback',
 	 *                            'single_feed', 'single_paged', 'commentpaged', 'paged', 'home', 'feed',
 	 *                            'category', 'page', 'year', 'month', 'day', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters( 'user_trailingslashit', $url, $type_of_url );
 }
 
 /**
@@ -222,7 +222,7 @@ function get_permalink( $post = 0, $leavename = false ) {
 	) {
 
 		$category = '';
-		if ( strpos( $permalink, '%category%' ) !== false ) {
+		if ( str_contains( $permalink, '%category%' ) ) {
 			$cats = get_the_category( $post->ID );
 			if ( $cats ) {
 				$cats = wp_list_sort(
@@ -249,8 +249,10 @@ function get_permalink( $post = 0, $leavename = false ) {
 					$category = get_category_parents( $category_object->parent, false, '/', true ) . $category;
 				}
 			}
-			// Show default category in permalinks,
-			// without having to assign it explicitly.
+			/*
+			 * Show default category in permalinks,
+			 * without having to assign it explicitly.
+			 */
 			if ( empty( $category ) ) {
 				$default_category = get_term( get_option( 'default_category' ), 'category' );
 				if ( $default_category && ! is_wp_error( $default_category ) ) {
@@ -260,13 +262,15 @@ function get_permalink( $post = 0, $leavename = false ) {
 		}
 
 		$author = '';
-		if ( strpos( $permalink, '%author%' ) !== false ) {
+		if ( str_contains( $permalink, '%author%' ) ) {
 			$authordata = get_userdata( $post->post_author );
 			$author     = $authordata->user_nicename;
 		}
 
-		// This is not an API call because the permalink is based on the stored post_date value,
-		// which should be parsed as local time regardless of the default PHP timezone.
+		/*
+		 * This is not an API call because the permalink is based on the stored post_date value,
+		 * which should be parsed as local time regardless of the default PHP timezone.
+		 */
 		$date = explode( ' ', str_replace( array( '-', ':' ), ' ', $post->post_date ) );
 
 		$rewritereplace = array(
@@ -496,13 +500,13 @@ function get_attachment_link( $post = null, $leavename = false ) {
 			$parentlink = get_permalink( $post->post_parent );
 		}
 
-		if ( is_numeric( $post->post_name ) || false !== strpos( get_option( 'permalink_structure' ), '%category%' ) ) {
+		if ( is_numeric( $post->post_name ) || str_contains( get_option( 'permalink_structure' ), '%category%' ) ) {
 			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker.
 		} else {
 			$name = $post->post_name;
 		}
 
-		if ( strpos( $parentlink, '?' ) === false ) {
+		if ( ! str_contains( $parentlink, '?' ) ) {
 			$link = user_trailingslashit( trailingslashit( $parentlink ) . '%postname%' );
 		}
 
@@ -692,7 +696,7 @@ function get_feed_link( $feed = '' ) {
 	$permalink = $wp_rewrite->get_feed_permastruct();
 
 	if ( $permalink ) {
-		if ( false !== strpos( $feed, 'comments_' ) ) {
+		if ( str_contains( $feed, 'comments_' ) ) {
 			$feed      = str_replace( 'comments_', '', $feed );
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
@@ -709,7 +713,7 @@ function get_feed_link( $feed = '' ) {
 			$feed = get_default_feed();
 		}
 
-		if ( false !== strpos( $feed, 'comments_' ) ) {
+		if ( str_contains( $feed, 'comments_' ) ) {
 			$feed = str_replace( 'comments_', 'comments-', $feed );
 		}
 
@@ -1122,14 +1126,14 @@ function get_edit_term_link( $term, $taxonomy = '', $object_type = '' ) {
  *
  * @since 3.1.0
  *
- * @param string           $link   Optional. Anchor text. If empty, default is 'Edit This'. Default empty.
- * @param string           $before Optional. Display before edit link. Default empty.
- * @param string           $after  Optional. Display after edit link. Default empty.
- * @param int|WP_Term|null $term   Optional. Term ID or object. If null, the queried object will be inspected. Default null.
- * @param bool             $echo   Optional. Whether or not to echo the return. Default true.
+ * @param string           $link    Optional. Anchor text. If empty, default is 'Edit This'. Default empty.
+ * @param string           $before  Optional. Display before edit link. Default empty.
+ * @param string           $after   Optional. Display after edit link. Default empty.
+ * @param int|WP_Term|null $term    Optional. Term ID or object. If null, the queried object will be inspected. Default null.
+ * @param bool             $display Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
+function edit_term_link( $link = '', $before = '', $after = '', $term = null, $display = true ) {
 	if ( is_null( $term ) ) {
 		$term = get_queried_object();
 	} else {
@@ -1161,7 +1165,7 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $link;
 	} else {
 		return $link;
@@ -1435,9 +1439,11 @@ function get_preview_post_link( $post = null, $query_args = array(), $preview_li
  * Retrieves the edit post link for post.
  *
  * Can be used within the WordPress loop or outside of it. Can be used with
- * pages, posts, attachments, and revisions.
+ * pages, posts, attachments, revisions, global styles, templates, and template parts.
  *
  * @since 2.3.0
+ * @since 6.3.0 Adds custom link for wp_navigation post types.
+ *              Adds custom links for wp_template_part and wp_template post types.
  *
  * @param int|WP_Post $post    Optional. Post ID or post object. Default is the global `$post`.
  * @param string      $context Optional. How to output the '&' character. Default '&amp;'.
@@ -1469,10 +1475,15 @@ function get_edit_post_link( $post = 0, $context = 'display' ) {
 		return;
 	}
 
-	if ( $post_type_object->_edit_link ) {
+	$link = '';
+
+	if ( 'wp_template' === $post->post_type || 'wp_template_part' === $post->post_type ) {
+		$slug = urlencode( get_stylesheet() . '//' . $post->post_name );
+		$link = admin_url( sprintf( $post_type_object->_edit_link, $post->post_type, $slug ) );
+	} elseif ( 'wp_navigation' === $post->post_type ) {
+		$link = admin_url( sprintf( $post_type_object->_edit_link, (string) $post->ID ) );
+	} elseif ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
-	} else {
-		$link = '';
 	}
 
 	/**
@@ -1492,15 +1503,15 @@ function get_edit_post_link( $post = 0, $context = 'display' ) {
  * Displays the edit post link for post.
  *
  * @since 1.0.0
- * @since 4.4.0 The `$class` argument was added.
+ * @since 4.4.0 The `$css_class` argument was added.
  *
- * @param string      $text   Optional. Anchor text. If null, default is 'Edit This'. Default null.
- * @param string      $before Optional. Display before edit link. Default empty.
- * @param string      $after  Optional. Display after edit link. Default empty.
- * @param int|WP_Post $post   Optional. Post ID or post object. Default is the global `$post`.
- * @param string      $class  Optional. Add custom class to link. Default 'post-edit-link'.
+ * @param string      $text      Optional. Anchor text. If null, default is 'Edit This'. Default null.
+ * @param string      $before    Optional. Display before edit link. Default empty.
+ * @param string      $after     Optional. Display after edit link. Default empty.
+ * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param string      $css_class Optional. Add custom class to link. Default 'post-edit-link'.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $post = 0, $class = 'post-edit-link' ) {
+function edit_post_link( $text = null, $before = '', $after = '', $post = 0, $css_class = 'post-edit-link' ) {
 	$post = get_post( $post );
 
 	if ( ! $post ) {
@@ -1517,7 +1528,7 @@ function edit_post_link( $text = null, $before = '', $after = '', $post = 0, $cl
 		$text = __( 'Edit This' );
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
+	$link = '<a class="' . esc_attr( $css_class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
 
 	/**
 	 * Filters the post edit link anchor tag.
@@ -1752,11 +1763,13 @@ function get_edit_user_link( $user_id = null ) {
  *
  * @since 1.5.0
  *
- * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return WP_Post|null|string Post object if successful. Null if global $post is not set. Empty string if no
- *                             corresponding post exists.
+ * @param bool         $in_same_term   Optional. Whether post should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
+ * @return WP_Post|null|string Post object if successful. Null if global `$post` is not set.
+ *                             Empty string if no corresponding post exists.
  */
 function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
@@ -1767,11 +1780,13 @@ function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxono
  *
  * @since 1.5.0
  *
- * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return WP_Post|null|string Post object if successful. Null if global $post is not set. Empty string if no
- *                             corresponding post exists.
+ * @param bool         $in_same_term   Optional. Whether post should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
+ * @return WP_Post|null|string Post object if successful. Null if global `$post` is not set.
+ *                             Empty string if no corresponding post exists.
  */
 function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
@@ -1786,12 +1801,15 @@ function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy =
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty string.
- * @param bool         $previous       Optional. Whether to retrieve previous post. Default true
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return WP_Post|null|string Post object if successful. Null if global $post is not set. Empty string if no
- *                             corresponding post exists.
+ * @param bool         $in_same_term   Optional. Whether post should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty string.
+ * @param bool         $previous       Optional. Whether to retrieve previous post.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
+ * @return WP_Post|null|string Post object if successful. Null if global `$post` is not set.
+ *                             Empty string if no corresponding post exists.
  */
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
@@ -1810,7 +1828,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 
 	if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
 		// Back-compat, $excluded_terms used to be $excluded_categories with IDs separated by " and ".
-		if ( false !== strpos( $excluded_terms, ' and ' ) ) {
+		if ( str_contains( $excluded_terms, ' and ' ) ) {
 			_deprecated_argument(
 				__FUNCTION__,
 				'3.3.0',
@@ -1919,7 +1937,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 	 * @since 4.4.0 Added the `$taxonomy` and `$post` parameters.
 	 *
 	 * @param string       $join           The JOIN clause in the SQL.
-	 * @param bool         $in_same_term   Whether post should be in a same taxonomy term.
+	 * @param bool         $in_same_term   Whether post should be in the same taxonomy term.
 	 * @param int[]|string $excluded_terms Array of excluded term IDs. Empty string if none were provided.
 	 * @param string       $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post      $post           WP_Post object.
@@ -1941,7 +1959,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 	 * @since 4.4.0 Added the `$taxonomy` and `$post` parameters.
 	 *
 	 * @param string       $where          The `WHERE` clause in the SQL.
-	 * @param bool         $in_same_term   Whether post should be in a same taxonomy term.
+	 * @param bool         $in_same_term   Whether post should be in the same taxonomy term.
 	 * @param int[]|string $excluded_terms Array of excluded term IDs. Empty string if none were provided.
 	 * @param string       $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post      $post           WP_Post object.
@@ -1969,9 +1987,15 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 	 */
 	$sort = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post, $order );
 
-	$query     = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result    = wp_cache_get( $query_key, 'counts' );
+	$query        = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
+	$key          = md5( $query );
+	$last_changed = wp_cache_get_last_changed( 'posts' );
+	if ( $in_same_term || ! empty( $excluded_terms ) ) {
+		$last_changed .= wp_cache_get_last_changed( 'terms' );
+	}
+	$cache_key = "adjacent_post:$key:$last_changed";
+
+	$result = wp_cache_get( $cache_key, 'post-queries' );
 	if ( false !== $result ) {
 		if ( $result ) {
 			$result = get_post( $result );
@@ -1984,7 +2008,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 		$result = '';
 	}
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set( $cache_key, $result, 'post-queries' );
 
 	if ( $result ) {
 		$result = get_post( $result );
@@ -2001,10 +2025,13 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
  * @since 2.8.0
  *
  * @param string       $title          Optional. Link title format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param bool         $previous       Optional. Whether to display link to previous or next post.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
@@ -2065,9 +2092,11 @@ function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $
  * @since 2.8.0
  *
  * @param string       $title          Optional. Link title format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
@@ -2100,9 +2129,11 @@ function adjacent_posts_rel_link_wp_head() {
  * @see get_adjacent_post_rel_link()
  *
  * @param string       $title          Optional. Link title format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
@@ -2116,9 +2147,11 @@ function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded
  * @see get_adjacent_post_rel_link()
  *
  * @param string       $title          Optional. Link title format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
@@ -2128,17 +2161,18 @@ function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded
  * Retrieves the boundary post.
  *
  * Boundary being either the first or last post by publish date within the constraints specified
- * by $in_same_term or $excluded_terms.
+ * by `$in_same_term` or `$excluded_terms`.
  *
  * @since 2.8.0
  *
- * @param bool         $in_same_term   Optional. Whether returned post should be in a same taxonomy term.
+ * @param bool         $in_same_term   Optional. Whether returned post should be in the same taxonomy term.
  *                                     Default false.
  * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  *                                     Default empty.
- * @param bool         $start          Optional. Whether to retrieve first or last post. Default true
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return null|array Array containing the boundary post object if successful, null otherwise.
+ * @param bool         $start          Optional. Whether to retrieve first or last post.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
+ * @return array|null Array containing the boundary post object if successful, null otherwise.
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
@@ -2198,9 +2232,11 @@ function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start
  *
  * @param string       $format         Optional. Link anchor format. Default '&laquo; %link'.
  * @param string       $link           Optional. Link permalink format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
 function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
@@ -2216,9 +2252,11 @@ function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $i
  *
  * @param string       $format         Optional. Link anchor format. Default '&laquo; %link'.
  * @param string       $link           Optional. Link permalink format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
@@ -2231,9 +2269,11 @@ function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_sa
  *
  * @param string       $format         Optional. Link anchor format. Default '&laquo; %link'.
  * @param string       $link           Optional. Link permalink format. Default '%title'.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
 function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
@@ -2248,10 +2288,12 @@ function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_sa
  * @see get_next_post_link()
  *
  * @param string       $format         Optional. Link anchor format. Default '&laquo; %link'.
- * @param string       $link           Optional. Link permalink format. Default '%title'
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param string       $link           Optional. Link permalink format. Default '%title'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ *                                     Default empty.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
 	echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
@@ -2266,10 +2308,13 @@ function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_t
  *
  * @param string       $format         Link anchor format.
  * @param string       $link           Link permalink format.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded terms IDs. Default empty.
- * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded terms IDs.
+ *                                     Default empty.
+ * @param bool         $previous       Optional. Whether to display link to previous or next post.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
@@ -2318,11 +2363,11 @@ function get_adjacent_post_link( $format, $link, $in_same_term = false, $exclude
 	 * @since 2.6.0
 	 * @since 4.2.0 Added the `$adjacent` parameter.
 	 *
-	 * @param string  $output   The adjacent post link.
-	 * @param string  $format   Link anchor format.
-	 * @param string  $link     Link permalink format.
-	 * @param WP_Post $post     The adjacent post.
-	 * @param string  $adjacent Whether the post is previous or next.
+	 * @param string         $output   The adjacent post link.
+	 * @param string         $format   Link anchor format.
+	 * @param string         $link     Link permalink format.
+	 * @param WP_Post|string $post     The adjacent post. Empty string if no corresponding post exists.
+	 * @param string         $adjacent Whether the post is previous or next.
 	 */
 	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
 }
@@ -2336,10 +2381,13 @@ function get_adjacent_post_link( $format, $link, $in_same_term = false, $exclude
  *
  * @param string       $format         Link anchor format.
  * @param string       $link           Link permalink format.
- * @param bool         $in_same_term   Optional. Whether link should be in a same taxonomy term. Default false.
- * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded category IDs. Default empty.
- * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
- * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
+ * @param bool         $in_same_term   Optional. Whether link should be in the same taxonomy term.
+ *                                     Default false.
+ * @param int[]|string $excluded_terms Optional. Array or comma-separated list of excluded category IDs.
+ *                                     Default empty.
+ * @param bool         $previous       Optional. Whether to display link to previous or next post.
+ *                                     Default true.
+ * @param string       $taxonomy       Optional. Taxonomy, if `$in_same_term` is true. Default 'category'.
  */
 function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
@@ -2353,8 +2401,8 @@ function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_te
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
  *
  * @param int  $pagenum Optional. Page number. Default 1.
- * @param bool $escape  Optional. Whether to escape the URL for display, with esc_url(). Defaults to true.
- *                      Otherwise, prepares the URL with sanitize_url().
+ * @param bool $escape  Optional. Whether to escape the URL for display, with esc_url().
+ *                      If set to false, prepares the URL with sanitize_url(). Default true.
  * @return string The link URL for the given page number.
  */
 function get_pagenum_link( $pagenum = 1, $escape = true ) {
@@ -2444,9 +2492,11 @@ function get_next_posts_page_link( $max_page = 0 ) {
 		if ( ! $paged ) {
 			$paged = 1;
 		}
-		$nextpage = (int) $paged + 1;
-		if ( ! $max_page || $max_page >= $nextpage ) {
-			return get_pagenum_link( $nextpage );
+
+		$next_page = (int) $paged + 1;
+
+		if ( ! $max_page || $max_page >= $next_page ) {
+			return get_pagenum_link( $next_page );
 		}
 	}
 }
@@ -2457,13 +2507,13 @@ function get_next_posts_page_link( $max_page = 0 ) {
  * @since 0.71
  *
  * @param int  $max_page Optional. Max pages. Default 0.
- * @param bool $echo     Optional. Whether to echo the link. Default true.
- * @return string|void The link URL for next posts page if `$echo = false`.
+ * @param bool $display  Optional. Whether to echo the link. Default true.
+ * @return string|void The link URL for next posts page if `$display = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
+function next_posts( $max_page = 0, $display = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $output;
 	} else {
 		return $output;
@@ -2493,13 +2543,13 @@ function get_next_posts_link( $label = null, $max_page = 0 ) {
 		$paged = 1;
 	}
 
-	$nextpage = (int) $paged + 1;
+	$next_page = (int) $paged + 1;
 
 	if ( null === $label ) {
 		$label = __( 'Next Page &raquo;' );
 	}
 
-	if ( ! is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ( $next_page <= $max_page ) ) {
 		/**
 		 * Filters the anchor tag attributes for the next posts page link.
 		 *
@@ -2509,7 +2559,12 @@ function get_next_posts_link( $label = null, $max_page = 0 ) {
 		 */
 		$attr = apply_filters( 'next_posts_link_attributes', '' );
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+		return sprintf(
+			'<a href="%1$s" %2$s>%3$s</a>',
+			next_posts( $max_page, false ),
+			$attr,
+			preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+		);
 	}
 }
 
@@ -2542,11 +2597,13 @@ function get_previous_posts_page_link() {
 	global $paged;
 
 	if ( ! is_single() ) {
-		$nextpage = (int) $paged - 1;
-		if ( $nextpage < 1 ) {
-			$nextpage = 1;
+		$previous_page = (int) $paged - 1;
+
+		if ( $previous_page < 1 ) {
+			$previous_page = 1;
 		}
-		return get_pagenum_link( $nextpage );
+
+		return get_pagenum_link( $previous_page );
 	}
 }
 
@@ -2555,13 +2612,13 @@ function get_previous_posts_page_link() {
  *
  * @since 0.71
  *
- * @param bool $echo Optional. Whether to echo the link. Default true.
- * @return string|void The previous posts page link if `$echo = false`.
+ * @param bool $display Optional. Whether to echo the link. Default true.
+ * @return string|void The previous posts page link if `$display = false`.
  */
-function previous_posts( $echo = true ) {
+function previous_posts( $display = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $output;
 	} else {
 		return $output;
@@ -2594,7 +2651,13 @@ function get_previous_posts_link( $label = null ) {
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
 		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+
+		return sprintf(
+			'<a href="%1$s" %2$s>%3$s</a>',
+			previous_posts( false ),
+			$attr,
+			preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+		);
 	}
 }
 
@@ -2683,12 +2746,17 @@ function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
  * @param array $args {
  *     Optional. Default post navigation arguments. Default empty array.
  *
- *     @type string       $prev_text          Anchor text to display in the previous post link. Default '%title'.
- *     @type string       $next_text          Anchor text to display in the next post link. Default '%title'.
- *     @type bool         $in_same_term       Whether link should be in a same taxonomy term. Default false.
- *     @type int[]|string $excluded_terms     Array or comma-separated list of excluded term IDs. Default empty.
+ *     @type string       $prev_text          Anchor text to display in the previous post link.
+ *                                            Default '%title'.
+ *     @type string       $next_text          Anchor text to display in the next post link.
+ *                                            Default '%title'.
+ *     @type bool         $in_same_term       Whether link should be in the same taxonomy term.
+ *                                            Default false.
+ *     @type int[]|string $excluded_terms     Array or comma-separated list of excluded term IDs.
+ *                                            Default empty.
  *     @type string       $taxonomy           Taxonomy, if `$in_same_term` is true. Default 'category'.
- *     @type string       $screen_reader_text Screen reader text for the nav element. Default 'Post navigation'.
+ *     @type string       $screen_reader_text Screen reader text for the nav element.
+ *                                            Default 'Post navigation'.
  *     @type string       $aria_label         ARIA label text for the nav element. Default 'Posts'.
  *     @type string       $class              Custom class for the nav element. Default 'post-navigation'.
  * }
@@ -2922,7 +2990,7 @@ function the_posts_pagination( $args = array() ) {
  * @access private
  *
  * @param string $links              Navigational links.
- * @param string $class              Optional. Custom class for the nav element.
+ * @param string $css_class          Optional. Custom class for the nav element.
  *                                   Default 'posts-navigation'.
  * @param string $screen_reader_text Optional. Screen reader text for the nav element.
  *                                   Default 'Posts navigation'.
@@ -2930,9 +2998,9 @@ function the_posts_pagination( $args = array() ) {
  *                                   Defaults to the value of `$screen_reader_text`.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '', $aria_label = '' ) {
+function _navigation_markup( $links, $css_class = 'posts-navigation', $screen_reader_text = '', $aria_label = '' ) {
 	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+		$screen_reader_text = /* translators: Hidden accessibility text. */ __( 'Posts navigation' );
 	}
 	if ( empty( $aria_label ) ) {
 		$aria_label = $screen_reader_text;
@@ -2958,13 +3026,13 @@ function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string $template The default template.
-	 * @param string $class    The class passed by the calling function.
+	 * @param string $template  The default template.
+	 * @param string $css_class The class passed by the calling function.
 	 * @return string Navigation template.
 	 */
-	$template = apply_filters( 'navigation_markup_template', $template, $class );
+	$template = apply_filters( 'navigation_markup_template', $template, $css_class );
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links, esc_html( $aria_label ) );
+	return sprintf( $template, sanitize_html_class( $css_class ), esc_html( $screen_reader_text ), $links, esc_attr( $aria_label ) );
 }
 
 /**
@@ -3037,7 +3105,7 @@ function get_next_comments_link( $label = '', $max_page = 0 ) {
 		$page = 1;
 	}
 
-	$nextpage = (int) $page + 1;
+	$next_page = (int) $page + 1;
 
 	if ( empty( $max_page ) ) {
 		$max_page = $wp_query->max_num_comment_pages;
@@ -3047,7 +3115,7 @@ function get_next_comments_link( $label = '', $max_page = 0 ) {
 		$max_page = get_comment_pages_count();
 	}
 
-	if ( $nextpage > $max_page ) {
+	if ( $next_page > $max_page ) {
 		return;
 	}
 
@@ -3062,7 +3130,14 @@ function get_next_comments_link( $label = '', $max_page = 0 ) {
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+	$attr = apply_filters( 'next_comments_link_attributes', '' );
+
+	return sprintf(
+		'<a href="%1$s" %2$s>%3$s</a>',
+		esc_url( get_comments_pagenum_link( $next_page, $max_page ) ),
+		$attr,
+		preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+	);
 }
 
 /**
@@ -3096,7 +3171,7 @@ function get_previous_comments_link( $label = '' ) {
 		return;
 	}
 
-	$prevpage = (int) $page - 1;
+	$previous_page = (int) $page - 1;
 
 	if ( empty( $label ) ) {
 		$label = __( '&laquo; Older Comments' );
@@ -3109,7 +3184,14 @@ function get_previous_comments_link( $label = '' ) {
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
+	$attr = apply_filters( 'previous_comments_link_attributes', '' );
+
+	return sprintf(
+		'<a href="%1$s" %2$s>%3$s</a>',
+		esc_url( get_comments_pagenum_link( $previous_page ) ),
+		$attr,
+		preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label )
+	);
 }
 
 /**
@@ -3565,7 +3647,7 @@ function plugins_url( $path = '', $plugin = '' ) {
 	$plugin        = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( ! empty( $plugin ) && 0 === strpos( $plugin, $mu_plugin_dir ) ) {
+	if ( ! empty( $plugin ) && str_starts_with( $plugin, $mu_plugin_dir ) ) {
 		$url = WPMU_PLUGIN_URL;
 	} else {
 		$url = WP_PLUGIN_URL;
@@ -3817,7 +3899,7 @@ function set_url_scheme( $url, $scheme = null ) {
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' ) {
+	if ( str_starts_with( $url, '//' ) ) {
 		$url = 'http:' . $url;
 	}
 
@@ -4181,10 +4263,10 @@ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
  *
  *     @type int    $size           Height and width of the avatar in pixels. Default 96.
  *     @type string $default        URL for the default image or a default type. Accepts '404' (return
- *                                  a 404 instead of a default image), 'retro' (8bit), 'monsterid' (monster),
- *                                  'wavatar' (cartoon face), 'indenticon' (the "quilt"), 'mystery', 'mm',
- *                                  or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF), or
- *                                  'gravatar_default' (the Gravatar logo). Default is the value of the
+ *                                  a 404 instead of a default image), 'retro' (8bit), 'RoboHash' (robohash),
+ *                                  'monsterid' (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
+ *                                  'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF),
+ *                                  or 'gravatar_default' (the Gravatar logo). Default is the value of the
  *                                  'avatar_default' option, with a fallback of 'mystery'.
  *     @type bool   $force_default  Whether to always show the default image, never the Gravatar. Default false.
  *     @type string $rating         What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are
@@ -4356,7 +4438,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
 	if ( is_numeric( $id_or_email ) ) {
 		$user = get_user_by( 'id', absint( $id_or_email ) );
 	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+		if ( str_contains( $id_or_email, '@md5.gravatar.com' ) ) {
 			// MD5 hash.
 			list( $email_hash ) = explode( '@', $id_or_email );
 		} else {
@@ -4608,6 +4690,7 @@ function the_privacy_policy_link( $before = '', $after = '' ) {
  * Returns the privacy policy link with formatting, when applicable.
  *
  * @since 4.9.6
+ * @since 6.2.0 Added 'privacy-policy' rel attribute.
  *
  * @param string $before Optional. Display before privacy policy link. Default empty.
  * @param string $after  Optional. Display after privacy policy link. Default empty.
@@ -4622,7 +4705,7 @@ function get_the_privacy_policy_link( $before = '', $after = '' ) {
 
 	if ( $privacy_policy_url && $page_title ) {
 		$link = sprintf(
-			'<a class="privacy-policy-link" href="%s">%s</a>',
+			'<a class="privacy-policy-link" href="%s" rel="privacy-policy">%s</a>',
 			esc_url( $privacy_policy_url ),
 			esc_html( $page_title )
 		);
@@ -4646,3 +4729,63 @@ function get_the_privacy_policy_link( $before = '', $after = '' ) {
 
 	return '';
 }
+
+/**
+ * Returns an array of URL hosts which are considered to be internal hosts.
+ *
+ * By default the list of internal hosts is comprised of the host name of
+ * the site's home_url() (as parsed by wp_parse_url()).
+ *
+ * This list is used when determining if a specificed URL is a link to a page on
+ * the site itself or a link offsite (to an external host). This is used, for
+ * example, when determining if the "nofollow" attribute should be applied to a
+ * link.
+ *
+ * @see wp_is_internal_link
+ *
+ * @since 6.2.0
+ *
+ * @return string[] An array of URL hosts.
+ */
+function wp_internal_hosts() {
+	static $internal_hosts;
+
+	if ( empty( $internal_hosts ) ) {
+		/**
+		 * Filters the array of URL hosts which are considered internal.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param string[] $internal_hosts An array of internal URL hostnames.
+		 */
+		$internal_hosts = apply_filters(
+			'wp_internal_hosts',
+			array(
+				wp_parse_url( home_url(), PHP_URL_HOST ),
+			)
+		);
+		$internal_hosts = array_unique(
+			array_map( 'strtolower', (array) $internal_hosts )
+		);
+	}
+
+	return $internal_hosts;
+}
+
+/**
+ * Determines whether or not the specified URL is of a host included in the internal hosts list.
+ *
+ * @see wp_internal_hosts()
+ *
+ * @since 6.2.0
+ *
+ * @param string $link The URL to test.
+ * @return bool Returns true for internal URLs and false for all other URLs.
+ */
+function wp_is_internal_link( $link ) {
+	$link = strtolower( $link );
+	if ( in_array( wp_parse_url( $link, PHP_URL_SCHEME ), wp_allowed_protocols(), true ) ) {
+		return in_array( wp_parse_url( $link, PHP_URL_HOST ), wp_internal_hosts(), true );
+	}
+	return false;
+}
diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
index 4986603e9ea77..9324eed562ff0 100644
--- a/src/wp-includes/load.php
+++ b/src/wp-includes/load.php
@@ -6,7 +6,7 @@
  */
 
 /**
- * Return the HTTP protocol sent by the server.
+ * Returns the HTTP protocol sent by the server.
  *
  * @since 4.4.0
  *
@@ -14,14 +14,16 @@
  */
 function wp_get_server_protocol() {
 	$protocol = isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : '';
+
 	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0', 'HTTP/3' ), true ) ) {
 		$protocol = 'HTTP/1.0';
 	}
+
 	return $protocol;
 }
 
 /**
- * Fix `$_SERVER` variables for various setups.
+ * Fixes `$_SERVER` variables for various setups.
  *
  * @since 3.0.0
  * @access private
@@ -40,7 +42,9 @@ function wp_fix_server_vars() {
 	$_SERVER = array_merge( $default_server_values, $_SERVER );
 
 	// Fix for IIS when running with PHP ISAPI.
-	if ( empty( $_SERVER['REQUEST_URI'] ) || ( 'cgi-fcgi' !== PHP_SAPI && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+	if ( empty( $_SERVER['REQUEST_URI'] )
+		|| ( 'cgi-fcgi' !== PHP_SAPI && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) )
+	) {
 
 		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
 			// IIS Mod-Rewrite.
@@ -56,7 +60,7 @@ function wp_fix_server_vars() {
 
 			// Some IIS + PHP configurations put the script-name in the path-info (no need to append it twice).
 			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {
+				if ( $_SERVER['PATH_INFO'] === $_SERVER['SCRIPT_NAME'] ) {
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 				} else {
 					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
@@ -71,12 +75,12 @@ function wp_fix_server_vars() {
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests.
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && str_ends_with( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) ) {
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 	}
 
 	// Fix for Dreamhost and other PHP as CGI hosts.
-	if ( isset( $_SERVER['SCRIPT_NAME'] ) && ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) ) {
+	if ( isset( $_SERVER['SCRIPT_NAME'] ) && str_contains( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) ) {
 		unset( $_SERVER['PATH_INFO'] );
 	}
 
@@ -130,7 +134,7 @@ function wp_populate_basic_auth_from_authorization_header() {
 }
 
 /**
- * Check for the required PHP version, and the MySQL extension or
+ * Checks for the required PHP version, and the MySQL extension or
  * a database drop-in.
  *
  * Dies if requirements are not met.
@@ -143,29 +147,51 @@ function wp_populate_basic_auth_from_authorization_header() {
  */
 function wp_check_php_mysql_versions() {
 	global $required_php_version, $wp_version;
+
 	$php_version = PHP_VERSION;
 
 	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
 		$protocol = wp_get_server_protocol();
 		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
 		header( 'Content-Type: text/html; charset=utf-8' );
-		printf( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.', $php_version, $wp_version, $required_php_version );
+		printf(
+			'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.',
+			$php_version,
+			$wp_version,
+			$required_php_version
+		);
 		exit( 1 );
 	}
 
-	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' )
-		// This runs before default constants are defined, so we can't assume WP_CONTENT_DIR is set yet.
-		&& ( defined( 'WP_CONTENT_DIR' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' )
-			|| ! file_exists( ABSPATH . 'wp-content/db.php' ) )
+	// This runs before default constants are defined, so we can't assume WP_CONTENT_DIR is set yet.
+	$wp_content_dir = defined( 'WP_CONTENT_DIR' ) ? WP_CONTENT_DIR : ABSPATH . 'wp-content';
+
+	if ( ! function_exists( 'mysqli_connect' ) && ! function_exists( 'mysql_connect' )
+		&& ! file_exists( $wp_content_dir . '/db.php' )
 	) {
 		require_once ABSPATH . WPINC . '/functions.php';
 		wp_load_translations_early();
+
+		$message = '<p>' . __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) . "</p>\n";
+
+		$message .= '<p>' . sprintf(
+			/* translators: %s: mysqli. */
+			__( 'Please check that the %s PHP extension is installed and enabled.' ),
+			'<code>mysqli</code>'
+		) . "</p>\n";
+
+		$message .= '<p>' . sprintf(
+			/* translators: %s: Support forums URL. */
+			__( 'If you are unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress support forums</a>.' ),
+			__( 'https://wordpress.org/support/forums/' )
+		) . "</p>\n";
+
 		$args = array(
 			'exit' => false,
 			'code' => 'mysql_not_found',
 		);
 		wp_die(
-			__( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ),
+			$message,
 			__( 'Requirements Not Met' ),
 			$args
 		);
@@ -240,7 +266,82 @@ function wp_get_environment_type() {
 }
 
 /**
- * Don't load all of WordPress when handling a favicon.ico request.
+ * Retrieves the current development mode.
+ *
+ * The development mode affects how certain parts of the WordPress application behave,
+ * which is relevant when developing for WordPress.
+ *
+ * Development mode can be set via the `WP_DEVELOPMENT_MODE` constant in `wp-config.php`.
+ * Possible values are 'core', 'plugin', 'theme', 'all', or an empty string to disable
+ * development mode. 'all' is a special value to signify that all three development modes
+ * ('core', 'plugin', and 'theme') are enabled.
+ *
+ * Development mode is considered separately from `WP_DEBUG` and wp_get_environment_type().
+ * It does not affect debugging output, but rather functional nuances in WordPress.
+ *
+ * This function retrieves the currently set development mode value. To check whether
+ * a specific development mode is enabled, use wp_is_development_mode().
+ *
+ * @since 6.3.0
+ *
+ * @return string The current development mode.
+ */
+function wp_get_development_mode() {
+	static $current_mode = null;
+
+	if ( ! defined( 'WP_RUN_CORE_TESTS' ) && null !== $current_mode ) {
+		return $current_mode;
+	}
+
+	$development_mode = WP_DEVELOPMENT_MODE;
+
+	// Exclusively for core tests, rely on the `$_wp_tests_development_mode` global.
+	if ( defined( 'WP_RUN_CORE_TESTS' ) && isset( $GLOBALS['_wp_tests_development_mode'] ) ) {
+		$development_mode = $GLOBALS['_wp_tests_development_mode'];
+	}
+
+	$valid_modes = array(
+		'core',
+		'plugin',
+		'theme',
+		'all',
+		'',
+	);
+
+	if ( ! in_array( $development_mode, $valid_modes, true ) ) {
+		$development_mode = '';
+	}
+
+	$current_mode = $development_mode;
+
+	return $current_mode;
+}
+
+/**
+ * Checks whether the site is in the given development mode.
+ *
+ * @since 6.3.0
+ *
+ * @param string $mode Development mode to check for. Either 'core', 'plugin', 'theme', or 'all'.
+ * @return bool True if the given mode is covered by the current development mode, false otherwise.
+ */
+function wp_is_development_mode( $mode ) {
+	$current_mode = wp_get_development_mode();
+	if ( empty( $current_mode ) ) {
+		return false;
+	}
+
+	// Return true if the current mode encompasses all modes.
+	if ( 'all' === $current_mode ) {
+		return true;
+	}
+
+	// Return true if the current mode is the given mode.
+	return $mode === $current_mode;
+}
+
+/**
+ * Ensures all of WordPress is not loaded when handling a favicon.ico request.
  *
  * Instead, send the headers for a zero-length favicon and bail.
  *
@@ -255,7 +356,7 @@ function wp_favicon_request() {
 }
 
 /**
- * Die with a maintenance message when conditions are met.
+ * Dies with a maintenance message when conditions are met.
  *
  * The default message can be replaced by using a drop-in (maintenance.php in
  * the wp-content directory).
@@ -287,7 +388,7 @@ function wp_maintenance() {
 }
 
 /**
- * Check if maintenance mode is enabled.
+ * Checks if maintenance mode is enabled.
  *
  * Checks for a file in the WordPress root directory named ".maintenance".
  * This file will contain the variable $upgrading, set to the time the file
@@ -308,6 +409,7 @@ function wp_is_maintenance_mode() {
 	}
 
 	require ABSPATH . '.maintenance';
+
 	// If the $upgrading timestamp is older than 10 minutes, consider maintenance over.
 	if ( ( time() - $upgrading ) >= 10 * MINUTE_IN_SECONDS ) {
 		return false;
@@ -334,7 +436,7 @@ function wp_is_maintenance_mode() {
 }
 
 /**
- * Get the time elapsed so far during this PHP script.
+ * Gets the time elapsed so far during this PHP script.
  *
  * Uses REQUEST_TIME_FLOAT that appeared in PHP 5.4.0.
  *
@@ -347,7 +449,7 @@ function timer_float() {
 }
 
 /**
- * Start the WordPress micro-timer.
+ * Starts the WordPress micro-timer.
  *
  * @since 0.71
  * @access private
@@ -359,12 +461,14 @@ function timer_float() {
  */
 function timer_start() {
 	global $timestart;
+
 	$timestart = microtime( true );
+
 	return true;
 }
 
 /**
- * Retrieve or display the time from the page start to when function is called.
+ * Retrieves or displays the time from the page start to when function is called.
  *
  * @since 0.71
  *
@@ -380,17 +484,25 @@ function timer_start() {
  */
 function timer_stop( $display = 0, $precision = 3 ) {
 	global $timestart, $timeend;
+
 	$timeend   = microtime( true );
 	$timetotal = $timeend - $timestart;
-	$r         = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
+
+	if ( function_exists( 'number_format_i18n' ) ) {
+		$r = number_format_i18n( $timetotal, $precision );
+	} else {
+		$r = number_format( $timetotal, $precision );
+	}
+
 	if ( $display ) {
 		echo $r;
 	}
+
 	return $r;
 }
 
 /**
- * Set PHP error reporting based on WordPress debug settings.
+ * Sets PHP error reporting based on WordPress debug settings.
  *
  * Uses three constants: `WP_DEBUG`, `WP_DEBUG_DISPLAY`, and `WP_DEBUG_LOG`.
  * All three can be defined in wp-config.php. By default, `WP_DEBUG` and
@@ -481,16 +593,16 @@ function wp_debug_mode() {
 		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 	}
 
-	if (
-		defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || defined( 'MS_FILES_REQUEST' ) ||
-		( defined( 'WP_INSTALLING' ) && WP_INSTALLING ) ||
-		wp_doing_ajax() || wp_is_json_request() ) {
+	if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || defined( 'MS_FILES_REQUEST' )
+		|| ( defined( 'WP_INSTALLING' ) && WP_INSTALLING )
+		|| wp_doing_ajax() || wp_is_json_request()
+	) {
 		ini_set( 'display_errors', 0 );
 	}
 }
 
 /**
- * Set the location of the language directory.
+ * Sets the location of the language directory.
  *
  * To set directory manually, define the `WP_LANG_DIR` constant
  * in wp-config.php.
@@ -504,7 +616,9 @@ function wp_debug_mode() {
  */
 function wp_set_lang_dir() {
 	if ( ! defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || ! @is_dir( ABSPATH . WPINC . '/languages' ) ) {
+		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' )
+			|| ! @is_dir( ABSPATH . WPINC . '/languages' )
+		) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -513,6 +627,7 @@ function wp_set_lang_dir() {
 			 * @since 2.1.0
 			 */
 			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
+
 			if ( ! defined( 'LANGDIR' ) ) {
 				// Old static relative path maintained for limited backward compatibility - won't work in some cases.
 				define( 'LANGDIR', 'wp-content/languages' );
@@ -526,6 +641,7 @@ function wp_set_lang_dir() {
 			 * @since 2.1.0
 			 */
 			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
+
 			if ( ! defined( 'LANGDIR' ) ) {
 				// Old relative path maintained for backward compatibility.
 				define( 'LANGDIR', WPINC . '/languages' );
@@ -535,7 +651,7 @@ function wp_set_lang_dir() {
 }
 
 /**
- * Load the database class file and instantiate the `$wpdb` global.
+ * Loads the database class file and instantiates the `$wpdb` global.
  *
  * @since 2.5.0
  *
@@ -563,7 +679,7 @@ function require_wp_db() {
 }
 
 /**
- * Set the database table prefix and the format specifiers for database
+ * Sets the database table prefix and the format specifiers for database
  * table columns.
  *
  * Columns not listed here default to `%s`.
@@ -576,6 +692,7 @@ function require_wp_db() {
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
+
 	if ( ! empty( $wpdb->error ) ) {
 		dead_db();
 	}
@@ -634,7 +751,7 @@ function wp_set_wpdb_vars() {
 }
 
 /**
- * Toggle `$_wp_using_ext_object_cache` on and off without directly
+ * Toggles `$_wp_using_ext_object_cache` on and off without directly
  * touching global.
  *
  * @since 3.7.0
@@ -646,15 +763,18 @@ function wp_set_wpdb_vars() {
  */
 function wp_using_ext_object_cache( $using = null ) {
 	global $_wp_using_ext_object_cache;
+
 	$current_using = $_wp_using_ext_object_cache;
+
 	if ( null !== $using ) {
 		$_wp_using_ext_object_cache = $using;
 	}
+
 	return $current_using;
 }
 
 /**
- * Start the WordPress object cache.
+ * Starts the WordPress object cache.
  *
  * If an object-cache.php file exists in the wp-content directory,
  * it uses that drop-in as an external object cache.
@@ -693,6 +813,7 @@ function wp_start_object_cache() {
 			 */
 			if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
 				require_once WP_CONTENT_DIR . '/object-cache.php';
+
 				if ( function_exists( 'wp_cache_init' ) ) {
 					wp_using_ext_object_cache( true );
 				}
@@ -739,28 +860,30 @@ function wp_start_object_cache() {
 				'blog_meta',
 				'global-posts',
 				'networks',
+				'network-queries',
 				'sites',
 				'site-details',
 				'site-options',
+				'site-queries',
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
+				'user_meta',
 				'useremail',
 				'userlogins',
-				'usermeta',
-				'user_meta',
 				'userslugs',
 			)
 		);
 
-		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 	}
 
 	$first_init = false;
 }
 
 /**
- * Redirect to the installer if WordPress is not installed.
+ * Redirects to the installer if WordPress is not installed.
  *
  * Dies with an error message when Multisite is enabled.
  *
@@ -788,7 +911,7 @@ function wp_not_installed() {
 }
 
 /**
- * Retrieve an array of must-use plugin files.
+ * Retrieves an array of must-use plugin files.
  *
  * The default directory is wp-content/mu-plugins. To change the default
  * directory manually, define `WPMU_PLUGIN_DIR` and `WPMU_PLUGIN_URL`
@@ -801,26 +924,31 @@ function wp_not_installed() {
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
+
 	if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
 		return $mu_plugins;
 	}
+
 	$dh = opendir( WPMU_PLUGIN_DIR );
 	if ( ! $dh ) {
 		return $mu_plugins;
 	}
+
 	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( '.php' === substr( $plugin, -4 ) ) {
+		if ( str_ends_with( $plugin, '.php' ) ) {
 			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
 		}
 	}
+
 	closedir( $dh );
+
 	sort( $mu_plugins );
 
 	return $mu_plugins;
 }
 
 /**
- * Retrieve an array of active and valid plugin files.
+ * Retrieves an array of active and valid plugin files.
  *
  * While upgrading or installing WordPress, no plugins are returned.
  *
@@ -851,11 +979,11 @@ function wp_get_active_and_valid_plugins() {
 
 	foreach ( $active_plugins as $plugin ) {
 		if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-			&& '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
+			&& str_ends_with( $plugin, '.php' )             // $plugin must end with '.php'.
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
 			// Not already included as a network plugin.
 			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins, true ) )
-			) {
+		) {
 			$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
 		}
 	}
@@ -973,7 +1101,7 @@ function wp_skip_paused_themes( array $themes ) {
 }
 
 /**
- * Is WordPress in Recovery Mode.
+ * Determines whether WordPress is in Recovery Mode.
  *
  * In this mode, plugins or themes that cause WSODs will be paused.
  *
@@ -1071,7 +1199,7 @@ function is_protected_ajax_action() {
 }
 
 /**
- * Set internal encoding.
+ * Sets internal encoding.
  *
  * In most cases the default internal encoding is latin1, which is
  * of no use, since we want to use the `mb_` functions for `utf-8` strings.
@@ -1090,7 +1218,7 @@ function wp_set_internal_encoding() {
 }
 
 /**
- * Add magic quotes to `$_GET`, `$_POST`, `$_COOKIE`, and `$_SERVER`.
+ * Adds magic quotes to `$_GET`, `$_POST`, `$_COOKIE`, and `$_SERVER`.
  *
  * Also forces `$_REQUEST` to be `$_GET + $_POST`. If `$_SERVER`,
  * `$_COOKIE`, or `$_ENV` are needed, use those superglobals directly.
@@ -1127,17 +1255,17 @@ function shutdown_action_hook() {
 }
 
 /**
- * Copy an object.
+ * Clones an object.
  *
  * @since 2.7.0
  * @deprecated 3.2.0
  *
- * @param object $object The object to clone.
+ * @param object $input_object The object to clone.
  * @return object The cloned object.
  */
-function wp_clone( $object ) {
+function wp_clone( $input_object ) {
 	// Use parens for clone to accommodate PHP 4. See #17880.
-	return clone( $object );
+	return clone( $input_object );
 }
 
 /**
@@ -1255,7 +1383,7 @@ function is_user_admin() {
 }
 
 /**
- * If Multisite is enabled.
+ * Determines whether Multisite is enabled.
  *
  * @since 3.0.0
  *
@@ -1274,7 +1402,7 @@ function is_multisite() {
 }
 
 /**
- * Retrieve the current site ID.
+ * Retrieves the current site ID.
  *
  * @since 3.1.0
  *
@@ -1284,6 +1412,7 @@ function is_multisite() {
  */
 function get_current_blog_id() {
 	global $blog_id;
+
 	return absint( $blog_id );
 }
 
@@ -1309,7 +1438,7 @@ function get_current_network_id() {
 }
 
 /**
- * Attempt an early load of translations.
+ * Attempts an early load of translations.
  *
  * Used for errors encountered during the initial loading process, before
  * the locale has been properly detected and loaded.
@@ -1321,15 +1450,17 @@ function get_current_network_id() {
  * @since 3.4.0
  * @access private
  *
- * @global WP_Locale $wp_locale WordPress date and time locale object.
+ * @global WP_Textdomain_Registry $wp_textdomain_registry WordPress Textdomain Registry.
+ * @global WP_Locale              $wp_locale              WordPress date and time locale object.
  */
 function wp_load_translations_early() {
-	global $wp_locale;
-
+	global $wp_textdomain_registry, $wp_locale;
 	static $loaded = false;
+
 	if ( $loaded ) {
 		return;
 	}
+
 	$loaded = true;
 
 	if ( function_exists( 'did_action' ) && did_action( 'init' ) ) {
@@ -1342,6 +1473,7 @@ function wp_load_translations_early() {
 	// Translation and localization.
 	require_once ABSPATH . WPINC . '/pomo/mo.php';
 	require_once ABSPATH . WPINC . '/l10n.php';
+	require_once ABSPATH . WPINC . '/class-wp-textdomain-registry.php';
 	require_once ABSPATH . WPINC . '/class-wp-locale.php';
 	require_once ABSPATH . WPINC . '/class-wp-locale-switcher.php';
 
@@ -1351,6 +1483,10 @@ function wp_load_translations_early() {
 	$locales   = array();
 	$locations = array();
 
+	if ( ! $wp_textdomain_registry instanceof WP_Textdomain_Registry ) {
+		$wp_textdomain_registry = new WP_Textdomain_Registry();
+	}
+
 	while ( true ) {
 		if ( defined( 'WPLANG' ) ) {
 			if ( '' === WPLANG ) {
@@ -1392,10 +1528,12 @@ function wp_load_translations_early() {
 		foreach ( $locales as $locale ) {
 			foreach ( $locations as $location ) {
 				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
+					load_textdomain( 'default', $location . '/' . $locale . '.mo', $locale );
+
 					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo', $locale );
 					}
+
 					break 2;
 				}
 			}
@@ -1408,7 +1546,7 @@ function wp_load_translations_early() {
 }
 
 /**
- * Check or set whether WordPress is in "installation" mode.
+ * Checks or sets whether WordPress is in "installation" mode.
  *
  * If the `WP_INSTALLING` constant is defined during the bootstrap, `wp_installing()` will default to `true`.
  *
@@ -1430,6 +1568,7 @@ function wp_installing( $is_installing = null ) {
 	if ( ! is_null( $is_installing ) ) {
 		$old_installing = $installing;
 		$installing     = $is_installing;
+
 		return (bool) $old_installing;
 	}
 
@@ -1450,12 +1589,13 @@ function is_ssl() {
 			return true;
 		}
 
-		if ( '1' == $_SERVER['HTTPS'] ) {
+		if ( '1' === (string) $_SERVER['HTTPS'] ) {
 			return true;
 		}
-	} elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' === (string) $_SERVER['SERVER_PORT'] ) ) {
 		return true;
 	}
+
 	return false;
 }
 
@@ -1475,11 +1615,11 @@ function wp_convert_hr_to_bytes( $value ) {
 	$value = strtolower( trim( $value ) );
 	$bytes = (int) $value;
 
-	if ( false !== strpos( $value, 'g' ) ) {
+	if ( str_contains( $value, 'g' ) ) {
 		$bytes *= GB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'm' ) ) {
+	} elseif ( str_contains( $value, 'm' ) ) {
 		$bytes *= MB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'k' ) ) {
+	} elseif ( str_contains( $value, 'k' ) ) {
 		$bytes *= KB_IN_BYTES;
 	}
 
@@ -1509,7 +1649,9 @@ function wp_is_ini_value_changeable( $setting ) {
 	}
 
 	// Bit operator to workaround https://bugs.php.net/bug.php?id=44936 which changes access level to 63 in PHP 5.2.6 - 5.2.17.
-	if ( isset( $ini_all[ $setting ]['access'] ) && ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) ) ) {
+	if ( isset( $ini_all[ $setting ]['access'] )
+		&& ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) )
+	) {
 		return true;
 	}
 
@@ -1623,7 +1765,7 @@ function wp_is_file_mod_allowed( $context ) {
 }
 
 /**
- * Start scraping edited file errors.
+ * Starts scraping edited file errors.
  *
  * @since 4.9.0
  */
@@ -1631,6 +1773,7 @@ function wp_start_scraping_edited_file_errors() {
 	if ( ! isset( $_REQUEST['wp_scrape_key'] ) || ! isset( $_REQUEST['wp_scrape_nonce'] ) ) {
 		return;
 	}
+
 	$key   = substr( sanitize_key( wp_unslash( $_REQUEST['wp_scrape_key'] ) ), 0, 32 );
 	$nonce = wp_unslash( $_REQUEST['wp_scrape_nonce'] );
 
@@ -1645,14 +1788,16 @@ function wp_start_scraping_edited_file_errors() {
 		echo "###### wp_scraping_result_end:$key ######";
 		die();
 	}
+
 	if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
 		define( 'WP_SANDBOX_SCRAPING', true );
 	}
+
 	register_shutdown_function( 'wp_finalize_scraping_edited_file_errors', $key );
 }
 
 /**
- * Finalize scraping for edited file errors.
+ * Finalizes scraping for edited file errors.
  *
  * @since 4.9.0
  *
@@ -1660,13 +1805,18 @@ function wp_start_scraping_edited_file_errors() {
  */
 function wp_finalize_scraping_edited_file_errors( $scrape_key ) {
 	$error = error_get_last();
+
 	echo "\n###### wp_scraping_result_start:$scrape_key ######\n";
-	if ( ! empty( $error ) && in_array( $error['type'], array( E_CORE_ERROR, E_COMPILE_ERROR, E_ERROR, E_PARSE, E_USER_ERROR, E_RECOVERABLE_ERROR ), true ) ) {
+
+	if ( ! empty( $error )
+		&& in_array( $error['type'], array( E_CORE_ERROR, E_COMPILE_ERROR, E_ERROR, E_PARSE, E_USER_ERROR, E_RECOVERABLE_ERROR ), true )
+	) {
 		$error = str_replace( ABSPATH, '', $error );
 		echo wp_json_encode( $error );
 	} else {
 		echo wp_json_encode( true );
 	}
+
 	echo "\n###### wp_scraping_result_end:$scrape_key ######\n";
 }
 
@@ -1679,7 +1829,6 @@ function wp_finalize_scraping_edited_file_errors( $scrape_key ) {
  *              False otherwise.
  */
 function wp_is_json_request() {
-
 	if ( isset( $_SERVER['HTTP_ACCEPT'] ) && wp_is_json_media_type( $_SERVER['HTTP_ACCEPT'] ) ) {
 		return true;
 	}
@@ -1689,7 +1838,6 @@ function wp_is_json_request() {
 	}
 
 	return false;
-
 }
 
 /**
@@ -1758,7 +1906,7 @@ function wp_is_xml_request() {
 
 	if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) {
 		foreach ( $accepted as $type ) {
-			if ( false !== strpos( $_SERVER['HTTP_ACCEPT'], $type ) ) {
+			if ( str_contains( $_SERVER['HTTP_ACCEPT'], $type ) ) {
 				return true;
 			}
 		}
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index 8de6170da9022..6bb31a7bb0d4f 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Outputs the markup for a audio tag to be used in an Underscore template
+ * Outputs the markup for an audio tag to be used in an Underscore template
  * when data.model is passed.
  *
  * @since 3.9.0
@@ -163,7 +163,7 @@ function wp_print_media_templates() {
 		'target="_blank" rel="noopener"',
 		sprintf(
 			'<span class="screen-reader-text"> %s</span>',
-			/* translators: Accessibility text. */
+			/* translators: Hidden accessibility text. */
 			__( '(opens in a new tab)' )
 		)
 	);
@@ -184,7 +184,7 @@ function wp_print_media_templates() {
 		</div>
 		<h2 class="media-frame-actions-heading screen-reader-text">
 		<?php
-			/* translators: Accessibility text. */
+			/* translators: Hidden accessibility text. */
 			_e( 'Selected media actions' );
 		?>
 		</h2>
@@ -196,7 +196,12 @@ function wp_print_media_templates() {
 	<script type="text/html" id="tmpl-media-modal">
 		<div tabindex="0" class="<?php echo $class; ?>" role="dialog" aria-labelledby="media-frame-title">
 			<# if ( data.hasCloseButton ) { #>
-				<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></span></button>
+				<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Close dialog' );
+					?>
+				</span></span></button>
 			<# } #>
 			<div class="media-modal-content" role="document"></div>
 		</div>
@@ -221,7 +226,12 @@ function wp_print_media_templates() {
 	<script type="text/html" id="tmpl-uploader-inline">
 		<# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
 		<# if ( data.canClose ) { #>
-		<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close uploader' ); ?></span></button>
+		<button class="close dashicons dashicons-no"><span class="screen-reader-text">
+			<?php
+			/* translators: Hidden accessibility text. */
+			_e( 'Close uploader' );
+			?>
+		</span></button>
 		<# } #>
 		<div class="uploader-inline-content {{ messageClass }}">
 		<# if ( data.message ) { #>
@@ -310,10 +320,20 @@ function wp_print_media_templates() {
 	<?php // Template for the view switchers, used for example in the Media Grid. ?>
 	<script type="text/html" id="tmpl-media-library-view-switcher">
 		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', admin_url( 'upload.php' ) ) ); ?>" class="view-list">
-			<span class="screen-reader-text"><?php _e( 'List view' ); ?></span>
+			<span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'List view' );
+				?>
+			</span>
 		</a>
 		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', admin_url( 'upload.php' ) ) ); ?>" class="view-grid current" aria-current="page">
-			<span class="screen-reader-text"><?php _e( 'Grid view' ); ?></span>
+			<span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Grid view' );
+				?>
+			</span>
 		</a>
 	</script>
 
@@ -342,8 +362,8 @@ function wp_print_media_templates() {
 	<?php // Template for the Attachment Details layout in the media browser. ?>
 	<script type="text/html" id="tmpl-edit-attachment-frame">
 		<div class="edit-media-header">
-			<button class="left dashicons"<# if ( ! data.hasPrevious ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button>
-			<button class="right dashicons"<# if ( ! data.hasNext ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button>
+			<button class="left dashicons"<# if ( ! data.hasPrevious ) { #> disabled<# } #>><span class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _e( 'Edit previous media item' ); ?></span></button>
+			<button class="right dashicons"<# if ( ! data.hasNext ) { #> disabled<# } #>><span class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _e( 'Edit next media item' ); ?></span></button>
 			<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></span></button>
 		</div>
 		<div class="media-frame-title"></div>
@@ -353,14 +373,19 @@ function wp_print_media_templates() {
 	<?php // Template for the Attachment Details two columns layout. ?>
 	<script type="text/html" id="tmpl-attachment-details-two-column">
 		<div class="attachment-media-view {{ data.orientation }}">
-			<h2 class="screen-reader-text"><?php _e( 'Attachment Preview' ); ?></h2>
+			<?php
+			if ( isset( $_GET['error'] ) && 'deprecated' === $_GET['error'] ) {
+				echo '<div id="message" class="error notice"><p>' . __( 'The Edit Media screen is deprecated as of WordPress 6.3. Please use the Media Library instead.' ) . '</p></div>';
+			}
+			?>
+			<h2 class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _e( 'Attachment Preview' ); ?></h2>
 			<div class="thumbnail thumbnail-{{ data.type }}">
 				<# if ( data.uploading ) { #>
 					<div class="media-progress-bar"><div></div></div>
-				<# } else if ( data.sizes && data.sizes.large ) { #>
-					<img class="details-image" src="{{ data.sizes.large.url }}" draggable="false" alt="" />
 				<# } else if ( data.sizes && data.sizes.full ) { #>
 					<img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" alt="" />
+				<# } else if ( data.sizes && data.sizes.large ) { #>
+					<img class="details-image" src="{{ data.sizes.large.url }}" draggable="false" alt="" />
 				<# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
 					<img class="details-image icon" src="{{ data.icon }}" draggable="false" alt="" />
 				<# } #>
@@ -404,7 +429,12 @@ function wp_print_media_templates() {
 				<span class="saved"><?php esc_html_e( 'Saved.' ); ?></span>
 			</span>
 			<div class="details">
-				<h2 class="screen-reader-text"><?php _e( 'Details' ); ?></h2>
+				<h2 class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Details' );
+					?>
+				</h2>
 				<div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
 				<div class="uploaded-by">
 					<strong><?php _e( 'Uploaded by:' ); ?></strong>
@@ -439,7 +469,7 @@ function wp_print_media_templates() {
 
 					<# if ( data.originalImageURL && data.originalImageName ) { #>
 						<div class="word-wrap-break-word">
-							<?php _e( 'Original image:' ); ?>
+							<strong><?php _e( 'Original image:' ); ?></strong>
 							<a href="{{ data.originalImageURL }}">{{data.originalImageName}}</a>
 						</div>
 					<# } #>
@@ -529,6 +559,10 @@ function wp_print_media_templates() {
 					<# } #>
 					<a href="{{ data.editLink }}"><?php _e( 'Edit more details' ); ?></a>
 				<# } #>
+				<# if ( data.can.save && data.link ) { #>
+					<span class="links-separator">|</span>
+					<a href="{{ data.url }}" download><?php _e( 'Download file' ); ?></a>
+				<# } #>
 				<# if ( ! data.uploading && data.can.remove ) { #>
 					<# if ( data.link || data.can.save ) { #>
 						<span class="links-separator">|</span>
@@ -573,11 +607,21 @@ function wp_print_media_templates() {
 				<# } #>
 			</div>
 			<# if ( data.buttons.close ) { #>
-				<button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text"><?php _e( 'Remove' ); ?></span></button>
+				<button type="button" class="button-link attachment-close media-modal-icon"><span class="screen-reader-text">
+					<?php
+					/* translators: Hidden accessibility text. */
+					_e( 'Remove' );
+					?>
+				</span></button>
 			<# } #>
 		</div>
 		<# if ( data.buttons.check ) { #>
-			<button type="button" class="check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text"><?php _e( 'Deselect' ); ?></span></button>
+			<button type="button" class="check" tabindex="-1"><span class="media-modal-icon"></span><span class="screen-reader-text">
+				<?php
+				/* translators: Hidden accessibility text. */
+				_e( 'Deselect' );
+				?>
+			</span></button>
 		<# } #>
 		<#
 		var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly';
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index bfd71cdcb3b81..aeedcc22a95ba 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -217,8 +217,10 @@ function image_downsize( $id, $size = 'medium' ) {
 	$is_intermediate  = false;
 	$img_url_basename = wp_basename( $img_url );
 
-	// If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
-	// Otherwise, a non-image type could be returned.
+	/*
+	 * If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
+	 * Otherwise, a non-image type could be returned.
+	 */
 	if ( ! $is_image ) {
 		if ( ! empty( $meta['sizes']['full'] ) ) {
 			$img_url          = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
@@ -281,12 +283,14 @@ function image_downsize( $id, $size = 'medium' ) {
  * @param string     $name   Image size identifier.
  * @param int        $width  Optional. Image width in pixels. Default 0.
  * @param int        $height Optional. Image height in pixels. Default 0.
- * @param bool|array $crop   Optional. Image cropping behavior. If false, the image will be scaled (default),
- *                           If true, image will be cropped to the specified dimensions using center positions.
- *                           If an array, the image will be cropped using the array to specify the crop location.
- *                           Array values must be in the format: array( x_crop_position, y_crop_position ) where:
- *                               - x_crop_position accepts: 'left', 'center', or 'right'.
- *                               - y_crop_position accepts: 'top', 'center', or 'bottom'.
+ * @param bool|array $crop   {
+ *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+ *     If true, image will be cropped to the specified dimensions using center positions.
+ *     If an array, the image will be cropped using the array to specify the crop location:
+ *
+ *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+ *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+ * }
  */
 function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
 	global $_wp_additional_image_sizes;
@@ -341,8 +345,14 @@ function remove_image_size( $name ) {
  *
  * @param int        $width  Image width in pixels.
  * @param int        $height Image height in pixels.
- * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
- *                           An array can specify positioning of the crop area. Default false.
+ * @param bool|array $crop   {
+ *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+ *     If true, image will be cropped to the specified dimensions using center positions.
+ *     If an array, the image will be cropped using the array to specify the crop location:
+ *
+ *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+ *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+ * }
  */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
 	add_image_size( 'post-thumbnail', $width, $height, $crop );
@@ -509,22 +519,20 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width =
  * Calculates dimensions and coordinates for a resized image that fits
  * within a specified width and height.
  *
- * Cropping behavior is dependent on the value of $crop:
- * 1. If false (default), images will not be cropped.
- * 2. If an array in the form of array( x_crop_position, y_crop_position ):
- *    - x_crop_position accepts 'left' 'center', or 'right'.
- *    - y_crop_position accepts 'top', 'center', or 'bottom'.
- *    Images will be cropped to the specified dimensions within the defined crop area.
- * 3. If true, images will be cropped to the specified dimensions using center positions.
- *
  * @since 2.5.0
  *
  * @param int        $orig_w Original width in pixels.
  * @param int        $orig_h Original height in pixels.
  * @param int        $dest_w New width in pixels.
  * @param int        $dest_h New height in pixels.
- * @param bool|array $crop   Optional. Whether to crop image to specified width and height or resize.
- *                           An array can specify positioning of the crop area. Default false.
+ * @param bool|array $crop   {
+ *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+ *     If true, image will be cropped to the specified dimensions using center positions.
+ *     If an array, the image will be cropped using the array to specify the crop location:
+ *
+ *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+ *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+ * }
  * @return array|false Returned array matches parameters for `imagecopyresampled()`. False on failure.
  */
 function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
@@ -652,8 +660,10 @@ function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = fa
 		}
 	}
 
-	// The return array matches the parameters to imagecopyresampled().
-	// int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
+	/*
+	 * The return array matches the parameters to imagecopyresampled().
+	 * int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
+	 */
 	return array( 0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h );
 }
 
@@ -666,11 +676,17 @@ function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = fa
  *
  * @since 2.5.0
  *
- * @param string $file   File path.
- * @param int    $width  Image width.
- * @param int    $height Image height.
- * @param bool   $crop   Optional. Whether to crop image to specified width and height or resize.
- *                       Default false.
+ * @param string     $file   File path.
+ * @param int        $width  Image width.
+ * @param int        $height Image height.
+ * @param bool|array $crop   {
+ *     Optional. Image cropping behavior. If false, the image will be scaled (default).
+ *     If true, image will be cropped to the specified dimensions using center positions.
+ *     If an array, the image will be cropped using the array to specify the crop location:
+ *
+ *     @type string $0 The x crop position. Accepts 'left' 'center', or 'right'.
+ *     @type string $1 The y crop position. Accepts 'top', 'center', or 'bottom'.
+ * }
  * @return array|false Metadata array on success. False if no image was created.
  */
 function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
@@ -749,10 +765,10 @@ function wp_image_matches_ratio( $source_width, $source_height, $target_width, $
  *     Array of file relative path, width, and height on success. Additionally includes absolute
  *     path and URL if registered size is passed to `$size` parameter. False on failure.
  *
- *     @type string $file   Path of image relative to uploads directory.
+ *     @type string $file   Filename of image.
  *     @type int    $width  Width of image in pixels.
  *     @type int    $height Height of image in pixels.
- *     @type string $path   Absolute filesystem path of image.
+ *     @type string $path   Path of image relative to uploads directory.
  *     @type string $url    URL of image.
  * }
  */
@@ -1023,7 +1039,8 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
  *                                  will result in the attribute being omitted for the image.
  *                                  Defaults to 'lazy', depending on wp_lazy_loading_enabled().
  *     @type string       $decoding The 'decoding' attribute value. Possible values are
- *                                  'async' (default), 'sync', or 'auto'.
+ *                                  'async' (default), 'sync', or 'auto'. Passing false or an empty
+ *                                  string will result in the attribute being omitted.
  * }
  * @return string HTML img element or empty string on failure.
  */
@@ -1049,19 +1066,46 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
 			'decoding' => 'async',
 		);
 
-		// Add `loading` attribute.
-		if ( wp_lazy_loading_enabled( 'img', 'wp_get_attachment_image' ) ) {
-			$default_attr['loading'] = wp_get_loading_attr_default( 'wp_get_attachment_image' );
-		}
+		/**
+		 * Filters the context in which wp_get_attachment_image() is used.
+		 *
+		 * @since 6.3.0
+		 *
+		 * @param string $context The context. Default 'wp_get_attachment_image'.
+		 */
+		$context = apply_filters( 'wp_get_attachment_image_context', 'wp_get_attachment_image' );
+		$attr    = wp_parse_args( $attr, $default_attr );
+
+		$loading_attr              = $attr;
+		$loading_attr['width']     = $width;
+		$loading_attr['height']    = $height;
+		$loading_optimization_attr = wp_get_loading_optimization_attributes(
+			'img',
+			$loading_attr,
+			$context
+		);
+
+		// Add loading optimization attributes if not available.
+		$attr = array_merge( $attr, $loading_optimization_attr );
 
-		$attr = wp_parse_args( $attr, $default_attr );
+		// Omit the `decoding` attribute if the value is invalid according to the spec.
+		if ( empty( $attr['decoding'] ) || ! in_array( $attr['decoding'], array( 'async', 'sync', 'auto' ), true ) ) {
+			unset( $attr['decoding'] );
+		}
 
-		// If the default value of `lazy` for the `loading` attribute is overridden
-		// to omit the attribute for this image, ensure it is not included.
-		if ( array_key_exists( 'loading', $attr ) && ! $attr['loading'] ) {
+		/*
+		 * If the default value of `lazy` for the `loading` attribute is overridden
+		 * to omit the attribute for this image, ensure it is not included.
+		 */
+		if ( isset( $attr['loading'] ) && ! $attr['loading'] ) {
 			unset( $attr['loading'] );
 		}
 
+		// If the `fetchpriority` attribute is overridden and set to false or an empty string.
+		if ( isset( $attr['fetchpriority'] ) && ! $attr['fetchpriority'] ) {
+			unset( $attr['fetchpriority'] );
+		}
+
 		// Generate 'srcset' and 'sizes' if not already present.
 		if ( empty( $attr['srcset'] ) ) {
 			$image_meta = wp_get_attachment_metadata( $attachment_id );
@@ -1153,7 +1197,7 @@ function _wp_get_attachment_relative_path( $file ) {
 		return '';
 	}
 
-	if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+	if ( str_contains( $dirname, 'wp-content/uploads' ) ) {
 		// Get the directory name relative to the upload directory (back compat for pre-2.7 uploads).
 		$dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
 		$dirname = ltrim( $dirname, '/' );
@@ -1291,7 +1335,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 			'height' => $image_meta['height'],
 			'file'   => $image_basename,
 		);
-	} elseif ( strpos( $image_src, $image_meta['file'] ) ) {
+	} elseif ( str_contains( $image_src, $image_meta['file'] ) ) {
 		return false;
 	}
 
@@ -1309,7 +1353,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 	 * If currently on HTTPS, prefer HTTPS URLs when we know they're supported by the domain
 	 * (which is to say, when they share the domain name of the current request).
 	 */
-	if ( is_ssl() && 'https' !== substr( $image_baseurl, 0, 5 ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
+	if ( is_ssl() && ! str_starts_with( $image_baseurl, 'https' ) && parse_url( $image_baseurl, PHP_URL_HOST ) === $_SERVER['HTTP_HOST'] ) {
 		$image_baseurl = set_url_scheme( $image_baseurl, 'https' );
 	}
 
@@ -1358,7 +1402,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 		}
 
 		// If the file name is part of the `src`, we've confirmed a match.
-		if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
+		if ( ! $src_matched && str_contains( $image_src, $dirname . $image['file'] ) ) {
 			$src_matched = true;
 			$is_src      = true;
 		}
@@ -1610,7 +1654,7 @@ function wp_image_src_get_dimensions( $image_src, $image_meta, $attachment_id =
 	// Is it a full size image?
 	if (
 		isset( $image_meta['file'] ) &&
-		strpos( $image_src, wp_basename( $image_meta['file'] ) ) !== false
+		str_contains( $image_src, wp_basename( $image_meta['file'] ) )
 	) {
 		$dimensions = array(
 			(int) $image_meta['width'],
@@ -1677,9 +1721,9 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
 	}
 
 	// Bail early if an image has been inserted and later edited.
-	if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
-		strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
-
+	if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash )
+		&& ! str_contains( wp_basename( $image_src ), $img_edit_hash[0] )
+	) {
 		return $image;
 	}
 
@@ -1733,9 +1777,11 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
  * @return bool Whether to add the attribute.
  */
 function wp_lazy_loading_enabled( $tag_name, $context ) {
-	// By default add to all 'img' and 'iframe' tags.
-	// See https://html.spec.whatwg.org/multipage/embedded-content.html#attr-img-loading
-	// See https://html.spec.whatwg.org/multipage/iframe-embed-object.html#attr-iframe-loading
+	/*
+	 * By default add to all 'img' and 'iframe' tags.
+	 * See https://html.spec.whatwg.org/multipage/embedded-content.html#attr-img-loading
+	 * See https://html.spec.whatwg.org/multipage/iframe-embed-object.html#attr-iframe-loading
+	 */
 	$default = ( 'img' === $tag_name || 'iframe' === $tag_name );
 
 	/**
@@ -1765,7 +1811,7 @@ function wp_lazy_loading_enabled( $tag_name, $context ) {
  *
  * @see wp_img_tag_add_width_and_height_attr()
  * @see wp_img_tag_add_srcset_and_sizes_attr()
- * @see wp_img_tag_add_loading_attr()
+ * @see wp_img_tag_add_loading_optimization_attrs()
  * @see wp_iframe_tag_add_loading_attr()
  *
  * @param string $content The HTML content to be filtered.
@@ -1778,7 +1824,6 @@ function wp_filter_content_tags( $content, $context = null ) {
 		$context = current_filter();
 	}
 
-	$add_img_loading_attr    = wp_lazy_loading_enabled( 'img', $context );
 	$add_iframe_loading_attr = wp_lazy_loading_enabled( 'iframe', $context );
 
 	if ( ! preg_match_all( '/<(img|iframe)\s[^>]+>/', $content, $matches, PREG_SET_ORDER ) ) {
@@ -1800,8 +1845,10 @@ function wp_filter_content_tags( $content, $context = null ) {
 					$attachment_id = absint( $class_id[1] );
 
 					if ( $attachment_id ) {
-						// If exactly the same image tag is used more than once, overwrite it.
-						// All identical tags will be replaced later with 'str_replace()'.
+						/*
+						 * If exactly the same image tag is used more than once, overwrite it.
+						 * All identical tags will be replaced later with 'str_replace()'.
+						 */
 						$images[ $tag ] = $attachment_id;
 						break;
 					}
@@ -1833,19 +1880,17 @@ function wp_filter_content_tags( $content, $context = null ) {
 			$attachment_id  = $images[ $match[0] ];
 
 			// Add 'width' and 'height' attributes if applicable.
-			if ( $attachment_id > 0 && false === strpos( $filtered_image, ' width=' ) && false === strpos( $filtered_image, ' height=' ) ) {
+			if ( $attachment_id > 0 && ! str_contains( $filtered_image, ' width=' ) && ! str_contains( $filtered_image, ' height=' ) ) {
 				$filtered_image = wp_img_tag_add_width_and_height_attr( $filtered_image, $context, $attachment_id );
 			}
 
 			// Add 'srcset' and 'sizes' attributes if applicable.
-			if ( $attachment_id > 0 && false === strpos( $filtered_image, ' srcset=' ) ) {
+			if ( $attachment_id > 0 && ! str_contains( $filtered_image, ' srcset=' ) ) {
 				$filtered_image = wp_img_tag_add_srcset_and_sizes_attr( $filtered_image, $context, $attachment_id );
 			}
 
-			// Add 'loading' attribute if applicable.
-			if ( $add_img_loading_attr && false === strpos( $filtered_image, ' loading=' ) ) {
-				$filtered_image = wp_img_tag_add_loading_attr( $filtered_image, $context );
-			}
+			// Add loading optimization attributes if applicable.
+			$filtered_image = wp_img_tag_add_loading_optimization_attrs( $filtered_image, $context );
 
 			// Add 'decoding=async' attribute unless a 'decoding' attribute is already present.
 			if ( ! str_contains( $filtered_image, ' decoding=' ) ) {
@@ -1879,7 +1924,7 @@ function wp_filter_content_tags( $content, $context = null ) {
 			$filtered_iframe = $match[0];
 
 			// Add 'loading' attribute if applicable.
-			if ( $add_iframe_loading_attr && false === strpos( $filtered_iframe, ' loading=' ) ) {
+			if ( $add_iframe_loading_attr && ! str_contains( $filtered_iframe, ' loading=' ) ) {
 				$filtered_iframe = wp_iframe_tag_add_loading_attr( $filtered_iframe, $context );
 			}
 
@@ -1899,45 +1944,100 @@ function wp_filter_content_tags( $content, $context = null ) {
 }
 
 /**
- * Adds `loading` attribute to an `img` HTML tag.
+ * Adds optimization attributes to an `img` HTML tag.
  *
- * @since 5.5.0
+ * @since 6.3.0
  *
  * @param string $image   The HTML `img` tag where the attribute should be added.
  * @param string $context Additional context to pass to the filters.
- * @return string Converted `img` tag with `loading` attribute added.
+ * @return string Converted `img` tag with optimization attributes added.
  */
-function wp_img_tag_add_loading_attr( $image, $context ) {
-	// Get loading attribute value to use. This must occur before the conditional check below so that even images that
-	// are ineligible for being lazy-loaded are considered.
-	$value = wp_get_loading_attr_default( $context );
+function wp_img_tag_add_loading_optimization_attrs( $image, $context ) {
+	$width             = preg_match( '/ width=["\']([0-9]+)["\']/', $image, $match_width ) ? (int) $match_width[1] : null;
+	$height            = preg_match( '/ height=["\']([0-9]+)["\']/', $image, $match_height ) ? (int) $match_height[1] : null;
+	$loading_val       = preg_match( '/ loading=["\']([A-Za-z]+)["\']/', $image, $match_loading ) ? $match_loading[1] : null;
+	$fetchpriority_val = preg_match( '/ fetchpriority=["\']([A-Za-z]+)["\']/', $image, $match_fetchpriority ) ? $match_fetchpriority[1] : null;
+
+	/*
+	 * Get loading optimization attributes to use.
+	 * This must occur before the conditional check below so that even images
+	 * that are ineligible for being lazy-loaded are considered.
+	 */
+	$optimization_attrs = wp_get_loading_optimization_attributes(
+		'img',
+		array(
+			'width'         => $width,
+			'height'        => $height,
+			'loading'       => $loading_val,
+			'fetchpriority' => $fetchpriority_val,
+		),
+		$context
+	);
 
-	// Images should have source and dimension attributes for the `loading` attribute to be added.
-	if ( false === strpos( $image, ' src="' ) || false === strpos( $image, ' width="' ) || false === strpos( $image, ' height="' ) ) {
+	// Images should have source and dimension attributes for the loading optimization attributes to be added.
+	if ( ! str_contains( $image, ' src="' ) || ! str_contains( $image, ' width="' ) || ! str_contains( $image, ' height="' ) ) {
 		return $image;
 	}
 
-	/**
-	 * Filters the `loading` attribute value to add to an image. Default `lazy`.
-	 *
-	 * Returning `false` or an empty string will not add the attribute.
-	 * Returning `true` will add the default value.
-	 *
-	 * @since 5.5.0
-	 *
-	 * @param string|bool $value   The `loading` attribute value. Returning a falsey value will result in
-	 *                             the attribute being omitted for the image.
-	 * @param string      $image   The HTML `img` tag to be filtered.
-	 * @param string      $context Additional context about how the function was called or where the img tag is.
-	 */
-	$value = apply_filters( 'wp_img_tag_add_loading_attr', $value, $image, $context );
+	// Retained for backward compatibility.
+	$loading_attrs_enabled = wp_lazy_loading_enabled( 'img', $context );
 
-	if ( $value ) {
-		if ( ! in_array( $value, array( 'lazy', 'eager' ), true ) ) {
-			$value = 'lazy';
+	if ( empty( $loading_val ) && $loading_attrs_enabled ) {
+		/**
+		 * Filters the `loading` attribute value to add to an image. Default `lazy`.
+		 *
+		 * Returning `false` or an empty string will not add the attribute.
+		 * Returning `true` will add the default value.
+		 *
+		 * @since 5.5.0
+		 *
+		 * @param string|bool $value   The `loading` attribute value. Returning a falsey value will result in
+		 *                             the attribute being omitted for the image.
+		 * @param string      $image   The HTML `img` tag to be filtered.
+		 * @param string      $context Additional context about how the function was called or where the img tag is.
+		 */
+		$filtered_loading_attr = apply_filters(
+			'wp_img_tag_add_loading_attr',
+			isset( $optimization_attrs['loading'] ) ? $optimization_attrs['loading'] : false,
+			$image,
+			$context
+		);
+
+		// Validate the values after filtering.
+		if ( isset( $optimization_attrs['loading'] ) && ! $filtered_loading_attr ) {
+			// Unset `loading` attributes if `$filtered_loading_attr` is set to `false`.
+			unset( $optimization_attrs['loading'] );
+		} elseif ( in_array( $filtered_loading_attr, array( 'lazy', 'eager' ), true ) ) {
+			/*
+			 * If the filter changed the loading attribute to "lazy" when a fetchpriority attribute
+			 * with value "high" is already present, trigger a warning since those two attribute
+			 * values should be mutually exclusive.
+			 *
+			 * The same warning is present in `wp_get_loading_optimization_attributes()`, and here it
+			 * is only intended for the specific scenario where the above filtered caused the problem.
+			 */
+			if ( isset( $optimization_attrs['fetchpriority'] ) && 'high' === $optimization_attrs['fetchpriority'] &&
+				( isset( $optimization_attrs['loading'] ) ? $optimization_attrs['loading'] : false ) !== $filtered_loading_attr &&
+				'lazy' === $filtered_loading_attr
+			) {
+				_doing_it_wrong(
+					__FUNCTION__,
+					__( 'An image should not be lazy-loaded and marked as high priority at the same time.' ),
+					'6.3.0'
+				);
+			}
+
+			// The filtered value will still be respected.
+			$optimization_attrs['loading'] = $filtered_loading_attr;
+		}
+
+		if ( ! empty( $optimization_attrs['loading'] ) ) {
+			$image = str_replace( '<img', '<img loading="' . esc_attr( $optimization_attrs['loading'] ) . '"', $image );
 		}
+	}
 
-		return str_replace( '<img', '<img loading="' . esc_attr( $value ) . '"', $image );
+	if ( empty( $fetchpriority_val ) && ! empty( $optimization_attrs['fetchpriority'] ) ) {
+		$image = str_replace( '<img', '<img fetchpriority="' . esc_attr( $optimization_attrs['fetchpriority'] ) . '"', $image );
 	}
 
 	return $image;
@@ -1962,6 +2062,14 @@ function wp_img_tag_add_loading_attr( $image, $context ) {
  * @return string Converted `img` tag with `decoding` attribute added.
  */
 function wp_img_tag_add_decoding_attr( $image, $context ) {
+	/*
+	 * Only apply the decoding attribute to images that have a src attribute that
+	 * starts with a double quote, ensuring escaped JSON is also excluded.
+	 */
+	if ( ! str_contains( $image, ' src="' ) ) {
+		return $image;
+	}
+
 	/**
 	 * Filters the `decoding` attribute value to add to an image. Default `async`.
 	 *
@@ -2074,21 +2182,42 @@ function wp_img_tag_add_srcset_and_sizes_attr( $image, $context, $attachment_id
  * @return string Converted `iframe` tag with `loading` attribute added.
  */
 function wp_iframe_tag_add_loading_attr( $iframe, $context ) {
-	// Iframes with fallback content (see `wp_filter_oembed_result()`) should not be lazy-loaded because they are
-	// visually hidden initially.
-	if ( false !== strpos( $iframe, ' data-secret="' ) ) {
+	/*
+	 * Iframes with fallback content (see `wp_filter_oembed_result()`) should not be lazy-loaded because they are
+	 * visually hidden initially.
+	 */
+	if ( str_contains( $iframe, ' data-secret="' ) ) {
 		return $iframe;
 	}
 
-	// Get loading attribute value to use. This must occur before the conditional check below so that even iframes that
-	// are ineligible for being lazy-loaded are considered.
-	$value = wp_get_loading_attr_default( $context );
+	/*
+	 * Get loading attribute value to use. This must occur before the conditional check below so that even iframes that
+	 * are ineligible for being lazy-loaded are considered.
+	 */
+	$optimization_attrs = wp_get_loading_optimization_attributes(
+		'iframe',
+		array(
+			/*
+			 * The concrete values for width and height are not important here for now
+			 * since fetchpriority is not yet supported for iframes.
+			 * TODO: Use WP_HTML_Tag_Processor to extract actual values once support is
+			 * added.
+			 */
+			'width'   => str_contains( $iframe, ' width="' ) ? 100 : null,
+			'height'  => str_contains( $iframe, ' height="' ) ? 100 : null,
+			// This function is never called when a 'loading' attribute is already present.
+			'loading' => null,
+		),
+		$context
+	);
 
 	// Iframes should have source and dimension attributes for the `loading` attribute to be added.
-	if ( false === strpos( $iframe, ' src="' ) || false === strpos( $iframe, ' width="' ) || false === strpos( $iframe, ' height="' ) ) {
+	if ( ! str_contains( $iframe, ' src="' ) || ! str_contains( $iframe, ' width="' ) || ! str_contains( $iframe, ' height="' ) ) {
 		return $iframe;
 	}
 
+	$value = isset( $optimization_attrs['loading'] ) ? $optimization_attrs['loading'] : false;
+
 	/**
 	 * Filters the `loading` attribute value to add to an iframe. Default `lazy`.
 	 *
@@ -2158,6 +2287,47 @@ function _wp_post_thumbnail_class_filter_remove( $attr ) {
 	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
 }
 
+/**
+ * Overrides the context used in {@see wp_get_attachment_image()}. Internal use only.
+ *
+ * Uses the {@see 'begin_fetch_post_thumbnail_html'} and {@see 'end_fetch_post_thumbnail_html'}
+ * action hooks to dynamically add/remove itself so as to only filter post thumbnails.
+ *
+ * @ignore
+ * @since 6.3.0
+ * @access private
+ *
+ * @param string $context The context for rendering an attachment image.
+ * @return string Modified context set to 'the_post_thumbnail'.
+ */
+function _wp_post_thumbnail_context_filter( $context ) {
+	return 'the_post_thumbnail';
+}
+
+/**
+ * Adds the '_wp_post_thumbnail_context_filter' callback to the 'wp_get_attachment_image_context'
+ * filter hook. Internal use only.
+ *
+ * @ignore
+ * @since 6.3.0
+ * @access private
+ */
+function _wp_post_thumbnail_context_filter_add() {
+	add_filter( 'wp_get_attachment_image_context', '_wp_post_thumbnail_context_filter' );
+}
+
+/**
+ * Removes the '_wp_post_thumbnail_context_filter' callback from the 'wp_get_attachment_image_context'
+ * filter hook. Internal use only.
+ *
+ * @ignore
+ * @since 6.3.0
+ * @access private
+ */
+function _wp_post_thumbnail_context_filter_remove() {
+	remove_filter( 'wp_get_attachment_image_context', '_wp_post_thumbnail_context_filter' );
+}
+
 add_shortcode( 'wp_caption', 'img_caption_shortcode' );
 add_shortcode( 'caption', 'img_caption_shortcode' );
 
@@ -2197,7 +2367,7 @@ function img_caption_shortcode( $attr, $content = '' ) {
 			$content         = $matches[1];
 			$attr['caption'] = trim( $matches[2] );
 		}
-	} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
+	} elseif ( str_contains( $attr['caption'], '<' ) ) {
 		$attr['caption'] = wp_kses( $attr['caption'], 'post' );
 	}
 
@@ -2626,10 +2796,14 @@ function wp_underscore_playlist_templates() {
 	<# } #>
 	<div class="wp-playlist-caption">
 		<span class="wp-playlist-item-meta wp-playlist-item-title">
-		<?php
-			/* translators: %s: Playlist item title. */
-			printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
-		?>
+			<# if ( data.meta.album || data.meta.artist ) { #>
+				<?php
+				/* translators: %s: Playlist item title. */
+				printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
+				?>
+			<# } else { #>
+				{{ data.title }}
+			<# } #>
 		</span>
 		<# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #>
 		<# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #>
@@ -2642,14 +2816,16 @@ function wp_underscore_playlist_templates() {
 			<# if ( data.caption ) { #>
 				{{ data.caption }}
 			<# } else { #>
-				<span class="wp-playlist-item-title">
-				<?php
-					/* translators: %s: Playlist item title. */
-					printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
-				?>
-				</span>
 				<# if ( data.artists && data.meta.artist ) { #>
-				<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
+					<span class="wp-playlist-item-title">
+						<?php
+						/* translators: %s: Playlist item title. */
+						printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
+						?>
+					</span>
+					<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
+				<# } else { #>
+					<span class="wp-playlist-item-title">{{{ data.title }}}</span>
 				<# } #>
 			<# } #>
 		</a>
@@ -3043,7 +3219,7 @@ function wp_audio_shortcode( $attr, $content = '' ) {
 	 * @since 3.6.0
 	 *
 	 * @param string $html     Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr     Attributes of the shortcode. @see wp_audio_shortcode()
+	 * @param array  $attr     Attributes of the shortcode. See {@see wp_audio_shortcode()}.
 	 * @param string $content  Shortcode content.
 	 * @param int    $instance Unique numeric ID of this audio shortcode instance.
 	 */
@@ -3265,7 +3441,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 	 * @see wp_video_shortcode()
 	 *
 	 * @param string $html     Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr     Attributes of the shortcode. @see wp_video_shortcode()
+	 * @param array  $attr     Attributes of the shortcode. See {@see wp_video_shortcode()}.
 	 * @param string $content  Video shortcode content.
 	 * @param int    $instance Unique numeric ID of this video shortcode instance.
 	 */
@@ -3374,8 +3550,10 @@ function wp_video_shortcode( $attr, $content = '' ) {
 		wp_enqueue_script( 'mediaelement-vimeo' );
 	}
 
-	// MediaElement.js has issues with some URL formats for Vimeo and YouTube,
-	// so update the URL to prevent the ME.js player from breaking.
+	/*
+	 * MediaElement.js has issues with some URL formats for Vimeo and YouTube,
+	 * so update the URL to prevent the ME.js player from breaking.
+	 */
 	if ( 'mediaelement' === $library ) {
 		if ( $is_youtube ) {
 			// Remove `feature` query arg and force SSL - see #40866.
@@ -3456,7 +3634,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 	}
 
 	if ( ! empty( $content ) ) {
-		if ( false !== strpos( $content, "\n" ) ) {
+		if ( str_contains( $content, "\n" ) ) {
 			$content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
 		}
 		$html .= trim( $content );
@@ -3661,14 +3839,14 @@ function get_attachment_taxonomies( $attachment, $output = 'names' ) {
 
 	$objects = array( 'attachment' );
 
-	if ( false !== strpos( $filename, '.' ) ) {
+	if ( str_contains( $filename, '.' ) ) {
 		$objects[] = 'attachment:' . substr( $filename, strrpos( $filename, '.' ) + 1 );
 	}
 
 	if ( ! empty( $attachment->post_mime_type ) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
 
-		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+		if ( str_contains( $attachment->post_mime_type, '/' ) ) {
 			foreach ( explode( '/', $attachment->post_mime_type ) as $token ) {
 				if ( ! empty( $token ) ) {
 					$objects[] = "attachment:$token";
@@ -3712,7 +3890,7 @@ function get_taxonomies_for_attachments( $output = 'names' ) {
 
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
-			if ( 'attachment' === $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
+			if ( 'attachment' === $object_type || str_starts_with( $object_type, 'attachment:' ) ) {
 				if ( 'names' === $output ) {
 					$taxonomies[] = $taxonomy->name;
 				} else {
@@ -3730,18 +3908,18 @@ function get_taxonomies_for_attachments( $output = 'names' ) {
  * Determines whether the value is an acceptable type for GD image functions.
  *
  * In PHP 8.0, the GD extension uses GdImage objects for its data structures.
- * This function checks if the passed value is either a resource of type `gd`
- * or a GdImage object instance. Any other type will return false.
+ * This function checks if the passed value is either a GdImage object instance
+ * or a resource of type `gd`. Any other type will return false.
  *
  * @since 5.6.0
  *
  * @param resource|GdImage|false $image A value to check the type for.
- * @return bool True if $image is either a GD image resource or GdImage instance,
+ * @return bool True if `$image` is either a GD image resource or a GdImage instance,
  *              false otherwise.
  */
 function is_gd_image( $image ) {
-	if ( is_resource( $image ) && 'gd' === get_resource_type( $image )
-		|| is_object( $image ) && $image instanceof GdImage
+	if ( $image instanceof GdImage
+		|| is_resource( $image ) && 'gd' === get_resource_type( $image )
 	) {
 		return true;
 	}
@@ -3750,7 +3928,7 @@ function is_gd_image( $image ) {
 }
 
 /**
- * Creates new GD image resource with transparency support.
+ * Creates a new GD image resource with transparency support.
  *
  * @todo Deprecate if possible.
  *
@@ -3842,8 +4020,10 @@ function wp_get_image_editor( $path, $args = array() ) {
 	if ( ! isset( $args['mime_type'] ) ) {
 		$file_info = wp_check_filetype( $args['path'] );
 
-		// If $file_info['type'] is false, then we let the editor attempt to
-		// figure out the file type, rather than forcing a failure based on extension.
+		/*
+		 * If $file_info['type'] is false, then we let the editor attempt to
+		 * figure out the file type, rather than forcing a failure based on extension.
+		 */
 		if ( isset( $file_info ) && $file_info['type'] ) {
 			$args['mime_type'] = $file_info['type'];
 		}
@@ -3940,8 +4120,10 @@ function _wp_image_editor_choose( $args = array() ) {
 			$args['mime_type'] !== $args['output_mime_type'] &&
 			! call_user_func( array( $implementation, 'supports_mime_type' ), $args['output_mime_type'] )
 		) {
-			// This implementation supports the imput type but not the output type.
-			// Keep looking to see if we can find an implementation that supports both.
+			/*
+			 * This implementation supports the imput type but not the output type.
+			 * Keep looking to see if we can find an implementation that supports both.
+			 */
 			$supports_input = $implementation;
 			continue;
 		}
@@ -3962,7 +4144,7 @@ function wp_plupload_default_settings() {
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
+	if ( $data && str_contains( $data, '_wpPluploadSettings' ) ) {
 		return;
 	}
 
@@ -3991,9 +4173,10 @@ function wp_plupload_default_settings() {
 	 * but iOS 7.x has a bug that prevents uploading of videos when enabled.
 	 * See #29602.
 	 */
-	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
-
+	if ( wp_is_mobile()
+		&& str_contains( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' )
+		&& str_contains( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' )
+	) {
 		$defaults['multi_selection'] = false;
 	}
 
@@ -4107,7 +4290,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
 	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+	if ( str_contains( $attachment->post_mime_type, '/' ) ) {
 		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 	} else {
 		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
@@ -4233,8 +4416,10 @@ function wp_prepare_attachment_for_js( $attachment ) {
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
 
-				// We have the actual image size, but might need to further constrain it if content_width is narrower.
-				// Thumbnail, medium, and full sizes are also checked against the site's height/width options.
+				/*
+				 * We have the actual image size, but might need to further constrain it if content_width is narrower.
+				 * Thumbnail, medium, and full sizes are also checked against the site's height/width options.
+				 */
 				list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
 
 				$sizes[ $size ] = array(
@@ -4328,7 +4513,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @param array       $response   Array of prepared attachment data. @see wp_prepare_attachment_for_js().
+	 * @param array       $response   Array of prepared attachment data. See {@see wp_prepare_attachment_for_js()}.
 	 * @param WP_Post     $attachment Attachment object.
 	 * @param array|false $meta       Array of attachment meta data, or false if there is none.
 	 */
@@ -4364,8 +4549,10 @@ function wp_enqueue_media( $args = array() ) {
 	);
 	$args     = wp_parse_args( $args, $defaults );
 
-	// We're going to pass the old thickbox media tabs to `media_upload_tabs`
-	// to ensure plugins will work. We will then unset those tabs.
+	/*
+	 * We're going to pass the old thickbox media tabs to `media_upload_tabs`
+	 * to ensure plugins will work. We will then unset those tabs.
+	 */
 	$tabs = array(
 		// handler action suffix => tab label
 		'type'     => '',
@@ -4416,13 +4603,11 @@ function wp_enqueue_media( $args = array() ) {
 	$show_audio_playlist = apply_filters( 'media_library_show_audio_playlist', true );
 	if ( null === $show_audio_playlist ) {
 		$show_audio_playlist = $wpdb->get_var(
-			"
-			SELECT ID
+			"SELECT ID
 			FROM $wpdb->posts
 			WHERE post_type = 'attachment'
 			AND post_mime_type LIKE 'audio%'
-			LIMIT 1
-		"
+			LIMIT 1"
 		);
 	}
 
@@ -4446,13 +4631,11 @@ function wp_enqueue_media( $args = array() ) {
 	$show_video_playlist = apply_filters( 'media_library_show_video_playlist', true );
 	if ( null === $show_video_playlist ) {
 		$show_video_playlist = $wpdb->get_var(
-			"
-			SELECT ID
+			"SELECT ID
 			FROM $wpdb->posts
 			WHERE post_type = 'attachment'
 			AND post_mime_type LIKE 'video%'
-			LIMIT 1
-		"
+			LIMIT 1"
 		);
 	}
 
@@ -4475,12 +4658,10 @@ function wp_enqueue_media( $args = array() ) {
 	if ( ! is_array( $months ) ) {
 		$months = $wpdb->get_results(
 			$wpdb->prepare(
-				"
-			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
-			FROM $wpdb->posts
-			WHERE post_type = %s
-			ORDER BY post_date DESC
-		",
+				"SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+				FROM $wpdb->posts
+				WHERE post_type = %s
+				ORDER BY post_date DESC",
 				'attachment'
 			)
 		);
@@ -4510,7 +4691,8 @@ function wp_enqueue_media( $args = array() ) {
 		/** This filter is documented in wp-admin/includes/media.php */
 		'captions'          => ! apply_filters( 'disable_captions', '' ),
 		'nonce'             => array(
-			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+			'sendToEditor'           => wp_create_nonce( 'media-send-to-editor' ),
+			'setAttachmentThumbnail' => wp_create_nonce( 'set-attachment-thumbnail' ),
 		),
 		'post'              => array(
 			'id' => 0,
@@ -4714,8 +4896,10 @@ function wp_enqueue_media( $args = array() ) {
 
 	$strings['settings'] = $settings;
 
-	// Ensure we enqueue media-editor first, that way media-views
-	// is registered internally before we try to localize it. See #24724.
+	/*
+	 * Ensure we enqueue media-editor first, that way media-views
+	 * is registered internally before we try to localize it. See #24724.
+	 */
 	wp_enqueue_script( 'media-editor' );
 	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
 
@@ -4792,7 +4976,7 @@ function get_attached_media( $type, $post = 0 ) {
 }
 
 /**
- * Checks the HTML content for a audio, video, object, embed, or iframe tags.
+ * Checks the HTML content for an audio, video, object, embed, or iframe tags.
  *
  * @since 3.6.0
  *
@@ -5102,7 +5286,7 @@ function attachment_url_to_postid( $url ) {
 		$path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );
 	}
 
-	if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
+	if ( str_starts_with( $path, $dir['baseurl'] . '/' ) ) {
 		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
 	}
 
@@ -5310,8 +5494,10 @@ function wp_getimagesize( $filename, array &$image_info = null ) {
 		return $info;
 	}
 
-	// For PHP versions that don't support WebP images,
-	// extract the image size info from the file headers.
+	/*
+	 * For PHP versions that don't support WebP images,
+	 * extract the image size info from the file headers.
+	 */
 	if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
 		$webp_info = wp_get_webp_info( $filename );
 		$width     = $webp_info['width'];
@@ -5372,8 +5558,10 @@ function wp_get_webp_info( $filename ) {
 		return compact( 'width', 'height', 'type' );
 	}
 
-	// The headers are a little different for each of the three formats.
-	// Header values based on WebP docs, see https://developers.google.com/speed/webp/docs/riff_container.
+	/*
+	 * The headers are a little different for each of the three formats.
+	 * Header values based on WebP docs, see https://developers.google.com/speed/webp/docs/riff_container.
+	 */
 	switch ( substr( $magic, 12, 4 ) ) {
 		// Lossy WebP.
 		case 'VP8 ':
@@ -5405,53 +5593,212 @@ function wp_get_webp_info( $filename ) {
 }
 
 /**
- * Gets the default value to use for a `loading` attribute on an element.
+ * Gets loading optimization attributes.
  *
- * This function should only be called for a tag and context if lazy-loading is generally enabled.
+ * This function returns an array of attributes that should be merged into the given attributes array to optimize
+ * loading performance. Potential attributes returned by this function are:
+ * - `loading` attribute with a value of "lazy"
+ * - `fetchpriority` attribute with a value of "high"
  *
- * The function usually returns 'lazy', but uses certain heuristics to guess whether the current element is likely to
- * appear above the fold, in which case it returns a boolean `false`, which will lead to the `loading` attribute being
- * omitted on the element. The purpose of this refinement is to avoid lazy-loading elements that are within the initial
- * viewport, which can have a negative performance impact.
+ * If any of these attributes are already present in the given attributes, they will not be modified. Note that no
+ * element should have both `loading="lazy"` and `fetchpriority="high"`, so the function will trigger a warning in case
+ * both attributes are present with those values.
  *
- * Under the hood, the function uses {@see wp_increase_content_media_count()} every time it is called for an element
- * within the main content. If the element is the very first content element, the `loading` attribute will be omitted.
- * This default threshold of 1 content element to omit the `loading` attribute for can be customized using the
- * {@see 'wp_omit_loading_attr_threshold'} filter.
+ * @since 6.3.0
  *
- * @since 5.9.0
+ * @global WP_Query $wp_query WordPress Query object.
  *
- * @param string $context Context for the element for which the `loading` attribute value is requested.
- * @return string|bool The default `loading` attribute value. Either 'lazy', 'eager', or a boolean `false`, to indicate
- *                     that the `loading` attribute should be skipped.
+ * @param string $tag_name The tag name.
+ * @param array  $attr     Array of the attributes for the tag.
+ * @param string $context  Context for the element for which the loading optimization attribute is requested.
+ * @return array Loading optimization attributes.
  */
-function wp_get_loading_attr_default( $context ) {
-	// Only elements with 'the_content' or 'the_post_thumbnail' context have special handling.
-	if ( 'the_content' !== $context && 'the_post_thumbnail' !== $context ) {
-		return 'lazy';
+function wp_get_loading_optimization_attributes( $tag_name, $attr, $context ) {
+	global $wp_query;
+
+	$loading_attrs = array();
+
+	/*
+	 * Skip lazy-loading for the overall block template, as it is handled more granularly.
+	 * The skip is also applicable for `fetchpriority`.
+	 */
+	if ( 'template' === $context ) {
+		return $loading_attrs;
 	}
 
-	// Only elements within the main query loop have special handling.
-	if ( is_admin() || ! in_the_loop() || ! is_main_query() ) {
-		return 'lazy';
+	// For now this function only supports images and iframes.
+	if ( 'img' !== $tag_name && 'iframe' !== $tag_name ) {
+		return $loading_attrs;
 	}
 
-	// Increase the counter since this is a main query content element.
-	$content_media_count = wp_increase_content_media_count();
+	// For any resources, width and height must be provided, to avoid layout shifts.
+	if ( ! isset( $attr['width'], $attr['height'] ) ) {
+		return $loading_attrs;
+	}
 
-	// If the count so far is below the threshold, return `false` so that the `loading` attribute is omitted.
-	if ( $content_media_count <= wp_omit_loading_attr_threshold() ) {
-		return false;
+	/*
+	 * Skip programmatically created images within post content as they need to be handled together with the other
+	 * images within the post content.
+	 * Without this clause, they would already be considered within their own context which skews the image count and
+	 * can result in the first post content image being lazy-loaded or an image further down the page being marked as a
+	 * high priority.
+	 */
+	switch ( $context ) {
+		case 'the_post_thumbnail':
+		case 'wp_get_attachment_image':
+		case 'widget_media_image':
+			if ( doing_filter( 'the_content' ) ) {
+				return $loading_attrs;
+			}
 	}
 
-	// For elements after the threshold, lazy-load them as usual.
-	return 'lazy';
+	/*
+	 * The key function logic starts here.
+	 */
+	$maybe_in_viewport    = null;
+	$increase_count       = false;
+	$maybe_increase_count = false;
+
+	// Logic to handle a `loading` attribute that is already provided.
+	if ( isset( $attr['loading'] ) ) {
+		/*
+		 * Interpret "lazy" as not in viewport. Any other value can be
+		 * interpreted as in viewport (realistically only "eager" or `false`
+		 * to force-omit the attribute are other potential values).
+		 */
+		if ( 'lazy' === $attr['loading'] ) {
+			$maybe_in_viewport = false;
+		} else {
+			$maybe_in_viewport = true;
+		}
+	}
+
+	// Logic to handle a `fetchpriority` attribute that is already provided.
+	if ( isset( $attr['fetchpriority'] ) && 'high' === $attr['fetchpriority'] ) {
+		/*
+		 * If the image was already determined to not be in the viewport (e.g.
+		 * from an already provided `loading` attribute), trigger a warning.
+		 * Otherwise, the value can be interpreted as in viewport, since only
+		 * the most important in-viewport image should have `fetchpriority` set
+		 * to "high".
+		 */
+		if ( false === $maybe_in_viewport ) {
+			_doing_it_wrong(
+				__FUNCTION__,
+				__( 'An image should not be lazy-loaded and marked as high priority at the same time.' ),
+				'6.3.0'
+			);
+			/*
+			 * Set `fetchpriority` here for backward-compatibility as we should
+			 * not override what a developer decided, even though it seems
+			 * incorrect.
+			 */
+			$loading_attrs['fetchpriority'] = 'high';
+		} else {
+			$maybe_in_viewport = true;
+		}
+	}
+
+	if ( null === $maybe_in_viewport ) {
+		switch ( $context ) {
+			// Consider elements with these header-specific contexts to be in viewport.
+			case 'template_part_' . WP_TEMPLATE_PART_AREA_HEADER:
+			case 'get_header_image_tag':
+				$maybe_in_viewport    = true;
+				$maybe_increase_count = true;
+				break;
+			// Count main content elements and detect whether in viewport.
+			case 'the_content':
+			case 'the_post_thumbnail':
+			case 'do_shortcode':
+				// Only elements within the main query loop have special handling.
+				if ( ! is_admin() && in_the_loop() && is_main_query() ) {
+					/*
+					 * Get the content media count, since this is a main query
+					 * content element. This is accomplished by "increasing"
+					 * the count by zero, as the only way to get the count is
+					 * to call this function.
+					 * The actual count increase happens further below, based
+					 * on the `$increase_count` flag set here.
+					 */
+					$content_media_count = wp_increase_content_media_count( 0 );
+					$increase_count      = true;
+
+					// If the count so far is below the threshold, `loading` attribute is omitted.
+					if ( $content_media_count < wp_omit_loading_attr_threshold() ) {
+						$maybe_in_viewport = true;
+					} else {
+						$maybe_in_viewport = false;
+					}
+				}
+				/*
+				 * For the 'the_post_thumbnail' context, the following case
+				 * clause needs to be considered as well, therefore skip the
+				 * break statement here if the viewport has not been
+				 * determined.
+				 */
+				if ( 'the_post_thumbnail' !== $context || null !== $maybe_in_viewport ) {
+					break;
+				}
+			// phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect
+			// Consider elements before the loop as being in viewport.
+			case 'wp_get_attachment_image':
+			case 'widget_media_image':
+				if (
+					// Only apply for main query but before the loop.
+					$wp_query->before_loop && $wp_query->is_main_query()
+					/*
+					 * Any image before the loop, but after the header has started should not be lazy-loaded,
+					 * except when the footer has already started which can happen when the current template
+					 * does not include any loop.
+					 */
+					&& did_action( 'get_header' ) && ! did_action( 'get_footer' )
+				) {
+					$maybe_in_viewport    = true;
+					$maybe_increase_count = true;
+				}
+				break;
+		}
+	}
+
+	/*
+	 * If the element is in the viewport (`true`), potentially add
+	 * `fetchpriority` with a value of "high". Otherwise, i.e. if the element
+	 * is not not in the viewport (`false`) or it is unknown (`null`), add
+	 * `loading` with a value of "lazy".
+	 */
+	if ( $maybe_in_viewport ) {
+		$loading_attrs = wp_maybe_add_fetchpriority_high_attr( $loading_attrs, $tag_name, $attr );
+	} else {
+		// Only add `loading="lazy"` if the feature is enabled.
+		if ( wp_lazy_loading_enabled( $tag_name, $context ) ) {
+			$loading_attrs['loading'] = 'lazy';
+		}
+	}
+
+	/*
+	 * If flag was set based on contextual logic above, increase the content
+	 * media count, either unconditionally, or based on whether the image size
+	 * is larger than the threshold.
+	 */
+	if ( $increase_count ) {
+		wp_increase_content_media_count();
+	} elseif ( $maybe_increase_count ) {
+		/** This filter is documented in wp-includes/media.php */
+		$wp_min_priority_img_pixels = apply_filters( 'wp_min_priority_img_pixels', 50000 );
+
+		if ( $wp_min_priority_img_pixels <= $attr['width'] * $attr['height'] ) {
+			wp_increase_content_media_count();
+		}
+	}
+
+	return $loading_attrs;
 }
 
 /**
  * Gets the threshold for how many of the first content media elements to not lazy-load.
  *
- * This function runs the {@see 'wp_omit_loading_attr_threshold'} filter, which uses a default threshold value of 1.
+ * This function runs the {@see 'wp_omit_loading_attr_threshold'} filter, which uses a default threshold value of 3.
  * The filter is only run once per page load, unless the `$force` parameter is used.
  *
  * @since 5.9.0
@@ -5472,10 +5819,11 @@ function wp_omit_loading_attr_threshold( $force = false ) {
 		 * for only the very first content media element.
 		 *
 		 * @since 5.9.0
+		 * @since 6.3.0 The default threshold was changed from 1 to 3.
 		 *
-		 * @param int $omit_threshold The number of media elements where the `loading` attribute will not be added. Default 1.
+		 * @param int $omit_threshold The number of media elements where the `loading` attribute will not be added. Default 3.
 		 */
-		$omit_threshold = apply_filters( 'wp_omit_loading_attr_threshold', 1 );
+		$omit_threshold = apply_filters( 'wp_omit_loading_attr_threshold', 3 );
 	}
 
 	return $omit_threshold;
@@ -5497,3 +5845,80 @@ function wp_increase_content_media_count( $amount = 1 ) {
 
 	return $content_media_count;
 }
+
+/**
+ * Determines whether to add `fetchpriority='high'` to loading attributes.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @param array  $loading_attrs Array of the loading optimization attributes for the element.
+ * @param string $tag_name      The tag name.
+ * @param array  $attr          Array of the attributes for the element.
+ * @return array Updated loading optimization attributes for the element.
+ */
+function wp_maybe_add_fetchpriority_high_attr( $loading_attrs, $tag_name, $attr ) {
+	// For now, adding `fetchpriority="high"` is only supported for images.
+	if ( 'img' !== $tag_name ) {
+		return $loading_attrs;
+	}
+
+	if ( isset( $attr['fetchpriority'] ) ) {
+		/*
+		 * While any `fetchpriority` value could be set in `$loading_attrs`,
+		 * for consistency we only do it for `fetchpriority="high"` since that
+		 * is the only possible value that WordPress core would apply on its
+		 * own.
+		 */
+		if ( 'high' === $attr['fetchpriority'] ) {
+			$loading_attrs['fetchpriority'] = 'high';
+			wp_high_priority_element_flag( false );
+		}
+
+		return $loading_attrs;
+	}
+
+	// Lazy-loading and `fetchpriority="high"` are mutually exclusive.
+	if ( isset( $loading_attrs['loading'] ) && 'lazy' === $loading_attrs['loading'] ) {
+		return $loading_attrs;
+	}
+
+	if ( ! wp_high_priority_element_flag() ) {
+		return $loading_attrs;
+	}
+
+	/**
+	 * Filters the minimum square-pixels threshold for an image to be eligible as the high-priority image.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int $threshold Minimum square-pixels threshold. Default 50000.
+	 */
+	$wp_min_priority_img_pixels = apply_filters( 'wp_min_priority_img_pixels', 50000 );
+
+	if ( $wp_min_priority_img_pixels <= $attr['width'] * $attr['height'] ) {
+		$loading_attrs['fetchpriority'] = 'high';
+		wp_high_priority_element_flag( false );
+	}
+
+	return $loading_attrs;
+}
+
+/**
+ * Accesses a flag that indicates if an element is a possible candidate for `fetchpriority='high'`.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @param bool $value Optional. Used to change the static variable. Default null.
+ * @return bool Returns true if high-priority element was marked already, otherwise false.
+ */
+function wp_high_priority_element_flag( $value = null ) {
+	static $high_priority_element = true;
+
+	if ( is_bool( $value ) ) {
+		$high_priority_element = $value;
+	}
+
+	return $high_priority_element;
+}
diff --git a/src/wp-includes/meta.php b/src/wp-includes/meta.php
index 73b883d10b157..0b9f08544e498 100644
--- a/src/wp-includes/meta.php
+++ b/src/wp-includes/meta.php
@@ -10,6 +10,8 @@
  * @subpackage Meta
  */
 
+require ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php';
+
 /**
  * Adds metadata for the specified object.
  *
@@ -171,7 +173,7 @@ function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique =
  * @param mixed  $meta_value Metadata value. Must be serializable if non-scalar.
  * @param mixed  $prev_value Optional. Previous value to check before updating.
  *                           If specified, only update existing metadata entries with
- *                           this value. Otherwise, update all entries. Default empty.
+ *                           this value. Otherwise, update all entries. Default empty string.
  * @return int|bool The new meta field ID if a field with the given key didn't exist
  *                  and was therefore added, true on successful update,
  *                  false on failure or if the value passed to the function
@@ -369,6 +371,7 @@ function update_metadata( $meta_type, $object_id, $meta_key, $meta_value, $prev_
  *                           Pass `null`, `false`, or an empty string to skip this check.
  *                           (For backward compatibility, it is not possible to pass an empty string
  *                           to delete those entries with an empty string for a value.)
+ *                           Default empty string.
  * @param bool   $delete_all Optional. If true, delete matching metadata entries for all objects,
  *                           ignoring the specified object_id. Otherwise, only delete
  *                           matching metadata entries for the specified object_id. Default false.
@@ -558,7 +561,7 @@ function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $
  *                          or any other object type with an associated meta table.
  * @param int    $object_id ID of the object metadata is for.
  * @param string $meta_key  Optional. Metadata key. If not specified, retrieve all metadata for
- *                          the specified object. Default empty.
+ *                          the specified object. Default empty string.
  * @param bool   $single    Optional. If true, return only the first value of the specified `$meta_key`.
  *                          This parameter has no effect if `$meta_key` is not specified. Default false.
  * @return mixed An array of values if `$single` is false.
@@ -585,7 +588,7 @@ function get_metadata( $meta_type, $object_id, $meta_key = '', $single = false )
  *                          or any other object type with an associated meta table.
  * @param int    $object_id ID of the object metadata is for.
  * @param string $meta_key  Optional. Metadata key. If not specified, retrieve all metadata for
- *                          the specified object. Default empty.
+ *                          the specified object. Default empty string.
  * @param bool   $single    Optional. If true, return only the first value of the specified `$meta_key`.
  *                          This parameter has no effect if `$meta_key` is not specified. Default false.
  * @return mixed An array of values if `$single` is false.
@@ -907,8 +910,10 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
 		$original_key = $meta->meta_key;
 		$object_id    = $meta->{$column};
 
-		// If a new meta_key (last parameter) was specified, change the meta key,
-		// otherwise use the original key in the update statement.
+		/*
+		 * If a new meta_key (last parameter) was specified, change the meta key,
+		 * otherwise use the original key in the update statement.
+		 */
 		if ( false === $meta_key ) {
 			$meta_key = $original_key;
 		} elseif ( ! is_string( $meta_key ) ) {
@@ -1230,7 +1235,7 @@ function wp_metadata_lazyloader() {
  * @param string $type              Type of meta.
  * @param string $primary_table     Primary database table name.
  * @param string $primary_id_column Primary ID column name.
- * @param object $context           Optional. The main query object
+ * @param object $context           Optional. The main query object. Default null.
  * @return string[]|false {
  *     Array containing JOIN and WHERE SQL clauses to append to the main query,
  *     or false if no table exists for the requested meta type.
@@ -1274,7 +1279,7 @@ function _get_meta_table( $type ) {
  *
  * @param string $meta_key  Metadata key.
  * @param string $meta_type Optional. Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
- *                          or any other object type with an associated meta table. Default empty.
+ *                          or any other object type with an associated meta table. Default empty string.
  * @return bool Whether the meta key is considered protected.
  */
 function is_protected_meta( $meta_key, $meta_type = '' ) {
@@ -1304,7 +1309,7 @@ function is_protected_meta( $meta_key, $meta_type = '' ) {
  * @param mixed  $meta_value     Metadata value to sanitize.
  * @param string $object_type    Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
  *                               or any other object type with an associated meta table.
- * @param string $object_subtype Optional. The subtype of the object type.
+ * @param string $object_subtype Optional. The subtype of the object type. Default empty string.
  * @return mixed Sanitized $meta_value.
  */
 function sanitize_meta( $meta_key, $meta_value, $object_type, $object_subtype = '' ) {
@@ -1580,7 +1585,7 @@ function filter_default_metadata( $value, $object_id, $meta_key, $single, $meta_
  * @param string $object_type    Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
  *                               or any other object type with an associated meta table.
  * @param string $meta_key       Metadata key.
- * @param string $object_subtype Optional. The subtype of the object type.
+ * @param string $object_subtype Optional. The subtype of the object type. Default empty string.
  * @return bool True if the meta key is registered to the object type and, if provided,
  *              the object subtype. False if not.
  */
@@ -1599,7 +1604,7 @@ function registered_meta_key_exists( $object_type, $meta_key, $object_subtype =
  * @param string $object_type    Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
  *                               or any other object type with an associated meta table.
  * @param string $meta_key       Metadata key.
- * @param string $object_subtype Optional. The subtype of the object type.
+ * @param string $object_subtype Optional. The subtype of the object type. Default empty string.
  * @return bool True if successful. False if the meta key was not registered.
  */
 function unregister_meta_key( $object_type, $meta_key, $object_subtype = '' ) {
@@ -1648,7 +1653,7 @@ function unregister_meta_key( $object_type, $meta_key, $object_subtype = '' ) {
  *
  * @param string $object_type    Type of object metadata is for. Accepts 'post', 'comment', 'term', 'user',
  *                               or any other object type with an associated meta table.
- * @param string $object_subtype Optional. The subtype of the object type.
+ * @param string $object_subtype Optional. The subtype of the object type. Default empty string.
  * @return array[] List of registered metadata args, keyed by their meta keys.
  */
 function get_registered_meta_keys( $object_type, $object_subtype = '' ) {
diff --git a/src/wp-includes/ms-blogs.php b/src/wp-includes/ms-blogs.php
index ed30cc5fe8138..eddb99c605cff 100644
--- a/src/wp-includes/ms-blogs.php
+++ b/src/wp-includes/ms-blogs.php
@@ -12,7 +12,7 @@
 require_once ABSPATH . WPINC . '/ms-network.php';
 
 /**
- * Update the last_updated field for the current site.
+ * Updates the last_updated field for the current site.
  *
  * @since MU (3.0.0)
  */
@@ -31,12 +31,12 @@ function wpmu_update_blogs_date() {
 }
 
 /**
- * Get a full blog URL, given a blog ID.
+ * Gets a full site URL, given a site ID.
  *
  * @since MU (3.0.0)
  *
- * @param int $blog_id Blog ID.
- * @return string Full URL of the blog if found. Empty string if not.
+ * @param int $blog_id Site ID.
+ * @return string Full site URL if found. Empty string if not.
  */
 function get_blogaddress_by_id( $blog_id ) {
 	$bloginfo = get_site( (int) $blog_id );
@@ -52,11 +52,11 @@ function get_blogaddress_by_id( $blog_id ) {
 }
 
 /**
- * Get a full blog URL, given a blog name.
+ * Gets a full site URL, given a site name.
  *
  * @since MU (3.0.0)
  *
- * @param string $blogname The (subdomain or directory) name
+ * @param string $blogname Name of the subdomain or directory.
  * @return string
  */
 function get_blogaddress_by_name( $blogname ) {
@@ -113,14 +113,14 @@ function get_id_from_blogname( $slug ) {
 }
 
 /**
- * Retrieve the details for a blog from the blogs table and blog options.
+ * Retrieves the details for a blog from the blogs table and blog options.
  *
  * @since MU (3.0.0)
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|string|array $fields  Optional. A blog ID, a blog slug, or an array of fields to query against.
- *                                  If not specified the current blog ID is used.
+ *                                  Defaults to the current blog ID.
  * @param bool             $get_all Whether to retrieve all details or only the details in the blogs table.
  *                                  Default is true.
  * @return WP_Site|false Blog details on success. False on failure.
@@ -137,7 +137,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 			if ( false !== $blog ) {
 				return $blog;
 			}
-			if ( 'www.' === substr( $fields['domain'], 0, 4 ) ) {
+			if ( str_starts_with( $fields['domain'], 'www.' ) ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog  = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
 			} else {
@@ -155,7 +155,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 			if ( false !== $blog ) {
 				return $blog;
 			}
-			if ( 'www.' === substr( $fields['domain'], 0, 4 ) ) {
+			if ( str_starts_with( $fields['domain'], 'www.' ) ) {
 				$nowww = substr( $fields['domain'], 4 );
 				$blog  = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
 			} else {
@@ -273,7 +273,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 }
 
 /**
- * Clear the blog details cache.
+ * Clears the blog details cache.
  *
  * @since MU (3.0.0)
  *
@@ -289,7 +289,7 @@ function refresh_blog_details( $blog_id = 0 ) {
 }
 
 /**
- * Update the details for a blog. Updates the blogs table for a given blog ID.
+ * Updates the details for a blog and the blogs table for a given blog ID.
  *
  * @since MU (3.0.0)
  *
@@ -337,7 +337,7 @@ function clean_site_details_cache( $site_id = 0 ) {
 }
 
 /**
- * Retrieve option value for a given blog id based on name of option.
+ * Retrieves option value for a given blog id based on name of option.
  *
  * If the option does not exist or does not have a value, then the return value
  * will be false. This is useful to check whether you need to install an option
@@ -348,12 +348,12 @@ function clean_site_details_cache( $site_id = 0 ) {
  *
  * @since MU (3.0.0)
  *
- * @param int    $id      A blog ID. Can be null to refer to the current blog.
- * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
- * @param mixed  $default Optional. Default value to return if the option does not exist.
+ * @param int    $id            A blog ID. Can be null to refer to the current blog.
+ * @param string $option        Name of option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed  $default_value Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_blog_option( $id, $option, $default = false ) {
+function get_blog_option( $id, $option, $default_value = false ) {
 	$id = (int) $id;
 
 	if ( empty( $id ) ) {
@@ -361,11 +361,11 @@ function get_blog_option( $id, $option, $default = false ) {
 	}
 
 	if ( get_current_blog_id() == $id ) {
-		return get_option( $option, $default );
+		return get_option( $option, $default_value );
 	}
 
 	switch_to_blog( $id );
-	$value = get_option( $option, $default );
+	$value = get_option( $option, $default_value );
 	restore_current_blog();
 
 	/**
@@ -382,7 +382,7 @@ function get_blog_option( $id, $option, $default = false ) {
 }
 
 /**
- * Add a new option for a given blog ID.
+ * Adds a new option for a given blog ID.
  *
  * You do not need to serialize values. If the value needs to be serialized, then
  * it will be serialized before it is inserted into the database. Remember,
@@ -397,7 +397,7 @@ function get_blog_option( $id, $option, $default = false ) {
  *
  * @param int    $id     A blog ID. Can be null to refer to the current blog.
  * @param string $option Name of option to add. Expected to not be SQL-escaped.
- * @param mixed  $value  Optional. Option value, can be anything. Expected to not be SQL-escaped.
+ * @param mixed  $value  Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool True if the option was added, false otherwise.
  */
 function add_blog_option( $id, $option, $value ) {
@@ -419,7 +419,7 @@ function add_blog_option( $id, $option, $value ) {
 }
 
 /**
- * Removes option by name for a given blog ID. Prevents removal of protected WordPress options.
+ * Removes an option by name for a given blog ID. Prevents removal of protected WordPress options.
  *
  * @since MU (3.0.0)
  *
@@ -446,7 +446,7 @@ function delete_blog_option( $id, $option ) {
 }
 
 /**
- * Update an option for a particular blog.
+ * Updates an option for a particular blog.
  *
  * @since MU (3.0.0)
  *
@@ -475,7 +475,7 @@ function update_blog_option( $id, $option, $value, $deprecated = null ) {
 }
 
 /**
- * Switch the current blog.
+ * Switches the current blog.
  *
  * This function is useful if you need to pull posts, or other information,
  * from other blogs. You can switch back afterwards using restore_current_blog().
@@ -560,22 +560,24 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 						'blog_meta',
 						'global-posts',
 						'networks',
+						'network-queries',
 						'sites',
 						'site-details',
 						'site-options',
+						'site-queries',
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
+						'user_meta',
 						'useremail',
 						'userlogins',
-						'usermeta',
-						'user_meta',
 						'userslugs',
 					)
 				);
 			}
 
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 		}
 	}
 
@@ -588,7 +590,7 @@ function switch_to_blog( $new_blog_id, $deprecated = null ) {
 }
 
 /**
- * Restore the current blog, after calling switch_to_blog().
+ * Restores the current blog, after calling switch_to_blog().
  *
  * @see switch_to_blog()
  * @since MU (3.0.0)
@@ -651,22 +653,24 @@ function restore_current_blog() {
 						'blog_meta',
 						'global-posts',
 						'networks',
+						'network-queries',
 						'sites',
 						'site-details',
 						'site-options',
+						'site-queries',
 						'site-transient',
 						'rss',
 						'users',
+						'user-queries',
+						'user_meta',
 						'useremail',
 						'userlogins',
-						'usermeta',
-						'user_meta',
 						'userslugs',
 					)
 				);
 			}
 
-			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+			wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 		}
 	}
 
@@ -701,7 +705,7 @@ function wp_switch_roles_and_user( $new_site_id, $old_site_id ) {
 }
 
 /**
- * Determines if switch_to_blog() is in effect
+ * Determines if switch_to_blog() is in effect.
  *
  * @since 3.5.0
  *
@@ -714,7 +718,7 @@ function ms_is_switched() {
 }
 
 /**
- * Check if a particular blog is archived.
+ * Checks if a particular blog is archived.
  *
  * @since MU (3.0.0)
  *
@@ -726,7 +730,7 @@ function is_archived( $id ) {
 }
 
 /**
- * Update the 'archived' status of a particular blog.
+ * Updates the 'archived' status of a particular blog.
  *
  * @since MU (3.0.0)
  *
@@ -740,7 +744,7 @@ function update_archived( $id, $archived ) {
 }
 
 /**
- * Update a blog details field.
+ * Updates a blog details field.
  *
  * @since MU (3.0.0)
  * @since 5.1.0 Use wp_update_site() internally.
@@ -781,7 +785,7 @@ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 }
 
 /**
- * Get a blog details field.
+ * Gets a blog details field.
  *
  * @since MU (3.0.0)
  *
@@ -803,7 +807,7 @@ function get_blog_status( $id, $pref ) {
 }
 
 /**
- * Get a list of most recently updated blogs.
+ * Gets a list of most recently updated blogs.
  *
  * @since MU (3.0.0)
  *
@@ -877,12 +881,12 @@ function _update_blog_date_on_post_delete( $post_id ) {
  * Handler for updating the current site's posts count when a post is deleted.
  *
  * @since 4.0.0
+ * @since 6.2.0 Added the `$post` parameter.
  *
- * @param int $post_id Post ID.
+ * @param int     $post_id Post ID.
+ * @param WP_Post $post    Post object.
  */
-function _update_posts_count_on_delete( $post_id ) {
-	$post = get_post( $post_id );
-
+function _update_posts_count_on_delete( $post_id, $post ) {
 	if ( ! $post || 'publish' !== $post->post_status || 'post' !== $post->post_type ) {
 		return;
 	}
@@ -917,7 +921,7 @@ function _update_posts_count_on_transition_post_status( $new_status, $old_status
 }
 
 /**
- * Count number of sites grouped by site status.
+ * Counts number of sites grouped by site status.
  *
  * @since 5.3.0
  *
diff --git a/src/wp-includes/ms-default-constants.php b/src/wp-includes/ms-default-constants.php
index 128b47b9ae3a0..99d6461f62dc7 100644
--- a/src/wp-includes/ms-default-constants.php
+++ b/src/wp-includes/ms-default-constants.php
@@ -28,8 +28,10 @@ function ms_upload_constants() {
 		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
 	}
 
-	// Note, the main site in a post-MU network uses wp-content/uploads.
-	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
+	/*
+	 * Note, the main site in a post-MU network uses wp-content/uploads.
+	 * This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
+	 */
 	if ( ! defined( 'UPLOADS' ) ) {
 		$site_id = get_current_blog_id();
 
diff --git a/src/wp-includes/ms-default-filters.php b/src/wp-includes/ms-default-filters.php
index c0af7215ffe67..8682d48e18e45 100644
--- a/src/wp-includes/ms-default-filters.php
+++ b/src/wp-includes/ms-default-filters.php
@@ -75,7 +75,7 @@
 add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );
 
 // Administration.
-add_action( 'after_delete_post', '_update_posts_count_on_delete' );
+add_action( 'after_delete_post', '_update_posts_count_on_delete', 10, 2 );
 add_action( 'delete_post', '_update_blog_date_on_post_delete' );
 add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3 );
 add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 );
diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
index a0553421d582d..c6c7f544c0b53 100644
--- a/src/wp-includes/ms-deprecated.php
+++ b/src/wp-includes/ms-deprecated.php
@@ -179,6 +179,8 @@ function validate_email( $email, $check_domain = true) {
  * @deprecated 3.0.0 Use wp_get_sites()
  * @see wp_get_sites()
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int    $start      Optional. Offset for retrieving the blog list. Default 0.
  * @param int    $num        Optional. Number of blogs to list. Default 10.
  * @param string $deprecated Unused.
@@ -293,7 +295,7 @@ function wpmu_admin_do_redirect( $url = '' ) {
 	if ( isset( $_GET['redirect'] ) && isset( $_POST['redirect'] ) && $_GET['redirect'] !== $_POST['redirect'] ) {
 		wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
 	} elseif ( isset( $_GET['redirect'] ) ) {
-		if ( 's_' === substr( $_GET['redirect'], 0, 2 ) )
+		if ( str_starts_with( $_GET['redirect'], 's_' ) )
 			$url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
 	} elseif ( isset( $_POST['redirect'] ) ) {
 		$url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
@@ -315,8 +317,8 @@ function wpmu_admin_do_redirect( $url = '' ) {
 function wpmu_admin_redirect_add_updated_param( $url = '' ) {
 	_deprecated_function( __FUNCTION__, '3.3.0', 'add_query_arg()' );
 
-	if ( strpos( $url, 'updated=true' ) === false ) {
-		if ( strpos( $url, '?' ) === false )
+	if ( ! str_contains( $url, 'updated=true' ) ) {
+		if ( ! str_contains( $url, '?' ) )
 			return $url . '?updated=true';
 		else
 			return $url . '&updated=true';
@@ -334,18 +336,18 @@ function wpmu_admin_redirect_add_updated_param( $url = '' ) {
  * @deprecated 3.6.0 Use get_user_by()
  * @see get_user_by()
  *
- * @param string $string Either an email address or a login.
+ * @param string $email_or_login Either an email address or a login.
  * @return int
  */
-function get_user_id_from_string( $string ) {
+function get_user_id_from_string( $email_or_login ) {
 	_deprecated_function( __FUNCTION__, '3.6.0', 'get_user_by()' );
 
-	if ( is_email( $string ) )
-		$user = get_user_by( 'email', $string );
-	elseif ( is_numeric( $string ) )
-		return $string;
+	if ( is_email( $email_or_login ) )
+		$user = get_user_by( 'email', $email_or_login );
+	elseif ( is_numeric( $email_or_login ) )
+		return $email_or_login;
 	else
-		$user = get_user_by( 'login', $string );
+		$user = get_user_by( 'login', $email_or_login );
 
 	if ( $user )
 		return $user->ID;
@@ -353,7 +355,7 @@ function get_user_id_from_string( $string ) {
 }
 
 /**
- * Get a full blog URL, given a domain and a path.
+ * Get a full site URL, given a domain and a path.
  *
  * @since MU (3.0.0)
  * @deprecated 3.7.0
diff --git a/src/wp-includes/ms-files.php b/src/wp-includes/ms-files.php
index 6fb7e4d276497..2efe452faf37e 100644
--- a/src/wp-includes/ms-files.php
+++ b/src/wp-includes/ms-files.php
@@ -18,7 +18,7 @@
 
 ms_file_constants();
 
-if ( '1' == $current_blog->archived || '1' == $current_blog->spam || '1' == $current_blog->deleted ) {
+if ( '1' === $current_blog->archived || '1' === $current_blog->spam || '1' === $current_blog->deleted ) {
 	status_header( 404 );
 	die( '404 &#8212; File not found.' );
 }
@@ -41,7 +41,7 @@
 }
 
 header( 'Content-Type: ' . $mimetype ); // Always send this.
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
+if ( ! str_contains( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
 	header( 'Content-Length: ' . filesize( $file ) );
 }
 
@@ -54,30 +54,36 @@
 	exit;
 }
 
-$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag          = '"' . md5( $last_modified ) . '"';
-header( "Last-Modified: $last_modified GMT" );
-header( 'ETag: ' . $etag );
+$wp_last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
+$wp_etag          = '"' . md5( $wp_last_modified ) . '"';
+
+header( "Last-Modified: $wp_last_modified GMT" );
+header( 'ETag: ' . $wp_etag );
 header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
 
 // Support for conditional GET - use stripslashes() to avoid formatting.php dependency.
-$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
+if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ) {
+	$client_etag = stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] );
+} else {
+	$client_etag = '';
+}
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
-	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+if ( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+	$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
+} else {
+	$client_last_modified = '';
 }
 
-$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 // If string is empty, return 0. If not, attempt to parse into a timestamp.
 $client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
 
-// Make a timestamp for our most recent modification...
-$modified_timestamp = strtotime( $last_modified );
+// Make a timestamp for our most recent modification.
+$wp_modified_timestamp = strtotime( $wp_last_modified );
 
 if ( ( $client_last_modified && $client_etag )
-	? ( ( $client_modified_timestamp >= $modified_timestamp ) && ( $client_etag == $etag ) )
-	: ( ( $client_modified_timestamp >= $modified_timestamp ) || ( $client_etag == $etag ) )
-	) {
+	? ( ( $client_modified_timestamp >= $wp_modified_timestamp ) && ( $client_etag === $wp_etag ) )
+	: ( ( $client_modified_timestamp >= $wp_modified_timestamp ) || ( $client_etag === $wp_etag ) )
+) {
 	status_header( 304 );
 	exit;
 }
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
index 127e115c0b3d6..09ee2a5c53d1c 100644
--- a/src/wp-includes/ms-functions.php
+++ b/src/wp-includes/ms-functions.php
@@ -145,7 +145,7 @@ function get_blog_post( $blog_id, $post_id ) {
  *
  * @param int    $blog_id ID of the blog the user is being added to.
  * @param int    $user_id ID of the user being added.
- * @param string $role    The role you want the user to have.
+ * @param string $role    User role.
  * @return true|WP_Error True on success or a WP_Error object if the user doesn't exist
  *                       or could not be added.
  */
@@ -245,8 +245,10 @@ function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
 	 */
 	do_action( 'remove_user_from_blog', $user_id, $blog_id, $reassign );
 
-	// If being removed from the primary blog, set a new primary
-	// if the user is assigned to multiple blogs.
+	/*
+	 * If being removed from the primary blog, set a new primary
+	 * if the user is assigned to multiple blogs.
+	 */
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	if ( $primary_blog == $blog_id ) {
 		$new_id     = '';
@@ -274,7 +276,7 @@ function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
 	$user->remove_all_caps();
 
 	$blogs = get_blogs_of_user( $user_id );
-	if ( count( $blogs ) == 0 ) {
+	if ( count( $blogs ) === 0 ) {
 		update_user_meta( $user_id, 'primary_blog', '' );
 		update_user_meta( $user_id, 'source_domain', '' );
 	}
@@ -295,6 +297,7 @@ function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
 		}
 	}
 
+	clean_user_cache( $user_id );
 	restore_current_blog();
 
 	return true;
@@ -307,7 +310,7 @@ function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
  *
  * @param int $blog_id ID of the source blog.
  * @param int $post_id ID of the desired post.
- * @return string The post's permalink
+ * @return string The post's permalink.
  */
 function get_blog_permalink( $blog_id, $post_id ) {
 	switch_to_blog( $blog_id );
@@ -329,9 +332,9 @@ function get_blog_permalink( $blog_id, $post_id ) {
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param string $domain
- * @param string $path   Optional. Not required for subdomain installations.
- * @return int 0 if no blog found, otherwise the ID of the matching blog
+ * @param string $domain Website domain.
+ * @param string $path   Optional. Not required for subdomain installations. Default '/'.
+ * @return int 0 if no blog found, otherwise the ID of the matching blog.
  */
 function get_blog_id_from_url( $domain, $path = '/' ) {
 	$domain = strtolower( $domain );
@@ -400,13 +403,12 @@ function is_email_address_unsafe( $user_email ) {
 				continue;
 			}
 
-			if ( $email_domain == $banned_domain ) {
+			if ( $email_domain === $banned_domain ) {
 				$is_email_address_unsafe = true;
 				break;
 			}
 
-			$dotted_domain = ".$banned_domain";
-			if ( substr( $normalized_email, -strlen( $dotted_domain ) ) === $dotted_domain ) {
+			if ( str_ends_with( $normalized_email, ".$banned_domain" ) ) {
 				$is_email_address_unsafe = true;
 				break;
 			}
@@ -603,11 +605,12 @@ function wpmu_validate_user_signup( $user_name, $user_email ) {
  * @global wpdb   $wpdb   WordPress database abstraction object.
  * @global string $domain
  *
- * @param string         $blogname   The blog name provided by the user. Must be unique.
- * @param string         $blog_title The blog title provided by the user.
+ * @param string         $blogname   The site name provided by the user. Must be unique.
+ * @param string         $blog_title The site title provided by the user.
  * @param WP_User|string $user       Optional. The user object to check against the new site name.
+ *                                   Default empty string.
  * @return array {
- *     Array of domain, path, blog name, blog title, user and error messages.
+ *     Array of domain, path, site name, site title, user and error messages.
  *
  *     @type string         $domain     Domain for the site.
  *     @type string         $path       Path for the site. Used in subdirectory installations.
@@ -716,8 +719,10 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 		}
 	}
 
-	// Has someone already signed up for this domain?
-	// TODO: Check email too?
+	/*
+	 * Has someone already signed up for this domain?
+	 * TODO: Check email too?
+	 */
 	$signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) );
 	if ( $signup instanceof stdClass ) {
 		$diff = time() - mysql2date( 'U', $signup->registered );
@@ -750,12 +755,12 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	 * @since MU (3.0.0)
 	 *
 	 * @param array $result {
-	 *     Array of domain, path, blog name, blog title, user and error messages.
+	 *     Array of domain, path, site name, site title, user and error messages.
 	 *
 	 *     @type string         $domain     Domain for the site.
 	 *     @type string         $path       Path for the site. Used in subdirectory installations.
 	 *     @type string         $blogname   The unique site name (slug).
-	 *     @type string         $blog_title Blog title.
+	 *     @type string         $blog_title Site title.
 	 *     @type string|WP_User $user       By default, an empty string. A user object if provided.
 	 *     @type WP_Error       $errors     WP_Error containing any errors found.
 	 * }
@@ -913,7 +918,7 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) {
  * @param string $title      The site title.
  * @param string $user_login The user's login name.
  * @param string $user_email The user's email address.
- * @param string $key        The activation key created in wpmu_signup_blog()
+ * @param string $key        The activation key created in wpmu_signup_blog().
  * @param array  $meta       Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
@@ -954,7 +959,7 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
 
 	$user            = get_user_by( 'login', $user_login );
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = $user && switch_to_user_locale( $user->ID );
 
 	$message = sprintf(
 		/**
@@ -1068,7 +1073,7 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 	}
 
 	$user            = get_user_by( 'login', $user_login );
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = $user && switch_to_user_locale( $user->ID );
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
@@ -1152,7 +1157,7 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $key The activation key provided to the user.
- * @return array|WP_Error An array containing information about the activated user and/or blog
+ * @return array|WP_Error An array containing information about the activated user and/or blog.
  */
 function wpmu_activate_signup( $key ) {
 	global $wpdb;
@@ -1279,6 +1284,8 @@ function wpmu_activate_signup( $key ) {
  *
  * @since 5.5.0
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int      $id       ID of the user to delete.
  * @param int|null $reassign ID of the user to reassign posts and links to.
  * @param WP_User  $user     User object.
@@ -1302,7 +1309,7 @@ function wp_delete_signup_on_user_delete( $id, $reassign, $user ) {
  * @param string $user_name The new user's login name.
  * @param string $password  The new user's password.
  * @param string $email     The new user's email address.
- * @return int|false Returns false on failure, or int $user_id on success
+ * @return int|false Returns false on failure, or int $user_id on success.
  */
 function wpmu_create_user( $user_name, $password, $email ) {
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
@@ -1352,6 +1359,7 @@ function wpmu_create_user( $user_name, $password, $email ) {
  *                           updated. Otherwise, keys and values will be used to set options for
  *                           the new site. Default empty array.
  * @param int    $network_id Optional. Network ID. Only relevant on multi-network installations.
+ *                           Default 1.
  * @return int|WP_Error Returns WP_Error object on failure, the new site ID on success.
  */
 function wpmu_create_blog( $domain, $path, $title, $user_id, $options = array(), $network_id = 1 ) {
@@ -1396,7 +1404,7 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $options = array(),
 		return $blog_id;
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set_sites_last_changed();
 
 	return $blog_id;
 }
@@ -1537,7 +1545,8 @@ function newuser_notify_siteadmin( $user_id ) {
  *
  * @param string $domain     The domain to be checked.
  * @param string $path       The path to be checked.
- * @param int    $network_id Optional. Network ID. Relevant only on multi-network installations.
+ * @param int    $network_id Optional. Network ID. Only relevant on multi-network installations.
+ *                           Default 1.
  * @return int|null The site ID if the site name exists, null otherwise.
  */
 function domain_exists( $domain, $path, $network_id = 1 ) {
@@ -1564,7 +1573,7 @@ function domain_exists( $domain, $path, $network_id = 1 ) {
 	 * @param int|null $result     The site ID if the site name exists, null otherwise.
 	 * @param string   $domain     Domain to be checked.
 	 * @param string   $path       Path to be checked.
-	 * @param int      $network_id Network ID. Relevant only on multi-network installations.
+	 * @param int      $network_id Network ID. Only relevant on multi-network installations.
 	 */
 	return apply_filters( 'domain_exists', $result, $domain, $path, $network_id );
 }
@@ -1608,7 +1617,7 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta
 
 	$user = get_userdata( $user_id );
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_user_locale( $user_id );
 
 	$welcome_email = get_site_option( 'welcome_email' );
 	if ( false == $welcome_email ) {
@@ -1732,7 +1741,7 @@ function wpmu_new_site_admin_notification( $site_id, $user_id ) {
 
 	if ( $network_admin ) {
 		// If the network admin email address corresponds to a user, switch to their locale.
-		$switched_locale = switch_to_locale( get_user_locale( $network_admin ) );
+		$switched_locale = switch_to_user_locale( $network_admin->ID );
 	} else {
 		// Otherwise switch to the locale of the current site.
 		$switched_locale = switch_to_locale( get_locale() );
@@ -1841,7 +1850,7 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 
 	$user = get_userdata( $user_id );
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_user_locale( $user_id );
 
 	/**
 	 * Filters the content of the welcome email after user activation.
@@ -1906,9 +1915,9 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
  *
  * @since MU (3.0.0)
  *
- * @global WP_Network $current_site
+ * @global WP_Network $current_site The current network.
  *
- * @return WP_Network
+ * @return WP_Network The current network.
  */
 function get_current_site() {
 	global $current_site;
@@ -1925,8 +1934,8 @@ function get_current_site() {
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $user_id
- * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
+ * @param int $user_id User ID.
+ * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts.
  */
 function get_most_recent_post_of_user( $user_id ) {
 	global $wpdb;
@@ -1934,8 +1943,10 @@ function get_most_recent_post_of_user( $user_id ) {
 	$user_blogs       = get_blogs_of_user( (int) $user_id );
 	$most_recent_post = array();
 
-	// Walk through each blog and get the most recent post
-	// published by $user_id.
+	/*
+	 * Walk through each blog and get the most recent post
+	 * published by $user_id.
+	 */
 	foreach ( (array) $user_blogs as $blog ) {
 		$prefix      = $wpdb->get_blog_prefix( $blog->userblog_id );
 		$recent_post = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A );
@@ -1986,7 +1997,7 @@ function check_upload_mimes( $mimes ) {
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( '' !== $ext && false !== strpos( $ext_pattern, $ext ) ) {
+			if ( '' !== $ext && str_contains( $ext_pattern, $ext ) ) {
 				$site_mimes[ $ext_pattern ] = $mime;
 			}
 		}
@@ -2073,7 +2084,7 @@ function redirect_this_site( $deprecated = '' ) {
  *
  * @blessed
  *
- * @param array $upload
+ * @param array $upload An array of information about the newly-uploaded file.
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
@@ -2159,7 +2170,7 @@ function maybe_redirect_404() {
  * @since MU (3.0.0)
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER['REQUEST_URI'], '/newbloguser/' ) ) {
+	if ( ! str_contains( $_SERVER['REQUEST_URI'], '/newbloguser/' ) ) {
 		return;
 	}
 
@@ -2260,7 +2271,7 @@ function add_new_user_to_blog( $user_id, $password, $meta ) {
 }
 
 /**
- * Corrects From host on outgoing mail to match the site domain
+ * Corrects From host on outgoing mail to match the site domain.
  *
  * @since MU (3.0.0)
  *
@@ -2298,8 +2309,8 @@ function is_user_spammy( $user = null ) {
  *
  * @since MU (3.0.0)
  *
- * @param int $old_value
- * @param int $value     The new public value
+ * @param int $old_value The old public value.
+ * @param int $value     The new public value.
  */
 function update_blog_public( $old_value, $value ) {
 	update_blog_status( get_current_blog_id(), 'public', (int) $value );
@@ -2376,12 +2387,12 @@ function force_ssl_content( $force = '' ) {
  *
  * @since 2.8.5
  *
- * @param string $url URL
- * @return string URL with https as the scheme
+ * @param string $url URL.
+ * @return string URL with https as the scheme.
  */
 function filter_SSL( $url ) {  // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
 	if ( ! is_string( $url ) ) {
-		return get_bloginfo( 'url' ); // Return home blog URL with proper scheme.
+		return get_bloginfo( 'url' ); // Return home site URL with proper scheme.
 	}
 
 	if ( force_ssl_content() && is_ssl() ) {
@@ -2543,7 +2554,7 @@ function get_space_used() {
  *
  * @since MU (3.0.0)
  *
- * @return int Quota in megabytes
+ * @return int Quota in megabytes.
  */
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
@@ -2571,7 +2582,7 @@ function get_space_allowed() {
  *
  * @since 3.0.0
  *
- * @return int of upload space available in bytes
+ * @return int of upload space available in bytes.
  */
 function get_upload_space_available() {
 	$allowed = get_space_allowed();
@@ -2634,7 +2645,7 @@ function upload_size_limit_filter( $size ) {
  * @since 3.3.0
  * @since 4.8.0 The `$network_id` parameter has been added.
  *
- * @param string   $using      'sites or 'users'. Default is 'sites'.
+ * @param string   $using      'sites' or 'users'. Default is 'sites'.
  * @param int|null $network_id ID of the network. Default is the current network.
  * @return bool True if the network meets the criteria for large. False otherwise.
  */
@@ -2724,7 +2735,7 @@ function update_network_option_new_admin_email( $old_value, $value ) {
 	);
 	update_site_option( 'network_admin_hash', $new_admin_email );
 
-	$switched_locale = switch_to_locale( get_user_locale() );
+	$switched_locale = switch_to_user_locale( get_current_user_id() );
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
 	$email_text = __(
diff --git a/src/wp-includes/ms-load.php b/src/wp-includes/ms-load.php
index 35942df0f861e..afac9b1147d05 100644
--- a/src/wp-includes/ms-load.php
+++ b/src/wp-includes/ms-load.php
@@ -46,7 +46,7 @@ function wp_get_active_network_plugins() {
 
 	foreach ( $active_plugins as $plugin ) {
 		if ( ! validate_file( $plugin )                     // $plugin must validate as file.
-			&& '.php' === substr( $plugin, -4 )             // $plugin must end with '.php'.
+			&& str_ends_with( $plugin, '.php' )             // $plugin must end with '.php'.
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
 			) {
 			$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
@@ -226,10 +226,12 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 	 * then cache whether we can just always ignore paths.
 	 */
 
-	// Either www or non-www is supported, not both. If a www domain is requested,
-	// query for both to provide the proper redirect.
+	/*
+	 * Either www or non-www is supported, not both. If a www domain is requested,
+	 * query for both to provide the proper redirect.
+	 */
 	$domains = array( $domain );
-	if ( 'www.' === substr( $domain, 0, 4 ) ) {
+	if ( str_starts_with( $domain, 'www.' ) ) {
 		$domains[] = substr( $domain, 4 );
 	}
 
@@ -297,7 +299,7 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 
 	// If the network is defined in wp-config.php, we can simply use that.
 	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
-		$current_site         = new stdClass;
+		$current_site         = new stdClass();
 		$current_site->id     = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
 		$current_site->path   = PATH_CURRENT_SITE;
@@ -310,8 +312,10 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 		if ( 0 === strcasecmp( $current_site->domain, $domain ) && 0 === strcasecmp( $current_site->path, $path ) ) {
 			$current_blog = get_site_by_path( $domain, $path );
 		} elseif ( '/' !== $current_site->path && 0 === strcasecmp( $current_site->domain, $domain ) && 0 === stripos( $path, $current_site->path ) ) {
-			// If the current network has a path and also matches the domain and path of the request,
-			// we need to look for a site using the first path segment following the network's path.
+			/*
+			 * If the current network has a path and also matches the domain and path of the request,
+			 * we need to look for a site using the first path segment following the network's path.
+			 */
 			$current_blog = get_site_by_path( $domain, $path, 1 + count( explode( '/', trim( $current_site->path, '/' ) ) ) );
 		} else {
 			// Otherwise, use the first path segment (as usual).
@@ -387,7 +391,7 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 
 	// During activation of a new subdomain, the requested site does not yet exist.
 	if ( empty( $current_blog ) && wp_installing() ) {
-		$current_blog          = new stdClass;
+		$current_blog          = new stdClass();
 		$current_blog->blog_id = 1;
 		$blog_id               = 1;
 		$current_blog->public  = 1;
@@ -493,7 +497,7 @@ function ms_not_installed( $domain, $path ) {
 	$msg .= sprintf(
 		/* translators: %s: Documentation URL. */
 		__( 'Read the <a href="%s" target="_blank">Debugging a WordPress Network</a> article. Some of the suggestions there may help you figure out what went wrong.' ),
-		__( 'https://wordpress.org/support/article/debugging-a-wordpress-network/' )
+		__( 'https://wordpress.org/documentation/article/debugging-a-wordpress-network/' )
 	);
 	$msg .= ' ' . __( 'If you are still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
 	foreach ( $wpdb->tables( 'global' ) as $t => $table ) {
diff --git a/src/wp-includes/ms-network.php b/src/wp-includes/ms-network.php
index 5d14d69ec72bd..8ab8819e268f2 100644
--- a/src/wp-includes/ms-network.php
+++ b/src/wp-includes/ms-network.php
@@ -96,7 +96,7 @@ function clean_network_cache( $ids ) {
 		do_action( 'clean_network_cache', $id );
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'networks' );
+	wp_cache_set_last_changed( 'networks' );
 }
 
 /**
diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php
index 6824895880f8b..27dc1337f5fd0 100644
--- a/src/wp-includes/ms-settings.php
+++ b/src/wp-includes/ms-settings.php
@@ -55,10 +55,10 @@
 if ( ! isset( $current_site ) || ! isset( $current_blog ) ) {
 
 	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-	if ( ':80' === substr( $domain, -3 ) ) {
+	if ( str_ends_with( $domain, ':80' ) ) {
 		$domain               = substr( $domain, 0, -3 );
 		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-	} elseif ( ':443' === substr( $domain, -4 ) ) {
+	} elseif ( str_ends_with( $domain, ':443' ) ) {
 		$domain               = substr( $domain, 0, -4 );
 		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
 	}
diff --git a/src/wp-includes/ms-site.php b/src/wp-includes/ms-site.php
index fe012c5fcabc8..eaee99f5685c2 100644
--- a/src/wp-includes/ms-site.php
+++ b/src/wp-includes/ms-site.php
@@ -114,8 +114,10 @@ function wp_insert_site( array $data ) {
 			$meta['WPLANG'] = get_network_option( $new_site->network_id, 'WPLANG' );
 		}
 
-		// Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using allowed keys.
-		// The `$allowed_data_fields` matches the one used in `wpmu_create_blog()`.
+		/*
+		 * Rebuild the data expected by the `wpmu_new_blog` hook prior to 5.1.0 using allowed keys.
+		 * The `$allowed_data_fields` matches the one used in `wpmu_create_blog()`.
+		 */
 		$allowed_data_fields = array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
 		$meta                = array_merge( array_intersect_key( $data, array_flip( $allowed_data_fields ) ), $meta );
 
@@ -340,6 +342,7 @@ function get_site( $site = null ) {
  * @since 4.6.0
  * @since 5.1.0 Introduced the `$update_meta_cache` parameter.
  * @since 6.1.0 This function is no longer marked as "private".
+ * @since 6.3.0 Use wp_lazyload_site_meta() for lazy-loading of site meta.
  *
  * @see update_site_cache()
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -354,8 +357,27 @@ function _prime_site_caches( $ids, $update_meta_cache = true ) {
 	if ( ! empty( $non_cached_ids ) ) {
 		$fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
 
-		update_site_cache( $fresh_sites, $update_meta_cache );
+		update_site_cache( $fresh_sites, false );
+	}
+
+	if ( $update_meta_cache ) {
+		wp_lazyload_site_meta( $ids );
+	}
+}
+
+/**
+ * Queue site meta for lazy-loading.
+ *
+ * @since 6.3.0
+ *
+ * @param array $site_ids List of site IDs.
+ */
+function wp_lazyload_site_meta( array $site_ids ) {
+	if ( empty( $site_ids ) ) {
+		return;
 	}
+	$lazyloader = wp_metadata_lazyloader();
+	$lazyloader->queue_objects( 'blog', $site_ids );
 }
 
 /**
@@ -822,7 +844,7 @@ function wp_uninitialize_site( $site_id ) {
 	 *
 	 * @since MU (3.0.0)
 	 *
-	 * @param string $basedir Uploads path without subdirectory. @see wp_upload_dir()
+	 * @param string $basedir Uploads path without subdirectory. See {@see wp_upload_dir()}.
 	 * @param int    $site_id The site ID.
 	 */
 	$dir     = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $site->id );
@@ -860,7 +882,7 @@ function wp_uninitialize_site( $site_id ) {
 
 	$stack = array_reverse( $stack ); // Last added directories are deepest.
 	foreach ( (array) $stack as $dir ) {
-		if ( $dir != $top_dir ) {
+		if ( $dir !== $top_dir ) {
 			@rmdir( $dir );
 		}
 	}
@@ -988,7 +1010,7 @@ function clean_blog_cache( $blog ) {
 	 */
 	do_action( 'clean_site_cache', $blog_id, $blog, $domain_path_key );
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set_sites_last_changed();
 
 	/**
 	 * Fires after the blog details cache is cleared.
@@ -1108,7 +1130,7 @@ function wp_maybe_update_network_site_counts_on_update( $new_site, $old_site = n
 		return;
 	}
 
-	if ( $new_site->network_id != $old_site->network_id ) {
+	if ( $new_site->network_id !== $old_site->network_id ) {
 		wp_maybe_update_network_site_counts( $new_site->network_id );
 		wp_maybe_update_network_site_counts( $old_site->network_id );
 	}
@@ -1131,8 +1153,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
 		$old_site = new WP_Site( new stdClass() );
 	}
 
-	if ( $new_site->spam != $old_site->spam ) {
-		if ( 1 == $new_site->spam ) {
+	if ( $new_site->spam !== $old_site->spam ) {
+		if ( '1' === $new_site->spam ) {
 
 			/**
 			 * Fires when the 'spam' status is added to a site.
@@ -1155,8 +1177,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
 		}
 	}
 
-	if ( $new_site->mature != $old_site->mature ) {
-		if ( 1 == $new_site->mature ) {
+	if ( $new_site->mature !== $old_site->mature ) {
+		if ( '1' === $new_site->mature ) {
 
 			/**
 			 * Fires when the 'mature' status is added to a site.
@@ -1179,8 +1201,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
 		}
 	}
 
-	if ( $new_site->archived != $old_site->archived ) {
-		if ( 1 == $new_site->archived ) {
+	if ( $new_site->archived !== $old_site->archived ) {
+		if ( '1' === $new_site->archived ) {
 
 			/**
 			 * Fires when the 'archived' status is added to a site.
@@ -1203,8 +1225,8 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
 		}
 	}
 
-	if ( $new_site->deleted != $old_site->deleted ) {
-		if ( 1 == $new_site->deleted ) {
+	if ( $new_site->deleted !== $old_site->deleted ) {
+		if ( '1' === $new_site->deleted ) {
 
 			/**
 			 * Fires when the 'deleted' status is added to a site.
@@ -1227,15 +1249,16 @@ function wp_maybe_transition_site_statuses_on_update( $new_site, $old_site = nul
 		}
 	}
 
-	if ( $new_site->public != $old_site->public ) {
+	if ( $new_site->public !== $old_site->public ) {
 
 		/**
 		 * Fires after the current blog's 'public' setting is updated.
 		 *
 		 * @since MU (3.0.0)
 		 *
-		 * @param int    $site_id Site ID.
-		 * @param string $value   The value of the site status.
+		 * @param int    $site_id   Site ID.
+		 * @param string $is_public Whether the site is public. A numeric string,
+		 *                          for compatibility reasons. Accepts '1' or '0'.
 		 */
 		do_action( 'update_blog_public', $site_id, $new_site->public );
 	}
@@ -1260,17 +1283,18 @@ function wp_maybe_clean_new_site_cache_on_update( $new_site, $old_site ) {
  *
  * @since 5.1.0
  *
- * @param int    $site_id Site ID.
- * @param string $public  The value of the site status.
+ * @param int    $site_id   Site ID.
+ * @param string $is_public Whether the site is public. A numeric string,
+ *                          for compatibility reasons. Accepts '1' or '0'.
  */
-function wp_update_blog_public_option_on_site_update( $site_id, $public ) {
+function wp_update_blog_public_option_on_site_update( $site_id, $is_public ) {
 
 	// Bail if the site's database tables do not exist (yet).
 	if ( ! wp_is_site_initialized( $site_id ) ) {
 		return;
 	}
 
-	update_blog_option( $site_id, 'blog_public', $public );
+	update_blog_option( $site_id, 'blog_public', $is_public );
 }
 
 /**
@@ -1279,7 +1303,7 @@ function wp_update_blog_public_option_on_site_update( $site_id, $public ) {
  * @since 5.1.0
  */
 function wp_cache_set_sites_last_changed() {
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set_last_changed( 'sites' );
 }
 
 /**
diff --git a/src/wp-includes/nav-menu-template.php b/src/wp-includes/nav-menu-template.php
index df478a5fa4f61..46a4d95c385cf 100644
--- a/src/wp-includes/nav-menu-template.php
+++ b/src/wp-includes/nav-menu-template.php
@@ -196,38 +196,32 @@ function wp_nav_menu( $args = array() ) {
 	_wp_menu_item_classes_by_context( $menu_items );
 
 	$sorted_menu_items        = array();
-	$menu_items_tree          = array();
 	$menu_items_with_children = array();
 	foreach ( (array) $menu_items as $menu_item ) {
-		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
-		$menu_items_tree[ $menu_item->ID ]           = $menu_item->menu_item_parent;
-		if ( $menu_item->menu_item_parent ) {
-			$menu_items_with_children[ $menu_item->menu_item_parent ] = 1;
+		/*
+		 * Fix invalid `menu_item_parent`. See: https://core.trac.wordpress.org/ticket/56926.
+		 * Compare as strings. Plugins may change the ID to a string.
+		 */
+		if ( (string) $menu_item->ID === (string) $menu_item->menu_item_parent ) {
+			$menu_item->menu_item_parent = 0;
 		}
 
-		// Calculate the depth of each menu item with children
-		foreach ( $menu_items_with_children as $menu_item_key => &$menu_item_depth ) {
-			$menu_item_parent = $menu_items_tree[ $menu_item_key ];
-			while ( $menu_item_parent ) {
-				$menu_item_depth  = $menu_item_depth + 1;
-				$menu_item_parent = $menu_items_tree[ $menu_item_parent ];
-			}
+		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
+		if ( $menu_item->menu_item_parent ) {
+			$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
 		}
 	}
 
 	// Add the menu-item-has-children class where applicable.
 	if ( $menu_items_with_children ) {
 		foreach ( $sorted_menu_items as &$menu_item ) {
-			if (
-				isset( $menu_items_with_children[ $menu_item->ID ] ) &&
-				( $args->depth <= 0 || $menu_items_with_children[ $menu_item->ID ] < $args->depth )
-			) {
+			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) ) {
 				$menu_item->classes[] = 'menu-item-has-children';
 			}
 		}
 	}
 
-	unset( $menu_items_tree, $menu_items_with_children, $menu_items, $menu_item );
+	unset( $menu_items, $menu_item );
 
 	/**
 	 * Filters the sorted list of menu item objects before generating the menu's HTML.
@@ -617,7 +611,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
  * @return string The HTML list content for the menu items.
  */
 function walk_nav_menu_tree( $items, $depth, $args ) {
-	$walker = ( empty( $args->walker ) ) ? new Walker_Nav_Menu : $args->walker;
+	$walker = ( empty( $args->walker ) ) ? new Walker_Nav_Menu() : $args->walker;
 
 	return $walker->walk( $items, $depth, $args );
 }
@@ -643,3 +637,60 @@ function _nav_menu_item_id_use_once( $id, $item ) {
 
 	return $id;
 }
+
+/**
+ * Remove the `menu-item-has-children` class from bottom level menu items.
+ *
+ * This runs on the {@see 'nav_menu_css_class'} filter. The $args and $depth
+ * parameters were added after the filter was originally introduced in
+ * WordPress 3.0.0 so this needs to allow for cases in which the filter is
+ * called without them.
+ *
+ * @see https://core.trac.wordpress.org/ticket/56926.
+ *
+ * @since 6.2.0
+ *
+ * @param string[]       $classes   Array of the CSS classes that are applied to the menu item's `<li>` element.
+ * @param WP_Post        $menu_item The current menu item object.
+ * @param stdClass|false $args      An object of wp_nav_menu() arguments. Default false ($args unspecified when filter is called).
+ * @param int|false      $depth     Depth of menu item. Default false ($depth unspecified when filter is called).
+ * @return string[] Modified nav menu classes.
+ */
+function wp_nav_menu_remove_menu_item_has_children_class( $classes, $menu_item, $args = false, $depth = false ) {
+	/*
+	 * Account for the filter being called without the $args or $depth parameters.
+	 *
+	 * This occurs when a theme uses a custom walker calling the `nav_menu_css_class`
+	 * filter using the legacy formats prior to the introduction of the $args and
+	 * $depth parameters.
+	 *
+	 * As both of these parameters are required for this function to determine
+	 * both the current and maximum depth of the menu tree, the function does not
+	 * attempt to remove the `menu-item-has-children` class if these parameters
+	 * are not set.
+	 */
+	if ( false === $depth || false === $args ) {
+		return $classes;
+	}
+
+	// Max-depth is 1-based.
+	$max_depth = isset( $args->depth ) ? (int) $args->depth : 0;
+	// Depth is 0-based so needs to be increased by one.
+	$depth = $depth + 1;
+
+	// Complete menu tree is displayed.
+	if ( 0 === $max_depth ) {
+		return $classes;
+	}
+
+	/*
+	 * Remove the `menu-item-has-children` class from bottom level menu items.
+	 * -1 is used to display all menu items in one level so the class should
+	 * be removed from all menu items.
+	 */
+	if ( -1 === $max_depth || $depth >= $max_depth ) {
+		$classes = array_diff( $classes, array( 'menu-item-has-children' ) );
+	}
+
+	return $classes;
+}
diff --git a/src/wp-includes/nav-menu.php b/src/wp-includes/nav-menu.php
index 8df3cd2cc8486..b43e45601cb81 100644
--- a/src/wp-includes/nav-menu.php
+++ b/src/wp-includes/nav-menu.php
@@ -143,7 +143,7 @@ function register_nav_menu( $location, $description ) {
  *
  * @global array $_wp_registered_nav_menus
  *
- * @return string[] Associative array of egistered navigation menu descriptions keyed
+ * @return string[] Associative array of registered navigation menu descriptions keyed
  *                  by their location. If none are registered, an empty array.
  */
 function get_registered_nav_menus() {
@@ -547,8 +547,10 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 		do_action( 'wp_add_nav_menu_item', $menu_id, $menu_item_db_id, $args );
 	}
 
-	// Associate the menu item with the menu term.
-	// Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms().
+	/*
+	 * Associate the menu item with the menu term.
+	 * Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms().
+	 */
 	if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
 		$update_terms = wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
 		if ( is_wp_error( $update_terms ) ) {
@@ -563,6 +565,11 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 
 	$menu_item_db_id = (int) $menu_item_db_id;
 
+	// Reset invalid `menu_item_parent`.
+	if ( (int) $args['menu-item-parent-id'] === $menu_item_db_id ) {
+		$args['menu-item-parent-id'] = 0;
+	}
+
 	update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key( $args['menu-item-type'] ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', (string) ( (int) $args['menu-item-parent-id'] ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_object_id', (string) ( (int) $args['menu-item-object-id'] ) );
@@ -669,18 +676,21 @@ function _is_valid_nav_menu_item( $item ) {
  * @param array              $args {
  *     Optional. Arguments to pass to get_posts().
  *
- *     @type string $order       How to order nav menu items as queried with get_posts(). Will be ignored
- *                               if 'output' is ARRAY_A. Default 'ASC'.
- *     @type string $orderby     Field to order menu items by as retrieved from get_posts(). Supply an orderby
- *                               field via 'output_key' to affect the output order of nav menu items.
- *                               Default 'menu_order'.
- *     @type string $post_type   Menu items post type. Default 'nav_menu_item'.
- *     @type string $post_status Menu items post status. Default 'publish'.
- *     @type string $output      How to order outputted menu items. Default ARRAY_A.
- *     @type string $output_key  Key to use for ordering the actual menu items that get returned. Note that
- *                               that is not a get_posts() argument and will only affect output of menu items
- *                               processed in this function. Default 'menu_order'.
- *     @type bool   $nopaging    Whether to retrieve all menu items (true) or paginate (false). Default true.
+ *     @type string $order                  How to order nav menu items as queried with get_posts().
+ *                                          Will be ignored if 'output' is ARRAY_A. Default 'ASC'.
+ *     @type string $orderby                Field to order menu items by as retrieved from get_posts().
+ *                                          Supply an orderby field via 'output_key' to affect the
+ *                                          output order of nav menu items. Default 'menu_order'.
+ *     @type string $post_type              Menu items post type. Default 'nav_menu_item'.
+ *     @type string $post_status            Menu items post status. Default 'publish'.
+ *     @type string $output                 How to order outputted menu items. Default ARRAY_A.
+ *     @type string $output_key             Key to use for ordering the actual menu items that get
+ *                                          returned. Note that that is not a get_posts() argument
+ *                                          and will only affect output of menu items processed in
+ *                                          this function. Default 'menu_order'.
+ *     @type bool   $nopaging               Whether to retrieve all menu items (true) or paginate
+ *                                          (false). Default true.
+ *     @type bool   $update_menu_item_cache Whether to update the menu item cache. Default true.
  * }
  * @return array|false Array of menu items, otherwise false.
  */
@@ -815,6 +825,24 @@ function update_menu_item_cache( $menu_items ) {
  * @return object The menu item with standard menu item properties.
  */
 function wp_setup_nav_menu_item( $menu_item ) {
+
+	/**
+	 * Filters whether to short-circuit the wp_setup_nav_menu_item() output.
+	 *
+	 * Returning a non-null value from the filter will short-circuit wp_setup_nav_menu_item(),
+	 * returning that value instead.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param object|null $modified_menu_item Modified menu item. Default null.
+	 * @param object      $menu_item          The menu item to modify.
+	 */
+	$pre_menu_item = apply_filters( 'pre_wp_setup_nav_menu_item', null, $menu_item );
+
+	if ( null !== $pre_menu_item ) {
+		return $pre_menu_item;
+	}
+
 	if ( isset( $menu_item->post_type ) ) {
 		if ( 'nav_menu_item' === $menu_item->post_type ) {
 			$menu_item->db_id            = (int) $menu_item->ID;
@@ -1010,7 +1038,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
 	$object_id     = (int) $object_id;
 	$menu_item_ids = array();
 
-	$query      = new WP_Query;
+	$query      = new WP_Query();
 	$menu_items = $query->query(
 		array(
 			'meta_key'       => '_menu_item_object_id',
@@ -1273,3 +1301,31 @@ function wp_map_nav_menu_locations( $new_nav_menu_locations, $old_nav_menu_locat
 
 	return $new_nav_menu_locations;
 }
+
+/**
+ * Prevents menu items from being their own parent.
+ *
+ * Resets menu_item_parent to 0 when the parent is set to the item itself.
+ * For use before saving `_menu_item_menu_item_parent` in nav-menus.php.
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @param array $menu_item_data The menu item data array.
+ * @return array The menu item data with reset menu_item_parent.
+ */
+function _wp_reset_invalid_menu_item_parent( $menu_item_data ) {
+	if ( ! is_array( $menu_item_data ) ) {
+		return $menu_item_data;
+	}
+
+	if (
+		! empty( $menu_item_data['ID'] ) &&
+		! empty( $menu_item_data['menu_item_parent'] ) &&
+		(int) $menu_item_data['ID'] === (int) $menu_item_data['menu_item_parent']
+	) {
+		$menu_item_data['menu_item_parent'] = 0;
+	}
+
+	return $menu_item_data;
+}
diff --git a/src/wp-includes/navigation-fallback.php b/src/wp-includes/navigation-fallback.php
new file mode 100644
index 0000000000000..cfd92f07e880b
--- /dev/null
+++ b/src/wp-includes/navigation-fallback.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Navigation Fallback
+ *
+ * Functions required for managing Navigation fallbacks behavior.
+ *
+ * @package WordPress
+ * @since 6.3.0
+ */
+
+/**
+ * Expose additional fields in the embeddable links of the
+ * Navigation Fallback REST endpoint.
+ *
+ * The endpoint may embed the full Navigation Menu object into the
+ * response as the `self` link. By default, the Posts Controller
+ * will only expose a limited subset of fields but the editor requires
+ * additional fields to be available in order to utilize the menu.
+ *
+ * @since 6.3.0
+ *
+ * @param array $schema the schema for the `wp_navigation` post.
+ * @return array the modified schema.
+ */
+function wp_add_fields_to_navigation_fallback_embedded_links( $schema ) {
+	// Expose top level fields.
+	$schema['properties']['status']['context']  = array_merge( $schema['properties']['status']['context'], array( 'embed' ) );
+	$schema['properties']['content']['context'] = array_merge( $schema['properties']['content']['context'], array( 'embed' ) );
+
+	/*
+	 * Exposes sub properties of content field.
+	 * These sub properties aren't exposed by the posts controller by default,
+	 * for requests where context is `embed`.
+	 *
+	 * @see WP_REST_Posts_Controller::get_item_schema()
+	 */
+	$schema['properties']['content']['properties']['raw']['context']           = array_merge( $schema['properties']['content']['properties']['raw']['context'], array( 'embed' ) );
+	$schema['properties']['content']['properties']['rendered']['context']      = array_merge( $schema['properties']['content']['properties']['rendered']['context'], array( 'embed' ) );
+	$schema['properties']['content']['properties']['block_version']['context'] = array_merge( $schema['properties']['content']['properties']['block_version']['context'], array( 'embed' ) );
+
+	/*
+	 * Exposes sub properties of title field.
+	 * These sub properties aren't exposed by the posts controller by default,
+	 * for requests where context is `embed`.
+	 *
+	 * @see WP_REST_Posts_Controller::get_item_schema()
+	 */
+	$schema['properties']['title']['properties']['raw']['context'] = array_merge( $schema['properties']['title']['properties']['raw']['context'], array( 'embed' ) );
+
+	return $schema;
+}
+
+add_filter(
+	'rest_wp_navigation_item_schema',
+	'wp_add_fields_to_navigation_fallback_embedded_links'
+);
diff --git a/src/wp-includes/option.php b/src/wp-includes/option.php
index 99525147339bb..93f70f7b504c2 100644
--- a/src/wp-includes/option.php
+++ b/src/wp-includes/option.php
@@ -29,7 +29,7 @@
  *
  * Exceptions:
  *
- * 1. When the option has not been saved in the database, the `$default` value
+ * 1. When the option has not been saved in the database, the `$default_value` value
  *    is returned if provided. If not, boolean `false` is returned.
  * 2. When one of the Options API filters is used: {@see 'pre_option_$option'},
  *    {@see 'default_option_$option'}, or {@see 'option_$option'}, the returned
@@ -67,15 +67,15 @@
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param string $option  Name of the option to retrieve. Expected to not be SQL-escaped.
- * @param mixed  $default Optional. Default value to return if the option does not exist.
+ * @param string $option        Name of the option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed  $default_value Optional. Default value to return if the option does not exist.
  * @return mixed Value of the option. A value of any type may be returned, including
  *               scalar (string, boolean, float, integer), null, array, object.
  *               Scalar and null values will be returned as strings as long as they originate
  *               from a database stored option value. If there is no option in the database,
  *               boolean `false` is returned.
  */
-function get_option( $option, $default = false ) {
+function get_option( $option, $default_value = false ) {
 	global $wpdb;
 
 	if ( is_scalar( $option ) ) {
@@ -106,7 +106,7 @@ function get_option( $option, $default = false ) {
 				$deprecated_keys[ $option ]
 			)
 		);
-		return get_option( $deprecated_keys[ $option ], $default );
+		return get_option( $deprecated_keys[ $option ], $default_value );
 	}
 
 	/**
@@ -119,17 +119,17 @@ function get_option( $option, $default = false ) {
 	 *
 	 * @since 1.5.0
 	 * @since 4.4.0 The `$option` parameter was added.
-	 * @since 4.9.0 The `$default` parameter was added.
-	 *
-	 * @param mixed  $pre_option The value to return instead of the option value. This differs
-	 *                           from `$default`, which is used as the fallback value in the event
-	 *                           the option doesn't exist elsewhere in get_option().
-	 *                           Default false (to skip past the short-circuit).
-	 * @param string $option     Option name.
-	 * @param mixed  $default    The fallback value to return if the option does not exist.
-	 *                           Default false.
+	 * @since 4.9.0 The `$default_value` parameter was added.
+	 *
+	 * @param mixed  $pre_option    The value to return instead of the option value. This differs from
+	 *                              `$default_value`, which is used as the fallback value in the event
+	 *                              the option doesn't exist elsewhere in get_option().
+	 *                              Default false (to skip past the short-circuit).
+	 * @param string $option        Option name.
+	 * @param mixed  $default_value The fallback value to return if the option does not exist.
+	 *                              Default false.
 	 */
-	$pre = apply_filters( "pre_option_{$option}", false, $option, $default );
+	$pre = apply_filters( "pre_option_{$option}", false, $option, $default_value );
 
 	/**
 	 * Filters the value of all existing options before it is retrieved.
@@ -139,15 +139,15 @@ function get_option( $option, $default = false ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param mixed  $pre_option  The value to return instead of the option value. This differs
-	 *                            from `$default`, which is used as the fallback value in the event
-	 *                            the option doesn't exist elsewhere in get_option().
-	 *                            Default false (to skip past the short-circuit).
-	 * @param string $option      Name of the option.
-	 * @param mixed  $default     The fallback value to return if the option does not exist.
-	 *                            Default false.
+	 * @param mixed  $pre_option    The value to return instead of the option value. This differs from
+	 *                              `$default_value`, which is used as the fallback value in the event
+	 *                              the option doesn't exist elsewhere in get_option().
+	 *                              Default false (to skip past the short-circuit).
+	 * @param string $option        Name of the option.
+	 * @param mixed  $default_value The fallback value to return if the option does not exist.
+	 *                              Default false.
 	 */
-	$pre = apply_filters( 'pre_option', $pre, $option, $default );
+	$pre = apply_filters( 'pre_option', $pre, $option, $default_value );
 
 	if ( false !== $pre ) {
 		return $pre;
@@ -180,12 +180,12 @@ function get_option( $option, $default = false ) {
 			 * @since 4.4.0 The `$option` parameter was added.
 			 * @since 4.7.0 The `$passed_default` parameter was added to distinguish between a `false` value and the default parameter value.
 			 *
-			 * @param mixed  $default The default value to return if the option does not exist
-			 *                        in the database.
-			 * @param string $option  Option name.
+			 * @param mixed  $default_value  The default value to return if the option does not exist
+			 *                               in the database.
+			 * @param string $option         Option name.
 			 * @param bool   $passed_default Was `get_option()` passed a default value?
 			 */
-			return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
+			return apply_filters( "default_option_{$option}", $default_value, $option, $passed_default );
 		}
 
 		$alloptions = wp_load_alloptions();
@@ -211,7 +211,7 @@ function get_option( $option, $default = false ) {
 					wp_cache_set( 'notoptions', $notoptions, 'options' );
 
 					/** This filter is documented in wp-includes/option.php */
-					return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
+					return apply_filters( "default_option_{$option}", $default_value, $option, $passed_default );
 				}
 			}
 		}
@@ -224,7 +224,7 @@ function get_option( $option, $default = false ) {
 			$value = $row->option_value;
 		} else {
 			/** This filter is documented in wp-includes/option.php */
-			return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
+			return apply_filters( "default_option_{$option}", $default_value, $option, $passed_default );
 		}
 	}
 
@@ -253,6 +253,117 @@ function get_option( $option, $default = false ) {
 	return apply_filters( "option_{$option}", maybe_unserialize( $value ), $option );
 }
 
+/**
+ * Primes specific options into the cache with a single database query.
+ *
+ * Only options that do not already exist in cache will be primed.
+ *
+ * @since 6.4.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $options An array of option names to be primed.
+ */
+function prime_options( $options ) {
+	$alloptions     = wp_load_alloptions();
+	$cached_options = wp_cache_get_multiple( $options, 'options' );
+
+	// Filter options that are not in the cache.
+	$options_to_prime = array();
+	foreach ( $options as $option ) {
+		if ( ( ! isset( $cached_options[ $option ] ) || ! $cached_options[ $option ] ) && ! isset( $alloptions[ $option ] ) ) {
+			$options_to_prime[] = $option;
+		}
+	}
+
+	// Bail early if there are no options to be primed.
+	if ( empty( $options_to_prime ) ) {
+		return;
+	}
+
+	global $wpdb;
+	$results = $wpdb->get_results(
+		$wpdb->prepare(
+			sprintf(
+				"SELECT option_name, option_value FROM $wpdb->options WHERE option_name IN (%s)",
+				implode( ',', array_fill( 0, count( $options_to_prime ), '%s' ) )
+			),
+			$options_to_prime
+		)
+	);
+
+	$options_found = array();
+	foreach ( $results as $result ) {
+		$options_found[ $result->option_name ] = maybe_unserialize( $result->option_value );
+	}
+	wp_cache_set_multiple( $options_found, 'options' );
+
+	// If all options were found, no need to update `notoptions` cache.
+	if ( count( $options_found ) === count( $options_to_prime ) ) {
+		return;
+	}
+
+	$options_not_found = array_diff( $options_to_prime, array_keys( $options_found ) );
+
+	$notoptions = wp_cache_get( 'notoptions', 'options' );
+
+	if ( ! is_array( $notoptions ) ) {
+		$notoptions = array();
+	}
+
+	// Add the options that were not found to the cache.
+	$update_notoptions = false;
+	foreach ( $options_not_found as $option_name ) {
+		if ( ! isset( $notoptions[ $option_name ] ) ) {
+			$notoptions[ $option_name ] = true;
+			$update_notoptions          = true;
+		}
+	}
+
+	// Only update the cache if it was modified.
+	if ( $update_notoptions ) {
+		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	}
+}
+
+/**
+ * Primes all options registered with a specific option group.
+ *
+ * @since 6.4.0
+ *
+ * @global array $new_allowed_options
+ *
+ * @param string $option_group The option group to prime options for.
+ */
+function prime_options_by_group( $option_group ) {
+	global $new_allowed_options;
+
+	if ( isset( $new_allowed_options[ $option_group ] ) ) {
+		prime_options( $new_allowed_options[ $option_group ] );
+	}
+}
+
+/**
+ * Retrieves multiple options.
+ *
+ * Options are primed as necessary first in order to use a single database query at most.
+ *
+ * @since 6.4.0
+ *
+ * @param array $options An array of option names to retrieve.
+ * @return array An array of key-value pairs for the requested options.
+ */
+function get_options( $options ) {
+	prime_options( $options );
+
+	$result = array();
+	foreach ( $options as $option ) {
+		$result[ $option ] = get_option( $option );
+	}
+
+	return $result;
+}
+
 /**
  * Protects WordPress special option from being modified.
  *
@@ -301,6 +412,22 @@ function form_option( $option ) {
 function wp_load_alloptions( $force_cache = false ) {
 	global $wpdb;
 
+	/**
+	 * Filters the array of alloptions before it is populated.
+	 *
+	 * Returning an array from the filter will effectively short circuit
+	 * wp_load_alloptions(), returning that value instead.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array|null $alloptions  An array of alloptions. Default null.
+	 * @param bool       $force_cache Whether to force an update of the local cache from the persistent cache. Default false.
+	 */
+	$alloptions = apply_filters( 'pre_wp_load_alloptions', null, $force_cache );
+	if ( is_array( $alloptions ) ) {
+		return $alloptions;
+	}
+
 	if ( ! wp_installing() || ! is_multisite() ) {
 		$alloptions = wp_cache_get( 'alloptions', 'options', $force_cache );
 	} else {
@@ -345,18 +472,19 @@ function wp_load_alloptions( $force_cache = false ) {
 }
 
 /**
- * Loads and caches certain often requested site options if is_multisite() and a persistent cache is not being used.
+ * Loads and primes caches of certain often requested network options if is_multisite().
  *
  * @since 3.0.0
+ * @since 6.3.0 Also prime caches for network options when persistent object cache is enabled.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $network_id Optional site ID for which to query the options. Defaults to the current site.
+ * @param int $network_id Optional. Network ID of network for which to prime network options cache. Defaults to current network.
  */
 function wp_load_core_site_options( $network_id = null ) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) {
+	if ( ! is_multisite() || wp_installing() ) {
 		return;
 	}
 
@@ -366,6 +494,16 @@ function wp_load_core_site_options( $network_id = null ) {
 
 	$core_options = array( 'site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 
+	if ( wp_using_ext_object_cache() ) {
+		$cache_keys = array();
+		foreach ( $core_options as $option ) {
+			$cache_keys[] = "{$network_id}:{$option}";
+		}
+		wp_cache_get_multiple( $cache_keys, 'site-options' );
+
+		return;
+	}
+
 	$core_options_in = "'" . implode( "', '", $core_options ) . "'";
 	$options         = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) );
 
@@ -401,8 +539,13 @@ function wp_load_core_site_options( $network_id = null ) {
  * @param mixed       $value    Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
  * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options,
  *                              `$autoload` can only be updated using `update_option()` if `$value` is also changed.
- *                              Accepts 'yes'|true to enable or 'no'|false to disable. For non-existent options,
- *                              the default value is 'yes'. Default null.
+ *                              Accepts 'yes'|true to enable or 'no'|false to disable.
+ *                              Autoloading too many options can lead to performance problems, especially if the
+ *                              options are not frequently used. For options which are accessed across several places
+ *                              in the frontend, it is recommended to autoload them, by using 'yes'|true.
+ *                              For options which are accessed only on few specific URLs, it is recommended
+ *                              to not autoload them, by using 'no'|false. For non-existent options, the default value
+ *                              is 'yes'. Default null.
  * @return bool True if the value was updated, false otherwise.
  */
 function update_option( $option, $value, $autoload = null ) {
@@ -588,7 +731,12 @@ function update_option( $option, $value, $autoload = null ) {
  *                                Expected to not be SQL-escaped.
  * @param string      $deprecated Optional. Description. Not used anymore.
  * @param string|bool $autoload   Optional. Whether to load the option when WordPress starts up.
- *                                Default is enabled. Accepts 'no' to disable for legacy reasons.
+ *                                Accepts 'yes'|true to enable or 'no'|false to disable.
+ *                                Autoloading too many options can lead to performance problems, especially if the
+ *                                options are not frequently used. For options which are accessed across several places
+ *                                in the frontend, it is recommended to autoload them, by using 'yes'|true.
+ *                                For options which are accessed only on few specific URLs, it is recommended
+ *                                to not autoload them, by using 'no'|false. Default 'yes'.
  * @return bool True if the option was added, false otherwise.
  */
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
@@ -637,8 +785,10 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 
 	$value = sanitize_option( $option, $value );
 
-	// Make sure the option doesn't already exist.
-	// We can check the 'notoptions' cache before we ask for a DB query.
+	/*
+	 * Make sure the option doesn't already exist.
+	 * We can check the 'notoptions' cache before we ask for a DB query.
+	 */
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
 
 	if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
@@ -711,7 +861,7 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 }
 
 /**
- * Removes option by name. Prevents removal of protected WordPress options.
+ * Removes an option by name. Prevents removal of protected WordPress options.
  *
  * @since 1.2.0
  *
@@ -971,8 +1121,10 @@ function set_transient( $transient, $value, $expiration = 0 ) {
 			}
 			$result = add_option( $transient_option, $value, '', $autoload );
 		} else {
-			// If expiration is requested, but the transient has no timeout option,
-			// delete, then re-create transient rather than update.
+			/*
+			 * If expiration is requested, but the transient has no timeout option,
+			 * delete, then re-create transient rather than update.
+			 */
 			$update = true;
 
 			if ( $expiration ) {
@@ -1033,6 +1185,8 @@ function set_transient( $transient, $value, $expiration = 0 ) {
  * The multi-table delete syntax is used to delete the transient record
  * from table a, and the corresponding transient_timeout record from table b.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @since 4.9.0
  *
  * @param bool $force_db Optional. Force cleanup to run against the database even when an external object cache is used.
@@ -1118,7 +1272,7 @@ function wp_user_settings() {
 		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE[ 'wp-settings-' . $user_id ] );
 
 		// No change or both empty.
-		if ( $cookie == $settings ) {
+		if ( $cookie === $settings ) {
 			return;
 		}
 
@@ -1145,14 +1299,14 @@ function wp_user_settings() {
  *
  * @since 2.7.0
  *
- * @param string       $name    The name of the setting.
- * @param string|false $default Optional. Default value to return when $name is not set. Default false.
+ * @param string       $name          The name of the setting.
+ * @param string|false $default_value Optional. Default value to return when $name is not set. Default false.
  * @return mixed The last saved user setting or the default value/false if it doesn't exist.
  */
-function get_user_setting( $name, $default = false ) {
+function get_user_setting( $name, $default_value = false ) {
 	$all_user_settings = get_all_user_settings();
 
-	return isset( $all_user_settings[ $name ] ) ? $all_user_settings[ $name ] : $default;
+	return isset( $all_user_settings[ $name ] ) ? $all_user_settings[ $name ] : $default_value;
 }
 
 /**
@@ -1324,13 +1478,13 @@ function delete_all_user_settings() {
  *
  * @see get_network_option()
  *
- * @param string $option     Name of the option to retrieve. Expected to not be SQL-escaped.
- * @param mixed  $default    Optional. Value to return if the option doesn't exist. Default false.
- * @param bool   $deprecated Whether to use cache. Multisite only. Always set to true.
+ * @param string $option        Name of the option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed  $default_value Optional. Value to return if the option doesn't exist. Default false.
+ * @param bool   $deprecated    Whether to use cache. Multisite only. Always set to true.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $deprecated = true ) {
-	return get_network_option( null, $option, $default );
+function get_site_option( $option, $default_value = false, $deprecated = true ) {
+	return get_network_option( null, $option, $default_value );
 }
 
 /**
@@ -1352,7 +1506,7 @@ function add_site_option( $option, $value ) {
 }
 
 /**
- * Removes a option by name for the current network.
+ * Removes an option by name for the current network.
  *
  * @since 2.8.0
  * @since 4.4.0 Modified into wrapper for delete_network_option()
@@ -1391,12 +1545,12 @@ function update_site_option( $option, $value ) {
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int    $network_id ID of the network. Can be null to default to the current network ID.
- * @param string $option     Name of the option to retrieve. Expected to not be SQL-escaped.
- * @param mixed  $default    Optional. Value to return if the option doesn't exist. Default false.
+ * @param int    $network_id    ID of the network. Can be null to default to the current network ID.
+ * @param string $option        Name of the option to retrieve. Expected to not be SQL-escaped.
+ * @param mixed  $default_value Optional. Value to return if the option doesn't exist. Default false.
  * @return mixed Value set for the option.
  */
-function get_network_option( $network_id, $option, $default = false ) {
+function get_network_option( $network_id, $option, $default_value = false ) {
 	global $wpdb;
 
 	if ( $network_id && ! is_numeric( $network_id ) ) {
@@ -1422,18 +1576,18 @@ function get_network_option( $network_id, $option, $default = false ) {
 	 * @since 3.0.0
 	 * @since 4.4.0 The `$option` parameter was added.
 	 * @since 4.7.0 The `$network_id` parameter was added.
-	 * @since 4.9.0 The `$default` parameter was added.
-	 *
-	 * @param mixed  $pre_option The value to return instead of the option value. This differs
-	 *                           from `$default`, which is used as the fallback value in the event
-	 *                           the option doesn't exist elsewhere in get_network_option().
-	 *                           Default false (to skip past the short-circuit).
-	 * @param string $option     Option name.
-	 * @param int    $network_id ID of the network.
-	 * @param mixed  $default    The fallback value to return if the option does not exist.
-	 *                           Default false.
+	 * @since 4.9.0 The `$default_value` parameter was added.
+	 *
+	 * @param mixed  $pre_option    The value to return instead of the option value. This differs from
+	 *                              `$default_value`, which is used as the fallback value in the event
+	 *                              the option doesn't exist elsewhere in get_network_option().
+	 *                              Default false (to skip past the short-circuit).
+	 * @param string $option        Option name.
+	 * @param int    $network_id    ID of the network.
+	 * @param mixed  $default_value The fallback value to return if the option does not exist.
+	 *                              Default false.
 	 */
-	$pre = apply_filters( "pre_site_option_{$option}", false, $option, $network_id, $default );
+	$pre = apply_filters( "pre_site_option_{$option}", false, $option, $network_id, $default_value );
 
 	if ( false !== $pre ) {
 		return $pre;
@@ -1454,18 +1608,18 @@ function get_network_option( $network_id, $option, $default = false ) {
 		 * @since 4.4.0 The `$option` parameter was added.
 		 * @since 4.7.0 The `$network_id` parameter was added.
 		 *
-		 * @param mixed  $default    The value to return if the site option does not exist
-		 *                           in the database.
-		 * @param string $option     Option name.
-		 * @param int    $network_id ID of the network.
+		 * @param mixed  $default_value The value to return if the site option does not exist
+		 *                              in the database.
+		 * @param string $option        Option name.
+		 * @param int    $network_id    ID of the network.
 		 */
-		return apply_filters( "default_site_option_{$option}", $default, $option, $network_id );
+		return apply_filters( "default_site_option_{$option}", $default_value, $option, $network_id );
 	}
 
 	if ( ! is_multisite() ) {
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
-		$value   = get_option( $option, $default );
+		$default_value = apply_filters( 'default_site_option_' . $option, $default_value, $option, $network_id );
+		$value         = get_option( $option, $default_value );
 	} else {
 		$cache_key = "$network_id:$option";
 		$value     = wp_cache_get( $cache_key, 'site-options' );
@@ -1487,7 +1641,7 @@ function get_network_option( $network_id, $option, $default = false ) {
 				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
 
 				/** This filter is documented in wp-includes/option.php */
-				$value = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
+				$value = apply_filters( 'default_site_option_' . $option, $default_value, $option, $network_id );
 			}
 		}
 	}
@@ -1569,8 +1723,10 @@ function add_network_option( $network_id, $option, $value ) {
 	} else {
 		$cache_key = "$network_id:$option";
 
-		// Make sure the option doesn't already exist.
-		// We can check the 'notoptions' cache before we ask for a DB query.
+		/*
+		 * Make sure the option doesn't already exist.
+		 * We can check the 'notoptions' cache before we ask for a DB query.
+		 */
 		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
 
 		if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
@@ -2554,19 +2710,19 @@ function get_registered_settings() {
  *
  * @since 4.7.0
  *
- * @param mixed  $default        Existing default value to return.
+ * @param mixed  $default_value  Existing default value to return.
  * @param string $option         Option name.
  * @param bool   $passed_default Was `get_option()` passed a default value?
  * @return mixed Filtered default value.
  */
-function filter_default_option( $default, $option, $passed_default ) {
+function filter_default_option( $default_value, $option, $passed_default ) {
 	if ( $passed_default ) {
-		return $default;
+		return $default_value;
 	}
 
 	$registered = get_registered_settings();
 	if ( empty( $registered[ $option ] ) ) {
-		return $default;
+		return $default_value;
 	}
 
 	return $registered[ $option ]['default'];
diff --git a/src/wp-includes/php-compat/readonly.php b/src/wp-includes/php-compat/readonly.php
index cc9230e8a2038..1c7fd9deff4e0 100644
--- a/src/wp-includes/php-compat/readonly.php
+++ b/src/wp-includes/php-compat/readonly.php
@@ -24,14 +24,14 @@
  *
  * @see wp_readonly()
  *
- * @param mixed $readonly One of the values to compare.
- * @param mixed $current  Optional. The other value to compare if not just true.
- *                        Default true.
- * @param bool  $echo     Optional. Whether to echo or just return the string.
- *                        Default true.
+ * @param mixed $readonly_value One of the values to compare.
+ * @param mixed $current        Optional. The other value to compare if not just true.
+ *                              Default true.
+ * @param bool  $display        Optional. Whether to echo or just return the string.
+ *                              Default true.
  * @return string HTML attribute or empty string.
  */
-function readonly( $readonly, $current = true, $echo = true ) {
+function readonly( $readonly_value, $current = true, $display = true ) {
 	_deprecated_function( __FUNCTION__, '5.9.0', 'wp_readonly()' );
-	return wp_readonly( $readonly, $current, $echo );
+	return wp_readonly( $readonly_value, $current, $display );
 }
diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
index 2852e23a9310c..ea422fce2f9e0 100644
--- a/src/wp-includes/pluggable.php
+++ b/src/wp-includes/pluggable.php
@@ -105,7 +105,7 @@ function get_user_by( $field, $value ) {
 			return false;
 		}
 
-		$user = new WP_User;
+		$user = new WP_User();
 		$user->init( $userdata );
 
 		return $user;
@@ -267,8 +267,10 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 			$headers = array();
 		} else {
 			if ( ! is_array( $headers ) ) {
-				// Explode the headers out, so this function can take
-				// both string headers and an array of headers.
+				/*
+				 * Explode the headers out, so this function can take
+				 * both string headers and an array of headers.
+				 */
 				$tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
 			} else {
 				$tempheaders = $headers;
@@ -279,7 +281,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 			if ( ! empty( $tempheaders ) ) {
 				// Iterate through the raw headers.
 				foreach ( (array) $tempheaders as $header ) {
-					if ( strpos( $header, ':' ) === false ) {
+					if ( ! str_contains( $header, ':' ) ) {
 						if ( false !== stripos( $header, 'boundary=' ) ) {
 							$parts    = preg_split( '/boundary=/i', trim( $header ) );
 							$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
@@ -315,7 +317,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 							}
 							break;
 						case 'content-type':
-							if ( strpos( $content, ';' ) !== false ) {
+							if ( str_contains( $content, ';' ) ) {
 								list( $type, $charset_content ) = explode( ';', $content );
 								$content_type                   = trim( $type );
 								if ( false !== stripos( $charset_content, 'charset=' ) ) {
@@ -376,7 +378,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 			$from_email = 'wordpress@';
 
 			if ( null !== $sitename ) {
-				if ( 'www.' === substr( $sitename, 0, 4 ) ) {
+				if ( str_starts_with( $sitename, 'www.' ) ) {
 					$sitename = substr( $sitename, 4 );
 				}
 
@@ -432,7 +434,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 					$recipient_name = '';
 
 					if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {
-						if ( count( $matches ) == 3 ) {
+						if ( count( $matches ) === 3 ) {
 							$recipient_name = $matches[1];
 							$address        = $matches[2];
 						}
@@ -463,7 +465,7 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 
 		// Set Content-Type and charset.
 
-		// If we don't have a content-type from the input headers.
+		// If we don't have a Content-Type from the input headers.
 		if ( ! isset( $content_type ) ) {
 			$content_type = 'text/plain';
 		}
@@ -517,9 +519,11 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
 		}
 
 		if ( ! empty( $attachments ) ) {
-			foreach ( $attachments as $attachment ) {
+			foreach ( $attachments as $filename => $attachment ) {
+				$filename = is_string( $filename ) ? $filename : '';
+
 				try {
-					$phpmailer->addAttachment( $attachment );
+					$phpmailer->addAttachment( $attachment, $filename );
 				} catch ( PHPMailer\PHPMailer\Exception $e ) {
 					continue;
 				}
@@ -614,8 +618,10 @@ function wp_authenticate( $username, $password ) {
 		$user = apply_filters( 'authenticate', null, $username, $password );
 
 		if ( null == $user ) {
-			// TODO: What should the error message be? (Or would these even happen?)
-			// Only needed if all authentication handlers fail to return anything.
+			/*
+			 * TODO: What should the error message be? (Or would these even happen?)
+			 * Only needed if all authentication handlers fail to return anything.
+			 */
 			$user = new WP_Error( 'authentication_failed', __( '<strong>Error:</strong> Invalid username, email address or incorrect password.' ) );
 		}
 
@@ -1068,10 +1074,19 @@ function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token =
 		 * Allows preventing auth cookies from actually being sent to the client.
 		 *
 		 * @since 4.7.4
-		 *
-		 * @param bool $send Whether to send auth cookies to the client.
+		 * @since 6.2.0 The `$expire`, `$expiration`, `$user_id`, `$scheme`, and `$token` parameters were added.
+		 *
+		 * @param bool   $send       Whether to send auth cookies to the client. Default true.
+		 * @param int    $expire     The time the login grace period expires as a UNIX timestamp.
+		 *                           Default is 12 hours past the cookie's expiration time. Zero when clearing cookies.
+		 * @param int    $expiration The time when the logged-in authentication cookie expires as a UNIX timestamp.
+		 *                           Default is 14 days from now. Zero when clearing cookies.
+		 * @param int    $user_id    User ID. Zero when clearing cookies.
+		 * @param string $scheme     Authentication scheme. Values include 'auth' or 'secure_auth'.
+		 *                           Empty string when clearing cookies.
+		 * @param string $token      User's session token to use for this cookie. Empty string when clearing cookies.
 		 */
-		if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+		if ( ! apply_filters( 'send_auth_cookies', true, $expire, $expiration, $user_id, $scheme, $token ) ) {
 			return;
 		}
 
@@ -1099,7 +1114,7 @@ function wp_clear_auth_cookie() {
 		do_action( 'clear_auth_cookie' );
 
 		/** This filter is documented in wp-includes/pluggable.php */
-		if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+		if ( ! apply_filters( 'send_auth_cookies', true, 0, 0, 0, '', '' ) ) {
 			return;
 		}
 
@@ -1175,8 +1190,8 @@ function auth_redirect() {
 		$secure = apply_filters( 'secure_auth_redirect', $secure );
 
 		// If https is required and request is http, redirect.
-		if ( $secure && ! is_ssl() && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
-			if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
+		if ( $secure && ! is_ssl() && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
+			if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
 				wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
 				exit;
 			} else {
@@ -1206,8 +1221,8 @@ function auth_redirect() {
 			do_action( 'auth_redirect', $user_id );
 
 			// If the user wants ssl but the session is not ssl, redirect.
-			if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
-				if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
+			if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
+				if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
 					wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
 					exit;
 				} else {
@@ -1222,7 +1237,11 @@ function auth_redirect() {
 		// The cookie is no good, so force login.
 		nocache_headers();
 
-		$redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		if ( str_contains( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) {
+			$redirect = wp_get_referer();
+		} else {
+			$redirect = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+		}
 
 		$login_url = wp_login_url( $redirect, true );
 
@@ -1236,7 +1255,7 @@ function auth_redirect() {
 	 * Ensures intent by verifying that a user was referred from another admin page with the correct security nonce.
 	 *
 	 * This function ensures the user intends to perform a given action, which helps protect against clickjacking style
-	 * attacks. It verifies intent, not authorisation, therefore it does not verify the user's capabilities. This should
+	 * attacks. It verifies intent, not authorization, therefore it does not verify the user's capabilities. This should
 	 * be performed with `current_user_can()` or similar.
 	 *
 	 * If the nonce value is invalid, the function will exit with an "Are You Sure?" style message.
@@ -1270,7 +1289,7 @@ function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
 		 */
 		do_action( 'check_admin_referer', $action, $result );
 
-		if ( ! $result && ! ( -1 === $action && strpos( $referer, $adminurl ) === 0 ) ) {
+		if ( ! $result && ! ( -1 === $action && str_starts_with( $referer, $adminurl ) ) ) {
 			wp_nonce_ays( $action );
 			die();
 		}
@@ -1289,13 +1308,13 @@ function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
 	 * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false,
 	 *                                `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce'
 	 *                                (in that order). Default false.
-	 * @param bool         $die       Optional. Whether to die early when the nonce cannot be verified.
+	 * @param bool         $stop      Optional. Whether to stop early when the nonce cannot be verified.
 	 *                                Default true.
 	 * @return int|false 1 if the nonce is valid and generated between 0-12 hours ago,
 	 *                   2 if the nonce is valid and generated between 12-24 hours ago.
 	 *                   False if the nonce is invalid.
 	 */
-	function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
+	function check_ajax_referer( $action = -1, $query_arg = false, $stop = true ) {
 		if ( -1 == $action ) {
 			_doing_it_wrong( __FUNCTION__, __( 'You should specify an action to be verified by using the first parameter.' ), '4.7.0' );
 		}
@@ -1323,7 +1342,7 @@ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
 		 */
 		do_action( 'check_ajax_referer', $action, $result );
 
-		if ( $die && false === $result ) {
+		if ( $stop && false === $result ) {
 			if ( wp_doing_ajax() ) {
 				wp_die( -1, 403 );
 			} else {
@@ -1346,7 +1365,7 @@ function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
 	 *     exit;
 	 *
 	 * Exiting can also be selectively manipulated by using wp_redirect() as a conditional
-	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
+	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_status'} filters:
 	 *
 	 *     if ( wp_redirect( $url ) ) {
 	 *         exit;
@@ -1492,7 +1511,7 @@ function _wp_sanitize_utf8_in_redirect( $matches ) {
 	 *     exit;
 	 *
 	 * Exiting can also be selectively manipulated by using wp_safe_redirect() as a conditional
-	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
+	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_status'} filters:
 	 *
 	 *     if ( wp_safe_redirect( $url ) ) {
 	 *         exit;
@@ -1519,7 +1538,9 @@ function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress
 		 * @param string $fallback_url The fallback URL to use by default.
 		 * @param int    $status       The HTTP response status code to use.
 		 */
-		$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
+		$fallback_url = apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status );
+
+		$location = wp_validate_redirect( $location, $fallback_url );
 
 		return wp_redirect( $location, $status, $x_redirect_by );
 	}
@@ -1533,23 +1554,25 @@ function wp_safe_redirect( $location, $status = 302, $x_redirect_by = 'WordPress
 	 * path. A plugin can therefore set or remove allowed host(s) to or from the
 	 * list.
 	 *
-	 * If the host is not allowed, then the redirect is to $default supplied.
+	 * If the host is not allowed, then the redirect is to $fallback_url supplied.
 	 *
 	 * @since 2.8.1
 	 *
-	 * @param string $location The redirect to validate.
-	 * @param string $default  The value to return if $location is not allowed.
-	 * @return string redirect-sanitized URL.
+	 * @param string $location     The redirect to validate.
+	 * @param string $fallback_url The value to return if $location is not allowed.
+	 * @return string Redirect-sanitized URL.
 	 */
-	function wp_validate_redirect( $location, $default = '' ) {
+	function wp_validate_redirect( $location, $fallback_url = '' ) {
 		$location = wp_sanitize_redirect( trim( $location, " \t\n\r\0\x08\x0B" ) );
 		// Browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'.
-		if ( '//' === substr( $location, 0, 2 ) ) {
+		if ( str_starts_with( $location, '//' ) ) {
 			$location = 'http:' . $location;
 		}
 
-		// In PHP 5 parse_url() may fail if the URL query part contains 'http://'.
-		// See https://bugs.php.net/bug.php?id=38143
+		/*
+		 * In PHP 5 parse_url() may fail if the URL query part contains 'http://'.
+		 * See https://bugs.php.net/bug.php?id=38143
+		 */
 		$cut  = strpos( $location, '?' );
 		$test = $cut ? substr( $location, 0, $cut ) : $location;
 
@@ -1557,12 +1580,12 @@ function wp_validate_redirect( $location, $default = '' ) {
 
 		// Give up if malformed URL.
 		if ( false === $lp ) {
-			return $default;
+			return $fallback_url;
 		}
 
 		// Allow only 'http' and 'https' schemes. No 'data:', etc.
 		if ( isset( $lp['scheme'] ) && ! ( 'http' === $lp['scheme'] || 'https' === $lp['scheme'] ) ) {
-			return $default;
+			return $fallback_url;
 		}
 
 		if ( ! isset( $lp['host'] ) && ! empty( $lp['path'] ) && '/' !== $lp['path'][0] ) {
@@ -1574,16 +1597,18 @@ function wp_validate_redirect( $location, $default = '' ) {
 			$location = '/' . ltrim( $path . '/', '/' ) . $location;
 		}
 
-		// Reject if certain components are set but host is not.
-		// This catches URLs like https:host.com for which parse_url() does not set the host field.
+		/*
+		 * Reject if certain components are set but host is not.
+		 * This catches URLs like https:host.com for which parse_url() does not set the host field.
+		 */
 		if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
-			return $default;
+			return $fallback_url;
 		}
 
 		// Reject malformed components parse_url() can return on odd inputs.
 		foreach ( array( 'user', 'pass', 'host' ) as $component ) {
 			if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
-				return $default;
+				return $fallback_url;
 			}
 		}
 
@@ -1600,7 +1625,7 @@ function wp_validate_redirect( $location, $default = '' ) {
 		$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
 
 		if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts, true ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
-			$location = $default;
+			$location = $fallback_url;
 		}
 
 		return $location;
@@ -1701,8 +1726,10 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
 			$comment_author_domain = gethostbyaddr( $comment->comment_author_IP );
 		}
 
-		// The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
-		// We want to reverse this for the plain text arena of emails.
+		/*
+		 * The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
+		 * We want to reverse this for the plain text arena of emails.
+		 */
 		$blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 		$comment_content = wp_specialchars_decode( $comment->comment_content );
 
@@ -1862,7 +1889,7 @@ function wp_notify_moderator( $comment_id ) {
 		 * @since 4.4.0
 		 *
 		 * @param bool $maybe_notify Whether to notify blog moderator.
-		 * @param int  $comment_ID   The id of the comment for the notification.
+		 * @param int  $comment_id   The ID of the comment for the notification.
 		 */
 		$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
 
@@ -1890,8 +1917,10 @@ function wp_notify_moderator( $comment_id ) {
 
 		$comments_waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" );
 
-		// The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
-		// We want to reverse this for the plain text arena of emails.
+		/*
+		 * The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
+		 * We want to reverse this for the plain text arena of emails.
+		 */
 		$blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 		$comment_content = wp_specialchars_decode( $comment->comment_content );
 
@@ -2029,13 +2058,17 @@ function wp_notify_moderator( $comment_id ) {
 	 * @param WP_User $user User object.
 	 */
 	function wp_password_change_notification( $user ) {
-		// Send a copy of password change notification to the admin,
-		// but check to see if it's the admin whose password we're changing, and skip this.
+		/*
+		 * Send a copy of password change notification to the admin,
+		 * but check to see if it's the admin whose password we're changing, and skip this.
+		 */
 		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
 			/* translators: %s: User name. */
 			$message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";
-			// The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
-			// We want to reverse this for the plain text arena of emails.
+			/*
+			 * The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
+			 * We want to reverse this for the plain text arena of emails.
+			 */
 			$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
 			$wp_password_change_notification_email = array(
@@ -2102,8 +2135,10 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
 
 		$user = get_userdata( $user_id );
 
-		// The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
-		// We want to reverse this for the plain text arena of emails.
+		/*
+		 * The blogname option is escaped with esc_html() on the way into the database in sanitize_option().
+		 * We want to reverse this for the plain text arena of emails.
+		 */
 		$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
 		/**
@@ -2184,7 +2219,7 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
 			return;
 		}
 
-		$switched_locale = switch_to_locale( get_user_locale( $user ) );
+		$switched_locale = switch_to_user_locale( $user_id );
 
 		/* translators: %s: User login. */
 		$message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
@@ -2346,7 +2381,7 @@ function wp_create_nonce( $action = -1 ) {
 			$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
 		}
 
-		$token = wp_get_session_token( $action );
+		$token = wp_get_session_token();
 		$i     = wp_nonce_tick( $action );
 
 		return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
@@ -2404,14 +2439,16 @@ function wp_salt( $scheme = 'auth' ) {
 		static $duplicated_keys;
 		if ( null === $duplicated_keys ) {
 			$duplicated_keys = array(
-				'put your unique phrase here'       => true,
-				/*
-				 * translators: This string should only be translated if wp-config-sample.php is localized.
-				 * You can check the localized release package or
-				 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
-				 */
-				__( 'put your unique phrase here' ) => true,
+				'put your unique phrase here' => true,
 			);
+
+			/*
+			 * translators: This string should only be translated if wp-config-sample.php is localized.
+			 * You can check the localized release package or
+			 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
+			 */
+			$duplicated_keys[ __( 'put your unique phrase here' ) ] = true;
+
 			foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
 				foreach ( array( 'KEY', 'SALT' ) as $second ) {
 					if ( ! defined( "{$first}_{$second}" ) ) {
@@ -2557,8 +2594,10 @@ function wp_check_password( $password, $hash, $user_id = '' ) {
 			return apply_filters( 'check_password', $check, $password, $hash, $user_id );
 		}
 
-		// If the stored hash is longer than an MD5,
-		// presume the new style phpass portable hash.
+		/*
+		 * If the stored hash is longer than an MD5,
+		 * presume the new style phpass portable hash.
+		 */
 		if ( empty( $wp_hasher ) ) {
 			require_once ABSPATH . WPINC . '/class-phpass.php';
 			// By default, use the portable hash from phpass.
@@ -2576,7 +2615,7 @@ function wp_check_password( $password, $hash, $user_id = '' ) {
 	/**
 	 * Generates a random password drawn from the defined set of characters.
 	 *
-	 * Uses wp_rand() is used to create passwords with far less predictability
+	 * Uses wp_rand() to create passwords with far less predictability
 	 * than similar native PHP functions like `rand()` or `mt_rand()`.
 	 *
 	 * @since 2.5.0
@@ -2636,8 +2675,10 @@ function wp_generate_password( $length = 12, $special_chars = true, $extra_speci
 	function wp_rand( $min = null, $max = null ) {
 		global $rnd_value;
 
-		// Some misconfigured 32-bit environments (Entropy PHP, for example)
-		// truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
+		/*
+		 * Some misconfigured 32-bit environments (Entropy PHP, for example)
+		 * truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
+		 */
 		$max_random_number = 3000000000 === 2147483647 ? (float) '4294967295' : 4294967295; // 4294967295 = 0xffffffff
 
 		if ( null === $min ) {
@@ -2672,8 +2713,10 @@ function wp_rand( $min = null, $max = null ) {
 			}
 		}
 
-		// Reset $rnd_value after 14 uses.
-		// 32 (md5) + 40 (sha1) + 40 (sha1) / 8 = 14 random numbers from $rnd_value.
+		/*
+		 * Reset $rnd_value after 14 uses.
+		 * 32 (md5) + 40 (sha1) + 40 (sha1) / 8 = 14 random numbers from $rnd_value.
+		 */
 		if ( strlen( $rnd_value ) < 8 ) {
 			if ( defined( 'WP_SETUP_CONFIG' ) ) {
 				static $seed = '';
@@ -2736,6 +2779,16 @@ function wp_set_password( $password, $user_id ) {
 		);
 
 		clean_user_cache( $user_id );
+
+		/**
+		 * Fires after the user password is set.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param string $password The plaintext password just set.
+		 * @param int    $user_id  The ID of the user whose password was just set.
+		 */
+		do_action( 'wp_set_password', $password, $user_id );
 	}
 endif;
 
@@ -2746,16 +2799,16 @@ function wp_set_password( $password, $user_id ) {
 	 * @since 2.5.0
 	 * @since 4.2.0 Optional `$args` parameter added.
 	 *
-	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
-	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
-	 * @param int    $size        Optional. Height and width of the avatar image file in pixels. Default 96.
-	 * @param string $default     Optional. URL for the default image or a default type. Accepts '404'
-	 *                            (return a 404 instead of a default image), 'retro' (8bit), 'monsterid'
-	 *                            (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
-	 *                            'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF),
-	 *                            or 'gravatar_default' (the Gravatar logo). Default is the value of the
-	 *                            'avatar_default' option, with a fallback of 'mystery'.
-	 * @param string $alt         Optional. Alternative text to use in img tag. Default empty.
+	 * @param mixed  $id_or_email   The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+	 *                              user email, WP_User object, WP_Post object, or WP_Comment object.
+	 * @param int    $size          Optional. Height and width of the avatar image file in pixels. Default 96.
+	 * @param string $default_value URL for the default image or a default type. Accepts '404' (return
+	 *                              a 404 instead of a default image), 'retro' (8bit), 'RoboHash' (robohash),
+	 *                              'monsterid' (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
+	 *                              'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF),
+	 *                              or 'gravatar_default' (the Gravatar logo). Default is the value of the
+	 *                              'avatar_default' option, with a fallback of 'mystery'.
+	 * @param string $alt           Optional. Alternative text to use in img tag. Default empty.
 	 * @param array  $args {
 	 *     Optional. Extra arguments to retrieve the avatar.
 	 *
@@ -2776,7 +2829,7 @@ function wp_set_password( $password, $user_id ) {
 	 * }
 	 * @return string|false `<img>` tag for the user's avatar. False on failure.
 	 */
-	function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) {
+	function get_avatar( $id_or_email, $size = 96, $default_value = '', $alt = '', $args = null ) {
 		$defaults = array(
 			// get_avatar_data() args.
 			'size'          => 96,
@@ -2790,20 +2843,17 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
 			'class'         => null,
 			'force_display' => false,
 			'loading'       => null,
+			'fetchpriority' => null,
 			'extra_attr'    => '',
 			'decoding'      => 'async',
 		);
 
-		if ( wp_lazy_loading_enabled( 'img', 'get_avatar' ) ) {
-			$defaults['loading'] = wp_get_loading_attr_default( 'get_avatar' );
-		}
-
 		if ( empty( $args ) ) {
 			$args = array();
 		}
 
 		$args['size']    = (int) $size;
-		$args['default'] = $default;
+		$args['default'] = $default_value;
 		$args['alt']     = $alt;
 
 		$args = wp_parse_args( $args, $defaults );
@@ -2815,6 +2865,11 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
 			$args['width'] = $args['size'];
 		}
 
+		// Update args with loading optimized attributes.
+		$loading_optimization_attr = wp_get_loading_optimization_attributes( 'img', $args, 'get_avatar' );
+
+		$args = array_merge( $args, $loading_optimization_attr );
+
 		if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
 			$id_or_email = get_comment( $id_or_email );
 		}
@@ -2867,25 +2922,40 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
 			}
 		}
 
-		// Add `loading` attribute.
+		// Add `loading`, `fetchpriority` and `decoding` attributes.
 		$extra_attr = $args['extra_attr'];
-		$loading    = $args['loading'];
 
-		if ( in_array( $loading, array( 'lazy', 'eager' ), true ) && ! preg_match( '/\bloading\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['loading'], array( 'lazy', 'eager' ), true )
+			&& ! preg_match( '/\bloading\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
 
-			$extra_attr .= "loading='{$loading}'";
+			$extra_attr .= "loading='{$args['loading']}'";
 		}
 
-		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ) ) && ! preg_match( '/\bdecoding\s*=/', $extra_attr ) ) {
+		if ( in_array( $args['decoding'], array( 'async', 'sync', 'auto' ), true )
+			&& ! preg_match( '/\bdecoding\s*=/', $extra_attr )
+		) {
 			if ( ! empty( $extra_attr ) ) {
 				$extra_attr .= ' ';
 			}
+
 			$extra_attr .= "decoding='{$args['decoding']}'";
 		}
 
+		// Add support for `fetchpriority`.
+		if ( in_array( $args['fetchpriority'], array( 'high', 'low', 'auto' ), true )
+			&& ! preg_match( '/\bfetchpriority\s*=/', $extra_attr )
+		) {
+			if ( ! empty( $extra_attr ) ) {
+				$extra_attr .= ' ';
+			}
+
+			$extra_attr .= "fetchpriority='{$args['fetchpriority']}'";
+		}
+
 		$avatar = sprintf(
 			"<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>",
 			esc_attr( $args['alt'] ),
@@ -2903,14 +2973,14 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
 		 * @since 2.5.0
 		 * @since 4.2.0 The `$args` parameter was added.
 		 *
-		 * @param string $avatar      HTML for the user's avatar.
-		 * @param mixed  $id_or_email The avatar to retrieve. Accepts a user_id, Gravatar MD5 hash,
-		 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
-		 * @param int    $size        Square avatar width and height in pixels to retrieve.
-		 * @param string $default     URL for the default image or a default type. Accepts '404', 'retro', 'monsterid',
-		 *                            'wavatar', 'indenticon', 'mystery', 'mm', 'mysteryman', 'blank', or 'gravatar_default'.
-		 * @param string $alt         Alternative text to use in the avatar image tag.
-		 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
+		 * @param string $avatar        HTML for the user's avatar.
+		 * @param mixed  $id_or_email   The avatar to retrieve. Accepts a user_id, Gravatar MD5 hash,
+		 *                              user email, WP_User object, WP_Post object, or WP_Comment object.
+		 * @param int    $size          Square avatar width and height in pixels to retrieve.
+		 * @param string $default_value URL for the default image or a default type. Accepts '404', 'retro', 'monsterid',
+		 *                              'wavatar', 'indenticon', 'mystery', 'mm', 'mysteryman', 'blank', or 'gravatar_default'.
+		 * @param string $alt           Alternative text to use in the avatar image tag.
+		 * @param array  $args          Arguments passed to get_avatar_data(), after processing.
 		 */
 		return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
 	}
diff --git a/src/wp-includes/plugin.php b/src/wp-includes/plugin.php
index e445dd8ea57da..77c1eb4ef669b 100644
--- a/src/wp-includes/plugin.php
+++ b/src/wp-includes/plugin.php
@@ -167,7 +167,7 @@ function add_filter( $hook_name, $callback, $priority = 10, $accepted_args = 1 )
  *
  * @param string $hook_name The name of the filter hook.
  * @param mixed  $value     The value to filter.
- * @param mixed  ...$args   Additional parameters to pass to the callback functions.
+ * @param mixed  ...$args   Optional. Additional parameters to pass to the callback functions.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters( $hook_name, $value, ...$args ) {
@@ -575,7 +575,7 @@ function do_action_ref_array( $hook_name, $args ) {
  *
  * @since 2.5.0
  *
- * @see has_filter() has_action() is an alias of has_filter().
+ * @see has_filter() This function is an alias of has_filter().
  *
  * @param string                      $hook_name The name of the action hook.
  * @param callable|string|array|false $callback  Optional. The callback to check for.
@@ -707,6 +707,7 @@ function did_action( $hook_name ) {
  * @param string $version     The version of WordPress that deprecated the hook.
  * @param string $replacement Optional. The hook that should have been used. Default empty.
  * @param string $message     Optional. A message regarding the change. Default empty.
+ * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters_deprecated( $hook_name, $args, $version, $replacement = '', $message = '' ) {
 	if ( ! has_filter( $hook_name ) ) {
@@ -770,7 +771,7 @@ function plugin_basename( $file ) {
 	arsort( $wp_plugin_paths );
 
 	foreach ( $wp_plugin_paths as $dir => $realdir ) {
-		if ( strpos( $file, $realdir ) === 0 ) {
+		if ( str_starts_with( $file, $realdir ) ) {
 			$file = $dir . substr( $file, strlen( $realdir ) );
 		}
 	}
@@ -964,18 +965,7 @@ function _wp_call_all_hook( $args ) {
 }
 
 /**
- * Builds Unique ID for storage and retrieval.
- *
- * The old way to serialize the callback caused issues and this function is the
- * solution. It works by checking for objects and creating a new property in
- * the class to keep track of the object and new objects of the same class that
- * need to be added.
- *
- * It also allows for the removal of actions and filters for objects after they
- * change class properties. It is possible to include the property $wp_filter_id
- * in your class and set it to "null" or a number to bypass the workaround.
- * However this will prevent you from adding new classes and any new classes
- * will overwrite the previous hook by the same class.
+ * Builds a unique string ID for a hook callback function.
  *
  * Functions and static method callbacks are just returned as strings and
  * shouldn't have any speed penalty.
diff --git a/src/wp-includes/pomo/entry.php b/src/wp-includes/pomo/entry.php
index 983f1d4113dac..cd209e2f20bbb 100644
--- a/src/wp-includes/pomo/entry.php
+++ b/src/wp-includes/pomo/entry.php
@@ -108,7 +108,7 @@ public function key() {
 		public function merge_with( &$other ) {
 			$this->flags      = array_unique( array_merge( $this->flags, $other->flags ) );
 			$this->references = array_unique( array_merge( $this->references, $other->references ) );
-			if ( $this->extracted_comments != $other->extracted_comments ) {
+			if ( $this->extracted_comments !== $other->extracted_comments ) {
 				$this->extracted_comments .= $other->extracted_comments;
 			}
 
diff --git a/src/wp-includes/pomo/mo.php b/src/wp-includes/pomo/mo.php
index 6a14b04389391..dec51cee31310 100644
--- a/src/wp-includes/pomo/mo.php
+++ b/src/wp-includes/pomo/mo.php
@@ -206,9 +206,9 @@ public function get_byteorder( $magic ) {
 			$magic_little_64 = (int) 2500072158;
 			// 0xde120495
 			$magic_big = ( (int) - 569244523 ) & 0xFFFFFFFF;
-			if ( $magic_little == $magic || $magic_little_64 == $magic ) {
+			if ( $magic_little === $magic || $magic_little_64 === $magic ) {
 				return 'little';
-			} elseif ( $magic_big == $magic ) {
+			} elseif ( $magic_big === $magic ) {
 				return 'big';
 			} else {
 				return false;
@@ -229,7 +229,7 @@ public function import_from_reader( $reader ) {
 			$endian = ( 'big' === $endian_string ) ? 'N' : 'V';
 
 			$header = $reader->read( 24 );
-			if ( $reader->strlen( $header ) != 24 ) {
+			if ( $reader->strlen( $header ) !== 24 ) {
 				return false;
 			}
 
@@ -240,7 +240,7 @@ public function import_from_reader( $reader ) {
 			}
 
 			// Support revision 0 of MO format specs, only.
-			if ( 0 != $header['revision'] ) {
+			if ( 0 !== $header['revision'] ) {
 				return false;
 			}
 
@@ -249,23 +249,23 @@ public function import_from_reader( $reader ) {
 
 			// Read originals' indices.
 			$originals_lengths_length = $header['translations_lengths_addr'] - $header['originals_lengths_addr'];
-			if ( $originals_lengths_length != $header['total'] * 8 ) {
+			if ( $originals_lengths_length !== $header['total'] * 8 ) {
 				return false;
 			}
 
 			$originals = $reader->read( $originals_lengths_length );
-			if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+			if ( $reader->strlen( $originals ) !== $originals_lengths_length ) {
 				return false;
 			}
 
 			// Read translations' indices.
 			$translations_lengths_length = $header['hash_addr'] - $header['translations_lengths_addr'];
-			if ( $translations_lengths_length != $header['total'] * 8 ) {
+			if ( $translations_lengths_length !== $header['total'] * 8 ) {
 				return false;
 			}
 
 			$translations = $reader->read( $translations_lengths_length );
-			if ( $reader->strlen( $translations ) != $translations_lengths_length ) {
+			if ( $reader->strlen( $translations ) !== $translations_lengths_length ) {
 				return false;
 			}
 
diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php
index 13fb16eb12f06..89d827c2550b9 100644
--- a/src/wp-includes/pomo/po.php
+++ b/src/wp-includes/pomo/po.php
@@ -110,10 +110,10 @@ public function set_comment_before_headers( $text ) {
 		/**
 		 * Formats a string in PO-style
 		 *
-		 * @param string $string the string to format
+		 * @param string $input_string the string to format
 		 * @return string the poified string
 		 */
-		public static function poify( $string ) {
+		public static function poify( $input_string ) {
 			$quote   = '"';
 			$slash   = '\\';
 			$newline = "\n";
@@ -124,12 +124,12 @@ public static function poify( $string ) {
 				"\t"     => '\t',
 			);
 
-			$string = str_replace( array_keys( $replaces ), array_values( $replaces ), $string );
+			$input_string = str_replace( array_keys( $replaces ), array_values( $replaces ), $input_string );
 
-			$po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $string ) ) . $quote;
+			$po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $input_string ) ) . $quote;
 			// Add empty string on first line for readbility.
-			if ( false !== strpos( $string, $newline ) &&
-				( substr_count( $string, $newline ) > 1 || substr( $string, -strlen( $newline ) ) !== $newline ) ) {
+			if ( str_contains( $input_string, $newline ) &&
+				( substr_count( $input_string, $newline ) > 1 || substr( $input_string, -strlen( $newline ) ) !== $newline ) ) {
 				$po = "$quote$quote$newline$po";
 			}
 			// Remove empty strings.
@@ -140,17 +140,17 @@ public static function poify( $string ) {
 		/**
 		 * Gives back the original string from a PO-formatted string
 		 *
-		 * @param string $string PO-formatted string
+		 * @param string $input_string PO-formatted string
 		 * @return string enascaped string
 		 */
-		public static function unpoify( $string ) {
+		public static function unpoify( $input_string ) {
 			$escapes               = array(
 				't'  => "\t",
 				'n'  => "\n",
 				'r'  => "\r",
 				'\\' => '\\',
 			);
-			$lines                 = array_map( 'trim', explode( "\n", $string ) );
+			$lines                 = array_map( 'trim', explode( "\n", $input_string ) );
 			$lines                 = array_map( array( 'PO', 'trim_quotes' ), $lines );
 			$unpoified             = '';
 			$previous_is_backslash = false;
@@ -178,18 +178,18 @@ public static function unpoify( $string ) {
 		}
 
 		/**
-		 * Inserts $with in the beginning of every new line of $string and
+		 * Inserts $with in the beginning of every new line of $input_string and
 		 * returns the modified string
 		 *
-		 * @param string $string prepend lines in this string
-		 * @param string $with prepend lines with this string
+		 * @param string $input_string prepend lines in this string
+		 * @param string $with         prepend lines with this string
 		 */
-		public static function prepend_each_line( $string, $with ) {
-			$lines  = explode( "\n", $string );
+		public static function prepend_each_line( $input_string, $with ) {
+			$lines  = explode( "\n", $input_string );
 			$append = '';
-			if ( "\n" === substr( $string, -1 ) && '' === end( $lines ) ) {
+			if ( "\n" === substr( $input_string, -1 ) && '' === end( $lines ) ) {
 				/*
-				 * Last line might be empty because $string was terminated
+				 * Last line might be empty because $input_string was terminated
 				 * with a newline, remove it from the $lines array,
 				 * we'll restore state by re-terminating the string at the end.
 				 */
@@ -505,10 +505,10 @@ public function add_comment_to_entry( &$entry, $po_comment_line ) {
 		 * @return string
 		 */
 		public static function trim_quotes( $s ) {
-			if ( '"' === substr( $s, 0, 1 ) ) {
+			if ( str_starts_with( $s, '"' ) ) {
 				$s = substr( $s, 1 );
 			}
-			if ( '"' === substr( $s, -1, 1 ) ) {
+			if ( str_ends_with( $s, '"' ) ) {
 				$s = substr( $s, 0, -1 );
 			}
 			return $s;
diff --git a/src/wp-includes/pomo/streams.php b/src/wp-includes/pomo/streams.php
index 5c1a95a2ed7bf..2a4feb5f676f7 100644
--- a/src/wp-includes/pomo/streams.php
+++ b/src/wp-includes/pomo/streams.php
@@ -60,7 +60,7 @@ public function setEndian( $endian ) { // phpcs:ignore WordPress.NamingConventio
 		 */
 		public function readint32() {
 			$bytes = $this->read( 4 );
-			if ( 4 != $this->strlen( $bytes ) ) {
+			if ( 4 !== $this->strlen( $bytes ) ) {
 				return false;
 			}
 			$endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
@@ -77,7 +77,7 @@ public function readint32() {
 		 */
 		public function readint32array( $count ) {
 			$bytes = $this->read( 4 * $count );
-			if ( 4 * $count != $this->strlen( $bytes ) ) {
+			if ( 4 * $count !== $this->strlen( $bytes ) ) {
 				return false;
 			}
 			$endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
@@ -85,46 +85,46 @@ public function readint32array( $count ) {
 		}
 
 		/**
-		 * @param string $string
+		 * @param string $input_string
 		 * @param int    $start
 		 * @param int    $length
 		 * @return string
 		 */
-		public function substr( $string, $start, $length ) {
+		public function substr( $input_string, $start, $length ) {
 			if ( $this->is_overloaded ) {
-				return mb_substr( $string, $start, $length, 'ascii' );
+				return mb_substr( $input_string, $start, $length, 'ascii' );
 			} else {
-				return substr( $string, $start, $length );
+				return substr( $input_string, $start, $length );
 			}
 		}
 
 		/**
-		 * @param string $string
+		 * @param string $input_string
 		 * @return int
 		 */
-		public function strlen( $string ) {
+		public function strlen( $input_string ) {
 			if ( $this->is_overloaded ) {
-				return mb_strlen( $string, 'ascii' );
+				return mb_strlen( $input_string, 'ascii' );
 			} else {
-				return strlen( $string );
+				return strlen( $input_string );
 			}
 		}
 
 		/**
-		 * @param string $string
+		 * @param string $input_string
 		 * @param int    $chunk_size
 		 * @return array
 		 */
-		public function str_split( $string, $chunk_size ) {
+		public function str_split( $input_string, $chunk_size ) {
 			if ( ! function_exists( 'str_split' ) ) {
-				$length = $this->strlen( $string );
+				$length = $this->strlen( $input_string );
 				$out    = array();
 				for ( $i = 0; $i < $length; $i += $chunk_size ) {
-					$out[] = $this->substr( $string, $i, $chunk_size );
+					$out[] = $this->substr( $input_string, $i, $chunk_size );
 				}
 				return $out;
 			} else {
-				return str_split( $string, $chunk_size );
+				return str_split( $input_string, $chunk_size );
 			}
 		}
 
@@ -194,7 +194,7 @@ public function read( $bytes ) {
 		 * @return bool
 		 */
 		public function seekto( $pos ) {
-			if ( -1 == fseek( $this->_f, $pos, SEEK_SET ) ) {
+			if ( -1 === fseek( $this->_f, $pos, SEEK_SET ) ) {
 				return false;
 			}
 			$this->_pos = $pos;
diff --git a/src/wp-includes/pomo/translations.php b/src/wp-includes/pomo/translations.php
index 8ebcbaa8d27d8..d3a1d3cbd09a9 100644
--- a/src/wp-includes/pomo/translations.php
+++ b/src/wp-includes/pomo/translations.php
@@ -120,7 +120,7 @@ public function translate( $singular, $context = null ) {
 		 * @param int $count number of items
 		 */
 		public function select_plural_form( $count ) {
-			return 1 == $count ? 0 : 1;
+			return 1 === (int) $count ? 0 : 1;
 		}
 
 		/**
@@ -152,7 +152,7 @@ public function translate_plural( $singular, $plural, $count, $context = null )
 				isset( $translated->translations[ $index ] ) ) {
 				return $translated->translations[ $index ];
 			} else {
-				return 1 == $count ? $singular : $plural;
+				return 1 === (int) $count ? $singular : $plural;
 			}
 		}
 
@@ -366,7 +366,7 @@ public function translate( $singular, $context = null ) {
 		 * @return bool
 		 */
 		public function select_plural_form( $count ) {
-			return 1 == $count ? 0 : 1;
+			return 1 === (int) $count ? 0 : 1;
 		}
 
 		/**
@@ -383,7 +383,7 @@ public function get_plural_forms_count() {
 		 * @param string $context
 		 */
 		public function translate_plural( $singular, $plural, $count, $context = null ) {
-			return 1 == $count ? $singular : $plural;
+			return 1 === (int) $count ? $singular : $plural;
 		}
 
 		/**
diff --git a/src/wp-includes/post-formats.php b/src/wp-includes/post-formats.php
index 11b6d63de6907..282670bd21eee 100644
--- a/src/wp-includes/post-formats.php
+++ b/src/wp-includes/post-formats.php
@@ -41,7 +41,7 @@ function get_post_format( $post = null ) {
  *
  * @since 3.1.0
  *
- * @param string|string[]  $format Optional. The format or formats to check.
+ * @param string|string[]  $format Optional. The format or formats to check. Default empty array.
  * @param WP_Post|int|null $post   Optional. The post to check. Defaults to the current post in the loop.
  * @return bool True if the post has any of the given formats (or any format, if no format specified),
  *              false otherwise.
diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php
index 03178a3dd5d8a..f6635fdb4dba4 100644
--- a/src/wp-includes/post-template.php
+++ b/src/wp-includes/post-template.php
@@ -34,21 +34,22 @@ function get_the_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFunctio
  *
  * @since 0.71
  *
- * @param string $before Optional. Markup to prepend to the title. Default empty.
- * @param string $after  Optional. Markup to append to the title. Default empty.
- * @param bool   $echo   Optional. Whether to echo or return the title. Default true for echo.
- * @return void|string Void if `$echo` argument is true, current post title if `$echo` is false.
+ * @param string $before  Optional. Markup to prepend to the title. Default empty.
+ * @param string $after   Optional. Markup to append to the title. Default empty.
+ * @param bool   $display Optional. Whether to echo or return the title. Default true for echo.
+ * @return void|string Void if `$display` argument is true or the title is empty,
+ *                     current post title if `$display` is false.
  */
-function the_title( $before = '', $after = '', $echo = true ) {
+function the_title( $before = '', $after = '', $display = true ) {
 	$title = get_the_title();
 
-	if ( strlen( $title ) == 0 ) {
+	if ( strlen( $title ) === 0 ) {
 		return;
 	}
 
 	$title = $before . $title . $after;
 
-	if ( $echo ) {
+	if ( $display ) {
 		echo $title;
 	} else {
 		return $title;
@@ -88,7 +89,7 @@ function the_title_attribute( $args = '' ) {
 
 	$title = get_the_title( $parsed_args['post'] );
 
-	if ( strlen( $title ) == 0 ) {
+	if ( strlen( $title ) === 0 ) {
 		return;
 	}
 
@@ -284,8 +285,10 @@ function get_the_content( $more_link_text = null, $strip_teaser = false, $post =
 		return '';
 	}
 
-	// Use the globals if the $post parameter was not specified,
-	// but only after they have been set up in setup_postdata().
+	/*
+	 * Use the globals if the $post parameter was not specified,
+	 * but only after they have been set up in setup_postdata().
+	 */
 	if ( null === $post && did_action( 'the_post' ) ) {
 		$elements = compact( 'page', 'more', 'preview', 'pages', 'multipage' );
 	} else {
@@ -342,7 +345,7 @@ function get_the_content( $more_link_text = null, $strip_teaser = false, $post =
 		$content = array( $content );
 	}
 
-	if ( false !== strpos( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || 1 == $elements['page'] ) ) {
+	if ( str_contains( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || 1 == $elements['page'] ) ) {
 		$strip_teaser = true;
 	}
 
@@ -453,48 +456,52 @@ function has_excerpt( $post = 0 ) {
  *
  * @since 2.7.0
  *
- * @param string|string[] $class One or more classes to add to the class list.
- * @param int|WP_Post     $post  Optional. Post ID or post object. Defaults to the global `$post`.
+ * @param string|string[] $css_class Optional. One or more classes to add to the class list.
+ *                                   Default empty.
+ * @param int|WP_Post     $post      Optional. Post ID or post object. Defaults to the global `$post`.
  */
-function post_class( $class = '', $post = null ) {
+function post_class( $css_class = '', $post = null ) {
 	// Separates classes with a single space, collates classes for post DIV.
-	echo 'class="' . esc_attr( implode( ' ', get_post_class( $class, $post ) ) ) . '"';
+	echo 'class="' . esc_attr( implode( ' ', get_post_class( $css_class, $post ) ) ) . '"';
 }
 
 /**
  * Retrieves an array of the class names for the post container element.
  *
- * The class names are many. If the post is a sticky, then the 'sticky'
- * class name. The class 'hentry' is always added to each post. If the post has a
- * post thumbnail, 'has-post-thumbnail' is added as a class. For each taxonomy that
- * the post belongs to, a class will be added of the format '{$taxonomy}-{$slug}' -
- * eg 'category-foo' or 'my_custom_taxonomy-bar'.
+ * The class names are many:
+ *
+ *  - If the post has a post thumbnail, `has-post-thumbnail` is added as a class.
+ *  - If the post is sticky, then the `sticky` class name is added.
+ *  - The class `hentry` is always added to each post.
+ *  - For each taxonomy that the post belongs to, a class will be added of the format
+ *    `{$taxonomy}-{$slug}`, e.g. `category-foo` or `my_custom_taxonomy-bar`.
+ *    The `post_tag` taxonomy is a special case; the class has the `tag-` prefix
+ *    instead of `post_tag-`.
  *
- * The 'post_tag' taxonomy is a special
- * case; the class has the 'tag-' prefix instead of 'post_tag-'. All class names are
- * passed through the filter, {@see 'post_class'}, with the list of class names, followed by
- * $class parameter value, with the post ID as the last parameter.
+ * All class names are passed through the filter, {@see 'post_class'}, followed by
+ * `$css_class` parameter value, with the post ID as the last parameter.
  *
  * @since 2.7.0
  * @since 4.2.0 Custom taxonomy class names were added.
  *
- * @param string|string[] $class Space-separated string or array of class names to add to the class list.
- * @param int|WP_Post     $post  Optional. Post ID or post object.
+ * @param string|string[] $css_class Optional. Space-separated string or array of class names
+ *                                   to add to the class list. Default empty.
+ * @param int|WP_Post     $post      Optional. Post ID or post object.
  * @return string[] Array of class names.
  */
-function get_post_class( $class = '', $post = null ) {
+function get_post_class( $css_class = '', $post = null ) {
 	$post = get_post( $post );
 
 	$classes = array();
 
-	if ( $class ) {
-		if ( ! is_array( $class ) ) {
-			$class = preg_split( '#\s+#', $class );
+	if ( $css_class ) {
+		if ( ! is_array( $css_class ) ) {
+			$css_class = preg_split( '#\s+#', $css_class );
 		}
-		$classes = array_map( 'esc_attr', $class );
+		$classes = array_map( 'esc_attr', $css_class );
 	} else {
 		// Ensure that we always coerce class to being an array.
-		$class = array();
+		$css_class = array();
 	}
 
 	if ( ! $post ) {
@@ -558,9 +565,9 @@ function get_post_class( $class = '', $post = null ) {
 	 * @param string[] $taxonomies List of all taxonomy names to generate classes for.
 	 * @param int      $post_id    The post ID.
 	 * @param string[] $classes    An array of post class names.
-	 * @param string[] $class      An array of additional class names added to the post.
+	 * @param string[] $css_class  An array of additional class names added to the post.
 	*/
-	$taxonomies = apply_filters( 'post_class_taxonomies', $taxonomies, $post->ID, $classes, $class );
+	$taxonomies = apply_filters( 'post_class_taxonomies', $taxonomies, $post->ID, $classes, $css_class );
 
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
@@ -591,11 +598,11 @@ function get_post_class( $class = '', $post = null ) {
 	 *
 	 * @since 2.7.0
 	 *
-	 * @param string[] $classes An array of post class names.
-	 * @param string[] $class   An array of additional class names added to the post.
-	 * @param int      $post_id The post ID.
+	 * @param string[] $classes   An array of post class names.
+	 * @param string[] $css_class An array of additional class names added to the post.
+	 * @param int      $post_id   The post ID.
 	 */
-	$classes = apply_filters( 'post_class', $classes, $class, $post->ID );
+	$classes = apply_filters( 'post_class', $classes, $css_class, $post->ID );
 
 	return array_unique( $classes );
 }
@@ -605,11 +612,12 @@ function get_post_class( $class = '', $post = null ) {
  *
  * @since 2.8.0
  *
- * @param string|string[] $class Space-separated string or array of class names to add to the class list.
+ * @param string|string[] $css_class Optional. Space-separated string or array of class names
+ *                                   to add to the class list. Default empty.
  */
-function body_class( $class = '' ) {
+function body_class( $css_class = '' ) {
 	// Separates class names with a single space, collates class names for body element.
-	echo 'class="' . esc_attr( implode( ' ', get_body_class( $class ) ) ) . '"';
+	echo 'class="' . esc_attr( implode( ' ', get_body_class( $css_class ) ) ) . '"';
 }
 
 /**
@@ -619,10 +627,11 @@ function body_class( $class = '' ) {
  *
  * @global WP_Query $wp_query WordPress Query object.
  *
- * @param string|string[] $class Space-separated string or array of class names to add to the class list.
+ * @param string|string[] $css_class Optional. Space-separated string or array of class names
+ *                                   to add to the class list. Default empty.
  * @return string[] Array of class names.
  */
-function get_body_class( $class = '' ) {
+function get_body_class( $css_class = '' ) {
 	global $wp_query;
 
 	$classes = array();
@@ -661,8 +670,8 @@ function get_body_class( $class = '' ) {
 	}
 
 	if ( is_singular() ) {
-		$post_id   = $wp_query->get_queried_object_id();
 		$post      = $wp_query->get_queried_object();
+		$post_id   = $post->ID;
 		$post_type = $post->post_type;
 
 		if ( is_page_template() ) {
@@ -705,16 +714,11 @@ function get_body_class( $class = '' ) {
 			$classes[]   = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
 		} elseif ( is_page() ) {
 			$classes[] = 'page';
-
-			$page_id = $wp_query->get_queried_object_id();
-
-			$post = get_post( $page_id );
-
-			$classes[] = 'page-id-' . $page_id;
+			$classes[] = 'page-id-' . $post_id;
 
 			if ( get_pages(
 				array(
-					'parent' => $page_id,
+					'parent' => $post_id,
 					'number' => 1,
 				)
 			) ) {
@@ -830,14 +834,14 @@ function get_body_class( $class = '' ) {
 		}
 	}
 
-	if ( ! empty( $class ) ) {
-		if ( ! is_array( $class ) ) {
-			$class = preg_split( '#\s+#', $class );
+	if ( ! empty( $css_class ) ) {
+		if ( ! is_array( $css_class ) ) {
+			$css_class = preg_split( '#\s+#', $css_class );
 		}
-		$classes = array_merge( $classes, $class );
+		$classes = array_merge( $classes, $css_class );
 	} else {
 		// Ensure that we always coerce class to being an array.
-		$class = array();
+		$css_class = array();
 	}
 
 	$classes = array_map( 'esc_attr', $classes );
@@ -847,10 +851,10 @@ function get_body_class( $class = '' ) {
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param string[] $classes An array of body class names.
-	 * @param string[] $class   An array of additional class names added to the body.
+	 * @param string[] $classes   An array of body class names.
+	 * @param string[] $css_class An array of additional class names added to the body.
 	 */
-	$classes = apply_filters( 'body_class', $classes, $class );
+	$classes = apply_filters( 'body_class', $classes, $css_class );
 
 	return array_unique( $classes );
 }
@@ -880,7 +884,7 @@ function post_password_required( $post = null ) {
 	$hasher = new PasswordHash( 8, true );
 
 	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) ) {
+	if ( ! str_starts_with( $hash, '$P$B' ) ) {
 		$required = true;
 	} else {
 		$required = ! $hasher->CheckPassword( $post->post_password, $hash );
@@ -1546,7 +1550,7 @@ function wp_page_menu( $args = array() ) {
  */
 function walk_page_tree( $pages, $depth, $current_page, $args ) {
 	if ( empty( $args['walker'] ) ) {
-		$walker = new Walker_Page;
+		$walker = new Walker_Page();
 	} else {
 		/**
 		 * @var Walker $walker
@@ -1578,7 +1582,7 @@ function walk_page_tree( $pages, $depth, $current_page, $args ) {
  */
 function walk_page_dropdown_tree( ...$args ) {
 	if ( empty( $args[2]['walker'] ) ) { // The user's options are the third parameter.
-		$walker = new Walker_PageDropdown;
+		$walker = new Walker_PageDropdown();
 	} else {
 		/**
 		 * @var Walker $walker
@@ -1660,7 +1664,24 @@ function wp_get_attachment_link( $post = 0, $size = 'thumbnail', $permalink = fa
 		$link_text = esc_html( pathinfo( get_attached_file( $_post->ID ), PATHINFO_FILENAME ) );
 	}
 
-	$link_html = "<a href='" . esc_url( $url ) . "'>$link_text</a>";
+	/**
+	 * Filters the list of attachment link attributes.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array $attributes An array of attributes for the link markup,
+	 *                          keyed on the attribute name.
+	 * @param int   $id         Post ID.
+	 */
+	$attributes = apply_filters( 'wp_get_attachment_link_attributes', array( 'href' => $url ), $_post->ID );
+
+	$link_attributes = '';
+	foreach ( $attributes as $name => $value ) {
+		$value            = 'href' === $name ? esc_url( $value ) : esc_attr( $value );
+		$link_attributes .= ' ' . esc_attr( $name ) . "='" . $value . "'";
+	}
+
+	$link_html = "<a$link_attributes>$link_text</a>";
 
 	/**
 	 * Filters a retrieved attachment page link.
@@ -1746,7 +1767,7 @@ function get_the_password_form( $post = 0 ) {
 	$label  = 'pwbox-' . ( empty( $post->ID ) ? rand() : $post->ID );
 	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
 	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
+	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" spellcheck="false" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
 	';
 
 	/**
diff --git a/src/wp-includes/post-thumbnail-template.php b/src/wp-includes/post-thumbnail-template.php
index cee8fa480b2f6..e801d53a976af 100644
--- a/src/wp-includes/post-thumbnail-template.php
+++ b/src/wp-includes/post-thumbnail-template.php
@@ -186,19 +186,6 @@ function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr =
 			update_post_thumbnail_cache();
 		}
 
-		// Get the 'loading' attribute value to use as default, taking precedence over the default from
-		// `wp_get_attachment_image()`.
-		$loading = wp_get_loading_attr_default( 'the_post_thumbnail' );
-
-		// Add the default to the given attributes unless they already include a 'loading' directive.
-		if ( empty( $attr ) ) {
-			$attr = array( 'loading' => $loading );
-		} elseif ( is_array( $attr ) && ! array_key_exists( 'loading', $attr ) ) {
-			$attr['loading'] = $loading;
-		} elseif ( is_string( $attr ) && ! preg_match( '/(^|&)loading=/', $attr ) ) {
-			$attr .= '&loading=' . $loading;
-		}
-
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**
diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
index d7e7bfec990a1..5367f51e06f06 100644
--- a/src/wp-includes/post.php
+++ b/src/wp-includes/post.php
@@ -282,25 +282,26 @@ function create_initial_post_types() {
 		'wp_block',
 		array(
 			'labels'                => array(
-				'name'                     => _x( 'Reusable blocks', 'post type general name' ),
-				'singular_name'            => _x( 'Reusable block', 'post type singular name' ),
-				'add_new'                  => _x( 'Add New', 'Reusable block' ),
-				'add_new_item'             => __( 'Add new Reusable block' ),
-				'new_item'                 => __( 'New Reusable block' ),
-				'edit_item'                => __( 'Edit Reusable block' ),
-				'view_item'                => __( 'View Reusable block' ),
-				'all_items'                => __( 'All Reusable blocks' ),
-				'search_items'             => __( 'Search Reusable blocks' ),
-				'not_found'                => __( 'No reusable blocks found.' ),
-				'not_found_in_trash'       => __( 'No reusable blocks found in Trash.' ),
-				'filter_items_list'        => __( 'Filter reusable blocks list' ),
-				'items_list_navigation'    => __( 'Reusable blocks list navigation' ),
-				'items_list'               => __( 'Reusable blocks list' ),
-				'item_published'           => __( 'Reusable block published.' ),
-				'item_published_privately' => __( 'Reusable block published privately.' ),
-				'item_reverted_to_draft'   => __( 'Reusable block reverted to draft.' ),
-				'item_scheduled'           => __( 'Reusable block scheduled.' ),
-				'item_updated'             => __( 'Reusable block updated.' ),
+				'name'                     => _x( 'Patterns', 'post type general name' ),
+				'singular_name'            => _x( 'Pattern', 'post type singular name' ),
+				'add_new'                  => _x( 'Add New', 'Pattern' ),
+				'add_new_item'             => __( 'Add new Pattern' ),
+				'new_item'                 => __( 'New Pattern' ),
+				'edit_item'                => __( 'Edit Block Pattern' ),
+				'view_item'                => __( 'View Pattern' ),
+				'view_items'               => __( 'View Patterns' ),
+				'all_items'                => __( 'All Patterns' ),
+				'search_items'             => __( 'Search Patterns' ),
+				'not_found'                => __( 'No patterns found.' ),
+				'not_found_in_trash'       => __( 'No patterns found in Trash.' ),
+				'filter_items_list'        => __( 'Filter patterns list' ),
+				'items_list_navigation'    => __( 'Patterns list navigation' ),
+				'items_list'               => __( 'Patterns list' ),
+				'item_published'           => __( 'Pattern published.' ),
+				'item_published_privately' => __( 'Pattern published privately.' ),
+				'item_reverted_to_draft'   => __( 'Pattern reverted to draft.' ),
+				'item_scheduled'           => __( 'Pattern scheduled.' ),
+				'item_updated'             => __( 'Pattern updated.' ),
 			),
 			'public'                => false,
 			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
@@ -327,10 +328,19 @@ function create_initial_post_types() {
 				'title',
 				'editor',
 				'revisions',
+				'custom-fields',
 			),
 		)
 	);
 
+	$template_edit_link = 'site-editor.php?' . build_query(
+		array(
+			'postType' => '%s',
+			'postId'   => '%s',
+			'canvas'   => 'edit',
+		)
+	);
+
 	register_post_type(
 		'wp_template',
 		array(
@@ -357,6 +367,7 @@ function create_initial_post_types() {
 			'description'           => __( 'Templates to include in your theme.' ),
 			'public'                => false,
 			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => $template_edit_link, /* internal use only. don't use this when registering your own post type. */
 			'has_archive'           => false,
 			'show_ui'               => false,
 			'show_in_menu'          => false,
@@ -417,6 +428,7 @@ function create_initial_post_types() {
 			'description'           => __( 'Template parts to include in your templates.' ),
 			'public'                => false,
 			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => $template_edit_link, /* internal use only. don't use this when registering your own post type. */
 			'has_archive'           => false,
 			'show_ui'               => false,
 			'show_in_menu'          => false,
@@ -457,6 +469,7 @@ function create_initial_post_types() {
 			'description'  => __( 'Global styles to include in themes.' ),
 			'public'       => false,
 			'_builtin'     => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'   => '/site-editor.php?canvas=edit', /* internal use only. don't use this when registering your own post type. */
 			'show_ui'      => false,
 			'show_in_rest' => false,
 			'rewrite'      => false,
@@ -478,6 +491,14 @@ function create_initial_post_types() {
 		)
 	);
 
+	$navigation_post_edit_link = 'site-editor.php?' . build_query(
+		array(
+			'postId'   => '%s',
+			'postType' => 'wp_navigation',
+			'canvas'   => 'edit',
+		)
+	);
+
 	register_post_type(
 		'wp_navigation',
 		array(
@@ -504,6 +525,7 @@ function create_initial_post_types() {
 			'description'           => __( 'Navigation menus that can be inserted into your site.' ),
 			'public'                => false,
 			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => $navigation_post_edit_link, /* internal use only. don't use this when registering your own post type. */
 			'has_archive'           => false,
 			'show_ui'               => true,
 			'show_in_menu'          => false,
@@ -705,26 +727,25 @@ function create_initial_post_types() {
 /**
  * Retrieves attached file path based on attachment ID.
  *
- * By default the path will go through the 'get_attached_file' filter, but
- * passing a true to the $unfiltered argument of get_attached_file() will
- * return the file path unfiltered.
+ * By default the path will go through the {@see 'get_attached_file'} filter, but
+ * passing `true` to the `$unfiltered` argument will return the file path unfiltered.
  *
- * The function works by getting the single post meta name, named
- * '_wp_attached_file' and returning it. This is a convenience function to
- * prevent looking up the meta name and provide a mechanism for sending the
- * attached filename through a filter.
+ * The function works by retrieving the `_wp_attached_file` post meta value.
+ * This is a convenience function to prevent looking up the meta name and provide
+ * a mechanism for sending the attached filename through a filter.
  *
  * @since 2.0.0
  *
  * @param int  $attachment_id Attachment ID.
- * @param bool $unfiltered    Optional. Whether to apply filters. Default false.
+ * @param bool $unfiltered    Optional. Whether to skip the {@see 'get_attached_file'} filter.
+ *                            Default false.
  * @return string|false The file path to where the attached file should be, false otherwise.
  */
 function get_attached_file( $attachment_id, $unfiltered = false ) {
 	$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
 
 	// If the file is relative, prepend upload dir.
-	if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
+	if ( $file && ! str_starts_with( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
 		$uploads = wp_get_upload_dir();
 		if ( false === $uploads['error'] ) {
 			$file = $uploads['basedir'] . "/$file";
@@ -796,7 +817,7 @@ function _wp_relative_upload_path( $path ) {
 	$new_path = $path;
 
 	$uploads = wp_get_upload_dir();
-	if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
+	if ( str_starts_with( $new_path, $uploads['basedir'] ) ) {
 			$new_path = str_replace( $uploads['basedir'], '', $new_path );
 			$new_path = ltrim( $new_path, '/' );
 	}
@@ -1225,7 +1246,7 @@ function get_page_statuses() {
  * @since 4.9.6
  * @access private
  *
- * @return array
+ * @return string[] Array of privacy request status labels keyed by their status.
  */
 function _wp_privacy_statuses() {
 	return array(
@@ -1547,9 +1568,8 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
  *
  * @global array $wp_post_types List of post types.
  *
- * @param string       $post_type Post type key. Must not exceed 20 characters and may
- *                                only contain lowercase alphanumeric characters, dashes,
- *                                and underscores. See sanitize_key().
+ * @param string       $post_type Post type key. Must not exceed 20 characters and may only contain
+ *                                lowercase alphanumeric characters, dashes, and underscores. See sanitize_key().
  * @param array|string $args {
  *     Array or string of arguments for registering a post type.
  *
@@ -1947,6 +1967,7 @@ function _post_type_meta_capabilities( $capabilities = null ) {
  *                              Default is 'Post published privately.' / 'Page published privately.'
  * - `item_reverted_to_draft` - Label used when an item is switched to a draft.
  *                            Default is 'Post reverted to draft.' / 'Page reverted to draft.'
+ * - `item_trashed` - Label used when an item is moved to Trash. Default is 'Post trashed.' / 'Page trashed.'
  * - `item_scheduled` - Label used when an item is scheduled for publishing. Default is 'Post scheduled.' /
  *                    'Page scheduled.'
  * - `item_updated` - Label used when an item is updated. Default is 'Post updated.' / 'Page updated.'
@@ -1970,6 +1991,7 @@ function _post_type_meta_capabilities( $capabilities = null ) {
  *              `item_scheduled`, and `item_updated` labels.
  * @since 5.7.0 Added the `filter_by_date` label.
  * @since 5.8.0 Added the `item_link` and `item_link_description` labels.
+ * @since 6.3.0 Added the `item_trashed` label.
  *
  * @access private
  *
@@ -2020,43 +2042,47 @@ function get_post_type_labels( $post_type_object ) {
  * @since 3.0.0
  * @access private
  *
- * @param object $object                  A custom-something object.
+ * @param object $data_object             A custom-something object.
  * @param array  $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels.
  * @return object Object containing labels for the given custom-something object.
  */
-function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
-	$object->labels = (array) $object->labels;
+function _get_custom_object_labels( $data_object, $nohier_vs_hier_defaults ) {
+	$data_object->labels = (array) $data_object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) ) {
-		$object->labels['name'] = $object->label;
+	if ( isset( $data_object->label ) && empty( $data_object->labels['name'] ) ) {
+		$data_object->labels['name'] = $data_object->label;
 	}
 
-	if ( ! isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
-		$object->labels['singular_name'] = $object->labels['name'];
+	if ( ! isset( $data_object->labels['singular_name'] ) && isset( $data_object->labels['name'] ) ) {
+		$data_object->labels['singular_name'] = $data_object->labels['name'];
 	}
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) ) {
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset( $data_object->labels['name_admin_bar'] ) ) {
+		$data_object->labels['name_admin_bar'] =
+			isset( $data_object->labels['singular_name'] )
+			? $data_object->labels['singular_name']
+			: $data_object->name;
 	}
 
-	if ( ! isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) ) {
-		$object->labels['menu_name'] = $object->labels['name'];
+	if ( ! isset( $data_object->labels['menu_name'] ) && isset( $data_object->labels['name'] ) ) {
+		$data_object->labels['menu_name'] = $data_object->labels['name'];
 	}
 
-	if ( ! isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) ) {
-		$object->labels['all_items'] = $object->labels['menu_name'];
+	if ( ! isset( $data_object->labels['all_items'] ) && isset( $data_object->labels['menu_name'] ) ) {
+		$data_object->labels['all_items'] = $data_object->labels['menu_name'];
 	}
 
-	if ( ! isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
-		$object->labels['archives'] = $object->labels['all_items'];
+	if ( ! isset( $data_object->labels['archives'] ) && isset( $data_object->labels['all_items'] ) ) {
+		$data_object->labels['archives'] = $data_object->labels['all_items'];
 	}
 
 	$defaults = array();
 	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
-		$defaults[ $key ] = $object->hierarchical ? $value[1] : $value[0];
+		$defaults[ $key ] = $data_object->hierarchical ? $value[1] : $value[0];
 	}
-	$labels         = array_merge( $defaults, $object->labels );
-	$object->labels = (object) $object->labels;
+
+	$labels              = array_merge( $defaults, $data_object->labels );
+	$data_object->labels = (object) $data_object->labels;
 
 	return (object) $labels;
 }
@@ -2411,7 +2437,7 @@ function get_posts( $args = null ) {
 	$parsed_args['ignore_sticky_posts'] = true;
 	$parsed_args['no_found_rows']       = true;
 
-	$get_posts = new WP_Query;
+	$get_posts = new WP_Query();
 	return $get_posts->query( $parsed_args );
 
 }
@@ -2758,7 +2784,7 @@ function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
 	}
 
 	$prefixed = false;
-	if ( false !== strpos( $field, 'post_' ) ) {
+	if ( str_contains( $field, 'post_' ) ) {
 		$prefixed        = true;
 		$field_no_prefix = str_replace( 'post_', '', $field );
 	}
@@ -3008,13 +3034,14 @@ function _count_posts_cache_key( $type = 'post', $perm = '' ) {
  *
  * @param string $type Optional. Post type to retrieve count. Default 'post'.
  * @param string $perm Optional. 'readable' or empty. Default empty.
- * @return stdClass Number of posts for each status.
+ * @return stdClass An object containing the number of posts for each status,
+ *                  or an empty object if the post type does not exist.
  */
 function wp_count_posts( $type = 'post', $perm = '' ) {
 	global $wpdb;
 
 	if ( ! post_type_exists( $type ) ) {
-		return new stdClass;
+		return new stdClass();
 	}
 
 	$cache_key = _count_posts_cache_key( $type, $perm );
@@ -3057,7 +3084,7 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 	wp_cache_set( $cache_key, $counts, 'counts' );
 
 	/**
-	 * Modifies returned post counts by status for the current post type.
+	 * Filters the post counts by status for the current post type.
 	 *
 	 * @since 3.7.0
 	 *
@@ -3109,7 +3136,7 @@ function wp_count_attachments( $mime_type = '' ) {
 	}
 
 	/**
-	 * Modifies returned attachment counts by mime type.
+	 * Filters the attachment counts by mime type.
 	 *
 	 * @since 3.7.0
 	 *
@@ -3257,7 +3284,7 @@ function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
 
 			$patternses[][ $type ] = "^$regex$";
 
-			if ( false === strpos( $mime, '/' ) ) {
+			if ( ! str_contains( $mime, '/' ) ) {
 				$patternses[][ $type ] = "^$regex/";
 				$patternses[][ $type ] = $regex;
 			}
@@ -3314,7 +3341,7 @@ function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace( '/[^-*.a-zA-Z0-9]/', '', $mime_type );
-			if ( false === strpos( $mime_pattern, '*' ) ) {
+			if ( ! str_contains( $mime_pattern, '*' ) ) {
 				$mime_pattern .= '/*';
 			}
 		}
@@ -3325,7 +3352,7 @@ function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
 			return '';
 		}
 
-		if ( false !== strpos( $mime_pattern, '%' ) ) {
+		if ( str_contains( $mime_pattern, '%' ) ) {
 			$wheres[] = empty( $table_alias ) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
 		} else {
 			$wheres[] = empty( $table_alias ) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
@@ -3559,15 +3586,19 @@ function wp_trash_post( $post_id = 0 ) {
 		return false;
 	}
 
+	$previous_status = $post->post_status;
+
 	/**
 	 * Filters whether a post trashing should take place.
 	 *
 	 * @since 4.9.0
+	 * @since 6.3.0 Added the `$previous_status` parameter.
 	 *
-	 * @param bool|null $trash Whether to go forward with trashing.
-	 * @param WP_Post   $post  Post object.
+	 * @param bool|null $trash           Whether to go forward with trashing.
+	 * @param WP_Post   $post            Post object.
+	 * @param string    $previous_status The status of the post about to be trashed.
 	 */
-	$check = apply_filters( 'pre_trash_post', null, $post );
+	$check = apply_filters( 'pre_trash_post', null, $post, $previous_status );
 
 	if ( null !== $check ) {
 		return $check;
@@ -3577,12 +3608,14 @@ function wp_trash_post( $post_id = 0 ) {
 	 * Fires before a post is sent to the Trash.
 	 *
 	 * @since 3.3.0
+	 * @since 6.3.0 Added the `$previous_status` parameter.
 	 *
-	 * @param int $post_id Post ID.
+	 * @param int    $post_id         Post ID.
+	 * @param string $previous_status The status of the post about to be trashed.
 	 */
-	do_action( 'wp_trash_post', $post_id );
+	do_action( 'wp_trash_post', $post_id, $previous_status );
 
-	add_post_meta( $post_id, '_wp_trash_meta_status', $post->post_status );
+	add_post_meta( $post_id, '_wp_trash_meta_status', $previous_status );
 	add_post_meta( $post_id, '_wp_trash_meta_time', time() );
 
 	$post_updated = wp_update_post(
@@ -3602,10 +3635,12 @@ function wp_trash_post( $post_id = 0 ) {
 	 * Fires after a post is sent to the Trash.
 	 *
 	 * @since 2.9.0
+	 * @since 6.3.0 Added the `$previous_status` parameter.
 	 *
-	 * @param int $post_id Post ID.
+	 * @param int    $post_id         Post ID.
+	 * @param string $previous_status The status of the post at the point where it was trashed.
 	 */
-	do_action( 'trashed_post', $post_id );
+	do_action( 'trashed_post', $post_id, $previous_status );
 
 	return $post;
 }
@@ -3639,7 +3674,7 @@ function wp_untrash_post( $post_id = 0 ) {
 	 * Filters whether a post untrashing should take place.
 	 *
 	 * @since 4.9.0
-	 * @since 5.6.0 The `$previous_status` parameter was added.
+	 * @since 5.6.0 Added the `$previous_status` parameter.
 	 *
 	 * @param bool|null $untrash         Whether to go forward with untrashing.
 	 * @param WP_Post   $post            Post object.
@@ -3654,7 +3689,7 @@ function wp_untrash_post( $post_id = 0 ) {
 	 * Fires before a post is restored from the Trash.
 	 *
 	 * @since 2.9.0
-	 * @since 5.6.0 The `$previous_status` parameter was added.
+	 * @since 5.6.0 Added the `$previous_status` parameter.
 	 *
 	 * @param int    $post_id         Post ID.
 	 * @param string $previous_status The status of the post at the point where it was trashed.
@@ -3700,7 +3735,7 @@ function wp_untrash_post( $post_id = 0 ) {
 	 * Fires after a post is restored from the Trash.
 	 *
 	 * @since 2.9.0
-	 * @since 5.6.0 The `$previous_status` parameter was added.
+	 * @since 5.6.0 Added the `$previous_status` parameter.
 	 *
 	 * @param int    $post_id         Post ID.
 	 * @param string $previous_status The status of the post at the point where it was trashed.
@@ -4011,10 +4046,6 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
  *                                         Default empty.
  *     @type string $pinged                Space or carriage return-separated list of URLs that have
  *                                         been pinged. Default empty.
- *     @type string $post_modified         The date when the post was last modified. Default is
- *                                         the current time.
- *     @type string $post_modified_gmt     The date when the post was last modified in the GMT
- *                                         timezone. Default is the current time.
  *     @type int    $post_parent           Set this for the post it belongs to, if any. Default 0.
  *     @type int    $menu_order            The order the post should be displayed in. Default 0.
  *     @type string $post_mime_type        The mime type of the post. Default empty.
@@ -4076,7 +4107,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 	$postarr = sanitize_post( $postarr, 'db' );
 
 	// Are we updating or creating?
-	$post_ID = 0;
+	$post_id = 0;
 	$update  = false;
 	$guid    = $postarr['guid'];
 
@@ -4084,8 +4115,8 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		$update = true;
 
 		// Get the post ID and GUID.
-		$post_ID     = $postarr['ID'];
-		$post_before = get_post( $post_ID );
+		$post_id     = $postarr['ID'];
+		$post_before = get_post( $post_id );
 
 		if ( is_null( $post_before ) ) {
 			if ( $wp_error ) {
@@ -4094,8 +4125,8 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			return 0;
 		}
 
-		$guid            = get_post_field( 'guid', $post_ID );
-		$previous_status = get_post_field( 'post_status', $post_ID );
+		$guid            = get_post_field( 'guid', $post_id );
+		$previous_status = get_post_field( 'post_status', $post_id );
 	} else {
 		$previous_status = 'new';
 		$post_before     = null;
@@ -4177,7 +4208,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 
 		if ( ! $update && $post_type_object && ! current_user_can( $post_type_object->cap->publish_posts ) ) {
 			$post_name = '';
-		} elseif ( $update && ! current_user_can( 'publish_post', $post_ID ) ) {
+		} elseif ( $update && ! current_user_can( 'publish_post', $post_id ) ) {
 			$post_name = '';
 		}
 	}
@@ -4196,9 +4227,12 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		// On updates, we need to check to see if it's using the old, fixed sanitization context.
 		$check_name = sanitize_title( $post_name, '', 'old-save' );
 
-		if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
+		if ( $update
+			&& strtolower( urlencode( $post_name ) ) === $check_name
+			&& get_post_field( 'post_name', $post_id ) === $check_name
+		) {
 			$post_name = $check_name;
-		} else { // new post, or slug has changed.
+		} else { // New post, or slug has changed.
 			$post_name = sanitize_title( $post_name );
 		}
 	}
@@ -4291,7 +4325,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 
 	$new_postarr = array_merge(
 		array(
-			'ID' => $post_ID,
+			'ID' => $post_id,
 		),
 		compact( array_diff( array_keys( $defaults ), array( 'context', 'filter' ) ) )
 	);
@@ -4302,21 +4336,21 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 	 * @since 3.1.0
 	 *
 	 * @param int   $post_parent Post parent ID.
-	 * @param int   $post_ID     Post ID.
+	 * @param int   $post_id     Post ID.
 	 * @param array $new_postarr Array of parsed post data.
 	 * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
 	 */
-	$post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, $new_postarr, $postarr );
+	$post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_id, $new_postarr, $postarr );
 
 	/*
 	 * If the post is being untrashed and it has a desired slug stored in post meta,
 	 * reassign it.
 	 */
 	if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
-		$desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
+		$desired_post_slug = get_post_meta( $post_id, '_wp_desired_post_slug', true );
 
 		if ( $desired_post_slug ) {
-			delete_post_meta( $post_ID, '_wp_desired_post_slug' );
+			delete_post_meta( $post_id, '_wp_desired_post_slug' );
 			$post_name = $desired_post_slug;
 		}
 	}
@@ -4330,21 +4364,21 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		 *
 		 * @param bool   $add_trashed_suffix Whether to attempt to add the suffix.
 		 * @param string $post_name          The name of the post being updated.
-		 * @param int    $post_ID            Post ID.
+		 * @param int    $post_id            Post ID.
 		 */
-		$add_trashed_suffix = apply_filters( 'add_trashed_suffix_to_trashed_posts', true, $post_name, $post_ID );
+		$add_trashed_suffix = apply_filters( 'add_trashed_suffix_to_trashed_posts', true, $post_name, $post_id );
 
 		if ( $add_trashed_suffix ) {
-			wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID );
+			wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_id );
 		}
 	}
 
 	// When trashing an existing post, change its slug to allow non-trashed posts to use it.
 	if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) {
-		$post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID );
+		$post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_id );
 	}
 
-	$post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
+	$post_name = wp_unique_post_slug( $post_name, $post_id, $post_status, $post_type, $post_parent );
 
 	// Don't unslash.
 	$post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : '';
@@ -4419,7 +4453,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 	}
 
 	$data  = wp_unslash( $data );
-	$where = array( 'ID' => $post_ID );
+	$where = array( 'ID' => $post_id );
 
 	if ( $update ) {
 		/**
@@ -4427,10 +4461,10 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		 *
 		 * @since 2.5.0
 		 *
-		 * @param int   $post_ID Post ID.
+		 * @param int   $post_id Post ID.
 		 * @param array $data    Array of unslashed post data.
 		 */
-		do_action( 'pre_post_update', $post_ID, $data );
+		do_action( 'pre_post_update', $post_id, $data );
 
 		if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
 			if ( $wp_error ) {
@@ -4469,25 +4503,25 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			}
 		}
 
-		$post_ID = (int) $wpdb->insert_id;
+		$post_id = (int) $wpdb->insert_id;
 
-		// Use the newly generated $post_ID.
-		$where = array( 'ID' => $post_ID );
+		// Use the newly generated $post_id.
+		$where = array( 'ID' => $post_id );
 	}
 
 	if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ), true ) ) {
-		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
+		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_id ), $post_id, $data['post_status'], $post_type, $post_parent );
 
 		$wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
-		clean_post_cache( $post_ID );
+		clean_post_cache( $post_id );
 	}
 
 	if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
-		wp_set_post_categories( $post_ID, $post_category );
+		wp_set_post_categories( $post_id, $post_category );
 	}
 
 	if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) {
-		wp_set_post_tags( $post_ID, $postarr['tags_input'] );
+		wp_set_post_tags( $post_id, $postarr['tags_input'] );
 	}
 
 	// Add default term for all associated custom taxonomies.
@@ -4502,7 +4536,7 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 				}
 
 				// Passed custom taxonomy list overwrites the existing list if not empty.
-				$terms = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );
+				$terms = wp_get_object_terms( $post_id, $taxonomy, array( 'fields' => 'ids' ) );
 				if ( ! empty( $terms ) && empty( $postarr['tax_input'][ $taxonomy ] ) ) {
 					$postarr['tax_input'][ $taxonomy ] = $terms;
 				}
@@ -4534,31 +4568,31 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			}
 
 			if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
-				wp_set_post_terms( $post_ID, $tags, $taxonomy );
+				wp_set_post_terms( $post_id, $tags, $taxonomy );
 			}
 		}
 	}
 
 	if ( ! empty( $postarr['meta_input'] ) ) {
 		foreach ( $postarr['meta_input'] as $field => $value ) {
-			update_post_meta( $post_ID, $field, $value );
+			update_post_meta( $post_id, $field, $value );
 		}
 	}
 
-	$current_guid = get_post_field( 'guid', $post_ID );
+	$current_guid = get_post_field( 'guid', $post_id );
 
 	// Set GUID.
 	if ( ! $update && '' === $current_guid ) {
-		$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
+		$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_id ) ), $where );
 	}
 
 	if ( 'attachment' === $postarr['post_type'] ) {
 		if ( ! empty( $postarr['file'] ) ) {
-			update_attached_file( $post_ID, $postarr['file'] );
+			update_attached_file( $post_id, $postarr['file'] );
 		}
 
 		if ( ! empty( $postarr['context'] ) ) {
-			add_post_meta( $post_ID, '_wp_attachment_context', $postarr['context'], true );
+			add_post_meta( $post_id, '_wp_attachment_context', $postarr['context'], true );
 		}
 	}
 
@@ -4567,9 +4601,9 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' ) || 'revision' === $post_type;
 
 		if ( ! $thumbnail_support && 'attachment' === $post_type && $post_mime_type ) {
-			if ( wp_attachment_is( 'audio', $post_ID ) ) {
+			if ( wp_attachment_is( 'audio', $post_id ) ) {
 				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-			} elseif ( wp_attachment_is( 'video', $post_ID ) ) {
+			} elseif ( wp_attachment_is( 'video', $post_id ) ) {
 				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
 			}
 		}
@@ -4577,16 +4611,16 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		if ( $thumbnail_support ) {
 			$thumbnail_id = (int) $postarr['_thumbnail_id'];
 			if ( -1 === $thumbnail_id ) {
-				delete_post_thumbnail( $post_ID );
+				delete_post_thumbnail( $post_id );
 			} else {
-				set_post_thumbnail( $post_ID, $thumbnail_id );
+				set_post_thumbnail( $post_id, $thumbnail_id );
 			}
 		}
 	}
 
-	clean_post_cache( $post_ID );
+	clean_post_cache( $post_id );
 
-	$post = get_post( $post_ID );
+	$post = get_post( $post_id );
 
 	if ( ! empty( $postarr['page_template'] ) ) {
 		$post->page_template = $postarr['page_template'];
@@ -4597,9 +4631,9 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 				return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
 			}
 
-			update_post_meta( $post_ID, '_wp_page_template', 'default' );
+			update_post_meta( $post_id, '_wp_page_template', 'default' );
 		} else {
-			update_post_meta( $post_ID, '_wp_page_template', $postarr['page_template'] );
+			update_post_meta( $post_id, '_wp_page_template', $postarr['page_template'] );
 		}
 	}
 
@@ -4612,22 +4646,22 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			 *
 			 * @since 2.0.0
 			 *
-			 * @param int $post_ID Attachment ID.
+			 * @param int $post_id Attachment ID.
 			 */
-			do_action( 'edit_attachment', $post_ID );
+			do_action( 'edit_attachment', $post_id );
 
-			$post_after = get_post( $post_ID );
+			$post_after = get_post( $post_id );
 
 			/**
 			 * Fires once an existing attachment has been updated.
 			 *
 			 * @since 4.4.0
 			 *
-			 * @param int     $post_ID      Post ID.
+			 * @param int     $post_id      Post ID.
 			 * @param WP_Post $post_after   Post object following the update.
 			 * @param WP_Post $post_before  Post object before the update.
 			 */
-			do_action( 'attachment_updated', $post_ID, $post_after, $post_before );
+			do_action( 'attachment_updated', $post_id, $post_after, $post_before );
 		} else {
 
 			/**
@@ -4635,12 +4669,12 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 			 *
 			 * @since 2.0.0
 			 *
-			 * @param int $post_ID Attachment ID.
+			 * @param int $post_id Attachment ID.
 			 */
-			do_action( 'add_attachment', $post_ID );
+			do_action( 'add_attachment', $post_id );
 		}
 
-		return $post_ID;
+		return $post_id;
 	}
 
 	if ( $update ) {
@@ -4657,33 +4691,33 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 		 *
 		 * @since 5.1.0
 		 *
-		 * @param int     $post_ID Post ID.
+		 * @param int     $post_id Post ID.
 		 * @param WP_Post $post    Post object.
 		 */
-		do_action( "edit_post_{$post->post_type}", $post_ID, $post );
+		do_action( "edit_post_{$post->post_type}", $post_id, $post );
 
 		/**
 		 * Fires once an existing post has been updated.
 		 *
 		 * @since 1.2.0
 		 *
-		 * @param int     $post_ID Post ID.
+		 * @param int     $post_id Post ID.
 		 * @param WP_Post $post    Post object.
 		 */
-		do_action( 'edit_post', $post_ID, $post );
+		do_action( 'edit_post', $post_id, $post );
 
-		$post_after = get_post( $post_ID );
+		$post_after = get_post( $post_id );
 
 		/**
 		 * Fires once an existing post has been updated.
 		 *
 		 * @since 3.0.0
 		 *
-		 * @param int     $post_ID      Post ID.
+		 * @param int     $post_id      Post ID.
 		 * @param WP_Post $post_after   Post object following the update.
 		 * @param WP_Post $post_before  Post object before the update.
 		 */
-		do_action( 'post_updated', $post_ID, $post_after, $post_before );
+		do_action( 'post_updated', $post_id, $post_after, $post_before );
 	}
 
 	/**
@@ -4699,39 +4733,39 @@ function wp_insert_post( $postarr, $wp_error = false, $fire_after_hooks = true )
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param int     $post_ID Post ID.
+	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated.
 	 */
-	do_action( "save_post_{$post->post_type}", $post_ID, $post, $update );
+	do_action( "save_post_{$post->post_type}", $post_id, $post, $update );
 
 	/**
 	 * Fires once a post has been saved.
 	 *
 	 * @since 1.5.0
 	 *
-	 * @param int     $post_ID Post ID.
+	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated.
 	 */
-	do_action( 'save_post', $post_ID, $post, $update );
+	do_action( 'save_post', $post_id, $post, $update );
 
 	/**
 	 * Fires once a post has been saved.
 	 *
 	 * @since 2.0.0
 	 *
-	 * @param int     $post_ID Post ID.
+	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated.
 	 */
-	do_action( 'wp_insert_post', $post_ID, $post, $update );
+	do_action( 'wp_insert_post', $post_id, $post, $update );
 
 	if ( $fire_after_hooks ) {
 		wp_after_insert_post( $post, $update, $post_before );
 	}
 
-	return $post_ID;
+	return $post_id;
 }
 
 /**
@@ -4940,8 +4974,8 @@ function check_and_publish_future_post( $post ) {
  *
  * @since 5.7.0
  *
- * @param string $post_date     The date in mysql format.
- * @param string $post_date_gmt The GMT date in mysql format.
+ * @param string $post_date     The date in mysql format (`Y-m-d H:i:s`).
+ * @param string $post_date_gmt The GMT date in mysql format (`Y-m-d H:i:s`).
  * @return string|false A valid Gregorian-calendar date string, or false on failure.
  */
 function wp_resolve_post_date( $post_date = '', $post_date_gmt = '' ) {
@@ -4976,13 +5010,13 @@ function wp_resolve_post_date( $post_date = '', $post_date_gmt = '' ) {
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
  *
  * @param string $slug        The desired slug (post_name).
- * @param int    $post_ID     Post ID.
+ * @param int    $post_id     Post ID.
  * @param string $post_status No uniqueness checks are made if the post is still draft or pending.
  * @param string $post_type   Post type.
  * @param int    $post_parent Post parent ID.
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
-function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
+function wp_unique_post_slug( $slug, $post_id, $post_status, $post_type, $post_parent ) {
 	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ), true )
 		|| ( 'inherit' === $post_status && 'revision' === $post_type ) || 'user_request' === $post_type
 	) {
@@ -4999,12 +5033,12 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 	 *
 	 * @param string|null $override_slug Short-circuit return value.
 	 * @param string      $slug          The desired slug (post_name).
-	 * @param int         $post_ID       Post ID.
+	 * @param int         $post_id       Post ID.
 	 * @param string      $post_status   The post status.
 	 * @param string      $post_type     Post type.
 	 * @param int         $post_parent   Post parent ID.
 	 */
-	$override_slug = apply_filters( 'pre_wp_unique_post_slug', null, $slug, $post_ID, $post_status, $post_type, $post_parent );
+	$override_slug = apply_filters( 'pre_wp_unique_post_slug', null, $slug, $post_id, $post_status, $post_type, $post_parent );
 	if ( null !== $override_slug ) {
 		return $override_slug;
 	}
@@ -5021,7 +5055,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 	if ( 'attachment' === $post_type ) {
 		// Attachment slugs must be unique across all types.
 		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
+		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_id ) );
 
 		/**
 		 * Filters whether the post slug would make a bad attachment slug.
@@ -5040,7 +5074,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 			$suffix = 2;
 			do {
 				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
+				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_id ) );
 				$suffix++;
 			} while ( $post_name_check );
 			$slug = $alt_post_name;
@@ -5055,7 +5089,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 		 * namespace than posts so page slugs are allowed to overlap post slugs.
 		 */
 		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_id, $post_parent ) );
 
 		/**
 		 * Filters whether the post slug would make a bad hierarchical post slug.
@@ -5077,7 +5111,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 			$suffix = 2;
 			do {
 				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
+				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_id, $post_parent ) );
 				$suffix++;
 			} while ( $post_name_check );
 			$slug = $alt_post_name;
@@ -5085,9 +5119,9 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 	} else {
 		// Post slugs must be unique across all posts.
 		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
+		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_id ) );
 
-		$post = get_post( $post_ID );
+		$post = get_post( $post_id );
 
 		// Prevent new post slugs that could result in URLs that conflict with date archives.
 		$conflicts_with_date_archive = false;
@@ -5133,7 +5167,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 			$suffix = 2;
 			do {
 				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_id ) );
 				$suffix++;
 			} while ( $post_name_check );
 			$slug = $alt_post_name;
@@ -5146,13 +5180,13 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 	 * @since 3.3.0
 	 *
 	 * @param string $slug          The post slug.
-	 * @param int    $post_ID       Post ID.
+	 * @param int    $post_id       Post ID.
 	 * @param string $post_status   The post status.
 	 * @param string $post_type     Post type.
 	 * @param int    $post_parent   Post parent ID
 	 * @param string $original_slug The original post slug.
 	 */
-	return apply_filters( 'wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug );
+	return apply_filters( 'wp_unique_post_slug', $slug, $post_id, $post_status, $post_type, $post_parent, $original_slug );
 }
 
 /**
@@ -5268,7 +5302,7 @@ function wp_set_post_terms( $post_id = 0, $terms = '', $taxonomy = 'post_tag', $
  *
  * @since 2.1.0
  *
- * @param int       $post_ID         Optional. The Post ID. Does not default to the ID
+ * @param int       $post_id         Optional. The Post ID. Does not default to the ID
  *                                   of the global $post. Default 0.
  * @param int[]|int $post_categories Optional. List of category IDs, or the ID of a single category.
  *                                   Default empty array.
@@ -5276,10 +5310,10 @@ function wp_set_post_terms( $post_id = 0, $terms = '', $taxonomy = 'post_tag', $
  *                                   If false, replace the categories with the new categories.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
  */
-function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
-	$post_ID     = (int) $post_ID;
-	$post_type   = get_post_type( $post_ID );
-	$post_status = get_post_status( $post_ID );
+function wp_set_post_categories( $post_id = 0, $post_categories = array(), $append = false ) {
+	$post_id     = (int) $post_id;
+	$post_type   = get_post_type( $post_id );
+	$post_status = get_post_status( $post_id );
 
 	// If $post_categories isn't already an array, make it one.
 	$post_categories = (array) $post_categories;
@@ -5310,7 +5344,7 @@ function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $appe
 		return true;
 	}
 
-	return wp_set_post_terms( $post_ID, $post_categories, 'category', $append );
+	return wp_set_post_terms( $post_id, $post_categories, 'category', $append );
 }
 
 /**
@@ -5677,7 +5711,7 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 
 	$hash      = md5( $page_path . serialize( $post_type ) );
 	$cache_key = "get_page_by_path:$hash:$last_changed";
-	$cached    = wp_cache_get( $cache_key, 'posts' );
+	$cached    = wp_cache_get( $cache_key, 'post-queries' );
 	if ( false !== $cached ) {
 		// Special case: '0' is a bad `$page_path`.
 		if ( '0' === $cached || 0 === $cached ) {
@@ -5734,7 +5768,7 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 				$p = $parent;
 			}
 
-			if ( 0 == $p->post_parent && count( $revparts ) == $count + 1 && $p->post_name == $revparts[ $count ] ) {
+			if ( 0 == $p->post_parent && count( $revparts ) === $count + 1 && $p->post_name == $revparts[ $count ] ) {
 				$foundid = $page->ID;
 				if ( $page->post_type == $post_type ) {
 					break;
@@ -5744,7 +5778,7 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 	}
 
 	// We cache misses as well as hits.
-	wp_cache_set( $cache_key, $foundid, 'posts' );
+	wp_cache_set( $cache_key, $foundid, 'post-queries' );
 
 	if ( $foundid ) {
 		return get_post( $foundid, $output );
@@ -5753,48 +5787,6 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 	return null;
 }
 
-/**
- * Retrieves a page given its title.
- *
- * If more than one post uses the same title, the post with the smallest ID will be returned.
- * Be careful: in case of more than one post having the same title, it will check the oldest
- * publication date, not the smallest ID.
- *
- * Because this function uses the MySQL '=' comparison, $page_title will usually be matched
- * as case-insensitive with default collation.
- *
- * @since 2.1.0
- * @since 3.0.0 The `$post_type` parameter was added.
- *
- * @param string       $page_title Page title.
- * @param string       $output     Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
- *                                 correspond to a WP_Post object, an associative array, or a numeric array,
- *                                 respectively. Default OBJECT.
- * @param string|array $post_type  Optional. Post type or array of post types. Default 'page'.
- * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
- */
-function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) {
-	$args  = array(
-		'title'                  => $page_title,
-		'post_type'              => $post_type,
-		'post_status'            => get_post_stati(),
-		'posts_per_page'         => 1,
-		'update_post_term_cache' => false,
-		'update_post_meta_cache' => false,
-		'no_found_rows'          => true,
-		'orderby'                => 'post_date ID',
-		'order'                  => 'ASC',
-	);
-	$query = new WP_Query( $args );
-	$pages = $query->posts;
-
-	if ( empty( $pages ) ) {
-		return null;
-	}
-
-	return get_post( $pages[0], $output );
-}
-
 /**
  * Identifies descendants of a given page ID in a list of page objects.
  *
@@ -5930,9 +5922,8 @@ function get_page_uri( $page = 0 ) {
 /**
  * Retrieves an array of pages (or hierarchical post type items).
  *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
  * @since 1.5.0
+ * @since 6.3.0 Use WP_Query internally.
  *
  * @param array|string $args {
  *     Optional. Array or string of arguments to retrieve pages.
@@ -5972,8 +5963,6 @@ function get_page_uri( $page = 0 ) {
  *                         supported by the post type.
  */
 function get_pages( $args = array() ) {
-	global $wpdb;
-
 	$defaults = array(
 		'child_of'     => 0,
 		'sort_order'   => 'ASC',
@@ -6022,50 +6011,35 @@ function get_pages( $args = array() ) {
 		return false;
 	}
 
-	// $args can be whatever, only use the args defined in defaults to compute the key.
-	$key          = md5( serialize( wp_array_slice_assoc( $parsed_args, array_keys( $defaults ) ) ) );
-	$last_changed = wp_cache_get_last_changed( 'posts' );
-
-	$cache_key = "get_pages:$key:$last_changed";
-	$cache     = wp_cache_get( $cache_key, 'posts' );
-	if ( false !== $cache ) {
-		_prime_post_caches( $cache, false, false );
-
-		// Convert to WP_Post instances.
-		$pages = array_map( 'get_post', $cache );
-		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', $pages, $parsed_args );
-
-		return $pages;
-	}
+	$query_args = array(
+		'orderby'                => 'post_title',
+		'order'                  => 'ASC',
+		'post__not_in'           => wp_parse_id_list( $exclude ),
+		'meta_key'               => $meta_key,
+		'meta_value'             => $meta_value,
+		'posts_per_page'         => -1,
+		'offset'                 => $offset,
+		'post_type'              => $parsed_args['post_type'],
+		'post_status'            => $post_status,
+		'update_post_term_cache' => false,
+		'update_post_meta_cache' => false,
+		'ignore_sticky_posts'    => true,
+		'no_found_rows'          => true,
+	);
 
-	$inclusions = '';
 	if ( ! empty( $parsed_args['include'] ) ) {
-		$child_of     = 0; // Ignore child_of, parent, exclude, meta_key, and meta_value params if using include.
-		$parent       = -1;
-		$exclude      = '';
-		$meta_key     = '';
-		$meta_value   = '';
-		$hierarchical = false;
-		$incpages     = wp_parse_id_list( $parsed_args['include'] );
-		if ( ! empty( $incpages ) ) {
-			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')';
-		}
+		$child_of = 0; // Ignore child_of, parent, exclude, meta_key, and meta_value params if using include.
+		$parent   = -1;
+		unset( $query_args['post__not_in'], $query_args['meta_key'], $query_args['meta_value'] );
+		$hierarchical           = false;
+		$query_args['post__in'] = wp_parse_id_list( $parsed_args['include'] );
 	}
 
-	$exclusions = '';
-	if ( ! empty( $exclude ) ) {
-		$expages = wp_parse_id_list( $exclude );
-		if ( ! empty( $expages ) ) {
-			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) . ')';
-		}
-	}
-
-	$author_query = '';
 	if ( ! empty( $parsed_args['authors'] ) ) {
 		$post_authors = wp_parse_list( $parsed_args['authors'] );
 
 		if ( ! empty( $post_authors ) ) {
+			$query_args['author__in'] = array();
 			foreach ( $post_authors as $post_author ) {
 				// Do we have an author id or an author login?
 				if ( 0 == (int) $post_author ) {
@@ -6078,136 +6052,47 @@ function get_pages( $args = array() ) {
 					}
 					$post_author = $post_author->ID;
 				}
-
-				if ( '' === $author_query ) {
-					$author_query = $wpdb->prepare( ' post_author = %d ', $post_author );
-				} else {
-					$author_query .= $wpdb->prepare( ' OR post_author = %d ', $post_author );
-				}
-			}
-			if ( '' !== $author_query ) {
-				$author_query = " AND ($author_query)";
+				$query_args['author__in'][] = (int) $post_author;
 			}
 		}
 	}
 
-	$join  = '';
-	$where = "$exclusions $inclusions ";
-	if ( '' !== $meta_key || '' !== $meta_value ) {
-		$join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
-
-		// meta_key and meta_value might be slashed.
-		$meta_key   = wp_unslash( $meta_key );
-		$meta_value = wp_unslash( $meta_value );
-		if ( '' !== $meta_key ) {
-			$where .= $wpdb->prepare( " AND $wpdb->postmeta.meta_key = %s", $meta_key );
-		}
-		if ( '' !== $meta_value ) {
-			$where .= $wpdb->prepare( " AND $wpdb->postmeta.meta_value = %s", $meta_value );
-		}
-	}
-
 	if ( is_array( $parent ) ) {
-		$post_parent__in = implode( ',', array_map( 'absint', (array) $parent ) );
+		$post_parent__in = array_map( 'absint', (array) $parent );
 		if ( ! empty( $post_parent__in ) ) {
-			$where .= " AND post_parent IN ($post_parent__in)";
+			$query_args['post_parent__in'] = $post_parent__in;
 		}
 	} elseif ( $parent >= 0 ) {
-		$where .= $wpdb->prepare( ' AND post_parent = %d ', $parent );
-	}
-
-	if ( 1 === count( $post_status ) ) {
-		$where_post_type = $wpdb->prepare( 'post_type = %s AND post_status = %s', $parsed_args['post_type'], reset( $post_status ) );
-	} else {
-		$post_status     = implode( "', '", $post_status );
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $parsed_args['post_type'] );
+		$query_args['post_parent'] = $parent;
 	}
 
-	$orderby_array = array();
-	$allowed_keys  = array(
-		'author',
-		'post_author',
-		'date',
-		'post_date',
-		'title',
-		'post_title',
-		'name',
-		'post_name',
-		'modified',
-		'post_modified',
-		'modified_gmt',
-		'post_modified_gmt',
-		'menu_order',
-		'parent',
-		'post_parent',
-		'ID',
-		'rand',
-		'comment_count',
-	);
-
-	foreach ( explode( ',', $parsed_args['sort_column'] ) as $orderby ) {
-		$orderby = trim( $orderby );
-		if ( ! in_array( $orderby, $allowed_keys, true ) ) {
-			continue;
-		}
-
-		switch ( $orderby ) {
-			case 'menu_order':
-				break;
-			case 'ID':
-				$orderby = "$wpdb->posts.ID";
-				break;
-			case 'rand':
-				$orderby = 'RAND()';
-				break;
-			case 'comment_count':
-				$orderby = "$wpdb->posts.comment_count";
-				break;
-			default:
-				if ( 0 === strpos( $orderby, 'post_' ) ) {
-					$orderby = "$wpdb->posts." . $orderby;
-				} else {
-					$orderby = "$wpdb->posts.post_" . $orderby;
-				}
-		}
-
-		$orderby_array[] = $orderby;
-
+	$orderby = wp_parse_list( $parsed_args['sort_column'] );
+	$orderby = array_map( 'trim', $orderby );
+	if ( $orderby ) {
+		$query_args['orderby'] = array_fill_keys( $orderby, $parsed_args['sort_order'] );
 	}
-	$sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
 
-	$sort_order = strtoupper( $parsed_args['sort_order'] );
-	if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ), true ) ) {
-		$sort_order = 'ASC';
+	$order = $parsed_args['sort_order'];
+	if ( $order ) {
+		$query_args['order'] = $order;
 	}
 
-	$query  = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
-	$query .= $author_query;
-	$query .= ' ORDER BY ' . $sort_column . ' ' . $sort_order;
-
 	if ( ! empty( $number ) ) {
-		$query .= ' LIMIT ' . $offset . ',' . $number;
-	}
-
-	$pages = $wpdb->get_results( $query );
-
-	if ( empty( $pages ) ) {
-		wp_cache_set( $cache_key, array(), 'posts' );
-
-		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', array(), $parsed_args );
-
-		return $pages;
+		$query_args['posts_per_page'] = $number;
 	}
 
-	// Sanitize before caching so it'll only get done once.
-	$num_pages = count( $pages );
-	for ( $i = 0; $i < $num_pages; $i++ ) {
-		$pages[ $i ] = sanitize_post( $pages[ $i ], 'raw' );
-	}
+	/**
+	 * Filters query arguments passed to WP_Query in get_pages.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array $query_args  Array of arguments passed to WP_Query.
+	 * @param array $parsed_args Array of get_pages() arguments.
+	 */
+	$query_args = apply_filters( 'get_pages_query_args', $query_args, $parsed_args );
 
-	// Update cache.
-	update_post_cache( $pages );
+	$query = new WP_Query( $query_args );
+	$pages = $query->get_posts();
 
 	if ( $child_of || $hierarchical ) {
 		$pages = get_page_children( $child_of, $pages );
@@ -6230,16 +6115,6 @@ function get_pages( $args = array() ) {
 		}
 	}
 
-	$page_structure = array();
-	foreach ( $pages as $page ) {
-		$page_structure[] = $page->ID;
-	}
-
-	wp_cache_set( $cache_key, $page_structure, 'posts' );
-
-	// Convert to WP_Post instances.
-	$pages = array_map( 'get_post', $pages );
-
 	/**
 	 * Filters the retrieved list of pages.
 	 *
@@ -6268,10 +6143,10 @@ function get_pages( $args = array() ) {
  * @return bool True on success, false on failure.
  */
 function is_local_attachment( $url ) {
-	if ( strpos( $url, home_url() ) === false ) {
+	if ( ! str_contains( $url, home_url() ) ) {
 		return false;
 	}
-	if ( strpos( $url, home_url( '/?attachment_id=' ) ) !== false ) {
+	if ( str_contains( $url, home_url( '/?attachment_id=' ) ) ) {
 		return true;
 	}
 
@@ -6306,13 +6181,13 @@ function is_local_attachment( $url ) {
  * @see wp_insert_post()
  *
  * @param string|array $args             Arguments for inserting an attachment.
- * @param string|false $file             Optional. Filename.
- * @param int          $parent           Optional. Parent post ID.
+ * @param string|false $file             Optional. Filename. Default false.
+ * @param int          $parent_post_id   Optional. Parent post ID or 0 for no parent. Default 0.
  * @param bool         $wp_error         Optional. Whether to return a WP_Error on failure. Default false.
  * @param bool         $fire_after_hooks Optional. Whether to fire the after insert hooks. Default true.
  * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
  */
-function wp_insert_attachment( $args, $file = false, $parent = 0, $wp_error = false, $fire_after_hooks = true ) {
+function wp_insert_attachment( $args, $file = false, $parent_post_id = 0, $wp_error = false, $fire_after_hooks = true ) {
 	$defaults = array(
 		'file'        => $file,
 		'post_parent' => 0,
@@ -6320,8 +6195,8 @@ function wp_insert_attachment( $args, $file = false, $parent = 0, $wp_error = fa
 
 	$data = wp_parse_args( $args, $defaults );
 
-	if ( ! empty( $parent ) ) {
-		$data['post_parent'] = $parent;
+	if ( ! empty( $parent_post_id ) ) {
+		$data['post_parent'] = $parent_post_id;
 	}
 
 	$data['post_type'] = 'attachment';
@@ -6651,10 +6526,10 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
 		$uploads = wp_get_upload_dir();
 		if ( $uploads && false === $uploads['error'] ) {
 			// Check that the upload base exists in the file location.
-			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
+			if ( str_starts_with( $file, $uploads['basedir'] ) ) {
 				// Replace file location with url location.
 				$url = str_replace( $uploads['basedir'], $uploads['baseurl'], $file );
-			} elseif ( false !== strpos( $file, 'wp-content/uploads' ) ) {
+			} elseif ( str_contains( $file, 'wp-content/uploads' ) ) {
 				// Get the directory name relative to the basedir (back compat for pre-2.7 uploads).
 				$url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . wp_basename( $file );
 			} else {
@@ -6739,8 +6614,10 @@ function wp_get_attachment_caption( $post_id = 0 ) {
 function wp_get_attachment_thumb_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
 
-	// This uses image_downsize() which also looks for the (very) old format $image_meta['thumb']
-	// when the newer format $image_meta['sizes']['thumbnail'] doesn't exist.
+	/*
+	 * This uses image_downsize() which also looks for the (very) old format $image_meta['thumb']
+	 * when the newer format $image_meta['sizes']['thumbnail'] doesn't exist.
+	 */
 	$thumbnail_url = wp_get_attachment_image_url( $post_id, 'thumbnail' );
 
 	if ( empty( $thumbnail_url ) ) {
@@ -6780,7 +6657,7 @@ function wp_attachment_is( $type, $post = null ) {
 		return false;
 	}
 
-	if ( 0 === strpos( $post->post_mime_type, $type . '/' ) ) {
+	if ( str_starts_with( $post->post_mime_type, $type . '/' ) ) {
 		return true;
 	}
 
@@ -6906,7 +6783,7 @@ function wp_mime_type_icon( $mime = 0 ) {
 				if ( $dh ) {
 					while ( false !== $file = readdir( $dh ) ) {
 						$file = wp_basename( $file );
-						if ( '.' === substr( $file, 0, 1 ) ) {
+						if ( str_starts_with( $file, '.' ) ) {
 							continue;
 						}
 
@@ -7399,7 +7276,7 @@ function clean_post_cache( $post ) {
 		do_action( 'clean_page_cache', $post->ID );
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'posts' );
+	wp_cache_set_posts_last_changed();
 }
 
 /**
@@ -7461,6 +7338,15 @@ function update_post_caches( &$posts, $post_type = 'post', $update_term_cache =
  * @param WP_Post[] $posts Array of post objects.
  */
 function update_post_author_caches( $posts ) {
+	/*
+	 * cache_users() is a pluggable function so is not available prior
+	 * to the `plugins_loaded` hook firing. This is to ensure against
+	 * fatal errors when the function is not available.
+	 */
+	if ( ! function_exists( 'cache_users' ) ) {
+		return;
+	}
+
 	$author_ids = wp_list_pluck( $posts, 'post_author' );
 	$author_ids = array_map( 'absint', $author_ids );
 	$author_ids = array_unique( array_filter( $author_ids ) );
@@ -7687,37 +7573,37 @@ function wp_get_post_parent_id( $post = null ) {
  * @see wp_find_hierarchy_loop()
  *
  * @param int $post_parent ID of the parent for the post we're checking.
- * @param int $post_ID     ID of the post we're checking.
+ * @param int $post_id     ID of the post we're checking.
  * @return int The new post_parent for the post, 0 otherwise.
  */
-function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
+function wp_check_post_hierarchy_for_loops( $post_parent, $post_id ) {
 	// Nothing fancy here - bail.
 	if ( ! $post_parent ) {
 		return 0;
 	}
 
 	// New post can't cause a loop.
-	if ( ! $post_ID ) {
+	if ( ! $post_id ) {
 		return $post_parent;
 	}
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID ) {
+	if ( $post_parent == $post_id ) {
 		return 0;
 	}
 
 	// Now look for larger loops.
-	$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent );
+	$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_id, $post_parent );
 	if ( ! $loop ) {
 		return $post_parent; // No loop.
 	}
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[ $post_ID ] ) ) {
+	if ( isset( $loop[ $post_id ] ) ) {
 		return 0;
 	}
 
-	// There's a loop, but it doesn't contain $post_ID. Break the loop.
+	// There's a loop, but it doesn't contain $post_id. Break the loop.
 	foreach ( array_keys( $loop ) as $loop_member ) {
 		wp_update_post(
 			array(
@@ -7795,7 +7681,7 @@ function wp_delete_auto_drafts() {
  */
 function wp_queue_posts_for_term_meta_lazyload( $posts ) {
 	$post_type_taxonomies = array();
-	$term_ids             = array();
+	$prime_post_terms     = array();
 	foreach ( $posts as $post ) {
 		if ( ! ( $post instanceof WP_Post ) ) {
 			continue;
@@ -7806,22 +7692,32 @@ function wp_queue_posts_for_term_meta_lazyload( $posts ) {
 		}
 
 		foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
-			// Term cache should already be primed by `update_post_term_cache()`.
-			$terms = get_object_term_cache( $post->ID, $taxonomy );
-			if ( false !== $terms ) {
-				foreach ( $terms as $term ) {
-					if ( ! in_array( $term->term_id, $term_ids, true ) ) {
-						$term_ids[] = $term->term_id;
+			$prime_post_terms[ $taxonomy ][] = $post->ID;
+		}
+	}
+
+	$term_ids = array();
+	if ( $prime_post_terms ) {
+		foreach ( $prime_post_terms as $taxonomy => $post_ids ) {
+			$cached_term_ids = wp_cache_get_multiple( $post_ids, "{$taxonomy}_relationships" );
+			if ( is_array( $cached_term_ids ) ) {
+				$cached_term_ids = array_filter( $cached_term_ids );
+				foreach ( $cached_term_ids as $_term_ids ) {
+					// Backward compatibility for if a plugin is putting objects into the cache, rather than IDs.
+					foreach ( $_term_ids as $term_id ) {
+						if ( is_numeric( $term_id ) ) {
+							$term_ids[] = (int) $term_id;
+						} elseif ( isset( $term_id->term_id ) ) {
+							$term_ids[] = (int) $term_id->term_id;
+						}
 					}
 				}
 			}
 		}
+		$term_ids = array_unique( $term_ids );
 	}
 
-	if ( $term_ids ) {
-		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'term', $term_ids );
-	}
+	wp_lazyload_term_meta( $term_ids );
 }
 
 /**
@@ -7851,7 +7747,9 @@ function _update_term_count_on_transition_post_status( $new_status, $old_status,
  * @since 3.4.0
  * @since 6.1.0 This function is no longer marked as "private".
  *
- * @see update_post_caches()
+ * @see update_post_cache()
+ * @see update_postmeta_cache()
+ * @see update_object_term_cache()
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -7866,7 +7764,20 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache
 	if ( ! empty( $non_cached_ids ) ) {
 		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", implode( ',', $non_cached_ids ) ) );
 
-		update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+		if ( $fresh_posts ) {
+			// Despite the name, update_post_cache() expects an array rather than a single post.
+			update_post_cache( $fresh_posts );
+		}
+	}
+
+	if ( $update_meta_cache ) {
+		update_postmeta_cache( $ids );
+	}
+
+	if ( $update_term_cache ) {
+		$post_types = array_map( 'get_post_type', $ids );
+		$post_types = array_unique( $post_types );
+		update_object_term_cache( $ids, $post_types );
 	}
 }
 
@@ -7882,16 +7793,16 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache
  * @access private
  *
  * @param string $post_name Post slug.
- * @param int    $post_ID   Optional. Post ID that should be ignored. Default 0.
+ * @param int    $post_id   Optional. Post ID that should be ignored. Default 0.
  */
-function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
+function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_id = 0 ) {
 	$trashed_posts_with_desired_slug = get_posts(
 		array(
 			'name'         => $post_name,
 			'post_status'  => 'trash',
 			'post_type'    => 'any',
 			'nopaging'     => true,
-			'post__not_in' => array( $post_ID ),
+			'post__not_in' => array( $post_id ),
 		)
 	);
 
@@ -7913,6 +7824,8 @@ function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post
  * @since 4.5.0
  * @access private
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param WP_Post $post The post.
  * @return string New slug for the post.
  */
@@ -7921,7 +7834,7 @@ function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
 
 	$post = get_post( $post );
 
-	if ( '__trashed' === substr( $post->post_name, -9 ) ) {
+	if ( str_ends_with( $post->post_name, '__trashed' ) ) {
 		return $post->post_name;
 	}
 	add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name );
@@ -7937,7 +7850,7 @@ function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
  * @since 5.0.0
  */
 function wp_cache_set_posts_last_changed() {
-	wp_cache_set( 'last_changed', microtime(), 'posts' );
+	wp_cache_set_last_changed( 'posts' );
 }
 
 /**
@@ -7953,8 +7866,21 @@ function wp_cache_set_posts_last_changed() {
 function get_available_post_mime_types( $type = 'attachment' ) {
 	global $wpdb;
 
-	$types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) );
-	return $types;
+	/**
+	 * Filters the list of available post MIME types for the given post type.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string[]|null $mime_types An array of MIME types. Default null.
+	 * @param string        $type       The post type name. Usually 'attachment' but can be any post type.
+	 */
+	$mime_types = apply_filters( 'get_available_post_mime_types', null, $type );
+
+	if ( ! is_array( $mime_types ) ) {
+		$mime_types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) );
+	}
+
+	return $mime_types;
 }
 
 /**
@@ -8126,3 +8052,28 @@ function use_block_editor_for_post_type( $post_type ) {
 	 */
 	return apply_filters( 'use_block_editor_for_post_type', true, $post_type );
 }
+
+/**
+ * Registers any additional post meta fields.
+ *
+ * @since 6.3.0 Adds `wp_pattern_sync_status` meta field to the wp_block post type so an unsynced option can be added.
+ *
+ * @link https://github.com/WordPress/gutenberg/pull/51144
+ */
+function wp_create_initial_post_meta() {
+	register_post_meta(
+		'wp_block',
+		'wp_pattern_sync_status',
+		array(
+			'sanitize_callback' => 'sanitize_text_field',
+			'single'            => true,
+			'type'              => 'string',
+			'show_in_rest'      => array(
+				'schema' => array(
+					'type' => 'string',
+					'enum' => array( 'partial', 'unsynced' ),
+				),
+			),
+		)
+	);
+}
diff --git a/src/wp-includes/query.php b/src/wp-includes/query.php
index c980c73286cae..94c6453b6637b 100644
--- a/src/wp-includes/query.php
+++ b/src/wp-includes/query.php
@@ -15,17 +15,18 @@
  * Retrieves the value of a query variable in the WP_Query class.
  *
  * @since 1.5.0
- * @since 3.9.0 The `$default` argument was introduced.
+ * @since 3.9.0 The `$default_value` argument was introduced.
  *
  * @global WP_Query $wp_query WordPress Query object.
  *
- * @param string $var       The variable key to retrieve.
- * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
+ * @param string $query_var     The variable key to retrieve.
+ * @param mixed  $default_value Optional. Value to return if the query variable is not set.
+ *                              Default empty string.
  * @return mixed Contents of the query variable.
  */
-function get_query_var( $var, $default = '' ) {
+function get_query_var( $query_var, $default_value = '' ) {
 	global $wp_query;
-	return $wp_query->get( $var, $default );
+	return $wp_query->get( $query_var, $default_value );
 }
 
 /**
@@ -67,12 +68,12 @@ function get_queried_object_id() {
  *
  * @global WP_Query $wp_query WordPress Query object.
  *
- * @param string $var   Query variable key.
- * @param mixed  $value Query variable value.
+ * @param string $query_var Query variable key.
+ * @param mixed  $value     Query variable value.
  */
-function set_query_var( $var, $value ) {
+function set_query_var( $query_var, $value ) {
 	global $wp_query;
-	$wp_query->set( $var, $value );
+	$wp_query->set( $query_var, $value );
 }
 
 /**
@@ -450,7 +451,7 @@ function is_comment_feed() {
  * If you set a static page for the front page of your site, this function will return
  * true when viewing that page.
  *
- * Otherwise the same as @see is_home()
+ * Otherwise the same as {@see is_home()}.
  *
  * For more information on this and similar theme functions, check out
  * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
@@ -1138,8 +1139,10 @@ function _find_post_by_old_slug( $post_type ) {
 
 	$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, get_query_var( 'name' ) );
 
-	// If year, monthnum, or day have been specified, make our query more precise
-	// just in case there are multiple identical _wp_old_slug values.
+	/*
+	 * If year, monthnum, or day have been specified, make our query more precise
+	 * just in case there are multiple identical _wp_old_slug values.
+	 */
 	if ( get_query_var( 'year' ) ) {
 		$query .= $wpdb->prepare( ' AND YEAR(post_date) = %d', get_query_var( 'year' ) );
 	}
@@ -1153,12 +1156,12 @@ function _find_post_by_old_slug( $post_type ) {
 	$key          = md5( $query );
 	$last_changed = wp_cache_get_last_changed( 'posts' );
 	$cache_key    = "find_post_by_old_slug:$key:$last_changed";
-	$cache        = wp_cache_get( $cache_key, 'posts' );
+	$cache        = wp_cache_get( $cache_key, 'post-queries' );
 	if ( false !== $cache ) {
 		$id = $cache;
 	} else {
 		$id = (int) $wpdb->get_var( $query );
-		wp_cache_set( $cache_key, $id, 'posts' );
+		wp_cache_set( $cache_key, $id, 'post-queries' );
 	}
 
 	return $id;
@@ -1196,7 +1199,7 @@ function _find_post_by_old_date( $post_type ) {
 		$key          = md5( $query );
 		$last_changed = wp_cache_get_last_changed( 'posts' );
 		$cache_key    = "find_post_by_old_date:$key:$last_changed";
-		$cache        = wp_cache_get( $cache_key, 'posts' );
+		$cache        = wp_cache_get( $cache_key, 'post-queries' );
 		if ( false !== $cache ) {
 			$id = $cache;
 		} else {
@@ -1205,7 +1208,7 @@ function _find_post_by_old_date( $post_type ) {
 				// Check to see if an old slug matches the old date.
 				$id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts, $wpdb->postmeta AS pm_slug, $wpdb->postmeta AS pm_date WHERE ID = pm_slug.post_id AND ID = pm_date.post_id AND post_type = %s AND pm_slug.meta_key = '_wp_old_slug' AND pm_slug.meta_value = %s AND pm_date.meta_key = '_wp_old_date'" . $date_query, $post_type, get_query_var( 'name' ) ) );
 			}
-			wp_cache_set( $cache_key, $id, 'posts' );
+			wp_cache_set( $cache_key, $id, 'post-queries' );
 		}
 	}
 
diff --git a/src/wp-includes/random_compat/byte_safe_strings.php b/src/wp-includes/random_compat/byte_safe_strings.php
deleted file mode 100644
index ef24488f9e7bf..0000000000000
--- a/src/wp-includes/random_compat/byte_safe_strings.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING')
-            &&
-        ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-
-            return (int) mb_strlen($binary_string, '8bit');
-        }
-
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return (int) strlen($binary_string);
-        }
-    }
-}
-
-if (!is_callable('RandomCompat_substr')) {
-
-    if (
-        defined('MB_OVERLOAD_STRING')
-            &&
-        ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int|null $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
-
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
-
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                /** @var int $length */
-                $length = RandomCompat_strlen($binary_string) - $start;
-            } elseif (!is_int($length)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                );
-            }
-
-            // Consistency with PHP's behavior
-            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
-                return '';
-            }
-            if ($start > RandomCompat_strlen($binary_string)) {
-                return '';
-            }
-
-            return (string) mb_substr(
-                (string) $binary_string,
-                (int) $start,
-                (int) $length,
-                '8bit'
-            );
-        }
-
-    } else {
-
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int|null $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
-
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
-
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
-
-                return (string) substr(
-                    (string )$binary_string,
-                    (int) $start,
-                    (int) $length
-                );
-            }
-
-            return (string) substr(
-                (string) $binary_string,
-                (int) $start
-            );
-        }
-    }
-}
diff --git a/src/wp-includes/random_compat/cast_to_int.php b/src/wp-includes/random_compat/cast_to_int.php
deleted file mode 100644
index 1b1bbfe8dee1b..0000000000000
--- a/src/wp-includes/random_compat/cast_to_int.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('RandomCompat_intval')) {
-
-    /**
-     * Cast to an integer if we can, safely.
-     *
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     *
-     * @param int|float $number    The number we want to convert to an int
-     * @param bool      $fail_open Set to true to not throw an exception
-     *
-     * @return float|int
-     * @psalm-suppress InvalidReturnType
-     *
-     * @throws TypeError
-     */
-    function RandomCompat_intval($number, $fail_open = false)
-    {
-        if (is_int($number) || is_float($number)) {
-            $number += 0;
-        } elseif (is_numeric($number)) {
-            /** @psalm-suppress InvalidOperand */
-            $number += 0;
-        }
-        /** @var int|float $number */
-
-        if (
-            is_float($number)
-                &&
-            $number > ~PHP_INT_MAX
-                &&
-            $number < PHP_INT_MAX
-        ) {
-            $number = (int) $number;
-        }
-
-        if (is_int($number)) {
-            return (int) $number;
-        } elseif (!$fail_open) {
-            throw new TypeError(
-                'Expected an integer.'
-            );
-        }
-        return $number;
-    }
-}
diff --git a/src/wp-includes/random_compat/error_polyfill.php b/src/wp-includes/random_compat/error_polyfill.php
deleted file mode 100644
index c02c5c8b4cdba..0000000000000
--- a/src/wp-includes/random_compat/error_polyfill.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!class_exists('Error', false)) {
-    // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception
-    {
-
-    }
-}
-
-if (!class_exists('TypeError', false)) {
-    if (is_subclass_of('Error', 'Exception')) {
-        class TypeError extends Error
-        {
-
-        }
-    } else {
-        class TypeError extends Exception
-        {
-
-        }
-    }
-}
diff --git a/src/wp-includes/random_compat/random.php b/src/wp-includes/random_compat/random.php
deleted file mode 100644
index 9429ec3018e44..0000000000000
--- a/src/wp-includes/random_compat/random.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * @version 2.0.17
- * @released 2018-07-04
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!defined('PHP_VERSION_ID')) {
-    // This constant was introduced in PHP 5.2.7
-    $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
-    define(
-        'PHP_VERSION_ID',
-        $RandomCompatversion[0] * 10000
-        + $RandomCompatversion[1] * 100
-        + $RandomCompatversion[2]
-    );
-    $RandomCompatversion = null;
-}
-
-/**
- * PHP 7.0.0 and newer have these functions natively.
- */
-if (PHP_VERSION_ID >= 70000) {
-    return;
-}
-
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
-}
-
-$RandomCompatDIR = dirname(__FILE__);
-
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'byte_safe_strings.php';
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'cast_to_int.php';
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'error_polyfill.php';
-
-if (!is_callable('random_bytes')) {
-    /**
-     * PHP 5.2.0 - 5.6.x way to implement random_bytes()
-     *
-     * We use conditional statements here to define the function in accordance
-     * to the operating environment. It's a micro-optimization.
-     *
-     * In order of preference:
-     *   1. Use libsodium if available.
-     *   2. fread() /dev/urandom if available (never on Windows)
-     *   3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
-     *   4. COM('CAPICOM.Utilities.1')->GetRandom()
-     *
-     * See RATIONALE.md for our reasoning behind this particular order
-     */
-    if (extension_loaded('libsodium')) {
-        // See random_bytes_libsodium.php
-        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_libsodium.php';
-        } elseif (method_exists('Sodium', 'randombytes_buf')) {
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_libsodium_legacy.php';
-        }
-    }
-
-    /**
-     * Reading directly from /dev/urandom:
-     */
-    if (DIRECTORY_SEPARATOR === '/') {
-        // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
-        // way to exclude Windows.
-        $RandomCompatUrandom = true;
-        $RandomCompat_basedir = ini_get('open_basedir');
-
-        if (!empty($RandomCompat_basedir)) {
-            $RandomCompat_open_basedir = explode(
-                PATH_SEPARATOR,
-                strtolower($RandomCompat_basedir)
-            );
-            $RandomCompatUrandom = (array() !== array_intersect(
-                array('/dev', '/dev/', '/dev/urandom'),
-                $RandomCompat_open_basedir
-            ));
-            $RandomCompat_open_basedir = null;
-        }
-
-        if (
-            !is_callable('random_bytes')
-            &&
-            $RandomCompatUrandom
-            &&
-            @is_readable('/dev/urandom')
-        ) {
-            // Error suppression on is_readable() in case of an open_basedir
-            // or safe_mode failure. All we care about is whether or not we
-            // can read it at this point. If the PHP environment is going to
-            // panic over trying to see if the file can be read in the first
-            // place, that is not helpful to us here.
-
-            // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_dev_urandom.php';
-        }
-        // Unset variables after use
-        $RandomCompat_basedir = null;
-    } else {
-        $RandomCompatUrandom = false;
-    }
-
-    /**
-     * mcrypt_create_iv()
-     *
-     * We only want to use mcypt_create_iv() if:
-     *
-     * - random_bytes() hasn't already been defined
-     * - the mcrypt extensions is loaded
-     * - One of these two conditions is true:
-     *   - We're on Windows (DIRECTORY_SEPARATOR !== '/')
-     *   - We're not on Windows and /dev/urandom is readabale
-     *     (i.e. we're not in a chroot jail)
-     * - Special case:
-     *   - If we're not on Windows, but the PHP version is between
-     *     5.6.10 and 5.6.12, we don't want to use mcrypt. It will
-     *     hang indefinitely. This is bad.
-     *   - If we're on Windows, we want to use PHP >= 5.3.7 or else
-     *     we get insufficient entropy errors.
-     */
-    if (
-        !is_callable('random_bytes')
-        &&
-        // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
-        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
-        &&
-        // Prevent this code from hanging indefinitely on non-Windows;
-        // see https://bugs.php.net/bug.php?id=69833
-        (
-            DIRECTORY_SEPARATOR !== '/' ||
-            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
-        )
-        &&
-        extension_loaded('mcrypt')
-    ) {
-        // See random_bytes_mcrypt.php
-        require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_mcrypt.php';
-    }
-    $RandomCompatUrandom = null;
-
-    /**
-     * This is a Windows-specific fallback, for when the mcrypt extension
-     * isn't loaded.
-     */
-    if (
-        !is_callable('random_bytes')
-        &&
-        extension_loaded('com_dotnet')
-        &&
-        class_exists('COM')
-    ) {
-        $RandomCompat_disabled_classes = preg_split(
-            '#\s*,\s*#',
-            strtolower(ini_get('disable_classes'))
-        );
-
-        if (!in_array('com', $RandomCompat_disabled_classes)) {
-            try {
-                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                /** @psalm-suppress TypeDoesNotContainType */
-                if (is_callable(array($RandomCompatCOMtest, 'GetRandom'))) {
-                    // See random_bytes_com_dotnet.php
-                    require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_com_dotnet.php';
-                }
-            } catch (com_exception $e) {
-                // Don't try to use it.
-            }
-        }
-        $RandomCompat_disabled_classes = null;
-        $RandomCompatCOMtest = null;
-    }
-
-    /**
-     * throw new Exception
-     */
-    if (!is_callable('random_bytes')) {
-        /**
-         * We don't have any more options, so let's throw an exception right now
-         * and hope the developer won't let it fail silently.
-         *
-         * @param mixed $length
-         * @psalm-suppress InvalidReturnType
-         * @throws Exception
-         * @return string
-         */
-        function random_bytes($length)
-        {
-            unset($length); // Suppress "variable not used" warnings.
-            throw new Exception(
-                'There is no suitable CSPRNG installed on your system'
-            );
-            return '';
-        }
-    }
-}
-
-if (!is_callable('random_int')) {
-    require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_int.php';
-}
-
-$RandomCompatDIR = null;
diff --git a/src/wp-includes/random_compat/random_bytes_com_dotnet.php b/src/wp-includes/random_compat/random_bytes_com_dotnet.php
deleted file mode 100644
index 537d02b27a3cd..0000000000000
--- a/src/wp-includes/random_compat/random_bytes_com_dotnet.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Windows with PHP < 5.3.0 will not have the function
-     * openssl_random_pseudo_bytes() available, so let's use
-     * CAPICOM to work around this deficiency.
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /** @var string $buf */
-        $buf = '';
-        if (!class_exists('COM')) {
-            throw new Error(
-                'COM does not exist'
-            );
-        }
-        /** @var COM $util */
-        $util = new COM('CAPICOM.Utilities.1');
-        $execCount = 0;
-
-        /**
-         * Let's not let it loop forever. If we run N times and fail to
-         * get N bytes of random data, then CAPICOM has failed us.
-         */
-        do {
-            $buf .= base64_decode((string) $util->GetRandom($bytes, 0));
-            if (RandomCompat_strlen($buf) >= $bytes) {
-                /**
-                 * Return our random entropy buffer here:
-                 */
-                return (string) RandomCompat_substr($buf, 0, $bytes);
-            }
-            ++$execCount;
-        } while ($execCount < $bytes);
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/src/wp-includes/random_compat/random_bytes_dev_urandom.php b/src/wp-includes/random_compat/random_bytes_dev_urandom.php
deleted file mode 100644
index c4e31ccbbbe5e..0000000000000
--- a/src/wp-includes/random_compat/random_bytes_dev_urandom.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
-}
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Unless open_basedir is enabled, use /dev/urandom for
-     * random numbers in accordance with best practices
-     *
-     * Why we use /dev/urandom and not /dev/random
-     * @ref https://www.2uo.de/myths-about-urandom
-     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        /** @var resource $fp */
-        static $fp = null;
-
-        /**
-         * This block should only be run once
-         */
-        if (empty($fp)) {
-            /**
-             * We don't want to ever read C:\dev\random, only /dev/urandom on
-             * Unix-like operating systems. While we guard against this
-             * condition in random.php, it doesn't hurt to be defensive in depth
-             * here.
-             *
-             * To that end, we only try to open /dev/urandom if we're on a Unix-
-             * like operating system (which means the directory separator is set
-             * to "/" not "\".
-             */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
-                    throw new Exception(
-                        'Environment misconfiguration: ' .
-                        '/dev/urandom cannot be read.'
-                    );
-                }
-                /**
-                 * We use /dev/urandom if it is a char device.
-                 * We never fall back to /dev/random
-                 */
-                /** @var resource|bool $fp */
-                $fp = fopen('/dev/urandom', 'rb');
-                if (is_resource($fp)) {
-                    /** @var array<string, int> $st */
-                    $st = fstat($fp);
-                    if (($st['mode'] & 0170000) !== 020000) {
-                        fclose($fp);
-                        $fp = false;
-                    }
-                }
-            }
-
-            if (is_resource($fp)) {
-                /**
-                 * stream_set_read_buffer() does not exist in HHVM
-                 *
-                 * If we don't set the stream's read buffer to 0, PHP will
-                 * internally buffer 8192 bytes, which can waste entropy
-                 *
-                 * stream_set_read_buffer returns 0 on success
-                 */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-            }
-        }
-
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * This if() block only runs if we managed to open a file handle
-         *
-         * It does not belong in an else {} block, because the above
-         * if (empty($fp)) line is logic that should only be run once per
-         * page load.
-         */
-        if (is_resource($fp)) {
-            /**
-             * @var int
-             */
-            $remaining = $bytes;
-
-            /**
-             * @var string|bool
-             */
-            $buf = '';
-
-            /**
-             * We use fread() in a loop to protect against partial reads
-             */
-            do {
-                /**
-                 * @var string|bool
-                 */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    /**
-                     * We cannot safely read from the file. Exit the
-                     * do-while loop and trigger the exception condition
-                     *
-                     * @var string|bool
-                     */
-                    $buf = false;
-                    break;
-                }
-                /**
-                 * Decrease the number of bytes returned from remaining
-                 */
-                $remaining -= RandomCompat_strlen($read);
-                /**
-                 * @var string $buf
-                 */
-                $buf .= $read;
-            } while ($remaining > 0);
-
-            /**
-             * Is our result valid?
-             * @var string|bool $buf
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Error reading from source device'
-        );
-    }
-}
diff --git a/src/wp-includes/random_compat/random_bytes_libsodium.php b/src/wp-includes/random_compat/random_bytes_libsodium.php
deleted file mode 100644
index 2e5629018293c..0000000000000
--- a/src/wp-includes/random_compat/random_bytes_libsodium.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        /** @var string|bool $buf */
-        if ($bytes > 2147483647) {
-            $buf = '';
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= \Sodium\randombytes_buf($n);
-            }
-        } else {
-            /** @var string|bool $buf */
-            $buf = \Sodium\randombytes_buf($bytes);
-        }
-
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php b/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php
deleted file mode 100644
index f78b2199a2b6a..0000000000000
--- a/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /**
-         * @var string
-         */
-        $buf = '';
-
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        if ($bytes > 2147483647) {
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= Sodium::randombytes_buf((int) $n);
-            }
-        } else {
-            $buf .= Sodium::randombytes_buf((int) $bytes);
-        }
-
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/src/wp-includes/random_compat/random_bytes_mcrypt.php b/src/wp-includes/random_compat/random_bytes_mcrypt.php
deleted file mode 100644
index 0b13fa73c5da0..0000000000000
--- a/src/wp-includes/random_compat/random_bytes_mcrypt.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Random_* Compatibility Library
- * for using the new PHP 7 random_* API in PHP 5 projects
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-if (!is_callable('random_bytes')) {
-    /**
-     * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
-     *
-     * @ref https://bugs.php.net/bug.php?id=55169
-     * @ref https://github.com/php/php-src/blob/c568ffe5171d942161fc8dda066bce844bdef676/ext/mcrypt/mcrypt.c#L1321-L1386
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
-
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
-
-        /** @var string|bool $buf */
-        $buf = @mcrypt_create_iv((int) $bytes, (int) MCRYPT_DEV_URANDOM);
-        if (
-            is_string($buf)
-                &&
-            RandomCompat_strlen($buf) === $bytes
-        ) {
-            /**
-             * Return our random entropy buffer here:
-             */
-            return $buf;
-        }
-
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
-}
diff --git a/src/wp-includes/random_compat/random_int.php b/src/wp-includes/random_compat/random_int.php
deleted file mode 100644
index ff80dfa438ac6..0000000000000
--- a/src/wp-includes/random_compat/random_int.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-if (!is_callable('random_int')) {
-    /**
-     * Random_* Compatibility Library
-     * for using the new PHP 7 random_* API in PHP 5 projects
-     *
-     * The MIT License (MIT)
-     *
-     * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in
-     * all copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
-
-    /**
-     * Fetch a random integer between $min and $max inclusive
-     *
-     * @param int $min
-     * @param int $max
-     *
-     * @throws Exception
-     *
-     * @return int
-     */
-    function random_int($min, $max)
-    {
-        /**
-         * Type and input logic checks
-         *
-         * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-         * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-         * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
-         * lose precision, so the <= and => operators might accidentally let a float
-         * through.
-         */
-
-        try {
-            /** @var int $min */
-            $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $min must be an integer'
-            );
-        }
-
-        try {
-            /** @var int $max */
-            $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_int(): $max must be an integer'
-            );
-        }
-
-        /**
-         * Now that we've verified our weak typing system has given us an integer,
-         * let's validate the logic then we can move forward with generating random
-         * integers along a given range.
-         */
-        if ($min > $max) {
-            throw new Error(
-                'Minimum value must be less than or equal to the maximum value'
-            );
-        }
-
-        if ($max === $min) {
-            return (int) $min;
-        }
-
-        /**
-         * Initialize variables to 0
-         *
-         * We want to store:
-         * $bytes => the number of random bytes we need
-         * $mask => an integer bitmask (for use with the &) operator
-         *          so we can minimize the number of discards
-         */
-        $attempts = $bits = $bytes = $mask = $valueShift = 0;
-        /** @var int $attempts */
-        /** @var int $bits */
-        /** @var int $bytes */
-        /** @var int $mask */
-        /** @var int $valueShift */
-
-        /**
-         * At this point, $range is a positive number greater than 0. It might
-         * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-         * a float and we will lose some precision.
-         *
-         * @var int|float $range
-         */
-        $range = $max - $min;
-
-        /**
-         * Test for integer overflow:
-         */
-        if (!is_int($range)) {
-
-            /**
-             * Still safely calculate wider ranges.
-             * Provided by @CodesInChaos, @oittaa
-             *
-             * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-             *
-             * We use ~0 as a mask in this case because it generates all 1s
-             *
-             * @ref https://eval.in/400356 (32-bit)
-             * @ref http://3v4l.org/XX9r5  (64-bit)
-             */
-            $bytes = PHP_INT_SIZE;
-            /** @var int $mask */
-            $mask = ~0;
-
-        } else {
-
-            /**
-             * $bits is effectively ceil(log($range, 2)) without dealing with
-             * type juggling
-             */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
-                    ++$bytes;
-                }
-                ++$bits;
-                $range >>= 1;
-                /** @var int $mask */
-                $mask = $mask << 1 | 1;
-            }
-            $valueShift = $min;
-        }
-
-        /** @var int $val */
-        $val = 0;
-        /**
-         * Now that we have our parameters set up, let's begin generating
-         * random integers until one falls between $min and $max
-         */
-        /** @psalm-suppress RedundantCondition */
-        do {
-            /**
-             * The rejection probability is at most 0.5, so this corresponds
-             * to a failure probability of 2^-128 for a working RNG
-             */
-            if ($attempts > 128) {
-                throw new Exception(
-                    'random_int: RNG is broken - too many rejections'
-                );
-            }
-
-            /**
-             * Let's grab the necessary number of random bytes
-             */
-            $randomByteString = random_bytes($bytes);
-
-            /**
-             * Let's turn $randomByteString into an integer
-             *
-             * This uses bitwise operators (<< and |) to build an integer
-             * out of the values extracted from ord()
-             *
-             * Example: [9F] | [6D] | [32] | [0C] =>
-             *   159 + 27904 + 3276800 + 201326592 =>
-             *   204631455
-             */
-            $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
-                $val |= ord($randomByteString[$i]) << ($i * 8);
-            }
-            /** @var int $val */
-
-            /**
-             * Apply mask
-             */
-            $val &= $mask;
-            $val += $valueShift;
-
-            ++$attempts;
-            /**
-             * If $val overflows to a floating point number,
-             * ... or is larger than $max,
-             * ... or smaller than $min,
-             * then try again.
-             */
-        } while (!is_int($val) || $val > $max || $val < $min);
-
-        return (int) $val;
-    }
-}
diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php
index b611745ebd661..a8a2aac177288 100644
--- a/src/wp-includes/rest-api.php
+++ b/src/wp-includes/rest-api.php
@@ -23,16 +23,16 @@
  * @since 5.1.0 Added a `_doing_it_wrong()` notice when not called on or after the `rest_api_init` hook.
  * @since 5.5.0 Added a `_doing_it_wrong()` notice when the required `permission_callback` argument is not set.
  *
- * @param string $namespace The first URL segment after core prefix. Should be unique to your package/plugin.
- * @param string $route     The base URL for route you are adding.
- * @param array  $args      Optional. Either an array of options for the endpoint, or an array of arrays for
- *                          multiple methods. Default empty array.
- * @param bool   $override  Optional. If the route already exists, should we override it? True overrides,
- *                          false merges (with newer overriding if duplicate keys exist). Default false.
+ * @param string $route_namespace The first URL segment after core prefix. Should be unique to your package/plugin.
+ * @param string $route           The base URL for route you are adding.
+ * @param array  $args            Optional. Either an array of options for the endpoint, or an array of arrays for
+ *                                multiple methods. Default empty array.
+ * @param bool   $override        Optional. If the route already exists, should we override it? True overrides,
+ *                                false merges (with newer overriding if duplicate keys exist). Default false.
  * @return bool True on success, false on error.
  */
-function register_rest_route( $namespace, $route, $args = array(), $override = false ) {
-	if ( empty( $namespace ) ) {
+function register_rest_route( $route_namespace, $route, $args = array(), $override = false ) {
+	if ( empty( $route_namespace ) ) {
 		/*
 		 * Non-namespaced routes are not allowed, with the exception of the main
 		 * and namespace indexes. If you really need to register a
@@ -45,9 +45,9 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f
 		return false;
 	}
 
-	$clean_namespace = trim( $namespace, '/' );
+	$clean_namespace = trim( $route_namespace, '/' );
 
-	if ( $clean_namespace !== $namespace ) {
+	if ( $clean_namespace !== $route_namespace ) {
 		_doing_it_wrong( __FUNCTION__, __( 'Namespace must not start or end with a slash.' ), '5.4.2' );
 	}
 
@@ -255,15 +255,15 @@ function create_initial_rest_routes() {
 	}
 
 	// Post types.
-	$controller = new WP_REST_Post_Types_Controller;
+	$controller = new WP_REST_Post_Types_Controller();
 	$controller->register_routes();
 
 	// Post statuses.
-	$controller = new WP_REST_Post_Statuses_Controller;
+	$controller = new WP_REST_Post_Statuses_Controller();
 	$controller->register_routes();
 
 	// Taxonomies.
-	$controller = new WP_REST_Taxonomies_Controller;
+	$controller = new WP_REST_Taxonomies_Controller();
 	$controller->register_routes();
 
 	// Terms.
@@ -278,7 +278,7 @@ function create_initial_rest_routes() {
 	}
 
 	// Users.
-	$controller = new WP_REST_Users_Controller;
+	$controller = new WP_REST_Users_Controller();
 	$controller->register_routes();
 
 	// Application Passwords
@@ -286,7 +286,7 @@ function create_initial_rest_routes() {
 	$controller->register_routes();
 
 	// Comments.
-	$controller = new WP_REST_Comments_Controller;
+	$controller = new WP_REST_Comments_Controller();
 	$controller->register_routes();
 
 	$search_handlers = array(
@@ -317,16 +317,20 @@ function create_initial_rest_routes() {
 	$controller = new WP_REST_Block_Types_Controller();
 	$controller->register_routes();
 
+	// Global Styles revisions.
+	$controller = new WP_REST_Global_Styles_Revisions_Controller();
+	$controller->register_routes();
+
 	// Global Styles.
-	$controller = new WP_REST_Global_Styles_Controller;
+	$controller = new WP_REST_Global_Styles_Controller();
 	$controller->register_routes();
 
 	// Settings.
-	$controller = new WP_REST_Settings_Controller;
+	$controller = new WP_REST_Settings_Controller();
 	$controller->register_routes();
 
 	// Themes.
-	$controller = new WP_REST_Themes_Controller;
+	$controller = new WP_REST_Themes_Controller();
 	$controller->register_routes();
 
 	// Plugins.
@@ -377,6 +381,10 @@ function create_initial_rest_routes() {
 	// Site Editor Export.
 	$controller = new WP_REST_Edit_Site_Export_Controller();
 	$controller->register_routes();
+
+	// Navigation Fallback.
+	$controller = new WP_REST_Navigation_Fallback_Controller();
+	$controller->register_routes();
 }
 
 /**
@@ -465,9 +473,11 @@ function get_rest_url( $blog_id = null, $path = '/', $scheme = 'rest' ) {
 		$url .= $path;
 	} else {
 		$url = trailingslashit( get_home_url( $blog_id, '', $scheme ) );
-		// nginx only allows HTTP/1.0 methods when redirecting from / to /index.php.
-		// To work around this, we manually add index.php to the URL, avoiding the redirect.
-		if ( 'index.php' !== substr( $url, 9 ) ) {
+		/*
+		 * nginx only allows HTTP/1.0 methods when redirecting from / to /index.php.
+		 * To work around this, we manually add index.php to the URL, avoiding the redirect.
+		 */
+		if ( ! str_ends_with( $url, 'index.php' ) ) {
 			$url .= 'index.php';
 		}
 
@@ -562,7 +572,7 @@ function rest_get_server() {
 		 * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
 		 */
 		$wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
-		$wp_rest_server       = new $wp_rest_server_class;
+		$wp_rest_server       = new $wp_rest_server_class();
 
 		/**
 		 * Fires when preparing to serve a REST API request.
@@ -624,8 +634,10 @@ function rest_ensure_response( $response ) {
 		return $response;
 	}
 
-	// While WP_HTTP_Response is the base class of WP_REST_Response, it doesn't provide
-	// all the required methods used in WP_REST_Server::dispatch().
+	/*
+	 * While WP_HTTP_Response is the base class of WP_REST_Response, it doesn't provide
+	 * all the required methods used in WP_REST_Server::dispatch().
+	 */
 	if ( $response instanceof WP_HTTP_Response ) {
 		return new WP_REST_Response(
 			$response->get_data(),
@@ -642,20 +654,20 @@ function rest_ensure_response( $response ) {
  *
  * @since 4.4.0
  *
- * @param string $function    The function that was called.
- * @param string $replacement The function that should have been called.
- * @param string $version     Version.
+ * @param string $function_name The function that was called.
+ * @param string $replacement   The function that should have been called.
+ * @param string $version       Version.
  */
-function rest_handle_deprecated_function( $function, $replacement, $version ) {
+function rest_handle_deprecated_function( $function_name, $replacement, $version ) {
 	if ( ! WP_DEBUG || headers_sent() ) {
 		return;
 	}
 	if ( ! empty( $replacement ) ) {
 		/* translators: 1: Function name, 2: WordPress version number, 3: New function name. */
-		$string = sprintf( __( '%1$s (since %2$s; use %3$s instead)' ), $function, $version, $replacement );
+		$string = sprintf( __( '%1$s (since %2$s; use %3$s instead)' ), $function_name, $version, $replacement );
 	} else {
 		/* translators: 1: Function name, 2: WordPress version number. */
-		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version );
+		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function_name, $version );
 	}
 
 	header( sprintf( 'X-WP-DeprecatedFunction: %s', $string ) );
@@ -666,20 +678,20 @@ function rest_handle_deprecated_function( $function, $replacement, $version ) {
  *
  * @since 4.4.0
  *
- * @param string $function    The function that was called.
- * @param string $message     A message regarding the change.
- * @param string $version     Version.
+ * @param string $function_name The function that was called.
+ * @param string $message       A message regarding the change.
+ * @param string $version       Version.
  */
-function rest_handle_deprecated_argument( $function, $message, $version ) {
+function rest_handle_deprecated_argument( $function_name, $message, $version ) {
 	if ( ! WP_DEBUG || headers_sent() ) {
 		return;
 	}
 	if ( $message ) {
 		/* translators: 1: Function name, 2: WordPress version number, 3: Error message. */
-		$string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function, $version, $message );
+		$string = sprintf( __( '%1$s (since %2$s; %3$s)' ), $function_name, $version, $message );
 	} else {
 		/* translators: 1: Function name, 2: WordPress version number. */
-		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function, $version );
+		$string = sprintf( __( '%1$s (since %2$s; no alternative available)' ), $function_name, $version );
 	}
 
 	header( sprintf( 'X-WP-DeprecatedParam: %s', $string ) );
@@ -690,11 +702,11 @@ function rest_handle_deprecated_argument( $function, $message, $version ) {
  *
  * @since 5.5.0
  *
- * @param string      $function The function that was called.
- * @param string      $message  A message explaining what has been done incorrectly.
- * @param string|null $version  The version of WordPress where the message was added.
+ * @param string      $function_name The function that was called.
+ * @param string      $message       A message explaining what has been done incorrectly.
+ * @param string|null $version       The version of WordPress where the message was added.
  */
-function rest_handle_doing_it_wrong( $function, $message, $version ) {
+function rest_handle_doing_it_wrong( $function_name, $message, $version ) {
 	if ( ! WP_DEBUG || headers_sent() ) {
 		return;
 	}
@@ -702,11 +714,11 @@ function rest_handle_doing_it_wrong( $function, $message, $version ) {
 	if ( $version ) {
 		/* translators: Developer debugging message. 1: PHP function name, 2: WordPress version number, 3: Explanatory message. */
 		$string = __( '%1$s (since %2$s; %3$s)' );
-		$string = sprintf( $string, $function, $version, $message );
+		$string = sprintf( $string, $function_name, $version, $message );
 	} else {
 		/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message. */
 		$string = __( '%1$s (%2$s)' );
-		$string = sprintf( $string, $function, $message );
+		$string = sprintf( $string, $function_name, $message );
 	}
 
 	header( sprintf( 'X-WP-DoingItWrong: %s', $string ) );
@@ -937,14 +949,18 @@ function rest_is_field_included( $field, $fields ) {
 	}
 
 	foreach ( $fields as $accepted_field ) {
-		// Check to see if $field is the parent of any item in $fields.
-		// A field "parent" should be accepted if "parent.child" is accepted.
-		if ( strpos( $accepted_field, "$field." ) === 0 ) {
+		/*
+		 * Check to see if $field is the parent of any item in $fields.
+		 * A field "parent" should be accepted if "parent.child" is accepted.
+		 */
+		if ( str_starts_with( $accepted_field, "$field." ) ) {
 			return true;
 		}
-		// Conversely, if "parent" is accepted, all "parent.child" fields
-		// should also be accepted.
-		if ( strpos( $field, "$accepted_field." ) === 0 ) {
+		/*
+		 * Conversely, if "parent" is accepted, all "parent.child" fields
+		 * should also be accepted.
+		 */
+		if ( str_starts_with( $field, "$accepted_field." ) ) {
 			return true;
 		}
 	}
@@ -1292,8 +1308,13 @@ function rest_parse_hex_color( $color ) {
  *
  * @param string $date   RFC3339 timestamp.
  * @param bool   $is_utc Whether the provided date should be interpreted as UTC. Default false.
- * @return array|null Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
- *                    null on failure.
+ * @return array|null {
+ *     Local and UTC datetime strings, in MySQL datetime format (Y-m-d H:i:s),
+ *     null on failure.
+ *
+ *     @type string $0 Local datetime string.
+ *     @type string $1 UTC datetime string.
+ * }
  */
 function rest_get_date_with_gmt( $date, $is_utc = false ) {
 	/*
@@ -1414,7 +1435,7 @@ function rest_parse_request_arg( $value, $request, $param ) {
 function rest_is_ip_address( $ip ) {
 	$ipv4_pattern = '/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/';
 
-	if ( ! preg_match( $ipv4_pattern, $ip ) && ! Requests_IPv6::check_ipv6( $ip ) ) {
+	if ( ! preg_match( $ipv4_pattern, $ip ) && ! WpOrg\Requests\Ipv6::check_ipv6( $ip ) ) {
 		return false;
 	}
 
@@ -1549,12 +1570,12 @@ function rest_is_object( $maybe_object ) {
 }
 
 /**
- * Converts an object-like value to an object.
+ * Converts an object-like value to an array.
  *
  * @since 5.5.0
  *
  * @param mixed $maybe_object The value being evaluated.
- * @return array Returns the object extracted from the value.
+ * @return array Returns the object extracted from the value as an associative array.
  */
 function rest_sanitize_object( $maybe_object ) {
 	if ( '' === $maybe_object ) {
@@ -1581,8 +1602,8 @@ function rest_sanitize_object( $maybe_object ) {
  *
  * @since 5.5.0
  *
- * @param mixed $value The value to check.
- * @param array $types The list of possible types.
+ * @param mixed    $value The value to check.
+ * @param string[] $types The list of possible types.
  * @return string The best matching type, an empty string if no types match.
  */
 function rest_get_best_type_for_value( $value, $types ) {
@@ -1596,8 +1617,10 @@ function rest_get_best_type_for_value( $value, $types ) {
 		'null'    => 'is_null',
 	);
 
-	// Both arrays and objects allow empty strings to be converted to their types.
-	// But the best answer for this type is a string.
+	/*
+	 * Both arrays and objects allow empty strings to be converted to their types.
+	 * But the best answer for this type is a string.
+	 */
 	if ( '' === $value && in_array( 'string', $types, true ) ) {
 		return 'string';
 	}
@@ -1656,13 +1679,13 @@ function rest_handle_multi_type_schema( $value, $args, $param = '' ) {
  *
  * @since 5.5.0
  *
- * @param array $array The array to check.
+ * @param array $input_array The array to check.
  * @return bool True if the array contains unique items, false otherwise.
  */
-function rest_validate_array_contains_unique_items( $array ) {
+function rest_validate_array_contains_unique_items( $input_array ) {
 	$seen = array();
 
-	foreach ( $array as $item ) {
+	foreach ( $input_array as $item ) {
 		$stabilized = rest_stabilize_value( $item );
 		$key        = serialize( $stabilized );
 
@@ -2178,8 +2201,10 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) {
 		}
 	}
 
-	// The "format" keyword should only be applied to strings. However, for backward compatibility,
-	// we allow the "format" keyword if the type keyword was not specified, or was set to an invalid value.
+	/*
+	 * The "format" keyword should only be applied to strings. However, for backward compatibility,
+	 * we allow the "format" keyword if the type keyword was not specified, or was set to an invalid value.
+	 */
 	if ( isset( $args['format'] )
 		&& ( ! isset( $args['type'] ) || 'string' === $args['type'] || ! in_array( $args['type'], $allowed_types, true ) )
 	) {
@@ -2845,8 +2870,10 @@ function rest_sanitize_value_from_schema( $value, $args, $param = '' ) {
  * @return array Modified reduce accumulator.
  */
 function rest_preload_api_request( $memo, $path ) {
-	// array_reduce() doesn't support passing an array in PHP 5.2,
-	// so we need to make sure we start with one.
+	/*
+	 * array_reduce() doesn't support passing an array in PHP 5.2,
+	 * so we need to make sure we start with one.
+	 */
 	if ( ! is_array( $memo ) ) {
 		$memo = array();
 	}
@@ -2934,36 +2961,36 @@ function rest_parse_embed_param( $embed ) {
  * @since 5.6.0 Support the "patternProperties" keyword for objects.
  *              Support the "anyOf" and "oneOf" keywords.
  *
- * @param array|object $data    The response data to modify.
- * @param array        $schema  The schema for the endpoint used to filter the response.
- * @param string       $context The requested context.
+ * @param array|object $response_data The response data to modify.
+ * @param array        $schema        The schema for the endpoint used to filter the response.
+ * @param string       $context       The requested context.
  * @return array|object The filtered response data.
  */
-function rest_filter_response_by_context( $data, $schema, $context ) {
+function rest_filter_response_by_context( $response_data, $schema, $context ) {
 	if ( isset( $schema['anyOf'] ) ) {
-		$matching_schema = rest_find_any_matching_schema( $data, $schema, '' );
+		$matching_schema = rest_find_any_matching_schema( $response_data, $schema, '' );
 		if ( ! is_wp_error( $matching_schema ) ) {
 			if ( ! isset( $schema['type'] ) ) {
 				$schema['type'] = $matching_schema['type'];
 			}
 
-			$data = rest_filter_response_by_context( $data, $matching_schema, $context );
+			$response_data = rest_filter_response_by_context( $response_data, $matching_schema, $context );
 		}
 	}
 
 	if ( isset( $schema['oneOf'] ) ) {
-		$matching_schema = rest_find_one_matching_schema( $data, $schema, '', true );
+		$matching_schema = rest_find_one_matching_schema( $response_data, $schema, '', true );
 		if ( ! is_wp_error( $matching_schema ) ) {
 			if ( ! isset( $schema['type'] ) ) {
 				$schema['type'] = $matching_schema['type'];
 			}
 
-			$data = rest_filter_response_by_context( $data, $matching_schema, $context );
+			$response_data = rest_filter_response_by_context( $response_data, $matching_schema, $context );
 		}
 	}
 
-	if ( ! is_array( $data ) && ! is_object( $data ) ) {
-		return $data;
+	if ( ! is_array( $response_data ) && ! is_object( $response_data ) ) {
+		return $response_data;
 	}
 
 	if ( isset( $schema['type'] ) ) {
@@ -2971,14 +2998,14 @@ function rest_filter_response_by_context( $data, $schema, $context ) {
 	} elseif ( isset( $schema['properties'] ) ) {
 		$type = 'object'; // Back compat if a developer accidentally omitted the type.
 	} else {
-		return $data;
+		return $response_data;
 	}
 
 	$is_array_type  = 'array' === $type || ( is_array( $type ) && in_array( 'array', $type, true ) );
 	$is_object_type = 'object' === $type || ( is_array( $type ) && in_array( 'object', $type, true ) );
 
 	if ( $is_array_type && $is_object_type ) {
-		if ( rest_is_array( $data ) ) {
+		if ( rest_is_array( $response_data ) ) {
 			$is_object_type = false;
 		} else {
 			$is_array_type = false;
@@ -2987,7 +3014,7 @@ function rest_filter_response_by_context( $data, $schema, $context ) {
 
 	$has_additional_properties = $is_object_type && isset( $schema['additionalProperties'] ) && is_array( $schema['additionalProperties'] );
 
-	foreach ( $data as $key => $value ) {
+	foreach ( $response_data as $key => $value ) {
 		$check = array();
 
 		if ( $is_array_type ) {
@@ -3012,27 +3039,27 @@ function rest_filter_response_by_context( $data, $schema, $context ) {
 		if ( ! in_array( $context, $check['context'], true ) ) {
 			if ( $is_array_type ) {
 				// All array items share schema, so there's no need to check each one.
-				$data = array();
+				$response_data = array();
 				break;
 			}
 
-			if ( is_object( $data ) ) {
-				unset( $data->$key );
+			if ( is_object( $response_data ) ) {
+				unset( $response_data->$key );
 			} else {
-				unset( $data[ $key ] );
+				unset( $response_data[ $key ] );
 			}
 		} elseif ( is_array( $value ) || is_object( $value ) ) {
 			$new_value = rest_filter_response_by_context( $value, $check, $context );
 
-			if ( is_object( $data ) ) {
-				$data->$key = $new_value;
+			if ( is_object( $response_data ) ) {
+				$response_data->$key = $new_value;
 			} else {
-				$data[ $key ] = $new_value;
+				$response_data[ $key ] = $new_value;
 			}
 		}
 	}
 
-	return $data;
+	return $response_data;
 }
 
 /**
diff --git a/src/wp-includes/rest-api/class-wp-rest-request.php b/src/wp-includes/rest-api/class-wp-rest-request.php
index 494abd2360379..c671fd3d132bc 100644
--- a/src/wp-includes/rest-api/class-wp-rest-request.php
+++ b/src/wp-includes/rest-api/class-wp-rest-request.php
@@ -291,16 +291,16 @@ public function set_headers( $headers, $override = true ) {
 	}
 
 	/**
-	 * Retrieves the content-type of the request.
+	 * Retrieves the Content-Type of the request.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return array|null Map containing 'value' and 'parameters' keys
-	 *                    or null when no valid content-type header was
+	 *                    or null when no valid Content-Type header was
 	 *                    available.
 	 */
 	public function get_content_type() {
-		$value = $this->get_header( 'content-type' );
+		$value = $this->get_header( 'Content-Type' );
 		if ( empty( $value ) ) {
 			return null;
 		}
@@ -311,7 +311,7 @@ public function get_content_type() {
 		}
 
 		$value = strtolower( $value );
-		if ( false === strpos( $value, '/' ) ) {
+		if ( ! str_contains( $value, '/' ) ) {
 			return null;
 		}
 
@@ -325,11 +325,11 @@ public function get_content_type() {
 	}
 
 	/**
-	 * Checks if the request has specified a JSON content-type.
+	 * Checks if the request has specified a JSON Content-Type.
 	 *
 	 * @since 5.6.0
 	 *
-	 * @return bool True if the content-type header is JSON.
+	 * @return bool True if the Content-Type header is JSON.
 	 */
 	public function is_json_content_type() {
 		$content_type = $this->get_content_type();
@@ -473,8 +473,10 @@ public function get_params() {
 
 		$params = array();
 		foreach ( $order as $type ) {
-			// array_merge() / the "+" operator will mess up
-			// numeric keys, so instead do a manual foreach.
+			/*
+			 * array_merge() / the "+" operator will mess up
+			 * numeric keys, so instead do a manual foreach.
+			 */
 			foreach ( (array) $this->params[ $type ] as $key => $value ) {
 				$params[ $key ] = $value;
 			}
@@ -719,7 +721,7 @@ protected function parse_body_params() {
 		$this->parsed_body = true;
 
 		/*
-		 * Check that we got URL-encoded. Treat a missing content-type as
+		 * Check that we got URL-encoded. Treat a missing Content-Type as
 		 * URL-encoded for maximum compatibility.
 		 */
 		$content_type = $this->get_content_type();
@@ -1031,7 +1033,7 @@ public static function from_url( $url ) {
 		}
 
 		$api_root = rest_url();
-		if ( get_option( 'permalink_structure' ) && 0 === strpos( $url, $api_root ) ) {
+		if ( get_option( 'permalink_structure' ) && str_starts_with( $url, $api_root ) ) {
 			// Pretty permalinks on, and URL is under the API root.
 			$api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) );
 			$route        = parse_url( $api_url_part, PHP_URL_PATH );
diff --git a/src/wp-includes/rest-api/class-wp-rest-response.php b/src/wp-includes/rest-api/class-wp-rest-response.php
index cb890f5b0bae1..c6ea11be83ee3 100644
--- a/src/wp-includes/rest-api/class-wp-rest-response.php
+++ b/src/wp-includes/rest-api/class-wp-rest-response.php
@@ -227,7 +227,7 @@ public function as_error() {
 			return null;
 		}
 
-		$error = new WP_Error;
+		$error = new WP_Error();
 
 		if ( is_array( $this->get_data() ) ) {
 			$data = $this->get_data();
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
index 1690a00eb877d..9df4556ada858 100644
--- a/src/wp-includes/rest-api/class-wp-rest-server.php
+++ b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -158,8 +158,8 @@ public function __construct() {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @return WP_Error|null WP_Error indicates unsuccessful login, null indicates successful
-	 *                       or no authentication provided
+	 * @return WP_Error|null|true WP_Error indicates unsuccessful login, null indicates successful
+	 *                            or no authentication provided
 	 */
 	public function check_authentication() {
 		/**
@@ -321,42 +321,6 @@ public function serve_request( $path = null ) {
 		 * https://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
 		 */
 		$this->send_header( 'X-Content-Type-Options', 'nosniff' );
-		$expose_headers = array( 'X-WP-Total', 'X-WP-TotalPages', 'Link' );
-
-		/**
-		 * Filters the list of response headers that are exposed to REST API CORS requests.
-		 *
-		 * @since 5.5.0
-		 *
-		 * @param string[] $expose_headers The list of response headers to expose.
-		 */
-		$expose_headers = apply_filters( 'rest_exposed_cors_headers', $expose_headers );
-
-		$this->send_header( 'Access-Control-Expose-Headers', implode( ', ', $expose_headers ) );
-
-		$allow_headers = array(
-			'Authorization',
-			'X-WP-Nonce',
-			'Content-Disposition',
-			'Content-MD5',
-			'Content-Type',
-		);
-
-		/**
-		 * Filters the list of request headers that are allowed for REST API CORS requests.
-		 *
-		 * The allowed headers are passed to the browser to specify which
-		 * headers can be passed to the REST API. By default, we allow the
-		 * Content-* headers needed to upload files to the media endpoints.
-		 * As well as the Authorization and Nonce headers for allowing authentication.
-		 *
-		 * @since 5.5.0
-		 *
-		 * @param string[] $allow_headers The list of request headers to allow.
-		 */
-		$allow_headers = apply_filters( 'rest_allowed_cors_headers', $allow_headers );
-
-		$this->send_header( 'Access-Control-Allow-Headers', implode( ', ', $allow_headers ) );
 
 		/**
 		 * Filters whether to send nocache headers on a REST API request.
@@ -436,6 +400,47 @@ public function serve_request( $path = null ) {
 			$request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
 		}
 
+		$expose_headers = array( 'X-WP-Total', 'X-WP-TotalPages', 'Link' );
+
+		/**
+		 * Filters the list of response headers that are exposed to REST API CORS requests.
+		 *
+		 * @since 5.5.0
+		 * @since 6.3.0 The `$request` parameter was added.
+		 *
+		 * @param string[]        $expose_headers The list of response headers to expose.
+		 * @param WP_REST_Request $request        The request in context.
+		 */
+		$expose_headers = apply_filters( 'rest_exposed_cors_headers', $expose_headers, $request );
+
+		$this->send_header( 'Access-Control-Expose-Headers', implode( ', ', $expose_headers ) );
+
+		$allow_headers = array(
+			'Authorization',
+			'X-WP-Nonce',
+			'Content-Disposition',
+			'Content-MD5',
+			'Content-Type',
+		);
+
+		/**
+		 * Filters the list of request headers that are allowed for REST API CORS requests.
+		 *
+		 * The allowed headers are passed to the browser to specify which
+		 * headers can be passed to the REST API. By default, we allow the
+		 * Content-* headers needed to upload files to the media endpoints.
+		 * As well as the Authorization and Nonce headers for allowing authentication.
+		 *
+		 * @since 5.5.0
+		 * @since 6.3.0 The `$request` parameter was added.
+		 *
+		 * @param string[]        $allow_headers The list of request headers to allow.
+		 * @param WP_REST_Request $request       The request in context.
+		 */
+		$allow_headers = apply_filters( 'rest_allowed_cors_headers', $allow_headers, $request );
+
+		$this->send_header( 'Access-Control-Allow-Headers', implode( ', ', $allow_headers ) );
+
 		$result = $this->check_authentication();
 
 		if ( ! is_wp_error( $result ) ) {
@@ -553,7 +558,7 @@ public function serve_request( $path = null ) {
 	 * Converts a response to data to send.
 	 *
 	 * @since 4.4.0
-	 * @since 5.4.0 The $embed parameter can now contain a list of link relations to include.
+	 * @since 5.4.0 The `$embed` parameter can now contain a list of link relations to include.
 	 *
 	 * @param WP_REST_Response $response Response object.
 	 * @param bool|string[]    $embed    Whether to embed all links, a filtered list of link relations, or no links.
@@ -648,7 +653,7 @@ public static function get_compact_response_links( $response ) {
 			// Convert $rel URIs to their compact versions if they exist.
 			foreach ( $curies as $curie ) {
 				$href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) );
-				if ( strpos( $rel, $href_prefix ) !== 0 ) {
+				if ( ! str_starts_with( $rel, $href_prefix ) ) {
 					continue;
 				}
 
@@ -677,7 +682,7 @@ public static function get_compact_response_links( $response ) {
 	 * Embeds the links from the data into the request.
 	 *
 	 * @since 4.4.0
-	 * @since 5.4.0 The $embed parameter can now contain a list of link relations to include.
+	 * @since 5.4.0 The `$embed` parameter can now contain a list of link relations to include.
 	 *
 	 * @param array         $data  Data from the request.
 	 * @param bool|string[] $embed Whether to embed all links or a filtered list of link relations.
@@ -696,8 +701,10 @@ protected function embed_links( $data, $embed = true ) {
 		$embedded = array();
 
 		foreach ( $data['_links'] as $rel => $links ) {
-			// If a list of relations was specified, and the link relation
-			// is not in the list of allowed relations, don't process the link.
+			/*
+			 * If a list of relations was specified, and the link relation
+			 * is not in the list of allowed relations, don't process the link.
+			 */
 			if ( is_array( $embed ) && ! in_array( $rel, $embed, true ) ) {
 				continue;
 			}
@@ -759,7 +766,7 @@ protected function embed_links( $data, $embed = true ) {
 	 * data instead.
 	 *
 	 * @since 4.4.0
-	 * @since 6.0.0 The $embed parameter can now contain a list of link relations to include
+	 * @since 6.0.0 The `$embed` parameter can now contain a list of link relations to include.
 	 *
 	 * @param WP_REST_Response $response Response object.
 	 * @param bool|string[]    $embed    Whether to embed all links, a filtered list of link relations, or no links.
@@ -797,26 +804,26 @@ public function envelope_response( $response, $embed ) {
 	 *
 	 * @since 4.4.0
 	 *
-	 * @param string $namespace  Namespace.
-	 * @param string $route      The REST route.
-	 * @param array  $route_args Route arguments.
-	 * @param bool   $override   Optional. Whether the route should be overridden if it already exists.
-	 *                           Default false.
+	 * @param string $route_namespace Namespace.
+	 * @param string $route           The REST route.
+	 * @param array  $route_args      Route arguments.
+	 * @param bool   $override        Optional. Whether the route should be overridden if it already exists.
+	 *                                Default false.
 	 */
-	public function register_route( $namespace, $route, $route_args, $override = false ) {
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			$this->namespaces[ $namespace ] = array();
+	public function register_route( $route_namespace, $route, $route_args, $override = false ) {
+		if ( ! isset( $this->namespaces[ $route_namespace ] ) ) {
+			$this->namespaces[ $route_namespace ] = array();
 
 			$this->register_route(
-				$namespace,
-				'/' . $namespace,
+				$route_namespace,
+				'/' . $route_namespace,
 				array(
 					array(
 						'methods'  => self::READABLE,
 						'callback' => array( $this, 'get_namespace_index' ),
 						'args'     => array(
 							'namespace' => array(
-								'default' => $namespace,
+								'default' => $route_namespace,
 							),
 							'context'   => array(
 								'default' => 'view',
@@ -828,8 +835,9 @@ public function register_route( $namespace, $route, $route_args, $override = fal
 		}
 
 		// Associative to avoid double-registration.
-		$this->namespaces[ $namespace ][ $route ] = true;
-		$route_args['namespace']                  = $namespace;
+		$this->namespaces[ $route_namespace ][ $route ] = true;
+
+		$route_args['namespace'] = $route_namespace;
 
 		if ( $override || empty( $this->endpoints[ $route ] ) ) {
 			$this->endpoints[ $route ] = $route_args;
@@ -854,17 +862,17 @@ public function register_route( $namespace, $route, $route_args, $override = fal
 	 * used as the delimiter with preg_match()
 	 *
 	 * @since 4.4.0
-	 * @since 5.4.0 Add $namespace parameter.
+	 * @since 5.4.0 Added `$route_namespace` parameter.
 	 *
-	 * @param string $namespace Optionally, only return routes in the given namespace.
+	 * @param string $route_namespace Optionally, only return routes in the given namespace.
 	 * @return array `'/path/regex' => array( $callback, $bitmask )` or
 	 *               `'/path/regex' => array( array( $callback, $bitmask ), ...)`.
 	 */
-	public function get_routes( $namespace = '' ) {
+	public function get_routes( $route_namespace = '' ) {
 		$endpoints = $this->endpoints;
 
-		if ( $namespace ) {
-			$endpoints = wp_list_filter( $endpoints, array( 'namespace' => $namespace ) );
+		if ( $route_namespace ) {
+			$endpoints = wp_list_filter( $endpoints, array( 'namespace' => $route_namespace ) );
 		}
 
 		/**
@@ -983,6 +991,15 @@ public function dispatch( $request ) {
 		$result = apply_filters( 'rest_pre_dispatch', null, $this, $request );
 
 		if ( ! empty( $result ) ) {
+
+			// Normalize to either WP_Error or WP_REST_Response...
+			$result = rest_ensure_response( $result );
+
+			// ...then convert WP_Error across.
+			if ( is_wp_error( $result ) ) {
+				$result = $this->error_to_response( $result );
+			}
+
 			return $result;
 		}
 
@@ -1034,7 +1051,7 @@ protected function match_request_to_handler( $request ) {
 		$with_namespace = array();
 
 		foreach ( $this->get_namespaces() as $namespace ) {
-			if ( 0 === strpos( trailingslashit( ltrim( $path, '/' ) ), $namespace ) ) {
+			if ( str_starts_with( trailingslashit( ltrim( $path, '/' ) ), $namespace ) ) {
 				$with_namespace[] = $this->get_routes( $namespace );
 			}
 		}
@@ -1528,7 +1545,7 @@ public function get_data_for_route( $route, $callbacks, $context = 'view' ) {
 			$data['endpoints'][] = $endpoint_data;
 
 			// For non-variable routes, generate links.
-			if ( strpos( $route, '{' ) === false ) {
+			if ( ! str_contains( $route, '{' ) ) {
 				$data['_links'] = array(
 					'self' => array(
 						array(
@@ -1817,7 +1834,7 @@ public function get_headers( $server ) {
 		);
 
 		foreach ( $server as $key => $value ) {
-			if ( strpos( $key, 'HTTP_' ) === 0 ) {
+			if ( str_starts_with( $key, 'HTTP_' ) ) {
 				$headers[ substr( $key, 5 ) ] = $value;
 			} elseif ( 'REDIRECT_HTTP_AUTHORIZATION' === $key && empty( $server['HTTP_AUTHORIZATION'] ) ) {
 				/*
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
index ff3c1dc42ffa5..138440e8c24e5 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
@@ -202,8 +202,10 @@ public function create_item( $request ) {
 		wp_after_insert_post( $attachment, false, null );
 
 		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-			// Set a custom header with the attachment_id.
-			// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			/*
+			 * Set a custom header with the attachment_id.
+			 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 */
 			header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
 		}
 
@@ -211,8 +213,10 @@ public function create_item( $request ) {
 		require_once ABSPATH . 'wp-admin/includes/media.php';
 		require_once ABSPATH . 'wp-admin/includes/image.php';
 
-		// Post-process the upload (create image sub-sizes, make PDF thumbnails, etc.) and insert attachment meta.
-		// At this point the server may run out of resources and post-processing of uploaded images may fail.
+		/*
+		 * Post-process the upload (create image sub-sizes, make PDF thumbnails, etc.) and insert attachment meta.
+		 * At this point the server may run out of resources and post-processing of uploaded images may fail.
+		 */
 		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 
 		$response = $this->prepare_item_for_response( $attachment, $request );
@@ -562,8 +566,10 @@ public function edit_media_item( $request ) {
 		$image_ext  = pathinfo( $image_file, PATHINFO_EXTENSION );
 		$image_name = wp_basename( $image_file, ".{$image_ext}" );
 
-		// Do not append multiple `-edited` to the file name.
-		// The user may be editing a previously edited image.
+		/*
+		 * Do not append multiple `-edited` to the file name.
+		 * The user may be editing a previously edited image.
+		 */
 		if ( preg_match( '/-edited(-\d+)?$/', $image_name ) ) {
 			// Remove any `-1`, `-2`, etc. `wp_unique_filename()` will add the proper number.
 			$image_name = preg_replace( '/-edited(-\d+)?$/', '-edited', $image_name );
@@ -625,8 +631,10 @@ public function edit_media_item( $request ) {
 		}
 
 		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
-			// Set a custom header with the attachment_id.
-			// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			/*
+			 * Set a custom header with the attachment_id.
+			 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 */
 			header( 'X-WP-Upload-Attachment-ID: ' . $new_attachment_id );
 		}
 
@@ -766,7 +774,7 @@ public function prepare_item_for_response( $item, $request ) {
 
 			// Ensure empty details is an empty object.
 			if ( empty( $data['media_details'] ) ) {
-				$data['media_details'] = new stdClass;
+				$data['media_details'] = new stdClass();
 			} elseif ( ! empty( $data['media_details']['sizes'] ) ) {
 
 				foreach ( $data['media_details']['sizes'] as $size => &$size_data ) {
@@ -797,7 +805,7 @@ public function prepare_item_for_response( $item, $request ) {
 					);
 				}
 			} else {
-				$data['media_details']['sizes'] = new stdClass;
+				$data['media_details']['sizes'] = new stdClass();
 			}
 		}
 
@@ -968,8 +976,8 @@ public function get_item_schema() {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param array $data    Supplied file data.
-	 * @param array $headers HTTP headers from the request.
+	 * @param string $data    Supplied file data.
+	 * @param array  $headers HTTP headers from the request.
 	 * @return array|WP_Error Data from wp_handle_sideload().
 	 */
 	protected function upload_from_data( $data, $headers ) {
@@ -1111,7 +1119,7 @@ public static function get_filename_from_disposition( $disposition_header ) {
 		foreach ( $disposition_header as $value ) {
 			$value = trim( $value );
 
-			if ( strpos( $value, ';' ) === false ) {
+			if ( ! str_contains( $value, ';' ) ) {
 				continue;
 			}
 
@@ -1121,7 +1129,7 @@ public static function get_filename_from_disposition( $disposition_header ) {
 			$attributes = array();
 
 			foreach ( $attr_parts as $part ) {
-				if ( strpos( $part, '=' ) === false ) {
+				if ( ! str_contains( $part, '=' ) ) {
 					continue;
 				}
 
@@ -1137,7 +1145,7 @@ public static function get_filename_from_disposition( $disposition_header ) {
 			$filename = trim( $attributes['filename'] );
 
 			// Unquote quoted filename, but after trimming.
-			if ( substr( $filename, 0, 1 ) === '"' && substr( $filename, -1, 1 ) === '"' ) {
+			if ( str_starts_with( $filename, '"' ) && str_ends_with( $filename, '"' ) ) {
 				$filename = substr( $filename, 1, -1 );
 			}
 		}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
index f99a201974833..3ebed0752b004 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php
@@ -68,8 +68,8 @@ public function __construct( $parent_post_type ) {
 		$this->parent_controller    = $parent_controller;
 		$this->revisions_controller = new WP_REST_Revisions_Controller( $parent_post_type );
 		$this->rest_base            = 'autosaves';
-		$this->namespace            = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
 		$this->parent_base          = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
+		$this->namespace            = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
 	}
 
 	/**
@@ -229,8 +229,10 @@ public function create_item( $request ) {
 		$is_draft  = 'draft' === $post->post_status || 'auto-draft' === $post->post_status;
 
 		if ( $is_draft && (int) $post->post_author === $user_id && ! $post_lock ) {
-			// Draft posts for the same author: autosaving updates the post and does not create a revision.
-			// Convert the post object to an array and add slashes, wp_update_post() expects escaped array.
+			/*
+			 * Draft posts for the same author: autosaving updates the post and does not create a revision.
+			 * Convert the post object to an array and add slashes, wp_update_post() expects escaped array.
+			 */
 			$autosave_id = wp_update_post( wp_slash( (array) $prepared_post ), true );
 		} else {
 			// Non-draft posts: create or update the post autosave.
@@ -304,7 +306,7 @@ public function get_items( $request ) {
 		$revisions = wp_get_post_revisions( $parent_id, array( 'check_enabled' => false ) );
 
 		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$parent_id}-autosave" ) ) {
+			if ( str_contains( $revision->post_name, "{$parent_id}-autosave" ) ) {
 				$data       = $this->prepare_item_for_response( $revision, $request );
 				$response[] = $this->prepare_response_for_collection( $data );
 			}
@@ -360,35 +362,31 @@ public function create_post_autosave( $post_data ) {
 			return $post;
 		}
 
+		// Only create an autosave when it is different from the saved post.
+		$autosave_is_different = false;
+		$new_autosave          = _wp_post_revision_data( $post_data, true );
+
+		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
+			if ( normalize_whitespace( $new_autosave[ $field ] ) !== normalize_whitespace( $post->$field ) ) {
+				$autosave_is_different = true;
+				break;
+			}
+		}
+
 		$user_id = get_current_user_id();
 
 		// Store one autosave per author. If there is already an autosave, overwrite it.
 		$old_autosave = wp_get_post_autosave( $post_id, $user_id );
 
+		if ( ! $autosave_is_different && $old_autosave ) {
+			// Nothing to save, return the existing autosave.
+			return $old_autosave->ID;
+		}
+
 		if ( $old_autosave ) {
-			$new_autosave                = _wp_post_revision_data( $post_data, true );
 			$new_autosave['ID']          = $old_autosave->ID;
 			$new_autosave['post_author'] = $user_id;
 
-			// If the new autosave has the same content as the post, delete the autosave.
-			$autosave_is_different = false;
-
-			foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
-				if ( normalize_whitespace( $new_autosave[ $field ] ) !== normalize_whitespace( $post->$field ) ) {
-					$autosave_is_different = true;
-					break;
-				}
-			}
-
-			if ( ! $autosave_is_different ) {
-				wp_delete_post_revision( $old_autosave->ID );
-				return new WP_Error(
-					'rest_autosave_no_changes',
-					__( 'There is nothing to save. The autosave and the post content are the same.' ),
-					array( 'status' => 400 )
-				);
-			}
-
 			/** This filter is documented in wp-admin/post.php */
 			do_action( 'wp_creating_autosave', $new_autosave );
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php
index 761c0d677741a..36a753416013f 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-pattern-categories-controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * REST API: WP_REST_Block_Pattern_Catergories_Controller class
+ * REST API: WP_REST_Block_Pattern_Categories_Controller class
  *
  * @package    WordPress
  * @subpackage REST_API
@@ -102,10 +102,10 @@ public function get_items( $request ) {
 	 */
 	public function prepare_item_for_response( $item, $request ) {
 		$fields = $this->get_fields_for_response( $request );
-		$keys   = array( 'name', 'label' );
+		$keys   = array( 'name', 'label', 'description' );
 		$data   = array();
 		foreach ( $keys as $key ) {
-			if ( rest_is_field_included( $key, $fields ) ) {
+			if ( isset( $item[ $key ] ) && rest_is_field_included( $key, $fields ) ) {
 				$data[ $key ] = $item[ $key ];
 			}
 		}
@@ -125,26 +125,38 @@ public function prepare_item_for_response( $item, $request ) {
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
 		$schema = array(
 			'$schema'    => 'http://json-schema.org/draft-04/schema#',
 			'title'      => 'block-pattern-category',
 			'type'       => 'object',
 			'properties' => array(
-				'name'  => array(
+				'name'        => array(
 					'description' => __( 'The category name.' ),
 					'type'        => 'string',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'label' => array(
+				'label'       => array(
 					'description' => __( 'The category label, in human readable format.' ),
 					'type'        => 'string',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
+				'description' => array(
+					'description' => __( 'The category description, in human readable format.' ),
+					'type'        => 'string',
+					'readonly'    => true,
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php
index cb0fe57fed290..d8f083924e030 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php
@@ -24,6 +24,18 @@ class WP_REST_Block_Patterns_Controller extends WP_REST_Controller {
 	 */
 	private $remote_patterns_loaded;
 
+	/**
+	 * An array that maps old categories names to new ones.
+	 *
+	 * @since 6.2.0
+	 * @var array
+	 */
+	protected static $categories_migration = array(
+		'buttons' => 'call-to-action',
+		'columns' => 'text',
+		'query'   => 'posts',
+	);
+
 	/**
 	 * Constructs the controller.
 	 *
@@ -84,6 +96,7 @@ public function get_items_permissions_check( $request ) {
 	 * Retrieves all block patterns.
 	 *
 	 * @since 6.0.0
+	 * @since 6.2.0 Added migration for old core pattern categories to the new ones.
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -101,16 +114,48 @@ public function get_items( $request ) {
 		$response = array();
 		$patterns = WP_Block_Patterns_Registry::get_instance()->get_all_registered();
 		foreach ( $patterns as $pattern ) {
-			$prepared_pattern = $this->prepare_item_for_response( $pattern, $request );
+			$migrated_pattern = $this->migrate_pattern_categories( $pattern );
+			$prepared_pattern = $this->prepare_item_for_response( $migrated_pattern, $request );
 			$response[]       = $this->prepare_response_for_collection( $prepared_pattern );
 		}
 		return rest_ensure_response( $response );
 	}
 
+	/**
+	 * Migrates old core pattern categories to the new categories.
+	 *
+	 * Core pattern categories are revamped. Migration is needed to ensure
+	 * backwards compatibility.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param array $pattern Raw pattern as registered, before applying any changes.
+	 * @return array Migrated pattern.
+	 */
+	protected function migrate_pattern_categories( $pattern ) {
+		// No categories to migrate.
+		if (
+			! isset( $pattern['categories'] ) ||
+			! is_array( $pattern['categories'] )
+		) {
+			return $pattern;
+		}
+
+		foreach ( $pattern['categories'] as $index => $category ) {
+			// If the category exists as a key, then it needs migration.
+			if ( isset( static::$categories_migration[ $category ] ) ) {
+				$pattern['categories'][ $index ] = static::$categories_migration[ $category ];
+			}
+		}
+
+		return $pattern;
+	}
+
 	/**
 	 * Prepare a raw block pattern before it gets output in a REST API response.
 	 *
 	 * @since 6.0.0
+	 * @since 6.3.0 Added `source` property.
 	 *
 	 * @param array           $item    Raw pattern as registered, before any changes.
 	 * @param WP_REST_Request $request Request object.
@@ -121,14 +166,16 @@ public function prepare_item_for_response( $item, $request ) {
 		$keys   = array(
 			'name'          => 'name',
 			'title'         => 'title',
+			'content'       => 'content',
 			'description'   => 'description',
 			'viewportWidth' => 'viewport_width',
-			'blockTypes'    => 'block_types',
-			'postTypes'     => 'post_types',
+			'inserter'      => 'inserter',
 			'categories'    => 'categories',
 			'keywords'      => 'keywords',
-			'content'       => 'content',
-			'inserter'      => 'inserter',
+			'blockTypes'    => 'block_types',
+			'postTypes'     => 'post_types',
+			'templateTypes' => 'template_types',
+			'source'        => 'source',
 		);
 		$data   = array();
 		foreach ( $keys as $item_key => $rest_key ) {
@@ -147,10 +194,15 @@ public function prepare_item_for_response( $item, $request ) {
 	 * Retrieves the block pattern schema, conforming to JSON Schema.
 	 *
 	 * @since 6.0.0
+	 * @since 6.3.0 Added `source` property.
 	 *
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
 		$schema = array(
 			'$schema'    => 'http://json-schema.org/draft-04/schema#',
 			'title'      => 'block-pattern',
@@ -168,6 +220,12 @@ public function get_item_schema() {
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
+				'content'        => array(
+					'description' => __( 'The pattern content.' ),
+					'type'        => 'string',
+					'readonly'    => true,
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
 				'description'    => array(
 					'description' => __( 'The pattern detailed description.' ),
 					'type'        => 'string',
@@ -180,45 +238,61 @@ public function get_item_schema() {
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'block_types'    => array(
-					'description' => __( 'Block types that the pattern is intended to be used with.' ),
+				'inserter'       => array(
+					'description' => __( 'Determines whether the pattern is visible in inserter.' ),
+					'type'        => 'boolean',
+					'readonly'    => true,
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
+				'categories'     => array(
+					'description' => __( 'The pattern category slugs.' ),
 					'type'        => 'array',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'post_types'     => array(
-					'description' => __( 'An array of post types that the pattern is restricted to be used with.' ),
+				'keywords'       => array(
+					'description' => __( 'The pattern keywords.' ),
 					'type'        => 'array',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'categories'     => array(
-					'description' => __( 'The pattern category slugs.' ),
+				'block_types'    => array(
+					'description' => __( 'Block types that the pattern is intended to be used with.' ),
 					'type'        => 'array',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'keywords'       => array(
-					'description' => __( 'The pattern keywords.' ),
+				'post_types'     => array(
+					'description' => __( 'An array of post types that the pattern is restricted to be used with.' ),
 					'type'        => 'array',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'content'        => array(
-					'description' => __( 'The pattern content.' ),
-					'type'        => 'string',
+				'template_types' => array(
+					'description' => __( 'An array of template types where the pattern fits.' ),
+					'type'        => 'array',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'inserter'       => array(
-					'description' => __( 'Determines whether the pattern is visible in inserter.' ),
-					'type'        => 'boolean',
+				'source'         => array(
+					'description' => __( 'Where the pattern comes from e.g. core' ),
+					'type'        => 'string',
 					'readonly'    => true,
 					'context'     => array( 'view', 'edit', 'embed' ),
+					'enum'        => array(
+						'core',
+						'plugin',
+						'theme',
+						'pattern-directory/core',
+						'pattern-directory/theme',
+						'pattern-directory/featured',
+					),
 				),
 			),
 		);
 
-		return $this->add_additional_fields_schema( $schema );
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
index e1f34baef6df0..26bd0e05449e6 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
@@ -237,6 +237,7 @@ public function get_item( $request ) {
 	 *
 	 * @since 5.5.0
 	 * @since 5.9.0 Renamed `$block_type` to `$item` to match parent class for PHP 8 named parameter support.
+	 * @since 6.3.0 Added `selectors` field.
 	 *
 	 * @param WP_Block_Type   $item    Block type data.
 	 * @param WP_REST_Request $request Full details about the request.
@@ -278,6 +279,7 @@ public function prepare_item_for_response( $item, $request ) {
 				'ancestor',
 				'provides_context',
 				'uses_context',
+				'selectors',
 				'supports',
 				'styles',
 				'textdomain',
@@ -379,6 +381,7 @@ protected function prepare_links( $block_type ) {
 	 * Retrieves the block type' schema, conforming to JSON Schema.
 	 *
 	 * @since 5.5.0
+	 * @since 6.3.0 Added `selectors` field.
 	 *
 	 * @return array Item schema data.
 	 */
@@ -518,6 +521,14 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
+				'selectors'             => array(
+					'description' => __( 'Custom CSS selectors.' ),
+					'type'        => 'object',
+					'default'     => array(),
+					'properties'  => array(),
+					'context'     => array( 'embed', 'view', 'edit' ),
+					'readonly'    => true,
+				),
 				'supports'              => array(
 					'description' => __( 'Block supports.' ),
 					'type'        => 'object',
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php
index 4a316685e1556..a270e0ff4829d 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php
@@ -40,6 +40,7 @@ public function check_read_permission( $post ) {
 	 * Filters a response based on the context defined in the schema.
 	 *
 	 * @since 5.0.0
+	 * @since 6.3.0 Adds the `wp_pattern_sync_status` postmeta property to the top level of response.
 	 *
 	 * @param array  $data    Response data to filter.
 	 * @param string $context Context defined in the schema.
@@ -56,6 +57,9 @@ public function filter_response_by_context( $data, $context ) {
 		unset( $data['title']['rendered'] );
 		unset( $data['content']['rendered'] );
 
+		// Add the core wp_pattern_sync_status meta as top level property to the response.
+		$data['wp_pattern_sync_status'] = isset( $data['meta']['wp_pattern_sync_status'] ) ? $data['meta']['wp_pattern_sync_status'] : '';
+		unset( $data['meta']['wp_pattern_sync_status'] );
 		return $data;
 	}
 
@@ -67,7 +71,10 @@ public function filter_response_by_context( $data, $context ) {
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
-		// Do not cache this schema because all properties are derived from parent controller.
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
 		$schema = parent::get_item_schema();
 
 		/*
@@ -86,7 +93,9 @@ public function get_item_schema() {
 		unset( $schema['properties']['title']['properties']['rendered'] );
 		unset( $schema['properties']['content']['properties']['rendered'] );
 
-		return $schema;
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
index 42919b7dc247f..cf2c4d5f9153d 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
@@ -274,7 +274,7 @@ public function get_items( $request ) {
 		 */
 		$prepared_args = apply_filters( 'rest_comment_query', $prepared_args, $request );
 
-		$query        = new WP_Comment_Query;
+		$query        = new WP_Comment_Query();
 		$query_result = $query->query( $prepared_args );
 
 		$comments = array();
@@ -295,7 +295,7 @@ public function get_items( $request ) {
 			// Out-of-bounds, run the query again without LIMIT for total count.
 			unset( $prepared_args['number'], $prepared_args['offset'] );
 
-			$query                  = new WP_Comment_Query;
+			$query                  = new WP_Comment_Query();
 			$prepared_args['count'] = true;
 
 			$total_comments = $query->query( $prepared_args );
@@ -1761,8 +1761,10 @@ protected function check_read_post_permission( $post, $request ) {
 
 		$posts_controller = $post_type->get_rest_controller();
 
-		// Ensure the posts controller is specifically a WP_REST_Posts_Controller instance
-		// before using methods specific to that controller.
+		/*
+		 * Ensure the posts controller is specifically a WP_REST_Posts_Controller instance
+		 * before using methods specific to that controller.
+		 */
 		if ( ! $posts_controller instanceof WP_REST_Posts_Controller ) {
 			$posts_controller = new WP_REST_Posts_Controller( $post->post_type );
 		}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
index 61591cb6c14fb..81fc991ba980f 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
@@ -289,15 +289,15 @@ public function prepare_response_for_collection( $response ) {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param array  $data    Response data to filter.
-	 * @param string $context Context defined in the schema.
+	 * @param array  $response_data Response data to filter.
+	 * @param string $context       Context defined in the schema.
 	 * @return array Filtered response.
 	 */
-	public function filter_response_by_context( $data, $context ) {
+	public function filter_response_by_context( $response_data, $context ) {
 
 		$schema = $this->get_item_schema();
 
-		return rest_filter_response_by_context( $data, $schema, $context );
+		return rest_filter_response_by_context( $response_data, $schema, $context );
 	}
 
 	/**
@@ -412,11 +412,11 @@ public function get_context_param( $args = array() ) {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param array           $prepared Prepared response array.
-	 * @param WP_REST_Request $request  Full details about the request.
+	 * @param array           $response_data Prepared response array.
+	 * @param WP_REST_Request $request       Full details about the request.
 	 * @return array Modified data object with additional fields.
 	 */
-	protected function add_additional_fields_to_object( $prepared, $request ) {
+	protected function add_additional_fields_to_object( $response_data, $request ) {
 
 		$additional_fields = $this->get_additional_fields();
 
@@ -431,10 +431,16 @@ protected function add_additional_fields_to_object( $prepared, $request ) {
 				continue;
 			}
 
-			$prepared[ $field_name ] = call_user_func( $field_options['get_callback'], $prepared, $field_name, $request, $this->get_object_type() );
+			$response_data[ $field_name ] = call_user_func(
+				$field_options['get_callback'],
+				$response_data,
+				$field_name,
+				$request,
+				$this->get_object_type()
+			);
 		}
 
-		return $prepared;
+		return $response_data;
 	}
 
 	/**
@@ -442,11 +448,11 @@ protected function add_additional_fields_to_object( $prepared, $request ) {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param object          $object  Data model like WP_Term or WP_Post.
-	 * @param WP_REST_Request $request Full details about the request.
+	 * @param object          $data_object Data model like WP_Term or WP_Post.
+	 * @param WP_REST_Request $request     Full details about the request.
 	 * @return true|WP_Error True on success, WP_Error object if a field cannot be updated.
 	 */
-	protected function update_additional_fields_for_object( $object, $request ) {
+	protected function update_additional_fields_for_object( $data_object, $request ) {
 		$additional_fields = $this->get_additional_fields();
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
@@ -459,7 +465,14 @@ protected function update_additional_fields_for_object( $object, $request ) {
 				continue;
 			}
 
-			$result = call_user_func( $field_options['update_callback'], $request[ $field_name ], $object, $field_name, $request, $this->get_object_type() );
+			$result = call_user_func(
+				$field_options['update_callback'],
+				$request[ $field_name ],
+				$data_object,
+				$field_name,
+				$request,
+				$this->get_object_type()
+			);
 
 			if ( is_wp_error( $result ) ) {
 				return $result;
@@ -563,8 +576,10 @@ public function get_fields_for_response( $request ) {
 		$additional_fields = $this->get_additional_fields();
 
 		foreach ( $additional_fields as $field_name => $field_options ) {
-			// For back-compat, include any field with an empty schema
-			// because it won't be present in $this->get_item_schema().
+			/*
+			 * For back-compat, include any field with an empty schema
+			 * because it won't be present in $this->get_item_schema().
+			 */
 			if ( is_null( $field_options['schema'] ) ) {
 				$properties[ $field_name ] = $field_options;
 			}
@@ -617,8 +632,10 @@ static function( $response_fields, $field ) use ( $fields ) {
 				}
 				// Check for nested fields if $field is not a direct match.
 				$nested_fields = explode( '.', $field );
-				// A nested field is included so long as its top-level property
-				// is present in the schema.
+				/*
+				 * A nested field is included so long as its top-level property
+				 * is present in the schema.
+				 */
 				if ( in_array( $nested_fields[0], $fields, true ) ) {
 					$response_fields[] = $field;
 				}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
index f1a9d2482a3eb..0315cd23cf600 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php
@@ -34,8 +34,6 @@ public function __construct() {
 	 * Registers the controllers routes.
 	 *
 	 * @since 5.9.0
-	 *
-	 * @return void
 	 */
 	public function register_routes() {
 		register_rest_route(
@@ -63,8 +61,10 @@ public function register_routes() {
 			sprintf(
 				'/%s/themes/(?P<stylesheet>%s)',
 				$this->rest_base,
-				// Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
-				// Excludes invalid directory name characters: `/:<>*?"|`.
+				/*
+				 * Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
+				 * Excludes invalid directory name characters: `/:<>*?"|`.
+				 */
 				'[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?'
 			),
 			array(
@@ -268,7 +268,11 @@ public function update_item( $request ) {
 		}
 
 		$changes = $this->prepare_item_for_database( $request );
-		$result  = wp_update_post( wp_slash( (array) $changes ), true, false );
+		if ( is_wp_error( $changes ) ) {
+			return $changes;
+		}
+
+		$result = wp_update_post( wp_slash( (array) $changes ), true, false );
 		if ( is_wp_error( $result ) ) {
 			return $result;
 		}
@@ -290,9 +294,10 @@ public function update_item( $request ) {
 	 * Prepares a single global styles config for update.
 	 *
 	 * @since 5.9.0
+	 * @since 6.2.0 Added validation of styles.css property.
 	 *
 	 * @param WP_REST_Request $request Request object.
-	 * @return stdClass Changes to pass to wp_update_post.
+	 * @return stdClass|WP_Error Prepared item on success. WP_Error on when the custom CSS is not valid.
 	 */
 	protected function prepare_item_for_database( $request ) {
 		$changes     = new stdClass();
@@ -312,6 +317,12 @@ protected function prepare_item_for_database( $request ) {
 		if ( isset( $request['styles'] ) || isset( $request['settings'] ) ) {
 			$config = array();
 			if ( isset( $request['styles'] ) ) {
+				if ( isset( $request['styles']['css'] ) ) {
+					$css_validation_result = $this->validate_custom_css( $request['styles']['css'] );
+					if ( is_wp_error( $css_validation_result ) ) {
+						return $css_validation_result;
+					}
+				}
 				$config['styles'] = $request['styles'];
 			} elseif ( isset( $existing_config['styles'] ) ) {
 				$config['styles'] = $existing_config['styles'];
@@ -411,6 +422,7 @@ public function prepare_item_for_response( $post, $request ) { // phpcs:ignore V
 	 * Prepares links for the request.
 	 *
 	 * @since 5.9.0
+	 * @since 6.3.0 Adds revisions count and rest URL href to version-history.
 	 *
 	 * @param integer $id ID.
 	 * @return array Links for the given post.
@@ -424,6 +436,16 @@ protected function prepare_links( $id ) {
 			),
 		);
 
+		if ( post_type_supports( $this->post_type, 'revisions' ) ) {
+			$revisions                = wp_get_latest_revision_id_and_total_count( $id );
+			$revisions_count          = ! is_wp_error( $revisions ) ? $revisions['count'] : 0;
+			$revisions_base           = sprintf( '/%s/%d/revisions', $base, $id );
+			$links['version-history'] = array(
+				'href'  => rest_url( $revisions_base ),
+				'count' => $revisions_count,
+			);
+		}
+
 		return $links;
 	}
 
@@ -431,6 +453,7 @@ protected function prepare_links( $id ) {
 	 * Get the link relations available for the post and current user.
 	 *
 	 * @since 5.9.0
+	 * @since 6.2.0 Added 'edit-css' action.
 	 *
 	 * @return array List of link relations.
 	 */
@@ -442,6 +465,10 @@ protected function get_available_actions() {
 			$rels[] = 'https://api.w.org/action-publish';
 		}
 
+		if ( current_user_can( 'edit_css' ) ) {
+			$rels[] = 'https://api.w.org/action-edit-css';
+		}
+
 		return $rels;
 	}
 
@@ -540,8 +567,10 @@ public function get_item_schema() {
 	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	public function get_theme_item_permissions_check( $request ) {
-		// Verify if the current user has edit_theme_options capability.
-		// This capability is required to edit/view/delete templates.
+		/*
+		 * Verify if the current user has edit_theme_options capability.
+		 * This capability is required to edit/view/delete templates.
+		 */
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return new WP_Error(
 				'rest_cannot_manage_global_styles',
@@ -564,7 +593,7 @@ public function get_theme_item_permissions_check( $request ) {
 	 * @return WP_REST_Response|WP_Error
 	 */
 	public function get_theme_item( $request ) {
-		if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
+		if ( get_stylesheet() !== $request['stylesheet'] ) {
 			// This endpoint only supports the active theme for now.
 			return new WP_Error(
 				'rest_theme_not_found',
@@ -613,8 +642,10 @@ public function get_theme_item( $request ) {
 	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	public function get_theme_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Verify if the current user has edit_theme_options capability.
-		// This capability is required to edit/view/delete templates.
+		/*
+		 * Verify if the current user has edit_theme_options capability.
+		 * This capability is required to edit/view/delete templates.
+		 */
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return new WP_Error(
 				'rest_cannot_manage_global_styles',
@@ -638,7 +669,7 @@ public function get_theme_items_permissions_check( $request ) { // phpcs:ignore
 	 * @return WP_REST_Response|WP_Error
 	 */
 	public function get_theme_items( $request ) {
-		if ( wp_get_theme()->get_stylesheet() !== $request['stylesheet'] ) {
+		if ( get_stylesheet() !== $request['stylesheet'] ) {
 			// This endpoint only supports the active theme for now.
 			return new WP_Error(
 				'rest_theme_not_found',
@@ -652,4 +683,25 @@ public function get_theme_items( $request ) {
 
 		return $response;
 	}
+
+	/**
+	 * Validate style.css as valid CSS.
+	 *
+	 * Currently just checks for invalid markup.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param string $css CSS to validate.
+	 * @return true|WP_Error True if the input was validated, otherwise WP_Error.
+	 */
+	private function validate_custom_css( $css ) {
+		if ( preg_match( '#</?\w+#', $css ) ) {
+			return new WP_Error(
+				'rest_custom_css_illegal_markup',
+				__( 'Markup is not allowed in CSS.' ),
+				array( 'status' => 400 )
+			);
+		}
+		return true;
+	}
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php
new file mode 100644
index 0000000000000..9ce7e2b3df66a
--- /dev/null
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php
@@ -0,0 +1,474 @@
+<?php
+/**
+ * REST API: WP_REST_Global_Styles_Revisions_Controller class
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.3.0
+ */
+
+/**
+ * Core class used to access global styles revisions via the REST API.
+ *
+ * @since 6.3.0
+ *
+ * @see WP_REST_Controller
+ */
+class WP_REST_Global_Styles_Revisions_Controller extends WP_REST_Controller {
+	/**
+	 * Parent post type.
+	 *
+	 * @since 6.3.0
+	 * @var string
+	 */
+	protected $parent_post_type;
+
+	/**
+	 * The base of the parent controller's route.
+	 *
+	 * @since 6.3.0
+	 * @var string
+	 */
+	protected $parent_base;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 6.3.0
+	 */
+	public function __construct() {
+		$this->parent_post_type = 'wp_global_styles';
+		$this->rest_base        = 'revisions';
+		$this->parent_base      = 'global-styles';
+		$this->namespace        = 'wp/v2';
+	}
+
+	/**
+	 * Registers the controller's routes.
+	 *
+	 * @since 6.3.0
+	 */
+	public function register_routes() {
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->parent_base . '/(?P<parent>[\d]+)/' . $this->rest_base,
+			array(
+				'args'   => array(
+					'parent' => array(
+						'description' => __( 'The ID for the parent of the revision.' ),
+						'type'        => 'integer',
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
+	}
+
+	/**
+	 * Retrieves the query params for collections.
+	 *
+	 * Inherits from WP_REST_Controller::get_collection_params(),
+	 * also reflects changes to return value WP_REST_Revisions_Controller::get_collection_params().
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array Collection parameters.
+	 */
+	public function get_collection_params() {
+		$collection_params                       = parent::get_collection_params();
+		$collection_params['context']['default'] = 'view';
+		$collection_params['offset']             = array(
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
+		);
+		unset( $collection_params['search'] );
+		unset( $collection_params['per_page']['default'] );
+
+		return $collection_params;
+	}
+
+	/**
+	 * Returns decoded JSON from post content string,
+	 * or a 404 if not found.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string $raw_json Encoded JSON from global styles custom post content.
+	 * @return Array|WP_Error
+	 */
+	protected function get_decoded_global_styles_json( $raw_json ) {
+		$decoded_json = json_decode( $raw_json, true );
+
+		if ( is_array( $decoded_json ) && isset( $decoded_json['isGlobalStylesUserThemeJSON'] ) && true === $decoded_json['isGlobalStylesUserThemeJSON'] ) {
+			return $decoded_json;
+		}
+
+		return new WP_Error(
+			'rest_global_styles_not_found',
+			__( 'Cannot find user global styles revisions.' ),
+			array( 'status' => 404 )
+		);
+	}
+
+	/**
+	 * Returns paginated revisions of the given global styles config custom post type.
+	 *
+	 * The bulk of the body is taken from WP_REST_Revisions_Controller->get_items,
+	 * but global styles does not require as many parameters.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_REST_Request $request The request instance.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_items( $request ) {
+		$parent = $this->get_parent( $request['parent'] );
+
+		if ( is_wp_error( $parent ) ) {
+			return $parent;
+		}
+
+		$global_styles_config = $this->get_decoded_global_styles_json( $parent->post_content );
+
+		if ( is_wp_error( $global_styles_config ) ) {
+			return $global_styles_config;
+		}
+
+		if ( wp_revisions_enabled( $parent ) ) {
+			$registered = $this->get_collection_params();
+			$query_args = array(
+				'post_parent'    => $parent->ID,
+				'post_type'      => 'revision',
+				'post_status'    => 'inherit',
+				'posts_per_page' => -1,
+				'orderby'        => 'date ID',
+				'order'          => 'DESC',
+			);
+
+			$parameter_mappings = array(
+				'offset'   => 'offset',
+				'page'     => 'paged',
+				'per_page' => 'posts_per_page',
+			);
+
+			foreach ( $parameter_mappings as $api_param => $wp_param ) {
+				if ( isset( $registered[ $api_param ], $request[ $api_param ] ) ) {
+					$query_args[ $wp_param ] = $request[ $api_param ];
+				}
+			}
+
+			$revisions_query = new WP_Query();
+			$revisions       = $revisions_query->query( $query_args );
+			$offset          = isset( $query_args['offset'] ) ? (int) $query_args['offset'] : 0;
+			$page            = (int) $query_args['paged'];
+			$total_revisions = $revisions_query->found_posts;
+
+			if ( $total_revisions < 1 ) {
+				// Out-of-bounds, run the query again without LIMIT for total count.
+				unset( $query_args['paged'], $query_args['offset'] );
+				$count_query = new WP_Query();
+				$count_query->query( $query_args );
+
+				$total_revisions = $count_query->found_posts;
+			}
+
+			if ( $revisions_query->query_vars['posts_per_page'] > 0 ) {
+				$max_pages = ceil( $total_revisions / (int) $revisions_query->query_vars['posts_per_page'] );
+			} else {
+				$max_pages = $total_revisions > 0 ? 1 : 0;
+			}
+			if ( $total_revisions > 0 ) {
+				if ( $offset >= $total_revisions ) {
+					return new WP_Error(
+						'rest_revision_invalid_offset_number',
+						__( 'The offset number requested is larger than or equal to the number of available revisions.' ),
+						array( 'status' => 400 )
+					);
+				} elseif ( ! $offset && $page > $max_pages ) {
+					return new WP_Error(
+						'rest_revision_invalid_page_number',
+						__( 'The page number requested is larger than the number of pages available.' ),
+						array( 'status' => 400 )
+					);
+				}
+			}
+		} else {
+			$revisions       = array();
+			$total_revisions = 0;
+			$max_pages       = 0;
+			$page            = (int) $request['page'];
+		}
+
+		$response = array();
+
+		foreach ( $revisions as $revision ) {
+			$data       = $this->prepare_item_for_response( $revision, $request );
+			$response[] = $this->prepare_response_for_collection( $data );
+		}
+
+		$response = rest_ensure_response( $response );
+
+		$response->header( 'X-WP-Total', (int) $total_revisions );
+		$response->header( 'X-WP-TotalPages', (int) $max_pages );
+
+		$request_params = $request->get_query_params();
+		$base_path      = rest_url( sprintf( '%s/%s/%d/%s', $this->namespace, $this->parent_base, $request['parent'], $this->rest_base ) );
+		$base           = add_query_arg( urlencode_deep( $request_params ), $base_path );
+
+		if ( $page > 1 ) {
+			$prev_page = $page - 1;
+
+			if ( $prev_page > $max_pages ) {
+				$prev_page = $max_pages;
+			}
+
+			$prev_link = add_query_arg( 'page', $prev_page, $base );
+			$response->link_header( 'prev', $prev_link );
+		}
+		if ( $max_pages > $page ) {
+			$next_page = $page + 1;
+			$next_link = add_query_arg( 'page', $next_page, $base );
+
+			$response->link_header( 'next', $next_link );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Checks the post_date_gmt or modified_gmt and prepare any post or
+	 * modified date for single post output.
+	 *
+	 * Duplicate of WP_REST_Revisions_Controller::prepare_date_response.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string      $date_gmt GMT publication time.
+	 * @param string|null $date     Optional. Local publication time. Default null.
+	 * @return string|null ISO8601/RFC3339 formatted datetime, otherwise null.
+	 */
+	protected function prepare_date_response( $date_gmt, $date = null ) {
+		if ( '0000-00-00 00:00:00' === $date_gmt ) {
+			return null;
+		}
+
+		if ( isset( $date ) ) {
+			return mysql_to_rfc3339( $date );
+		}
+
+		return mysql_to_rfc3339( $date_gmt );
+	}
+
+	/**
+	 * Prepares the revision for the REST response.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Post         $post    Post revision object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response|WP_Error Response object.
+	 */
+	public function prepare_item_for_response( $post, $request ) {
+		$parent               = $this->get_parent( $request['parent'] );
+		$global_styles_config = $this->get_decoded_global_styles_json( $post->post_content );
+
+		if ( is_wp_error( $global_styles_config ) ) {
+			return $global_styles_config;
+		}
+
+		$fields = $this->get_fields_for_response( $request );
+		$data   = array();
+
+		if ( ! empty( $global_styles_config['styles'] ) || ! empty( $global_styles_config['settings'] ) ) {
+			$global_styles_config = ( new WP_Theme_JSON( $global_styles_config, 'custom' ) )->get_raw_data();
+			if ( rest_is_field_included( 'settings', $fields ) ) {
+				$data['settings'] = ! empty( $global_styles_config['settings'] ) ? $global_styles_config['settings'] : new stdClass();
+			}
+			if ( rest_is_field_included( 'styles', $fields ) ) {
+				$data['styles'] = ! empty( $global_styles_config['styles'] ) ? $global_styles_config['styles'] : new stdClass();
+			}
+		}
+
+		if ( rest_is_field_included( 'author', $fields ) ) {
+			$data['author'] = (int) $post->post_author;
+		}
+
+		if ( rest_is_field_included( 'date', $fields ) ) {
+			$data['date'] = $this->prepare_date_response( $post->post_date_gmt, $post->post_date );
+		}
+
+		if ( rest_is_field_included( 'date_gmt', $fields ) ) {
+			$data['date_gmt'] = $this->prepare_date_response( $post->post_date_gmt );
+		}
+
+		if ( rest_is_field_included( 'id', $fields ) ) {
+			$data['id'] = (int) $post->ID;
+		}
+
+		if ( rest_is_field_included( 'modified', $fields ) ) {
+			$data['modified'] = $this->prepare_date_response( $post->post_modified_gmt, $post->post_modified );
+		}
+
+		if ( rest_is_field_included( 'modified_gmt', $fields ) ) {
+			$data['modified_gmt'] = $this->prepare_date_response( $post->post_modified_gmt );
+		}
+
+		if ( rest_is_field_included( 'parent', $fields ) ) {
+			$data['parent'] = (int) $parent->ID;
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		return rest_ensure_response( $data );
+	}
+
+	/**
+	 * Retrieves the revision's schema, conforming to JSON Schema.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array Item schema data.
+	 */
+	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => "{$this->parent_post_type}-revision",
+			'type'       => 'object',
+			// Base properties for every revision.
+			'properties' => array(
+
+				/*
+				 * Adds settings and styles from the WP_REST_Revisions_Controller item fields.
+				 * Leaves out GUID as global styles shouldn't be accessible via URL.
+				 */
+				'author'       => array(
+					'description' => __( 'The ID for the author of the revision.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
+				'date'         => array(
+					'description' => __( "The date the revision was published, in the site's timezone." ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
+				'date_gmt'     => array(
+					'description' => __( 'The date the revision was published, as GMT.' ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'id'           => array(
+					'description' => __( 'Unique identifier for the revision.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
+				'modified'     => array(
+					'description' => __( "The date the revision was last modified, in the site's timezone." ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'modified_gmt' => array(
+					'description' => __( 'The date the revision was last modified, as GMT.' ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+				),
+				'parent'       => array(
+					'description' => __( 'The ID for the parent of the revision.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+				),
+
+				// Adds settings and styles from the WP_REST_Global_Styles_Controller parent schema.
+				'styles'       => array(
+					'description' => __( 'Global styles.' ),
+					'type'        => array( 'object' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+				'settings'     => array(
+					'description' => __( 'Global settings.' ),
+					'type'        => array( 'object' ),
+					'context'     => array( 'view', 'edit' ),
+				),
+			),
+		);
+
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
+	}
+
+	/**
+	 * Checks if a given request has access to read a single global style.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_item_permissions_check( $request ) {
+		$post = $this->get_parent( $request['parent'] );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		/*
+		 * The same check as WP_REST_Global_Styles_Controller::get_item_permissions_check.
+		 */
+		if ( ! current_user_can( 'read_post', $post->ID ) ) {
+			return new WP_Error(
+				'rest_cannot_view',
+				__( 'Sorry, you are not allowed to view revisions for this global style.' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the parent post, if the ID is valid.
+	 *
+	 * Duplicate of WP_REST_Revisions_Controller::get_parent.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int $parent_post_id Supplied ID.
+	 * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
+	 */
+	protected function get_parent( $parent_post_id ) {
+		$error = new WP_Error(
+			'rest_post_invalid_parent',
+			__( 'Invalid post parent ID.' ),
+			array( 'status' => 404 )
+		);
+
+		if ( (int) $parent_post_id <= 0 ) {
+			return $error;
+		}
+
+		$parent_post = get_post( (int) $parent_post_id );
+
+		if ( empty( $parent_post ) || empty( $parent_post->ID )
+			|| $this->parent_post_type !== $parent_post->post_type
+		) {
+			return $error;
+		}
+
+		return $parent_post;
+	}
+}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php
index c50dded1616d0..4119b6530e91e 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php
@@ -57,7 +57,7 @@ public function get_items_permissions_check( $request ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object otherwise.
+	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object or false otherwise.
 	 */
 	public function get_item_permissions_check( $request ) {
 		$permission_check = parent::get_item_permissions_check( $request );
@@ -77,7 +77,7 @@ public function get_item_permissions_check( $request ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error Whether the current user has permission.
+	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	protected function check_has_read_only_access( $request ) {
 		if ( current_user_can( 'edit_theme_options' ) ) {
@@ -710,6 +710,10 @@ protected function get_schema_links() {
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
 		$schema = array(
 			'$schema' => 'http://json-schema.org/draft-04/schema#',
 			'title'   => $this->post_type,
@@ -792,7 +796,7 @@ public function get_item_schema() {
 			),
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'arg_options' => array(
-				'sanitize_callback' => function ( $value ) {
+				'sanitize_callback' => static function ( $value ) {
 					return array_map( 'sanitize_html_class', wp_parse_list( $value ) );
 				},
 			),
@@ -873,7 +877,7 @@ public function get_item_schema() {
 			),
 			'context'     => array( 'view', 'edit', 'embed' ),
 			'arg_options' => array(
-				'sanitize_callback' => function ( $value ) {
+				'sanitize_callback' => static function ( $value ) {
 					return array_map( 'sanitize_html_class', wp_parse_list( $value ) );
 				},
 			),
@@ -914,7 +918,9 @@ public function get_item_schema() {
 			$schema['links'] = $schema_links;
 		}
 
-		return $this->add_additional_fields_schema( $schema );
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 
 	/**
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php
index 5c06dc7a6583a..5d25b47f5fa94 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-locations-controller.php
@@ -120,7 +120,7 @@ public function get_items( $request ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return WP_Error|bool True if the request has read access for the item, WP_Error object otherwise.
+	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
 	 */
 	public function get_item_permissions_check( $request ) {
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php
index 775d805efe5b5..3b8205f89dc92 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-menus-controller.php
@@ -40,7 +40,7 @@ public function get_items_permissions_check( $request ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the item, otherwise false or WP_Error object.
+	 * @return true|WP_Error True if the request has read access for the item, otherwise WP_Error object.
 	 */
 	public function get_item_permissions_check( $request ) {
 		$has_permission = parent::get_item_permissions_check( $request );
@@ -81,7 +81,7 @@ protected function get_term( $id ) {
 	 * @since 5.9.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error Whether the current user has permission.
+	 * @return true|WP_Error True if the current user has permission, WP_Error object otherwise.
 	 */
 	protected function check_has_read_only_access( $request ) {
 		if ( current_user_can( 'edit_theme_options' ) ) {
@@ -523,6 +523,10 @@ protected function handle_locations( $menu_id, $request ) {
 	 * @return array Item schema data.
 	 */
 	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
 		$schema = parent::get_item_schema();
 		unset( $schema['properties']['count'], $schema['properties']['link'], $schema['properties']['taxonomy'] );
 
@@ -534,7 +538,7 @@ public function get_item_schema() {
 			),
 			'context'     => array( 'view', 'edit' ),
 			'arg_options' => array(
-				'validate_callback' => function ( $locations, $request, $param ) {
+				'validate_callback' => static function ( $locations, $request, $param ) {
 					$valid = rest_validate_request_arg( $locations, $request, $param );
 
 					if ( true !== $valid ) {
@@ -566,6 +570,8 @@ public function get_item_schema() {
 			'type'        => 'boolean',
 		);
 
-		return $schema;
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 }
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php
new file mode 100644
index 0000000000000..2290c69f32411
--- /dev/null
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * WP_REST_Navigation_Fallback_Controller class
+ *
+ * REST Controller to create/fetch a fallback Navigation Menu.
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.3.0
+ */
+
+/**
+ * REST Controller to fetch a fallback Navigation Block Menu. If needed it creates one.
+ *
+ * @since 6.3.0
+ */
+class WP_REST_Navigation_Fallback_Controller extends WP_REST_Controller {
+
+	/**
+	 * The Post Type for the Controller
+	 *
+	 * @since 6.3.0
+	 *
+	 * @var string
+	 */
+	private $post_type;
+
+	/**
+	 * Constructs the controller.
+	 *
+	 * @since 6.3.0
+	 */
+	public function __construct() {
+		$this->namespace = 'wp-block-editor/v1';
+		$this->rest_base = 'navigation-fallback';
+		$this->post_type = 'wp_navigation';
+	}
+
+	/**
+	 * Registers the controllers routes.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return void
+	 */
+	public function register_routes() {
+
+		// Lists a single nav item based on the given id or slug.
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::READABLE ),
+				),
+				'schema' => array( $this, 'get_item_schema' ),
+			)
+		);
+	}
+
+	/**
+	 * Checks if a given request has access to read fallbacks.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_item_permissions_check( $request ) {
+
+		$post_type = get_post_type_object( $this->post_type );
+
+		// Getting fallbacks requires creating and reading `wp_navigation` posts.
+		if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( 'edit_theme_options' ) || ! current_user_can( 'edit_posts' ) ) {
+			return new WP_Error(
+				'rest_cannot_create',
+				__( 'Sorry, you are not allowed to create Navigation Menus as this user.' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		if ( 'edit' === $request['context'] && ! current_user_can( $post_type->cap->edit_posts ) ) {
+			return new WP_Error(
+				'rest_forbidden_context',
+				__( 'Sorry, you are not allowed to edit Navigation Menus as this user.' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the most appropriate fallback Navigation Menu.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function get_item( $request ) {
+		$post = WP_Navigation_Fallback::get_fallback();
+
+		if ( empty( $post ) ) {
+			return rest_ensure_response( new WP_Error( 'no_fallback_menu', __( 'No fallback menu found.' ), array( 'status' => 404 ) ) );
+		}
+
+		$response = $this->prepare_item_for_response( $post, $request );
+
+		return $response;
+	}
+
+	/**
+	 * Retrieves the fallbacks' schema, conforming to JSON Schema.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array Item schema data.
+	 */
+	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
+		$this->schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'navigation-fallback',
+			'type'       => 'object',
+			'properties' => array(
+				'id' => array(
+					'description' => __( 'The unique identifier for the Navigation Menu.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
+				),
+			),
+		);
+
+		return $this->add_additional_fields_schema( $this->schema );
+	}
+
+	/**
+	 * Matches the post data to the schema we want.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Post         $item    The wp_navigation Post object whose response is being prepared.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response $response The response data.
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$data = array();
+
+		$fields = $this->get_fields_for_response( $request );
+
+		if ( rest_is_field_included( 'id', $fields ) ) {
+			$data['id'] = (int) $item->ID;
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
+			$links = $this->prepare_links( $item );
+			$response->add_links( $links );
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Prepares the links for the request.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param WP_Post $post the Navigation Menu post object.
+	 * @return array Links for the given request.
+	 */
+	private function prepare_links( $post ) {
+		return array(
+			'self' => array(
+				'href'       => rest_url( rest_get_route_for_post( $post->ID ) ),
+				'embeddable' => true,
+			),
+		);
+	}
+}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
index b0ba186a0264d..0260561866efb 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
@@ -81,6 +81,7 @@ public function get_items_permissions_check( $request ) {
 	 *
 	 * @since 5.8.0
 	 * @since 6.0.0 Added 'slug' to request.
+	 * @since 6.2.0 Added 'per_page', 'page', 'offset', 'order', and 'orderby' to request.
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -93,31 +94,23 @@ public function get_items( $request ) {
 		 */
 		require ABSPATH . WPINC . '/version.php';
 
-		$query_args = array(
-			'locale'     => get_user_locale(),
-			'wp-version' => $wp_version,
+		$valid_query_args = array(
+			'offset'   => true,
+			'order'    => true,
+			'orderby'  => true,
+			'page'     => true,
+			'per_page' => true,
+			'search'   => true,
+			'slug'     => true,
 		);
+		$query_args       = array_intersect_key( $request->get_params(), $valid_query_args );
 
-		$category_id = $request['category'];
-		$keyword_id  = $request['keyword'];
-		$search_term = $request['search'];
-		$slug        = $request['slug'];
+		$query_args['locale']             = get_user_locale();
+		$query_args['wp-version']         = $wp_version; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable -- it's defined in `version.php` above.
+		$query_args['pattern-categories'] = isset( $request['category'] ) ? $request['category'] : false;
+		$query_args['pattern-keywords']   = isset( $request['keyword'] ) ? $request['keyword'] : false;
 
-		if ( $category_id ) {
-			$query_args['pattern-categories'] = $category_id;
-		}
-
-		if ( $keyword_id ) {
-			$query_args['pattern-keywords'] = $keyword_id;
-		}
-
-		if ( $search_term ) {
-			$query_args['search'] = $search_term;
-		}
-
-		if ( $slug ) {
-			$query_args['slug'] = $slug;
-		}
+		$query_args = array_filter( $query_args );
 
 		$transient_key = $this->get_transient_key( $query_args );
 
@@ -209,6 +202,7 @@ public function prepare_item_for_response( $item, $request ) {
 			'keywords'       => array_map( 'sanitize_text_field', explode( ',', $raw_pattern->meta->wpop_keywords ) ),
 			'description'    => sanitize_text_field( $raw_pattern->meta->wpop_description ),
 			'viewport_width' => absint( $raw_pattern->meta->wpop_viewport_width ),
+			'block_types'    => array_map( 'sanitize_text_field', $raw_pattern->meta->wpop_block_types ),
 		);
 
 		$prepared_pattern = $this->add_additional_fields_to_object( $prepared_pattern, $request );
@@ -231,6 +225,7 @@ public function prepare_item_for_response( $item, $request ) {
 	 * Retrieves the block pattern's schema, conforming to JSON Schema.
 	 *
 	 * @since 5.8.0
+	 * @since 6.2.0 Added `'block_types'` to schema.
 	 *
 	 * @return array Item schema data.
 	 */
@@ -293,6 +288,14 @@ public function get_item_schema() {
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
+
+				'block_types'    => array(
+					'description' => __( 'The block types which can use this pattern.' ),
+					'type'        => 'array',
+					'uniqueItems' => true,
+					'items'       => array( 'type' => 'string' ),
+					'context'     => array( 'view', 'embed' ),
+				),
 			),
 		);
 
@@ -303,16 +306,14 @@ public function get_item_schema() {
 	 * Retrieves the search parameters for the block pattern's collection.
 	 *
 	 * @since 5.8.0
+	 * @since 6.2.0 Added 'per_page', 'page', 'offset', 'order', and 'orderby' to request.
 	 *
 	 * @return array Collection parameters.
 	 */
 	public function get_collection_params() {
 		$query_params = parent::get_collection_params();
 
-		// Pagination is not supported.
-		unset( $query_params['page'] );
-		unset( $query_params['per_page'] );
-
+		$query_params['per_page']['default'] = 100;
 		$query_params['search']['minLength'] = 1;
 		$query_params['context']['default']  = 'view';
 
@@ -333,6 +334,37 @@ public function get_collection_params() {
 			'type'        => 'array',
 		);
 
+		$query_params['offset'] = array(
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
+		);
+
+		$query_params['order'] = array(
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'type'        => 'string',
+			'default'     => 'desc',
+			'enum'        => array( 'asc', 'desc' ),
+		);
+
+		$query_params['orderby'] = array(
+			'description' => __( 'Sort collection by post attribute.' ),
+			'type'        => 'string',
+			'default'     => 'date',
+			'enum'        => array(
+				'author',
+				'date',
+				'id',
+				'include',
+				'modified',
+				'parent',
+				'relevance',
+				'slug',
+				'include_slugs',
+				'title',
+				'favorite_count',
+			),
+		);
+
 		/**
 		 * Filter collection parameters for the block pattern directory controller.
 		 *
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
index 9e9441085a337..4cbc5063e906e 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php
@@ -298,7 +298,7 @@ public function create_item( $request ) {
 		);
 
 		if ( is_wp_error( $api ) ) {
-			if ( false !== strpos( $api->get_error_message(), 'Plugin not found.' ) ) {
+			if ( str_contains( $api->get_error_message(), 'Plugin not found.' ) ) {
 				$api->add_data( array( 'status' => 404 ) );
 			} else {
 				$api->add_data( array( 'status' => 500 ) );
@@ -809,7 +809,7 @@ protected function does_plugin_match_request( $request, $item ) {
 			$matched_search = false;
 
 			foreach ( $item as $field ) {
-				if ( is_string( $field ) && false !== strpos( strip_tags( $field ), $search ) ) {
+				if ( is_string( $field ) && str_contains( strip_tags( $field ), $search ) ) {
 					$matched_search = true;
 					break;
 				}
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index deb83c2f0343e..356c321129894 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -249,6 +249,7 @@ public function get_items( $request ) {
 			'parent'         => 'post_parent__in',
 			'parent_exclude' => 'post_parent__not_in',
 			'search'         => 's',
+			'search_columns' => 'search_columns',
 			'slug'           => 'post_name__in',
 			'status'         => 'post_status',
 		);
@@ -474,7 +475,7 @@ protected function get_post( $id ) {
 	 * @since 4.7.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access for the item, WP_Error object otherwise.
+	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object or false otherwise.
 	 */
 	public function get_item_permissions_check( $request ) {
 		$post = $this->get_post( $request['id'] );
@@ -659,11 +660,9 @@ public function create_item( $request ) {
 			&& in_array( $prepared_post->post_status, array( 'draft', 'pending' ), true )
 		) {
 			/*
-			 * `wp_unique_post_slug()` returns the same
-			 * slug for 'draft' or 'pending' posts.
+			 * `wp_unique_post_slug()` returns the same slug for 'draft' or 'pending' posts.
 			 *
-			 * To ensure that a unique slug is generated,
-			 * pass the post data with the 'publish' status.
+			 * To ensure that a unique slug is generated, pass the post data with the 'publish' status.
 			 */
 			$prepared_post->post_name = wp_unique_post_slug(
 				$prepared_post->post_name,
@@ -862,15 +861,19 @@ public function update_item( $request ) {
 		}
 
 		/*
-		 * `wp_unique_post_slug()` returns the same
-		 * slug for 'draft' or 'pending' posts.
+		 * `wp_unique_post_slug()` returns the same slug for 'draft' or 'pending' posts.
 		 *
-		 * To ensure that a unique slug is generated,
-		 * pass the post data with the 'publish' status.
+		 * To ensure that a unique slug is generated, pass the post data with the 'publish' status.
 		 */
 		if ( ! empty( $post->post_name ) && in_array( $post_status, array( 'draft', 'pending' ), true ) ) {
 			$post_parent     = ! empty( $post->post_parent ) ? $post->post_parent : 0;
-			$post->post_name = wp_unique_post_slug( $post->post_name, $post->ID, 'publish', $post->post_type, $post_parent );
+			$post->post_name = wp_unique_post_slug(
+				$post->post_name,
+				$post->ID,
+				'publish',
+				$post->post_type,
+				$post_parent
+			);
 		}
 
 		// Convert the post object to an array, otherwise wp_update_post() will expect non-escaped input.
@@ -1060,8 +1063,10 @@ public function delete_item( $request ) {
 				);
 			}
 
-			// (Note that internally this falls through to `wp_delete_post()`
-			// if the Trash is disabled.)
+			/*
+			 * (Note that internally this falls through to `wp_delete_post()`
+			 * if the Trash is disabled.)
+			 */
 			$result   = wp_trash_post( $id );
 			$post     = get_post( $id );
 			$response = $this->prepare_item_for_response( $post, $request );
@@ -1266,8 +1271,10 @@ protected function prepare_item_for_database( $request ) {
 			}
 		}
 
-		// Sending a null date or date_gmt value resets date and date_gmt to their
-		// default values (`0000-00-00 00:00:00`).
+		/*
+		 * Sending a null date or date_gmt value resets date and date_gmt to their
+		 * default values (`0000-00-00 00:00:00`).
+		 */
 		if (
 			( ! empty( $schema['properties']['date_gmt'] ) && $request->has_param( 'date_gmt' ) && null === $request['date_gmt'] ) ||
 			( ! empty( $schema['properties']['date'] ) && $request->has_param( 'date' ) && null === $request['date'] )
@@ -1499,7 +1506,7 @@ protected function handle_featured_media( $featured_media, $post_id ) {
 	 *
 	 * @param string          $template Page template filename.
 	 * @param WP_REST_Request $request  Request.
-	 * @return bool|WP_Error True if template is still valid or if the same as existing value, or false if template not supported.
+	 * @return true|WP_Error True if template is still valid or if the same as existing value, or a WP_Error if template not supported.
 	 */
 	public function check_template( $template, $request ) {
 
@@ -1795,7 +1802,7 @@ public function prepare_item_for_response( $item, $request ) {
 			 * with the site's timezone offset applied.
 			 */
 			if ( '0000-00-00 00:00:00' === $post->post_modified_gmt ) {
-				$post_modified_gmt = gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) - ( get_option( 'gmt_offset' ) * 3600 ) );
+				$post_modified_gmt = gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) - ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
 			} else {
 				$post_modified_gmt = $post->post_modified_gmt;
 			}
@@ -2889,10 +2896,20 @@ public function get_collection_params() {
 			);
 		}
 
+		$query_params['search_columns'] = array(
+			'default'     => array(),
+			'description' => __( 'Array of column names to be searched.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'enum' => array( 'post_title', 'post_content', 'post_excerpt' ),
+				'type' => 'string',
+			),
+		);
+
 		$query_params['slug'] = array(
-			'description'       => __( 'Limit result set to posts with one or more specific slugs.' ),
-			'type'              => 'array',
-			'items'             => array(
+			'description' => __( 'Limit result set to posts with one or more specific slugs.' ),
+			'type'        => 'array',
+			'items'       => array(
 				'type' => 'string',
 			),
 		);
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 23f9ada215104..6fde5f13f545d 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -48,16 +48,18 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * @param string $parent_post_type Post type of the parent.
 	 */
 	public function __construct( $parent_post_type ) {
-		$this->parent_post_type  = $parent_post_type;
+		$this->parent_post_type = $parent_post_type;
+		$post_type_object       = get_post_type_object( $parent_post_type );
+		$parent_controller      = $post_type_object->get_rest_controller();
+
+		if ( ! $parent_controller ) {
+			$parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
+		}
+
+		$this->parent_controller = $parent_controller;
 		$this->rest_base         = 'revisions';
-		$post_type_object        = get_post_type_object( $parent_post_type );
 		$this->parent_base       = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
 		$this->namespace         = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
-		$this->parent_controller = $post_type_object->get_rest_controller();
-
-		if ( ! $this->parent_controller ) {
-			$this->parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
-		}
 	}
 
 	/**
@@ -134,25 +136,29 @@ public function register_routes() {
 	 *
 	 * @since 4.7.2
 	 *
-	 * @param int $parent Supplied ID.
+	 * @param int $parent_post_id Supplied ID.
 	 * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
 	 */
-	protected function get_parent( $parent ) {
+	protected function get_parent( $parent_post_id ) {
 		$error = new WP_Error(
 			'rest_post_invalid_parent',
 			__( 'Invalid post parent ID.' ),
 			array( 'status' => 404 )
 		);
-		if ( (int) $parent <= 0 ) {
+
+		if ( (int) $parent_post_id <= 0 ) {
 			return $error;
 		}
 
-		$parent = get_post( (int) $parent );
-		if ( empty( $parent ) || empty( $parent->ID ) || $this->parent_post_type !== $parent->post_type ) {
+		$parent_post = get_post( (int) $parent_post_id );
+
+		if ( empty( $parent_post ) || empty( $parent_post->ID )
+			|| $this->parent_post_type !== $parent_post->post_type
+		) {
 			return $error;
 		}
 
-		return $parent;
+		return $parent_post;
 	}
 
 	/**
@@ -406,8 +412,6 @@ public function delete_item_permissions_check( $request ) {
 			return $parent;
 		}
 
-		$parent_post_type = get_post_type_object( $parent->post_type );
-
 		if ( ! current_user_can( 'delete_post', $parent->ID ) ) {
 			return new WP_Error(
 				'rest_cannot_delete',
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
index 93502d60f41fb..bf59c1e998f10 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-search-controller.php
@@ -360,7 +360,7 @@ public function get_collection_params() {
 	 * @param string|array    $subtypes  One or more subtypes.
 	 * @param WP_REST_Request $request   Full details about the request.
 	 * @param string          $parameter Parameter name.
-	 * @return array|WP_Error List of valid subtypes, or WP_Error object on failure.
+	 * @return string[]|WP_Error List of valid subtypes, or WP_Error object on failure.
 	 */
 	public function sanitize_subtypes( $subtypes, $request, $parameter ) {
 		$subtypes = wp_parse_slug_list( $subtypes );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
index 449ad6bb5b335..36ef35461c2b9 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-sidebars-controller.php
@@ -261,8 +261,10 @@ public function update_item( $request ) {
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
 	protected function do_permissions_check() {
-		// Verify if the current user has edit_theme_options capability.
-		// This capability is required to access the widgets screen.
+		/*
+		 * Verify if the current user has edit_theme_options capability.
+		 * This capability is required to access the widgets screen.
+		 */
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return new WP_Error(
 				'rest_cannot_manage_widgets',
@@ -339,6 +341,10 @@ public function prepare_item_for_response( $item, $request ) {
 			$sidebar['class']       = '';
 		}
 
+		if ( wp_is_block_theme() ) {
+			$sidebar['status'] = 'inactive';
+		}
+
 		$fields = $this->get_fields_for_response( $request );
 		if ( rest_is_field_included( 'widgets', $fields ) ) {
 			$sidebars = wp_get_sidebars_widgets();
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php
index 954165b825866..43e6676eff0ea 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php
@@ -336,7 +336,7 @@ protected function load_admin_textdomain() {
 		// Accounts for inner REST API requests in the admin.
 		if ( ! is_admin() ) {
 			$locale = determine_locale();
-			load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
+			load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo", $locale );
 		}
 	}
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 8f70cda9f1296..4ca84ad03c3b8 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -101,11 +101,13 @@ public function register_routes() {
 			sprintf(
 				'/%s/(?P<id>%s%s)',
 				$this->rest_base,
-				// Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
-				// Excludes invalid directory name characters: `/:<>*?"|`.
+				/*
+				 * Matches theme's directory: `/themes/<subdirectory>/<theme>/` or `/themes/<theme>/`.
+				 * Excludes invalid directory name characters: `/:<>*?"|`.
+				 */
 				'([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)',
 				// Matches the template name.
-				'[\/\w-]+'
+				'[\/\w%-]+'
 			),
 			array(
 				'args'   => array(
@@ -150,14 +152,21 @@ public function register_routes() {
 	 * Returns the fallback template for the given slug.
 	 *
 	 * @since 6.1.0
+	 * @since 6.3.0 Ignore empty templates.
 	 *
 	 * @param WP_REST_Request $request The request instance.
 	 * @return WP_REST_Response|WP_Error
 	 */
 	public function get_template_fallback( $request ) {
-		$hierarchy         = get_template_hierarchy( $request['slug'], $request['is_custom'], $request['template_prefix'] );
-		$fallback_template = resolve_block_template( $request['slug'], $hierarchy, '' );
-		$response          = $this->prepare_item_for_response( $fallback_template, $request );
+		$hierarchy = get_template_hierarchy( $request['slug'], $request['is_custom'], $request['template_prefix'] );
+
+		do {
+			$fallback_template = resolve_block_template( $request['slug'], $hierarchy, '' );
+			array_shift( $hierarchy );
+		} while ( ! empty( $hierarchy ) && empty( $fallback_template->content ) );
+
+		$response = $this->prepare_item_for_response( $fallback_template, $request );
+
 		return rest_ensure_response( $response );
 	}
 
@@ -170,8 +179,10 @@ public function get_template_fallback( $request ) {
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
 	protected function permissions_check( $request ) {
-		// Verify if the current user has edit_theme_options capability.
-		// This capability is required to edit/view/delete templates.
+		/*
+		 * Verify if the current user has edit_theme_options capability.
+		 * This capability is required to edit/view/delete templates.
+		 */
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return new WP_Error(
 				'rest_cannot_manage_templates',
@@ -495,8 +506,10 @@ public function delete_item( $request ) {
 				);
 			}
 
-			// (Note that internally this falls through to `wp_delete_post()`
-			// if the Trash is disabled.)
+			/*
+			 * (Note that internally this falls through to `wp_delete_post()`
+			 * if the Trash is disabled.)
+			 */
 			$result           = wp_trash_post( $id );
 			$template->status = 'trash';
 			$response         = $this->prepare_item_for_response( $template, $request );
@@ -528,7 +541,7 @@ protected function prepare_item_for_database( $request ) {
 			$changes->post_type   = $this->post_type;
 			$changes->post_status = 'publish';
 			$changes->tax_input   = array(
-				'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : wp_get_theme()->get_stylesheet(),
+				'wp_theme' => isset( $request['theme'] ) ? $request['theme'] : get_stylesheet(),
 			);
 		} elseif ( 'custom' !== $template->source ) {
 			$changes->post_name   = $template->slug;
@@ -583,7 +596,7 @@ protected function prepare_item_for_database( $request ) {
 				$changes->tax_input['wp_template_part_area'] = _filter_block_template_part_area( $request['area'] );
 			} elseif ( null !== $template && 'custom' !== $template->source && $template->area ) {
 				$changes->tax_input['wp_template_part_area'] = _filter_block_template_part_area( $template->area );
-			} elseif ( ! $template->area ) {
+			} elseif ( empty( $template->area ) ) {
 				$changes->tax_input['wp_template_part_area'] = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
 			}
 		}
@@ -614,6 +627,7 @@ protected function prepare_item_for_database( $request ) {
 	 *
 	 * @since 5.8.0
 	 * @since 5.9.0 Renamed `$template` to `$item` to match parent class for PHP 8 named parameter support.
+	 * @since 6.3.0 Added `modified` property to the response.
 	 *
 	 * @param WP_Block_Template $item    Template instance.
 	 * @param WP_REST_Request   $request Request object.
@@ -708,6 +722,10 @@ public function prepare_item_for_response( $item, $request ) { // phpcs:ignore V
 			$data['area'] = $template->area;
 		}
 
+		if ( rest_is_field_included( 'modified', $fields ) ) {
+			$data['modified'] = mysql_to_rfc3339( $template->modified );
+		}
+
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
 		$data    = $this->add_additional_fields_to_object( $data, $request );
 		$data    = $this->filter_response_by_context( $data, $context );
@@ -834,7 +852,7 @@ public function get_item_schema() {
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'required'    => true,
 					'minLength'   => 1,
-					'pattern'     => '[a-zA-Z0-9_\-]+',
+					'pattern'     => '[a-zA-Z0-9_\%-]+',
 				),
 				'theme'          => array(
 					'description' => __( 'Theme identifier for the template.' ),
@@ -926,6 +944,13 @@ public function get_item_schema() {
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
+				'modified'       => array(
+					'description' => __( "The date the template was last modified, in the site's timezone." ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
+				),
 			),
 		);
 
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index 4ef48fa366331..cf9dc917c49d2 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -179,7 +179,7 @@ public function check_read_terms_permission_for_post( $post, $request ) {
 	 * @since 4.7.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access, otherwise false or WP_Error object.
+	 * @return bool|WP_Error True if the request has read access, otherwise false or WP_Error object.
 	 */
 	public function get_items_permissions_check( $request ) {
 		$tax_obj = get_taxonomy( $this->taxonomy );
@@ -417,7 +417,7 @@ protected function get_term( $id ) {
 	 * @since 4.7.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return true|WP_Error True if the request has read access for the item, otherwise false or WP_Error object.
+	 * @return true|WP_Error True if the request has read access for the item, otherwise WP_Error object.
 	 */
 	public function get_item_permissions_check( $request ) {
 		$term = $this->get_term( $request['id'] );
@@ -807,7 +807,7 @@ public function delete_item( $request ) {
 	 * @return object Term object.
 	 */
 	public function prepare_item_for_database( $request ) {
-		$prepared_term = new stdClass;
+		$prepared_term = new stdClass();
 
 		$schema = $this->get_item_schema();
 		if ( isset( $request['name'] ) && ! empty( $schema['properties']['name'] ) ) {
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
index 71dbcb61931f8..ac326e98c752b 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php
@@ -118,7 +118,7 @@ public function get_items_permissions_check( $request ) {
 	 * @since 5.7.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
-	 * @return bool|WP_Error True if the request has read access for the item, otherwise WP_Error object.
+	 * @return true|WP_Error True if the request has read access for the item, otherwise WP_Error object.
 	 */
 	public function get_item_permissions_check( $request ) {
 		if ( current_user_can( 'switch_themes' ) || current_user_can( 'manage_network_themes' ) ) {
@@ -144,7 +144,7 @@ public function get_item_permissions_check( $request ) {
 	 *
 	 * @since 5.7.0
 	 *
-	 * @return bool|WP_Error Whether the theme can be read.
+	 * @return true|WP_Error True if the theme can be read, WP_Error object otherwise.
 	 */
 	protected function check_read_active_theme_permission() {
 		if ( current_user_can( 'edit_posts' ) ) {
@@ -326,6 +326,10 @@ public function prepare_item_for_response( $item, $request ) {
 			}
 		}
 
+		if ( rest_is_field_included( 'is_block_theme', $fields ) ) {
+			$data['is_block_theme'] = $theme->is_block_theme();
+		}
+
 		$data = $this->add_additional_fields_to_object( $data, $request );
 
 		// Wrap the data in a response object.
@@ -494,6 +498,11 @@ public function get_item_schema() {
 						),
 					),
 				),
+				'is_block_theme' => array(
+					'description' => __( 'Whether the theme is a block-based theme.' ),
+					'type'        => 'boolean',
+					'readonly'    => true,
+				),
 				'name'           => array(
 					'description' => __( 'The name of the theme.' ),
 					'type'        => 'object',
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index 52e8fcf0cdb08..00edcdc7f9604 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -683,8 +683,10 @@ public function update_item_permissions_check( $request ) {
 
 			$request_params = array_keys( $request->get_params() );
 			sort( $request_params );
-			// If only 'id' and 'roles' are specified (we are only trying to
-			// edit roles), then only the 'promote_user' cap is required.
+			/*
+			 * If only 'id' and 'roles' are specified (we are only trying to
+			 * edit roles), then only the 'promote_user' cap is required.
+			 */
 			if ( array( 'id', 'roles' ) === $request_params ) {
 				return true;
 			}
@@ -717,14 +719,6 @@ public function update_item( $request ) {
 
 		$id = $user->ID;
 
-		if ( ! $user ) {
-			return new WP_Error(
-				'rest_user_invalid_id',
-				__( 'Invalid user ID.' ),
-				array( 'status' => 404 )
-			);
-		}
-
 		$owner_id = false;
 		if ( is_string( $request['email'] ) ) {
 			$owner_id = email_exists( $request['email'] );
@@ -1121,7 +1115,7 @@ protected function prepare_links( $user ) {
 	 * @return object User object.
 	 */
 	protected function prepare_item_for_database( $request ) {
-		$prepared_user = new stdClass;
+		$prepared_user = new stdClass();
 
 		$schema = $this->get_item_schema();
 
@@ -1313,7 +1307,7 @@ public function check_user_password( $value, $request, $param ) {
 			);
 		}
 
-		if ( false !== strpos( $password, '\\' ) ) {
+		if ( str_contains( $password, '\\' ) ) {
 			return new WP_Error(
 				'rest_user_invalid_password',
 				sprintf(
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
index d721c32d64c4d..9734ae66255c0 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widget-types-controller.php
@@ -85,9 +85,9 @@ public function register_routes() {
 					'form_data' => array(
 						'description'       => __( 'Serialized widget form data to encode into instance settings.' ),
 						'type'              => 'string',
-						'sanitize_callback' => static function( $string ) {
+						'sanitize_callback' => static function( $form_data ) {
 							$array = array();
-							wp_parse_str( $string, $array );
+							wp_parse_str( $form_data, $array );
 							return $array;
 						},
 					),
@@ -464,8 +464,10 @@ public function encode_form_data( $request ) {
 			);
 		}
 
-		// Set the widget's number so that the id attributes in the HTML that we
-		// return are predictable.
+		/*
+		 * Set the widget's number so that the id attributes in the HTML that we
+		 * return are predictable.
+		 */
 		if ( isset( $request['number'] ) && is_numeric( $request['number'] ) ) {
 			$widget_object->_set( (int) $request['number'] );
 		} else {
@@ -529,7 +531,7 @@ public function encode_form_data( $request ) {
 
 		if ( ! empty( $widget_object->widget_options['show_instance_in_rest'] ) ) {
 			// Use new stdClass so that JSON result is {} and not [].
-			$response['instance']['raw'] = empty( $instance ) ? new stdClass : $instance;
+			$response['instance']['raw'] = empty( $instance ) ? new stdClass() : $instance;
 		}
 
 		return rest_ensure_response( $response );
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
index e6ac11cf88afc..267a75ffaedb9 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-widgets-controller.php
@@ -715,7 +715,7 @@ public function prepare_item_for_response( $item, $request ) {
 
 				if ( ! empty( $widget_object->widget_options['show_instance_in_rest'] ) ) {
 					// Use new stdClass so that JSON result is {} and not [].
-					$prepared['instance']['raw'] = empty( $instance ) ? new stdClass : $instance;
+					$prepared['instance']['raw'] = empty( $instance ) ? new stdClass() : $instance;
 				}
 			}
 		}
@@ -861,9 +861,9 @@ public function get_item_schema() {
 					'type'        => 'string',
 					'context'     => array(),
 					'arg_options' => array(
-						'sanitize_callback' => static function( $string ) {
+						'sanitize_callback' => static function( $form_data ) {
 							$array = array();
-							wp_parse_str( $string, $array );
+							wp_parse_str( $form_data, $array );
 							return $array;
 						},
 					),
diff --git a/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php b/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
index 1b6a7fe37f565..60c3c3ab24a22 100644
--- a/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
+++ b/src/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
@@ -368,6 +368,16 @@ function ( $stored_value ) use ( $meta_key, $subtype, $value ) {
 	protected function update_meta_value( $object_id, $meta_key, $name, $value ) {
 		$meta_type = $this->get_meta_type();
 
+		// Do the exact same check for a duplicate value as in update_metadata() to avoid update_metadata() returning false.
+		$old_value = get_metadata( $meta_type, $object_id, $meta_key );
+		$subtype   = get_object_subtype( $meta_type, $object_id );
+
+		if ( is_array( $old_value ) && 1 === count( $old_value )
+			&& $this->is_meta_value_same_as_stored_value( $meta_key, $subtype, $old_value[0], $value )
+		) {
+			return true;
+		}
+
 		if ( ! current_user_can( "edit_{$meta_type}_meta", $object_id, $meta_key ) ) {
 			return new WP_Error(
 				'rest_cannot_update',
@@ -380,16 +390,6 @@ protected function update_meta_value( $object_id, $meta_key, $name, $value ) {
 			);
 		}
 
-		// Do the exact same check for a duplicate value as in update_metadata() to avoid update_metadata() returning false.
-		$old_value = get_metadata( $meta_type, $object_id, $meta_key );
-		$subtype   = get_object_subtype( $meta_type, $object_id );
-
-		if ( is_array( $old_value ) && 1 === count( $old_value )
-			&& $this->is_meta_value_same_as_stored_value( $meta_key, $subtype, $old_value[0], $value )
-		) {
-			return true;
-		}
-
 		if ( ! update_metadata( $meta_type, $object_id, wp_slash( $meta_key ), wp_slash( $value ) ) ) {
 			return new WP_Error(
 				'rest_meta_database_error',
diff --git a/src/wp-includes/rest-api/search/class-wp-rest-search-handler.php b/src/wp-includes/rest-api/search/class-wp-rest-search-handler.php
index 34ba2f1c08b0f..cc9dcf8215555 100644
--- a/src/wp-includes/rest-api/search/class-wp-rest-search-handler.php
+++ b/src/wp-includes/rest-api/search/class-wp-rest-search-handler.php
@@ -37,7 +37,7 @@ abstract class WP_REST_Search_Handler {
 	 * Object subtypes managed by this search handler.
 	 *
 	 * @since 5.0.0
-	 * @var array
+	 * @var string[]
 	 */
 	protected $subtypes = array();
 
@@ -57,7 +57,7 @@ public function get_type() {
 	 *
 	 * @since 5.0.0
 	 *
-	 * @return array Array of object subtype identifiers.
+	 * @return string[] Array of object subtype identifiers.
 	 */
 	public function get_subtypes() {
 		return $this->subtypes;
diff --git a/src/wp-includes/revision.php b/src/wp-includes/revision.php
index 0f76f908f185f..d5a5829d7eef9 100644
--- a/src/wp-includes/revision.php
+++ b/src/wp-includes/revision.php
@@ -138,7 +138,7 @@ function wp_save_post_revision( $post_id ) {
 	if ( $revisions ) {
 		// Grab the latest revision, but not an autosave.
 		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
+			if ( str_contains( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
 				$latest_revision = $revision;
 				break;
 			}
@@ -190,8 +190,10 @@ function wp_save_post_revision( $post_id ) {
 
 	$return = _wp_put_post_revision( $post );
 
-	// If a limit for the number of revisions to keep has been set,
-	// delete the oldest ones.
+	/*
+	 * If a limit for the number of revisions to keep has been set,
+	 * delete the oldest ones.
+	 */
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
 	if ( $revisions_to_keep < 0 ) {
@@ -200,6 +202,20 @@ function wp_save_post_revision( $post_id ) {
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
+	/**
+	 * Filters the revisions to be considered for deletion.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_Post[] $revisions Array of revisions, or an empty array if none.
+	 * @param int       $post_id   The ID of the post to save as a revision.
+	 */
+	$revisions = apply_filters(
+		'wp_save_post_revision_revisions_before_deletion',
+		$revisions,
+		$post_id
+	);
+
 	$delete = count( $revisions ) - $revisions_to_keep;
 
 	if ( $delete < 1 ) {
@@ -209,7 +225,7 @@ function wp_save_post_revision( $post_id ) {
 	$revisions = array_slice( $revisions, 0, $delete );
 
 	for ( $i = 0; isset( $revisions[ $i ] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
+		if ( str_contains( $revisions[ $i ]->post_name, 'autosave' ) ) {
 			continue;
 		}
 
@@ -231,7 +247,7 @@ function wp_save_post_revision( $post_id ) {
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $post_id The post ID.
- * @param int $user_id Optional. The post author ID.
+ * @param int $user_id Optional. The post author ID. Default 0.
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
 function wp_get_post_autosave( $post_id, $user_id = 0 ) {
@@ -299,7 +315,7 @@ function wp_is_post_autosave( $post ) {
 		return false;
 	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
+	if ( str_contains( $post->post_name, "{$post->post_parent}-autosave" ) ) {
 		return (int) $post->post_parent;
 	}
 
@@ -314,6 +330,7 @@ function wp_is_post_autosave( $post ) {
  *
  * @param int|WP_Post|array|null $post     Post ID, post object OR post array.
  * @param bool                   $autosave Optional. Whether the revision is an autosave or not.
+ *                                         Default false.
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
@@ -362,7 +379,7 @@ function _wp_put_post_revision( $post = null, $autosave = false ) {
  * @param string      $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which
  *                            correspond to a WP_Post object, an associative array, or a numeric array,
  *                            respectively. Default OBJECT.
- * @param string      $filter Optional sanitization filter. See sanitize_post().
+ * @param string      $filter Optional sanitization filter. See sanitize_post(). Default 'raw'.
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
 function wp_get_post_revision( &$post, $output = OBJECT, $filter = 'raw' ) {
@@ -751,7 +768,7 @@ function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
 		return $terms;
 	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID !== $post_id
 		|| 'post_format' !== $taxonomy || 'revision' === $post->post_type
 	) {
 		return $terms;
@@ -761,6 +778,7 @@ function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
 		$terms = array();
 	} else {
 		$term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' );
+
 		if ( $term ) {
 			$terms = array( $term ); // Can only have one post format.
 		}
@@ -787,13 +805,10 @@ function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
 		return $value;
 	}
 
-	if ( empty( $_REQUEST['_thumbnail_id'] ) ||
-		empty( $_REQUEST['preview_id'] ) ||
-		$post->ID != $post_id ||
-		'_thumbnail_id' !== $meta_key ||
-		'revision' === $post->post_type ||
-		$post_id != $_REQUEST['preview_id'] ) {
-
+	if ( empty( $_REQUEST['_thumbnail_id'] ) || empty( $_REQUEST['preview_id'] )
+		|| $post->ID !== $post_id || $post_id !== (int) $_REQUEST['preview_id']
+		|| '_thumbnail_id' !== $meta_key || 'revision' === $post->post_type
+	) {
 		return $value;
 	}
 
@@ -854,12 +869,14 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 		$locked = get_option( $lock );
 
 		if ( ! $locked ) {
-			// Can't write to the lock, and can't read the lock.
-			// Something broken has happened.
+			/*
+			 * Can't write to the lock, and can't read the lock.
+			 * Something broken has happened.
+			 */
 			return false;
 		}
 
-		if ( $locked > $now - 3600 ) {
+		if ( $locked > $now - HOUR_IN_SECONDS ) {
 			// Lock is not too old: some other process may be upgrading this post. Bail.
 			return false;
 		}
@@ -884,8 +901,10 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 			continue;
 		}
 
-		// 1 is the latest revision version, so we're already up to date.
-		// No need to add a copy of the post as latest revision.
+		/*
+		 * 1 is the latest revision version, so we're already up to date.
+		 * No need to add a copy of the post as latest revision.
+		 */
 		if ( 0 < $this_revision_version ) {
 			$add_last = false;
 			continue;
diff --git a/src/wp-includes/rewrite.php b/src/wp-includes/rewrite.php
index 477a85fbef1ec..647977cc2041e 100644
--- a/src/wp-includes/rewrite.php
+++ b/src/wp-includes/rewrite.php
@@ -210,7 +210,8 @@ function add_permastruct( $name, $struct, $args = array() ) {
 	if ( ! is_array( $args ) ) {
 		$args = array( 'with_front' => $args );
 	}
-	if ( func_num_args() == 4 ) {
+
+	if ( func_num_args() === 4 ) {
 		$args['ep_mask'] = func_get_arg( 3 );
 	}
 
@@ -244,10 +245,10 @@ function remove_permastruct( $name ) {
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
  *
  * @param string   $feedname Feed name.
- * @param callable $function Callback to run on feed display.
+ * @param callable $callback Callback to run on feed display.
  * @return string Feed action name.
  */
-function add_feed( $feedname, $function ) {
+function add_feed( $feedname, $callback ) {
 	global $wp_rewrite;
 
 	if ( ! in_array( $feedname, $wp_rewrite->feeds, true ) ) {
@@ -259,7 +260,7 @@ function add_feed( $feedname, $function ) {
 	// Remove default function hook.
 	remove_action( $hook, $hook );
 
-	add_action( $hook, $function, 10, 2 );
+	add_action( $hook, $callback, 10, 2 );
 
 	return $hook;
 }
@@ -542,12 +543,12 @@ function url_to_postid( $url ) {
 	$url    = set_url_scheme( $url, $scheme );
 
 	// Add 'www.' if it is absent and should be there.
-	if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
+	if ( str_contains( home_url(), '://www.' ) && ! str_contains( $url, '://www.' ) ) {
 		$url = str_replace( '://', '://www.', $url );
 	}
 
 	// Strip 'www.' if it is present and shouldn't be.
-	if ( false === strpos( home_url(), '://www.' ) ) {
+	if ( ! str_contains( home_url(), '://www.' ) ) {
 		$url = str_replace( '://www.', '://', $url );
 	}
 
@@ -572,7 +573,7 @@ function url_to_postid( $url ) {
 		$url = str_replace( $wp_rewrite->index . '/', '', $url );
 	}
 
-	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
+	if ( str_contains( trailingslashit( $url ), home_url( '/' ) ) ) {
 		// Chop off http://domain.com/[path].
 		$url = str_replace( home_url(), '', $url );
 	} else {
@@ -598,9 +599,11 @@ function url_to_postid( $url ) {
 	$request_match = $request;
 	foreach ( (array) $rewrite as $match => $query ) {
 
-		// If the requesting file is the anchor of the match,
-		// prepend it to the path info.
-		if ( ! empty( $url ) && ( $url != $request ) && ( strpos( $match, $url ) === 0 ) ) {
+		/*
+		 * If the requesting file is the anchor of the match,
+		 * prepend it to the path info.
+		 */
+		if ( ! empty( $url ) && ( $url !== $request ) && str_starts_with( $match, $url ) ) {
 			$request_match = $url . '/' . $request;
 		}
 
@@ -620,8 +623,10 @@ function url_to_postid( $url ) {
 				}
 			}
 
-			// Got a match.
-			// Trim the query of everything up to the '?'.
+			/*
+			 * Got a match.
+			 * Trim the query of everything up to the '?'.
+			 */
 			$query = preg_replace( '!^.+\?!', '', $query );
 
 			// Substitute the substring matches into the query.
diff --git a/src/wp-includes/rss.php b/src/wp-includes/rss.php
index c55417728af36..6d8941ab3856d 100644
--- a/src/wp-includes/rss.php
+++ b/src/wp-includes/rss.php
@@ -195,7 +195,7 @@ function feed_start_element($p, $element, &$attrs) {
 			array_unshift( $this->stack, $el );
 		}
 
-		// Atom support many links per containging element.
+		// Atom support many links per containing element.
 		// Magpie treats link elements of type rel='alternate'
 		// as being equivalent to RSS's simple link element.
 		//
@@ -338,7 +338,7 @@ function append($el, $text) {
 	function normalize () {
 		// if atom populate rss fields
 		if ( $this->is_atom() ) {
-			$this->channel['descripton'] = $this->channel['tagline'];
+			$this->channel['description'] = $this->channel['tagline'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
 				if ( isset($item['summary']) )
@@ -500,7 +500,7 @@ function fetch_rss ($url) {
 			else {
 				$errormsg = "Failed to fetch $url. ";
 				if ( $resp->error ) {
-					# compensate for Snoopy's annoying habbit to tacking
+					# compensate for Snoopy's annoying habit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
@@ -541,7 +541,7 @@ function fetch_rss ($url) {
  * @subpackage MagpieRSS
  *
  * @param string $url URL to retrieve
- * @param array $headers Optional. Headers to send to the URL.
+ * @param array $headers Optional. Headers to send to the URL. Default empty string.
  * @return Snoopy style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
@@ -836,7 +836,7 @@ function debug ($debugmsg, $lvl=E_USER_NOTICE) {
 if ( !function_exists('parse_w3cdtf') ) :
 function parse_w3cdtf ( $date_str ) {
 
-	# regex to match wc3dtf
+	# regex to match W3C date/time formats
 	$pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
 	if ( preg_match( $pat, $date_str, $match ) ) {
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index fd1bf4b6fa93b..205cedda72580 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -57,8 +57,10 @@ function wp_register_tinymce_scripts( $scripts, $force_uncompressed = false ) {
 	$compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
 		&& false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
 
-	// Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production)
-	// or tinymce.min.js (when SCRIPT_DEBUG is true).
+	/*
+	 * Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production)
+	 * or tinymce.min.js (when SCRIPT_DEBUG is true).
+	 */
 	if ( $compressed ) {
 		$scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . 'wp-tinymce.js', array(), $tinymce_version );
 	} else {
@@ -99,22 +101,24 @@ function wp_default_packages_vendor( $scripts ) {
 		'wp-polyfill-dom-rect',
 		'wp-polyfill-element-closest',
 		'wp-polyfill-object-fit',
-		'wp-polyfill' => array( 'regenerator-runtime' ),
+		'wp-polyfill-inert',
+		'wp-polyfill' => array( 'wp-polyfill-inert', 'regenerator-runtime' ),
 	);
 
 	$vendor_scripts_versions = array(
-		'react'                       => '17.0.1',
-		'react-dom'                   => '17.0.1',
-		'regenerator-runtime'         => '0.13.9',
+		'react'                       => '18.2.0',
+		'react-dom'                   => '18.2.0',
+		'regenerator-runtime'         => '0.13.11',
 		'moment'                      => '2.29.4',
 		'lodash'                      => '4.17.19',
-		'wp-polyfill-fetch'           => '3.6.2',
+		'wp-polyfill-fetch'           => '3.6.17',
 		'wp-polyfill-formdata'        => '4.0.10',
-		'wp-polyfill-node-contains'   => '4.4.0',
+		'wp-polyfill-node-contains'   => '4.6.0',
 		'wp-polyfill-url'             => '3.6.4',
-		'wp-polyfill-dom-rect'        => '4.4.0',
-		'wp-polyfill-element-closest' => '2.0.2',
+		'wp-polyfill-dom-rect'        => '4.6.0',
+		'wp-polyfill-element-closest' => '3.0.2',
 		'wp-polyfill-object-fit'      => '2.3.5',
+		'wp-polyfill-inert'           => '3.1.2',
 		'wp-polyfill'                 => '3.15.0',
 	);
 
@@ -182,7 +186,7 @@ function wp_get_script_polyfill( $scripts, $tests ) {
 		$src = $scripts->registered[ $handle ]->src;
 		$ver = $scripts->registered[ $handle ]->ver;
 
-		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $scripts->content_url && 0 === strpos( $src, $scripts->content_url ) ) ) {
+		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $scripts->content_url && str_starts_with( $src, $scripts->content_url ) ) ) {
 			$src = $scripts->base_url . $src;
 		}
 
@@ -583,8 +587,10 @@ function wp_tinymce_inline_scripts() {
 	/** This filter is documented in wp-includes/class-wp-editor.php */
 	$tinymce_settings = apply_filters( 'tiny_mce_before_init', $tinymce_settings, 'classic-block' );
 
-	// Do "by hand" translation from PHP array to js object.
-	// Prevents breakage in some custom settings.
+	/*
+	 * Do "by hand" translation from PHP array to js object.
+	 * Prevents breakage in some custom settings.
+	 */
 	$init_obj = '';
 	foreach ( $tinymce_settings as $key => $value ) {
 		if ( is_bool( $value ) ) {
@@ -649,6 +655,11 @@ function wp_scripts_get_suffix( $type = '' ) {
 		// Include an unmodified $wp_version.
 		require ABSPATH . WPINC . '/version.php';
 
+		/*
+		 * Note: str_contains() is not used here, as this file can be included
+		 * via wp-admin/load-scripts.php or wp-admin/load-styles.php, in which case
+		 * the polyfills from wp-includes/compat.php are not loaded.
+		 */
 		$develop_src = false !== strpos( $wp_version, '-src' );
 
 		if ( ! defined( 'SCRIPT_DEBUG' ) ) {
@@ -818,17 +829,21 @@ function wp_default_scripts( $scripts ) {
 	// Not used in core, replaced by Jcrop.js.
 	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
 
-	// jQuery.
-	// The unminified jquery.js and jquery-migrate.js are included to facilitate debugging.
-	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '3.6.1' );
-	$scripts->add( 'jquery-core', "/wp-includes/js/jquery/jquery$suffix.js", array(), '3.6.1' );
-	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '3.3.2' );
-
-	// Full jQuery UI.
-	// The build process in 1.12.1 has changed significantly.
-	// In order to keep backwards compatibility, and to keep the optimized loading,
-	// the source files were flattened and included with some modifications for AMD loading.
-	// A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
+	/*
+	 * jQuery.
+	 * The unminified jquery.js and jquery-migrate.js are included to facilitate debugging.
+	 */
+	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '3.7.0' );
+	$scripts->add( 'jquery-core', "/wp-includes/js/jquery/jquery$suffix.js", array(), '3.7.0' );
+	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '3.4.1' );
+
+	/*
+	 * Full jQuery UI.
+	 * The build process in 1.12.1 has changed significantly.
+	 * In order to keep backwards compatibility, and to keep the optimized loading,
+	 * the source files were flattened and included with some modifications for AMD loading.
+	 * A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
+	 */
 	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.13.2', 1 );
 	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.13.2', 1 );
 
@@ -874,8 +889,10 @@ function wp_default_scripts( $scripts ) {
 	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.2', 1 );
 	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.2', 1 );
 
-	// As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
-	// Listed here for back-compat.
+	/*
+	 * As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
+	 * Listed here for back-compat.
+	 */
 	$scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
 	$scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
 
@@ -908,9 +925,11 @@ function wp_default_scripts( $scripts ) {
 	// Not used any more, registered for backward compatibility.
 	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array( 'jquery' ), '1.1-20110113', 1 );
 
-	// Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
-	// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-	$scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '4.1.4', 1 );
+	/*
+	 * Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
+	 * It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
+	 */
+	$scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '5.0.0', 1 );
 	$scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '4.2.2', 1 );
 	$scripts->add( 'jquery-masonry', '/wp-includes/js/jquery/jquery.masonry.min.js', array( 'jquery', 'masonry' ), '3.1.2b', 1 );
 
@@ -988,12 +1007,13 @@ function wp_default_scripts( $scripts ) {
 	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
 
 	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
+	did_action( 'init' ) && $scripts->add_data( 'comment-reply', 'strategy', 'async' );
 
 	$scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' );
 	did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
 
 	$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.13.4', 1 );
-	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.4.1', 1 );
+	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.5.0', 1 );
 
 	$scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 );
 	did_action( 'init' ) && $scripts->localize(
@@ -1106,9 +1126,13 @@ function wp_default_scripts( $scripts ) {
 	$scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.17', 1 );
 	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
 	$mejs_settings = array(
-		'pluginPath'  => includes_url( 'js/mediaelement/', 'relative' ),
-		'classPrefix' => 'mejs-',
-		'stretching'  => 'responsive',
+		'pluginPath'            => includes_url( 'js/mediaelement/', 'relative' ),
+		'classPrefix'           => 'mejs-',
+		'stretching'            => 'responsive',
+		/** This filter is documented in wp-includes/media.php */
+		'audioShortcodeLibrary' => apply_filters( 'wp_audio_shortcode_library', 'mediaelement' ),
+		/** This filter is documented in wp-includes/media.php */
+		'videoShortcodeLibrary' => apply_filters( 'wp_video_shortcode_library', 'mediaelement' ),
 	);
 	did_action( 'init' ) && $scripts->localize(
 		'mediaelement',
@@ -1131,7 +1155,7 @@ function wp_default_scripts( $scripts ) {
 	$scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' );
 	$scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );
 	$scripts->add( 'code-editor', "/wp-admin/js/code-editor$suffix.js", array( 'jquery', 'wp-codemirror', 'underscore' ) );
-	$scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'common', 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ) );
+	$scripts->add( 'wp-theme-plugin-editor', "/wp-admin/js/theme-plugin-editor$suffix.js", array( 'common', 'wp-util', 'wp-sanitize', 'jquery', 'jquery-ui-core', 'wp-a11y', 'underscore' ), false, 1 );
 	$scripts->set_translations( 'wp-theme-plugin-editor' );
 
 	$scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
@@ -1160,6 +1184,9 @@ function wp_default_scripts( $scripts ) {
 	);
 	$scripts->set_translations( 'password-strength-meter' );
 
+	$scripts->add( 'password-toggle', "/wp-admin/js/password-toggle$suffix.js", array(), false, 1 );
+	$scripts->set_translations( 'password-toggle' );
+
 	$scripts->add( 'application-passwords', "/wp-admin/js/application-passwords$suffix.js", array( 'jquery', 'wp-util', 'wp-api-request', 'wp-date', 'wp-i18n', 'wp-hooks' ), false, 1 );
 	$scripts->set_translations( 'application-passwords' );
 
@@ -1287,8 +1314,8 @@ function wp_default_scripts( $scripts ) {
 			'invalidValue'            => __( 'Invalid value.' ),
 			'blockThemeNotification'  => sprintf(
 				/* translators: 1: Link to Site Editor documentation on HelpHub, 2: HTML button. */
-				__( 'Hurray! Your theme supports Full Site Editing with blocks. <a href="%1$s">Tell me more</a>. %2$s' ),
-				__( 'https://wordpress.org/support/article/site-editor/' ),
+				__( 'Hurray! Your theme supports site editing with blocks. <a href="%1$s">Tell me more</a>. %2$s' ),
+				__( 'https://wordpress.org/documentation/article/site-editor/' ),
 				sprintf(
 					'<button type="button" data-action="%1$s" class="button switch-to-editor">%2$s</button>',
 					esc_url( admin_url( 'site-editor.php' ) ),
@@ -1322,10 +1349,13 @@ function wp_default_scripts( $scripts ) {
 		)
 	);
 
-	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js", array(), false, 1 );
+	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" );
+	did_action( 'init' ) && $scripts->add_data( 'wp-embed', 'strategy', 'defer' );
 
-	// To enqueue media-views or media-editor, call wp_enqueue_media().
-	// Both rely on numerous settings, styles, and templates to operate correctly.
+	/*
+	 * To enqueue media-views or media-editor, call wp_enqueue_media().
+	 * Both rely on numerous settings, styles, and templates to operate correctly.
+	 */
 	$scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'clipboard' ), false, 1 );
 	$scripts->set_translations( 'media-views' );
 
@@ -1474,6 +1504,11 @@ function wp_default_styles( $styles ) {
 	require ABSPATH . WPINC . '/version.php';
 
 	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
+		/*
+		 * Note: str_contains() is not used here, as this file can be included
+		 * via wp-admin/load-scripts.php or wp-admin/load-styles.php, in which case
+		 * the polyfills from wp-includes/compat.php are not loaded.
+		 */
 		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
 	}
 
@@ -1607,23 +1642,38 @@ function wp_default_styles( $styles ) {
 		array()
 	);
 
+	$styles->add(
+		'wp-block-editor-content',
+		"/wp-includes/css/dist/block-editor/content$suffix.css",
+		array( 'wp-components' )
+	);
+
 	$wp_edit_blocks_dependencies = array(
 		'wp-components',
 		'wp-editor',
-		// This need to be added before the block library styles,
-		// The block library styles override the "reset" styles.
+		/*
+		 * This needs to be added before the block library styles,
+		 * The block library styles override the "reset" styles.
+		 */
 		'wp-reset-editor-styles',
 		'wp-block-library',
 		'wp-reusable-blocks',
+		'wp-block-editor-content',
 	);
 
 	// Only load the default layout and margin styles for themes without theme.json file.
-	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( ! wp_theme_has_theme_json() ) {
 		$wp_edit_blocks_dependencies[] = 'wp-editor-classic-layout-styles';
 	}
 
-	if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) {
-		// Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.
+	if (
+		current_theme_supports( 'wp-block-styles' ) &&
+		( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
+	) {
+		/*
+		 * Include opinionated block styles if the theme supports block styles and
+		 * no $editor_styles are declared, so the editor never appears broken.
+		 */
 		$wp_edit_blocks_dependencies[] = 'wp-block-library-theme';
 	}
 
@@ -1638,18 +1688,18 @@ function wp_default_styles( $styles ) {
 		'block-library'        => array(),
 		'block-directory'      => array(),
 		'components'           => array(),
+		'commands'             => array(),
 		'edit-post'            => array(
 			'wp-components',
 			'wp-block-editor',
 			'wp-editor',
 			'wp-edit-blocks',
 			'wp-block-library',
-			'wp-nux',
+			'wp-commands',
 		),
 		'editor'               => array(
 			'wp-components',
 			'wp-block-editor',
-			'wp-nux',
 			'wp-reusable-blocks',
 		),
 		'format-library'       => array(),
@@ -1677,6 +1727,7 @@ function wp_default_styles( $styles ) {
 			'wp-components',
 			'wp-block-editor',
 			'wp-edit-blocks',
+			'wp-commands',
 		),
 	);
 
@@ -1732,6 +1783,7 @@ function wp_default_styles( $styles ) {
 		'wp-block-editor',
 		'wp-block-library',
 		'wp-block-directory',
+		'wp-commands',
 		'wp-components',
 		'wp-customize-widgets',
 		'wp-edit-post',
@@ -1818,12 +1870,7 @@ function wp_just_in_time_script_localization() {
 		'word-count',
 		'wordCountL10n',
 		array(
-			/*
-			 * translators: If your word count is based on single characters (e.g. East Asian characters),
-			 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
-			 * Do not translate into your own language.
-			 */
-			'type'       => _x( 'words', 'Word count type. Do not translate!' ),
+			'type'       => wp_get_word_count_type(),
 			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
 		)
 	);
@@ -2347,20 +2394,8 @@ function wp_common_block_scripts_and_styles() {
 
 	wp_enqueue_style( 'wp-block-library' );
 
-	if ( current_theme_supports( 'wp-block-styles' ) ) {
-		if ( wp_should_load_separate_core_block_assets() ) {
-			$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? 'css' : 'min.css';
-			$files  = glob( __DIR__ . "/blocks/**/theme.$suffix" );
-			foreach ( $files as $path ) {
-				$block_name = basename( dirname( $path ) );
-				if ( is_rtl() && file_exists( __DIR__ . "/blocks/$block_name/theme-rtl.$suffix" ) ) {
-					$path = __DIR__ . "/blocks/$block_name/theme-rtl.$suffix";
-				}
-				wp_add_inline_style( "wp-block-{$block_name}", file_get_contents( $path ) );
-			}
-		} else {
-			wp_enqueue_style( 'wp-block-library-theme' );
-		}
+	if ( current_theme_supports( 'wp-block-styles' ) && ! wp_should_load_separate_core_block_assets() ) {
+		wp_enqueue_style( 'wp-block-library-theme' );
 	}
 
 	/**
@@ -2393,7 +2428,7 @@ function wp_common_block_scripts_and_styles() {
 function wp_filter_out_block_nodes( $nodes ) {
 	return array_filter(
 		$nodes,
-		function( $node ) {
+		static function( $node ) {
 			return ! in_array( 'blocks', $node['path'], true );
 		},
 		ARRAY_FILTER_USE_BOTH
@@ -2437,7 +2472,7 @@ function wp_enqueue_global_styles() {
 		return;
 	}
 
-	wp_register_style( 'global-styles', false, array(), true, true );
+	wp_register_style( 'global-styles', false );
 	wp_add_inline_style( 'global-styles', $stylesheet );
 	wp_enqueue_style( 'global-styles' );
 
@@ -2446,30 +2481,23 @@ function wp_enqueue_global_styles() {
 }
 
 /**
- * Renders the SVG filters supplied by theme.json.
- *
- * Note that this doesn't render the per-block user-defined
- * filters which are handled by wp_render_duotone_support,
- * but it should be rendered before the filtered content
- * in the body to satisfy Safari's rendering quirks.
+ * Enqueues the global styles custom css defined via theme.json.
  *
- * @since 5.9.1
+ * @since 6.2.0
  */
-function wp_global_styles_render_svg_filters() {
-	/*
-	 * When calling via the in_admin_header action, we only want to render the
-	 * SVGs on block editor pages.
-	 */
-	if (
-		is_admin() &&
-		! get_current_screen()->is_block_editor()
-	) {
+function wp_enqueue_global_styles_custom_css() {
+	if ( ! wp_is_block_theme() ) {
 		return;
 	}
 
-	$filters = wp_get_global_styles_svg_filters();
-	if ( ! empty( $filters ) ) {
-		echo $filters;
+	// Don't enqueue Customizer's custom CSS separately.
+	remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
+
+	$custom_css  = wp_get_custom_css();
+	$custom_css .= wp_get_global_styles_custom_css();
+
+	if ( ! empty( $custom_css ) ) {
+		wp_add_inline_style( 'global-styles', $custom_css );
 	}
 }
 
@@ -2602,7 +2630,7 @@ function enqueue_block_styles_assets() {
 				if ( wp_should_load_separate_core_block_assets() ) {
 					add_filter(
 						'render_block',
-						function( $html, $block ) use ( $block_name, $style_properties ) {
+						static function( $html, $block ) use ( $block_name, $style_properties ) {
 							if ( $block['blockName'] === $block_name ) {
 								wp_enqueue_style( $style_properties['style_handle'] );
 							}
@@ -2704,8 +2732,10 @@ function wp_sanitize_script_attributes( $attributes ) {
 	$html5_script_support = ! is_admin() && ! current_theme_supports( 'html5', 'script' );
 	$attributes_string    = '';
 
-	// If HTML5 script tag is supported, only the attribute name is added
-	// to $attributes_string for entries with a boolean value, and that are true.
+	/*
+	 * If HTML5 script tag is supported, only the attribute name is added
+	 * to $attributes_string for entries with a boolean value, and that are true.
+	 */
 	foreach ( $attributes as $attribute_name => $attribute_value ) {
 		if ( is_bool( $attribute_value ) ) {
 			if ( $attribute_value ) {
@@ -2839,12 +2869,21 @@ function wp_maybe_inline_styles() {
 
 	// Build an array of styles that have a path defined.
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( wp_styles()->get_data( $handle, 'path' ) && file_exists( $wp_styles->registered[ $handle ]->extra['path'] ) ) {
+		if ( ! isset( $wp_styles->registered[ $handle ] ) ) {
+			continue;
+		}
+		$src  = $wp_styles->registered[ $handle ]->src;
+		$path = $wp_styles->get_data( $handle, 'path' );
+		if ( $path && $src ) {
+			$size = wp_filesize( $path );
+			if ( ! $size ) {
+				continue;
+			}
 			$styles[] = array(
 				'handle' => $handle,
-				'src'    => $wp_styles->registered[ $handle ]->src,
-				'path'   => $wp_styles->registered[ $handle ]->extra['path'],
-				'size'   => filesize( $wp_styles->registered[ $handle ]->extra['path'] ),
+				'src'    => $src,
+				'path'   => $path,
+				'size'   => $size,
 			);
 		}
 	}
@@ -2877,8 +2916,10 @@ static function( $a, $b ) {
 			// Get the styles if we don't already have them.
 			$style['css'] = file_get_contents( $style['path'] );
 
-			// Check if the style contains relative URLs that need to be modified.
-			// URLs relative to the stylesheet's path should be converted to relative to the site's root.
+			/*
+			 * Check if the style contains relative URLs that need to be modified.
+			 * URLs relative to the stylesheet's path should be converted to relative to the site's root.
+			 */
 			$style['css'] = _wp_normalize_relative_css_links( $style['css'], $style['src'] );
 
 			// Set `src` to `false` and add styles inline.
@@ -2906,41 +2947,33 @@ static function( $a, $b ) {
  * @return string The CSS with URLs made relative to the WordPress installation.
  */
 function _wp_normalize_relative_css_links( $css, $stylesheet_url ) {
-	$has_src_results = preg_match_all( '#url\s*\(\s*[\'"]?\s*([^\'"\)]+)#', $css, $src_results );
-	if ( $has_src_results ) {
-		// Loop through the URLs to find relative ones.
-		foreach ( $src_results[1] as $src_index => $src_result ) {
-			// Skip if this is an absolute URL.
-			if ( 0 === strpos( $src_result, 'http' ) || 0 === strpos( $src_result, '//' ) ) {
-				continue;
-			}
-
-			// Skip if the URL is an HTML ID.
-			if ( str_starts_with( $src_result, '#' ) ) {
-				continue;
-			}
+	return preg_replace_callback(
+		'#(url\s*\(\s*[\'"]?\s*)([^\'"\)]+)#',
+		static function ( $matches ) use ( $stylesheet_url ) {
+			list( , $prefix, $url ) = $matches;
 
-			// Skip if the URL is a data URI.
-			if ( str_starts_with( $src_result, 'data:' ) ) {
-				continue;
+			// Short-circuit if the URL does not require normalization.
+			if (
+				str_starts_with( $url, 'http:' ) ||
+				str_starts_with( $url, 'https:' ) ||
+				str_starts_with( $url, '//' ) ||
+				str_starts_with( $url, '#' ) ||
+				str_starts_with( $url, 'data:' )
+			) {
+				return $matches[0];
 			}
 
 			// Build the absolute URL.
-			$absolute_url = dirname( $stylesheet_url ) . '/' . $src_result;
+			$absolute_url = dirname( $stylesheet_url ) . '/' . $url;
 			$absolute_url = str_replace( '/./', '/', $absolute_url );
-			// Convert to URL related to the site root.
-			$relative_url = wp_make_link_relative( $absolute_url );
 
-			// Replace the URL in the CSS.
-			$css = str_replace(
-				$src_results[0][ $src_index ],
-				str_replace( $src_result, $relative_url, $src_results[0][ $src_index ] ),
-				$css
-			);
-		}
-	}
+			// Convert to URL related to the site root.
+			$url = wp_make_link_relative( $absolute_url );
 
-	return $css;
+			return $prefix . $url;
+		},
+		$css
+	);
 }
 
 /**
@@ -2949,7 +2982,7 @@ function _wp_normalize_relative_css_links( $css, $stylesheet_url ) {
  * @since 5.9.0
  */
 function wp_enqueue_global_styles_css_custom_properties() {
-	wp_register_style( 'global-styles-css-custom-properties', false, array(), true, true );
+	wp_register_style( 'global-styles-css-custom-properties', false );
 	wp_add_inline_style( 'global-styles-css-custom-properties', wp_get_global_stylesheet( array( 'variables' ) ) );
 	wp_enqueue_style( 'global-styles-css-custom-properties' );
 }
@@ -2991,13 +3024,14 @@ static function () use ( $style ) {
  * @since 6.1.0
  *
  * @param array $options {
- *     Optional. An array of options to pass to wp_style_engine_get_stylesheet_from_context(). Default empty array.
+ *     Optional. An array of options to pass to wp_style_engine_get_stylesheet_from_context().
+ *     Default empty array.
  *
- *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
- *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+ *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules.
+ *                          Default true.
+ *     @type bool $prettify Whether to add new lines and indents to output.
+ *                          Default to whether the `SCRIPT_DEBUG` constant is defined.
  * }
- *
- * @return void
  */
 function wp_enqueue_stored_styles( $options = array() ) {
 	$is_block_theme   = wp_is_block_theme();
@@ -3030,7 +3064,7 @@ function wp_enqueue_stored_styles( $options = array() ) {
 
 	// Combines Core styles.
 	if ( ! empty( $compiled_core_stylesheet ) ) {
-		wp_register_style( $style_tag_id, false, array(), true, true );
+		wp_register_style( $style_tag_id, false );
 		wp_add_inline_style( $style_tag_id, $compiled_core_stylesheet );
 		wp_enqueue_style( $style_tag_id );
 	}
@@ -3044,7 +3078,7 @@ function wp_enqueue_stored_styles( $options = array() ) {
 		$styles = wp_style_engine_get_stylesheet_from_context( $store_name, $options );
 		if ( ! empty( $styles ) ) {
 			$key = "wp-style-engine-$store_name";
-			wp_register_style( $key, false, array(), true, true );
+			wp_register_style( $key, false );
 			wp_add_inline_style( $key, $styles );
 			wp_enqueue_style( $key );
 		}
@@ -3061,7 +3095,15 @@ function wp_enqueue_stored_styles( $options = array() ) {
  * @since 5.9.0
  *
  * @param string $block_name The block-name, including namespace.
- * @param array  $args       An array of arguments [handle,src,deps,ver,media].
+ * @param array  $args       {
+ *     An array of arguments. See wp_register_style() for full information about each argument.
+ *
+ *     @type string           $handle The handle for the stylesheet.
+ *     @type string|false     $src    The source URL of the stylesheet.
+ *     @type string[]         $deps   Array of registered stylesheet handles this stylesheet depends on.
+ *     @type string|bool|null $ver    Stylesheet version number.
+ *     @type string           $media  The media for which this stylesheet has been defined.
+ * }
  */
 function wp_enqueue_block_style( $block_name, $args ) {
 	$args = wp_parse_args(
@@ -3190,6 +3232,10 @@ function _wp_theme_json_webfonts_handler() {
 		return;
 	}
 
+	if ( ! wp_theme_has_theme_json() ) {
+		return;
+	}
+
 	// Webfonts to be processed.
 	$registered_webfonts = array();
 
@@ -3355,7 +3401,7 @@ function _wp_theme_json_webfonts_handler() {
 		}
 
 		// Check the font-display.
-		if ( ! in_array( $webfont['font-display'], array( 'auto', 'block', 'fallback', 'swap' ), true ) ) {
+		if ( ! in_array( $webfont['font-display'], array( 'auto', 'block', 'fallback', 'optional', 'swap' ), true ) ) {
 			$webfont['font-display'] = 'fallback';
 		}
 
@@ -3491,28 +3537,23 @@ function _wp_theme_json_webfonts_handler() {
 	 * Compiles the 'src' into valid CSS.
 	 *
 	 * @since 6.0.0
+	 * @since 6.2.0 Removed local() CSS.
 	 *
 	 * @param string $font_family Font family.
 	 * @param array  $value       Value to process.
 	 * @return string The CSS.
 	 */
 	$fn_compile_src = static function( $font_family, array $value ) {
-		$src = "local($font_family)";
+		$src = '';
 
 		foreach ( $value as $item ) {
-
-			if (
-				str_starts_with( $item['url'], site_url() ) ||
-				str_starts_with( $item['url'], home_url() )
-			) {
-				$item['url'] = wp_make_link_relative( $item['url'] );
-			}
-
 			$src .= ( 'data' === $item['format'] )
 				? ", url({$item['url']})"
 				: ", url('{$item['url']}') format('{$item['format']}')";
 		}
 
+		$src = ltrim( $src, ', ' );
+
 		return $src;
 	};
 
@@ -3665,9 +3706,10 @@ function _wp_theme_json_webfonts_handler() {
  * @since 6.1.0
  */
 function wp_enqueue_classic_theme_styles() {
-	if ( ! WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( ! wp_theme_has_theme_json() ) {
 		$suffix = wp_scripts_get_suffix();
-		wp_register_style( 'classic-theme-styles', '/' . WPINC . "/css/classic-themes$suffix.css", array(), true );
+		wp_register_style( 'classic-theme-styles', '/' . WPINC . "/css/classic-themes$suffix.css" );
+		wp_style_add_data( 'classic-theme-styles', 'path', ABSPATH . WPINC . "/css/classic-themes$suffix.css" );
 		wp_enqueue_style( 'classic-theme-styles' );
 	}
 }
@@ -3683,15 +3725,18 @@ function wp_enqueue_classic_theme_styles() {
  * @return array A filtered array of editor settings.
  */
 function wp_add_editor_classic_theme_styles( $editor_settings ) {
-	if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( wp_theme_has_theme_json() ) {
 		return $editor_settings;
 	}
-	$suffix = wp_scripts_get_suffix();
+
+	$suffix               = wp_scripts_get_suffix();
 	$classic_theme_styles = ABSPATH . WPINC . "/css/classic-themes$suffix.css";
 
-	// This follows the pattern of get_block_editor_theme_styles,
-	// but we can't use get_block_editor_theme_styles directly as it
-	// only handles external files or theme files.
+	/*
+	 * This follows the pattern of get_block_editor_theme_styles,
+	 * but we can't use get_block_editor_theme_styles directly as it
+	 * only handles external files or theme files.
+	 */
 	$classic_theme_styles_settings = array(
 		'css'            => file_get_contents( $classic_theme_styles ),
 		'__unstableType' => 'core',
diff --git a/src/wp-includes/shortcodes.php b/src/wp-includes/shortcodes.php
index 938e796fa7829..538b6e79daca0 100644
--- a/src/wp-includes/shortcodes.php
+++ b/src/wp-includes/shortcodes.php
@@ -147,7 +147,7 @@ function shortcode_exists( $tag ) {
  * @return bool Whether the passed content contains the given shortcode.
  */
 function has_shortcode( $content, $tag ) {
-	if ( false === strpos( $content, '[' ) ) {
+	if ( ! str_contains( $content, '[' ) ) {
 		return false;
 	}
 
@@ -205,7 +205,7 @@ function apply_shortcodes( $content, $ignore_html = false ) {
 function do_shortcode( $content, $ignore_html = false ) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if ( ! str_contains( $content, '[' ) ) {
 		return $content;
 	}
 
@@ -221,6 +221,14 @@ function do_shortcode( $content, $ignore_html = false ) {
 		return $content;
 	}
 
+	// Ensure this context is only added once if shortcodes are nested.
+	$has_filter   = has_filter( 'wp_get_attachment_image_context', '_filter_do_shortcode_context' );
+	$filter_added = false;
+
+	if ( ! $has_filter ) {
+		$filter_added = add_filter( 'wp_get_attachment_image_context', '_filter_do_shortcode_context' );
+	}
+
 	$content = do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames );
 
 	$pattern = get_shortcode_regex( $tagnames );
@@ -229,9 +237,29 @@ function do_shortcode( $content, $ignore_html = false ) {
 	// Always restore square braces so we don't break things like <!--[if IE ]>.
 	$content = unescape_invalid_shortcodes( $content );
 
+	// Only remove the filter if it was added in this scope.
+	if ( $filter_added ) {
+		remove_filter( 'wp_get_attachment_image_context', '_filter_do_shortcode_context' );
+	}
+
 	return $content;
 }
 
+/**
+ * Filter the `wp_get_attachment_image_context` hook during shortcode rendering.
+ *
+ * When wp_get_attachment_image() is called during shortcode rendering, we need to make clear
+ * that the context is a shortcode and not part of the theme's template rendering logic.
+ *
+ * @since 6.3.0
+ * @access private
+ *
+ * @return string The filtered context value for wp_get_attachment_images when doing shortcodes.
+ */
+function _filter_do_shortcode_context() {
+	return 'do_shortcode';
+}
+
 /**
  * Retrieves the shortcode regular expression for searching.
  *
@@ -263,8 +291,10 @@ function get_shortcode_regex( $tagnames = null ) {
 	}
 	$tagregexp = implode( '|', array_map( 'preg_quote', $tagnames ) );
 
-	// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().
-	// Also, see shortcode_unautop() and shortcode.js.
+	/*
+	 * WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().
+	 * Also, see shortcode_unautop() and shortcode.js.
+	 */
 
 	// phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
 	return '\\['                             // Opening bracket.
@@ -308,8 +338,18 @@ function get_shortcode_regex( $tagnames = null ) {
  *
  * @global array $shortcode_tags
  *
- * @param array $m Regular expression match array.
- * @return string|false Shortcode output on success, false on failure.
+ * @param array $m {
+ *     Regular expression match array.
+ *
+ *     @type string $0 Entire matched shortcode text.
+ *     @type string $1 Optional second opening bracket for escaping shortcodes.
+ *     @type string $2 Shortcode name.
+ *     @type string $3 Shortcode arguments list.
+ *     @type string $4 Optional self closing slash.
+ *     @type string $5 Content of a shortcode when it wraps some content.
+ *     @type string $6 Optional second closing brocket for escaping shortcodes.
+ * }
+ * @return string Shortcode output.
  */
 function do_shortcode_tag( $m ) {
 	global $shortcode_tags;
@@ -340,9 +380,9 @@ function do_shortcode_tag( $m ) {
 	 *
 	 * @since 4.7.0
 	 *
-	 * @param false|string $return Short-circuit return value. Either false or the value to replace the shortcode with.
+	 * @param false|string $output Short-circuit return value. Either false or the value to replace the shortcode with.
 	 * @param string       $tag    Shortcode name.
-	 * @param array|string $attr   Shortcode attributes array or empty string.
+	 * @param array|string $attr   Shortcode attributes array or the original arguments string if it cannot be parsed.
 	 * @param array        $m      Regular expression match array.
 	 */
 	$return = apply_filters( 'pre_do_shortcode_tag', false, $tag, $attr, $m );
@@ -361,7 +401,7 @@ function do_shortcode_tag( $m ) {
 	 *
 	 * @param string       $output Shortcode output.
 	 * @param string       $tag    Shortcode name.
-	 * @param array|string $attr   Shortcode attributes array or empty string.
+	 * @param array|string $attr   Shortcode attributes array or the original arguments string if it cannot be parsed.
 	 * @param array        $m      Regular expression match array.
 	 */
 	return apply_filters( 'do_shortcode_tag', $output, $tag, $attr, $m );
@@ -402,8 +442,8 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 			continue;
 		}
 
-		$noopen  = false === strpos( $element, '[' );
-		$noclose = false === strpos( $element, ']' );
+		$noopen  = ! str_contains( $element, '[' );
+		$noclose = ! str_contains( $element, ']' );
 		if ( $noopen || $noclose ) {
 			// This element does not contain shortcodes.
 			if ( $noopen xor $noclose ) {
@@ -413,7 +453,7 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 			continue;
 		}
 
-		if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
+		if ( $ignore_html || str_starts_with( $element, '<!--' ) || str_starts_with( $element, '<![CDATA[' ) ) {
 			// Encode all '[' and ']' chars.
 			$element = strtr( $element, $trans );
 			continue;
@@ -456,8 +496,10 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 				 */
 				$attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );
 			} else {
-				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'".
-				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
+				/*
+				 * $attr like 'name = "[shortcode]"' or "name = '[shortcode]'".
+				 * We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
+				 */
 				$count    = 0;
 				$new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
 				if ( $count > 0 ) {
@@ -521,11 +563,10 @@ function get_shortcode_atts_regex() {
  *
  * @since 2.5.0
  *
- * @param string $text
- * @return array|string List of attribute values.
- *                      Returns empty array if '""' === trim( $text ).
- *                      Returns empty string if '' === trim( $text ).
- *                      All other matches are checked for not empty().
+ * @param string $text Shortcode arguments list.
+ * @return array|string Array of attribute values keyed by attribute name.
+ *                      Returns empty array if there are no attributes.
+ *                      Returns the original arguments string if it cannot be parsed.
  */
 function shortcode_parse_atts( $text ) {
 	$atts    = array();
@@ -550,7 +591,7 @@ function shortcode_parse_atts( $text ) {
 
 		// Reject any unclosed HTML elements.
 		foreach ( $atts as &$value ) {
-			if ( false !== strpos( $value, '<' ) ) {
+			if ( str_contains( $value, '<' ) ) {
 				if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
 					$value = '';
 				}
@@ -625,7 +666,7 @@ function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
 function strip_shortcodes( $content ) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if ( ! str_contains( $content, '[' ) ) {
 		return $content;
 	}
 
diff --git a/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php b/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
index 81464c1bdbfba..13a03f99a47a7 100644
--- a/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
+++ b/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php
@@ -69,8 +69,10 @@ public function get_sitemap_type_data() {
 
 		$object_subtypes = $this->get_object_subtypes();
 
-		// If there are no object subtypes, include a single sitemap for the
-		// entire object type.
+		/*
+		 * If there are no object subtypes, include a single sitemap for the
+		 * entire object type.
+		 */
 		if ( empty( $object_subtypes ) ) {
 			$sitemap_data[] = array(
 				'name'  => '',
@@ -107,7 +109,7 @@ public function get_sitemap_entries() {
 		$sitemap_types = $this->get_sitemap_type_data();
 
 		foreach ( $sitemap_types as $type ) {
-			for ( $page = 1; $page <= $type['pages']; $page ++ ) {
+			for ( $page = 1; $page <= $type['pages']; $page++ ) {
 				$sitemap_entry = array(
 					'loc' => $this->get_sitemap_url( $type['name'], $page ),
 				);
diff --git a/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php b/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php
index 11d5c3820ad07..9f91a10b7cfd7 100644
--- a/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php
+++ b/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php
@@ -123,7 +123,7 @@ public function get_sitemap_index_stylesheet_url() {
 	 * @param array $sitemaps Array of sitemap URLs.
 	 */
 	public function render_index( $sitemaps ) {
-		header( 'Content-type: application/xml; charset=UTF-8' );
+		header( 'Content-Type: application/xml; charset=UTF-8' );
 
 		$this->check_for_simple_xml_availability();
 
@@ -188,7 +188,7 @@ public function get_sitemap_index_xml( $sitemaps ) {
 	 * @param array $url_list Array of URLs for a sitemap.
 	 */
 	public function render_sitemap( $url_list ) {
-		header( 'Content-type: application/xml; charset=UTF-8' );
+		header( 'Content-Type: application/xml; charset=UTF-8' );
 
 		$this->check_for_simple_xml_availability();
 
diff --git a/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php b/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php
index 8268fcc924a0f..f752a7f55f711 100644
--- a/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php
+++ b/src/wp-includes/sitemaps/class-wp-sitemaps-stylesheet.php
@@ -22,7 +22,7 @@ class WP_Sitemaps_Stylesheet {
 	 * @param string $type Stylesheet type. Either 'sitemap' or 'index'.
 	 */
 	public function render_stylesheet( $type ) {
-		header( 'Content-type: application/xml; charset=UTF-8' );
+		header( 'Content-Type: application/xml; charset=UTF-8' );
 
 		if ( 'sitemap' === $type ) {
 			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- All content escaped below.
diff --git a/src/wp-includes/sitemaps/class-wp-sitemaps.php b/src/wp-includes/sitemaps/class-wp-sitemaps.php
index cd8d1e4dbc95f..d897fa8f2a291 100644
--- a/src/wp-includes/sitemaps/class-wp-sitemaps.php
+++ b/src/wp-includes/sitemaps/class-wp-sitemaps.php
@@ -99,8 +99,8 @@ public function sitemaps_enabled() {
 		 *
 		 * @since 5.5.0
 		 *
-		 * @param bool $is_enabled Whether XML Sitemaps are enabled or not. Defaults
-		 * to true for public sites.
+		 * @param bool $is_enabled Whether XML Sitemaps are enabled or not.
+		 *                         Defaults to true for public sites.
 		 */
 		return (bool) apply_filters( 'wp_sitemaps_enabled', $is_enabled );
 	}
@@ -250,12 +250,12 @@ public function redirect_sitemapxml( $bypass, $query ) {
 	 *
 	 * @since 5.5.0
 	 *
-	 * @param string $output robots.txt output.
-	 * @param bool   $public Whether the site is public.
+	 * @param string $output    robots.txt output.
+	 * @param bool   $is_public Whether the site is public.
 	 * @return string The robots.txt output.
 	 */
-	public function add_robots( $output, $public ) {
-		if ( $public ) {
+	public function add_robots( $output, $is_public ) {
+		if ( $is_public ) {
 			$output .= "\nSitemap: " . esc_url( $this->index->get_index_url() ) . "\n";
 		}
 
diff --git a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
index a54547877126b..dff85a70e12c5 100644
--- a/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
+++ b/src/wp-includes/sitemaps/providers/class-wp-sitemaps-posts.php
@@ -221,7 +221,7 @@ protected function get_posts_query_args( $post_type ) {
 				'no_found_rows'          => true,
 				'update_post_term_cache' => false,
 				'update_post_meta_cache' => false,
-				'ignore_sticky_posts'    => true, // sticky posts will still appear, but they won't be moved to the front.
+				'ignore_sticky_posts'    => true, // Sticky posts will still appear, but they won't be moved to the front.
 			),
 			$post_type
 		);
diff --git a/src/wp-includes/sodium_compat/LICENSE b/src/wp-includes/sodium_compat/LICENSE
index 84b3e00ff9304..af760a7b73160 100644
--- a/src/wp-includes/sodium_compat/LICENSE
+++ b/src/wp-includes/sodium_compat/LICENSE
@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2022, Paragon Initiative Enterprises <security at paragonie dot com>
+Copyright (c) 2016-2023, Paragon Initiative Enterprises <security at paragonie dot com>
 Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org>
 
 Permission to use, copy, modify, and/or distribute this software for any
diff --git a/src/wp-includes/sodium_compat/lib/php72compat.php b/src/wp-includes/sodium_compat/lib/php72compat.php
index bf1e05ebad916..e949dbdc68465 100644
--- a/src/wp-includes/sodium_compat/lib/php72compat.php
+++ b/src/wp-includes/sodium_compat/lib/php72compat.php
@@ -1360,6 +1360,8 @@ function sodium_memcmp($string1, $string2)
      * @return void
      * @throws SodiumException
      * @throws TypeError
+     *
+     * @psalm-suppress ReferenceConstraintViolation
      */
     function sodium_memzero(&$string)
     {
diff --git a/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php b/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php
index 4b64e04078c2e..cfaeb0b1ed5f3 100644
--- a/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php
+++ b/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php
@@ -210,43 +210,43 @@ public function blocks($message, $bytes)
 
             /* h *= r */
             $d0 = (
-                self::mul($h0, $r0, 25) +
-                self::mul($s4, $h1, 26) +
-                self::mul($s3, $h2, 26) +
-                self::mul($s2, $h3, 26) +
-                self::mul($s1, $h4, 26)
+                self::mul($h0, $r0, 27) +
+                self::mul($s4, $h1, 27) +
+                self::mul($s3, $h2, 27) +
+                self::mul($s2, $h3, 27) +
+                self::mul($s1, $h4, 27)
             );
 
             $d1 = (
-                self::mul($h0, $r1, 25) +
-                self::mul($h1, $r0, 25) +
-                self::mul($s4, $h2, 26) +
-                self::mul($s3, $h3, 26) +
-                self::mul($s2, $h4, 26)
+                self::mul($h0, $r1, 27) +
+                self::mul($h1, $r0, 27) +
+                self::mul($s4, $h2, 27) +
+                self::mul($s3, $h3, 27) +
+                self::mul($s2, $h4, 27)
             );
 
             $d2 = (
-                self::mul($h0, $r2, 25) +
-                self::mul($h1, $r1, 25) +
-                self::mul($h2, $r0, 25) +
-                self::mul($s4, $h3, 26) +
-                self::mul($s3, $h4, 26)
+                self::mul($h0, $r2, 27) +
+                self::mul($h1, $r1, 27) +
+                self::mul($h2, $r0, 27) +
+                self::mul($s4, $h3, 27) +
+                self::mul($s3, $h4, 27)
             );
 
             $d3 = (
-                self::mul($h0, $r3, 25) +
-                self::mul($h1, $r2, 25) +
-                self::mul($h2, $r1, 25) +
-                self::mul($h3, $r0, 25) +
-                self::mul($s4, $h4, 26)
+                self::mul($h0, $r3, 27) +
+                self::mul($h1, $r2, 27) +
+                self::mul($h2, $r1, 27) +
+                self::mul($h3, $r0, 27) +
+                self::mul($s4, $h4, 27)
             );
 
             $d4 = (
-                self::mul($h0, $r4, 25) +
-                self::mul($h1, $r3, 25) +
-                self::mul($h2, $r2, 25) +
-                self::mul($h3, $r1, 25) +
-                self::mul($h4, $r0, 25)
+                self::mul($h0, $r4, 27) +
+                self::mul($h1, $r3, 27) +
+                self::mul($h2, $r2, 27) +
+                self::mul($h3, $r1, 27) +
+                self::mul($h4, $r0, 27)
             );
 
             /* (partial) h %= p */
diff --git a/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php b/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php
index e77a8f42ee63c..90d036276ec02 100644
--- a/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php
+++ b/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php
@@ -255,39 +255,39 @@ public function blocks($message, $bytes)
 
             /* h *= r */
             $d0 = $zero
-                ->addInt64($h0->mulInt64($r0, 25))
-                ->addInt64($s4->mulInt64($h1, 26))
-                ->addInt64($s3->mulInt64($h2, 26))
-                ->addInt64($s2->mulInt64($h3, 26))
-                ->addInt64($s1->mulInt64($h4, 26));
+                ->addInt64($h0->mulInt64($r0, 27))
+                ->addInt64($s4->mulInt64($h1, 27))
+                ->addInt64($s3->mulInt64($h2, 27))
+                ->addInt64($s2->mulInt64($h3, 27))
+                ->addInt64($s1->mulInt64($h4, 27));
 
             $d1 = $zero
-                ->addInt64($h0->mulInt64($r1, 25))
-                ->addInt64($h1->mulInt64($r0, 25))
-                ->addInt64($s4->mulInt64($h2, 26))
-                ->addInt64($s3->mulInt64($h3, 26))
-                ->addInt64($s2->mulInt64($h4, 26));
+                ->addInt64($h0->mulInt64($r1, 27))
+                ->addInt64($h1->mulInt64($r0, 27))
+                ->addInt64($s4->mulInt64($h2, 27))
+                ->addInt64($s3->mulInt64($h3, 27))
+                ->addInt64($s2->mulInt64($h4, 27));
 
             $d2 = $zero
-                ->addInt64($h0->mulInt64($r2, 25))
-                ->addInt64($h1->mulInt64($r1, 25))
-                ->addInt64($h2->mulInt64($r0, 25))
-                ->addInt64($s4->mulInt64($h3, 26))
-                ->addInt64($s3->mulInt64($h4, 26));
+                ->addInt64($h0->mulInt64($r2, 27))
+                ->addInt64($h1->mulInt64($r1, 27))
+                ->addInt64($h2->mulInt64($r0, 27))
+                ->addInt64($s4->mulInt64($h3, 27))
+                ->addInt64($s3->mulInt64($h4, 27));
 
             $d3 = $zero
-                ->addInt64($h0->mulInt64($r3, 25))
-                ->addInt64($h1->mulInt64($r2, 25))
-                ->addInt64($h2->mulInt64($r1, 25))
-                ->addInt64($h3->mulInt64($r0, 25))
-                ->addInt64($s4->mulInt64($h4, 26));
+                ->addInt64($h0->mulInt64($r3, 27))
+                ->addInt64($h1->mulInt64($r2, 27))
+                ->addInt64($h2->mulInt64($r1, 27))
+                ->addInt64($h3->mulInt64($r0, 27))
+                ->addInt64($s4->mulInt64($h4, 27));
 
             $d4 = $zero
-                ->addInt64($h0->mulInt64($r4, 25))
-                ->addInt64($h1->mulInt64($r3, 25))
-                ->addInt64($h2->mulInt64($r2, 25))
-                ->addInt64($h3->mulInt64($r1, 25))
-                ->addInt64($h4->mulInt64($r0, 25));
+                ->addInt64($h0->mulInt64($r4, 27))
+                ->addInt64($h1->mulInt64($r3, 27))
+                ->addInt64($h2->mulInt64($r2, 27))
+                ->addInt64($h3->mulInt64($r1, 27))
+                ->addInt64($h4->mulInt64($r0, 27));
 
             /* (partial) h %= p */
             $c = $d0->shiftRight(26);
diff --git a/src/wp-includes/style-engine.php b/src/wp-includes/style-engine.php
index 1a572e4583ad3..4a93d2cc5a1ea 100644
--- a/src/wp-includes/style-engine.php
+++ b/src/wp-includes/style-engine.php
@@ -10,35 +10,53 @@
  * @since 6.1.0
  */
 
-
 /**
- * Global public interface method to generate styles from a single style object, e.g.,
- * the value of a block's attributes.style object or the top level styles in theme.json.
- * See: https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/#styles and
- * https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/
+ * Global public interface method to generate styles from a single style object,
+ * e.g. the value of a block's attributes.style object or the top level styles in theme.json.
  *
  * Example usage:
  *
- * $styles = wp_style_engine_get_styles( array( 'color' => array( 'text' => '#cccccc' ) ) );
- * // Returns `array( 'css' => 'color: #cccccc', 'declarations' => array( 'color' => '#cccccc' ), 'classnames' => 'has-color' )`.
+ *     $styles = wp_style_engine_get_styles(
+ *         array(
+ *             'color' => array( 'text' => '#cccccc' ),
+ *         )
+ *     );
+ *
+ * Returns:
+ *
+ *     array(
+ *         'css'          => 'color: #cccccc',
+ *         'declarations' => array( 'color' => '#cccccc' ),
+ *         'classnames'   => 'has-color',
+ *     )
  *
- * @access public
  * @since 6.1.0
  *
+ * @see https://developer.wordpress.org/block-editor/reference-guides/theme-json-reference/theme-json-living/#styles
+ * @see https://developer.wordpress.org/block-editor/reference-guides/block-api/block-supports/
+ *
  * @param array $block_styles The style object.
  * @param array $options {
  *     Optional. An array of options. Default empty array.
  *
- *     @type string|null $context                    An identifier describing the origin of the style object, e.g., 'block-supports' or 'global-styles'. Default is `null`.
- *                                                   When set, the style engine will attempt to store the CSS rules, where a selector is also passed.
- *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
- *     @type string      $selector                   Optional. When a selector is passed, the value of `$css` in the return value will comprise a full CSS rule `$selector { ...$css_declarations }`,
- *                                                   otherwise, the value will be a concatenated string of CSS declarations.
+ *     @type string|null $context                    An identifier describing the origin of the style object,
+ *                                                   e.g. 'block-supports' or 'global-styles'. Default null.
+ *                                                   When set, the style engine will attempt to store the CSS rules,
+ *                                                   where a selector is also passed.
+ *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns,
+ *                                                   e.g. `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`,
+ *                                                   to `var( --wp--preset--* )` values. Default false.
+ *     @type string      $selector                   Optional. When a selector is passed,
+ *                                                   the value of `$css` in the return value will comprise
+ *                                                   a full CSS rule `$selector { ...$css_declarations }`,
+ *                                                   otherwise, the value will be a concatenated string
+ *                                                   of CSS declarations.
  * }
- *
  * @return array {
- *     @type string   $css          A CSS ruleset or declarations block formatted to be placed in an HTML `style` attribute or tag.
- *     @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+ *     @type string   $css          A CSS ruleset or declarations block
+ *                                  formatted to be placed in an HTML `style` attribute or tag.
+ *     @type string[] $declarations An associative array of CSS definitions,
+ *                                  e.g. `array( "$property" => "$value", "$property" => "$value" )`.
  *     @type string   $classnames   Classnames separated by a space.
  * }
  */
@@ -74,12 +92,25 @@ function wp_style_engine_get_styles( $block_styles, $options = array() ) {
 
 /**
  * Returns compiled CSS from a collection of selectors and declarations.
- * Useful for returning a compiled stylesheet from any collection of  CSS selector + declarations.
+ * Useful for returning a compiled stylesheet from any collection of CSS selector + declarations.
  *
  * Example usage:
- * $css_rules = array( array( 'selector' => '.elephant-are-cool', 'declarations' => array( 'color' => 'gray', 'width' => '3em' ) ) );
- * $css       = wp_style_engine_get_stylesheet_from_css_rules( $css_rules );
- * // Returns `.elephant-are-cool{color:gray;width:3em}`.
+ *
+ *     $css_rules = array(
+ *         array(
+ *             'selector'     => '.elephant-are-cool',
+ *             'declarations' => array(
+ *                 'color' => 'gray',
+ *                 'width' => '3em',
+ *             ),
+ *         ),
+ *     );
+ *
+ *     $css = wp_style_engine_get_stylesheet_from_css_rules( $css_rules );
+ *
+ * Returns:
+ *
+ *     .elephant-are-cool{color:gray;width:3em}
  *
  * @since 6.1.0
  *
@@ -88,18 +119,21 @@ function wp_style_engine_get_styles( $block_styles, $options = array() ) {
  *
  *     @type array ...$0 {
  *         @type string   $selector     A CSS selector.
- *         @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+ *         @type string[] $declarations An associative array of CSS definitions,
+ *                                      e.g. `array( "$property" => "$value", "$property" => "$value" )`.
  *     }
  * }
  * @param array $options {
  *     Optional. An array of options. Default empty array.
  *
- *     @type string|null $context  An identifier describing the origin of the style object, e.g., 'block-supports' or 'global-styles'. Default is 'block-supports'.
+ *     @type string|null $context  An identifier describing the origin of the style object,
+ *                                 e.g. 'block-supports' or 'global-styles'. Default 'block-supports'.
  *                                 When set, the style engine will attempt to store the CSS rules.
- *     @type bool        $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
- *     @type bool        $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+ *     @type bool        $optimize Whether to optimize the CSS output, e.g. combine rules.
+ *                                 Default true.
+ *     @type bool        $prettify Whether to add new lines and indents to output.
+ *                                 Defaults to whether the `SCRIPT_DEBUG` constant is defined.
  * }
- *
  * @return string A string of compiled CSS declarations, or empty string.
  */
 function wp_style_engine_get_stylesheet_from_css_rules( $css_rules, $options = array() ) {
@@ -143,10 +177,11 @@ function wp_style_engine_get_stylesheet_from_css_rules( $css_rules, $options = a
  * @param array  $options {
  *     Optional. An array of options. Default empty array.
  *
- *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
- *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+ *     @type bool $optimize Whether to optimize the CSS output, e.g. combine rules.
+ *                          Default true.
+ *     @type bool $prettify Whether to add new lines and indents to output.
+ *                          Defaults to whether the `SCRIPT_DEBUG` constant is defined.
  * }
- *
  * @return string A compiled CSS string.
  */
 function wp_style_engine_get_stylesheet_from_context( $context, $options = array() ) {
diff --git a/src/wp-includes/style-engine/class-wp-style-engine-css-declarations.php b/src/wp-includes/style-engine/class-wp-style-engine-css-declarations.php
index 23efd6a40cc71..fbcb54b73aa3e 100644
--- a/src/wp-includes/style-engine/class-wp-style-engine-css-declarations.php
+++ b/src/wp-includes/style-engine/class-wp-style-engine-css-declarations.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * WP_Style_Engine_CSS_Declarations
- *
- * Holds, sanitizes and prints CSS rules declarations
+ * Style Engine: WP_Style_Engine_CSS_Declarations class
  *
  * @package WordPress
  * @subpackage StyleEngine
@@ -10,9 +8,9 @@
  */
 
 /**
- * Class WP_Style_Engine_CSS_Declarations.
+ * Core class used for style engine CSS declarations.
  *
- * Holds, sanitizes, processes and prints CSS declarations for the style engine.
+ * Holds, sanitizes, processes, and prints CSS declarations for the style engine.
  *
  * @since 6.1.0
  */
@@ -24,7 +22,7 @@ class WP_Style_Engine_CSS_Declarations {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	protected $declarations = array();
 
@@ -32,11 +30,13 @@ class WP_Style_Engine_CSS_Declarations {
 	 * Constructor for this object.
 	 *
 	 * If a `$declarations` array is passed, it will be used to populate
-	 * the initial $declarations prop of the object by calling add_declarations().
+	 * the initial `$declarations` prop of the object by calling add_declarations().
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+	 * @param string[] $declarations Optional. An associative array of CSS definitions,
+	 *                               e.g. `array( "$property" => "$value", "$property" => "$value" )`.
+	 *                               Default empty array.
 	 */
 	public function __construct( $declarations = array() ) {
 		$this->add_declarations( $declarations );
@@ -49,7 +49,6 @@ public function __construct( $declarations = array() ) {
 	 *
 	 * @param string $property The CSS property.
 	 * @param string $value    The CSS value.
-	 *
 	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
 	 */
 	public function add_declaration( $property, $value ) {
@@ -78,7 +77,6 @@ public function add_declaration( $property, $value ) {
 	 * @since 6.1.0
 	 *
 	 * @param string $property The CSS property.
-	 *
 	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
 	 */
 	public function remove_declaration( $property ) {
@@ -91,8 +89,7 @@ public function remove_declaration( $property ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array $declarations An array of declarations.
-	 *
+	 * @param string[] $declarations An array of declarations.
 	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
 	 */
 	public function add_declarations( $declarations ) {
@@ -107,8 +104,7 @@ public function add_declarations( $declarations ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array $properties An array of properties.
-	 *
+	 * @param string[] $properties Optional. An array of properties. Default empty array.
 	 * @return WP_Style_Engine_CSS_Declarations Returns the object to allow chaining methods.
 	 */
 	public function remove_declarations( $properties = array() ) {
@@ -123,7 +119,7 @@ public function remove_declarations( $properties = array() ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @return array
+	 * @return string[] The declarations array.
 	 */
 	public function get_declarations() {
 		return $this->declarations;
@@ -136,8 +132,8 @@ public function get_declarations() {
 	 *
 	 * @param string $property The CSS property.
 	 * @param string $value    The value to be filtered.
-	 * @param string $spacer   The spacer between the colon and the value. Defaults to an empty string.
-	 *
+	 * @param string $spacer   Optional. The spacer between the colon and the value.
+	 *                         Default empty string.
 	 * @return string The filtered declaration or an empty string.
 	 */
 	protected static function filter_declaration( $property, $value, $spacer = '' ) {
@@ -153,9 +149,10 @@ protected static function filter_declaration( $property, $value, $spacer = '' )
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
-	 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
-	 *
+	 * @param bool $should_prettify Optional. Whether to add spacing, new lines and indents.
+	 *                              Default false.
+	 * @param int  $indent_count    Optional. The number of tab indents to apply to the rule.
+	 *                              Applies if `prettify` is `true`. Default 0.
 	 * @return string The CSS declarations.
 	 */
 	public function get_declarations_string( $should_prettify = false, $indent_count = 0 ) {
@@ -172,6 +169,7 @@ public function get_declarations_string( $should_prettify = false, $indent_count
 				$declarations_output .= "{$indent}{$filtered_declaration};$suffix";
 			}
 		}
+
 		return rtrim( $declarations_output );
 	}
 
@@ -181,7 +179,6 @@ public function get_declarations_string( $should_prettify = false, $indent_count
 	 * @since 6.1.0
 	 *
 	 * @param string $property The CSS property.
-	 *
 	 * @return string The sanitized property name.
 	 */
 	protected function sanitize_property( $property ) {
diff --git a/src/wp-includes/style-engine/class-wp-style-engine-css-rule.php b/src/wp-includes/style-engine/class-wp-style-engine-css-rule.php
index 53225d7d65a1e..2b31cff0b48c5 100644
--- a/src/wp-includes/style-engine/class-wp-style-engine-css-rule.php
+++ b/src/wp-includes/style-engine/class-wp-style-engine-css-rule.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * WP_Style_Engine_CSS_Rule
- *
- * An object for CSS rules.
+ * Style Engine: WP_Style_Engine_CSS_Rule class
  *
  * @package WordPress
  * @subpackage StyleEngine
@@ -10,9 +8,9 @@
  */
 
 /**
- * Class WP_Style_Engine_CSS_Rule.
+ * Core class used for style engine CSS rules.
  *
- * Holds, sanitizes, processes and prints CSS declarations for the style engine.
+ * Holds, sanitizes, processes, and prints CSS declarations for the style engine.
  *
  * @since 6.1.0
  */
@@ -38,13 +36,15 @@ class WP_Style_Engine_CSS_Rule {
 	protected $declarations;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param string                                    $selector     The CSS selector.
-	 * @param string[]|WP_Style_Engine_CSS_Declarations $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ),
+	 * @param string                                    $selector     Optional. The CSS selector. Default empty string.
+	 * @param string[]|WP_Style_Engine_CSS_Declarations $declarations Optional. An associative array of CSS definitions,
+	 *                                                                e.g. `array( "$property" => "$value", "$property" => "$value" )`,
 	 *                                                                or a WP_Style_Engine_CSS_Declarations object.
+	 *                                                                Default empty array.
 	 */
 	public function __construct( $selector = '', $declarations = array() ) {
 		$this->set_selector( $selector );
@@ -57,7 +57,6 @@ public function __construct( $selector = '', $declarations = array() ) {
 	 * @since 6.1.0
 	 *
 	 * @param string $selector The CSS selector.
-	 *
 	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
 	 */
 	public function set_selector( $selector ) {
@@ -70,9 +69,8 @@ public function set_selector( $selector ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array|WP_Style_Engine_CSS_Declarations $declarations An array of declarations (property => value pairs),
-	 *                                                             or a WP_Style_Engine_CSS_Declarations object.
-	 *
+	 * @param string[]|WP_Style_Engine_CSS_Declarations $declarations An array of declarations (property => value pairs),
+	 *                                                                or a WP_Style_Engine_CSS_Declarations object.
 	 * @return WP_Style_Engine_CSS_Rule Returns the object to allow chaining of methods.
 	 */
 	public function add_declarations( $declarations ) {
@@ -118,9 +116,10 @@ public function get_selector() {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param bool   $should_prettify Whether to add spacing, new lines and indents.
-	 * @param number $indent_count    The number of tab indents to apply to the rule. Applies if `prettify` is `true`.
-	 *
+	 * @param bool $should_prettify Optional. Whether to add spacing, new lines and indents.
+	 *                              Default false.
+	 * @param int  $indent_count    Optional. The number of tab indents to apply to the rule.
+	 *                              Applies if `prettify` is `true`. Default 0.
 	 * @return string
 	 */
 	public function get_css( $should_prettify = false, $indent_count = 0 ) {
diff --git a/src/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php b/src/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
index 235fe53e92076..371e59fb8b112 100644
--- a/src/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
+++ b/src/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * WP_Style_Engine_CSS_Rules_Store
- *
- * A store for WP_Style_Engine_CSS_Rule objects.
+ * Style Engine: WP_Style_Engine_CSS_Rules_Store class
  *
  * @package WordPress
  * @subpackage StyleEngine
@@ -10,9 +8,9 @@
  */
 
 /**
- * Class WP_Style_Engine_CSS_Rules_Store.
+ * Core class used as a store for WP_Style_Engine_CSS_Rule objects.
  *
- * Holds, sanitizes, processes and prints CSS declarations for the style engine.
+ * Holds, sanitizes, processes, and prints CSS declarations for the style engine.
  *
  * @since 6.1.0
  */
@@ -51,7 +49,6 @@ class WP_Style_Engine_CSS_Rules_Store {
 	 * @since 6.1.0
 	 *
 	 * @param string $store_name The name of the store.
-	 *
 	 * @return WP_Style_Engine_CSS_Rules_Store|void
 	 */
 	public static function get_store( $store_name = 'default' ) {
@@ -81,8 +78,6 @@ public static function get_stores() {
 	 * Clears all stores from static::$stores.
 	 *
 	 * @since 6.1.0
-	 *
-	 * @return void
 	 */
 	public static function remove_all_stores() {
 		static::$stores = array();
@@ -94,8 +89,6 @@ public static function remove_all_stores() {
 	 * @since 6.1.0
 	 *
 	 * @param string $name The store name.
-	 *
-	 * @return void
 	 */
 	public function set_name( $name ) {
 		$this->name = $name;
@@ -130,8 +123,8 @@ public function get_all_rules() {
 	 * @since 6.1.0
 	 *
 	 * @param string $selector The CSS selector.
-	 *
-	 * @return WP_Style_Engine_CSS_Rule|void Returns a WP_Style_Engine_CSS_Rule object, or null if the selector is empty.
+	 * @return WP_Style_Engine_CSS_Rule|void Returns a WP_Style_Engine_CSS_Rule object,
+	 *                                       or void if the selector is empty.
 	 */
 	public function add_rule( $selector ) {
 		$selector = trim( $selector );
@@ -155,8 +148,6 @@ public function add_rule( $selector ) {
 	 * @since 6.1.0
 	 *
 	 * @param string $selector The CSS selector.
-	 *
-	 * @return void
 	 */
 	public function remove_rule( $selector ) {
 		unset( $this->rules[ $selector ] );
diff --git a/src/wp-includes/style-engine/class-wp-style-engine-processor.php b/src/wp-includes/style-engine/class-wp-style-engine-processor.php
index 241437b2043e1..c603d1c509c23 100644
--- a/src/wp-includes/style-engine/class-wp-style-engine-processor.php
+++ b/src/wp-includes/style-engine/class-wp-style-engine-processor.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * WP_Style_Engine_Processor
- *
- * Compiles styles from stores or collection of CSS rules.
+ * Style Engine: WP_Style_Engine_Processor class
  *
  * @package WordPress
  * @subpackage StyleEngine
@@ -10,9 +8,7 @@
  */
 
 /**
- * Class WP_Style_Engine_Processor.
- *
- * Compiles styles from stores or collection of CSS rules.
+ * Core class used to compile styles from stores or collection of CSS rules.
  *
  * @since 6.1.0
  */
@@ -41,7 +37,6 @@ class WP_Style_Engine_Processor {
 	 * @since 6.1.0
 	 *
 	 * @param WP_Style_Engine_CSS_Rules_Store $store The store to add.
-	 *
 	 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
 	 */
 	public function add_store( $store ) {
@@ -64,8 +59,9 @@ public function add_store( $store ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param WP_Style_Engine_CSS_Rule|WP_Style_Engine_CSS_Rule[] $css_rules A single, or an array of, WP_Style_Engine_CSS_Rule objects from a store or otherwise.
-	 *
+	 * @param WP_Style_Engine_CSS_Rule|WP_Style_Engine_CSS_Rule[] $css_rules A single, or an array of,
+	 *                                                                       WP_Style_Engine_CSS_Rule objects
+	 *                                                                       from a store or otherwise.
 	 * @return WP_Style_Engine_Processor Returns the object to allow chaining methods.
 	 */
 	public function add_rules( $css_rules ) {
@@ -93,10 +89,11 @@ public function add_rules( $css_rules ) {
 	 * @param array $options   {
 	 *     Optional. An array of options. Default empty array.
 	 *
-	 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
-	 *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+	 *     @type bool $optimize Whether to optimize the CSS output, e.g. combine rules.
+	 *                          Default true.
+	 *     @type bool $prettify Whether to add new lines and indents to output.
+	 *                          Defaults to whether the `SCRIPT_DEBUG` constant is defined.
 	 * }
-	 *
 	 * @return string The computed CSS.
 	 */
 	public function get_css( $options = array() ) {
@@ -129,8 +126,6 @@ public function get_css( $options = array() ) {
 	 * Combines selectors from the rules store when they have the same styles.
 	 *
 	 * @since 6.1.0
-	 *
-	 * @return void
 	 */
 	private function combine_rules_selectors() {
 		// Build an array of selectors along with the JSON-ified styles to make comparisons easier.
diff --git a/src/wp-includes/style-engine/class-wp-style-engine.php b/src/wp-includes/style-engine/class-wp-style-engine.php
index 951dac4b543eb..bdaae4a1f7ae6 100644
--- a/src/wp-includes/style-engine/class-wp-style-engine.php
+++ b/src/wp-includes/style-engine/class-wp-style-engine.php
@@ -1,8 +1,6 @@
 <?php
 /**
- * StyleEngine: WP_Style_Engine class
- *
- * This is the main class integrating all other WP_Style_Engine_* classes.
+ * Style Engine: WP_Style_Engine class
  *
  * @package WordPress
  * @subpackage StyleEngine
@@ -10,31 +8,44 @@
  */
 
 /**
- * Class WP_Style_Engine.
+ * The main class integrating all other WP_Style_Engine_* classes.
  *
- * The Style Engine aims to provide a consistent API for rendering styling for blocks across both client-side and server-side applications.
+ * The Style Engine aims to provide a consistent API for rendering styling for blocks
+ * across both client-side and server-side applications.
  *
  * This class is final and should not be extended.
- * This class is for internal Core usage and is not supposed to be used by extenders (plugins and/or themes).
- * This is a low-level API that may need to do breaking changes. Please, use wp_style_engine_get_styles instead.
+ *
+ * This class is for internal Core usage and is not supposed to be used by extenders
+ * (plugins and/or themes). This is a low-level API that may need to do breaking changes.
+ * Please, use wp_style_engine_get_styles() instead.
  *
  * @access private
  * @since 6.1.0
+ * @since 6.3.0 Added support for text-columns.
  */
 #[AllowDynamicProperties]
 final class WP_Style_Engine {
 	/**
 	 * Style definitions that contain the instructions to
 	 * parse/output valid Gutenberg styles from a block's attributes.
-	 * For every style definition, the follow properties are valid:
-	 *  - classnames    => (array) an array of classnames to be returned for block styles. The key is a classname or pattern.
-	 *                    A value of `true` means the classname should be applied always. Otherwise, a valid CSS property (string)
-	 *                    to match the incoming value, e.g., "color" to match var:preset|color|somePresetSlug.
-	 *  - css_vars      => (array) an array of key value pairs used to generate CSS var values. The key is a CSS var pattern, whose `$slug` fragment will be replaced with a preset slug.
-	 *                    The value should be a valid CSS property (string) to match the incoming value, e.g., "color" to match var:preset|color|somePresetSlug.
-	 *  - property_keys => (array) array of keys whose values represent a valid CSS property, e.g., "margin" or "border".
-	 *  - path          => (array) a path that accesses the corresponding style value in the block style object.
-	 *  - value_func    => (string) the name of a function to generate a CSS definition array for a particular style object. The output of this function should be `array( "$property" => "$value", ... )`.
+	 *
+	 * For every style definition, the following properties are valid:
+	 *
+	 *  - classnames    => (array) An array of classnames to be returned for block styles.
+	 *                     The key is a classname or pattern.
+	 *                     A value of `true` means the classname should be applied always.
+	 *                     Otherwise, a valid CSS property (string) to match the incoming value,
+	 *                     e.g. "color" to match var:preset|color|somePresetSlug.
+	 *  - css_vars      => (array) An array of key value pairs used to generate CSS var values.
+	 *                     The key is a CSS var pattern, whose `$slug` fragment will be replaced with a preset slug.
+	 *                     The value should be a valid CSS property (string) to match the incoming value,
+	 *                     e.g. "color" to match var:preset|color|somePresetSlug.
+	 *  - property_keys => (array) An array of keys whose values represent a valid CSS property,
+	 *                     e.g. "margin" or "border".
+	 *  - path          => (array) A path that accesses the corresponding style value in the block style object.
+	 *  - value_func    => (string) The name of a function to generate a CSS definition array
+	 *                     for a particular style object. The output of this function should be
+	 *                     `array( "$property" => "$value", ... )`.
 	 *
 	 * @since 6.1.0
 	 * @var array
@@ -137,6 +148,28 @@ final class WP_Style_Engine {
 				),
 			),
 		),
+		'shadow'     => array(
+			'shadow' => array(
+				'property_keys' => array(
+					'default' => 'box-shadow',
+				),
+				'path'          => array( 'shadow' ),
+				'css_vars'      => array(
+					'shadow' => '--wp--preset--shadow--$slug',
+				),
+			),
+		),
+		'dimensions' => array(
+			'minHeight' => array(
+				'property_keys' => array(
+					'default' => 'min-height',
+				),
+				'path'          => array( 'dimensions', 'minHeight' ),
+				'css_vars'      => array(
+					'spacing' => '--wp--preset--spacing--$slug',
+				),
+			),
+		),
 		'spacing'    => array(
 			'padding' => array(
 				'property_keys' => array(
@@ -196,6 +229,12 @@ final class WP_Style_Engine {
 				),
 				'path'          => array( 'typography', 'lineHeight' ),
 			),
+			'textColumns'    => array(
+				'property_keys' => array(
+					'default' => 'column-count',
+				),
+				'path'          => array( 'typography', 'textColumns' ),
+			),
 			'textDecoration' => array(
 				'property_keys' => array(
 					'default' => 'text-decoration',
@@ -218,17 +257,20 @@ final class WP_Style_Engine {
 	);
 
 	/**
-	 * Util: Extracts the slug in kebab case from a preset string, e.g., "heavenly-blue" from 'var:preset|color|heavenlyBlue'.
+	 * Util: Extracts the slug in kebab case from a preset string,
+	 * e.g. `heavenly-blue` from `var:preset|color|heavenlyBlue`.
 	 *
 	 * @since 6.1.0
 	 *
 	 * @param string $style_value  A single CSS preset value.
-	 * @param string $property_key The CSS property that is the second element of the preset string. Used for matching.
-	 *
+	 * @param string $property_key The CSS property that is the second element of the preset string.
+	 *                             Used for matching.
 	 * @return string The slug, or empty string if not found.
 	 */
 	protected static function get_slug_from_preset_value( $style_value, $property_key ) {
-		if ( is_string( $style_value ) && is_string( $property_key ) && str_contains( $style_value, "var:preset|{$property_key}|" ) ) {
+		if ( is_string( $style_value ) && is_string( $property_key )
+			&& str_contains( $style_value, "var:preset|{$property_key}|" )
+		) {
 			$index_to_splice = strrpos( $style_value, '|' ) + 1;
 			return _wp_to_kebab_case( substr( $style_value, $index_to_splice ) );
 		}
@@ -236,17 +278,18 @@ protected static function get_slug_from_preset_value( $style_value, $property_ke
 	}
 
 	/**
-	 * Util: Generates a CSS var string, e.g., var(--wp--preset--color--background) from a preset string such as `var:preset|space|50`.
+	 * Util: Generates a CSS var string, e.g. `var(--wp--preset--color--background)`
+	 * from a preset string such as `var:preset|space|50`.
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param string   $style_value  A single css preset value.
-	 * @param string[] $css_vars     An associate array of css var patterns used to generate the var string.
-	 *
-	 * @return string The css var, or an empty string if no match for slug found.
+	 * @param string   $style_value  A single CSS preset value.
+	 * @param string[] $css_vars     An associate array of CSS var patterns
+	 *                               used to generate the var string.
+	 * @return string The CSS var, or an empty string if no match for slug found.
 	 */
 	protected static function get_css_var_value( $style_value, $css_vars ) {
-		foreach ( $css_vars as  $property_key => $css_var_pattern ) {
+		foreach ( $css_vars as $property_key => $css_var_pattern ) {
 			$slug = static::get_slug_from_preset_value( $style_value, $property_key );
 			if ( static::is_valid_style_value( $slug ) ) {
 				$var = strtr(
@@ -265,7 +308,6 @@ protected static function get_css_var_value( $style_value, $css_vars ) {
 	 * @since 6.1.0
 	 *
 	 * @param string $style_value A single CSS preset value.
-	 *
 	 * @return bool
 	 */
 	protected static function is_valid_style_value( $style_value ) {
@@ -278,10 +320,11 @@ protected static function is_valid_style_value( $style_value ) {
 	 * @since 6.1.0
 	 *
 	 * @param string   $store_name       A valid store key.
-	 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
-	 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 *
-	 * @return void.
+	 * @param string   $css_selector     When a selector is passed, the function will return
+	 *                                   a full CSS rule `$selector { ...rules }`
+	 *                                   otherwise a concatenated string of properties and values.
+	 * @param string[] $css_declarations An associative array of CSS definitions,
+	 *                                   e.g. `array( "$property" => "$value", "$property" => "$value" )`.
 	 */
 	public static function store_css_rule( $store_name, $css_selector, $css_declarations ) {
 		if ( empty( $store_name ) || empty( $css_selector ) || empty( $css_declarations ) ) {
@@ -296,8 +339,7 @@ public static function store_css_rule( $store_name, $css_selector, $css_declarat
 	 * @since 6.1.0
 	 *
 	 * @param string $store_name A store key.
-	 *
-	 * @return WP_Style_Engine_CSS_Rules_Store
+	 * @return WP_Style_Engine_CSS_Rules_Store|null
 	 */
 	public static function get_store( $store_name ) {
 		return WP_Style_Engine_CSS_Rules_Store::get_store( $store_name );
@@ -305,6 +347,7 @@ public static function get_store( $store_name ) {
 
 	/**
 	 * Returns classnames and CSS based on the values in a styles object.
+	 *
 	 * Return values are parsed based on the instructions in BLOCK_STYLE_DEFINITIONS_METADATA.
 	 *
 	 * @since 6.1.0
@@ -313,14 +356,19 @@ public static function get_store( $store_name ) {
 	 * @param array $options      {
 	 *     Optional. An array of options. Default empty array.
 	 *
-	 *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
-	 *     @type string      $selector                   Optional. When a selector is passed, the value of `$css` in the return value will comprise a full CSS rule `$selector { ...$css_declarations }`,
-	 *                                                   otherwise, the value will be a concatenated string of CSS declarations.
+	 *     @type bool        $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns,
+	 *                                                   e.g. `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`,
+	 *                                                   to `var( --wp--preset--* )` values. Default false.
+	 *     @type string      $selector                   Optional. When a selector is passed,
+	 *                                                   the value of `$css` in the return value will comprise
+	 *                                                   a full CSS rule `$selector { ...$css_declarations }`,
+	 *                                                   otherwise, the value will be a concatenated string
+	 *                                                   of CSS declarations.
 	 * }
-	 *
 	 * @return array {
-	 *     @type string   $classnames   Classnames separated by a space.
-	 *     @type string[] $declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+	 *     @type string[] $classnames   Array of class names.
+	 *     @type string[] $declarations An associative array of CSS definitions,
+	 *                                  e.g. `array( "$property" => "$value", "$property" => "$value" )`.
 	 * }
 	 */
 	public static function parse_block_styles( $block_styles, $options ) {
@@ -353,14 +401,15 @@ public static function parse_block_styles( $block_styles, $options ) {
 	}
 
 	/**
-	 * Returns classnames, and generates classname(s) from a CSS preset property pattern, e.g., '`var:preset|<PRESET_TYPE>|<PRESET_SLUG>`'.
+	 * Returns classnames, and generates classname(s) from a CSS preset property pattern,
+	 * e.g. `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`.
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array $style_value      A single raw style value or css preset property from the $block_styles array.
-	 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
-	 *
-	 * @return array|string[] An array of CSS classnames, or empty array.
+	 * @param string $style_value      A single raw style value or CSS preset property
+	 *                                 from the `$block_styles` array.
+	 * @param array  $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
+	 * @return string[] An array of CSS classnames, or empty array if there are none.
 	 */
 	protected static function get_classnames( $style_value, $style_definition ) {
 		if ( empty( $style_value ) ) {
@@ -396,15 +445,16 @@ protected static function get_classnames( $style_value, $style_definition ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array $style_value      A single raw style value from $block_styles array.
+	 * @param mixed $style_value      A single raw style value from $block_styles array.
 	 * @param array $style_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA.
 	 * @param array $options          {
 	 *     Optional. An array of options. Default empty array.
 	 *
-	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
+	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns,
+	 *                                            e.g. `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`,
+	 *                                            to `var( --wp--preset--* )` values. Default false.
 	 * }
-	 *
-	 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+	 * @return string[] An associative array of CSS definitions, e.g. `array( "$property" => "$value", "$property" => "$value" )`.
 	 */
 	protected static function get_css_declarations( $style_value, $style_definition, $options = array() ) {
 		if ( isset( $style_definition['value_func'] ) && is_callable( $style_definition['value_func'] ) ) {
@@ -462,21 +512,33 @@ protected static function get_css_declarations( $style_value, $style_definition,
 	/**
 	 * Style value parser that returns a CSS definition array comprising style properties
 	 * that have keys representing individual style properties, otherwise known as longhand CSS properties.
-	 * e.g., "$style_property-$individual_feature: $value;", which could represent the following:
-	 * "border-{top|right|bottom|left}-{color|width|style}: {value};" or,
-	 * "border-image-{outset|source|width|repeat|slice}: {value};"
+	 *
+	 * Example:
+	 *
+	 *     "$style_property-$individual_feature: $value;"
+	 *
+	 * Which could represent the following:
+	 *
+	 *     "border-{top|right|bottom|left}-{color|width|style}: {value};"
+	 *
+	 * or:
+	 *
+	 *     "border-image-{outset|source|width|repeat|slice}: {value};"
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param array $style_value                    A single raw style value from $block_styles array.
-	 * @param array $individual_property_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA representing an individual property of a CSS property, e.g., 'top' in 'border-top'.
+	 * @param array $style_value                    A single raw style value from `$block_styles` array.
+	 * @param array $individual_property_definition A single style definition from BLOCK_STYLE_DEFINITIONS_METADATA
+	 *                                              representing an individual property of a CSS property,
+	 *                                              e.g. 'top' in 'border-top'.
 	 * @param array $options                        {
 	 *     Optional. An array of options. Default empty array.
 	 *
-	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns, e.g., `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`, to var( --wp--preset--* ) values. Default `false`.
+	 *     @type bool $convert_vars_to_classnames Whether to skip converting incoming CSS var patterns,
+	 *                                            e.g. `var:preset|<PRESET_TYPE>|<PRESET_SLUG>`,
+	 *                                            to `var( --wp--preset--* )` values. Default false.
 	 * }
-	 *
-	 * @return string[] An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
+	 * @return string[] An associative array of CSS definitions, e.g. `array( "$property" => "$value", "$property" => "$value" )`.
 	 */
 	protected static function get_individual_property_css_declarations( $style_value, $individual_property_definition, $options = array() ) {
 		if ( ! is_array( $style_value ) || empty( $style_value ) || empty( $individual_property_definition['path'] ) ) {
@@ -484,9 +546,12 @@ protected static function get_individual_property_css_declarations( $style_value
 		}
 
 		/*
-		 * The first item in $individual_property_definition['path'] array tells us the style property, e.g., "border".
-		 * We use this to get a corresponding CSS style definition such as "color" or "width" from the same group.
-		 * The second item in $individual_property_definition['path'] array refers to the individual property marker, e.g., "top".
+		 * The first item in $individual_property_definition['path'] array
+		 * tells us the style property, e.g. "border". We use this to get a corresponding
+		 * CSS style definition such as "color" or "width" from the same group.
+		 *
+		 * The second item in $individual_property_definition['path'] array
+		 * refers to the individual property marker, e.g. "top".
 		 */
 		$definition_group_key    = $individual_property_definition['path'][0];
 		$individual_property_key = $individual_property_definition['path'][1];
@@ -504,10 +569,14 @@ protected static function get_individual_property_css_declarations( $style_value
 
 			if ( $style_definition && isset( $style_definition['property_keys']['individual'] ) ) {
 				// Set a CSS var if there is a valid preset value.
-				if ( is_string( $value ) && str_contains( $value, 'var:' ) && ! $should_skip_css_vars && ! empty( $individual_property_definition['css_vars'] ) ) {
+				if ( is_string( $value ) && str_contains( $value, 'var:' )
+					&& ! $should_skip_css_vars && ! empty( $individual_property_definition['css_vars'] )
+				) {
 					$value = static::get_css_var_value( $value, $individual_property_definition['css_vars'] );
 				}
-				$individual_css_property                      = sprintf( $style_definition['property_keys']['individual'], $individual_property_key );
+
+				$individual_css_property = sprintf( $style_definition['property_keys']['individual'], $individual_property_key );
+
 				$css_declarations[ $individual_css_property ] = $value;
 			}
 		}
@@ -515,13 +584,15 @@ protected static function get_individual_property_css_declarations( $style_value
 	}
 
 	/**
-	 * Returns compiled CSS from css_declarations.
+	 * Returns compiled CSS from CSS declarations.
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ).
-	 * @param string   $css_selector     When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values.
-	 *
+	 * @param string[] $css_declarations An associative array of CSS definitions,
+	 *                                   e.g. `array( "$property" => "$value", "$property" => "$value" )`.
+	 * @param string   $css_selector     When a selector is passed, the function will return
+	 *                                   a full CSS rule `$selector { ...rules }`,
+	 *                                   otherwise a concatenated string of properties and values.
 	 * @return string A compiled CSS string.
 	 */
 	public static function compile_css( $css_declarations, $css_selector ) {
@@ -544,14 +615,19 @@ public static function compile_css( $css_declarations, $css_selector ) {
 	 *
 	 * @since 6.1.0
 	 *
-	 * @param WP_Style_Engine_CSS_Rule[] $css_rules An array of WP_Style_Engine_CSS_Rule objects from a store or otherwise.
+	 * @param WP_Style_Engine_CSS_Rule[] $css_rules An array of WP_Style_Engine_CSS_Rule objects
+	 *                                              from a store or otherwise.
 	 * @param array                      $options   {
 	 *     Optional. An array of options. Default empty array.
 	 *
-	 *     @type bool $optimize Whether to optimize the CSS output, e.g., combine rules. Default is `false`.
-	 *     @type bool $prettify Whether to add new lines and indents to output. Default is the test of whether the global constant `SCRIPT_DEBUG` is defined.
+	 *     @type string|null $context  An identifier describing the origin of the style object,
+	 *                                 e.g. 'block-supports' or 'global-styles'. Default 'block-supports'.
+	 *                                 When set, the style engine will attempt to store the CSS rules.
+	 *     @type bool        $optimize Whether to optimize the CSS output, e.g. combine rules.
+	 *                                 Default true.
+	 *     @type bool        $prettify Whether to add new lines and indents to output.
+	 *                                 Defaults to whether the `SCRIPT_DEBUG` constant is defined.
 	 * }
-	 *
 	 * @return string A compiled stylesheet from stored CSS rules.
 	 */
 	public static function compile_stylesheet_from_css_rules( $css_rules, $options = array() ) {
diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php
index 1dfcf4d9c5278..52a5705331798 100644
--- a/src/wp-includes/taxonomy.php
+++ b/src/wp-includes/taxonomy.php
@@ -264,26 +264,26 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
  *
  * @global WP_Taxonomy[] $wp_taxonomies The registered taxonomies.
  *
- * @param string|string[]|WP_Post $object Name of the type of taxonomy object, or an object (row from posts)
- * @param string                  $output Optional. The type of output to return in the array. Accepts either
- *                                        'names' or 'objects'. Default 'names'.
+ * @param string|string[]|WP_Post $object_type Name of the type of taxonomy object, or an object (row from posts).
+ * @param string                  $output      Optional. The type of output to return in the array. Accepts either
+ *                                             'names' or 'objects'. Default 'names'.
  * @return string[]|WP_Taxonomy[] The names or objects of all taxonomies of `$object_type`.
  */
-function get_object_taxonomies( $object, $output = 'names' ) {
+function get_object_taxonomies( $object_type, $output = 'names' ) {
 	global $wp_taxonomies;
 
-	if ( is_object( $object ) ) {
-		if ( 'attachment' === $object->post_type ) {
-			return get_attachment_taxonomies( $object, $output );
+	if ( is_object( $object_type ) ) {
+		if ( 'attachment' === $object_type->post_type ) {
+			return get_attachment_taxonomies( $object_type, $output );
 		}
-		$object = $object->post_type;
+		$object_type = $object_type->post_type;
 	}
 
-	$object = (array) $object;
+	$object_type = (array) $object_type;
 
 	$taxonomies = array();
 	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
-		if ( array_intersect( $object, (array) $tax_obj->object_type ) ) {
+		if ( array_intersect( $object_type, (array) $tax_obj->object_type ) ) {
 			if ( 'names' === $output ) {
 				$taxonomies[] = $tax_name;
 			} else {
@@ -390,8 +390,8 @@ function is_taxonomy_hierarchical( $taxonomy ) {
  *
  * @global WP_Taxonomy[] $wp_taxonomies Registered taxonomies.
  *
- * @param string       $taxonomy    Taxonomy key, must not exceed 32 characters and may only contain lowercase alphanumeric
- *                                  characters, dashes, and underscores. See sanitize_key().
+ * @param string       $taxonomy    Taxonomy key. Must not exceed 32 characters and may only contain
+ *                                  lowercase alphanumeric characters, dashes, and underscores. See sanitize_key().
  * @param array|string $object_type Object type or array of object types with which the taxonomy should be associated.
  * @param array|string $args        {
  *     Optional. Array or query string of arguments for registering a taxonomy.
@@ -558,13 +558,14 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
  *
  * @since 4.5.0
  *
- * @global WP            $wp            Current WordPress environment instance.
  * @global WP_Taxonomy[] $wp_taxonomies List of taxonomies.
  *
  * @param string $taxonomy Taxonomy name.
  * @return true|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
  */
 function unregister_taxonomy( $taxonomy ) {
+	global $wp_taxonomies;
+
 	if ( ! taxonomy_exists( $taxonomy ) ) {
 		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
@@ -576,8 +577,6 @@ function unregister_taxonomy( $taxonomy ) {
 		return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) );
 	}
 
-	global $wp_taxonomies;
-
 	$taxonomy_object->remove_rewrite_rules();
 	$taxonomy_object->remove_hooks();
 
@@ -815,7 +814,11 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
  *
  * @param int|int[]       $term_ids   Term ID or array of term IDs of terms that will be used.
  * @param string|string[] $taxonomies String of taxonomy name or Array of string values of taxonomy names.
- * @param array|string    $args       Change the order of the object IDs, either ASC or DESC.
+ * @param array|string    $args       {
+ *     Change the order of the object IDs.
+ *
+ *     @type string $order Order to retrieve terms. Accepts 'ASC' or 'DESC'. Default 'ASC'.
+ * }
  * @return string[]|WP_Error An array of object IDs as numeric strings on success,
  *                           WP_Error if the taxonomy does not exist.
  */
@@ -848,10 +851,10 @@ function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
 
 	$last_changed = wp_cache_get_last_changed( 'terms' );
 	$cache_key    = 'get_objects_in_term:' . md5( $sql ) . ":$last_changed";
-	$cache        = wp_cache_get( $cache_key, 'terms' );
+	$cache        = wp_cache_get( $cache_key, 'term-queries' );
 	if ( false === $cache ) {
 		$object_ids = $wpdb->get_col( $sql );
-		wp_cache_set( $cache_key, $object_ids, 'terms' );
+		wp_cache_set( $cache_key, $object_ids, 'term-queries' );
 	} else {
 		$object_ids = (array) $cache;
 	}
@@ -1230,19 +1233,16 @@ function get_term_to_edit( $id, $taxonomy ) {
  * The {@see 'get_terms_orderby'} filter passes the `ORDER BY` clause for the query
  * along with the $args array.
  *
- * Prior to 4.5.0, the first parameter of `get_terms()` was a taxonomy or list of taxonomies:
- *
- *     $terms = get_terms( 'post_tag', array(
- *         'hide_empty' => false,
- *     ) );
- *
- * Since 4.5.0, taxonomies should be passed via the 'taxonomy' argument in the `$args` array:
+ * Taxonomy or an array of taxonomies should be passed via the 'taxonomy' argument
+ * in the `$args` array:
  *
  *     $terms = get_terms( array(
- *         'taxonomy' => 'post_tag',
+ *         'taxonomy'   => 'post_tag',
  *         'hide_empty' => false,
  *     ) );
  *
+ * Prior to 4.5.0, taxonomy was passed as the first parameter of `get_terms()`.
+ *
  * @since 2.3.0
  * @since 4.2.0 Introduced 'name' and 'childless' parameters.
  * @since 4.4.0 Introduced the ability to pass 'term_id' as an alias of 'id' for the `orderby` parameter.
@@ -1430,6 +1430,22 @@ function update_termmeta_cache( $term_ids ) {
 	return update_meta_cache( 'term', $term_ids );
 }
 
+
+/**
+ * Queue term meta for lazy-loading.
+ *
+ * @since 6.3.0
+ *
+ * @param array $term_ids List of term IDs.
+ */
+function wp_lazyload_term_meta( array $term_ids ) {
+	if ( empty( $term_ids ) ) {
+		return;
+	}
+	$lazyloader = wp_metadata_lazyloader();
+	$lazyloader->queue_objects( 'term', $term_ids );
+}
+
 /**
  * Gets all meta data, including meta IDs, for the given term ID.
  *
@@ -1498,15 +1514,15 @@ function unregister_term_meta( $taxonomy, $meta_key ) {
  *
  * @global bool $_wp_suspend_cache_invalidation
  *
- * @param int|string $term     The term to check. Accepts term ID, slug, or name.
- * @param string     $taxonomy Optional. The taxonomy name to use.
- * @param int        $parent   Optional. ID of parent term under which to confine the exists search.
+ * @param int|string $term        The term to check. Accepts term ID, slug, or name.
+ * @param string     $taxonomy    Optional. The taxonomy name to use.
+ * @param int        $parent_term Optional. ID of parent term under which to confine the exists search.
  * @return mixed Returns null if the term does not exist.
  *               Returns the term ID if no taxonomy is specified and the term ID exists.
  *               Returns an array of the term ID and the term taxonomy ID if the taxonomy is specified and the pairing exists.
  *               Returns 0 if term ID 0 is passed to the function.
  */
-function term_exists( $term, $taxonomy = '', $parent = null ) {
+function term_exists( $term, $taxonomy = '', $parent_term = null ) {
 	global $_wp_suspend_cache_invalidation;
 
 	if ( null === $term ) {
@@ -1539,14 +1555,14 @@ function term_exists( $term, $taxonomy = '', $parent = null ) {
 	 *
 	 * @since 6.0.0
 	 *
-	 * @param array      $defaults An array of arguments passed to get_terms().
-	 * @param int|string $term     The term to check. Accepts term ID, slug, or name.
-	 * @param string     $taxonomy The taxonomy name to use. An empty string indicates
-	 *                             the search is against all taxonomies.
-	 * @param int|null   $parent   ID of parent term under which to confine the exists search.
-	 *                             Null indicates the search is unconfined.
+	 * @param array      $defaults    An array of arguments passed to get_terms().
+	 * @param int|string $term        The term to check. Accepts term ID, slug, or name.
+	 * @param string     $taxonomy    The taxonomy name to use. An empty string indicates
+	 *                                the search is against all taxonomies.
+	 * @param int|null   $parent_term ID of parent term under which to confine the exists search.
+	 *                                Null indicates the search is unconfined.
 	 */
-	$defaults = apply_filters( 'term_exists_default_query_args', $defaults, $term, $taxonomy, $parent );
+	$defaults = apply_filters( 'term_exists_default_query_args', $defaults, $term, $taxonomy, $parent_term );
 
 	if ( is_int( $term ) ) {
 		if ( 0 === $term ) {
@@ -1560,8 +1576,8 @@ function term_exists( $term, $taxonomy = '', $parent = null ) {
 			return null;
 		}
 
-		if ( ! empty( $taxonomy ) && is_numeric( $parent ) ) {
-			$defaults['parent'] = (int) $parent;
+		if ( ! empty( $taxonomy ) && is_numeric( $parent_term ) ) {
+			$defaults['parent'] = (int) $parent_term;
 		}
 
 		$args  = wp_parse_args( array( 'slug' => sanitize_title( $term ) ), $defaults );
@@ -2158,13 +2174,13 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
  *
  * @since 2.0.0
  *
- * @param int $cat_ID Category term ID.
+ * @param int $cat_id Category term ID.
  * @return bool|int|WP_Error Returns true if completes delete action; false if term doesn't exist;
  *                           Zero on attempted deletion of default Category; WP_Error object is
  *                           also a possibility.
  */
-function wp_delete_category( $cat_ID ) {
-	return wp_delete_term( $cat_ID, 'category' );
+function wp_delete_category( $cat_id ) {
+	return wp_delete_term( $cat_id, 'category' );
 }
 
 /**
@@ -2176,6 +2192,8 @@ function wp_delete_category( $cat_ID ) {
  * @since 4.4.0 Introduced `$meta_query` and `$update_term_meta_cache` arguments. When `$fields` is 'all' or
  *              'all_with_object_id', an array of `WP_Term` objects will be returned.
  * @since 4.7.0 Refactored to use WP_Term_Query, and to support any WP_Term_Query arguments.
+ * @since 6.3.0 Passing `update_term_meta_cache` argument value false by default resulting in get_terms() to not
+ *              prime the term meta cache.
  *
  * @param int|int[]       $object_ids The ID(s) of the object(s) to retrieve.
  * @param string|string[] $taxonomies The taxonomy names to retrieve terms from.
@@ -2204,7 +2222,11 @@ function wp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
 	}
 	$object_ids = array_map( 'intval', $object_ids );
 
-	$args = wp_parse_args( $args );
+	$defaults = array(
+		'update_term_meta_cache' => false,
+	);
+
+	$args = wp_parse_args( $args, $defaults );
 
 	/**
 	 * Filters arguments for retrieving object terms.
@@ -2246,7 +2268,7 @@ function wp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
 		$terms_from_remaining_taxonomies = get_terms( $args );
 
 		// Array keys should be preserved for values of $fields that use term_id for keys.
-		if ( ! empty( $args['fields'] ) && 0 === strpos( $args['fields'], 'id=>' ) ) {
+		if ( ! empty( $args['fields'] ) && str_starts_with( $args['fields'], 'id=>' ) ) {
 			$terms = $terms + $terms_from_remaining_taxonomies;
 		} else {
 			$terms = array_merge( $terms, $terms_from_remaining_taxonomies );
@@ -2715,7 +2737,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
  * @param int              $object_id The object to relate to.
  * @param string|int|array $terms     A single term slug, single term ID, or array of either term slugs or IDs.
  *                                    Will replace all existing related terms in this taxonomy. Passing an
- *                                    empty value will remove all related terms.
+ *                                    empty array will remove all related terms.
  * @param string           $taxonomy  The context in which to relate the term to the object.
  * @param bool             $append    Optional. If false will delete difference of terms. Default false.
  * @return array|WP_Error Term taxonomy IDs of the affected terms or WP_Error on failure.
@@ -2729,7 +2751,9 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
 
-	if ( ! is_array( $terms ) ) {
+	if ( empty( $terms ) ) {
+		$terms = array();
+	} elseif ( ! is_array( $terms ) ) {
 		$terms = array( $terms );
 	}
 
@@ -2862,7 +2886,7 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 	}
 
 	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
-	wp_cache_delete( 'last_changed', 'terms' );
+	wp_cache_set_terms_last_changed();
 
 	/**
 	 * Fires after an object's terms have been set.
@@ -2960,7 +2984,7 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
 		$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
 
 		wp_cache_delete( $object_id, $taxonomy . '_relationships' );
-		wp_cache_delete( 'last_changed', 'terms' );
+		wp_cache_set_terms_last_changed();
 
 		/**
 		 * Fires immediately after an object-term relationship is deleted.
@@ -3215,7 +3239,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param int    $parent      ID of the parent term.
+	 * @param int    $parent_term ID of the parent term.
 	 * @param int    $term_id     Term ID.
 	 * @param string $taxonomy    Taxonomy slug.
 	 * @param array  $parsed_args An array of potentially altered update arguments for the given term.
@@ -3226,8 +3250,10 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	// Check for duplicate slug.
 	$duplicate = get_term_by( 'slug', $slug, $taxonomy );
 	if ( $duplicate && $duplicate->term_id !== $term_id ) {
-		// If an empty slug was passed or the parent changed, reset the slug to something unique.
-		// Otherwise, bail.
+		/*
+		 * If an empty slug was passed or the parent changed, reset the slug to something unique.
+		 * Otherwise, bail.
+		 */
 		if ( $empty_slug || ( $parent !== (int) $term['parent'] ) ) {
 			$slug = wp_unique_term_slug( $slug, (object) $args );
 		} else {
@@ -3490,7 +3516,7 @@ function wp_update_term_count_now( $terms, $taxonomy ) {
 	} else {
 		$object_types = (array) $taxonomy->object_type;
 		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) ) {
+			if ( str_starts_with( $object_type, 'attachment:' ) ) {
 				list( $object_type ) = explode( ':', $object_type );
 			}
 		}
@@ -3546,7 +3572,7 @@ function clean_object_term_cache( $object_ids, $object_type ) {
 		wp_cache_delete_multiple( $object_ids, "{$taxonomy}_relationships" );
 	}
 
-	wp_cache_delete( 'last_changed', 'terms' );
+	wp_cache_set_terms_last_changed();
 
 	/**
 	 * Fires after the object term cache has been cleaned.
@@ -3621,7 +3647,7 @@ function clean_term_cache( $ids, $taxonomy = '', $clean_taxonomy = true ) {
 		do_action( 'clean_term_cache', $ids, $taxonomy, $clean_taxonomy );
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'terms' );
+	wp_cache_set_terms_last_changed();
 }
 
 /**
@@ -3634,7 +3660,7 @@ function clean_term_cache( $ids, $taxonomy = '', $clean_taxonomy = true ) {
 function clean_taxonomy_cache( $taxonomy ) {
 	wp_cache_delete( 'all_ids', $taxonomy );
 	wp_cache_delete( 'get', $taxonomy );
-	wp_cache_delete( 'last_changed', 'terms' );
+	wp_cache_set_terms_last_changed();
 
 	// Regenerate cached hierarchy.
 	delete_option( "{$taxonomy}_children" );
@@ -4007,6 +4033,7 @@ function _pad_term_counts( &$terms, $taxonomy ) {
  *
  * @since 4.6.0
  * @since 6.1.0 This function is no longer marked as "private".
+ * @since 6.3.0 Use wp_lazyload_term_meta() for lazy-loading of term meta.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
@@ -4021,10 +4048,10 @@ function _prime_term_caches( $term_ids, $update_meta_cache = true ) {
 		$fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
 		update_term_cache( $fresh_terms );
+	}
 
-		if ( $update_meta_cache ) {
-			update_termmeta_cache( $non_cached_ids );
-		}
+	if ( $update_meta_cache ) {
+		wp_lazyload_term_meta( $term_ids );
 	}
 }
 
@@ -4522,6 +4549,8 @@ function wp_get_split_term( $old_term_id, $taxonomy ) {
  *
  * @since 4.4.0
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $term_id Term ID.
  * @return bool Returns false if a term is not shared between multiple taxonomies or
  *              if splitting shared taxonomy terms is finished.
@@ -4939,29 +4968,29 @@ function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
  *
  * @since 3.1.0
  *
- * @param int    $parent   `term_id` of the parent for the term we're checking.
- * @param int    $term_id  The term we're checking.
- * @param string $taxonomy The taxonomy of the term we're checking.
+ * @param int    $parent_term `term_id` of the parent for the term we're checking.
+ * @param int    $term_id     The term we're checking.
+ * @param string $taxonomy    The taxonomy of the term we're checking.
  * @return int The new parent for the term.
  */
-function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
+function wp_check_term_hierarchy_for_loops( $parent_term, $term_id, $taxonomy ) {
 	// Nothing fancy here - bail.
-	if ( ! $parent ) {
+	if ( ! $parent_term ) {
 		return 0;
 	}
 
 	// Can't be its own parent.
-	if ( $parent === $term_id ) {
+	if ( $parent_term === $term_id ) {
 		return 0;
 	}
 
 	// Now look for larger loops.
-	$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) );
+	$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent_term, array( $taxonomy ) );
 	if ( ! $loop ) {
-		return $parent; // No loop.
+		return $parent_term; // No loop.
 	}
 
-	// Setting $parent to the given value causes a loop.
+	// Setting $parent_term to the given value causes a loop.
 	if ( isset( $loop[ $term_id ] ) ) {
 		return 0;
 	}
@@ -4971,7 +5000,7 @@ function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
 		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
 	}
 
-	return $parent;
+	return $parent_term;
 }
 
 /**
@@ -5019,7 +5048,7 @@ function is_term_publicly_viewable( $term ) {
  * @since 5.0.0
  */
 function wp_cache_set_terms_last_changed() {
-	wp_cache_set( 'last_changed', microtime(), 'terms' );
+	wp_cache_set_last_changed( 'terms' );
 }
 
 /**
diff --git a/src/wp-includes/template.php b/src/wp-includes/template.php
index 69f8b76b51b54..afc2ca6edfaad 100644
--- a/src/wp-includes/template.php
+++ b/src/wp-includes/template.php
@@ -152,7 +152,7 @@ function get_archive_template() {
 
 	$templates = array();
 
-	if ( count( $post_types ) == 1 ) {
+	if ( count( $post_types ) === 1 ) {
 		$post_type   = reset( $post_types );
 		$templates[] = "archive-{$post_type}.php";
 	}
@@ -470,8 +470,10 @@ function get_page_template() {
 	$pagename = get_query_var( 'pagename' );
 
 	if ( ! $pagename && $id ) {
-		// If a static page is set as the front page, $pagename will not be set.
-		// Retrieve it from the queried object.
+		/*
+		 * If a static page is set as the front page, $pagename will not be set.
+		 * Retrieve it from the queried object.
+		 */
 		$post = get_queried_object();
 		if ( $post ) {
 			$pagename = $post->post_name;
@@ -662,7 +664,7 @@ function get_attachment_template() {
 	$templates = array();
 
 	if ( $attachment ) {
-		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+		if ( str_contains( $attachment->post_mime_type, '/' ) ) {
 			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
 		} else {
 			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
@@ -690,13 +692,13 @@ function get_attachment_template() {
  *
  * @param string|array $template_names Template file(s) to search for, in order.
  * @param bool         $load           If true the template file will be loaded if it is found.
- * @param bool         $require_once   Whether to require_once or require. Has no effect if `$load` is false.
+ * @param bool         $load_once      Whether to require_once or require. Has no effect if `$load` is false.
  *                                     Default true.
  * @param array        $args           Optional. Additional arguments passed to the template.
  *                                     Default empty array.
  * @return string The template filename if one is located.
  */
-function locate_template( $template_names, $load = false, $require_once = true, $args = array() ) {
+function locate_template( $template_names, $load = false, $load_once = true, $args = array() ) {
 	$located = '';
 	foreach ( (array) $template_names as $template_name ) {
 		if ( ! $template_name ) {
@@ -705,7 +707,7 @@ function locate_template( $template_names, $load = false, $require_once = true,
 		if ( file_exists( STYLESHEETPATH . '/' . $template_name ) ) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
-		} elseif ( file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
+		} elseif ( is_child_theme() && file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
 			$located = TEMPLATEPATH . '/' . $template_name;
 			break;
 		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
@@ -715,7 +717,7 @@ function locate_template( $template_names, $load = false, $require_once = true,
 	}
 
 	if ( $load && '' !== $located ) {
-		load_template( $located, $require_once, $args );
+		load_template( $located, $load_once, $args );
 	}
 
 	return $located;
@@ -744,11 +746,11 @@ function locate_template( $template_names, $load = false, $require_once = true,
  * @global int        $user_ID
  *
  * @param string $_template_file Path to template file.
- * @param bool   $require_once   Whether to require_once or require. Default true.
+ * @param bool   $load_once      Whether to require_once or require. Default true.
  * @param array  $args           Optional. Additional arguments passed to the template.
  *                               Default empty array.
  */
-function load_template( $_template_file, $require_once = true, $args = array() ) {
+function load_template( $_template_file, $load_once = true, $args = array() ) {
 	global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
 	if ( is_array( $wp_query->query_vars ) ) {
@@ -774,12 +776,12 @@ function load_template( $_template_file, $require_once = true, $args = array() )
 	 * @since 6.1.0
 	 *
 	 * @param string $_template_file The full path to the template file.
-	 * @param bool   $require_once   Whether to require_once or require.
+	 * @param bool   $load_once      Whether to require_once or require.
 	 * @param array  $args           Additional arguments passed to the template.
 	 */
-	do_action( 'wp_before_load_template', $_template_file, $require_once, $args );
+	do_action( 'wp_before_load_template', $_template_file, $load_once, $args );
 
-	if ( $require_once ) {
+	if ( $load_once ) {
 		require_once $_template_file;
 	} else {
 		require $_template_file;
@@ -791,8 +793,8 @@ function load_template( $_template_file, $require_once = true, $args = array() )
 	 * @since 6.1.0
 	 *
 	 * @param string $_template_file The full path to the template file.
-	 * @param bool   $require_once   Whether to require_once or require.
+	 * @param bool   $load_once      Whether to require_once or require.
 	 * @param array  $args           Additional arguments passed to the template.
 	 */
-	do_action( 'wp_after_load_template', $_template_file, $require_once, $args );
+	do_action( 'wp_after_load_template', $_template_file, $load_once, $args );
 }
diff --git a/src/wp-includes/theme-compat/comments.php b/src/wp-includes/theme-compat/comments.php
index 2002f8679f3de..a576590636fb0 100644
--- a/src/wp-includes/theme-compat/comments.php
+++ b/src/wp-includes/theme-compat/comments.php
@@ -32,7 +32,7 @@
 <?php if ( have_comments() ) : ?>
 	<h3 id="comments">
 		<?php
-		if ( 1 == get_comments_number() ) {
+		if ( '1' === get_comments_number() ) {
 			printf(
 				/* translators: %s: Post title. */
 				__( 'One response to %s' ),
diff --git a/src/wp-includes/theme-compat/footer.php b/src/wp-includes/theme-compat/footer.php
index 53f6d31373e8a..2a719e18f00b0 100644
--- a/src/wp-includes/theme-compat/footer.php
+++ b/src/wp-includes/theme-compat/footer.php
@@ -22,7 +22,7 @@
 	<p>
 		<?php
 		printf(
-			/* translators: 1: Blog name, 2: WordPress */
+			/* translators: 1: Site name, 2: WordPress */
 			__( '%1$s is proudly powered by %2$s' ),
 			get_bloginfo( 'name' ),
 			'<a href="https://wordpress.org/">WordPress</a>'
diff --git a/src/wp-includes/theme-compat/header.php b/src/wp-includes/theme-compat/header.php
index daa0088d232f1..cbd84eb20e798 100644
--- a/src/wp-includes/theme-compat/header.php
+++ b/src/wp-includes/theme-compat/header.php
@@ -43,7 +43,8 @@
 
 <?php
 if ( is_singular() ) {
-	wp_enqueue_script( 'comment-reply' );}
+	wp_enqueue_script( 'comment-reply' );
+}
 ?>
 
 <?php wp_head(); ?>
diff --git a/src/wp-includes/theme-previews.php b/src/wp-includes/theme-previews.php
new file mode 100644
index 0000000000000..e8e4a6a8c8d5d
--- /dev/null
+++ b/src/wp-includes/theme-previews.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Theme previews using the Site Editor for block themes.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Filters the blog option to return the path for the previewed theme.
+ *
+ * @since 6.3.0
+ *
+ * @param string $current_stylesheet The current theme's stylesheet or template path.
+ * @return string The previewed theme's stylesheet or template path.
+ */
+function wp_get_theme_preview_path( $current_stylesheet = null ) {
+	if ( ! current_user_can( 'switch_themes' ) ) {
+		return $current_stylesheet;
+	}
+
+	$preview_stylesheet = ! empty( $_GET['wp_theme_preview'] ) ? sanitize_text_field( wp_unslash( $_GET['wp_theme_preview'] ) ) : null;
+	$wp_theme           = wp_get_theme( $preview_stylesheet );
+	if ( ! is_wp_error( $wp_theme->errors() ) ) {
+		if ( current_filter() === 'template' ) {
+			$theme_path = $wp_theme->get_template();
+		} else {
+			$theme_path = $wp_theme->get_stylesheet();
+		}
+
+		return sanitize_text_field( $theme_path );
+	}
+
+	return $current_stylesheet;
+}
+
+/**
+ * Adds a middleware to `apiFetch` to set the theme for the preview.
+ * This adds a `wp_theme_preview` URL parameter to API requests from the Site Editor, so they also respond as if the theme is set to the value of the parameter.
+ *
+ * @since 6.3.0
+ */
+function wp_attach_theme_preview_middleware() {
+	// Don't allow non-admins to preview themes.
+	if ( ! current_user_can( 'switch_themes' ) ) {
+		return;
+	}
+
+	wp_add_inline_script(
+		'wp-api-fetch',
+		sprintf(
+			'wp.apiFetch.use( wp.apiFetch.createThemePreviewMiddleware( %s ) );',
+			wp_json_encode( sanitize_text_field( wp_unslash( $_GET['wp_theme_preview'] ) ) )
+		),
+		'after'
+	);
+}
+
+/**
+ * Set a JavaScript constant for theme activation.
+ *
+ * Sets the JavaScript global WP_BLOCK_THEME_ACTIVATE_NONCE containing the nonce
+ * required to activate a theme. For use within the site editor.
+ *
+ * @see https://github.com/WordPress/gutenberg/pull/41836.
+ *
+ * @since 6.3.0
+ * @private
+ */
+function wp_block_theme_activate_nonce() {
+	$nonce_handle = 'switch-theme_' . wp_get_theme_preview_path();
+	?>
+	<script type="text/javascript">
+		window.WP_BLOCK_THEME_ACTIVATE_NONCE = <?php echo wp_json_encode( wp_create_nonce( $nonce_handle ) ); ?>;
+	</script>
+	<?php
+}
+
+// Attaches filters to enable theme previews in the Site Editor.
+if ( ! empty( $_GET['wp_theme_preview'] ) ) {
+	add_filter( 'stylesheet', 'wp_get_theme_preview_path' );
+	add_filter( 'template', 'wp_get_theme_preview_path' );
+	add_action( 'init', 'wp_attach_theme_preview_middleware' );
+	add_action( 'admin_head', 'wp_block_theme_activate_nonce' );
+}
diff --git a/src/wp-includes/theme-templates.php b/src/wp-includes/theme-templates.php
index 16bd5e2d77212..114d7205d470c 100644
--- a/src/wp-includes/theme-templates.php
+++ b/src/wp-includes/theme-templates.php
@@ -27,7 +27,7 @@ function wp_set_unique_slug_on_create_template_part( $post_id ) {
 
 	$terms = get_the_terms( $post_id, 'wp_theme' );
 	if ( ! is_array( $terms ) || ! count( $terms ) ) {
-		wp_set_post_terms( $post_id, wp_get_theme()->get_stylesheet(), 'wp_theme' );
+		wp_set_post_terms( $post_id, get_stylesheet(), 'wp_theme' );
 	}
 }
 
@@ -39,12 +39,12 @@ function wp_set_unique_slug_on_create_template_part( $post_id ) {
  *
  * @param string $override_slug The filtered value of the slug (starts as `null` from apply_filter).
  * @param string $slug          The original/un-filtered slug (post_name).
- * @param int    $post_ID       Post ID.
+ * @param int    $post_id       Post ID.
  * @param string $post_status   No uniqueness checks are made if the post is still draft or pending.
  * @param string $post_type     Post type.
  * @return string The original, desired slug.
  */
-function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID, $post_status, $post_type ) {
+function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_id, $post_status, $post_type ) {
 	if ( 'wp_template' !== $post_type && 'wp_template_part' !== $post_type ) {
 		return $override_slug;
 	}
@@ -60,8 +60,8 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID
 	 * in the case of new entities since is too early in the process to have been saved
 	 * to the entity. So for now we use the currently activated theme for creation.
 	 */
-	$theme = wp_get_theme()->get_stylesheet();
-	$terms = get_the_terms( $post_ID, 'wp_theme' );
+	$theme = get_stylesheet();
+	$terms = get_the_terms( $post_id, 'wp_theme' );
 	if ( $terms && ! is_wp_error( $terms ) ) {
 		$theme = $terms[0]->name;
 	}
@@ -71,7 +71,7 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_ID
 		'post_type'      => $post_type,
 		'posts_per_page' => 1,
 		'no_found_rows'  => true,
-		'post__not_in'   => array( $post_ID ),
+		'post__not_in'   => array( $post_id ),
 		'tax_query'      => array(
 			array(
 				'taxonomy' => 'wp_theme',
@@ -173,8 +173,10 @@ function the_block_template_skip_link() {
 			return;
 		}
 
-		// Get the site wrapper.
-		// The skip-link will be injected in the beginning of it.
+		/*
+		 * Get the site wrapper.
+		 * The skip-link will be injected in the beginning of it.
+		 */
 		sibling = document.querySelector( '.wp-site-blocks' );
 
 		// Early exit if the root element was not found.
@@ -193,7 +195,7 @@ function the_block_template_skip_link() {
 		skipLink = document.createElement( 'a' );
 		skipLink.classList.add( 'skip-link', 'screen-reader-text' );
 		skipLink.href = '#' + skipLinkTargetID;
-		skipLink.innerHTML = '<?php esc_html_e( 'Skip to content' ); ?>';
+		skipLink.innerHTML = '<?php /* translators: Hidden accessibility text. */ esc_html_e( 'Skip to content' ); ?>';
 
 		// Inject the skip link.
 		sibling.parentElement.insertBefore( skipLink, sibling );
@@ -209,7 +211,7 @@ function the_block_template_skip_link() {
  * @since 5.8.0
  */
 function wp_enable_block_templates() {
-	if ( wp_is_block_theme() || WP_Theme_JSON_Resolver::theme_has_support() ) {
+	if ( wp_is_block_theme() || wp_theme_has_theme_json() ) {
 		add_theme_support( 'block-templates' );
 	}
 }
diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json
index 40432cedf3877..fd116a42ba724 100644
--- a/src/wp-includes/theme.json
+++ b/src/wp-includes/theme.json
@@ -11,6 +11,8 @@
 		},
 		"color": {
 			"background": true,
+			"button": true,
+			"caption": true,
 			"custom": true,
 			"customDuotone": true,
 			"customGradient": true,
@@ -121,6 +123,7 @@
 					"slug": "midnight"
 				}
 			],
+			"heading": true,
 			"link": false,
 			"palette": [
 				{
@@ -186,144 +189,35 @@
 			],
 			"text": true
 		},
-		"layout": {
-			"definitions": {
-				"default": {
-					"name": "default",
-					"slug": "flow",
-					"className": "is-layout-flow",
-					"baseStyles": [
-						{
-							"selector": " > .alignleft",
-							"rules": {
-								"float": "left",
-								"margin-inline-start": "0",
-								"margin-inline-end": "2em"
-							}
-						},
-						{
-							"selector": " > .alignright",
-							"rules": {
-								"float": "right",
-								"margin-inline-start": "2em",
-								"margin-inline-end": "0"
-							}
-						},
-						{
-							"selector": " > .aligncenter",
-							"rules": {
-								"margin-left": "auto !important",
-								"margin-right": "auto !important"
-							}
-						}
-					],
-					"spacingStyles": [
-						{
-							"selector": " > *",
-							"rules": {
-								"margin-block-start": "0",
-								"margin-block-end": "0"
-							}
-						},
-						{
-							"selector": " > * + *",
-							"rules": {
-								"margin-block-start": null,
-								"margin-block-end": "0"
-							}
-						}
-					]
-				},
-				"constrained": {
-					"name": "constrained",
-					"slug": "constrained",
-					"className": "is-layout-constrained",
-					"baseStyles": [
-						{
-							"selector": " > .alignleft",
-							"rules": {
-								"float": "left",
-								"margin-inline-start": "0",
-								"margin-inline-end": "2em"
-							}
-						},
-						{
-							"selector": " > .alignright",
-							"rules": {
-								"float": "right",
-								"margin-inline-start": "2em",
-								"margin-inline-end": "0"
-							}
-						},
-						{
-							"selector": " > .aligncenter",
-							"rules": {
-								"margin-left": "auto !important",
-								"margin-right": "auto !important"
-							}
-						},
-						{
-							"selector": " > :where(:not(.alignleft):not(.alignright):not(.alignfull))",
-							"rules": {
-								"max-width": "var(--wp--style--global--content-size)",
-								"margin-left": "auto !important",
-								"margin-right": "auto !important"
-							}
-						},
-						{
-							"selector": " > .alignwide",
-							"rules": {
-								"max-width": "var(--wp--style--global--wide-size)"
-							}
-						}
-					],
-					"spacingStyles": [
-						{
-							"selector": " > *",
-							"rules": {
-								"margin-block-start": "0",
-								"margin-block-end": "0"
-							}
-						},
-						{
-							"selector": " > * + *",
-							"rules": {
-								"margin-block-start": null,
-								"margin-block-end": "0"
-							}
-						}
-					]
-				},
-				"flex": {
-					"name": "flex",
-					"slug": "flex",
-					"className": "is-layout-flex",
-					"displayMode": "flex",
-					"baseStyles": [
-						{
-							"selector": "",
-							"rules": {
-								"flex-wrap": "wrap",
-								"align-items": "center"
-							}
-						},
-						{
-							"selector": " > *",
-							"rules": {
-								"margin": "0"
-							}
-						}
-					],
-					"spacingStyles": [
-						{
-							"selector": "",
-							"rules": {
-								"gap": null
-							}
-						}
-					]
+		"shadow": {
+			"defaultPresets": true,
+			"presets": [
+				{
+					"name": "Natural",
+					"slug": "natural",
+					"shadow": "6px 6px 9px rgba(0, 0, 0, 0.2)"
+				},
+				{
+					"name": "Deep",
+					"slug": "deep",
+					"shadow": "12px 12px 50px rgba(0, 0, 0, 0.4)"
+				},
+				{
+					"name": "Sharp",
+					"slug": "sharp",
+					"shadow": "6px 6px 0px rgba(0, 0, 0, 0.2)"
+				},
+				{
+					"name": "Outlined",
+					"slug": "outlined",
+					"shadow": "6px 6px 0px -3px rgba(255, 255, 255, 1), 6px 6px rgba(0, 0, 0, 1)"
+				},
+				{
+					"name": "Crisp",
+					"slug": "crisp",
+					"shadow": "6px 6px 0px rgba(0, 0, 0, 1)"
 				}
-			}
+			]
 		},
 		"spacing": {
 			"blockGap": null,
diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
index 6eab6fcc00023..5ff31953b1323 100644
--- a/src/wp-includes/theme.php
+++ b/src/wp-includes/theme.php
@@ -45,8 +45,10 @@ function wp_get_themes( $args = array() ) {
 	$theme_directories = search_theme_directories();
 
 	if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) {
-		// Make sure the active theme wins out, in case search_theme_directories() picks the wrong
-		// one in the case of a conflict. (Normally, last registered theme root wins.)
+		/*
+		 * Make sure the active theme wins out, in case search_theme_directories() picks the wrong
+		 * one in the case of a conflict. (Normally, last registered theme root wins.)
+		 */
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
@@ -457,7 +459,7 @@ function search_theme_directories( $force = false ) {
 	 * to use in get_theme_root().
 	 */
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+		if ( str_starts_with( $theme_root, WP_CONTENT_DIR ) ) {
 			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
 		} else {
 			$relative_theme_roots[ $theme_root ] = $theme_root;
@@ -510,16 +512,20 @@ function search_theme_directories( $force = false ) {
 				continue;
 			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
-				// wp-content/themes/a-single-theme
-				// wp-content/themes is $theme_root, a-single-theme is $dir.
+				/*
+				 * wp-content/themes/a-single-theme
+				 * wp-content/themes is $theme_root, a-single-theme is $dir.
+				 */
 				$found_themes[ $dir ] = array(
 					'theme_file' => $dir . '/style.css',
 					'theme_root' => $theme_root,
 				);
 			} else {
 				$found_theme = false;
-				// wp-content/themes/a-folder-of-themes/*
-				// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
+				/*
+				 * wp-content/themes/a-folder-of-themes/*
+				 * wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
+				 */
 				$sub_dirs = @ scandir( $theme_root . '/' . $dir );
 				if ( ! $sub_dirs ) {
 					trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
@@ -538,8 +544,10 @@ function search_theme_directories( $force = false ) {
 					);
 					$found_theme                           = true;
 				}
-				// Never mind the above, it's just a theme missing a style.css.
-				// Return it; WP_Theme will catch the error.
+				/*
+				 * Never mind the above, it's just a theme missing a style.css.
+				 * Return it; WP_Theme will catch the error.
+				 */
 				if ( ! $found_theme ) {
 					$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
@@ -587,8 +595,10 @@ function get_theme_root( $stylesheet_or_template = '' ) {
 	if ( $stylesheet_or_template ) {
 		$theme_root = get_raw_theme_root( $stylesheet_or_template );
 		if ( $theme_root ) {
-			// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
-			// This gives relative theme roots the benefit of the doubt when things go haywire.
+			/*
+			 * Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
+			 * This gives relative theme roots the benefit of the doubt when things go haywire.
+			 */
 			if ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
 				$theme_root = WP_CONTENT_DIR . $theme_root;
 			}
@@ -634,11 +644,11 @@ function get_theme_root_uri( $stylesheet_or_template = '', $theme_root = '' ) {
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+			if ( str_starts_with( $theme_root, WP_CONTENT_DIR ) ) {
 				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
+			} elseif ( str_starts_with( $theme_root, ABSPATH ) ) {
 				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
+			} elseif ( str_starts_with( $theme_root, WP_PLUGIN_DIR ) || str_starts_with( $theme_root, WPMU_PLUGIN_DIR ) ) {
 				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
 			} else {
 				$theme_root_uri = $theme_root;
@@ -733,11 +743,12 @@ function locale_stylesheet() {
  * @global array                $wp_theme_directories
  * @global WP_Customize_Manager $wp_customize
  * @global array                $sidebars_widgets
+ * @global array                $wp_registered_sidebars
  *
  * @param string $stylesheet Stylesheet name.
  */
 function switch_theme( $stylesheet ) {
-	global $wp_theme_directories, $wp_customize, $sidebars_widgets;
+	global $wp_theme_directories, $wp_customize, $sidebars_widgets, $wp_registered_sidebars;
 
 	$requirements = validate_theme_requirements( $stylesheet );
 	if ( is_wp_error( $requirements ) ) {
@@ -814,11 +825,18 @@ function switch_theme( $stylesheet ) {
 		}
 	}
 
+	// Stores classic sidebars for later use by block themes.
+	if ( $new_theme->is_block_theme() ) {
+		set_theme_mod( 'wp_classic_sidebars', $wp_registered_sidebars );
+	}
+
 	update_option( 'theme_switched', $old_theme->get_stylesheet() );
 
 	/**
 	 * Fires after the theme is switched.
 	 *
+	 * See {@see 'after_switch_theme'}.
+	 *
 	 * @since 1.5.0
 	 * @since 4.5.0 Introduced the `$old_theme` parameter.
 	 *
@@ -991,18 +1009,18 @@ function get_theme_mods() {
 /**
  * Retrieves theme modification value for the active theme.
  *
- * If the modification name does not exist and `$default` is a string, then the
+ * If the modification name does not exist and `$default_value` is a string, then the
  * default will be passed through the {@link https://www.php.net/sprintf sprintf()}
  * PHP function with the template directory URI as the first value and the
  * stylesheet directory URI as the second value.
  *
  * @since 2.1.0
  *
- * @param string $name    Theme modification name.
- * @param mixed  $default Optional. Theme modification default value. Default false.
+ * @param string $name          Theme modification name.
+ * @param mixed  $default_value Optional. Theme modification default value. Default false.
  * @return mixed Theme modification value.
  */
-function get_theme_mod( $name, $default = false ) {
+function get_theme_mod( $name, $default_value = false ) {
 	$mods = get_theme_mods();
 
 	if ( isset( $mods[ $name ] ) ) {
@@ -1020,17 +1038,17 @@ function get_theme_mod( $name, $default = false ) {
 		return apply_filters( "theme_mod_{$name}", $mods[ $name ] );
 	}
 
-	if ( is_string( $default ) ) {
+	if ( is_string( $default_value ) ) {
 		// Only run the replacement if an sprintf() string format pattern was found.
-		if ( preg_match( '#(?<!%)%(?:\d+\$?)?s#', $default ) ) {
+		if ( preg_match( '#(?<!%)%(?:\d+\$?)?s#', $default_value ) ) {
 			// Remove a single trailing percent sign.
-			$default = preg_replace( '#(?<!%)%$#', '', $default );
-			$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+			$default_value = preg_replace( '#(?<!%)%$#', '', $default_value );
+			$default_value = sprintf( $default_value, get_template_directory_uri(), get_stylesheet_directory_uri() );
 		}
 	}
 
 	/** This filter is documented in wp-includes/theme.php */
-	return apply_filters( "theme_mod_{$name}", $default );
+	return apply_filters( "theme_mod_{$name}", $default_value );
 }
 
 /**
@@ -1229,10 +1247,11 @@ function get_header_image_tag( $attr = array() ) {
 	$attr = wp_parse_args(
 		$attr,
 		array(
-			'src'    => $header->url,
-			'width'  => $width,
-			'height' => $height,
-			'alt'    => $alt,
+			'src'      => $header->url,
+			'width'    => $width,
+			'height'   => $height,
+			'alt'      => $alt,
+			'decoding' => 'async',
 		)
 	);
 
@@ -1257,6 +1276,29 @@ function get_header_image_tag( $attr = array() ) {
 		}
 	}
 
+	$attr = array_merge(
+		$attr,
+		wp_get_loading_optimization_attributes( 'img', $attr, 'get_header_image_tag' )
+	);
+
+	/*
+	 * If the default value of `lazy` for the `loading` attribute is overridden
+	 * to omit the attribute for this image, ensure it is not included.
+	 */
+	if ( isset( $attr['loading'] ) && ! $attr['loading'] ) {
+		unset( $attr['loading'] );
+	}
+
+	// If the `fetchpriority` attribute is overridden and set to false or an empty string.
+	if ( isset( $attr['fetchpriority'] ) && ! $attr['fetchpriority'] ) {
+		unset( $attr['fetchpriority'] );
+	}
+
+	// If the `decoding` attribute is overridden and set to false or an empty string.
+	if ( isset( $attr['decoding'] ) && ! $attr['decoding'] ) {
+		unset( $attr['decoding'] );
+	}
+
 	/**
 	 * Filters the list of header image attributes.
 	 *
@@ -1331,7 +1373,7 @@ function _get_random_header_data() {
 		}
 
 		if ( empty( $headers ) ) {
-			return new stdClass;
+			return new stdClass();
 		}
 
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
@@ -1800,8 +1842,10 @@ function _custom_background_cb() {
 	// $background is the saved custom image, or the default image.
 	$background = set_url_scheme( get_background_image() );
 
-	// $color is the saved custom color.
-	// A default has to be specified in style.css. It will not be printed here.
+	/*
+	 * $color is the saved custom color.
+	 * A default has to be specified in style.css. It will not be printed here.
+	 */
 	$color = get_background_color();
 
 	if ( get_theme_support( 'custom-background', 'default-color' ) === $color ) {
@@ -2370,7 +2414,7 @@ function get_theme_starter_content() {
 				'post_title'   => _x( 'About', 'Theme starter content' ),
 				'post_content' => sprintf(
 					"<!-- wp:paragraph -->\n<p>%s</p>\n<!-- /wp:paragraph -->",
-					_x( 'You might be an artist who would like to introduce yourself and your work here or maybe you&rsquo;re a business with a mission to describe.', 'Theme starter content' )
+					_x( 'You might be an artist who would like to introduce yourself and your work here or maybe you are a business with a mission to describe.', 'Theme starter content' )
 				),
 			),
 			'contact'          => array(
@@ -2475,8 +2519,10 @@ function get_theme_starter_content() {
 				}
 				break;
 
-			// All that's left now are posts (besides attachments).
-			// Not a default case for the sake of clarity and future work.
+			/*
+			 * All that's left now are posts (besides attachments).
+			 * Not a default case for the sake of clarity and future work.
+			 */
 			case 'posts':
 				foreach ( $config[ $type ] as $id => $item ) {
 					if ( is_array( $item ) ) {
@@ -2703,14 +2749,18 @@ function add_theme_support( $feature, ...$args ) {
 			$jit = isset( $args[0]['__jit'] );
 			unset( $args[0]['__jit'] );
 
-			// Merge in data from previous add_theme_support() calls.
-			// The first value registered wins. (A child theme is set up first.)
+			/*
+			 * Merge in data from previous add_theme_support() calls.
+			 * The first value registered wins. (A child theme is set up first.)
+			 */
 			if ( isset( $_wp_theme_features['custom-header'] ) ) {
 				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
 			}
 
-			// Load in the defaults at the end, as we need to insure first one wins.
-			// This will cause all constants to be defined, as each arg will then be set to the default.
+			/*
+			 * Load in the defaults at the end, as we need to insure first one wins.
+			 * This will cause all constants to be defined, as each arg will then be set to the default.
+			 */
 			if ( $jit ) {
 				$args[0] = wp_parse_args( $args[0], $defaults );
 			}
@@ -2757,8 +2807,10 @@ function add_theme_support( $feature, ...$args ) {
 				$args[0]['random-default'] = false;
 			}
 
-			// If headers are supported, and we still don't have a defined width or height,
-			// we have implicit flex sizes.
+			/*
+			 * If headers are supported, and we still don't have a defined width or height,
+			 * we have implicit flex sizes.
+			 */
 			if ( $jit ) {
 				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
 					$args[0]['flex-width'] = true;
@@ -3125,12 +3177,12 @@ function current_theme_supports( $feature, ...$args ) {
  *
  * @param string $feature The feature being checked. See add_theme_support() for the list
  *                        of possible values.
- * @param string $include Path to the file.
+ * @param string $file    Path to the file.
  * @return bool True if the active theme supports the supplied feature, false otherwise.
  */
-function require_if_theme_supports( $feature, $include ) {
+function require_if_theme_supports( $feature, $file ) {
 	if ( current_theme_supports( $feature ) ) {
-		require $include;
+		require $file;
 		return true;
 	}
 	return false;
@@ -3380,13 +3432,14 @@ function check_theme_switched() {
 
 		if ( $old_theme->exists() ) {
 			/**
-			 * Fires on the first WP load after a theme switch if the old theme still exists.
+			 * Fires on the next WP load after the theme has been switched.
 			 *
-			 * This action fires multiple times and the parameters differs
-			 * according to the context, if the old theme exists or not.
-			 * If the old theme is missing, the parameter will be the slug
+			 * The parameters differ according to whether the old theme exists or not.
+			 * If the old theme is missing, the old name will instead be the slug
 			 * of the old theme.
 			 *
+			 * See {@see 'switch_theme'}.
+			 *
 			 * @since 3.3.0
 			 *
 			 * @param string   $old_name  Old theme name.
@@ -3454,12 +3507,16 @@ function _wp_customize_include() {
 	$autosaved         = null;
 	$messenger_channel = null;
 
-	// Value false indicates UUID should be determined after_setup_theme
-	// to either re-use existing saved changeset or else generate a new UUID if none exists.
+	/*
+	 * Value false indicates UUID should be determined after_setup_theme
+	 * to either re-use existing saved changeset or else generate a new UUID if none exists.
+	 */
 	$changeset_uuid = false;
 
-	// Set initially fo false since defaults to true for back-compat;
-	// can be overridden via the customize_changeset_branching filter.
+	/*
+	 * Set initially fo false since defaults to true for back-compat;
+	 * can be overridden via the customize_changeset_branching filter.
+	 */
 	$branching = false;
 
 	if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {
@@ -3567,7 +3624,7 @@ function _wp_customize_publish_changeset( $new_status, $old_status, $changeset_p
 		remove_action( 'customize_register', array( $wp_customize, 'register_controls' ) );
 		$wp_customize->register_controls();
 
-		/** This filter is documented in /wp-includes/class-wp-customize-manager.php */
+		/** This filter is documented in wp-includes/class-wp-customize-manager.php */
 		do_action( 'customize_register', $wp_customize );
 	}
 	$wp_customize->_publish_changeset_values( $changeset_post->ID );
@@ -3619,7 +3676,7 @@ function _wp_customize_changeset_filter_insert_post_data( $post_data, $supplied_
 function _wp_customize_loader_settings() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 
 	$browser = array(
 		'mobile' => wp_is_mobile(),
@@ -3684,7 +3741,7 @@ function wp_customize_url( $stylesheet = '' ) {
 function wp_customize_support_script() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 	$type_attr    = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
 	?>
 	<script<?php echo $type_attr; ?>>
@@ -4211,7 +4268,7 @@ function create_initial_theme_features() {
  *
  * @since 5.9.0
  *
- * @return boolean Whether the active theme is a block-based theme or not.
+ * @return bool Whether the active theme is a block-based theme or not.
  */
 function wp_is_block_theme() {
 	return wp_get_theme()->is_block_theme();
diff --git a/src/wp-includes/update.php b/src/wp-includes/update.php
index f352cab7c25e9..7c4e31feefe99 100644
--- a/src/wp-includes/update.php
+++ b/src/wp-includes/update.php
@@ -44,7 +44,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	}
 
 	if ( ! is_object( $current ) ) {
-		$current                  = new stdClass;
+		$current                  = new stdClass();
 		$current->updates         = array();
 		$current->version_checked = $wp_version;
 	}
@@ -74,7 +74,9 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	$current->last_checked = time();
 	set_site_transient( 'update_core', $current );
 
-	if ( method_exists( $wpdb, 'db_version' ) ) {
+	if ( method_exists( $wpdb, 'db_server_info' ) ) {
+		$mysql_version = $wpdb->db_server_info();
+	} elseif ( method_exists( $wpdb, 'db_version' ) ) {
 		$mysql_version = preg_replace( '/[^0-9.].*/', '', $wpdb->db_version() );
 	} else {
 		$mysql_version = 'N/A';
@@ -327,10 +329,10 @@ function wp_update_plugins( $extra_stats = array() ) {
 	$current = get_site_transient( 'update_plugins' );
 
 	if ( ! is_object( $current ) ) {
-		$current = new stdClass;
+		$current = new stdClass();
 	}
 
-	$updates               = new stdClass;
+	$updates               = new stdClass();
 	$updates->last_checked = time();
 	$updates->response     = array();
 	$updates->translations = array();
@@ -595,7 +597,7 @@ function wp_update_themes( $extra_stats = array() ) {
 	$last_update = get_site_transient( 'update_themes' );
 
 	if ( ! is_object( $last_update ) ) {
-		$last_update = new stdClass;
+		$last_update = new stdClass();
 	}
 
 	$themes  = array();
@@ -734,7 +736,7 @@ function wp_update_themes( $extra_stats = array() ) {
 		return;
 	}
 
-	$new_update               = new stdClass;
+	$new_update               = new stdClass();
 	$new_update->last_checked = time();
 	$new_update->checked      = $checked;
 
@@ -843,10 +845,10 @@ function wp_update_themes( $extra_stats = array() ) {
  * @since 3.7.0
  */
 function wp_maybe_auto_update() {
-	include_once ABSPATH . 'wp-admin/includes/admin.php';
+	require_once ABSPATH . 'wp-admin/includes/admin.php';
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
-	$upgrader = new WP_Automatic_Updater;
+	$upgrader = new WP_Automatic_Updater();
 	$upgrader->run();
 }
 
@@ -1077,6 +1079,73 @@ function wp_clean_update_cache() {
 	delete_site_transient( 'update_core' );
 }
 
+/**
+ * Schedules the removal of all contents in the temporary backup directory.
+ *
+ * @since 6.3.0
+ */
+function wp_delete_all_temp_backups() {
+	/*
+	 * Check if there is a lock, or if currently performing an Ajax request,
+	 * in which case there is a chance an update is running.
+	 * Reschedule for an hour from now and exit early.
+	 */
+	if ( get_option( 'core_updater.lock' ) || get_option( 'auto_updater.lock' ) || wp_doing_ajax() ) {
+		wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_delete_temp_updater_backups' );
+		return;
+	}
+
+	// This action runs on shutdown to make sure there are no plugin updates currently running.
+	add_action( 'shutdown', '_wp_delete_all_temp_backups' );
+}
+
+/**
+ * Deletes all contents in the temporary backup directory.
+ *
+ * @since 6.3.0
+ *
+ * @access private
+ *
+ * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+ *
+ * @return void|WP_Error Void on success, or a WP_Error object on failure.
+ */
+function _wp_delete_all_temp_backups() {
+	global $wp_filesystem;
+
+	if ( ! function_exists( 'WP_Filesystem' ) ) {
+		require_once ABSPATH . '/wp-admin/includes/file.php';
+	}
+
+	ob_start();
+	$credentials = request_filesystem_credentials( '' );
+	ob_end_clean();
+
+	if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
+		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+	}
+
+	if ( ! $wp_filesystem->wp_content_dir() ) {
+		return new WP_Error(
+			'fs_no_content_dir',
+			/* translators: %s: Directory name. */
+			sprintf( __( 'Unable to locate WordPress content directory (%s).' ), 'wp-content' )
+		);
+	}
+
+	$temp_backup_dir = $wp_filesystem->wp_content_dir() . 'upgrade-temp-backup/';
+	$dirlist         = $wp_filesystem->dirlist( $temp_backup_dir );
+	$dirlist         = $dirlist ? $dirlist : array();
+
+	foreach ( array_keys( $dirlist ) as $dir ) {
+		if ( '.' === $dir || '..' === $dir ) {
+			continue;
+		}
+
+		$wp_filesystem->delete( $temp_backup_dir . $dir, true );
+	}
+}
+
 if ( ( ! is_main_site() && ! is_network_admin() ) || wp_doing_ajax() ) {
 	return;
 }
@@ -1101,3 +1170,5 @@ function wp_clean_update_cache() {
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
 
 add_action( 'init', 'wp_schedule_update_checks' );
+
+add_action( 'wp_delete_temp_updater_backups', 'wp_delete_all_temp_backups' );
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 9c17d1583e7c2..0ee3a0d615c5e 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -26,13 +26,24 @@
  *
  * @global string $auth_secure_cookie
  *
- * @param array       $credentials   Optional. User info in order to sign on.
+ * @param array       $credentials {
+ *     Optional. User info in order to sign on.
+ *
+ *     @type string $user_login    Username.
+ *     @type string $user_password User password.
+ *     @type bool   $remember      Whether to 'remember' the user. Increases the time
+ *                                 that the cookie will be kept. Default false.
+ * }
  * @param string|bool $secure_cookie Optional. Whether to use secure cookie.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 	if ( empty( $credentials ) ) {
-		$credentials = array(); // Back-compat for plugins passing an empty string.
+		$credentials = array(
+			'user_login'    => '',
+			'user_password' => '',
+			'remember'      => false,
+		);
 
 		if ( ! empty( $_POST['log'] ) ) {
 			$credentials['user_login'] = wp_unslash( $_POST['log'] );
@@ -691,7 +702,7 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
  * Updates user option with global blog capability.
  *
  * User options are just like user metadata except that they have support for
- * global blog options. If the 'global' parameter is false, which it is by default
+ * global blog options. If the 'is_global' parameter is false, which it is by default,
  * it will prepend the WordPress table prefix to the option name.
  *
  * Deletes the user option if $newvalue is empty.
@@ -703,15 +714,15 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
  * @param int    $user_id     User ID.
  * @param string $option_name User option name.
  * @param mixed  $newvalue    User option value.
- * @param bool   $global      Optional. Whether option name is global or blog specific.
+ * @param bool   $is_global   Optional. Whether option name is global or blog specific.
  *                            Default false (blog specific).
  * @return int|bool User meta ID if the option didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
+function update_user_option( $user_id, $option_name, $newvalue, $is_global = false ) {
 	global $wpdb;
 
-	if ( ! $global ) {
+	if ( ! $is_global ) {
 		$option_name = $wpdb->get_blog_prefix() . $option_name;
 	}
 
@@ -722,7 +733,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
  * Deletes user option with global blog capability.
  *
  * User options are just like user metadata except that they have support for
- * global blog options. If the 'global' parameter is false, which it is by default
+ * global blog options. If the 'is_global' parameter is false, which it is by default,
  * it will prepend the WordPress table prefix to the option name.
  *
  * @since 3.0.0
@@ -731,16 +742,17 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
  *
  * @param int    $user_id     User ID
  * @param string $option_name User option name.
- * @param bool   $global      Optional. Whether option name is global or blog specific.
+ * @param bool   $is_global   Optional. Whether option name is global or blog specific.
  *                            Default false (blog specific).
  * @return bool True on success, false on failure.
  */
-function delete_user_option( $user_id, $option_name, $global = false ) {
+function delete_user_option( $user_id, $option_name, $is_global = false ) {
 	global $wpdb;
 
-	if ( ! $global ) {
+	if ( ! $is_global ) {
 		$option_name = $wpdb->get_blog_prefix() . $option_name;
 	}
+
 	return delete_user_meta( $user_id, $option_name );
 }
 
@@ -951,7 +963,7 @@ function get_blogs_of_user( $user_id, $all = false ) {
 
 	if ( ! is_multisite() ) {
 		$site_id                        = get_current_blog_id();
-		$sites                          = array( $site_id => new stdClass );
+		$sites                          = array( $site_id => new stdClass() );
 		$sites[ $site_id ]->userblog_id = $site_id;
 		$sites[ $site_id ]->blogname    = get_option( 'blogname' );
 		$sites[ $site_id ]->domain      = '';
@@ -974,10 +986,10 @@ function get_blogs_of_user( $user_id, $all = false ) {
 	$keys = array_keys( $keys );
 
 	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) ) {
+		if ( ! str_ends_with( $key, 'capabilities' ) ) {
 			continue;
 		}
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) ) {
+		if ( $wpdb->base_prefix && ! str_starts_with( $key, $wpdb->base_prefix ) ) {
 			continue;
 		}
 		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
@@ -992,9 +1004,8 @@ function get_blogs_of_user( $user_id, $all = false ) {
 
 	if ( ! empty( $site_ids ) ) {
 		$args = array(
-			'number'                 => '',
-			'site__in'               => $site_ids,
-			'update_site_meta_cache' => false,
+			'number'   => '',
+			'site__in' => $site_ids,
 		);
 		if ( ! $all ) {
 			$args['archived'] = 0;
@@ -1054,8 +1065,10 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
 		$user_id = get_current_user_id();
 	}
 
-	// Technically not needed, but does save calls to get_site() and get_user_meta()
-	// in the event that the function is called when a user isn't logged in.
+	/*
+	 * Technically not needed, but does save calls to get_site() and get_user_meta()
+	 * in the event that the function is called when a user isn't logged in.
+	 */
 	if ( empty( $user_id ) ) {
 		return false;
 	} else {
@@ -1754,7 +1767,7 @@ function sanitize_user_field( $field, $value, $user_id, $context ) {
 		return $value;
 	}
 
-	$prefixed = false !== strpos( $field, 'user_' );
+	$prefixed = str_contains( $field, 'user_' );
 
 	if ( 'edit' === $context ) {
 		if ( $prefixed ) {
@@ -1873,6 +1886,7 @@ function update_user_caches( $user ) {
  *
  * @since 3.0.0
  * @since 4.4.0 'clean_user_cache' action was added.
+ * @since 6.2.0 User metadata caches are now cleared.
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
@@ -1893,6 +1907,9 @@ function clean_user_cache( $user ) {
 		wp_cache_delete( $user->user_email, 'useremail' );
 	}
 
+	wp_cache_delete( $user->ID, 'user_meta' );
+	wp_cache_set_users_last_changed();
+
 	/**
 	 * Fires immediately after the given user's cache is cleaned.
 	 *
@@ -2015,7 +2032,8 @@ function validate_username( $username ) {
  *     An array, object, or WP_User object of user data arguments.
  *
  *     @type int    $ID                   User ID. If supplied, the user will be updated.
- *     @type string $user_pass            The plain-text user password.
+ *     @type string $user_pass            The plain-text user password for new users.
+ *                                        Hashed password for existing users.
  *     @type string $user_login           The user's login username.
  *     @type string $user_nicename        The URL-friendly user name.
  *     @type string $user_url             The user URL.
@@ -2505,6 +2523,8 @@ function wp_update_user( $userdata ) {
 		$userdata = $userdata->to_array();
 	}
 
+	$userdata_raw = $userdata;
+
 	$user_id = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
 	if ( ! $user_id ) {
 		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
@@ -2574,7 +2594,7 @@ function wp_update_user( $userdata ) {
 
 	$switched_locale = false;
 	if ( ! empty( $send_password_change_email ) || ! empty( $send_email_change_email ) ) {
-		$switched_locale = switch_to_locale( get_user_locale( $user_id ) );
+		$switched_locale = switch_to_user_locale( $user_id );
 	}
 
 	if ( ! empty( $send_password_change_email ) ) {
@@ -2705,8 +2725,10 @@ function wp_update_user( $userdata ) {
 		if ( isset( $plaintext_pass ) ) {
 			wp_clear_auth_cookie();
 
-			// Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
-			// If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
+			/*
+			 * Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
+			 * If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
+			 */
 			$logged_in_cookie = wp_parse_auth_cookie( '', 'logged_in' );
 			/** This filter is documented in wp-includes/pluggable.php */
 			$default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $user_id, false );
@@ -2719,6 +2741,17 @@ function wp_update_user( $userdata ) {
 		}
 	}
 
+	/**
+	 * Fires after the user has been updated and emails have been sent.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int   $user_id      The ID of the user that was just updated.
+	 * @param array $userdata     The array of user data that was updated.
+	 * @param array $userdata_raw The unedited array of user data that was updated.
+	 */
+	do_action( 'wp_update_user', $user_id, $userdata, $userdata_raw );
+
 	return $user_id;
 }
 
@@ -2868,25 +2901,11 @@ function get_password_reset_key( $user ) {
 	 */
 	do_action( 'retrieve_password', $user->user_login );
 
-	$allow = true;
-	if ( is_multisite() && is_user_spammy( $user ) ) {
-		$allow = false;
-	}
-
-	/**
-	 * Filters whether to allow a password to be reset.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param bool $allow   Whether to allow the password to be reset. Default true.
-	 * @param int  $user_id The ID of the user attempting to reset a password.
-	 */
-	$allow = apply_filters( 'allow_password_reset', $allow, $user->ID );
-
-	if ( ! $allow ) {
+	$password_reset_allowed = wp_is_password_reset_allowed_for_user( $user );
+	if ( ! $password_reset_allowed ) {
 		return new WP_Error( 'no_password_reset', __( 'Password reset is not allowed for this user' ) );
-	} elseif ( is_wp_error( $allow ) ) {
-		return $allow;
+	} elseif ( is_wp_error( $password_reset_allowed ) ) {
+		return $password_reset_allowed;
 	}
 
 	// Generate something random for a password reset key.
@@ -2974,7 +2993,7 @@ function check_password_reset_key( $key, $login ) {
 	 */
 	$expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
 
-	if ( false !== strpos( $user->user_activation_key, ':' ) ) {
+	if ( str_contains( $user->user_activation_key, ':' ) ) {
 		list( $pass_request_time, $pass_key ) = explode( ':', $user->user_activation_key, 2 );
 		$expiration_time                      = $pass_request_time + $expiration_duration;
 	} else {
@@ -3135,7 +3154,7 @@ function retrieve_password( $user_login = null ) {
 	// Localize password reset message content for user.
 	$locale = get_user_locale( $user_data );
 
-	$switched_locale = switch_to_locale( $locale );
+	$switched_locale = switch_to_user_locale( $user_data->ID );
 
 	if ( is_multisite() ) {
 		$site_name = get_network()->site_name;
@@ -3253,7 +3272,7 @@ function retrieve_password( $user_login = null ) {
 			sprintf(
 				/* translators: %s: Documentation URL. */
 				__( '<strong>Error:</strong> The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
-				esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
+				esc_url( __( 'https://wordpress.org/documentation/article/reset-your-password/' ) )
 			)
 		);
 		return $errors;
@@ -3325,7 +3344,6 @@ function register_new_user( $user_login, $user_email ) {
 		$sanitized_user_login = '';
 	} elseif ( username_exists( $sanitized_user_login ) ) {
 		$errors->add( 'username_exists', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
-
 	} else {
 		/** This filter is documented in wp-includes/user.php */
 		$illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
@@ -3505,6 +3523,8 @@ function wp_destroy_all_sessions() {
  * @since 4.4.0
  * @since 4.9.0 The `$site_id` parameter was added to support multisite.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int|null $site_id Optional. The site ID to get users with no role for. Defaults to the current site.
  * @return string[] Array of user IDs as strings.
  */
@@ -3529,12 +3549,10 @@ function wp_get_users_with_no_role( $site_id = null ) {
 	$regex = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
 	$users = $wpdb->get_col(
 		$wpdb->prepare(
-			"
-		SELECT user_id
-		FROM $wpdb->usermeta
-		WHERE meta_key = '{$prefix}capabilities'
-		AND meta_value NOT REGEXP %s
-	",
+			"SELECT user_id
+			FROM $wpdb->usermeta
+			WHERE meta_key = '{$prefix}capabilities'
+			AND meta_value NOT REGEXP %s",
 			$regex
 		)
 	);
@@ -3710,7 +3728,7 @@ function send_confirmation_on_profile_email() {
 		$content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
 
 		$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-		$content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail=' . $hash ) ), $content );
+		$content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'profile.php?newuseremail=' . $hash ) ), $content );
 		$content = str_replace( '###EMAIL###', $_POST['email'], $content );
 		$content = str_replace( '###SITENAME###', $sitename, $content );
 		$content = str_replace( '###SITEURL###', home_url(), $content );
@@ -4014,7 +4032,7 @@ function _wp_privacy_account_request_confirmed( $request_id ) {
 function _wp_privacy_send_request_confirmation_notification( $request_id ) {
 	$request = wp_get_user_request( $request_id );
 
-	if ( ! is_a( $request, 'WP_User_Request' ) || 'request-confirmed' !== $request->status ) {
+	if ( ! ( $request instanceof WP_User_Request ) || 'request-confirmed' !== $request->status ) {
 		return;
 	}
 
@@ -4226,7 +4244,7 @@ function _wp_privacy_send_request_confirmation_notification( $request_id ) {
 function _wp_privacy_send_erasure_fulfillment_notification( $request_id ) {
 	$request = wp_get_user_request( $request_id );
 
-	if ( ! is_a( $request, 'WP_User_Request' ) || 'request-completed' !== $request->status ) {
+	if ( ! ( $request instanceof WP_User_Request ) || 'request-completed' !== $request->status ) {
 		return;
 	}
 
@@ -4238,13 +4256,11 @@ function _wp_privacy_send_erasure_fulfillment_notification( $request_id ) {
 
 	// Localize message content for user; fallback to site default for visitors.
 	if ( ! empty( $request->user_id ) ) {
-		$locale = get_user_locale( $request->user_id );
+		$switched_locale = switch_to_user_locale( $request->user_id );
 	} else {
-		$locale = get_locale();
+		$switched_locale = switch_to_locale( get_locale() );
 	}
 
-	$switched_locale = switch_to_locale( $locale );
-
 	/**
 	 * Filters the recipient of the data erasure fulfillment notification.
 	 *
@@ -4649,13 +4665,11 @@ function wp_send_user_request( $request_id ) {
 
 	// Localize message content for user; fallback to site default for visitors.
 	if ( ! empty( $request->user_id ) ) {
-		$locale = get_user_locale( $request->user_id );
+		$switched_locale = switch_to_user_locale( $request->user_id );
 	} else {
-		$locale = get_locale();
+		$switched_locale = switch_to_locale( get_locale() );
 	}
 
-	$switched_locale = switch_to_locale( $locale );
-
 	$email_data = array(
 		'request'     => $request,
 		'email'       => $request->email,
@@ -5004,3 +5018,44 @@ function wp_register_persisted_preferences_meta() {
 		)
 	);
 }
+
+/**
+ * Sets the last changed time for the 'users' cache group.
+ *
+ * @since 6.3.0
+ */
+function wp_cache_set_users_last_changed() {
+	wp_cache_set_last_changed( 'users' );
+}
+
+/**
+ * Checks if password reset is allowed for a specific user.
+ *
+ * @since 6.3.0
+ *
+ * @param int|WP_User $user The user to check.
+ * @return bool|WP_Error True if allowed, false or WP_Error otherwise.
+ */
+function wp_is_password_reset_allowed_for_user( $user ) {
+	if ( ! is_object( $user ) ) {
+		$user = get_userdata( $user );
+	}
+
+	if ( ! $user || ! $user->exists() ) {
+		return false;
+	}
+	$allow = true;
+	if ( is_multisite() && is_user_spammy( $user ) ) {
+		$allow = false;
+	}
+
+	/**
+	 * Filters whether to allow a password to be reset.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param bool $allow   Whether to allow the password to be reset. Default true.
+	 * @param int  $user_id The ID of the user attempting to reset a password.
+	 */
+	return apply_filters( 'allow_password_reset', $allow, $user->ID );
+}
diff --git a/src/wp-includes/vars.php b/src/wp-includes/vars.php
index e285ed8321e02..117f053278c8d 100644
--- a/src/wp-includes/vars.php
+++ b/src/wp-includes/vars.php
@@ -10,7 +10,7 @@
  * servers with known pretty permalink capability.
  *
  * Note: Though Nginx is detected, WordPress does not currently
- * generate rewrite rules for it. See https://wordpress.org/support/article/nginx/
+ * generate rewrite rules for it. See https://wordpress.org/documentation/article/nginx/
  *
  * @package WordPress
  */
@@ -39,7 +39,7 @@
 	} else {
 		preg_match( '#(.*?)(/|$)#', $pagenow, $self_matches );
 		$pagenow = strtolower( $self_matches[1] );
-		if ( '.php' !== substr( $pagenow, -4, 4 ) ) {
+		if ( ! str_ends_with( $pagenow, '.php' ) ) {
 			$pagenow .= '.php'; // For `Options +Multiviews`: /wp-admin/themes/index.php (themes.php is queried).
 		}
 	}
@@ -65,10 +65,12 @@
 $is_edge   = false;
 
 if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
-	if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Lynx' ) !== false ) {
+	if ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Lynx' ) ) {
 		$is_lynx = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edg' ) !== false ) {
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Edg' ) ) {
 		$is_edge = true;
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera' ) || str_contains( $_SERVER['HTTP_USER_AGENT'], 'OPR/' ) ) {
+		$is_opera = true;
 	} elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chrome' ) !== false ) {
 		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
 			$is_admin = is_admin();
@@ -89,15 +91,13 @@
 		}
 	} elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'safari' ) !== false ) {
 		$is_safari = true;
-	} elseif ( ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false || strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) !== false ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'Win' ) !== false ) {
+	} elseif ( ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Win' ) ) {
 		$is_winIE = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) !== false ) {
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) ) {
 		$is_macIE = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Gecko' ) !== false ) {
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Gecko' ) ) {
 		$is_gecko = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera' ) !== false ) {
-		$is_opera = true;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Nav' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.' ) !== false ) {
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Nav' ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.' ) ) {
 		$is_NS4 = true;
 	}
 }
@@ -115,21 +115,21 @@
  *
  * @global bool $is_apache
  */
-$is_apache = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false );
+$is_apache = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) || str_contains( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) );
 
 /**
  * Whether the server software is Nginx or something else
  *
  * @global bool $is_nginx
  */
-$is_nginx = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false );
+$is_nginx = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) );
 
 /**
  * Whether the server software is IIS or something else
  *
  * @global bool $is_IIS
  */
-$is_IIS = ! $is_apache && ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) !== false );
+$is_IIS = ! $is_apache && ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) || str_contains( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) );
 
 /**
  * Whether the server software is IIS 7.X or greater
@@ -148,13 +148,13 @@
 function wp_is_mobile() {
 	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
 		$is_mobile = false;
-	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) !== false // Many mobile devices (all iPhone, iPad, etc.)
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Android' ) !== false
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Silk/' ) !== false
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Kindle' ) !== false
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'BlackBerry' ) !== false
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mini' ) !== false
-		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mobi' ) !== false ) {
+	} elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) // Many mobile devices (all iPhone, iPad, etc.)
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'Android' )
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'Silk/' )
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'Kindle' )
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'BlackBerry' )
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera Mini' )
+		|| str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera Mobi' ) ) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;
diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
index 19ca8b4933e5f..a58fa72d4bef1 100644
--- a/src/wp-includes/version.php
+++ b/src/wp-includes/version.php
@@ -16,14 +16,14 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-alpha-54642-src';
+$wp_version = '6.4-alpha-56267-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 53496;
+$wp_db_version = 55853;
 
 /**
  * Holds the TinyMCE version.
@@ -37,7 +37,7 @@
  *
  * @global string $required_php_version
  */
-$required_php_version = '5.6.20';
+$required_php_version = '7.0.0';
 
 /**
  * Holds the required MySQL version.
diff --git a/src/wp-includes/widgets.php b/src/wp-includes/widgets.php
index 015cb3c48a646..c568cbe301ae3 100644
--- a/src/wp-includes/widgets.php
+++ b/src/wp-includes/widgets.php
@@ -10,7 +10,7 @@
  * This functionality was found in a plugin before the WordPress 2.2 release, which
  * included it in the core from that point on.
  *
- * @link https://wordpress.org/support/article/wordpress-widgets/
+ * @link https://wordpress.org/documentation/article/manage-wordpress-widgets/
  * @link https://developer.wordpress.org/themes/functionality/widgets/
  *
  * @package WordPress
@@ -185,8 +185,10 @@ function register_sidebars( $number = 1, $args = array() ) {
 			$_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
 		}
 
-		// Custom specified ID's are suffixed if they exist already.
-		// Automatically generated sidebar names need to be suffixed regardless starting at -0.
+		/*
+		 * Custom specified ID's are suffixed if they exist already.
+		 * Automatically generated sidebar names need to be suffixed regardless starting at -0.
+		 */
 		if ( isset( $args['id'] ) ) {
 			$_args['id'] = $args['id'];
 			$n           = 2; // Start at -2 for conflicting custom IDs.
@@ -908,7 +910,7 @@ function is_active_widget( $callback = false, $widget_id = false, $id_base = fal
 
 	if ( is_array( $sidebars_widgets ) ) {
 		foreach ( $sidebars_widgets as $sidebar => $widgets ) {
-			if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) ) {
+			if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || str_starts_with( $sidebar, 'orphaned_widgets' ) ) ) {
 				continue;
 			}
 
@@ -1013,8 +1015,10 @@ function wp_get_sidebars_widgets( $deprecated = true ) {
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
-	// If loading from front page, consult $_wp_sidebars_widgets rather than options
-	// to see if wp_convert_widget_settings() has made manipulations in memory.
+	/*
+	 * If loading from front page, consult $_wp_sidebars_widgets rather than options
+	 * to see if wp_convert_widget_settings() has made manipulations in memory.
+	 */
 	if ( ! is_admin() ) {
 		if ( empty( $_wp_sidebars_widgets ) ) {
 			$_wp_sidebars_widgets = get_option( 'sidebars_widgets', array() );
@@ -1382,7 +1386,7 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
 	}
 
 	foreach ( $existing_sidebars_widgets as $sidebar => $widgets ) {
-		if ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+		if ( 'wp_inactive_widgets' === $sidebar || str_starts_with( $sidebar, 'orphaned_widgets' ) ) {
 			$new_sidebars_widgets['wp_inactive_widgets'] = array_merge( $new_sidebars_widgets['wp_inactive_widgets'], (array) $widgets );
 			unset( $existing_sidebars_widgets[ $sidebar ] );
 		}
@@ -1490,7 +1494,7 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
 
 		// Remove orphaned widgets, we're only interested in previously active sidebars.
 		foreach ( $old_sidebars_widgets as $sidebar => $widgets ) {
-			if ( 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
+			if ( str_starts_with( $sidebar, 'orphaned_widgets' ) ) {
 				unset( $old_sidebars_widgets[ $sidebar ] );
 			}
 		}
@@ -1627,7 +1631,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 			$summary = $desc;
 
 			// Change existing [...] to [&hellip;].
-			if ( '[...]' === substr( $summary, -5 ) ) {
+			if ( str_ends_with( $summary, '[...]' ) ) {
 				$summary = substr( $summary, 0, -5 ) . '[&hellip;]';
 			}
 
@@ -2105,3 +2109,29 @@ function wp_check_widget_editor_deps() {
 		}
 	}
 }
+
+/**
+ * Registers the previous theme's sidebars for the block themes.
+ *
+ * @since 6.2.0
+ * @access private
+ *
+ * @global array $wp_registered_sidebars Registered sidebars.
+ */
+function _wp_block_theme_register_classic_sidebars() {
+	global $wp_registered_sidebars;
+
+	if ( ! wp_is_block_theme() ) {
+		return;
+	}
+
+	$classic_sidebars = get_theme_mod( 'wp_classic_sidebars' );
+	if ( empty( $classic_sidebars ) ) {
+		return;
+	}
+
+	// Don't use `register_sidebar` since it will enable the `widgets` support for a theme.
+	foreach ( $classic_sidebars as $sidebar ) {
+		$wp_registered_sidebars[ $sidebar['id'] ] = $sidebar;
+	}
+}
diff --git a/src/wp-includes/widgets/class-wp-widget-block.php b/src/wp-includes/widgets/class-wp-widget-block.php
index 44534c7fa88ea..44371825ac57c 100644
--- a/src/wp-includes/widgets/class-wp-widget-block.php
+++ b/src/wp-includes/widgets/class-wp-widget-block.php
@@ -223,7 +223,7 @@ public function form( $instance ) {
 	 * @return bool Updated `is_wide` value.
 	 */
 	public function set_is_wide_widget_in_customizer( $is_wide, $widget_id ) {
-		if ( strpos( $widget_id, 'block-' ) === 0 ) {
+		if ( str_starts_with( $widget_id, 'block-' ) ) {
 			return false;
 		}
 
diff --git a/src/wp-includes/widgets/class-wp-widget-custom-html.php b/src/wp-includes/widgets/class-wp-widget-custom-html.php
index 3f0d149dcbd0e..771520e1c4bc2 100644
--- a/src/wp-includes/widgets/class-wp-widget-custom-html.php
+++ b/src/wp-includes/widgets/class-wp-widget-custom-html.php
@@ -69,14 +69,16 @@ public function _register_one( $number = -1 ) {
 		}
 		$this->registered = true;
 
-		wp_add_inline_script( 'custom-html-widgets', sprintf( 'wp.customHtmlWidgets.idBases.push( %s );', wp_json_encode( $this->id_base ) ) );
-
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		 */
 		add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );
 
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		 */
 		add_action( 'admin_footer-widgets.php', array( 'WP_Widget_Custom_HTML', 'render_control_template_scripts' ) );
 
 		// Note this action is used to ensure the help text is added to the end.
@@ -216,6 +218,8 @@ public function enqueue_admin_scripts() {
 		);
 
 		wp_enqueue_script( 'custom-html-widgets' );
+		wp_add_inline_script( 'custom-html-widgets', sprintf( 'wp.customHtmlWidgets.idBases.push( %s );', wp_json_encode( $this->id_base ) ) );
+
 		if ( empty( $settings ) ) {
 			$settings = array(
 				'disabled' => true,
@@ -314,7 +318,7 @@ public static function add_help_text() {
 				'class="external-link" target="_blank"',
 				sprintf(
 					'<span class="screen-reader-text"> %s</span>',
-					/* translators: Accessibility text. */
+					/* translators: Hidden accessibility text. */
 					__( '(opens in a new tab)' )
 				)
 			);
diff --git a/src/wp-includes/widgets/class-wp-widget-media-image.php b/src/wp-includes/widgets/class-wp-widget-media-image.php
index 77df8050d8170..31a8bef16f88a 100644
--- a/src/wp-includes/widgets/class-wp-widget-media-image.php
+++ b/src/wp-includes/widgets/class-wp-widget-media-image.php
@@ -239,14 +239,31 @@ public function render_media( $instance ) {
 				$instance['height'] = '';
 			}
 
-			$image = sprintf(
-				'<img class="%1$s" src="%2$s" alt="%3$s" width="%4$s" height="%5$s" />',
-				esc_attr( $classes ),
-				esc_url( $instance['url'] ),
-				esc_attr( $instance['alt'] ),
-				esc_attr( $instance['width'] ),
-				esc_attr( $instance['height'] )
+			$attr = array(
+				'class'    => $classes,
+				'src'      => $instance['url'],
+				'alt'      => $instance['alt'],
+				'width'    => $instance['width'],
+				'height'   => $instance['height'],
+				'decoding' => 'async',
 			);
+
+			$loading_optimization_attr = wp_get_loading_optimization_attributes(
+				'img',
+				$attr,
+				'widget_media_image'
+			);
+
+			$attr = array_merge( $attr, $loading_optimization_attr );
+
+			$attr  = array_map( 'esc_attr', $attr );
+			$image = '<img';
+
+			foreach ( $attr as $name => $value ) {
+				$image .= ' ' . $name . '="' . $value . '"';
+			}
+
+			$image .= ' />';
 		} // End if().
 
 		$url = '';
diff --git a/src/wp-includes/widgets/class-wp-widget-media.php b/src/wp-includes/widgets/class-wp-widget-media.php
index 18d66e402bae4..ebca22ec66955 100644
--- a/src/wp-includes/widgets/class-wp-widget-media.php
+++ b/src/wp-includes/widgets/class-wp-widget-media.php
@@ -107,16 +107,20 @@ public function _register_one( $number = -1 ) {
 		}
 		$this->registered = true;
 
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		 */
 		add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );
 
 		if ( $this->is_preview() ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );
 		}
 
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		 */
 		add_action( 'admin_footer-widgets.php', array( $this, 'render_control_template_scripts' ) );
 
 		add_filter( 'display_media_states', array( $this, 'display_media_state' ), 10, 2 );
diff --git a/src/wp-includes/widgets/class-wp-widget-rss.php b/src/wp-includes/widgets/class-wp-widget-rss.php
index a265680901594..a4a1b198b9e4e 100644
--- a/src/wp-includes/widgets/class-wp-widget-rss.php
+++ b/src/wp-includes/widgets/class-wp-widget-rss.php
@@ -101,12 +101,12 @@ public function widget( $args, $instance ) {
 			/**
 			 * Filters the classic RSS widget's feed icon link.
 			 *
-			 * Themes can remove the icon link by using `add_filter( 'rss_widget_feed_link', '__return_false' );`.
+			 * Themes can remove the icon link by using `add_filter( 'rss_widget_feed_link', '__return_empty_string' );`.
 			 *
 			 * @since 5.9.0
 			 *
-			 * @param string $feed_link HTML for link to RSS feed.
-			 * @param array  $instance  Array of settings for the current widget.
+			 * @param string|false $feed_link HTML for link to RSS feed.
+			 * @param array        $instance  Array of settings for the current widget.
 			 */
 			$feed_link = apply_filters( 'rss_widget_feed_link', $feed_link, $instance );
 
diff --git a/src/wp-includes/widgets/class-wp-widget-text.php b/src/wp-includes/widgets/class-wp-widget-text.php
index 7f28205c45388..1259357ae2c19 100644
--- a/src/wp-includes/widgets/class-wp-widget-text.php
+++ b/src/wp-includes/widgets/class-wp-widget-text.php
@@ -44,7 +44,7 @@ public function __construct() {
 	}
 
 	/**
-	 * Add hooks for enqueueing assets when registering all widget instances of this widget class.
+	 * Adds hooks for enqueueing assets when registering all widget instances of this widget class.
 	 *
 	 * @param int $number Optional. The unique order number of this widget instance
 	 *                    compared to other instances of the same class. Default -1.
@@ -56,18 +56,20 @@ public function _register_one( $number = -1 ) {
 		}
 		$this->registered = true;
 
-		wp_add_inline_script( 'text-widgets', sprintf( 'wp.textWidgets.idBases.push( %s );', wp_json_encode( $this->id_base ) ) );
-
 		if ( $this->is_preview() ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );
 		}
 
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_print_scripts-widgets.php' action in WP_Customize_Widgets::print_scripts().
+		 */
 		add_action( 'admin_print_scripts-widgets.php', array( $this, 'enqueue_admin_scripts' ) );
 
-		// Note that the widgets component in the customizer will also do
-		// the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		/*
+		 * Note that the widgets component in the customizer will also do
+		 * the 'admin_footer-widgets.php' action in WP_Customize_Widgets::print_footer_scripts().
+		 */
 		add_action( 'admin_footer-widgets.php', array( 'WP_Widget_Text', 'render_control_template_scripts' ) );
 	}
 
@@ -103,7 +105,7 @@ public function is_legacy_instance( $instance ) {
 		}
 
 		$wpautop         = ! empty( $instance['filter'] );
-		$has_line_breaks = ( false !== strpos( trim( $instance['text'] ), "\n" ) );
+		$has_line_breaks = ( str_contains( trim( $instance['text'] ), "\n" ) );
 
 		// If auto-paragraphs are not enabled and there are line breaks, then ensure legacy mode.
 		if ( ! $wpautop && $has_line_breaks ) {
@@ -111,7 +113,7 @@ public function is_legacy_instance( $instance ) {
 		}
 
 		// If an HTML comment is present, assume legacy mode.
-		if ( false !== strpos( $instance['text'], '<!--' ) ) {
+		if ( str_contains( $instance['text'], '<!--' ) ) {
 			return true;
 		}
 
@@ -342,7 +344,7 @@ public function widget( $args, $instance ) {
 	}
 
 	/**
-	 * Inject max-width and remove height for videos too constrained to fit inside sidebars on frontend.
+	 * Injects max-width and removes height for videos too constrained to fit inside sidebars on frontend.
 	 *
 	 * @since 4.9.0
 	 *
@@ -412,7 +414,7 @@ public function update( $new_instance, $old_instance ) {
 	}
 
 	/**
-	 * Enqueue preview scripts.
+	 * Enqueues preview scripts.
 	 *
 	 * These scripts normally are enqueued just-in-time when a playlist shortcode is used.
 	 * However, in the customizer, a playlist shortcode may be used in a text widget and
@@ -436,6 +438,7 @@ public function enqueue_admin_scripts() {
 		wp_enqueue_editor();
 		wp_enqueue_media();
 		wp_enqueue_script( 'text-widgets' );
+		wp_add_inline_script( 'text-widgets', sprintf( 'wp.textWidgets.idBases.push( %s );', wp_json_encode( $this->id_base ) ) );
 		wp_add_inline_script( 'text-widgets', 'wp.textWidgets.init();', 'after' );
 	}
 
@@ -511,7 +514,7 @@ public function form( $instance ) {
 	}
 
 	/**
-	 * Render form template scripts.
+	 * Renders form template scripts.
 	 *
 	 * @since 4.8.0
 	 * @since 4.9.0 The method is now static.
@@ -561,7 +564,7 @@ public static function render_control_template_scripts() {
 			<?php endif; ?>
 
 			<p>
-				<label for="{{ elementIdPrefix }}text" class="screen-reader-text"><?php esc_html_e( 'Content:' ); ?></label>
+				<label for="{{ elementIdPrefix }}text" class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ esc_html_e( 'Content:' ); ?></label>
 				<textarea id="{{ elementIdPrefix }}text" class="widefat text wp-editor-area" style="height: 200px" rows="16" cols="20"></textarea>
 			</p>
 		</script>
diff --git a/src/wp-includes/wlwmanifest.xml b/src/wp-includes/wlwmanifest.xml
deleted file mode 100644
index 8e9b021ddbece..0000000000000
--- a/src/wp-includes/wlwmanifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<manifest xmlns="http://schemas.microsoft.com/wlw/manifest/weblog">
-
-  <options>
-    <clientType>WordPress</clientType>
-	<supportsKeywords>Yes</supportsKeywords>
-	<supportsGetTags>Yes</supportsGetTags>
-  </options>
-
-  <weblog>
-    <serviceName>WordPress</serviceName>
-    <imageUrl>images/wlw/wp-icon.png</imageUrl>
-    <watermarkImageUrl>images/wlw/wp-watermark.png</watermarkImageUrl>
-    <homepageLinkText>View site</homepageLinkText>
-    <adminLinkText>Dashboard</adminLinkText>
-    <adminUrl>
-      <![CDATA[
-			{blog-postapi-url}/../wp-admin/
-		]]>
-    </adminUrl>
-    <postEditingUrl>
-      <![CDATA[
-			{blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id}
-		]]>
-    </postEditingUrl>
-  </weblog>
-
-  <buttons>
-    <button>
-      <id>0</id>
-      <text>Manage Comments</text>
-      <imageUrl>images/wlw/wp-comments.png</imageUrl>
-      <clickUrl>
-        <![CDATA[
-				{blog-postapi-url}/../wp-admin/edit-comments.php
-			]]>
-      </clickUrl>
-    </button>
-
-  </buttons>
-
-</manifest>
diff --git a/src/wp-links-opml.php b/src/wp-links-opml.php
index ca43c3d43ca92..746c287a7e585 100644
--- a/src/wp-links-opml.php
+++ b/src/wp-links-opml.php
@@ -83,7 +83,8 @@
 <outline text="<?php echo esc_attr( $title ); ?>" type="link" xmlUrl="<?php echo esc_url( $bookmark->link_rss ); ?>" htmlUrl="<?php echo esc_url( $bookmark->link_url ); ?>" updated="
 							<?php
 							if ( '0000-00-00 00:00:00' !== $bookmark->link_updated ) {
-								echo $bookmark->link_updated;}
+								echo $bookmark->link_updated;
+							}
 							?>
 " />
 		<?php
diff --git a/src/wp-load.php b/src/wp-load.php
index 9e8241fef5924..d3787d108e17d 100644
--- a/src/wp-load.php
+++ b/src/wp-load.php
@@ -31,7 +31,7 @@
 	 * Initialize error reporting to a known set of levels.
 	 *
 	 * This will be adapted in wp_debug_mode() located in wp-includes/load.php based on WP_DEBUG.
-	 * @see http://php.net/manual/en/errorfunc.constants.php List of known error levels.
+	 * @see https://www.php.net/manual/en/errorfunc.constants.php List of known error levels.
 	 */
 	error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 }
@@ -59,29 +59,27 @@
 	// A config file doesn't exist.
 
 	define( 'WPINC', 'wp-includes' );
+	require_once ABSPATH . WPINC . '/version.php';
+	require_once ABSPATH . WPINC . '/compat.php';
 	require_once ABSPATH . WPINC . '/load.php';
 
+	// Check for the required PHP version and for the MySQL extension or a database drop-in.
+	wp_check_php_mysql_versions();
+
 	// Standardize $_SERVER variables across setups.
 	wp_fix_server_vars();
 
+	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
 	require_once ABSPATH . WPINC . '/functions.php';
 
 	$path = wp_guess_url() . '/wp-admin/setup-config.php';
 
-	/*
-	 * We're going to redirect to setup-config.php. While this shouldn't result
-	 * in an infinite loop, that's a silly thing to assume, don't you think? If
-	 * we're traveling in circles, our last-ditch effort is "Need more help?"
-	 */
-	if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
+	// Redirect to setup-config.php.
+	if ( ! str_contains( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
 		header( 'Location: ' . $path );
 		exit;
 	}
 
-	define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
-	require_once ABSPATH . WPINC . '/version.php';
-
-	wp_check_php_mysql_versions();
 	wp_load_translations_early();
 
 	// Die with an error message.
@@ -93,7 +91,7 @@
 	$die .= '<p>' . sprintf(
 		/* translators: 1: Documentation URL, 2: wp-config.php */
 		__( 'Need more help? <a href="%1$s">Read the support article on %2$s</a>.' ),
-		__( 'https://wordpress.org/support/article/editing-wp-config-php/' ),
+		__( 'https://wordpress.org/documentation/article/editing-wp-config-php/' ),
 		'<code>wp-config.php</code>'
 	) . '</p>';
 	$die .= '<p>' . sprintf(
diff --git a/src/wp-login.php b/src/wp-login.php
index 4c9de9503c7e0..3dbfacfd2bb25 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -13,7 +13,7 @@
 
 // Redirect to HTTPS login if forced to use SSL.
 if ( force_ssl_admin() && ! is_ssl() ) {
-	if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
+	if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
 		wp_safe_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
 		exit;
 	} else {
@@ -23,7 +23,7 @@
 }
 
 /**
- * Output the login page header.
+ * Outputs the login page header.
  *
  * @since 2.1.0
  *
@@ -107,7 +107,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 	}
 
 	/**
-	 * Enqueue scripts and styles for the login page.
+	 * Enqueues scripts and styles for the login page.
 	 *
 	 * @since 3.1.0
 	 */
@@ -294,7 +294,7 @@ function login_footer( $input_id = '' ) {
 				)
 			);
 			/**
-			 * Filter the "Go to site" link displayed in the login page footer.
+			 * Filters the "Go to site" link displayed in the login page footer.
 			 *
 			 * @since 5.7.0
 			 *
@@ -315,11 +315,11 @@ function login_footer( $input_id = '' ) {
 	if (
 		! $interim_login &&
 		/**
-		 * Filters the Languages select input activation on the login screen.
+		 * Filters whether to display the Language selector on the login screen.
 		 *
 		 * @since 5.9.0
 		 *
-		 * @param bool Whether to display the Languages select input on the login screen.
+		 * @param bool $display Whether to display the Language selector on the login screen.
 		 */
 		apply_filters( 'login_display_language_dropdown', true )
 	) {
@@ -332,7 +332,12 @@ function login_footer( $input_id = '' ) {
 
 					<label for="language-switcher-locales">
 						<span class="dashicons dashicons-translation" aria-hidden="true"></span>
-						<span class="screen-reader-text"><?php _e( 'Language' ); ?></span>
+						<span class="screen-reader-text">
+							<?php
+							/* translators: Hidden accessibility text. */
+							_e( 'Language' );
+							?>
+						</span>
 					</label>
 
 					<?php
@@ -425,7 +430,9 @@ function wp_login_viewport_meta() {
 }
 
 /*
- * Main part: check the request and redirect or display a form based on the current action.
+ * Main part.
+ *
+ * Check the request and redirect or display a form based on the current action.
  */
 
 $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'login';
@@ -644,10 +651,13 @@ function wp_login_viewport_meta() {
 				<?php
 
 				/* translators: URL to the WordPress help section about admin email. */
-				$admin_email_help_url = __( 'https://wordpress.org/support/article/settings-general-screen/#email-address' );
+				$admin_email_help_url = __( 'https://wordpress.org/documentation/article/settings-general-screen/#email-address' );
 
-				/* translators: Accessibility text. */
-				$accessibility_text = sprintf( '<span class="screen-reader-text"> %s</span>', __( '(opens in a new tab)' ) );
+				$accessibility_text = sprintf(
+					'<span class="screen-reader-text"> %s</span>',
+					/* translators: Hidden accessibility text. */
+					__( '(opens in a new tab)' )
+				);
 
 				printf(
 					'<a href="%s" rel="noopener" target="_blank">%s%s</a>',
@@ -832,7 +842,7 @@ function wp_login_viewport_meta() {
 		<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
 			<p>
 				<label for="user_login"><?php _e( 'Username or Email Address' ); ?></label>
-				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" autocomplete="username" />
+				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" autocomplete="username" required="required" />
 			</p>
 			<?php
 
@@ -956,7 +966,7 @@ function wp_login_viewport_meta() {
 				</p>
 
 				<div class="wp-pwd">
-					<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="new-password" aria-describedby="pass-strength-result" />
+					<input type="password" name="pass1" id="pass1" class="input password-input" size="24" value="" autocomplete="new-password" spellcheck="false" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" aria-describedby="pass-strength-result" />
 
 					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 						<span class="dashicons dashicons-hidden" aria-hidden="true"></span>
@@ -971,7 +981,7 @@ function wp_login_viewport_meta() {
 
 			<p class="user-pass2-wrap">
 				<label for="pass2"><?php _e( 'Confirm new password' ); ?></label>
-				<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="new-password" />
+				<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="new-password" spellcheck="false" />
 			</p>
 
 			<p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
@@ -1075,11 +1085,11 @@ function wp_login_viewport_meta() {
 		<form name="registerform" id="registerform" action="<?php echo esc_url( site_url( 'wp-login.php?action=register', 'login_post' ) ); ?>" method="post" novalidate="novalidate">
 			<p>
 				<label for="user_login"><?php _e( 'Username' ); ?></label>
-				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" autocomplete="username" />
+				<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" autocapitalize="off" autocomplete="username" required="required" />
 			</p>
 			<p>
 				<label for="user_email"><?php _e( 'Email' ); ?></label>
-				<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" autocomplete="email" />
+				<input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" autocomplete="email" required="required" />
 			</p>
 			<?php
 
@@ -1219,7 +1229,7 @@ function wp_login_viewport_meta() {
 		if ( isset( $_REQUEST['redirect_to'] ) ) {
 			$redirect_to = $_REQUEST['redirect_to'];
 			// Redirect to HTTPS if user wants SSL.
-			if ( $secure_cookie && false !== strpos( $redirect_to, 'wp-admin' ) ) {
+			if ( $secure_cookie && str_contains( $redirect_to, 'wp-admin' ) ) {
 				$redirect_to = preg_replace( '|^http://|', 'https://', $redirect_to );
 			}
 		} else {
@@ -1237,18 +1247,18 @@ function wp_login_viewport_meta() {
 					sprintf(
 						/* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
 						__( '<strong>Error:</strong> Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/article/cookies/' ),
+						__( 'https://wordpress.org/documentation/article/cookies/' ),
 						__( 'https://wordpress.org/support/forums/' )
 					)
 				);
 			} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
-				// If cookies are disabled, we can't log in even with a valid user and password.
+				// If cookies are disabled, the user can't log in even with a valid username and password.
 				$user = new WP_Error(
 					'test_cookie',
 					sprintf(
 						/* translators: %s: Browser cookie documentation URL. */
 						__( '<strong>Error:</strong> Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
-						__( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
+						__( 'https://wordpress.org/documentation/article/cookies/#enable-cookies-in-your-browser' )
 					)
 				);
 			}
@@ -1293,7 +1303,7 @@ function wp_login_viewport_meta() {
 			}
 
 			// Check if it is time to add a redirect to the admin email confirmation screen.
-			if ( is_a( $user, 'WP_User' ) && $user->exists() && $user->has_cap( 'manage_options' ) ) {
+			if ( $user instanceof WP_User && $user->exists() && $user->has_cap( 'manage_options' ) ) {
 				$admin_email_lifespan = (int) get_option( 'admin_email_lifespan' );
 
 				/*
@@ -1352,11 +1362,11 @@ function wp_login_viewport_meta() {
 				$errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
 			} elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
 				$errors->add( 'registerdisabled', __( '<strong>Error:</strong> User registration is currently not allowed.' ) );
-			} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
+			} elseif ( str_contains( $redirect_to, 'about.php?updated' ) ) {
 				$errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
 			} elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
 				$errors->add( 'enter_recovery_mode', __( 'Recovery Mode Initialized. Please log in to continue.' ), 'message' );
-			} elseif ( isset( $_GET['redirect_to'] ) && false !== strpos( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
+			} elseif ( isset( $_GET['redirect_to'] ) && str_contains( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
 				$query_component = wp_parse_url( $_GET['redirect_to'], PHP_URL_QUERY );
 				$query           = array();
 				if ( $query_component ) {
@@ -1415,13 +1425,13 @@ function wp_login_viewport_meta() {
 		<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
 			<p>
 				<label for="user_login"><?php _e( 'Username or Email Address' ); ?></label>
-				<input type="text" name="log" id="user_login"<?php echo $aria_describedby; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" autocomplete="username" />
+				<input type="text" name="log" id="user_login"<?php echo $aria_describedby; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" autocapitalize="off" autocomplete="username" required="required" />
 			</p>
 
 			<div class="user-pass-wrap">
 				<label for="user_pass"><?php _e( 'Password' ); ?></label>
 				<div class="wp-pwd">
-					<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby; ?> class="input password-input" value="" size="20" autocomplete="current-password" />
+					<input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby; ?> class="input password-input" value="" size="20" autocomplete="current-password" spellcheck="false" required="required" />
 					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Show password' ); ?>">
 						<span class="dashicons dashicons-visibility" aria-hidden="true"></span>
 					</button>
diff --git a/src/wp-mail.php b/src/wp-mail.php
index eab3e0cf9f298..1dd1e570d1fe4 100644
--- a/src/wp-mail.php
+++ b/src/wp-mail.php
@@ -107,7 +107,7 @@
 				$content_transfer_encoding = explode( ';', $content_transfer_encoding );
 				$content_transfer_encoding = $content_transfer_encoding[0];
 			}
-			if ( ( 'multipart/alternative' === $content_type ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' === $boundary ) ) {
+			if ( ( 'multipart/alternative' === $content_type ) && ( str_contains( $line, 'boundary="' ) ) && ( '' === $boundary ) ) {
 				$boundary = trim( $line );
 				$boundary = explode( '"', $boundary );
 				$boundary = $boundary[1];
@@ -147,7 +147,7 @@
 
 			if ( preg_match( '/Date: /i', $line ) ) { // Of the form '20 Mar 2002 20:32:37 +0100'.
 				$ddate = str_replace( 'Date: ', '', trim( $line ) );
-				// Remove parenthesised timezone string if it exists, as this confuses strtotime().
+				// Remove parenthesized timezone string if it exists, as this confuses strtotime().
 				$ddate           = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate );
 				$ddate_timestamp = strtotime( $ddate );
 				$post_date       = gmdate( 'Y-m-d H:i:s', $ddate_timestamp + $time_difference );
@@ -171,7 +171,7 @@
 		$content = explode( '--' . $boundary, $content );
 		$content = $content[2];
 
-		// Match case-insensitive content-transfer-encoding.
+		// Match case-insensitive Content-Transfer-Encoding.
 		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim ) ) {
 			$content = explode( $delim[0], $content );
 			$content = $content[1];
@@ -231,7 +231,7 @@
 		echo "\n" . $post_ID->get_error_message();
 	}
 
-	// We couldn't post, for whatever reason. Better move forward to the next email.
+	// The post wasn't inserted or updated, for whatever reason. Better move forward to the next email.
 	if ( empty( $post_ID ) ) {
 		continue;
 	}
diff --git a/src/wp-settings.php b/src/wp-settings.php
index d80d79bb82d6b..9760b519a7d4b 100644
--- a/src/wp-settings.php
+++ b/src/wp-settings.php
@@ -19,8 +19,8 @@
  * Version information for the current WordPress release.
  *
  * These can't be directly globalized in version.php. When updating,
- * we're including version.php from another installation and don't want
- * these values to be overridden if already set.
+ * include version.php from another installation and don't override
+ * these values if already set.
  *
  * @global string $wp_version             The WordPress version string.
  * @global int    $wp_db_version          WordPress database version.
@@ -31,6 +31,7 @@
  */
 global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version, $wp_local_package;
 require ABSPATH . WPINC . '/version.php';
+require ABSPATH . WPINC . '/compat.php';
 require ABSPATH . WPINC . '/load.php';
 
 // Check for the required PHP version and for the MySQL extension or a database drop-in.
@@ -60,7 +61,7 @@
 // Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, SCRIPT_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants();
 
-// Make sure we register the shutdown handler for fatal errors as soon as possible.
+// Register the shutdown handler for fatal errors as soon as possible.
 wp_register_fatal_error_handler();
 
 // WordPress calculates offsets from UTC.
@@ -70,13 +71,13 @@
 // Standardize $_SERVER variables across setups.
 wp_fix_server_vars();
 
-// Check if we're in maintenance mode.
+// Check if the site is in maintenance mode.
 wp_maintenance();
 
 // Start loading timer.
 timer_start();
 
-// Check if we're in WP_DEBUG mode.
+// Check if WP_DEBUG mode is enabled.
 wp_debug_mode();
 
 /**
@@ -104,7 +105,6 @@
 wp_set_lang_dir();
 
 // Load early WordPress files.
-require ABSPATH . WPINC . '/compat.php';
 require ABSPATH . WPINC . '/class-wp-list-util.php';
 require ABSPATH . WPINC . '/formatting.php';
 require ABSPATH . WPINC . '/meta.php';
@@ -145,7 +145,7 @@
 
 register_shutdown_function( 'shutdown_action_hook' );
 
-// Stop most of WordPress from being loaded if we just want the basics.
+// Stop most of WordPress from being loaded if SHORTINIT is enabled.
 if ( SHORTINIT ) {
 	return false;
 }
@@ -175,11 +175,13 @@
 require ABSPATH . WPINC . '/class-wp-theme-json-data.php';
 require ABSPATH . WPINC . '/class-wp-theme-json.php';
 require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
+require ABSPATH . WPINC . '/class-wp-duotone.php';
 require ABSPATH . WPINC . '/global-styles-and-settings.php';
 require ABSPATH . WPINC . '/class-wp-block-template.php';
 require ABSPATH . WPINC . '/block-template-utils.php';
 require ABSPATH . WPINC . '/block-template.php';
 require ABSPATH . WPINC . '/theme-templates.php';
+require ABSPATH . WPINC . '/theme-previews.php';
 require ABSPATH . WPINC . '/template.php';
 require ABSPATH . WPINC . '/https-detection.php';
 require ABSPATH . WPINC . '/https-migration.php';
@@ -188,7 +190,6 @@
 require ABSPATH . WPINC . '/class-wp-user-query.php';
 require ABSPATH . WPINC . '/class-wp-session-tokens.php';
 require ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php';
-require ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php';
 require ABSPATH . WPINC . '/general-template.php';
 require ABSPATH . WPINC . '/link-template.php';
 require ABSPATH . WPINC . '/author-template.php';
@@ -234,6 +235,16 @@
 require ABSPATH . WPINC . '/class-wp-oembed-controller.php';
 require ABSPATH . WPINC . '/media.php';
 require ABSPATH . WPINC . '/http.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-attribute-token.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-span.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-text-replacement.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-tag-processor.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-unsupported-exception.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-active-formatting-elements.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-open-elements.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-token.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-processor-state.php';
+require ABSPATH . WPINC . '/html-api/class-wp-html-processor.php';
 require ABSPATH . WPINC . '/class-wp-http.php';
 require ABSPATH . WPINC . '/class-wp-http-streams.php';
 require ABSPATH . WPINC . '/class-wp-http-curl.php';
@@ -258,6 +269,7 @@
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-posts-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-attachments-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-global-styles-controller.php';
+require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-global-styles-revisions-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-types-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-post-statuses-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-revisions-controller.php';
@@ -288,6 +300,7 @@
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-widgets-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-templates-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-url-details-controller.php';
+require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php';
 require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
 require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-comment-meta-fields.php';
 require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-post-meta-fields.php';
@@ -315,7 +328,11 @@
 require ABSPATH . WPINC . '/class-wp-block-type-registry.php';
 require ABSPATH . WPINC . '/class-wp-block.php';
 require ABSPATH . WPINC . '/class-wp-block-list.php';
+require ABSPATH . WPINC . '/class-wp-block-parser-block.php';
+require ABSPATH . WPINC . '/class-wp-block-parser-frame.php';
 require ABSPATH . WPINC . '/class-wp-block-parser.php';
+require ABSPATH . WPINC . '/class-wp-classic-to-block-menu-converter.php';
+require ABSPATH . WPINC . '/class-wp-navigation-fallback.php';
 require ABSPATH . WPINC . '/blocks.php';
 require ABSPATH . WPINC . '/blocks/index.php';
 require ABSPATH . WPINC . '/block-editor.php';
@@ -328,11 +345,15 @@
 require ABSPATH . WPINC . '/block-supports/custom-classname.php';
 require ABSPATH . WPINC . '/block-supports/dimensions.php';
 require ABSPATH . WPINC . '/block-supports/duotone.php';
+require ABSPATH . WPINC . '/block-supports/shadow.php';
 require ABSPATH . WPINC . '/block-supports/elements.php';
 require ABSPATH . WPINC . '/block-supports/generated-classname.php';
 require ABSPATH . WPINC . '/block-supports/layout.php';
+require ABSPATH . WPINC . '/block-supports/position.php';
 require ABSPATH . WPINC . '/block-supports/spacing.php';
 require ABSPATH . WPINC . '/block-supports/typography.php';
+require ABSPATH . WPINC . '/block-supports/settings.php';
+require ABSPATH . WPINC . '/navigation-fallback.php';
 require ABSPATH . WPINC . '/style-engine.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine.php';
 require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-declarations.php';
@@ -434,7 +455,7 @@
 // Register the default theme directory root.
 register_theme_directory( get_theme_root() );
 
-if ( ! is_multisite() ) {
+if ( ! is_multisite() && wp_is_fatal_error_handler_enabled() ) {
 	// Handle users requesting a recovery mode link and initiating recovery mode.
 	wp_recovery_mode()->initialize();
 }
@@ -501,7 +522,7 @@
 $GLOBALS['wp_the_query'] = new WP_Query();
 
 /**
- * Holds the reference to @see $wp_the_query
+ * Holds the reference to {@see $wp_the_query}.
  * Use this global for WordPress queries
  *
  * @global WP_Query $wp_query WordPress Query object.
diff --git a/src/wp-signup.php b/src/wp-signup.php
index 9782dad499171..d11f16698f095 100644
--- a/src/wp-signup.php
+++ b/src/wp-signup.php
@@ -113,7 +113,7 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 	}
 
 	$current_network = get_network();
-	// Blog name.
+	// Site name.
 	if ( ! is_subdomain_install() ) {
 		echo '<label for="blogname">' . __( 'Site Name (subdirectory only):' ) . '</label>';
 	} else {
@@ -399,7 +399,7 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 		<input type="hidden" name="stage" value="gimmeanotherblog" />
 		<?php
 		/**
-		 * Hidden sign-up form fields output when creating another site or user.
+		 * Fires when hidden sign-up form fields output when creating another site or user.
 		 *
 		 * @since MU (3.0.0)
 		 *
@@ -704,8 +704,8 @@ function confirm_user_signup( $user_name, $user_email ) {
 	<p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ); ?></p>
 	<p>
 	<?php
-	/* translators: %s: Email address. */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
+	/* translators: %s: The user email address. */
+	printf( __( 'Check your inbox at %s and click on the given link.' ), '<strong>' . $user_email . '</strong>' );
 	?>
 	</p>
 	<p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
@@ -862,8 +862,8 @@ function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $use
 	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ); ?></p>
 	<p>
 	<?php
-	/* translators: %s: Email address. */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
+	/* translators: %s: The user email address. */
+	printf( __( 'Check your inbox at %s and click on the given link.' ), '<strong>' . $user_email . '</strong>' );
 	?>
 	</p>
 	<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
diff --git a/src/wp-trackback.php b/src/wp-trackback.php
index d7d1881417532..670d9c457bc81 100644
--- a/src/wp-trackback.php
+++ b/src/wp-trackback.php
@@ -65,7 +65,7 @@ function trackback_response( $error = 0, $error_message = '' ) {
 }
 
 // No valid uses for UTF-7.
-if ( false !== strpos( $charset, 'UTF-7' ) ) {
+if ( str_contains( $charset, 'UTF-7' ) ) {
 	die;
 }
 
@@ -76,7 +76,7 @@ function trackback_response( $error = 0, $error_message = '' ) {
 	$blog_name = mb_convert_encoding( $blog_name, get_option( 'blog_charset' ), $charset );
 }
 
-// Now that mb_convert_encoding() has been given a swing, we need to escape these three.
+// Escape values to use in the trackback.
 $title     = wp_slash( $title );
 $excerpt   = wp_slash( $excerpt );
 $blog_name = wp_slash( $blog_name );
@@ -106,7 +106,7 @@ function trackback_response( $error = 0, $error_message = '' ) {
 	 * @param string $charset       Character set.
 	 * @param string $title         Trackback title.
 	 * @param string $excerpt       Trackback excerpt.
-	 * @param string $blog_name     Blog name.
+	 * @param string $blog_name     Site name.
 	 */
 	do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name );
 
diff --git a/src/xmlrpc.php b/src/xmlrpc.php
index 341a6dc84dc55..ac0f191792adf 100644
--- a/src/xmlrpc.php
+++ b/src/xmlrpc.php
@@ -6,13 +6,13 @@
  */
 
 /**
- * Whether this is an XML-RPC Request
+ * Whether this is an XML-RPC Request.
  *
  * @var bool
  */
 define( 'XMLRPC_REQUEST', true );
 
-// Some browser-embedded clients send cookies. We don't want them.
+// Discard unneeded cookies sent by some browser-embedded clients.
 $_COOKIE = array();
 
 // $HTTP_RAW_POST_DATA was deprecated in PHP 5.6 and removed in PHP 7.0.
@@ -30,7 +30,7 @@
 /** Include the bootstrap for setting up WordPress environment */
 require_once __DIR__ . '/wp-load.php';
 
-if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+if ( isset( $_GET['rsd'] ) ) { // https://cyber.harvard.edu/blogs/gems/tech/rsd.html
 	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 	echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 	?>
@@ -46,9 +46,9 @@
 			<api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
 			<?php
 			/**
-			 * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
+			 * Fires when adding APIs to the Really Simple Discovery (RSD) endpoint.
 			 *
-			 * @link http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+			 * @link https://cyber.harvard.edu/blogs/gems/tech/rsd.html
 			 *
 			 * @since 3.5.0
 			 */
@@ -81,7 +81,7 @@
  * @param string $class The name of the XML-RPC server class.
  */
 $wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
-$wp_xmlrpc_server       = new $wp_xmlrpc_server_class;
+$wp_xmlrpc_server       = new $wp_xmlrpc_server_class();
 
 // Fire off the request.
 $wp_xmlrpc_server->serve_request();
diff --git a/tests/e2e/specs/cache-control-headers-directives.test.js b/tests/e2e/specs/cache-control-headers-directives.test.js
new file mode 100644
index 0000000000000..f451e251721a6
--- /dev/null
+++ b/tests/e2e/specs/cache-control-headers-directives.test.js
@@ -0,0 +1,38 @@
+import {
+	visitAdminPage,
+	createNewPost,
+	publishPost,
+	trashAllPosts,
+	createURL,
+	logout,
+} from "@wordpress/e2e-test-utils";
+
+describe( 'Cache Control header directives', () => {
+
+	beforeEach( async () => {
+		await trashAllPosts();
+	} );
+
+	it( 'No private directive present in cache control when user not logged in.', async () => {
+		await createNewPost( { title: 'Hello World' } );
+		await publishPost();
+		await logout();
+
+		const response = await page.goto( createURL( '/hello-world/' ) );
+		const responseHeaders = response.headers();
+
+		expect( responseHeaders ).toEqual( expect.not.objectContaining( { "cache-control": "no-store" } ) );
+		expect( responseHeaders ).toEqual( expect.not.objectContaining( { "cache-control": "private" } ) );
+	} );
+
+	it( 'Private directive header present in cache control when logged in.', async () => {
+		await visitAdminPage( '/' );
+
+		const response = await page.goto( createURL( '/wp-admin' ) );
+		const responseHeaders = response.headers();
+
+		expect( responseHeaders[ 'cache-control' ] ).toContain( 'no-store' );
+		expect( responseHeaders[ 'cache-control' ] ).toContain( 'private' );
+	} );
+
+} );
diff --git a/tests/e2e/specs/edit-posts.test.js b/tests/e2e/specs/edit-posts.test.js
index 51d8824bb5638..5c07019f4d1e6 100644
--- a/tests/e2e/specs/edit-posts.test.js
+++ b/tests/e2e/specs/edit-posts.test.js
@@ -54,14 +54,16 @@ describe( 'Edit Posts', () => {
 		);
 		await editLink.click();
 
-		// Edit the post.
-		await page.waitForNavigation();
+		// Wait for the editor iframe to load, and switch to it as the active content frame.
+		const editorFrame = await page.waitForSelector( 'iframe[name="editor-canvas"]' );
+
+		const innerFrame = await editorFrame.contentFrame();
 
 		// Wait for title field to render onscreen.
-		await page.waitForSelector( '.editor-post-title__input' );
+		await innerFrame.waitForSelector( '.editor-post-title__input' );
 
 		// Expect to now be in the editor with the correct post title shown.
-		const editorPostTitleInput = await page.$x(
+		const editorPostTitleInput = await innerFrame.$x(
 			`//h1[contains(@class, "editor-post-title__input")][contains(text(), "${ title }")]`
 		);
 		expect( editorPostTitleInput.length ).toBe( 1 );
diff --git a/tests/e2e/specs/gutenberg-plugin.test.js b/tests/e2e/specs/gutenberg-plugin.test.js
new file mode 100644
index 0000000000000..21b6e9737d0f1
--- /dev/null
+++ b/tests/e2e/specs/gutenberg-plugin.test.js
@@ -0,0 +1,26 @@
+import {
+	activatePlugin,
+	deactivatePlugin,
+	installPlugin,
+	uninstallPlugin,
+} from '@wordpress/e2e-test-utils';
+
+describe( 'Gutenberg plugin', () => {
+	beforeAll( async () => {
+		await installPlugin( 'gutenberg' );
+	} );
+
+	afterAll( async () => {
+		await uninstallPlugin( 'gutenberg' );
+	} );
+
+	it( 'should activate', async () => {
+		await activatePlugin( 'gutenberg' );
+		/*
+		 * If plugin activation fails, it will time out and throw an error,
+		 * since the activatePlugin helper is looking for a `.deactivate` link
+		 * which is only there if activation succeeds.
+		 */
+		await deactivatePlugin( 'gutenberg' );
+	} );
+} );
diff --git a/tests/performance/config/bootstrap.js b/tests/performance/config/bootstrap.js
new file mode 100644
index 0000000000000..773d2c1d74f87
--- /dev/null
+++ b/tests/performance/config/bootstrap.js
@@ -0,0 +1,41 @@
+/**
+ * WordPress dependencies.
+ */
+import {
+	clearLocalStorage,
+	enablePageDialogAccept,
+	setBrowserViewport,
+} from '@wordpress/e2e-test-utils';
+
+/**
+ * Timeout, in seconds, that the test should be allowed to run.
+ *
+ * @type {string|undefined}
+ */
+const PUPPETEER_TIMEOUT = process.env.PUPPETEER_TIMEOUT;
+
+// The Jest timeout is increased because these tests are a bit slow.
+jest.setTimeout( PUPPETEER_TIMEOUT || 100000 );
+
+async function setupBrowser() {
+	await clearLocalStorage();
+	await setBrowserViewport( 'large' );
+}
+
+/*
+ * Before every test suite run, delete all content created by the test. This ensures
+ * other posts/comments/etc. aren't dirtying tests and tests don't depend on
+ * each other's side-effects.
+ */
+beforeAll( async () => {
+	enablePageDialogAccept();
+
+	await setBrowserViewport( 'large' );
+	await page.emulateMediaFeatures( [
+		{ name: 'prefers-reduced-motion', value: 'reduce' },
+	] );
+} );
+
+afterEach( async () => {
+	await setupBrowser();
+} );
diff --git a/tests/performance/jest.config.js b/tests/performance/jest.config.js
new file mode 100644
index 0000000000000..b62bb016c3b03
--- /dev/null
+++ b/tests/performance/jest.config.js
@@ -0,0 +1,14 @@
+const config = require( '@wordpress/scripts/config/jest-e2e.config' );
+
+const jestE2EConfig = {
+	...config,
+	setupFilesAfterEnv: [
+		'<rootDir>/config/bootstrap.js',
+	],
+	globals: {
+		// Number of requests to run per test.
+		TEST_RUNS: 20,
+	}
+};
+
+module.exports = jestE2EConfig;
diff --git a/tests/performance/log-results.js b/tests/performance/log-results.js
new file mode 100644
index 0000000000000..8a29366a94cba
--- /dev/null
+++ b/tests/performance/log-results.js
@@ -0,0 +1,102 @@
+#!/usr/bin/env node
+
+/**
+ * External dependencies.
+ */
+const fs = require( 'fs' );
+const path = require( 'path' );
+const https = require( 'https' );
+const [ token, branch, hash, baseHash, timestamp, host ] = process.argv.slice( 2 );
+const { median } = require( './utils' );
+
+// The list of test suites to log.
+const testSuites = [
+	'home-block-theme',
+	'home-classic-theme',
+];
+
+// A list of results to parse based on test suites.
+const testResults = testSuites.map(( key ) => ({
+	key,
+	file: `${ key }.test.results.json`,
+}));
+
+// A list of base results to parse based on test suites.
+const baseResults = testSuites.map(( key ) => ({
+	key,
+	file: `base-${ key }.test.results.json`,
+}));
+
+/**
+ * Parse test files into JSON objects.
+ *
+ * @param {string} fileName The name of the file.
+ * @returns An array of parsed objects from each file.
+ */
+const parseFile = ( fileName ) => (
+	JSON.parse(
+		fs.readFileSync( path.join( __dirname, '/specs/', fileName ), 'utf8' )
+	)
+);
+
+/**
+ * Gets the array of metrics from a list of results.
+ *
+ * @param {Object[]} results A list of results to format.
+ * @return {Object[]} Metrics.
+ */
+const formatResults = ( results ) => {
+	return results.reduce(
+		( result, { key, file } ) => {
+			return {
+				...result,
+				...Object.fromEntries(
+					Object.entries(
+						parseFile( file ) ?? {}
+					).map( ( [ metric, value ] ) => [
+						key + '-' + metric,
+						median ( value ),
+					] )
+				),
+			};
+		},
+		{}
+	);
+};
+
+const data = new TextEncoder().encode(
+	JSON.stringify( {
+		branch,
+		hash,
+		baseHash,
+		timestamp: parseInt( timestamp, 10 ),
+		metrics: formatResults( testResults ),
+		baseMetrics: formatResults( baseResults ),
+	} )
+);
+
+const options = {
+	hostname: host,
+	port: 443,
+	path: '/api/log?token=' + token,
+	method: 'POST',
+	headers: {
+		'Content-Type': 'application/json',
+		'Content-Length': data.length,
+	},
+};
+
+const req = https.request( options, ( res ) => {
+	console.log( `statusCode: ${ res.statusCode }` );
+
+	res.on( 'data', ( d ) => {
+		process.stdout.write( d );
+	} );
+} );
+
+req.on( 'error', ( error ) => {
+	console.error( error );
+} );
+
+req.write( data );
+req.end();
diff --git a/tests/performance/results.js b/tests/performance/results.js
new file mode 100644
index 0000000000000..3ebf47edaabd0
--- /dev/null
+++ b/tests/performance/results.js
@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+/**
+ * External dependencies.
+ */
+const fs = require( 'fs' );
+const { join } = require( 'path' );
+const { median, getResultsFilename } = require( './utils' );
+
+const testSuites = [
+    'home-classic-theme',
+    'home-block-theme',
+];
+
+console.log( '\n>> 🎉 Results 🎉 \n' );
+
+for ( const testSuite of testSuites ) {
+    const resultsFileName = getResultsFilename( testSuite + '.test' );
+    const resultsPath = join( __dirname, '/specs/', resultsFileName );
+    fs.readFile( resultsPath, "utf8", ( err, data ) => {
+        if ( err ) {
+            console.log( "File read failed:", err );
+            return;
+        }
+        const convertString = testSuite.charAt( 0 ).toUpperCase() + testSuite.slice( 1 );
+        console.log( convertString.replace( /[-]+/g, " " ) + ':' );
+
+        tableData = JSON.parse( data );
+        const rawResults = [];
+
+        for ( var key in tableData ) {
+            if ( tableData.hasOwnProperty( key ) ) {
+                rawResults[ key ] = median( tableData[ key ] );
+            }
+        }
+        console.table( rawResults );
+    });
+}
diff --git a/tests/performance/run-tests.js b/tests/performance/run-tests.js
new file mode 100644
index 0000000000000..84e3c847842c2
--- /dev/null
+++ b/tests/performance/run-tests.js
@@ -0,0 +1,16 @@
+/**
+ * External dependencies.
+ */
+const dotenv = require( 'dotenv' );
+const dotenv_expand = require( 'dotenv-expand' );
+const { execSync } = require( 'child_process' );
+
+// WP_BASE_URL interpolates LOCAL_PORT, so needs to be parsed by dotenv_expand().
+dotenv_expand.expand( dotenv.config() );
+
+// Run the tests, passing additional arguments through to the test script.
+execSync(
+	'wp-scripts test-e2e --config tests/performance/jest.config.js ' +
+		process.argv.slice( 2 ).join( ' ' ),
+	{ stdio: 'inherit' }
+);
diff --git a/tests/performance/specs/home-block-theme.test.js b/tests/performance/specs/home-block-theme.test.js
new file mode 100644
index 0000000000000..f9a93824a6077
--- /dev/null
+++ b/tests/performance/specs/home-block-theme.test.js
@@ -0,0 +1,67 @@
+/**
+ * External dependencies.
+ */
+const { basename, join } = require( 'path' );
+const { writeFileSync } = require( 'fs' );
+const {
+	getResultsFilename,
+	getTimeToFirstByte,
+	getLargestContentfulPaint,
+} = require( './../utils' );
+
+/**
+ * WordPress dependencies.
+ */
+import { activateTheme, createURL } from '@wordpress/e2e-test-utils';
+
+describe( 'Server Timing - Twenty Twenty Three', () => {
+	const results = {
+		wpBeforeTemplate: [],
+		wpTemplate: [],
+		wpTotal: [],
+		timeToFirstByte: [],
+		largestContentfulPaint: [],
+		lcpMinusTtfb: [],
+	};
+
+	beforeAll( async () => {
+		await activateTheme( 'twentytwentythree' );
+	} );
+
+	afterAll( async () => {
+		const resultsFilename = getResultsFilename(
+			basename( __filename, '.js' )
+		);
+		writeFileSync(
+			join( __dirname, resultsFilename ),
+			JSON.stringify( results, null, 2 )
+		);
+	} );
+
+	it( 'Server Timing Metrics', async () => {
+		let i = TEST_RUNS;
+		while ( i-- ) {
+			await page.goto( createURL( '/' ) );
+			const navigationTimingJson = await page.evaluate( () =>
+				JSON.stringify( performance.getEntriesByType( 'navigation' ) )
+			);
+
+			const [ navigationTiming ] = JSON.parse( navigationTimingJson );
+
+			results.wpBeforeTemplate.push(
+				navigationTiming.serverTiming[ 0 ].duration
+			);
+			results.wpTemplate.push(
+				navigationTiming.serverTiming[ 1 ].duration
+			);
+			results.wpTotal.push( navigationTiming.serverTiming[ 2 ].duration );
+
+			const ttfb = await getTimeToFirstByte();
+			const lcp = await getLargestContentfulPaint();
+
+			results.timeToFirstByte.push( ttfb );
+			results.largestContentfulPaint.push( lcp );
+			results.lcpMinusTtfb.push( lcp - ttfb );
+		}
+	} );
+} );
diff --git a/tests/performance/specs/home-classic-theme.test.js b/tests/performance/specs/home-classic-theme.test.js
new file mode 100644
index 0000000000000..7ae9282ddc3cc
--- /dev/null
+++ b/tests/performance/specs/home-classic-theme.test.js
@@ -0,0 +1,71 @@
+/**
+ * External dependencies.
+ */
+const { basename, join } = require( 'path' );
+const { writeFileSync } = require( 'fs' );
+const { exec } = require( 'child_process' );
+const {
+	getResultsFilename,
+	getTimeToFirstByte,
+	getLargestContentfulPaint,
+} = require( './../utils' );
+
+/**
+ * WordPress dependencies.
+ */
+import { activateTheme, createURL } from '@wordpress/e2e-test-utils';
+
+describe( 'Server Timing - Twenty Twenty One', () => {
+	const results = {
+		wpBeforeTemplate: [],
+		wpTemplate: [],
+		wpTotal: [],
+		timeToFirstByte: [],
+		largestContentfulPaint: [],
+		lcpMinusTtfb: [],
+	};
+
+	beforeAll( async () => {
+		await activateTheme( 'twentytwentyone' );
+		await exec(
+			'npm run env:cli -- menu location assign all-pages primary'
+		);
+	} );
+
+	afterAll( async () => {
+		const resultsFilename = getResultsFilename(
+			basename( __filename, '.js' )
+		);
+		writeFileSync(
+			join( __dirname, resultsFilename ),
+			JSON.stringify( results, null, 2 )
+		);
+	} );
+
+	it( 'Server Timing Metrics', async () => {
+		let i = TEST_RUNS;
+		while ( i-- ) {
+			await page.goto( createURL( '/' ) );
+			const navigationTimingJson = await page.evaluate( () =>
+				JSON.stringify( performance.getEntriesByType( 'navigation' ) )
+			);
+
+			const [ navigationTiming ] = JSON.parse( navigationTimingJson );
+
+			results.wpBeforeTemplate.push(
+				navigationTiming.serverTiming[ 0 ].duration
+			);
+			results.wpTemplate.push(
+				navigationTiming.serverTiming[ 1 ].duration
+			);
+			results.wpTotal.push( navigationTiming.serverTiming[ 2 ].duration );
+
+			const ttfb = await getTimeToFirstByte();
+			const lcp = await getLargestContentfulPaint();
+
+			results.timeToFirstByte.push( ttfb );
+			results.largestContentfulPaint.push( lcp );
+			results.lcpMinusTtfb.push( lcp - ttfb );
+		}
+	} );
+} );
diff --git a/tests/performance/utils.js b/tests/performance/utils.js
new file mode 100644
index 0000000000000..732ab66d447fa
--- /dev/null
+++ b/tests/performance/utils.js
@@ -0,0 +1,78 @@
+/**
+ * Computes the median number from an array numbers.
+ *
+ * @param {number[]} array
+ *
+ * @return {number} Median.
+ */
+function median( array ) {
+	const mid = Math.floor( array.length / 2 );
+	const numbers = [ ...array ].sort( ( a, b ) => a - b );
+	return array.length % 2 !== 0
+		? numbers[ mid ]
+		: ( numbers[ mid - 1 ] + numbers[ mid ] ) / 2;
+}
+
+/**
+ * Gets the result file name.
+ *
+ * @param {string} File name.
+ *
+ * @return {string} Result file name.
+ */
+function getResultsFilename( fileName ) {
+	const prefixArg = process.argv.find( ( arg ) =>
+		arg.startsWith( '--prefix' )
+	);
+	const fileNamePrefix = prefixArg ? `${ prefixArg.split( '=' )[ 1 ] }-` : '';
+	const resultsFilename = fileNamePrefix + fileName + '.results.json';
+	return resultsFilename;
+}
+
+/**
+ * Returns time to first byte (TTFB) using the Navigation Timing API.
+ *
+ * @see https://web.dev/ttfb/#measure-ttfb-in-javascript
+ *
+ * @return {Promise<number>}
+ */
+async function getTimeToFirstByte() {
+	return page.evaluate( () => {
+		const { responseStart, startTime } =
+			performance.getEntriesByType( 'navigation' )[ 0 ];
+		return responseStart - startTime;
+	} );
+}
+
+/**
+ * Returns the Largest Contentful Paint (LCP) value using the dedicated API.
+ *
+ * @see https://w3c.github.io/largest-contentful-paint/
+ * @see https://web.dev/lcp/#measure-lcp-in-javascript
+ *
+ * @return {Promise<number>}
+ */
+async function getLargestContentfulPaint() {
+	return page.evaluate(
+		() =>
+			new Promise( ( resolve ) => {
+				new PerformanceObserver( ( entryList ) => {
+					const entries = entryList.getEntries();
+					// The last entry is the largest contentful paint.
+					const largestPaintEntry = entries.at( -1 );
+
+					resolve( largestPaintEntry?.startTime || 0 );
+				} ).observe( {
+					type: 'largest-contentful-paint',
+					buffered: true,
+				} );
+			} )
+	);
+}
+
+module.exports = {
+	median,
+	getResultsFilename,
+	getTimeToFirstByte,
+	getLargestContentfulPaint,
+};
diff --git a/tests/performance/wp-content/mu-plugins/server-timing.php b/tests/performance/wp-content/mu-plugins/server-timing.php
new file mode 100644
index 0000000000000..9ae95561ec903
--- /dev/null
+++ b/tests/performance/wp-content/mu-plugins/server-timing.php
@@ -0,0 +1,45 @@
+<?php
+
+add_filter(
+	'template_include',
+	static function( $template ) {
+
+		global $timestart;
+
+		$server_timing_values = array();
+		$template_start       = microtime( true );
+
+		$server_timing_values['before-template'] = $template_start - $timestart;
+
+		ob_start();
+
+		add_action(
+			'shutdown',
+			static function() use ( $server_timing_values, $template_start ) {
+
+				global $timestart;
+
+				$output = ob_get_clean();
+
+				$server_timing_values['template'] = microtime( true ) - $template_start;
+
+				$server_timing_values['total'] = $server_timing_values['before-template'] + $server_timing_values['template'];
+
+				$header_values = array();
+				foreach ( $server_timing_values as $slug => $value ) {
+					if ( is_float( $value ) ) {
+						$value = round( $value * 1000.0, 2 );
+					}
+					$header_values[] = sprintf( 'wp-%1$s;dur=%2$s', $slug, $value );
+				}
+				header( 'Server-Timing: ' . implode( ', ', $header_values ) );
+
+				echo $output;
+			},
+			PHP_INT_MIN
+		);
+
+		return $template;
+	},
+	PHP_INT_MAX
+);
diff --git a/tests/phpunit/data/WPHTTP-testcase-redirection-script.php b/tests/phpunit/data/WPHTTP-testcase-redirection-script.php
index a73e8c6e09375..94643d3de9c43 100644
--- a/tests/phpunit/data/WPHTTP-testcase-redirection-script.php
+++ b/tests/phpunit/data/WPHTTP-testcase-redirection-script.php
@@ -36,7 +36,7 @@ function is_ssl() {
 }
 if ( isset($_GET['header-check']) ) {
 	$out = array();
-	header("Content-type: text/plain");
+	header("Content-Type: text/plain");
 	foreach ( $_SERVER as $key => $value ) {
 		if ( stripos($key, 'http') === 0 ) {
 			$key = strtolower(substr($key, 5));
@@ -63,7 +63,7 @@ function is_ssl() {
 
 	echo $method;
 	exit;
-	
+
 }
 
 if ( isset( $_GET['location-with-200'] ) ) {
diff --git a/tests/phpunit/data/blocks/fixtures/core__archives.server.html b/tests/phpunit/data/blocks/fixtures/core__archives.server.html
index 9191cc5b0380a..19e64659ef9c2 100644
--- a/tests/phpunit/data/blocks/fixtures/core__archives.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__archives.server.html
@@ -1 +1 @@
-<div class=" wp-block-archives-list wp-block-archives">No archives to show.</div>
\ No newline at end of file
+<div class="wp-block-archives-list wp-block-archives">No archives to show.</div>
\ No newline at end of file
diff --git a/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html b/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
index 9191cc5b0380a..19e64659ef9c2 100644
--- a/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__archives__showPostCounts.server.html
@@ -1 +1 @@
-<div class=" wp-block-archives-list wp-block-archives">No archives to show.</div>
\ No newline at end of file
+<div class="wp-block-archives-list wp-block-archives">No archives to show.</div>
\ No newline at end of file
diff --git a/tests/phpunit/data/blocks/fixtures/core__column.server.html b/tests/phpunit/data/blocks/fixtures/core__column.server.html
index d3d3cac0834b7..d0b6ab4016d91 100644
--- a/tests/phpunit/data/blocks/fixtures/core__column.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__column.server.html
@@ -1,5 +1,5 @@
 
-<div class="is-layout-flow wp-block-column">
+<div class="wp-block-column is-layout-flow wp-block-column-is-layout-flow">
 	
 	<p>Column One, Paragraph One</p>
 	
diff --git a/tests/phpunit/data/blocks/fixtures/core__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__columns.server.html
index f8b9705b598f8..e35ab2763e833 100644
--- a/tests/phpunit/data/blocks/fixtures/core__columns.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__columns.server.html
@@ -1,7 +1,7 @@
 
-<div class="is-layout-flex wp-container-1 wp-block-columns has-3-columns">
+<div class="wp-block-columns has-3-columns is-layout-flex wp-container-1 wp-block-columns-is-layout-flex">
 	
-	<div class="is-layout-flow wp-block-column">
+	<div class="wp-block-column is-layout-flow wp-block-column-is-layout-flow">
 		
 		<p>Column One, Paragraph One</p>
 		
@@ -11,7 +11,7 @@
 	</div>
 	
 	
-	<div class="is-layout-flow wp-block-column">
+	<div class="wp-block-column is-layout-flow wp-block-column-is-layout-flow">
 		
 		<p>Column Two, Paragraph One</p>
 		
diff --git a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
index 6240dc51a8de7..c61aabf6822a1 100644
--- a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html
@@ -1,5 +1,5 @@
 
-<div class="is-layout-flex wp-container-1 wp-block-columns has-3-columns">
+<div class="wp-block-columns has-3-columns is-layout-flex wp-container-1 wp-block-columns-is-layout-flex">
 	
 	<p class="layout-column-1">Column One, Paragraph One</p>
 	
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.html b/tests/phpunit/data/blocks/fixtures/core__cover.html
index ae26d922c2644..34e8b7ad5ec64 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.html
@@ -1,5 +1,5 @@
 <!-- wp:core/cover {"url":"https://cldup.com/uuUqE_dXzy.jpg","dimRatio":40} -->
-<div class="wp-block-cover has-background-dim-40 has-background-dim" style="background-image:url(https://cldup.com/uuUqE_dXzy.jpg)">
+<div class="wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow" style="background-image:url(https://cldup.com/uuUqE_dXzy.jpg)">
     <p class="wp-block-cover-text">Guten Berg!</p>
 </div>
 <!-- /wp:core/cover -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.json b/tests/phpunit/data/blocks/fixtures/core__cover.json
index dea09d92c11c8..6b3ec9c1c9985 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.json
@@ -12,6 +12,6 @@
             "backgroundType": "image"
         },
         "innerBlocks": [],
-        "originalContent": "<div class=\"wp-block-cover has-background-dim-40 has-background-dim\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
+        "originalContent": "<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
     }
 ]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
index 14f37b617067b..e4c901f253264 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.parsed.json
@@ -6,9 +6,9 @@
             "dimRatio": 40
         },
         "innerBlocks": [],
-        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
+        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
         "innerContent": [
-            "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
+            "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg)\">\n    <p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
         ]
     },
     {
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover.server.html b/tests/phpunit/data/blocks/fixtures/core__cover.server.html
index 726c24a585c85..ba293cb7a9551 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover.server.html
@@ -1,5 +1,5 @@
 
-<div class="wp-block-cover has-background-dim-40 has-background-dim" style="background-image:url(https://cldup.com/uuUqE_dXzy.jpg)">
+<div class="wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow" style="background-image:url(https://cldup.com/uuUqE_dXzy.jpg)">
     <p class="wp-block-cover-text">Guten Berg!</p>
 </div>
 
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
index 2a3530954f29b..5d3456e7c97b0 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.html
@@ -1,5 +1,5 @@
 <!-- wp:cover {"url":"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=","dimRatio":10,"customOverlayColor":"#3615d9","backgroundType":"video"} -->
-<div class="wp-block-cover has-background-dim-10 has-background-dim" style="background-color:#3615d9">
+<div class="wp-block-cover has-background-dim-10 has-background-dim is-layout-flow wp-block-cover-is-layout-flow" style="background-color:#3615d9">
 	<video class="wp-block-cover__video-background" autoplay muted loop src="data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE="></video>
 	<p class="wp-block-cover-text">Guten Berg!</p>
 </div>
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
index 08f0de4eb4c15..ac816851889af 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.json
@@ -13,6 +13,6 @@
             "backgroundType": "video"
         },
         "innerBlocks": [],
-        "originalContent": "<div class=\"wp-block-cover has-background-dim-10 has-background-dim\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
+        "originalContent": "<div class=\"wp-block-cover has-background-dim-10 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
     }
 ]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
index a2a3ccc94a713..71700c25a9c19 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.parsed.json
@@ -8,9 +8,9 @@
             "backgroundType": "video"
         },
         "innerBlocks": [],
-        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-10 has-background-dim\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
+        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-10 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
         "innerContent": [
-            "\n<div class=\"wp-block-cover has-background-dim-10 has-background-dim\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
+            "\n<div class=\"wp-block-cover has-background-dim-10 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\" style=\"background-color:#3615d9\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
         ]
     },
     {
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
index d8e1e40cace8c..aa2f0267ac8e7 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video-overlay.server.html
@@ -1,5 +1,5 @@
 
-<div class="wp-block-cover has-background-dim-10 has-background-dim" style="background-color:#3615d9">
+<div class="wp-block-cover has-background-dim-10 has-background-dim is-layout-flow wp-block-cover-is-layout-flow" style="background-color:#3615d9">
 	<video class="wp-block-cover__video-background" autoplay muted loop src="data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE="></video>
 	<p class="wp-block-cover-text">Guten Berg!</p>
 </div>
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.html b/tests/phpunit/data/blocks/fixtures/core__cover__video.html
index 0ab2fd73ccdf8..5408bbe933779 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.html
@@ -1,5 +1,5 @@
 <!-- wp:cover {"url":"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=","dimRatio":40,"backgroundType":"video"} -->
-<div class="wp-block-cover has-background-dim-40 has-background-dim">
+<div class="wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow">
 	<video class="wp-block-cover__video-background" autoplay muted loop src="data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE="></video>
 	<p class="wp-block-cover-text">Guten Berg!</p>
 </div>
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.json b/tests/phpunit/data/blocks/fixtures/core__cover__video.json
index 1fa4d25d66cda..673cd3b725d9b 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.json
@@ -12,6 +12,6 @@
             "backgroundType": "video"
         },
         "innerBlocks": [],
-        "originalContent": "<div class=\"wp-block-cover has-background-dim-40 has-background-dim\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
+        "originalContent": "<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>"
     }
 ]
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json b/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
index a864b5fea344e..ad48e4fde4b96 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.parsed.json
@@ -7,9 +7,9 @@
             "backgroundType": "video"
         },
         "innerBlocks": [],
-        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
+        "innerHTML": "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n",
         "innerContent": [
-            "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
+            "\n<div class=\"wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow\">\n\t<video class=\"wp-block-cover__video-background\" autoplay muted loop src=\"data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=\"></video>\n\t<p class=\"wp-block-cover-text\">Guten Berg!</p>\n</div>\n"
         ]
     },
     {
diff --git a/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html b/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
index 50a924c054d94..20afe15696748 100644
--- a/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__cover__video.server.html
@@ -1,5 +1,5 @@
 
-<div class="wp-block-cover has-background-dim-40 has-background-dim">
+<div class="wp-block-cover has-background-dim-40 has-background-dim is-layout-flow wp-block-cover-is-layout-flow">
 	<video class="wp-block-cover__video-background" autoplay muted loop src="data:video/mp4;base64,AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAC721kYXQhEAUgpBv/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3pwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcCEQBSCkG//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADengAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAsJtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAALwABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAB7HRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAALwAAAAAAAAAAAAAAAQEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAC8AAAAAAAEAAAAAAWRtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAAKxEAAAIAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAAEPbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAADTc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAAKxEAAAAAAAzZXNkcwAAAAADgICAIgACAASAgIAUQBUAAAAAAfQAAAHz+QWAgIACEhAGgICAAQIAAAAYc3R0cwAAAAAAAAABAAAAAgAABAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAIAAAABAAAAHHN0c3oAAAAAAAAAAAAAAAIAAAFzAAABdAAAABRzdGNvAAAAAAAAAAEAAAAsAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE="></video>
 	<p class="wp-block-cover-text">Guten Berg!</p>
 </div>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html
new file mode 100644
index 0000000000000..498c7752e3a2f
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.html
@@ -0,0 +1,26 @@
+<!-- wp:gallery {"linkTo":"none"} -->
+<figure
+	class="wp-block-gallery has-nested-images columns-default is-cropped columns-2"
+>
+	<!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none","inheritedAttributes":{"linkDestination":true,"linkTarget":true,"sizeSlug":true}} -->
+	<figure class="wp-block-image size-large">
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
+	</figure>
+	<!-- /wp:image -->
+
+	<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none","inheritedAttributes":{"linkDestination":true,"linkTarget":true,"sizeSlug":true}} -->
+	<figure class="wp-block-image size-large">
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
+	</figure>
+	<!-- /wp:image -->
+	<figcaption class="blocks-gallery-caption wp-element-caption">Gallery Caption</figcaption>
+</figure>
+<!-- /wp:core/gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json
new file mode 100644
index 0000000000000..12b516606641d
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.json
@@ -0,0 +1,46 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"images": [],
+			"ids": [],
+			"shortCodeTransforms": [],
+			"caption": "Gallery Caption",
+			"imageCrop": true,
+			"fixedHeight": true,
+			"linkTo": "none",
+			"sizeSlug": "large",
+			"allowResize": false,
+			"className": "columns-2"
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190",
+					"alt": "Image gallery image",
+					"caption": "",
+					"id": 1421,
+					"sizeSlug": "large",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580",
+					"alt": "Image gallery image",
+					"caption": "",
+					"id": 1440,
+					"sizeSlug": "large",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json
new file mode 100644
index 0000000000000..619adef3d8f10
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.parsed.json
@@ -0,0 +1,62 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"linkTo": "none"
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 1421,
+					"sizeSlug": "large",
+					"linkDestination": "none",
+					"inheritedAttributes": {
+						"linkDestination": true,
+						"linkTarget": true,
+						"sizeSlug": true
+					}
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t",
+				"innerContent": [
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t"
+				]
+			},
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 1440,
+					"sizeSlug": "large",
+					"linkDestination": "none",
+					"inheritedAttributes": {
+						"linkDestination": true,
+						"linkTarget": true,
+						"sizeSlug": true
+					}
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t",
+				"innerContent": [
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t"
+				]
+			}
+		],
+		"innerHTML": "\n<figure\n\tclass=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\"\n>\n\t\n\n\t\n\t<figcaption class=\"blocks-gallery-caption wp-element-caption\">Gallery Caption</figcaption>\n</figure>\n",
+		"innerContent": [
+			"\n<figure\n\tclass=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\"\n>\n\t",
+			null,
+			"\n\n\t",
+			null,
+			"\n\t<figcaption class=\"blocks-gallery-caption wp-element-caption\">Gallery Caption</figcaption>\n</figure>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html
new file mode 100644
index 0000000000000..0eeab028d199d
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.serialized.html
@@ -0,0 +1,9 @@
+<!-- wp:gallery {"linkTo":"none","className":"columns-2"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped columns-2"><!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="Image gallery image" class="wp-image-1421"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="Image gallery image" class="wp-image-1440"/></figure>
+<!-- /wp:image --><figcaption class="blocks-gallery-caption wp-element-caption">Gallery Caption</figcaption></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html
new file mode 100644
index 0000000000000..49912d63c46c0
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html
@@ -0,0 +1,26 @@
+
+<figure
+	class="wp-block-gallery has-nested-images columns-default is-cropped columns-2 wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex"
+>
+
+	<figure class="wp-block-image size-large">
+		<img data-id="1421"
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
+	</figure>
+
+
+
+	<figure class="wp-block-image size-large">
+		<img data-id="1440"
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
+	</figure>
+
+	<figcaption class="blocks-gallery-caption wp-element-caption">Gallery Caption</figcaption>
+</figure>
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.html b/tests/phpunit/data/blocks/fixtures/core__gallery.html
index 54f9991f88f38..3db587c8d72d5 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.html
@@ -1,14 +1,24 @@
 <!-- wp:gallery {"linkTo":"none","className":"columns-2"} -->
-<figure class="wp-block-gallery has-nested-images columns-default is-cropped columns-2">
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+<figure
+	class="wp-block-gallery has-nested-images columns-default is-cropped columns-2"
+>
+	<!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image size-large">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" />
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
 	</figure>
 	<!-- /wp:image -->
 
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none"} -->
 	<figure class="wp-block-image size-large">
-		<img src="http://google.com/hi.png" alt="Image gallery image" />
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
 	</figure>
 	<!-- /wp:image -->
 </figure>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.json b/tests/phpunit/data/blocks/fixtures/core__gallery.json
index 0225422123390..8b7a1000d37cc 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.json
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.json
@@ -19,9 +19,10 @@
 				"name": "core/image",
 				"isValid": true,
 				"attributes": {
-					"url": "https://cldup.com/uuUqE_dXzy.jpg",
+					"url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190",
 					"alt": "Image gallery image",
 					"caption": "",
+					"id": 1421,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
@@ -31,9 +32,10 @@
 				"name": "core/image",
 				"isValid": true,
 				"attributes": {
-					"url": "http://google.com/hi.png",
+					"url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580",
 					"alt": "Image gallery image",
 					"caption": "",
+					"id": 1440,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json
index 00a75f5f1356d..4ddf4ca36e365 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.parsed.json
@@ -9,44 +9,45 @@
 			{
 				"blockName": "core/image",
 				"attrs": {
+					"id": 1421,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"Image gallery image\" />\n\t</figure>\n\t",
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t",
 				"innerContent": [
-					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"Image gallery image\" />\n\t</figure>\n\t"
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t"
 				]
 			},
 			{
 				"blockName": "core/image",
 				"attrs": {
+					"id": 1440,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"Image gallery image\" />\n\t</figure>\n\t",
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t",
 				"innerContent": [
-					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"Image gallery image\" />\n\t</figure>\n\t"
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t"
 				]
 			}
 		],
-		"innerHTML": "\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\">\n\t\n\n\t\n</figure>\n",
+		"innerHTML": "\n<figure\n\tclass=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\"\n>\n\t\n\n\t\n</figure>\n",
 		"innerContent": [
-			"\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\">\n\t",
+			"\n<figure\n\tclass=\"wp-block-gallery has-nested-images columns-default is-cropped columns-2\"\n>\n\t",
 			null,
 			"\n\n\t",
 			null,
 			"\n</figure>\n"
 		]
 	},
-    {
-        "blockName": null,
-        "attrs": {},
-        "innerBlocks": [],
-        "innerHTML": "\n",
-        "innerContent": [
-            "\n"
-        ]
-    }
-]
\ No newline at end of file
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html
index bc5d6be414303..6ab87b7c6031d 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.serialized.html
@@ -1,3 +1,9 @@
 <!-- wp:gallery {"linkTo":"none","className":"columns-2"} -->
-<figure class="wp-block-gallery has-nested-images columns-default is-cropped columns-2"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} --><figure class="wp-block-image size-large"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" /></figure><!-- /wp:image --><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} --><figure class="wp-block-image size-large"><img src="http://google.com/hi.png" alt="Image gallery image" /></figure><!-- /wp:image --></figure>
-<!-- /wp:gallery -->
\ No newline at end of file
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped columns-2"><!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="Image gallery image" class="wp-image-1421"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="Image gallery image" class="wp-image-1440"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
index c7a5d3bb44aa8..051cc297b4f25 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html
@@ -1,15 +1,25 @@
 
-<figure class="is-layout-flex wp-block-gallery-1 wp-block-gallery has-nested-images columns-default is-cropped columns-2">
-	
+<figure
+	class="wp-block-gallery has-nested-images columns-default is-cropped columns-2 wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex"
+>
+
 	<figure class="wp-block-image size-large">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" />
+		<img data-id="1421"
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
 	</figure>
-	
 
-	
+
+
 	<figure class="wp-block-image size-large">
-		<img src="http://google.com/hi.png" alt="Image gallery image" />
+		<img data-id="1440"
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
 	</figure>
-	
+
 </figure>
 
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html
index 4f34167c1772f..b70ac2b6f06a8 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.html
@@ -1,14 +1,22 @@
-<!-- wp:gallery {"linkTo":"none","className":"columns-1"} -->
-<figure class="wp-block-gallery has-nested-images is-cropped columns-1" >
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+<!-- wp:gallery {"columns":1,"linkTo":"none"} -->
+<figure class="wp-block-gallery has-nested-images columns-1 is-cropped">
+	<!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none","inheritedAttributes":{"linkDestination":true,"linkTarget":true,"sizeSlug":true}} -->
 	<figure class="wp-block-image size-large">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" />
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
 	</figure>
 	<!-- /wp:image -->
 
-	<!-- wp:image {"sizeSlug":"large","linkDestination":"none"} -->
+	<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none","inheritedAttributes":{"linkDestination":true,"linkTarget":true,"sizeSlug":true}} -->
 	<figure class="wp-block-image size-large">
-		<img src="http://google.com/hi.png" alt="Image gallery image" />
+		<img
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
 	</figure>
 	<!-- /wp:image -->
 </figure>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json
index 4523d16b204a6..d0c40b3d3a9a9 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.json
@@ -6,23 +6,23 @@
 			"images": [],
 			"ids": [],
 			"shortCodeTransforms": [],
+			"columns": 1,
 			"caption": "",
 			"imageCrop": true,
 			"fixedHeight": true,
 			"linkTo": "none",
 			"sizeSlug": "large",
-			"allowResize": false,
-			"className": "columns-1",
-            "columns": 1
+			"allowResize": false
 		},
 		"innerBlocks": [
 			{
 				"name": "core/image",
 				"isValid": true,
 				"attributes": {
-					"url": "https://cldup.com/uuUqE_dXzy.jpg",
+					"url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190",
 					"alt": "Image gallery image",
 					"caption": "",
+					"id": 1421,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
@@ -32,9 +32,10 @@
 				"name": "core/image",
 				"isValid": true,
 				"attributes": {
-					"url": "http://google.com/hi.png",
+					"url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580",
 					"alt": "Image gallery image",
 					"caption": "",
+					"id": 1440,
 					"sizeSlug": "large",
 					"linkDestination": "none"
 				},
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json
index d3d7c23893ae6..b7a56415bf367 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.parsed.json
@@ -2,51 +2,61 @@
 	{
 		"blockName": "core/gallery",
 		"attrs": {
-			"linkTo": "none",
-			"className": "columns-1"
+			"columns": 1,
+			"linkTo": "none"
 		},
 		"innerBlocks": [
 			{
 				"blockName": "core/image",
 				"attrs": {
+					"id": 1421,
 					"sizeSlug": "large",
-					"linkDestination": "none"
+					"linkDestination": "none",
+					"inheritedAttributes": {
+						"linkDestination": true,
+						"linkTarget": true,
+						"sizeSlug": true
+					}
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"Image gallery image\" />\n\t</figure>\n\t",
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t",
 				"innerContent": [
-					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"Image gallery image\" />\n\t</figure>\n\t"
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1421\"\n\t\t/>\n\t</figure>\n\t"
 				]
 			},
 			{
 				"blockName": "core/image",
 				"attrs": {
+					"id": 1440,
 					"sizeSlug": "large",
-					"linkDestination": "none"
+					"linkDestination": "none",
+					"inheritedAttributes": {
+						"linkDestination": true,
+						"linkTarget": true,
+						"sizeSlug": true
+					}
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"Image gallery image\" />\n\t</figure>\n\t",
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t",
 				"innerContent": [
-					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"Image gallery image\" />\n\t</figure>\n\t"
+					"\n\t<figure class=\"wp-block-image size-large\">\n\t\t<img\n\t\t\tsrc=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\"\n\t\t\talt=\"Image gallery image\"\n\t\t\tclass=\"wp-image-1440\"\n\t\t/>\n\t</figure>\n\t"
 				]
 			}
 		],
-		"innerHTML": "\n<figure class=\"wp-block-gallery has-nested-images is-cropped columns-1\" >\n\t\n\n\t\n</figure>\n",
+		"innerHTML": "\n<figure class=\"wp-block-gallery has-nested-images columns-1 is-cropped\">\n\t\n\n\t\n</figure>\n",
 		"innerContent": [
-			"\n<figure class=\"wp-block-gallery has-nested-images is-cropped columns-1\" >\n\t",
+			"\n<figure class=\"wp-block-gallery has-nested-images columns-1 is-cropped\">\n\t",
 			null,
 			"\n\n\t",
 			null,
 			"\n</figure>\n"
 		]
 	},
-    {
-        "blockName": null,
-        "attrs": {},
-        "innerBlocks": [],
-        "innerHTML": "\n",
-        "innerContent": [
-            "\n"
-        ]
-    }
-]
\ No newline at end of file
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html
index 88464bedce473..a1398677951cf 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.serialized.html
@@ -1,3 +1,9 @@
-<!-- wp:gallery {"linkTo":"none","className":"columns-1"} -->
-<figure class="wp-block-gallery has-nested-images is-cropped columns-1"><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} --><figure class="wp-block-image size-large"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" /></figure><!-- /wp:image --><!-- wp:image {"sizeSlug":"large","linkDestination":"none"} --><figure class="wp-block-image size-large"><img src="http://google.com/hi.png" alt="Image gallery image" /></figure><!-- /wp:image --></figure>
-<!-- /wp:gallery -->
\ No newline at end of file
+<!-- wp:gallery {"columns":1,"linkTo":"none"} -->
+<figure class="wp-block-gallery has-nested-images columns-1 is-cropped"><!-- wp:image {"id":1421,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="Image gallery image" class="wp-image-1421"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":1440,"sizeSlug":"large","linkDestination":"none"} -->
+<figure class="wp-block-image size-large"><img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="Image gallery image" class="wp-image-1440"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
index 2970d60ced4f7..024adf2115e3b 100644
--- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html
@@ -1,15 +1,17 @@
 
-<figure class="is-layout-flex wp-block-gallery-1 wp-block-gallery has-nested-images is-cropped columns-1" >
-	
+<figure class="wp-block-gallery has-nested-images columns-1 is-cropped wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
 	<figure class="wp-block-image size-large">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="Image gallery image" />
+		<img data-id="1421"
+			src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190"
+			alt="Image gallery image"
+			class="wp-image-1421"
+		/>
 	</figure>
-	
-
-	
 	<figure class="wp-block-image size-large">
-		<img src="http://google.com/hi.png" alt="Image gallery image" />
+		<img data-id="1440"
+			src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580"
+			alt="Image gallery image"
+			class="wp-image-1440"
+		/>
 	</figure>
-	
 </figure>
-
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html
new file mode 100644
index 0000000000000..f982c52aa27cc
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.html
@@ -0,0 +1,10 @@
+<!-- wp:core/gallery {"columns":2,"align":"wide"} -->
+<div class="wp-block-gallery columns-2 is-cropped alignwide">
+	<figure class="blocks-gallery-image">
+		<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+	</figure>
+	<figure class="blocks-gallery-image">
+		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+	</figure>
+</div>
+<!-- /wp:core/gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json
new file mode 100644
index 0000000000000..9e15ee7f1c714
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.json
@@ -0,0 +1,35 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"columns": 2,
+			"imageCrop": true,
+			"linkTo": "none",
+			"align": "wide",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+					"alt": "title",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+					"alt": "title",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json
new file mode 100644
index 0000000000000..1f2ad33f724a0
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"columns": 2,
+			"align": "wide"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t</figure>\n</div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t</figure>\n</div>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html
new file mode 100644
index 0000000000000..d0210e6ab6796
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.serialized.html
@@ -0,0 +1,9 @@
+<!-- wp:gallery {"columns":2,"linkTo":"none","align":"wide"} -->
+<figure class="wp-block-gallery alignwide has-nested-images columns-2 is-cropped"><!-- wp:image {"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html
new file mode 100644
index 0000000000000..b75b284fc1b17
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-1.server.html
@@ -0,0 +1,9 @@
+
+<div class="wp-block-gallery columns-2 is-cropped alignwide wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<figure class="blocks-gallery-image">
+		<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+	</figure>
+	<figure class="blocks-gallery-image">
+		<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+	</figure>
+</div>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html
new file mode 100644
index 0000000000000..7ff72ee6bc605
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"columns":2,"align":"wide"} -->
+<ul class="wp-block-gallery columns-2 is-cropped alignwide">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" data-id="1" alt="title" class="wp-image-1" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" data-id="2" alt="title" class="wp-image-2" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json
new file mode 100644
index 0000000000000..a60776801eb33
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.json
@@ -0,0 +1,39 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"columns": 2,
+			"imageCrop": true,
+			"linkTo": "none",
+			"align": "wide",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+					"alt": "title",
+					"caption": "",
+					"id": 1,
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+					"alt": "title",
+					"caption": "",
+					"id": 2,
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json
new file mode 100644
index 0000000000000..84f1f77d5b702
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"columns": 2,
+			"align": "wide"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" data-id=\"1\" alt=\"title\" class=\"wp-image-1\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" data-id=\"2\" alt=\"title\" class=\"wp-image-2\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+		"innerContent": [
+			"\n<ul class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" data-id=\"1\" alt=\"title\" class=\"wp-image-1\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" data-id=\"2\" alt=\"title\" class=\"wp-image-2\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html
new file mode 100644
index 0000000000000..cab51d71a3be4
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.serialized.html
@@ -0,0 +1,9 @@
+<!-- wp:gallery {"columns":2,"linkTo":"none","align":"wide"} -->
+<figure class="wp-block-gallery alignwide has-nested-images columns-2 is-cropped"><!-- wp:image {"id":1,"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" class="wp-image-1"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":2,"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" class="wp-image-2"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html
new file mode 100644
index 0000000000000..399594ce5943e
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html
@@ -0,0 +1,13 @@
+
+<ul class="wp-block-gallery columns-2 is-cropped alignwide wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" data-id="1" alt="title" class="wp-image-1" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" data-id="2" alt="title" class="wp-image-2" />
+		</figure>
+	</li>
+</ul>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html
new file mode 100644
index 0000000000000..8b23e16a38a38
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.html
@@ -0,0 +1,14 @@
+<!-- wp:core/gallery {"ids":[null,null],"align":"wide"} -->
+<ul class="wp-block-gallery columns-2 is-cropped alignwide">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
+<!-- /wp:core/gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json
new file mode 100644
index 0000000000000..9ac2c197819ce
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.json
@@ -0,0 +1,36 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"imageCrop": true,
+			"linkTo": "none",
+			"align": "wide",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==",
+					"alt": "title",
+					"caption": "",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=",
+					"alt": "title",
+					"caption": "",
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json
new file mode 100644
index 0000000000000..cbb35065cfe34
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"ids": [ null, null ],
+			"align": "wide"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<ul class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n",
+		"innerContent": [
+			"\n<ul class=\"wp-block-gallery columns-2 is-cropped alignwide\">\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n\t<li class=\"blocks-gallery-item\">\n\t\t<figure>\n\t\t\t<img src=\"data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=\" alt=\"title\" />\n\t\t</figure>\n\t</li>\n</ul>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html
new file mode 100644
index 0000000000000..3cf2bb609deaf
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.serialized.html
@@ -0,0 +1,9 @@
+<!-- wp:gallery {"linkTo":"none","align":"wide"} -->
+<figure class="wp-block-gallery alignwide has-nested-images columns-default is-cropped"><!-- wp:image {"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html
new file mode 100644
index 0000000000000..e017c1a0c8c03
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html
@@ -0,0 +1,13 @@
+
+<ul class="wp-block-gallery columns-2 is-cropped alignwide wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACklEQVR4nGMAAQAABQABDQottAAAAABJRU5ErkJggg==" alt="title" />
+		</figure>
+	</li>
+	<li class="blocks-gallery-item">
+		<figure>
+			<img src="data:image/jpeg;base64,/9j/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/yQALCAABAAEBAREA/8wABgAQEAX/2gAIAQEAAD8A0s8g/9k=" alt="title" />
+		</figure>
+	</li>
+</ul>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html
new file mode 100644
index 0000000000000..2ec636839051f
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.html
@@ -0,0 +1,21 @@
+<!-- wp:gallery {"ids":["1421","1440","1362"],"align":"wide"} -->
+<figure class="wp-block-gallery columns-3 is-cropped alignwide">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="" data-id="1421" class="wp-image-1421"/>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="" data-id="1440" class="wp-image-1440"/>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580" alt="" data-id="1362" class="wp-image-1362"/>
+			</figure>
+		</li>
+	</ul>
+</figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json
new file mode 100644
index 0000000000000..dad150cc96b48
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.json
@@ -0,0 +1,51 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"caption": "",
+			"imageCrop": true,
+			"linkTo": "none",
+			"align": "wide",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190",
+					"alt": "",
+					"caption": "",
+					"id": 1421,
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580",
+					"alt": "",
+					"caption": "",
+					"id": 1440,
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580",
+					"alt": "",
+					"caption": "",
+					"id": 1362,
+					"linkDestination": "none"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json
new file mode 100644
index 0000000000000..04dc77f79980e
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"ids": [ "1421", "1440", "1362" ],
+			"align": "wide"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<figure class=\"wp-block-gallery columns-3 is-cropped alignwide\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\" alt=\"\" data-id=\"1421\" class=\"wp-image-1421\"/>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\" alt=\"\" data-id=\"1440\" class=\"wp-image-1440\"/>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580\" alt=\"\" data-id=\"1362\" class=\"wp-image-1362\"/>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-gallery columns-3 is-cropped alignwide\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190\" alt=\"\" data-id=\"1421\" class=\"wp-image-1421\"/>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580\" alt=\"\" data-id=\"1440\" class=\"wp-image-1440\"/>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<img src=\"https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580\" alt=\"\" data-id=\"1362\" class=\"wp-image-1362\"/>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html
new file mode 100644
index 0000000000000..7ecc6f852e99c
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.serialized.html
@@ -0,0 +1,13 @@
+<!-- wp:gallery {"linkTo":"none","align":"wide"} -->
+<figure class="wp-block-gallery alignwide has-nested-images columns-default is-cropped"><!-- wp:image {"id":1421,"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="" class="wp-image-1421"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":1440,"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="" class="wp-image-1440"/></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":1362,"linkDestination":"none"} -->
+<figure class="wp-block-image"><img src="https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580" alt="" class="wp-image-1362"/></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html
new file mode 100644
index 0000000000000..b835e5f1ab6a8
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html
@@ -0,0 +1,20 @@
+
+<figure class="wp-block-gallery columns-3 is-cropped alignwide wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2016/09/cropped-img_9054-1.jpg?w=190" alt="" data-id="1421" class="wp-image-1421"/>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2017/09/cropped-l1001498-1.jpg?w=580" alt="" data-id="1440" class="wp-image-1440"/>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<img src="https://sergioestevaofolio.files.wordpress.com/2017/05/cropped-l1005945-2-2.jpg?w=580" alt="" data-id="1362" class="wp-image-1362"/>
+			</figure>
+		</li>
+	</ul>
+</figure>
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html
new file mode 100644
index 0000000000000..d97624d43e0c3
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.html
@@ -0,0 +1,48 @@
+<!-- wp:gallery {"ids":[705,704,703],"linkTo":"media"} -->
+<figure class="wp-block-gallery columns-3 is-cropped">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"
+						alt=""
+						data-id="705"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+						data-link="http://wptest.local/classic/test-image-3/"
+						class="wp-image-705"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"
+						alt=""
+						data-id="704"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+						data-link="http://wptest.local/test-image-2/"
+						class="wp-image-704"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"
+						alt=""
+						data-id="703"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+						data-link="http://wptest.local/test-image/"
+						class="wp-image-703"
+					/>
+				</a>
+			</figure>
+		</li>
+	</ul>
+</figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json
new file mode 100644
index 0000000000000..9ef1f03ba0934
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.json
@@ -0,0 +1,57 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"caption": "",
+			"imageCrop": true,
+			"linkTo": "media",
+			"sizeSlug": "large",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json
new file mode 100644
index 0000000000000..f2680567d89f8
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"ids": [ 705, 704, 703 ],
+			"linkTo": "media"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<figure class=\"wp-block-gallery columns-3 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"705\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/classic/test-image-3/\"\n\t\t\t\t\t\tclass=\"wp-image-705\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"704\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image-2/\"\n\t\t\t\t\t\tclass=\"wp-image-704\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"703\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image/\"\n\t\t\t\t\t\tclass=\"wp-image-703\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-gallery columns-3 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"705\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/classic/test-image-3/\"\n\t\t\t\t\t\tclass=\"wp-image-705\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"704\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image-2/\"\n\t\t\t\t\t\tclass=\"wp-image-704\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\" >\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"703\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image/\"\n\t\t\t\t\t\tclass=\"wp-image-703\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html
new file mode 100644
index 0000000000000..74fb0a124f8d7
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.serialized.html
@@ -0,0 +1,13 @@
+<!-- wp:gallery {"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html
new file mode 100644
index 0000000000000..f69cf83abc9cf
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html
@@ -0,0 +1,48 @@
+
+<figure class="wp-block-gallery columns-3 is-cropped wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"
+						alt=""
+						data-id="705"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+						data-link="http://wptest.local/classic/test-image-3/"
+						class="wp-image-705"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"
+						alt=""
+						data-id="704"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+						data-link="http://wptest.local/test-image-2/"
+						class="wp-image-704"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a href="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg" >
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"
+						alt=""
+						data-id="703"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+						data-link="http://wptest.local/test-image/"
+						class="wp-image-703"
+					/>
+				</a>
+			</figure>
+		</li>
+	</ul>
+</figure>
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html
new file mode 100644
index 0000000000000..0dcf604233435
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.html
@@ -0,0 +1,54 @@
+<!-- wp:gallery {"ids":[705,704,703],"linkTo":"media"} -->
+<figure class="wp-block-gallery columns-3 is-cropped">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"
+						alt=""
+						data-id="705"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+						data-link="http://wptest.local/classic/test-image-3/"
+						class="wp-image-705"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"
+						alt=""
+						data-id="704"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+						data-link="http://wptest.local/test-image-2/"
+						class="wp-image-704"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"
+						alt=""
+						data-id="703"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+						data-link="http://wptest.local/test-image/"
+						class="wp-image-703"
+					/>
+				</a>
+			</figure>
+		</li>
+	</ul>
+</figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json
new file mode 100644
index 0000000000000..9ef1f03ba0934
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.json
@@ -0,0 +1,57 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"caption": "",
+			"imageCrop": true,
+			"linkTo": "media",
+			"sizeSlug": "large",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json
new file mode 100644
index 0000000000000..2b42128d658b0
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.parsed.json
@@ -0,0 +1,21 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"ids": [ 705, 704, 703 ],
+			"linkTo": "media"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<figure class=\"wp-block-gallery columns-3 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"705\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/classic/test-image-3/\"\n\t\t\t\t\t\tclass=\"wp-image-705\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"704\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image-2/\"\n\t\t\t\t\t\tclass=\"wp-image-704\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"703\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image/\"\n\t\t\t\t\t\tclass=\"wp-image-703\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-gallery columns-3 is-cropped\">\n\t<ul class=\"blocks-gallery-grid\">\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"705\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/classic/test-image-3/\"\n\t\t\t\t\t\tclass=\"wp-image-705\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"704\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image-2/\"\n\t\t\t\t\t\tclass=\"wp-image-704\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t\t<li class=\"blocks-gallery-item\">\n\t\t\t<figure>\n\t\t\t\t<a\n\t\t\t\t\thref=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t>\n\t\t\t\t\t<img\n\t\t\t\t\t\tsrc=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"\n\t\t\t\t\t\talt=\"\"\n\t\t\t\t\t\tdata-id=\"703\"\n\t\t\t\t\t\tdata-full-url=\"http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg\"\n\t\t\t\t\t\tdata-link=\"http://wptest.local/test-image/\"\n\t\t\t\t\t\tclass=\"wp-image-703\"\n\t\t\t\t\t/>\n\t\t\t\t</a>\n\t\t\t</figure>\n\t\t</li>\n\t</ul>\n</figure>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html
new file mode 100644
index 0000000000000..74fb0a124f8d7
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.serialized.html
@@ -0,0 +1,13 @@
+<!-- wp:gallery {"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html
new file mode 100644
index 0000000000000..7952cd8c488e3
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html
@@ -0,0 +1,54 @@
+
+<figure class="wp-block-gallery columns-3 is-cropped wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<ul class="blocks-gallery-grid">
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"
+						alt=""
+						data-id="705"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-scaled.jpg"
+						data-link="http://wptest.local/classic/test-image-3/"
+						class="wp-image-705"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"
+						alt=""
+						data-id="704"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-scaled.jpg"
+						data-link="http://wptest.local/test-image-2/"
+						class="wp-image-704"
+					/>
+				</a>
+			</figure>
+		</li>
+		<li class="blocks-gallery-item">
+			<figure>
+				<a
+					href="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+				>
+					<img
+						src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"
+						alt=""
+						data-id="703"
+						data-full-url="http://wptest.local/wp-content/uploads/2020/04/test-image-scaled.jpg"
+						data-link="http://wptest.local/test-image/"
+						class="wp-image-703"
+					/>
+				</a>
+			</figure>
+		</li>
+	</ul>
+</figure>
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html
new file mode 100644
index 0000000000000..61b70f3385fe8
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.html
@@ -0,0 +1,31 @@
+<!-- wp:gallery {"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped">
+	<!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+	<!-- /wp:image -->
+	
+	<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+	<!-- /wp:image -->
+	
+	<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+	<!-- /wp:image -->
+</figure>
+<!-- /wp:gallery -->
+<!-- wp:gallery {"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped">
+	<!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+	<!-- /wp:image -->
+	
+	<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+	<!-- /wp:image -->
+	
+	<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+	<!-- /wp:image -->
+	<figcaption class="blocks-gallery-caption">This gallery has a caption</figcaption>
+</figure>
+<!-- /wp:gallery -->
\ No newline at end of file
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json
new file mode 100644
index 0000000000000..4eaf85b46906d
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.json
@@ -0,0 +1,120 @@
+[
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"images": [],
+			"ids": [],
+			"shortCodeTransforms": [],
+			"caption": "",
+			"imageCrop": true,
+			"fixedHeight": true,
+			"linkTo": "media",
+			"sizeSlug": "large",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			}
+		]
+	},
+	{
+		"name": "core/gallery",
+		"isValid": true,
+		"attributes": {
+			"images": [],
+			"ids": [],
+			"shortCodeTransforms": [],
+			"caption": "This gallery has a caption",
+			"imageCrop": true,
+			"fixedHeight": true,
+			"linkTo": "media",
+			"sizeSlug": "large",
+			"allowResize": false
+		},
+		"innerBlocks": [
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg",
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg",
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/image",
+				"isValid": true,
+				"attributes": {
+					"url": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"alt": "",
+					"caption": "",
+					"href": "http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg",
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json
new file mode 100644
index 0000000000000..f59684073d158
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.parsed.json
@@ -0,0 +1,123 @@
+[
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"linkTo": "media"
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\" alt=\"\" class=\"wp-image-705\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\" alt=\"\" class=\"wp-image-705\"/></a></figure>\n\t"
+				]
+			},
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\" alt=\"\" class=\"wp-image-704\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\" alt=\"\" class=\"wp-image-704\"/></a></figure>\n\t"
+				]
+			},
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\" alt=\"\" class=\"wp-image-703\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\" alt=\"\" class=\"wp-image-703\"/></a></figure>\n\t"
+				]
+			}
+		],
+		"innerHTML": "\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped\">\n\t\n\t\n\t\n\t\n\t\n</figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped\">\n\t",
+			null,
+			"\n\t\n\t",
+			null,
+			"\n\t\n\t",
+			null,
+			"\n</figure>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n",
+		"innerContent": [ "\n" ]
+	},
+	{
+		"blockName": "core/gallery",
+		"attrs": {
+			"linkTo": "media"
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 705,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\" alt=\"\" class=\"wp-image-705\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg\" alt=\"\" class=\"wp-image-705\"/></a></figure>\n\t"
+				]
+			},
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 704,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\" alt=\"\" class=\"wp-image-704\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg\" alt=\"\" class=\"wp-image-704\"/></a></figure>\n\t"
+				]
+			},
+			{
+				"blockName": "core/image",
+				"attrs": {
+					"id": 703,
+					"sizeSlug": "large",
+					"linkDestination": "media"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\" alt=\"\" class=\"wp-image-703\"/></a></figure>\n\t",
+				"innerContent": [
+					"\n\t<figure class=\"wp-block-image size-large\"><a href=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\"><img src=\"http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg\" alt=\"\" class=\"wp-image-703\"/></a></figure>\n\t"
+				]
+			}
+		],
+		"innerHTML": "\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped\">\n\t\n\t\n\t\n\t\n\t\n\t<figcaption class=\"blocks-gallery-caption\">This gallery has a caption</figcaption>\n</figure>\n",
+		"innerContent": [
+			"\n<figure class=\"wp-block-gallery has-nested-images columns-default is-cropped\">\n\t",
+			null,
+			"\n\t\n\t",
+			null,
+			"\n\t\n\t",
+			null,
+			"\n\t<figcaption class=\"blocks-gallery-caption\">This gallery has a caption</figcaption>\n</figure>\n"
+		]
+	}
+]
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html
new file mode 100644
index 0000000000000..0aed527cce98c
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.serialized.html
@@ -0,0 +1,27 @@
+<!-- wp:gallery {"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+<!-- /wp:image --></figure>
+<!-- /wp:gallery -->
+
+<!-- wp:gallery {"ids":[],"shortCodeTransforms":[],"linkTo":"media"} -->
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped"><!-- wp:image {"id":705,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":704,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+<!-- /wp:image -->
+
+<!-- wp:image {"id":703,"sizeSlug":"large","linkDestination":"media"} -->
+<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+<!-- /wp:image --><figcaption class="blocks-gallery-caption wp-element-caption">This gallery has a caption</figcaption></figure>
+<!-- /wp:gallery -->
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html
new file mode 100644
index 0000000000000..b522543d92a29
--- /dev/null
+++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html
@@ -0,0 +1,15 @@
+
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img data-id="705" src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img data-id="704" src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+		<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img data-id="703" src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+</figure>
+
+
+<figure class="wp-block-gallery has-nested-images columns-default is-cropped wp-block-gallery-1 is-layout-flex wp-block-gallery-is-layout-flex">
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg"><img data-id="705" src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1-682x1024.jpg" alt="" class="wp-image-705"/></a></figure>
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg"><img data-id="704" src="http://wptest.local/wp-content/uploads/2020/09/test-image-edited-1024x682.jpg" alt="" class="wp-image-704"/></a></figure>
+	<figure class="wp-block-image size-large"><a href="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg"><img data-id="703" src="http://wptest.local/wp-content/uploads/2020/04/test-image-1024x683.jpg" alt="" class="wp-image-703"/></a></figure>
+	<figcaption class="blocks-gallery-caption">This gallery has a caption</figcaption>
+</figure>
+
diff --git a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
index b67b8225a5aa2..1b47cd7b0bca6 100644
--- a/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__heading__h2-em.server.html
@@ -1,3 +1,3 @@
 
-<h2>The <em>Inserter</em> Tool</h2>
+<h2 class="wp-block-heading">The <em>Inserter</em> Tool</h2>
 
diff --git a/tests/phpunit/data/blocks/fixtures/core__heading__h2.server.html b/tests/phpunit/data/blocks/fixtures/core__heading__h2.server.html
index d0ea06ef06c62..b99dc3b87d034 100644
--- a/tests/phpunit/data/blocks/fixtures/core__heading__h2.server.html
+++ b/tests/phpunit/data/blocks/fixtures/core__heading__h2.server.html
@@ -1,3 +1,3 @@
 
-<h2>A picture is worth a thousand words, or so the saying goes</h2>
+<h2 class="wp-block-heading">A picture is worth a thousand words, or so the saying goes</h2>
 
diff --git a/tests/phpunit/data/blocks/notice/block.json b/tests/phpunit/data/blocks/notice/block.json
index 9d2fadfb5dc86..c3a3b4dde9513 100644
--- a/tests/phpunit/data/blocks/notice/block.json
+++ b/tests/phpunit/data/blocks/notice/block.json
@@ -27,6 +27,9 @@
 			"type": "string"
 		}
 	},
+	"selectors": {
+		"root": ".wp-block-notice"
+	},
 	"supports": {
 		"align": true,
 		"lightBlockWrapper": true
diff --git a/tests/phpunit/data/blocks/pattern-directory/browse-all.json b/tests/phpunit/data/blocks/pattern-directory/browse-all.json
index 8d0d2d4ba3522..27dca1b4b3886 100644
--- a/tests/phpunit/data/blocks/pattern-directory/browse-all.json
+++ b/tests/phpunit/data/blocks/pattern-directory/browse-all.json
@@ -10,7 +10,8 @@
 			"spay_email": "",
 			"wpop_description": "A heading preceded by a chapter number, and followed by a paragraph.",
 			"wpop_keywords": "blog post",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": [ "core/heading" ]
 		},
 		"category_slugs": [ "text" ],
 		"keyword_slugs": [ "core" ],
@@ -27,7 +28,8 @@
 			"spay_email": "",
 			"wpop_description": "A large hero section with an example background image and a heading in the center.",
 			"wpop_keywords": "header, hero",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "header" ],
 		"keyword_slugs": [ "core" ],
@@ -44,7 +46,8 @@
 			"spay_email": "",
 			"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
 			"wpop_keywords": "call to action, hero section",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "header" ],
 		"keyword_slugs": [ "core" ],
diff --git a/tests/phpunit/data/blocks/pattern-directory/browse-category-2.json b/tests/phpunit/data/blocks/pattern-directory/browse-category-2.json
index 1fce1a0f80f92..f5d4b289db72c 100644
--- a/tests/phpunit/data/blocks/pattern-directory/browse-category-2.json
+++ b/tests/phpunit/data/blocks/pattern-directory/browse-category-2.json
@@ -10,7 +10,8 @@
 			"spay_email": "",
 			"wpop_description": "Three filled buttons with rounded corners, side by side.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 600
+			"wpop_viewport_width": 600,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "buttons" ],
 		"keyword_slugs": [ "core" ],
@@ -27,7 +28,8 @@
 			"spay_email": "",
 			"wpop_description": "Two buttons, one filled and one outlined, side by side.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 500
+			"wpop_viewport_width": 500,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "buttons" ],
 		"keyword_slugs": [ "core" ],
diff --git a/tests/phpunit/data/blocks/pattern-directory/browse-keyword-11.json b/tests/phpunit/data/blocks/pattern-directory/browse-keyword-11.json
index 383d7eff61f94..360dcdfb84b3c 100644
--- a/tests/phpunit/data/blocks/pattern-directory/browse-keyword-11.json
+++ b/tests/phpunit/data/blocks/pattern-directory/browse-keyword-11.json
@@ -10,7 +10,8 @@
 			"spay_email": "",
 			"wpop_description": "A heading preceded by a chapter number, and followed by a paragraph.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "text" ],
 		"keyword_slugs": [ "core" ],
@@ -27,7 +28,8 @@
 			"spay_email": "",
 			"wpop_description": "A large hero section with an example background image and a heading in the center.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "header" ],
 		"keyword_slugs": [ "core" ],
@@ -44,7 +46,8 @@
 			"spay_email": "",
 			"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "header" ],
 		"keyword_slugs": [ "core" ],
diff --git a/tests/phpunit/data/blocks/pattern-directory/search-button.json b/tests/phpunit/data/blocks/pattern-directory/search-button.json
index 10e5c6036fa8d..4a6f86de8a44b 100644
--- a/tests/phpunit/data/blocks/pattern-directory/search-button.json
+++ b/tests/phpunit/data/blocks/pattern-directory/search-button.json
@@ -10,7 +10,8 @@
 			"spay_email": "",
 			"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "header" ],
 		"keyword_slugs": [ "core" ],
@@ -27,7 +28,8 @@
 			"spay_email": "",
 			"wpop_description": "Three small columns of text, each with an outlined button with rounded corners at the bottom.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 1000
+			"wpop_viewport_width": 1000,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "columns" ],
 		"keyword_slugs": [ "core" ],
@@ -44,7 +46,8 @@
 			"spay_email": "",
 			"wpop_description": "Three filled buttons with rounded corners, side by side.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 600
+			"wpop_viewport_width": 600,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "buttons" ],
 		"keyword_slugs": [ "core" ],
@@ -61,7 +64,8 @@
 			"spay_email": "",
 			"wpop_description": "Two buttons, one filled and one outlined, side by side.",
 			"wpop_keywords": "",
-			"wpop_viewport_width": 500
+			"wpop_viewport_width": 500,
+			"wpop_block_types": []
 		},
 		"category_slugs": [ "buttons" ],
 		"keyword_slugs": [ "core" ],
diff --git a/tests/phpunit/data/feed/wordpress-org-news.xml b/tests/phpunit/data/feed/wordpress-org-news.xml
index 1173c71bd74a7..75ca75f0a145f 100644
--- a/tests/phpunit/data/feed/wordpress-org-news.xml
+++ b/tests/phpunit/data/feed/wordpress-org-news.xml
@@ -843,7 +843,7 @@
 
 
 
-<ul><li>The <a href="https://make.wordpress.org/updates/2020/10/20/quarterly-updates-q3-2020/">Q3 2020 update</a> from the WordPress project is now out!</li><li>The <a href="https://make.wordpress.org/marketing/">WordPress Marketing team</a> has put together a list of <a href="https://github.com/wpmarketingteam/WP5.5">WordPress 5.5 marketing resources</a> consisting of video presentations, slides, questions &amp; answers, social media posts, and more &#8211; aimed at both developers and non-developers. The team has also prepared a list of <a href="https://www.youtube.com/playlist?list=PLCVEqsAbLffcS1Rx-COZ5CZBOmXZJEe6k">captioned screen-recordings</a> in several languages to aid new contributors. Contact the team on the <a href="https://wordpress.slack.com/archives/C0GKJ7TFA">#marketing</a> channel if you would like to contribute to these and upcoming projects.&nbsp;</li><li>The <a href="https://make.wordpress.org/core">WordPress Core team</a> has <a href="https://make.wordpress.org/core/2020/09/23/proposal-rest-api-authentication-application-passwords/">announced a proposal</a> to introduce application passwords for REST API integrations.</li><li>Five online WordCamps took place in October: <a href="https://2020.rochester.wordcamp.org/">WordCamp Rochester, NY</a>, <a href="https://austin.wordcamp.org/2020/">WordCamp Austin, TX</a>, <a href="https://2020.italia.wordcamp.org/">WordCamp Italia Online</a>, <a href="https://la.wordcamp.org/2020/">WordCamp Los Angeles, CA</a>, and <a href="https://bulgaria.wordcamp.org/2020/">WordCamp Bulgaria Online</a>. You can find livestream recaps of these camps on their websites. The camps are also in the process of uploading their videos to <a href="https://wordpress.tv/">WordPress.tv</a>. Check out the <a href="https://central.wordcamp.org/schedule/">WordCamp Schedule</a> to catch up with upcoming online WordCamps.</li><li>Contributor teams have started work on <a href="https://make.wordpress.org/core/2020/10/22/twenty-twenty-one-dark-mode-discussion/">adding dark mode support for the Twenty Twenty One theme</a>. Additionally, the development of the <a href="https://make.wordpress.org/themes/2020/10/23/developing-the-full-site-editing-version-of-twenty-twenty-one/">Full Site Editing version of Twenty Twenty One</a> has also kicked-off in the <a href="https://github.com/WordPress/theme-experiments/tree/master/twentytwentyone-blocks">Theme Experiments GitHub repository</a>.</li><li><a href="https://buddypress.org/2020/10/buddypress-7-0-0-beta1/">BuddyPress 7.0 beta</a>, which comes with new administration screens, blocks, and improved CLI support &#8211; is now available!&nbsp;</li><li>The Core team is <a href="https://make.wordpress.org/core/2020/10/06/revisiting-starter-content-on-org-and-beyond/">revisiting starter content for WordPress themes</a> as part of the 5.6 release. The team also decided not to ship the widgets screen in WordPress 5.6 and have started discussions on <a href="https://make.wordpress.org/core/2020/10/29/discussion-align-the-wordpress-release-cycle-with-the-industry-standard/">aligning the WordPress release cycle with industry standards</a>.</li><li>WordPress Accessibility enthusiasts all over the world joined hands for the first ever 24 hour <a href="https://wpaccessibilityday.org/">WP Accessibility day</a> event on Oct. 2. You can find the recorded livestream of the event on its <a href="https://www.youtube.com/channel/UCes9XCUZd51CAigbBEGlfNg/featured?view_as=subscriber">YouTube channel</a>.</li><li>The <a href="https://make.wordpress.org/meta">Meta</a> team has <a href="https://make.wordpress.org/meta/2020/10/27/block-pattern-directory-ideas-and-discussion/">kicked off a discussion</a> on setting up a <a href="https://developer.wordpress.org/block-editor/developers/block-api/block-patterns/">Block pattern</a> directory (similar to the <a href="https://wordpress.org/support/article/block-directory/">existing block directory</a>).&nbsp;</li><li>The <a href="https://make.wordpress.org/themes">Themes</a> team has published a post clarifying <a href="https://make.wordpress.org/themes/2020/10/07/block-based-themes-and-wordpress-5-6/">how Block based themes will work with WordPress 5.6</a>. Check out the <a href="https://developer.wordpress.org/block-editor/tutorials/block-based-themes/">block-based theme tutorial</a> and its <a href="https://github.com/WordPress/gutenberg/blob/master/docs/designers-developers/developers/themes/block-based-themes.md">documentation</a> to learn how to build block-based themes.&nbsp;</li></ul>
+<ul><li>The <a href="https://make.wordpress.org/updates/2020/10/20/quarterly-updates-q3-2020/">Q3 2020 update</a> from the WordPress project is now out!</li><li>The <a href="https://make.wordpress.org/marketing/">WordPress Marketing team</a> has put together a list of <a href="https://github.com/wpmarketingteam/WP5.5">WordPress 5.5 marketing resources</a> consisting of video presentations, slides, questions &amp; answers, social media posts, and more &#8211; aimed at both developers and non-developers. The team has also prepared a list of <a href="https://www.youtube.com/playlist?list=PLCVEqsAbLffcS1Rx-COZ5CZBOmXZJEe6k">captioned screen-recordings</a> in several languages to aid new contributors. Contact the team on the <a href="https://wordpress.slack.com/archives/C0GKJ7TFA">#marketing</a> channel if you would like to contribute to these and upcoming projects.&nbsp;</li><li>The <a href="https://make.wordpress.org/core">WordPress Core team</a> has <a href="https://make.wordpress.org/core/2020/09/23/proposal-rest-api-authentication-application-passwords/">announced a proposal</a> to introduce application passwords for REST API integrations.</li><li>Five online WordCamps took place in October: <a href="https://2020.rochester.wordcamp.org/">WordCamp Rochester, NY</a>, <a href="https://austin.wordcamp.org/2020/">WordCamp Austin, TX</a>, <a href="https://2020.italia.wordcamp.org/">WordCamp Italia Online</a>, <a href="https://la.wordcamp.org/2020/">WordCamp Los Angeles, CA</a>, and <a href="https://bulgaria.wordcamp.org/2020/">WordCamp Bulgaria Online</a>. You can find livestream recaps of these camps on their websites. The camps are also in the process of uploading their videos to <a href="https://wordpress.tv/">WordPress.tv</a>. Check out the <a href="https://central.wordcamp.org/schedule/">WordCamp Schedule</a> to catch up with upcoming online WordCamps.</li><li>Contributor teams have started work on <a href="https://make.wordpress.org/core/2020/10/22/twenty-twenty-one-dark-mode-discussion/">adding dark mode support for the Twenty Twenty One theme</a>. Additionally, the development of the <a href="https://make.wordpress.org/themes/2020/10/23/developing-the-full-site-editing-version-of-twenty-twenty-one/">Full Site Editing version of Twenty Twenty One</a> has also kicked-off in the <a href="https://github.com/WordPress/theme-experiments/tree/master/twentytwentyone-blocks">Theme Experiments GitHub repository</a>.</li><li><a href="https://buddypress.org/2020/10/buddypress-7-0-0-beta1/">BuddyPress 7.0 beta</a>, which comes with new administration screens, blocks, and improved CLI support &#8211; is now available!&nbsp;</li><li>The Core team is <a href="https://make.wordpress.org/core/2020/10/06/revisiting-starter-content-on-org-and-beyond/">revisiting starter content for WordPress themes</a> as part of the 5.6 release. The team also decided not to ship the widgets screen in WordPress 5.6 and have started discussions on <a href="https://make.wordpress.org/core/2020/10/29/discussion-align-the-wordpress-release-cycle-with-the-industry-standard/">aligning the WordPress release cycle with industry standards</a>.</li><li>WordPress Accessibility enthusiasts all over the world joined hands for the first ever 24 hour <a href="https://wpaccessibilityday.org/">WP Accessibility day</a> event on Oct. 2. You can find the recorded livestream of the event on its <a href="https://www.youtube.com/channel/UCes9XCUZd51CAigbBEGlfNg/featured?view_as=subscriber">YouTube channel</a>.</li><li>The <a href="https://make.wordpress.org/meta">Meta</a> team has <a href="https://make.wordpress.org/meta/2020/10/27/block-pattern-directory-ideas-and-discussion/">kicked off a discussion</a> on setting up a <a href="https://developer.wordpress.org/block-editor/developers/block-api/block-patterns/">Block pattern</a> directory (similar to the <a href="https://wordpress.org/documentation/article/block-directory/">existing block directory</a>).&nbsp;</li><li>The <a href="https://make.wordpress.org/themes">Themes</a> team has published a post clarifying <a href="https://make.wordpress.org/themes/2020/10/07/block-based-themes-and-wordpress-5-6/">how Block based themes will work with WordPress 5.6</a>. Check out the <a href="https://developer.wordpress.org/block-editor/tutorials/block-based-themes/">block-based theme tutorial</a> and its <a href="https://github.com/WordPress/gutenberg/blob/master/docs/designers-developers/developers/themes/block-based-themes.md">documentation</a> to learn how to build block-based themes.&nbsp;</li></ul>
 
 
 
diff --git a/tests/phpunit/data/images/test-alpha.pdf b/tests/phpunit/data/images/test-alpha.pdf
new file mode 100644
index 0000000000000..1cbd4686e7e23
Binary files /dev/null and b/tests/phpunit/data/images/test-alpha.pdf differ
diff --git a/tests/phpunit/data/images/test-square-150.jpg b/tests/phpunit/data/images/test-square-150.jpg
new file mode 100644
index 0000000000000..eb6009226703f
Binary files /dev/null and b/tests/phpunit/data/images/test-square-150.jpg differ
diff --git a/tests/phpunit/data/themedir1/block-theme-child-no-theme-json/style.css b/tests/phpunit/data/themedir1/block-theme-child-no-theme-json/style.css
new file mode 100644
index 0000000000000..344441288258e
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-child-no-theme-json/style.css
@@ -0,0 +1,8 @@
+/*
+Theme Name: Block Theme Child with no theme.json
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: block-theme
+Version: 1.0.0
+Text Domain: block-theme-child-no-theme-json
+*/
diff --git a/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css b/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css
new file mode 100644
index 0000000000000..ae4ca9fd837ad
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/style.css
@@ -0,0 +1,8 @@
+/*
+Theme Name: Block Theme Child Theme With Fluid Typography Config
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: block-theme
+Version: 1.0.0
+Text Domain: block-theme-child-with-fluid-typography
+*/
diff --git a/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json b/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
new file mode 100644
index 0000000000000..73864f2920039
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-child-with-fluid-typography-config/theme.json
@@ -0,0 +1,14 @@
+{
+	"version": 2,
+	"settings": {
+		"appearanceTools": true,
+		"layout": {
+			"wideSize": "1000px"
+		},
+		"typography": {
+			"fluid": {
+				"minFontSize": "16px"
+			}
+		}
+	}
+}
diff --git a/tests/phpunit/data/themedir1/block-theme-child/styles/variation-b.json b/tests/phpunit/data/themedir1/block-theme-child/styles/variation-b.json
new file mode 100644
index 0000000000000..0a8a4fcab99f6
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-child/styles/variation-b.json
@@ -0,0 +1,18 @@
+{
+	"version": 2,
+	"settings": {
+		"blocks": {
+			"core/post-title": {
+				"color": {
+					"palette": [
+						{
+							"slug": "dark",
+							"name": "Dark",
+							"color": "#010101"
+						}
+					]
+				}
+			}
+		}
+	}
+}
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/index.php b/tests/phpunit/data/themedir1/block-theme-non-latin/index.php
new file mode 100644
index 0000000000000..589adcefcd0f2
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/index.php
@@ -0,0 +1,4 @@
+<?php
+/**
+ * Block theme.
+ */
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/page-1.php b/tests/phpunit/data/themedir1/block-theme-non-latin/page-1.php
new file mode 100644
index 0000000000000..eafbb1b6e854b
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/page-1.php
@@ -0,0 +1,3 @@
+<?php
+
+echo 'PHP template for page with ID 1';
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/parts/small-header-test.html b/tests/phpunit/data/themedir1/block-theme-non-latin/parts/small-header-test.html
new file mode 100644
index 0000000000000..5c18e98125793
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/parts/small-header-test.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>Small Header Template Part</p>
+<!-- /wp:paragraph -->
\ No newline at end of file
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/style.css b/tests/phpunit/data/themedir1/block-theme-non-latin/style.css
new file mode 100644
index 0000000000000..4de5f009a5dd5
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/style.css
@@ -0,0 +1,7 @@
+/*
+Theme Name: Block Theme Non Latin
+Theme URI: https://wordpress.org/
+Description: Has different characters in theme directory name for testing purposes.
+Version: 0.0.1
+Text Domain: block-theme
+*/
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/templates/page-test.html b/tests/phpunit/data/themedir1/block-theme-non-latin/templates/page-test.html
new file mode 100644
index 0000000000000..1aca9fe8abc1f
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/templates/page-test.html
@@ -0,0 +1,3 @@
+<!-- wp:paragraph -->
+<p>(测试) Page Template</p>
+<!-- /wp:paragraph -->
diff --git a/tests/phpunit/data/themedir1/block-theme-non-latin/theme.json b/tests/phpunit/data/themedir1/block-theme-non-latin/theme.json
new file mode 100644
index 0000000000000..f0c59a63ab281
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme-non-latin/theme.json
@@ -0,0 +1,80 @@
+{
+	"version": 1,
+	"settings": {
+		"color": {
+			"palette": [
+				{
+					"slug": "light",
+					"name": "Light",
+					"color": "#f5f7f9"
+				},
+				{
+					"slug": "dark",
+					"name": "Dark",
+					"color": "#000"
+				}
+			],
+			"gradients": [
+				{
+					"name": "Custom gradient",
+					"gradient": "linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%)",
+					"slug": "custom-gradient"
+				}
+			],
+			"custom": false,
+			"customGradient": false
+		},
+		"typography": {
+			"fontSizes": [
+				{
+					"name": "Custom",
+					"slug": "custom",
+					"size": "100px"
+				}
+			],
+			"customFontSize": false,
+			"customLineHeight": true
+		},
+		"spacing": {
+			"units": [
+				"rem"
+			],
+			"customPadding": true
+		},
+		"blocks": {
+			"core/paragraph": {
+				"color": {
+					"palette": [
+						{
+							"slug": "light",
+							"name": "Light",
+							"color": "#f5f7f9"
+						}
+					]
+				}
+			}
+		}
+	},
+	"customTemplates": [
+		{
+			"name": "page-τεστ",
+			"title": "Homepage template"
+		},
+		{
+			"name": "page-测试",
+			"title": "Homepage template"
+		}
+	],
+	"templateParts": [
+		{
+			"name": "small-header-τεστ",
+			"title": "Small Header",
+			"area": "header"
+		},
+		{
+			"name": "small-header-测试",
+			"title": "Small Header",
+			"area": "header"
+		},
+	]
+}
diff --git a/tests/phpunit/data/themedir1/block-theme/styles/variation-b.json b/tests/phpunit/data/themedir1/block-theme/styles/variation-b.json
new file mode 100644
index 0000000000000..340198ffe0b65
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme/styles/variation-b.json
@@ -0,0 +1,18 @@
+{
+	"version": 2,
+	"settings": {
+		"blocks": {
+			"core/post-title": {
+				"color": {
+					"palette": [
+						{
+							"slug": "light",
+							"name": "Light",
+							"color": "#f1f1f1"
+						}
+					]
+				}
+			}
+		}
+	}
+}
diff --git a/tests/phpunit/data/themedir1/block-theme/templates/single.html b/tests/phpunit/data/themedir1/block-theme/templates/single.html
new file mode 100644
index 0000000000000..4ad4c7caec0d1
--- /dev/null
+++ b/tests/phpunit/data/themedir1/block-theme/templates/single.html
@@ -0,0 +1,2 @@
+<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"bottom":"var:preset|spacing|40"}}}} /-->
+<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
diff --git a/tests/phpunit/data/themedir1/block-theme/theme.json b/tests/phpunit/data/themedir1/block-theme/theme.json
index d023faec53125..982ad8ca39f0e 100644
--- a/tests/phpunit/data/themedir1/block-theme/theme.json
+++ b/tests/phpunit/data/themedir1/block-theme/theme.json
@@ -73,6 +73,13 @@
 			"my/third-party-block": {
 				"color": {
 					"background": "hotpink"
+				},
+				"elements": {
+					"cite": {
+						"color": {
+							"text": "white"
+						}
+					}
 				}
 			}
 		},
@@ -124,4 +131,4 @@
 			"area": "header"
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/tests/phpunit/data/themedir1/default-child-no-theme-json/style.css b/tests/phpunit/data/themedir1/default-child-no-theme-json/style.css
new file mode 100644
index 0000000000000..8f971990d9fec
--- /dev/null
+++ b/tests/phpunit/data/themedir1/default-child-no-theme-json/style.css
@@ -0,0 +1,8 @@
+/*
+Theme Name: Default Child Theme with no theme.json
+Theme URI: https://wordpress.org/
+Description: For testing purposes only.
+Template: default
+Version: 1.0.0
+Text Domain: default-child-no-theme-json
+*/
diff --git a/tests/phpunit/includes/abstract-testcase.php b/tests/phpunit/includes/abstract-testcase.php
index 38f846e54181b..129943f27456d 100644
--- a/tests/phpunit/includes/abstract-testcase.php
+++ b/tests/phpunit/includes/abstract-testcase.php
@@ -142,15 +142,18 @@ public function set_up() {
 	 * After a test method runs, resets any state in WordPress the test method might have changed.
 	 */
 	public function tear_down() {
-		global $wpdb, $wp_query, $wp;
+		global $wpdb, $wp_the_query, $wp_query, $wp;
 		$wpdb->query( 'ROLLBACK' );
 		if ( is_multisite() ) {
 			while ( ms_is_switched() ) {
 				restore_current_blog();
 			}
 		}
-		$wp_query = new WP_Query();
-		$wp       = new WP();
+
+		// Reset query, main query, and WP globals similar to wp-settings.php.
+		$wp_the_query = new WP_Query();
+		$wp_query     = $wp_the_query;
+		$wp           = new WP();
 
 		// Reset globals related to the post loop and `setup_postdata()`.
 		$post_globals = array( 'post', 'id', 'authordata', 'currentday', 'currentmonth', 'page', 'pages', 'multipage', 'more', 'numpages' );
@@ -194,6 +197,8 @@ public function tear_down() {
 		remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
 		$this->_restore_hooks();
 		wp_set_current_user( 0 );
+
+		$this->reset_lazyload_queue();
 	}
 
 	/**
@@ -272,6 +277,16 @@ public function skipTestOnTimeout( $response ) {
 
 	}
 
+	/**
+	 * Reset the lazy load meta queue.
+	 */
+	protected function reset_lazyload_queue() {
+		$lazyloader = wp_metadata_lazyloader();
+		$lazyloader->reset_queue( 'term' );
+		$lazyloader->reset_queue( 'comment' );
+		$lazyloader->reset_queue( 'blog' );
+	}
+
 	/**
 	 * Unregisters existing post types and register defaults.
 	 *
@@ -319,47 +334,55 @@ protected function reset__SERVER() {
 	}
 
 	/**
-	 * Saves the action and filter-related globals so they can be restored later.
+	 * Saves the hook-related globals so they can be restored later.
 	 *
-	 * Stores $wp_actions, $wp_current_filter, and $wp_filter on a class variable
-	 * so they can be restored on tearDown() using _restore_hooks().
+	 * Stores $wp_filter, $wp_actions, $wp_filters, and $wp_current_filter
+	 * on a class variable so they can be restored on tear_down() using _restore_hooks().
 	 *
+	 * @global array $wp_filter
 	 * @global array $wp_actions
+	 * @global array $wp_filters
 	 * @global array $wp_current_filter
-	 * @global array $wp_filter
 	 */
 	protected function _backup_hooks() {
-		$globals = array( 'wp_actions', 'wp_current_filter' );
-		foreach ( $globals as $key ) {
-			self::$hooks_saved[ $key ] = $GLOBALS[ $key ];
-		}
 		self::$hooks_saved['wp_filter'] = array();
+
 		foreach ( $GLOBALS['wp_filter'] as $hook_name => $hook_object ) {
 			self::$hooks_saved['wp_filter'][ $hook_name ] = clone $hook_object;
 		}
+
+		$globals = array( 'wp_actions', 'wp_filters', 'wp_current_filter' );
+
+		foreach ( $globals as $key ) {
+			self::$hooks_saved[ $key ] = $GLOBALS[ $key ];
+		}
 	}
 
 	/**
-	 * Restores the hook-related globals to their state at setUp()
+	 * Restores the hook-related globals to their state at set_up()
 	 * so that future tests aren't affected by hooks set during this last test.
 	 *
+	 * @global array $wp_filter
 	 * @global array $wp_actions
+	 * @global array $wp_filters
 	 * @global array $wp_current_filter
-	 * @global array $wp_filter
 	 */
 	protected function _restore_hooks() {
-		$globals = array( 'wp_actions', 'wp_current_filter' );
-		foreach ( $globals as $key ) {
-			if ( isset( self::$hooks_saved[ $key ] ) ) {
-				$GLOBALS[ $key ] = self::$hooks_saved[ $key ];
-			}
-		}
 		if ( isset( self::$hooks_saved['wp_filter'] ) ) {
 			$GLOBALS['wp_filter'] = array();
+
 			foreach ( self::$hooks_saved['wp_filter'] as $hook_name => $hook_object ) {
 				$GLOBALS['wp_filter'][ $hook_name ] = clone $hook_object;
 			}
 		}
+
+		$globals = array( 'wp_actions', 'wp_filters', 'wp_current_filter' );
+
+		foreach ( $globals as $key ) {
+			if ( isset( self::$hooks_saved[ $key ] ) ) {
+				$GLOBALS[ $key ] = self::$hooks_saved[ $key ];
+			}
+		}
 	}
 
 	/**
@@ -368,12 +391,9 @@ protected function _restore_hooks() {
 	public static function flush_cache() {
 		global $wp_object_cache;
 
-		$wp_object_cache->group_ops      = array();
-		$wp_object_cache->stats          = array();
-		$wp_object_cache->memcache_debug = array();
-		$wp_object_cache->cache          = array();
+		wp_cache_flush_runtime();
 
-		if ( method_exists( $wp_object_cache, '__remoteset' ) ) {
+		if ( is_object( $wp_object_cache ) && method_exists( $wp_object_cache, '__remoteset' ) ) {
 			$wp_object_cache->__remoteset();
 		}
 
@@ -387,21 +407,23 @@ public static function flush_cache() {
 				'blog_meta',
 				'global-posts',
 				'networks',
+				'network-queries',
 				'sites',
 				'site-details',
 				'site-options',
+				'site-queries',
 				'site-transient',
 				'rss',
 				'users',
+				'user-queries',
+				'user_meta',
 				'useremail',
 				'userlogins',
-				'usermeta',
-				'user_meta',
 				'userslugs',
 			)
 		);
 
-		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins', 'theme_json' ) );
 	}
 
 	/**
@@ -546,12 +568,14 @@ public function expectDeprecated() {
 
 		add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ), 10, 3 );
 		add_action( 'deprecated_argument_run', array( $this, 'deprecated_function_run' ), 10, 3 );
+		add_action( 'deprecated_class_run', array( $this, 'deprecated_function_run' ), 10, 3 );
 		add_action( 'deprecated_file_included', array( $this, 'deprecated_function_run' ), 10, 4 );
 		add_action( 'deprecated_hook_run', array( $this, 'deprecated_function_run' ), 10, 4 );
 		add_action( 'doing_it_wrong_run', array( $this, 'doing_it_wrong_run' ), 10, 3 );
 
 		add_action( 'deprecated_function_trigger_error', '__return_false' );
 		add_action( 'deprecated_argument_trigger_error', '__return_false' );
+		add_action( 'deprecated_class_trigger_error', '__return_false' );
 		add_action( 'deprecated_file_trigger_error', '__return_false' );
 		add_action( 'deprecated_hook_trigger_error', '__return_false' );
 		add_action( 'doing_it_wrong_trigger_error', '__return_false' );
@@ -682,26 +706,26 @@ public function setExpectedException( $exception, $message = '', $code = null )
 	 * @since 3.7.0
 	 * @since 6.1.0 Added the `$replacement`, `$version`, and `$message` parameters.
 	 *
-	 * @param string $function    The deprecated function.
-	 * @param string $replacement The function that should have been called.
-	 * @param string $version     The version of WordPress that deprecated the function.
-	 * @param string $message     Optional. A message regarding the change.
+	 * @param string $function_name The deprecated function.
+	 * @param string $replacement   The function that should have been called.
+	 * @param string $version       The version of WordPress that deprecated the function.
+	 * @param string $message       Optional. A message regarding the change.
 	 */
-	public function deprecated_function_run( $function, $replacement, $version, $message = '' ) {
-		if ( ! isset( $this->caught_deprecated[ $function ] ) ) {
+	public function deprecated_function_run( $function_name, $replacement, $version, $message = '' ) {
+		if ( ! isset( $this->caught_deprecated[ $function_name ] ) ) {
 			switch ( current_action() ) {
 				case 'deprecated_function_run':
 					if ( $replacement ) {
 						$message = sprintf(
 							'Function %1$s is deprecated since version %2$s! Use %3$s instead.',
-							$function,
+							$function_name,
 							$version,
 							$replacement
 						);
 					} else {
 						$message = sprintf(
 							'Function %1$s is deprecated since version %2$s with no alternative available.',
-							$function,
+							$function_name,
 							$version
 						);
 					}
@@ -711,14 +735,31 @@ public function deprecated_function_run( $function, $replacement, $version, $mes
 					if ( $replacement ) {
 						$message = sprintf(
 							'Function %1$s was called with an argument that is deprecated since version %2$s! %3$s',
-							$function,
+							$function_name,
 							$version,
 							$replacement
 						);
 					} else {
 						$message = sprintf(
 							'Function %1$s was called with an argument that is deprecated since version %2$s with no alternative available.',
-							$function,
+							$function_name,
+							$version
+						);
+					}
+					break;
+
+				case 'deprecated_class_run':
+					if ( $replacement ) {
+						$message = sprintf(
+							'Class %1$s is deprecated since version %2$s! Use %3$s instead.',
+							$function_name,
+							$version,
+							$replacement
+						);
+					} else {
+						$message = sprintf(
+							'Class %1$s is deprecated since version %2$s with no alternative available.',
+							$function_name,
 							$version
 						);
 					}
@@ -728,14 +769,14 @@ public function deprecated_function_run( $function, $replacement, $version, $mes
 					if ( $replacement ) {
 						$message = sprintf(
 							'File %1$s is deprecated since version %2$s! Use %3$s instead.',
-							$function,
+							$function_name,
 							$version,
 							$replacement
 						) . ' ' . $message;
 					} else {
 						$message = sprintf(
 							'File %1$s is deprecated since version %2$s with no alternative available.',
-							$function,
+							$function_name,
 							$version
 						) . ' ' . $message;
 					}
@@ -745,21 +786,21 @@ public function deprecated_function_run( $function, $replacement, $version, $mes
 					if ( $replacement ) {
 						$message = sprintf(
 							'Hook %1$s is deprecated since version %2$s! Use %3$s instead.',
-							$function,
+							$function_name,
 							$version,
 							$replacement
 						) . ' ' . $message;
 					} else {
 						$message = sprintf(
 							'Hook %1$s is deprecated since version %2$s with no alternative available.',
-							$function,
+							$function_name,
 							$version
 						) . ' ' . $message;
 					}
 					break;
 			}
 
-			$this->caught_deprecated[ $function ] = $message;
+			$this->caught_deprecated[ $function_name ] = $message;
 		}
 	}
 
@@ -769,17 +810,17 @@ public function deprecated_function_run( $function, $replacement, $version, $mes
 	 * @since 3.7.0
 	 * @since 6.1.0 Added the `$message` and `$version` parameters.
 	 *
-	 * @param string $function The function to add.
-	 * @param string $message  A message explaining what has been done incorrectly.
-	 * @param string $version  The version of WordPress where the message was added.
+	 * @param string $function_name The function to add.
+	 * @param string $message       A message explaining what has been done incorrectly.
+	 * @param string $version       The version of WordPress where the message was added.
 	 */
-	public function doing_it_wrong_run( $function, $message, $version ) {
-		if ( ! isset( $this->caught_doing_it_wrong[ $function ] ) ) {
+	public function doing_it_wrong_run( $function_name, $message, $version ) {
+		if ( ! isset( $this->caught_doing_it_wrong[ $function_name ] ) ) {
 			if ( $version ) {
 				$message .= ' ' . sprintf( '(This message was added in version %s.)', $version );
 			}
 
-			$this->caught_doing_it_wrong[ $function ] = $message;
+			$this->caught_doing_it_wrong[ $function_name ] = $message;
 		}
 	}
 
@@ -837,18 +878,18 @@ public function assertNotIXRError( $actual, $message = '' ) {
 	 * @since UT (3.7.0)
 	 * @since 5.9.0 Added the `$message` parameter.
 	 *
-	 * @param object $object  The object to check.
+	 * @param object $actual  The object to check.
 	 * @param array  $fields  The fields to check.
 	 * @param string $message Optional. Message to display when the assertion fails.
 	 */
-	public function assertEqualFields( $object, $fields, $message = '' ) {
-		$this->assertIsObject( $object, $message . ' Passed $object is not an object.' );
+	public function assertEqualFields( $actual, $fields, $message = '' ) {
+		$this->assertIsObject( $actual, $message . ' Passed $actual is not an object.' );
 		$this->assertIsArray( $fields, $message . ' Passed $fields is not an array.' );
 		$this->assertNotEmpty( $fields, $message . ' Fields array is empty.' );
 
 		foreach ( $fields as $field_name => $field_value ) {
-			$this->assertObjectHasAttribute( $field_name, $object, $message . " Property $field_name does not exist on the object." );
-			$this->assertSame( $field_value, $object->$field_name, $message . " Value of property $field_name is not $field_value." );
+			$this->assertObjectHasProperty( $field_name, $actual, $message . " Property $field_name does not exist on the object." );
+			$this->assertSame( $field_value, $actual->$field_name, $message . " Value of property $field_name is not $field_value." );
 		}
 	}
 
@@ -1012,14 +1053,14 @@ public function assertEqualSetsWithIndex( $expected, $actual, $message = '' ) {
 	 * @since 4.8.0
 	 * @since 5.9.0 Added the `$message` parameter.
 	 *
-	 * @param array  $array   Array to check.
+	 * @param array  $actual  Array to check.
 	 * @param string $message Optional. Message to display when the assertion fails.
 	 */
-	public function assertNonEmptyMultidimensionalArray( $array, $message = '' ) {
-		$this->assertIsArray( $array, $message . ' Value under test is not an array.' );
-		$this->assertNotEmpty( $array, $message . ' Array is empty.' );
+	public function assertNonEmptyMultidimensionalArray( $actual, $message = '' ) {
+		$this->assertIsArray( $actual, $message . ' Value under test is not an array.' );
+		$this->assertNotEmpty( $actual, $message . ' Array is empty.' );
 
-		foreach ( $array as $sub_array ) {
+		foreach ( $actual as $sub_array ) {
 			$this->assertIsArray( $sub_array, $message . ' Subitem of the array is not an array.' );
 			$this->assertNotEmpty( $sub_array, $message . ' Subitem of the array is empty.' );
 		}
@@ -1365,11 +1406,12 @@ public function rmdir( $path ) {
 	/**
 	 * Deletes files added to the `uploads` directory during tests.
 	 *
-	 * This method works in tandem with the `setUp()` and `rmdir()` methods:
-	 * - `setUp()` scans the `uploads` directory before every test, and stores its contents inside of the
-	 *   `$ignore_files` property.
-	 * - `rmdir()` and its helper methods only delete files that are not listed in the `$ignore_files` property. If
-	 *   called during `tearDown()` in tests, this will only delete files added during the previously run test.
+	 * This method works in tandem with the `set_up()` and `rmdir()` methods:
+	 * - `set_up()` scans the `uploads` directory before every test, and stores
+	 *   its contents inside of the `$ignore_files` property.
+	 * - `rmdir()` and its helper methods only delete files that are not listed
+	 *   in the `$ignore_files` property. If called during `tear_down()` in tests,
+	 *   this will only delete files added during the previously run test.
 	 */
 	public function remove_added_uploads() {
 		$uploads = wp_upload_dir();
@@ -1521,10 +1563,11 @@ public function set_permalink_structure( $structure = '' ) {
 	 * Creates an attachment post from an uploaded file.
 	 *
 	 * @since 4.4.0
+	 * @since 6.2.0 Returns a WP_Error object on failure.
 	 *
 	 * @param array $upload         Array of information about the uploaded file, provided by wp_upload_bits().
 	 * @param int   $parent_post_id Optional. Parent post ID.
-	 * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
+	 * @return int|WP_Error The attachment ID on success, WP_Error object on failure.
 	 */
 	public function _make_attachment( $upload, $parent_post_id = 0 ) {
 		$type = '';
@@ -1546,9 +1589,18 @@ public function _make_attachment( $upload, $parent_post_id = 0 ) {
 			'guid'           => $upload['url'],
 		);
 
-		$id = wp_insert_attachment( $attachment, $upload['file'], $parent_post_id );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
-		return $id;
+		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $parent_post_id, true );
+
+		if ( is_wp_error( $attachment_id ) ) {
+			return $attachment_id;
+		}
+
+		wp_update_attachment_metadata(
+			$attachment_id,
+			wp_generate_attachment_metadata( $attachment_id, $upload['file'] )
+		);
+
+		return $attachment_id;
 	}
 
 	/**
diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
index 9a1b234b71686..96a84b33f8cd5 100644
--- a/tests/phpunit/includes/bootstrap.php
+++ b/tests/phpunit/includes/bootstrap.php
@@ -139,7 +139,7 @@
  * Minimum version of the PHPUnit Polyfills package as declared in `composer.json`.
  * Only needs updating when new polyfill features start being used in the test suite.
  */
-$phpunit_polyfills_minimum_version = '1.0.1';
+$phpunit_polyfills_minimum_version = '1.1.0';
 if ( class_exists( '\Yoast\PHPUnitPolyfills\Autoload' )
 	&& ( defined( '\Yoast\PHPUnitPolyfills\Autoload::VERSION' ) === false
 	|| version_compare( Yoast\PHPUnitPolyfills\Autoload::VERSION, $phpunit_polyfills_minimum_version, '<' ) )
@@ -302,7 +302,7 @@ function wp_tests_options( $value ) {
 }
 
 // Load WordPress.
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH . 'wp-settings.php';
 
 // Delete any default posts & related data.
 _delete_all_posts();
diff --git a/tests/phpunit/includes/class-wp-test-stream.php b/tests/phpunit/includes/class-wp-test-stream.php
index 78ce816f699a2..11997507d0b1b 100644
--- a/tests/phpunit/includes/class-wp-test-stream.php
+++ b/tests/phpunit/includes/class-wp-test-stream.php
@@ -183,7 +183,7 @@ public function stream_eof() {
 	 *
 	 * @see streamWrapper::stream_metadata
 	 */
-	public function stream_metadata( $path, $option, $var ) {
+	public function stream_metadata( $path, $option, $value ) {
 		$this->open( $path );
 		if ( STREAM_META_TOUCH === $option ) {
 			if ( ! isset( $this->data_ref ) ) {
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php
index 5f544e55696ea..115c950c2f27e 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php
@@ -10,6 +10,8 @@ class WP_UnitTest_Factory_Callback_After_Create {
 	/**
 	 * WP_UnitTest_Factory_Callback_After_Create constructor.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param callable $callback A callback function.
 	 */
 	public function __construct( $callback ) {
@@ -19,11 +21,13 @@ public function __construct( $callback ) {
 	/**
 	 * Calls the set callback on a given object.
 	 *
-	 * @param mixed $object The object to apply the callback on.
+	 * @since UT (3.7.0)
+	 *
+	 * @param int $object_id ID of the object to apply the callback on.
 	 *
-	 * @return mixed The possibly altered object.
+	 * @return mixed Updated object field.
 	 */
-	public function call( $object ) {
-		return call_user_func( $this->callback, $object );
+	public function call( $object_id ) {
+		return call_user_func( $this->callback, $object_id );
 	}
 }
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php
index ffa5756859c08..262c6c4640790 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php
@@ -1,10 +1,23 @@
 <?php
 
+/**
+ * Unit test factory for attachments.
+ *
+ * Note: The below @method notations are defined solely for the benefit of IDEs,
+ * as a way to indicate expected return values from the given factory methods.
+ *
+ * @method int|WP_Error     create( $args = array(), $generation_definitions = null )
+ * @method WP_Post|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[] create_many( $count, $args = array(), $generation_definitions = null )
+ */
 class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 
 	/**
 	 * Create an attachment fixture.
 	 *
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
 	 * @param array $args {
 	 *     Array of arguments. Accepts all arguments that can be passed to
 	 *     wp_insert_attachment(), in addition to the following:
@@ -14,7 +27,7 @@ class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 	 * @param int   $legacy_parent Deprecated.
 	 * @param array $legacy_args   Deprecated.
 	 *
-	 * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
+	 * @return int|WP_Error The attachment ID on success, WP_Error object on failure.
 	 */
 	public function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
 		// Backward compatibility for legacy argument format.
@@ -33,18 +46,21 @@ public function create_object( $args, $legacy_parent = 0, $legacy_args = array()
 			$args
 		);
 
-		return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
+		return wp_insert_attachment( $r, $r['file'], $r['post_parent'], true );
 	}
 
 	/**
 	 * Saves an attachment.
 	 *
-	 * @param string $file   The file name to create attachment object for.
-	 * @param int    $parent ID of the post to attach the file to.
+	 * @since 4.4.0
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @param string $file           The file name to create attachment object for.
+	 * @param int    $parent_post_id ID of the post to attach the file to.
 	 *
-	 * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
+	 * @return int|WP_Error The attachment ID on success, WP_Error object on failure.
 	 */
-	public function create_upload_object( $file, $parent = 0 ) {
+	public function create_upload_object( $file, $parent_post_id = 0 ) {
 		$contents = file_get_contents( $file );
 		$upload   = wp_upload_bits( wp_basename( $file ), null, $contents );
 
@@ -62,15 +78,23 @@ public function create_upload_object( $file, $parent = 0 ) {
 			'post_title'     => wp_basename( $upload['file'] ),
 			'post_content'   => '',
 			'post_type'      => 'attachment',
-			'post_parent'    => $parent,
+			'post_parent'    => $parent_post_id,
 			'post_mime_type' => $type,
 			'guid'           => $upload['url'],
 		);
 
 		// Save the data.
-		$id = wp_insert_attachment( $attachment, $upload['file'], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$attachment_id = wp_insert_attachment( $attachment, $upload['file'], $parent_post_id, true );
+
+		if ( is_wp_error( $attachment_id ) ) {
+			return $attachment_id;
+		}
+
+		wp_update_attachment_metadata(
+			$attachment_id,
+			wp_generate_attachment_metadata( $attachment_id, $upload['file'] )
+		);
 
-		return $id;
+		return $attachment_id;
 	}
 }
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php
index aba7f0d37825f..39b59f7169056 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_Site create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error     create( $args = array(), $generation_definitions = null )
+ * @method WP_Site|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[] create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-bookmark.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-bookmark.php
index 4c18a34507067..d9f8e06fbe353 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-bookmark.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-bookmark.php
@@ -8,9 +8,9 @@
  *
  * @since 4.6.0
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method object create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error     create( $args = array(), $generation_definitions = null )
+ * @method object|WP_Error  create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[] create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Bookmark extends WP_UnitTest_Factory_For_Thing {
 
@@ -22,15 +22,52 @@ public function __construct( $factory = null ) {
 		);
 	}
 
+	/**
+	 * Creates a link object.
+	 *
+	 * @since 4.6.0
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @param array $args Arguments for the link object.
+	 *
+	 * @return int|WP_Error The link ID on success, WP_Error object on failure.
+	 */
 	public function create_object( $args ) {
-		return wp_insert_link( $args );
+		return wp_insert_link( $args, true );
 	}
 
+	/**
+	 * Updates a link object.
+	 *
+	 * @since 4.6.0
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @param int   $link_id ID of the link to update.
+	 * @param array $fields  The fields to update.
+	 *
+	 * @return int|WP_Error The link ID on success, WP_Error object on failure.
+	 */
 	public function update_object( $link_id, $fields ) {
 		$fields['link_id'] = $link_id;
-		return wp_update_link( $fields );
+
+		$result = wp_update_link( $fields );
+
+		if ( 0 === $result ) {
+			return new WP_Error( 'link_update_error', __( 'Could not update link.' ) );
+		}
+
+		return $result;
 	}
 
+	/**
+	 * Retrieves a link by a given ID.
+	 *
+	 * @since 4.6.0
+	 *
+	 * @param int $link_id ID of the link to retrieve.
+	 *
+	 * @return object|null The link object on success, null on failure.
+	 */
 	public function get_object_by_id( $link_id ) {
 		return get_bookmark( $link_id );
 	}
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php
index 17f37437ce7aa..194a8bf6eca0b 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_Comment create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error        create( $args = array(), $generation_definitions = null )
+ * @method WP_Comment|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[]    create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
@@ -25,30 +25,53 @@ public function __construct( $factory = null ) {
 	/**
 	 * Inserts a comment.
 	 *
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
 	 * @param array $args The comment details.
 	 *
-	 * @return int|false The comment's ID on success, false on failure.
+	 * @return int|WP_Error The comment ID on success, WP_Error object on failure.
 	 */
 	public function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
+		global $wpdb;
+
+		$comment_id = wp_insert_comment( $this->addslashes_deep( $args ) );
+
+		if ( false === $comment_id ) {
+			return new WP_Error(
+				'db_insert_error',
+				__( 'Could not insert comment into the database.' ),
+				$wpdb->last_error
+			);
+		}
+
+		return $comment_id;
 	}
 
 	/**
 	 * Updates a comment.
 	 *
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
 	 * @param int   $comment_id The comment ID.
 	 * @param array $fields     The comment details.
 	 *
-	 * @return int The value 1 if the comment was updated, 0 if not updated.
+	 * @return int|WP_Error The value 1 if the comment was updated, 0 if not updated.
+	 *                      WP_Error object on failure.
 	 */
 	public function update_object( $comment_id, $fields ) {
 		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
+		return wp_update_comment( $this->addslashes_deep( $fields ), true );
 	}
 
 	/**
 	 * Creates multiple comments on a given post.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int   $post_id                ID of the post to create comments for.
 	 * @param int   $count                  Total amount of comments to create.
 	 * @param array $args                   The comment details.
@@ -64,6 +87,8 @@ public function create_post_comments( $post_id, $count = 1, $args = array(), $ge
 	/**
 	 * Retrieves a comment by a given ID.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int $comment_id ID of the comment to retrieve.
 	 *
 	 * @return WP_Comment|null WP_Comment object on success, null on failure.
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php
index b6d3ece393272..a578bddb6aea8 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_Network create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error        create( $args = array(), $generation_definitions = null )
+ * @method WP_Network|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[]    create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
@@ -23,6 +23,16 @@ public function __construct( $factory = null ) {
 		);
 	}
 
+	/**
+	 * Creates a network object.
+	 *
+	 * @since 3.9.0
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @param array $args Arguments for the network object.
+	 *
+	 * @return int|WP_Error The network ID on success, WP_Error object on failure.
+	 */
 	public function create_object( $args ) {
 		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
@@ -32,12 +42,43 @@ public function create_object( $args ) {
 			$email = get_userdata( $args['user'] )->user_email;
 		}
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+		$result = populate_network(
+			$args['network_id'],
+			$args['domain'],
+			$email,
+			$args['title'],
+			$args['path'],
+			$args['subdomain_install']
+		);
+
+		if ( is_wp_error( $result ) ) {
+			return $result;
+		}
+
 		return (int) $args['network_id'];
 	}
 
+	/**
+	 * Updates a network object. Not implemented.
+	 *
+	 * @since 3.9.0
+	 *
+	 * @param int   $network_id ID of the network to update.
+	 * @param array $fields  The fields to update.
+	 *
+	 * @return void
+	 */
 	public function update_object( $network_id, $fields ) {}
 
+	/**
+	 * Retrieves a network by a given ID.
+	 *
+	 * @since 3.9.0
+	 *
+	 * @param int $network_id ID of the network to retrieve.
+	 *
+	 * @return WP_Network|null The network object on success, null on failure.
+	 */
 	public function get_object_by_id( $network_id ) {
 		return get_network( $network_id );
 	}
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php
index 312fd90dc8658..16fdf04166776 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_Post create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error     create( $args = array(), $generation_definitions = null )
+ * @method WP_Post|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[] create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
@@ -26,30 +26,38 @@ public function __construct( $factory = null ) {
 	/**
 	 * Creates a post object.
 	 *
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
 	 * @param array $args Array with elements for the post.
 	 *
-	 * @return int The post ID on success. The value 0 on failure.
+	 * @return int|WP_Error The post ID on success, WP_Error object on failure.
 	 */
 	public function create_object( $args ) {
-		return wp_insert_post( $args );
+		return wp_insert_post( $args, true );
 	}
 
 	/**
 	 * Updates an existing post object.
 	 *
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
 	 * @param int   $post_id ID of the post to update.
 	 * @param array $fields  Post data.
 	 *
-	 * @return int The post ID on success. The value 0 on failure.
+	 * @return int|WP_Error The post ID on success, WP_Error object on failure.
 	 */
 	public function update_object( $post_id, $fields ) {
 		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
+		return wp_update_post( $fields, true );
 	}
 
 	/**
 	 * Retrieves a post by a given ID.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int $post_id ID of the post to retrieve.
 	 *
 	 * @return WP_Post|null WP_Post object on success, null on failure.
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php
index 1d4a5cba9c318..ee082b3f97de1 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_Term create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error          create( $args = array(), $generation_definitions = null )
+ * @method WP_Term|WP_Error|null create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[]      create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_Term extends WP_UnitTest_Factory_For_Thing {
 
@@ -28,39 +28,55 @@ public function __construct( $factory = null, $taxonomy = null ) {
 	/**
 	 * Creates a term object.
 	 *
-	 * @param array $args Array or string of arguments for inserting a term.
+	 * @since UT (3.7.0)
 	 *
-	 * @return array|WP_Error
+	 * @param array $args Array of arguments for inserting a term.
+	 *
+	 * @return int|WP_Error The term ID on success, WP_Error object on failure.
 	 */
 	public function create_object( $args ) {
 		$args         = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
 		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
+
 		if ( is_wp_error( $term_id_pair ) ) {
 			return $term_id_pair;
 		}
+
 		return $term_id_pair['term_id'];
 	}
 
 	/**
 	 * Updates the term.
 	 *
-	 * @param int|object   $term   The term to update.
-	 * @param array|string $fields The context in which to relate the term to the object.
+	 * @since UT (3.7.0)
+	 * @since 6.2.0 Returns a WP_Error object on failure.
+	 *
+	 * @param int|object $term   The term to update.
+	 * @param array      $fields Array of arguments for updating a term.
 	 *
-	 * @return int The term ID.
+	 * @return int|WP_Error The term ID on success, WP_Error object on failure.
 	 */
 	public function update_object( $term, $fields ) {
 		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
+
 		if ( is_object( $term ) ) {
 			$taxonomy = $term->taxonomy;
 		}
+
 		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+
+		if ( is_wp_error( $term_id_pair ) ) {
+			return $term_id_pair;
+		}
+
 		return $term_id_pair['term_id'];
 	}
 
 	/**
 	 * Attach terms to the given post.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int          $post_id  The post ID.
 	 * @param string|array $terms    An array of terms to set for the post, or a string of terms
 	 *                               separated by commas. Hierarchical taxonomies must always pass IDs rather
@@ -79,6 +95,8 @@ public function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
 	/**
 	 * Create a term and returns it as an object.
 	 *
+	 * @since 4.3.0
+	 *
 	 * @param array $args                   Array or string of arguments for inserting a term.
 	 * @param null  $generation_definitions The default values.
 	 *
@@ -92,12 +110,15 @@ public function create_and_get( $args = array(), $generation_definitions = null
 		}
 
 		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
+
 		return get_term( $term_id, $taxonomy );
 	}
 
 	/**
 	 * Retrieves the term by a given ID.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int $term_id ID of the term to retrieve.
 	 *
 	 * @return WP_Term|WP_Error|null WP_Term on success. WP_Error if taxonomy does not exist. Null for miscellaneous failure.
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php
index d996213f458aa..ebdb450163a13 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php
@@ -9,12 +9,19 @@ abstract class WP_UnitTest_Factory_For_Thing {
 	public $factory;
 
 	/**
-	 * Creates a new factory, which will create objects of a specific Thing
-	 *
-	 * @param object $factory Global factory that can be used to create other objects on the system
-	 * @param array $default_generation_definitions Defines what default values should the properties of the object have. The default values
-	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
-	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
+	 * Creates a new factory, which will create objects of a specific Thing.
+	 *
+	 * @since UT (3.7.0)
+	 *
+	 * @param object $factory                       Global factory that can be used to create other objects
+	 *                                              on the system.
+	 * @param array $default_generation_definitions Defines what default values should the properties
+	 *                                              of the object have. The default values can be generators --
+	 *                                              an object with the next() method.
+	 *                                              There are some default generators:
+	 *                                               - {@link WP_UnitTest_Generator_Sequence}
+	 *                                               - {@link WP_UnitTest_Generator_Locale_Name}
+	 *                                               - {@link WP_UnitTest_Factory_Callback_After_Create}
 	 */
 	public function __construct( $factory, $default_generation_definitions = array() ) {
 		$this->factory                        = $factory;
@@ -22,31 +29,39 @@ public function __construct( $factory, $default_generation_definitions = array()
 	}
 
 	/**
-	 * Creates an object.
+	 * Creates an object and returns its ID.
+	 *
+	 * @since UT (3.7.0)
 	 *
 	 * @param array $args The arguments.
 	 *
-	 * @return mixed The result. Can be anything.
+	 * @return int|WP_Error The object ID on success, WP_Error object on failure.
 	 */
 	abstract public function create_object( $args );
 
 	/**
 	 * Updates an existing object.
 	 *
-	 * @param int   $object The object ID.
-	 * @param array $fields The values to update.
+	 * @since UT (3.7.0)
+	 *
+	 * @param int   $object_id The object ID.
+	 * @param array $fields    The values to update.
 	 *
-	 * @return mixed The result. Can be anything.
+	 * @return int|WP_Error The object ID on success, WP_Error object on failure.
 	 */
-	abstract public function update_object( $object, $fields );
+	abstract public function update_object( $object_id, $fields );
 
 	/**
-	 * Creates an object.
+	 * Creates an object and returns its ID.
 	 *
-	 * @param array $args                   Optional. The arguments for the object to create. Default is empty array.
-	 * @param null  $generation_definitions Optional. The default values for the object. Default is null.
+	 * @since UT (3.7.0)
 	 *
-	 * @return mixed The result. Can be anything.
+	 * @param array $args                   Optional. The arguments for the object to create.
+	 *                                      Default empty array.
+	 * @param null  $generation_definitions Optional. The default values for the object.
+	 *                                      Default null.
+	 *
+	 * @return int|WP_Error The object ID on success, WP_Error object on failure.
 	 */
 	public function create( $args = array(), $generation_definitions = null ) {
 		if ( is_null( $generation_definitions ) ) {
@@ -54,28 +69,35 @@ public function create( $args = array(), $generation_definitions = null ) {
 		}
 
 		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created        = $this->create_object( $generated_args );
-		if ( ! $created || is_wp_error( $created ) ) {
-			return $created;
+		$object_id      = $this->create_object( $generated_args );
+
+		if ( ! $object_id || is_wp_error( $object_id ) ) {
+			return $object_id;
 		}
 
 		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result    = $this->update_object( $created, $updated_fields );
+			$updated_fields = $this->apply_callbacks( $callbacks, $object_id );
+			$save_result    = $this->update_object( $object_id, $updated_fields );
+
 			if ( ! $save_result || is_wp_error( $save_result ) ) {
 				return $save_result;
 			}
 		}
-		return $created;
+
+		return $object_id;
 	}
 
 	/**
-	 * Creates an object and returns its object.
+	 * Creates and returns an object.
+	 *
+	 * @since UT (3.7.0)
 	 *
-	 * @param array $args                   Optional. The arguments for the object to create. Default is empty array.
-	 * @param null  $generation_definitions Optional. The default values for the object. Default is null.
+	 * @param array $args                   Optional. The arguments for the object to create.
+	 *                                      Default empty array.
+	 * @param null  $generation_definitions Optional. The default values for the object.
+	 *                                      Default null.
 	 *
-	 * @return mixed The created object. Can be anything.
+	 * @return mixed The created object. Can be anything. WP_Error object on failure.
 	 */
 	public function create_and_get( $args = array(), $generation_definitions = null ) {
 		$object_id = $this->create( $args, $generation_definitions );
@@ -90,6 +112,8 @@ public function create_and_get( $args = array(), $generation_definitions = null
 	/**
 	 * Retrieves an object by ID.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int $object_id The object ID.
 	 *
 	 * @return mixed The object. Can be anything.
@@ -99,17 +123,23 @@ abstract public function get_object_by_id( $object_id );
 	/**
 	 * Creates multiple objects.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int   $count                  Amount of objects to create.
-	 * @param array $args                   Optional. The arguments for the object to create. Default is empty array.
-	 * @param null  $generation_definitions Optional. The default values for the object. Default is null.
+	 * @param array $args                   Optional. The arguments for the object to create.
+	 *                                      Default empty array.
+	 * @param null  $generation_definitions Optional. The default values for the object.
+	 *                                      Default null.
 	 *
 	 * @return array
 	 */
 	public function create_many( $count, $args = array(), $generation_definitions = null ) {
 		$results = array();
+
 		for ( $i = 0; $i < $count; $i++ ) {
 			$results[] = $this->create( $args, $generation_definitions );
 		}
+
 		return $results;
 	}
 
@@ -117,9 +147,13 @@ public function create_many( $count, $args = array(), $generation_definitions =
 	 * Combines the given arguments with the generation_definitions (defaults) and applies
 	 * possibly set callbacks on it.
 	 *
-	 * @param array       $args                   Optional. The arguments to combine with defaults. Default is empty array.
-	 * @param array|null  $generation_definitions Optional. The defaults. Default is null.
-	 * @param array|null  $callbacks              Optional. Array with callbacks to apply on the fields. Default is null.
+	 * @since UT (3.7.0)
+	 *
+	 * @param array       $args                   Optional. The arguments to combine with defaults.
+	 *                                            Default empty array.
+	 * @param array|null  $generation_definitions Optional. The defaults. Default null.
+	 * @param array|null  $callbacks              Optional. Array with callbacks to apply on the fields.
+	 *                                            Default null.
 	 *
 	 * @return array|WP_Error Combined array on success. WP_Error when default value is incorrent.
 	 */
@@ -144,7 +178,10 @@ public function generate_args( $args = array(), $generation_definitions = null,
 				} elseif ( is_object( $generator ) ) {
 					$args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
 				} else {
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+					return new WP_Error(
+						'invalid_argument',
+						'Factory default value should be either a scalar or an generator object.'
+					);
 				}
 			}
 		}
@@ -156,34 +193,41 @@ public function generate_args( $args = array(), $generation_definitions = null,
 	/**
 	 * Applies the callbacks on the created object.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param WP_UnitTest_Factory_Callback_After_Create[] $callbacks Array with callback functions.
-	 * @param mixed                                       $created   The object to apply callbacks for.
+	 * @param int                                         $object_id ID of the object to apply callbacks for.
 	 *
 	 * @return array The altered fields.
 	 */
-	public function apply_callbacks( $callbacks, $created ) {
+	public function apply_callbacks( $callbacks, $object_id ) {
 		$updated_fields = array();
 
 		foreach ( $callbacks as $field_name => $generator ) {
-			$updated_fields[ $field_name ] = $generator->call( $created );
+			$updated_fields[ $field_name ] = $generator->call( $object_id );
 		}
+
 		return $updated_fields;
 	}
 
 	/**
-	 * Instantiates a callback objects for the given function name.
+	 * Instantiates a callback object for the given function name.
 	 *
-	 * @param string $function The callback function.
+	 * @since UT (3.7.0)
+	 *
+	 * @param callable $callback The callback function.
 	 *
 	 * @return WP_UnitTest_Factory_Callback_After_Create
 	 */
-	public function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
+	public function callback( $callback ) {
+		return new WP_UnitTest_Factory_Callback_After_Create( $callback );
 	}
 
 	/**
 	 * Adds slashes to the given value.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param array|object|string|mixed $value The value to add slashes to.
 	 *
 	 * @return array|string The value with the possibly applied slashes.
diff --git a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php
index 966eed8021517..5bdc8312fc2af 100644
--- a/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php
+++ b/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php
@@ -6,9 +6,9 @@
  * Note: The below @method notations are defined solely for the benefit of IDEs,
  * as a way to indicate expected return values from the given factory methods.
  *
- * @method int create( $args = array(), $generation_definitions = null )
- * @method WP_User create_and_get( $args = array(), $generation_definitions = null )
- * @method int[] create_many( $count, $args = array(), $generation_definitions = null )
+ * @method int|WP_Error     create( $args = array(), $generation_definitions = null )
+ * @method WP_User|WP_Error create_and_get( $args = array(), $generation_definitions = null )
+ * @method (int|WP_Error)[] create_many( $count, $args = array(), $generation_definitions = null )
  */
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
@@ -24,6 +24,8 @@ public function __construct( $factory = null ) {
 	/**
 	 * Inserts an user.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param array $args The user data to insert.
 	 *
 	 * @return int|WP_Error The user ID on success, WP_Error object on failure.
@@ -35,6 +37,8 @@ public function create_object( $args ) {
 	/**
 	 * Updates the user data.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int   $user_id ID of the user to update.
 	 * @param array $fields  The user data to update.
 	 *
@@ -48,6 +52,8 @@ public function update_object( $user_id, $fields ) {
 	/**
 	 * Retrieves the user for a given ID.
 	 *
+	 * @since UT (3.7.0)
+	 *
 	 * @param int $user_id ID of the user ID to retrieve.
 	 *
 	 * @return WP_User The user object.
diff --git a/tests/phpunit/includes/functions.php b/tests/phpunit/includes/functions.php
index 3845f930a53b8..81d4339db1bf8 100644
--- a/tests/phpunit/includes/functions.php
+++ b/tests/phpunit/includes/functions.php
@@ -37,63 +37,70 @@ function tests_reset__SERVER() { // phpcs:ignore WordPress.NamingConventions.Val
 /**
  * Adds hooks before loading WP.
  *
+ * @since UT (3.7.0)
+ *
  * @see add_filter()
+ * @global WP_Hook[] $wp_filter A multidimensional array of all hooks and the callbacks hooked to them.
  *
- * @param string   $tag             The name of the filter to hook the $function_to_add callback to.
- * @param callable $function_to_add The callback to be run when the filter is applied.
- * @param int      $priority        Optional. Used to specify the order in which the functions
- *                                  associated with a particular action are executed.
- *                                  Lower numbers correspond with earlier execution,
- *                                  and functions with the same priority are executed
- *                                  in the order in which they were added to the action. Default 10.
- * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
- * @return true
+ * @param string   $hook_name     The name of the filter to add the callback to.
+ * @param callable $callback      The callback to be run when the filter is applied.
+ * @param int      $priority      Optional. Used to specify the order in which the functions
+ *                                associated with a particular action are executed.
+ *                                Lower numbers correspond with earlier execution,
+ *                                and functions with the same priority are executed
+ *                                in the order in which they were added to the action. Default 10.
+ * @param int      $accepted_args Optional. The number of arguments the function accepts. Default 1.
+ * @return true Always returns true.
  */
-function tests_add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+function tests_add_filter( $hook_name, $callback, $priority = 10, $accepted_args = 1 ) {
 	global $wp_filter;
 
 	if ( function_exists( 'add_filter' ) ) {
-		add_filter( $tag, $function_to_add, $priority, $accepted_args );
+		add_filter( $hook_name, $callback, $priority, $accepted_args );
 	} else {
-		$idx = _test_filter_build_unique_id( $tag, $function_to_add, $priority );
+		$idx = _test_filter_build_unique_id( $hook_name, $callback, $priority );
 
-		$wp_filter[ $tag ][ $priority ][ $idx ] = array(
-			'function'      => $function_to_add,
+		$wp_filter[ $hook_name ][ $priority ][ $idx ] = array(
+			'function'      => $callback,
 			'accepted_args' => $accepted_args,
 		);
 	}
+
 	return true;
 }
 
 /**
  * Generates a unique function ID based on the given arguments.
  *
+ * @since UT (3.7.0)
+ *
  * @see _wp_filter_build_unique_id()
  *
- * @param string   $tag      Unused. The name of the filter to build ID for.
- * @param callable $function The function to generate ID for.
- * @param int      $priority Unused. The order in which the functions
- *                           associated with a particular action are executed.
+ * @param string                $hook_name Unused. The name of the filter to build ID for.
+ * @param callable|string|array $callback  The callback to generate ID for. The callback may
+ *                                         or may not exist.
+ * @param int                   $priority  Unused. The order in which the functions
+ *                                         associated with a particular action are executed.
  * @return string Unique function ID for usage as array key.
  */
-function _test_filter_build_unique_id( $tag, $function, $priority ) {
-	if ( is_string( $function ) ) {
-		return $function;
+function _test_filter_build_unique_id( $hook_name, $callback, $priority ) {
+	if ( is_string( $callback ) ) {
+		return $callback;
 	}
 
-	if ( is_object( $function ) ) {
+	if ( is_object( $callback ) ) {
 		// Closures are currently implemented as objects.
-		$function = array( $function, '' );
+		$callback = array( $callback, '' );
 	} else {
-		$function = (array) $function;
+		$callback = (array) $callback;
 	}
 
-	if ( is_object( $function[0] ) ) {
+	if ( is_object( $callback[0] ) ) {
 		// Object class calling.
-		return spl_object_hash( $function[0] ) . $function[1];
-	} elseif ( is_string( $function[0] ) ) {
+		return spl_object_hash( $callback[0] ) . $callback[1];
+	} elseif ( is_string( $callback[0] ) ) {
 		// Static calling.
-		return $function[0] . '::' . $function[1];
+		return $callback[0] . '::' . $callback[1];
 	}
 }
 
@@ -111,7 +118,7 @@ function _delete_all_data() {
 		$wpdb->term_relationships,
 		$wpdb->termmeta,
 	) as $table ) {
-		//phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		$wpdb->query( "DELETE FROM {$table}" );
 	}
 
@@ -119,7 +126,7 @@ function _delete_all_data() {
 		$wpdb->terms,
 		$wpdb->term_taxonomy,
 	) as $table ) {
-		//phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+		// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 		$wpdb->query( "DELETE FROM {$table} WHERE term_id != 1" );
 	}
 
diff --git a/tests/phpunit/includes/install.php b/tests/phpunit/includes/install.php
index 1357b4d5fe905..8a595903c78b6 100644
--- a/tests/phpunit/includes/install.php
+++ b/tests/phpunit/includes/install.php
@@ -37,10 +37,10 @@
 
 tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter_exit' );
 
-require_once ABSPATH . '/wp-settings.php';
+require_once ABSPATH . 'wp-settings.php';
 
-require_once ABSPATH . '/wp-admin/includes/upgrade.php';
-require_once ABSPATH . '/wp-includes/class-wpdb.php';
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+require_once ABSPATH . 'wp-includes/class-wpdb.php';
 
 // Override the PHPMailer.
 global $phpmailer;
@@ -64,12 +64,12 @@
 
 $wpdb->query( 'SET foreign_key_checks = 0' );
 foreach ( $wpdb->tables() as $table => $prefixed_table ) {
-	//phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
 }
 
 foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
-	//phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
 	$wpdb->query( "DROP TABLE IF EXISTS $prefixed_table" );
 
 	// We need to create references to ms global tables.
diff --git a/tests/phpunit/includes/object-cache.php b/tests/phpunit/includes/object-cache.php
index c1fe9755a66e3..e1404188f35bd 100644
--- a/tests/phpunit/includes/object-cache.php
+++ b/tests/phpunit/includes/object-cache.php
@@ -312,6 +312,16 @@ function wp_cache_flush( $delay = 0 ) {
 	return $wp_object_cache->flush( $delay );
 }
 
+/**
+ * Removes all cache items from the in-memory runtime cache.
+ *
+ * @return bool True on success, false on failure.
+ */
+function wp_cache_flush_runtime() {
+	global $wp_object_cache;
+	return $wp_object_cache->flush_runtime();
+}
+
 /**
  * Determines whether the object cache implementation supports a particular feature.
  *
@@ -323,7 +333,13 @@ function wp_cache_flush( $delay = 0 ) {
  * @return bool True if the feature is supported, false otherwise.
  */
 function wp_cache_supports( $feature ) {
-	return false;
+	switch ( $feature ) {
+		case 'get_multiple':
+		case 'flush_runtime':
+			return true;
+		default:
+			return false;
+	}
 }
 
 /**
@@ -482,6 +498,10 @@ function wp_cache_get_multi_by_key( $server_key, $keys, $groups = '', &$cas_toke
  */
 function wp_cache_get_multiple( $keys, $group = '', $force = false ) {
 	global $wp_object_cache;
+
+	// Prime multiple keys in a single Memcached call.
+	$wp_object_cache->getMulti( $keys, $group );
+
 	return $wp_object_cache->getMultiple( $keys, $group, $force );
 }
 
@@ -893,6 +913,20 @@ class WP_Object_Cache {
 	 */
 	public $blog_prefix = '';
 
+	/**
+	 * Thirty days in seconds.
+	 *
+	 * @var int
+	 */
+	public $thirty_days;
+
+	/**
+	 * Current unix time stamp.
+	 *
+	 * @var int
+	 */
+	public $now;
+
 	/**
 	 * Instantiates the Memcached class.
 	 *
@@ -968,21 +1002,22 @@ public function add( $key, $value, $group = 'default', $expiration = 0, $server_
 		}
 
 		$derived_key = $this->buildKey( $key, $group );
-		$expiration  = $this->sanitize_expiration( $expiration );
+
+		// Add does not set the value if the key exists; mimic that here.
+		if ( isset( $this->cache[ $derived_key ] ) ) {
+			return false;
+		}
 
 		// If group is a non-Memcached group, save to runtime cache, not Memcached.
 		if ( in_array( $group, $this->no_mc_groups, true ) ) {
 
-			// Add does not set the value if the key exists; mimic that here.
-			if ( isset( $this->cache[ $derived_key ] ) ) {
-				return false;
-			}
-
 			$this->add_to_internal_cache( $derived_key, $value );
 
 			return true;
 		}
 
+		$expiration = $this->sanitize_expiration( $expiration );
+
 		// Save to Memcached.
 		if ( $by_key ) {
 			$result = $this->m->addByKey( $server_key, $derived_key, $value, $expiration );
@@ -1171,7 +1206,6 @@ public function appendByKey( $server_key, $key, $value, $group = 'default' ) {
 	 */
 	public function cas( $cas_token, $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
 		$derived_key = $this->buildKey( $key, $group );
-		$expiration  = $this->sanitize_expiration( $expiration );
 
 		/**
 		 * If group is a non-Memcached group, save to runtime cache, not Memcached. Note
@@ -1183,6 +1217,8 @@ public function cas( $cas_token, $key, $value, $group = 'default', $expiration =
 			return true;
 		}
 
+		$expiration = $this->sanitize_expiration( $expiration );
+
 		// Save to Memcached.
 		if ( $by_key ) {
 			$result = $this->m->casByKey( $cas_token, $server_key, $derived_key, $value, $expiration );
@@ -1401,6 +1437,17 @@ public function flush( $delay = 0 ) {
 		return $result;
 	}
 
+	/**
+	 * Clears the in-memory cache of all data leaving the external cache untouched.
+	 *
+	 * @return bool Always returns true.
+	 */
+	public function flush_runtime() {
+		$this->cache = array();
+
+		return true;
+	}
+
 	/**
 	 * Retrieves object from cache.
 	 *
@@ -1896,7 +1943,6 @@ public function prependByKey( $server_key, $key, $value, $group = 'default' ) {
 	 */
 	public function replace( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
 		$derived_key = $this->buildKey( $key, $group );
-		$expiration  = $this->sanitize_expiration( $expiration );
 
 		// If group is a non-Memcached group, save to runtime cache, not Memcached.
 		if ( in_array( $group, $this->no_mc_groups, true ) ) {
@@ -1910,6 +1956,8 @@ public function replace( $key, $value, $group = 'default', $expiration = 0, $ser
 			return true;
 		}
 
+		$expiration = $this->sanitize_expiration( $expiration );
+
 		// Save to Memcached.
 		if ( $by_key ) {
 			$result = $this->m->replaceByKey( $server_key, $derived_key, $value, $expiration );
@@ -1961,7 +2009,6 @@ public function replaceByKey( $server_key, $key, $value, $group = 'default', $ex
 	 */
 	public function set( $key, $value, $group = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
 		$derived_key = $this->buildKey( $key, $group );
-		$expiration  = $this->sanitize_expiration( $expiration );
 
 		// If group is a non-Memcached group, save to runtime cache, not Memcached.
 		if ( in_array( $group, $this->no_mc_groups, true ) ) {
@@ -1969,6 +2016,8 @@ public function set( $key, $value, $group = 'default', $expiration = 0, $server_
 			return true;
 		}
 
+		$expiration = $this->sanitize_expiration( $expiration );
+
 		// Save to Memcached.
 		if ( $by_key ) {
 			$result = $this->m->setByKey( $server_key, $derived_key, $value, $expiration );
@@ -2023,7 +2072,6 @@ public function setByKey( $server_key, $key, $value, $group = 'default', $expira
 	public function setMulti( $items, $groups = 'default', $expiration = 0, $server_key = '', $by_key = false ) {
 		// Build final keys and replace $items keys with the new keys.
 		$derived_keys  = $this->buildKeys( array_keys( $items ), $groups );
-		$expiration    = $this->sanitize_expiration( $expiration );
 		$derived_items = array_combine( $derived_keys, $items );
 
 		// Do not add to memcached if in no_mc_groups.
@@ -2039,6 +2087,8 @@ public function setMulti( $items, $groups = 'default', $expiration = 0, $server_
 			}
 		}
 
+		$expiration = $this->sanitize_expiration( $expiration );
+
 		// Save to memcached.
 		if ( $by_key ) {
 			$result = $this->m->setMultiByKey( $server_key, $derived_items, $expiration );
@@ -2161,6 +2211,7 @@ public function buildKeys( $keys, $groups = 'default' ) {
 		if ( ! is_array( $keys ) ) {
 			$keys = (array) $keys;
 		}
+		$keys = array_values( $keys );
 
 		// If we have equal numbers of keys and groups, merge $keys[n] and $group[n].
 		if ( count( $keys ) === count( $groups ) ) {
diff --git a/tests/phpunit/includes/phpunit-adapter-testcase.php b/tests/phpunit/includes/phpunit-adapter-testcase.php
index 423a9d2213d04..13ac7bdd06614 100644
--- a/tests/phpunit/includes/phpunit-adapter-testcase.php
+++ b/tests/phpunit/includes/phpunit-adapter-testcase.php
@@ -6,7 +6,7 @@
  * PHPUnit adapter layer.
  *
  * This class enhances the PHPUnit native `TestCase` with polyfills
- * for assertions and expectation methods added between PHPUnit 4.8 - 9.5.
+ * for assertions and expectation methods added between PHPUnit 4.8 - 9.6.
  *
  * Additionally, the Polyfill TestCase offers a workaround for the addition
  * of the `void` return type to PHPUnit fixture methods by providing
diff --git a/tests/phpunit/includes/spy-rest-server.php b/tests/phpunit/includes/spy-rest-server.php
index 0702ebbb23c16..49cda8748a1a2 100644
--- a/tests/phpunit/includes/spy-rest-server.php
+++ b/tests/phpunit/includes/spy-rest-server.php
@@ -70,15 +70,15 @@ public function dispatch( $request ) {
 	/**
 	 * Overrides the register_route method so we can re-register routes internally if needed.
 	 *
-	 * @param string $namespace  Namespace.
-	 * @param string $route      The REST route.
-	 * @param array  $route_args Route arguments.
-	 * @param bool   $override   Optional. Whether the route should be overridden if it already exists.
-	 *                           Default false. Also set `$GLOBALS['wp_rest_server']->override_by_default = true`
-	 *                           to set overrides when you don't have access to the caller context.
+	 * @param string $route_namespace Namespace.
+	 * @param string $route           The REST route.
+	 * @param array  $route_args      Route arguments.
+	 * @param bool   $override        Optional. Whether the route should be overridden if it already exists.
+	 *                                Default false. Also set `$GLOBALS['wp_rest_server']->override_by_default = true`
+	 *                                to set overrides when you don't have access to the caller context.
 	 */
-	public function register_route( $namespace, $route, $route_args, $override = false ) {
-		parent::register_route( $namespace, $route, $route_args, $override || $this->override_by_default );
+	public function register_route( $route_namespace, $route, $route_args, $override = false ) {
+		parent::register_route( $route_namespace, $route, $route_args, $override || $this->override_by_default );
 	}
 
 	/**
diff --git a/tests/phpunit/includes/testcase-canonical.php b/tests/phpunit/includes/testcase-canonical.php
index 833df23e5b876..26916fac6e96b 100644
--- a/tests/phpunit/includes/testcase-canonical.php
+++ b/tests/phpunit/includes/testcase-canonical.php
@@ -37,7 +37,7 @@ public function set_up() {
 	/**
 	 * Generate fixtures to be shared between canonical tests.
 	 *
-	 * Abstracted here because it's invoked by setUpBeforeClass() in more than one class.
+	 * Abstracted here because it's invoked by wpSetUpBeforeClass() in more than one class.
 	 *
 	 * @since 4.1.0
 	 */
@@ -46,7 +46,7 @@ public static function generate_shared_fixtures( WP_UnitTest_Factory $factory )
 		self::$author_id        = $factory->user->create( array( 'user_login' => 'canonical-author' ) );
 
 		/*
-		 * Also set in self::setUp(), but we must configure here to make sure that
+		 * Also set in self::set_up(), but we must configure here to make sure that
 		 * post authorship is properly attributed for fixtures.
 		 */
 		wp_set_current_user( self::$author_id );
diff --git a/tests/phpunit/includes/testcase-rest-api.php b/tests/phpunit/includes/testcase-rest-api.php
index 45e7c5e145b77..54644f13fb1de 100644
--- a/tests/phpunit/includes/testcase-rest-api.php
+++ b/tests/phpunit/includes/testcase-rest-api.php
@@ -3,7 +3,7 @@
 abstract class WP_Test_REST_TestCase extends WP_UnitTestCase {
 	protected function assertErrorResponse( $code, $response, $status = null ) {
 
-		if ( is_a( $response, 'WP_REST_Response' ) ) {
+		if ( $response instanceof WP_REST_Response ) {
 			$response = $response->as_error();
 		}
 
diff --git a/tests/phpunit/includes/testcase-rest-controller.php b/tests/phpunit/includes/testcase-rest-controller.php
index 67a7970b66943..9a4c2a0b61b2c 100644
--- a/tests/phpunit/includes/testcase-rest-controller.php
+++ b/tests/phpunit/includes/testcase-rest-controller.php
@@ -9,7 +9,7 @@ public function set_up() {
 		add_filter( 'rest_url', array( $this, 'filter_rest_url_for_leading_slash' ), 10, 2 );
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
diff --git a/tests/phpunit/includes/testcase-xml.php b/tests/phpunit/includes/testcase-xml.php
index 253ac2c7fcd2e..9fc36ec60d968 100644
--- a/tests/phpunit/includes/testcase-xml.php
+++ b/tests/phpunit/includes/testcase-xml.php
@@ -69,7 +69,7 @@ public function normalizeXML( $xml, $options = 0 ) {
 	 * @param string $message   Optional. Message to display when the assertion fails.
 	 */
 	public function assertXMLEquals( $expectedXml, $actualXml, $message = '' ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
-		$this->assertSame( $this->normalizeXML( $expectedXml ), $this->normalizeXML( $actualXml ), $message ); //phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+		$this->assertSame( $this->normalizeXML( $expectedXml ), $this->normalizeXML( $actualXml ), $message ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 	}
 
 	/**
@@ -86,7 +86,7 @@ public function assertXMLEquals( $expectedXml, $actualXml, $message = '' ) { //
 	 * @param string $actualXml
 	 * @param string $message   Optional. Message to display when the assertion fails.
 	 */
-	public function assertXMLNotEquals( $expectedXml, $actualXml, $message = '' ) { //phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
-		$this->assertNotEquals( $this->normalizeXML( $expectedXml ), $this->normalizeXML( $actualXml ), $message ); //phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+	public function assertXMLNotEquals( $expectedXml, $actualXml, $message = '' ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
+		$this->assertNotEquals( $this->normalizeXML( $expectedXml ), $this->normalizeXML( $actualXml ), $message ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase
 	}
 }
diff --git a/tests/phpunit/includes/unregister-blocks-hooks.php b/tests/phpunit/includes/unregister-blocks-hooks.php
index df08612e8c490..164c9c98db3f9 100644
--- a/tests/phpunit/includes/unregister-blocks-hooks.php
+++ b/tests/phpunit/includes/unregister-blocks-hooks.php
@@ -20,7 +20,9 @@
 remove_action( 'init', 'register_block_core_comments_title' );
 remove_action( 'init', 'register_block_core_cover' );
 remove_action( 'init', 'register_block_core_file' );
+remove_action( 'init', 'register_block_core_footnotes' );
 remove_action( 'init', 'register_block_core_gallery' );
+remove_action( 'init', 'register_block_core_heading' );
 remove_action( 'init', 'register_block_core_home_link' );
 remove_action( 'init', 'register_block_core_image' );
 remove_action( 'init', 'register_block_core_latest_comments' );
@@ -30,9 +32,11 @@
 remove_action( 'init', 'register_block_core_navigation_link' );
 remove_action( 'init', 'register_block_core_navigation_submenu' );
 remove_action( 'init', 'register_block_core_page_list' );
+remove_action( 'init', 'register_block_core_page_list_item' );
 remove_action( 'init', 'register_block_core_pattern' );
 remove_action( 'init', 'register_block_core_post_author' );
 remove_action( 'init', 'register_block_core_post_author_biography' );
+remove_action( 'init', 'register_block_core_post_author_name' );
 remove_action( 'init', 'register_block_core_post_comments_form' );
 remove_action( 'init', 'register_block_core_post_content' );
 remove_action( 'init', 'register_block_core_post_date' );
diff --git a/tests/phpunit/includes/utils.php b/tests/phpunit/includes/utils.php
index 16b331b6a67aa..30af6aa348490 100644
--- a/tests/phpunit/includes/utils.php
+++ b/tests/phpunit/includes/utils.php
@@ -431,16 +431,17 @@ function dmp_filter( $a ) {
 	return $a;
 }
 
-function get_echo( $callable, $args = array() ) {
+function get_echo( $callback, $args = array() ) {
 	ob_start();
-	call_user_func_array( $callable, $args );
+	call_user_func_array( $callback, $args );
 	return ob_get_clean();
 }
 
 // Recursively generate some quick assertEquals() tests based on an array.
-function gen_tests_array( $name, $array ) {
+function gen_tests_array( $name, $expected_data ) {
 	$out = array();
-	foreach ( $array as $k => $v ) {
+
+	foreach ( $expected_data as $k => $v ) {
 		if ( is_numeric( $k ) ) {
 			$index = (string) $k;
 		} else {
@@ -455,16 +456,17 @@ function gen_tests_array( $name, $array ) {
 			$out[] = gen_tests_array( "{$name}[{$index}]", $v );
 		}
 	}
+
 	return implode( "\n", $out ) . "\n";
 }
 
 /**
- * Use to create objects by yourself
+ * Use to create objects by yourself.
  */
 class MockClass extends stdClass {}
 
 /**
- * Drops all tables from the WordPress database
+ * Drops all tables from the WordPress database.
  */
 function drop_tables() {
 	global $wpdb;
diff --git a/tests/phpunit/includes/wp-profiler.php b/tests/phpunit/includes/wp-profiler.php
index 17c79ee51b04e..ce78ba4c8e0c5 100644
--- a/tests/phpunit/includes/wp-profiler.php
+++ b/tests/phpunit/includes/wp-profiler.php
@@ -73,7 +73,7 @@ public function stop() {
 
 		if ( isset( $this->profile[ $name ] ) ) {
 			$this->profile[ $name ]['time'] += $time;
-			$this->profile[ $name ]['calls'] ++;
+			$this->profile[ $name ]['calls']++;
 			$this->profile[ $name ]['cache_cold_hits']    += ( $wp_object_cache->cold_cache_hits - $item['cache_cold_hits'] );
 			$this->profile[ $name ]['cache_warm_hits']    += ( $wp_object_cache->warm_cache_hits - $item['cache_warm_hits'] );
 			$this->profile[ $name ]['cache_misses']       += ( $wp_object_cache->cache_misses - $item['cache_misses'] );
@@ -143,7 +143,7 @@ public function _query_summary( $queries, &$out ) {
 			$sql = preg_replace( '/(WHERE \w+ =) \d+/', '$1 x', $sql );
 			$sql = preg_replace( '/(WHERE \w+ =) \'\[-\w]+\'/', '$1 \'xxx\'', $sql );
 
-			$out[ $sql ] ++;
+			$out[ $sql ]++;
 		}
 		asort( $out );
 		return;
diff --git a/tests/phpunit/tests/actions.php b/tests/phpunit/tests/actions.php
index 67222c08198c2..2f0daaa6a0751 100644
--- a/tests/phpunit/tests/actions.php
+++ b/tests/phpunit/tests/actions.php
@@ -535,7 +535,7 @@ public function test_remove_anonymous_callback() {
 		foreach ( $hook as $priority => $filter ) {
 			foreach ( $filter as $identifier => $function ) {
 				if ( is_array( $function )
-					&& is_a( $function['function'][0], 'MockAction' )
+					&& $function['function'][0] instanceof MockAction
 					&& 'action' === $function['function'][1]
 				) {
 					remove_filter(
diff --git a/tests/phpunit/tests/admin/includesFile.php b/tests/phpunit/tests/admin/includesFile.php
index b598a2d3bdb36..375f895c84a2e 100644
--- a/tests/phpunit/tests/admin/includesFile.php
+++ b/tests/phpunit/tests/admin/includesFile.php
@@ -68,8 +68,8 @@ public function test_download_url_non_200_response_code() {
 		remove_filter( 'pre_http_request', array( $this, '_fake_download_url_non_200_response_code' ) );
 	}
 
-	public function _fake_download_url_non_200_response_code( $response, $args, $url ) {
-		file_put_contents( $args['filename'], 'This is an unexpected error message from your favorite server.' );
+	public function _fake_download_url_non_200_response_code( $response, $parsed_args, $url ) {
+		file_put_contents( $parsed_args['filename'], 'This is an unexpected error message from your favorite server.' );
 		return array(
 			'response' => array(
 				'code'    => 418,
@@ -150,13 +150,13 @@ public function data_save_to_temp_directory_when_getting_filename_from_content_d
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'attachment; filename="filename-from-content-disposition-header.txt"',
+				'Content-Disposition' => 'attachment; filename="filename-from-content-disposition-header.txt"',
 			),
 		);
 	}
@@ -168,13 +168,13 @@ public function filter_content_disposition_header_with_filename( $response, $arg
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename_with_path_traversal( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename_with_path_traversal( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'attachment; filename="../../filename-from-content-disposition-header.txt"',
+				'Content-Disposition' => 'attachment; filename="../../filename-from-content-disposition-header.txt"',
 			),
 		);
 	}
@@ -186,13 +186,13 @@ public function filter_content_disposition_header_with_filename_with_path_traver
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename_without_quotes( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename_without_quotes( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'attachment; filename=filename-from-content-disposition-header.txt',
+				'Content-Disposition' => 'attachment; filename=filename-from-content-disposition-header.txt',
 			),
 		);
 	}
@@ -235,13 +235,13 @@ public function data_download_url_should_reject_filename_from_invalid_content_di
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename_without_context( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename_without_context( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'filename="filename-from-content-disposition-header.txt"',
+				'Content-Disposition' => 'filename="filename-from-content-disposition-header.txt"',
 			),
 		);
 	}
@@ -253,13 +253,13 @@ public function filter_content_disposition_header_with_filename_without_context(
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename_with_inline_context( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename_with_inline_context( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'inline; filename="filename-from-content-disposition-header.txt"',
+				'Content-Disposition' => 'inline; filename="filename-from-content-disposition-header.txt"',
 			),
 		);
 	}
@@ -271,13 +271,13 @@ public function filter_content_disposition_header_with_filename_with_inline_cont
 	 *
 	 * @return array
 	 */
-	public function filter_content_disposition_header_with_filename_with_form_data_context( $response, $args, $url ) {
+	public function filter_content_disposition_header_with_filename_with_form_data_context( $response, $parsed_args, $url ) {
 		return array(
 			'response' => array(
 				'code' => 200,
 			),
 			'headers'  => array(
-				'content-disposition' => 'form-data; name="file"; filename="filename-from-content-disposition-header.txt"',
+				'Content-Disposition' => 'form-data; name="file"; filename="filename-from-content-disposition-header.txt"',
 			),
 		);
 	}
@@ -365,12 +365,12 @@ static function( $urls ) {
 	/**
 	 * Mock the HTTP request response.
 	 *
-	 * @param bool   $false     False.
-	 * @param array  $arguments Request arguments.
-	 * @param string $url       Request URL.
-	 * @return array|bool
+	 * @param false|array|WP_Error $response    A preemptive return value of an HTTP request. Default false.
+	 * @param array                $parsed_args HTTP request arguments.
+	 * @param string               $url         The request URL.
+	 * @return false|array|WP_Error Response data.
 	 */
-	public function mock_http_request( $false, $arguments, $url ) {
+	public function mock_http_request( $response, $parsed_args, $url ) {
 		if ( 'https://example.com' === $url ) {
 			return array(
 				'response' => array(
@@ -379,6 +379,6 @@ public function mock_http_request( $false, $arguments, $url ) {
 			);
 		}
 
-		return $false;
+		return $response;
 	}
 }
diff --git a/tests/phpunit/tests/admin/includesPost.php b/tests/phpunit/tests/admin/includesPost.php
index 799d927dfa909..4ce59dbabe177 100644
--- a/tests/phpunit/tests/admin/includesPost.php
+++ b/tests/phpunit/tests/admin/includesPost.php
@@ -293,6 +293,72 @@ public function test_bulk_edit_posts_should_preserve_post_format_when_unchanged(
 		$this->assertFalse( get_post_format( $post_ids[2] ) );
 	}
 
+	/**
+	 * @ticket 31635
+	 */
+	public function test_bulk_edit_posts_should_publish_scheduled_post() {
+		wp_set_current_user( self::$admin_id );
+
+		$post = self::factory()->post->create(
+			array(
+				'post_author'    => self::$author_ids[0],
+				'comment_status' => 'closed',
+				'ping_status'    => 'closed',
+				'post_status'    => 'future',
+				'post_date'      => gmdate( 'Y-m-d H:i:s', strtotime( '+1 month' ) ),
+			)
+		);
+
+		$request = array(
+			'post_type'      => 'post',
+			'post_author'    => -1,
+			'ping_status'    => -1,
+			'comment_status' => -1,
+			'_status'        => 'publish',
+			'post'           => array( $post ),
+		);
+
+		bulk_edit_posts( $request );
+
+		$this->assertSame( 'publish', get_post_status( $post ) );
+		$this->assertLessThanOrEqual( gmdate( 'Y-m-d H:i:s' ), get_post_time( 'Y-m-d H:i:s', false, $post ) );
+	}
+	/**
+	 * @ticket 31635
+	 */
+	public function test_bulk_edit_posts_should_publish_draft_immediately() {
+		wp_set_current_user( self::$admin_id );
+
+		// Create draft last edited a month ago
+		$post = self::factory()->post->create(
+			array(
+				'post_author'    => self::$author_ids[0],
+				'comment_status' => 'closed',
+				'ping_status'    => 'closed',
+				'post_status'    => 'draft',
+				'post_date'      => gmdate( 'Y-m-d H:i:s', strtotime( '-1 month' ) ),
+			)
+		);
+
+		$request = array(
+			'post_type'      => 'post',
+			'post_author'    => -1,
+			'ping_status'    => -1,
+			'comment_status' => -1,
+			'_status'        => 'publish',
+			'post'           => array( $post ),
+		);
+
+		bulk_edit_posts( $request );
+
+		$this->assertSame( 'publish', get_post_status( $post ) );
+
+		// Expect to be published within the last minute (to consider slow testing environment).
+		$minute_before = gmdate( 'Y-m-d H:i:s', strtotime( '-1 minute' ) );
+		$this->assertGreaterThanOrEqual( $minute_before, get_post_time( 'Y-m-d H:i:s', false, $post ) );
+		$this->assertLessThanOrEqual( gmdate( 'Y-m-d H:i:s' ), get_post_time( 'Y-m-d H:i:s', false, $post ) );
+	}
+
 	/**
 	 * @ticket 41396
 	 */
@@ -318,6 +384,31 @@ public function check_post_format( $post_id ) {
 		}
 	}
 
+	/**
+	 * Tests that `bulk_edit_posts()` fires the 'bulk_edit_posts' action.
+	 *
+	 * @ticket 28112
+	 *
+	 * @covers ::bulk_edit_posts
+	 */
+	public function test_bulk_edit_posts_should_fire_bulk_edit_posts_action() {
+		wp_set_current_user( self::$admin_id );
+
+		$action = new MockAction();
+		add_action( 'bulk_edit_posts', array( $action, 'action' ) );
+
+		bulk_edit_posts(
+			array(
+				'post'      => self::$post_id,
+				'post_type' => 'post',
+				'_status'   => 1,
+
+			)
+		);
+
+		$this->assertSame( 1, $action->get_call_count() );
+	}
+
 	/**
 	 * @ticket 38293
 	 */
@@ -826,6 +917,7 @@ public function test_get_block_editor_server_block_settings() {
 			'category'        => 'common',
 			'render_callback' => 'foo',
 			'ancestor'        => array( 'core/test-ancestor' ),
+			'selectors'       => array( 'root' => '.wp-block-test' ),
 		);
 
 		register_block_type( $name, $settings );
@@ -845,6 +937,7 @@ public function test_get_block_editor_server_block_settings() {
 					'lock' => array( 'type' => 'object' ),
 				),
 				'usesContext' => array(),
+				'selectors'   => array( 'root' => '.wp-block-test' ),
 				'category'    => 'common',
 				'styles'      => array(),
 				'ancestor'    => array( 'core/test-ancestor' ),
diff --git a/tests/phpunit/tests/admin/includesTemplate.php b/tests/phpunit/tests/admin/includesTemplate.php
index 6b61639c35f08..ca769eb8b70f7 100644
--- a/tests/phpunit/tests/admin/includesTemplate.php
+++ b/tests/phpunit/tests/admin/includesTemplate.php
@@ -222,7 +222,7 @@ public function test_get_settings_errors_sources() {
 	 * @ticket 44941
 	 * @covers ::settings_errors
 	 * @global array $wp_settings_errors
-	 * @dataProvider settings_errors_css_classes_provider
+	 * @dataProvider data_settings_errors_css_classes
 	 */
 	public function test_settings_errors_css_classes( $type, $expected ) {
 		global $wp_settings_errors;
@@ -241,7 +241,7 @@ public function test_settings_errors_css_classes( $type, $expected ) {
 		$this->assertStringNotContainsString( 'notice-notice-', $output );
 	}
 
-	public function settings_errors_css_classes_provider() {
+	public function data_settings_errors_css_classes() {
 		return array(
 			array( 'error', 'notice-error' ),
 			array( 'success', 'notice-success' ),
diff --git a/tests/phpunit/tests/admin/includesUser.php b/tests/phpunit/tests/admin/includesUser.php
index 0b590377e9164..c4f6f0c9c1aeb 100644
--- a/tests/phpunit/tests/admin/includesUser.php
+++ b/tests/phpunit/tests/admin/includesUser.php
@@ -7,52 +7,82 @@
 class Tests_Admin_IncludesUser extends WP_UnitTestCase {
 
 	/**
-	 * @ticket       42790
+	 * Test redirect URLs for application password authorization requests.
+	 *
+	 * @ticket 42790
+	 * @ticket 52617
+	 *
+	 * @covers ::wp_is_authorize_application_password_request_valid
+	 *
 	 * @dataProvider data_is_authorize_application_password_request_valid
-	 * @param array  $request    The request data to validate.
-	 * @param string $error_code The expected error code, empty if no error.
+	 *
+	 * @param array  $request             The request data to validate.
+	 * @param string $expected_error_code The expected error code, empty if no error is expected.
+	 * @param string $env                 The environment type. Defaults to 'production'.
 	 */
-	public function test_is_authorize_application_password_request_valid( $request, $error_code ) {
-		$error = wp_is_authorize_application_password_request_valid( $request, get_userdata( 1 ) );
+	public function test_is_authorize_application_password_request_valid( $request, $expected_error_code, $env = 'production' ) {
+		putenv( "WP_ENVIRONMENT_TYPE=$env" );
 
-		if ( $error_code ) {
-			$this->assertWPError( $error );
-			$this->assertSame( $error_code, $error->get_error_code() );
+		$actual = wp_is_authorize_application_password_request_valid( $request, get_userdata( 1 ) );
+
+		putenv( 'WP_ENVIRONMENT_TYPE' );
+
+		if ( $expected_error_code ) {
+			$this->assertWPError( $actual, 'A WP_Error object is expected.' );
+			$this->assertSame( $expected_error_code, $actual->get_error_code(), 'Unexpected error code.' );
 		} else {
-			$this->assertNotWPError( $error );
+			$this->assertNotWPError( $actual, 'A WP_Error object is not expected.' );
 		}
 	}
 
 	public function data_is_authorize_application_password_request_valid() {
-		return array(
-			array(
-				array(),
-				'',
-			),
-			array(
-				array( 'success_url' => 'http://example.org' ),
-				'invalid_redirect_scheme',
-			),
-			array(
-				array( 'reject_url' => 'http://example.org' ),
-				'invalid_redirect_scheme',
-			),
-			array(
-				array( 'success_url' => 'https://example.org' ),
-				'',
-			),
-			array(
-				array( 'reject_url' => 'https://example.org' ),
-				'',
-			),
-			array(
-				array( 'success_url' => 'wordpress://example' ),
-				'',
-			),
-			array(
-				array( 'reject_url' => 'wordpress://example' ),
-				'',
-			),
-		);
+		$environment_types = array( 'local', 'development', 'staging', 'production' );
+
+		$datasets = array();
+		foreach ( $environment_types as $environment_type ) {
+			$datasets[ $environment_type . ' and no request arguments' ] = array(
+				'request'             => array(),
+				'expected_error_code' => '',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and a "https" scheme "success_url"' ] = array(
+				'request'             => array( 'success_url' => 'https://example.org' ),
+				'expected_error_code' => '',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and a "https" scheme "reject_url"' ] = array(
+				'request'             => array( 'reject_url' => 'https://example.org' ),
+				'expected_error_code' => '',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and an app scheme "success_url"' ] = array(
+				'request'             => array( 'success_url' => 'wordpress://example' ),
+				'expected_error_code' => '',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and an app scheme "reject_url"' ] = array(
+				'request'             => array( 'reject_url' => 'wordpress://example' ),
+				'expected_error_code' => '',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and a "http" scheme "success_url"' ] = array(
+				'request'             => array( 'success_url' => 'http://example.org' ),
+				'expected_error_code' => 'local' === $environment_type ? '' : 'invalid_redirect_scheme',
+				'env'                 => $environment_type,
+			);
+
+			$datasets[ $environment_type . ' and a "http" scheme "reject_url"' ] = array(
+				'request'             => array( 'reject_url' => 'http://example.org' ),
+				'expected_error_code' => 'local' === $environment_type ? '' : 'invalid_redirect_scheme',
+				'env'                 => $environment_type,
+			);
+		}
+
+		return $datasets;
 	}
 }
diff --git a/tests/phpunit/tests/admin/wpAdminNotice.php b/tests/phpunit/tests/admin/wpAdminNotice.php
new file mode 100644
index 0000000000000..2feca7de7c433
--- /dev/null
+++ b/tests/phpunit/tests/admin/wpAdminNotice.php
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * Tests for `wp_admin_notice()`.
+ *
+ * @group admin
+ *
+ * @covers ::wp_admin_notice
+ */
+class Tests_Admin_WpAdminNotice extends WP_UnitTestCase {
+
+	/**
+	 * Tests that `wp_admin_notice()` outputs the expected admin notice markup.
+	 *
+	 * @ticket 57791
+	 *
+	 * @dataProvider data_should_output_admin_notice
+	 *
+	 * @param string $message  The message to output.
+	 * @param array  $args     Arguments for the admin notice.
+	 * @param string $expected The expected admin notice markup.
+	 */
+	public function test_should_output_admin_notice( $message, $args, $expected ) {
+		ob_start();
+		wp_admin_notice( $message, $args );
+		$actual = ob_get_clean();
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_output_admin_notice() {
+		return array(
+			'defaults'                                  => array(
+				'message'  => 'A notice with defaults.',
+				'args'     => array(),
+				'expected' => '<div class="notice"><p>A notice with defaults.</p></div>',
+			),
+			'an empty message (used for templates)'     => array(
+				'message'  => '',
+				'args'     => array(
+					'type'               => 'error',
+					'dismissible'        => true,
+					'id'                 => 'message',
+					'additional_classes' => array( 'inline', 'hidden' ),
+				),
+				'expected' => '<div id="message" class="notice notice-error is-dismissible inline hidden"><p></p></div>',
+			),
+			'an empty message (used for templates) without paragraph wrapping' => array(
+				'message'  => '',
+				'args'     => array(
+					'type'               => 'error',
+					'dismissible'        => true,
+					'id'                 => 'message',
+					'additional_classes' => array( 'inline', 'hidden' ),
+					'paragraph_wrap'     => false,
+				),
+				'expected' => '<div id="message" class="notice notice-error is-dismissible inline hidden"></div>',
+			),
+			'an "error" notice'                         => array(
+				'message'  => 'An "error" notice.',
+				'args'     => array(
+					'type' => 'error',
+				),
+				'expected' => '<div class="notice notice-error"><p>An "error" notice.</p></div>',
+			),
+			'a "success" notice'                        => array(
+				'message'  => 'A "success" notice.',
+				'args'     => array(
+					'type' => 'success',
+				),
+				'expected' => '<div class="notice notice-success"><p>A "success" notice.</p></div>',
+			),
+			'a "warning" notice'                        => array(
+				'message'  => 'A "warning" notice.',
+				'args'     => array(
+					'type' => 'warning',
+				),
+				'expected' => '<div class="notice notice-warning"><p>A "warning" notice.</p></div>',
+			),
+			'an "info" notice'                          => array(
+				'message'  => 'An "info" notice.',
+				'args'     => array(
+					'type' => 'info',
+				),
+				'expected' => '<div class="notice notice-info"><p>An "info" notice.</p></div>',
+			),
+			'a type that already starts with "notice-"' => array(
+				'message'  => 'A type that already starts with "notice-".',
+				'args'     => array(
+					'type' => 'notice-info',
+				),
+				'expected' => '<div class="notice notice-notice-info"><p>A type that already starts with "notice-".</p></div>',
+			),
+			'a dismissible notice'                      => array(
+				'message'  => 'A dismissible notice.',
+				'args'     => array(
+					'dismissible' => true,
+				),
+				'expected' => '<div class="notice is-dismissible"><p>A dismissible notice.</p></div>',
+			),
+			'no type and an ID'                         => array(
+				'message'  => 'A notice with an ID.',
+				'args'     => array(
+					'id' => 'message',
+				),
+				'expected' => '<div id="message" class="notice"><p>A notice with an ID.</p></div>',
+			),
+			'a type and an ID'                          => array(
+				'message'  => 'A warning notice with an ID.',
+				'args'     => array(
+					'type' => 'warning',
+					'id'   => 'message',
+				),
+				'expected' => '<div id="message" class="notice notice-warning"><p>A warning notice with an ID.</p></div>',
+			),
+			'no type and additional classes'            => array(
+				'message'  => 'A notice with additional classes.',
+				'args'     => array(
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice error notice-alt"><p>A notice with additional classes.</p></div>',
+			),
+			'a type and additional classes'             => array(
+				'message'  => 'A warning notice with additional classes.',
+				'args'     => array(
+					'type'               => 'warning',
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice notice-warning error notice-alt"><p>A warning notice with additional classes.</p></div>',
+			),
+			'a dismissible notice with a type and additional classes' => array(
+				'message'  => 'A dismissible warning notice with a type and additional classes.',
+				'args'     => array(
+					'type'               => 'warning',
+					'dismissible'        => true,
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice notice-warning is-dismissible error notice-alt"><p>A dismissible warning notice with a type and additional classes.</p></div>',
+			),
+			'a notice without paragraph wrapping'       => array(
+				'message'  => '<span>A notice without paragraph wrapping.</span>',
+				'args'     => array(
+					'paragraph_wrap' => false,
+				),
+				'expected' => '<div class="notice"><span>A notice without paragraph wrapping.</span></div>',
+			),
+			'an unsafe type'                            => array(
+				'message'  => 'A notice with an unsafe type.',
+				'args'     => array(
+					'type' => '"><script>alert("Howdy,admin!");</script>',
+				),
+				'expected' => '<div class="notice notice-">alert("Howdy,admin!");"&gt;<p>A notice with an unsafe type.</p></div>',
+			),
+			'an unsafe ID'                              => array(
+				'message'  => 'A notice with an unsafe ID.',
+				'args'     => array(
+					'id' => '"><script>alert( "Howdy, admin!" );</script> <div class="notice',
+				),
+				'expected' => '<div id="">alert( "Howdy, admin!" ); <div class="notice"><p>A notice with an unsafe ID.</p></div>',
+			),
+			'unsafe additional classes'                 => array(
+				'message'  => 'A notice with unsafe additional classes.',
+				'args'     => array(
+					'additional_classes' => array( '"><script>alert( "Howdy, admin!" );</script> <div class="notice' ),
+				),
+				'expected' => '<div class="notice ">alert( "Howdy, admin!" ); <div class="notice"><p>A notice with unsafe additional classes.</p></div>',
+			),
+			'a type that is not a string'               => array(
+				'message'  => 'A notice with a type that is not a string.',
+				'args'     => array(
+					'type' => array(),
+				),
+				'expected' => '<div class="notice"><p>A notice with a type that is not a string.</p></div>',
+			),
+			'a type with only empty space'              => array(
+				'message'  => 'A notice with a type with only empty space.',
+				'args'     => array(
+					'type' => " \t\r\n",
+				),
+				'expected' => '<div class="notice"><p>A notice with a type with only empty space.</p></div>',
+			),
+			'an ID that is not a string'                => array(
+				'message'  => 'A notice with an ID that is not a string.',
+				'args'     => array(
+					'id' => array( 'message' ),
+				),
+				'expected' => '<div class="notice"><p>A notice with an ID that is not a string.</p></div>',
+			),
+			'an ID with only empty space'               => array(
+				'message'  => 'A notice with an ID with only empty space.',
+				'args'     => array(
+					'id' => " \t\r\n",
+				),
+				'expected' => '<div class="notice"><p>A notice with an ID with only empty space.</p></div>',
+			),
+			'dismissible as a truthy value rather than (bool) true' => array(
+				'message'  => 'A notice with dismissible as a truthy value rather than (bool) true.',
+				'args'     => array(
+					'dismissible' => 1,
+				),
+				'expected' => '<div class="notice"><p>A notice with dismissible as a truthy value rather than (bool) true.</p></div>',
+			),
+			'additional classes that are not an array'  => array(
+				'message'  => 'A notice with additional classes that are not an array.',
+				'args'     => array(
+					'additional_classes' => 'class-1 class-2 class-3',
+				),
+				'expected' => '<div class="notice"><p>A notice with additional classes that are not an array.</p></div>',
+			),
+			'paragraph wrapping as a falsy value rather than (bool) false' => array(
+				'message'  => 'A notice with paragraph wrapping as a falsy value rather than (bool) false.',
+				'args'     => array(
+					'paragraph_wrap' => 0,
+				),
+				'expected' => '<div class="notice"><p>A notice with paragraph wrapping as a falsy value rather than (bool) false.</p></div>',
+			),
+		);
+	}
+
+	/**
+	 * Tests that `_doing_it_wrong()` is thrown when a 'type' containing spaces is passed.
+	 *
+	 * @ticket 57791
+	 *
+	 * @expectedIncorrectUsage wp_get_admin_notice
+	 */
+	public function test_should_throw_doing_it_wrong_with_a_type_containing_spaces() {
+		ob_start();
+		wp_admin_notice(
+			'A type containing spaces.',
+			array( 'type' => 'first second third fourth' )
+		);
+		$actual = ob_get_clean();
+
+		$this->assertSame(
+			'<div class="notice notice-first second third fourth"><p>A type containing spaces.</p></div>',
+			$actual
+		);
+	}
+
+	/**
+	 * Tests that `wp_admin_notice()` fires the 'wp_admin_notice' action.
+	 *
+	 * @ticket 57791
+	 */
+	public function test_should_fire_wp_admin_notice_action() {
+		$action = new MockAction();
+		add_action( 'wp_admin_notice', array( $action, 'action' ) );
+
+		ob_start();
+		wp_admin_notice( 'A notice.', array( 'type' => 'success' ) );
+		ob_end_clean();
+
+		$this->assertSame( 1, $action->get_call_count() );
+	}
+}
diff --git a/tests/phpunit/tests/admin/wpAutomaticUpdater.php b/tests/phpunit/tests/admin/wpAutomaticUpdater.php
index 65bb39db2aa92..eb91a97c09e5b 100644
--- a/tests/phpunit/tests/admin/wpAutomaticUpdater.php
+++ b/tests/phpunit/tests/admin/wpAutomaticUpdater.php
@@ -572,4 +572,162 @@ public function data_send_plugin_theme_email_should_not_append_plugin_urls() {
 			),
 		);
 	}
+
+	/**
+	 * Tests that `WP_Automatic_Updater::is_allowed_dir()` returns true
+	 * when the `open_basedir` directive is not set.
+	 *
+	 * @ticket 42619
+	 *
+	 * @covers WP_Automatic_Updater::is_allowed_dir
+	 */
+	public function test_is_allowed_dir_should_return_true_if_open_basedir_is_not_set() {
+		$this->assertTrue( self::$updater->is_allowed_dir( ABSPATH ) );
+	}
+
+	/**
+	 * Tests that `WP_Automatic_Updater::is_allowed_dir()` returns true
+	 * when the `open_basedir` directive is set and the path is allowed.
+	 *
+	 * Runs in a separate process to ensure that `open_basedir` changes
+	 * don't impact other tests should an error occur.
+	 *
+	 * This test does not preserve global state to prevent the exception
+	 * "Serialization of 'Closure' is not allowed" when running in
+	 * a separate process.
+	 *
+	 * @ticket 42619
+	 *
+	 * @covers WP_Automatic_Updater::is_allowed_dir
+	 *
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function test_is_allowed_dir_should_return_true_if_open_basedir_is_set_and_path_is_allowed() {
+		// The repository for PHPUnit and test suite resources.
+		$abspath_parent      = trailingslashit( dirname( ABSPATH ) );
+		$abspath_grandparent = trailingslashit( dirname( $abspath_parent ) );
+
+		$open_basedir_backup = ini_get( 'open_basedir' );
+		// Allow access to the directory one level above the repository.
+		ini_set( 'open_basedir', wp_normalize_path( $abspath_grandparent ) );
+
+		// Checking an allowed directory should succeed.
+		$actual = self::$updater->is_allowed_dir( wp_normalize_path( ABSPATH ) );
+
+		ini_set( 'open_basedir', $open_basedir_backup );
+
+		$this->assertTrue( $actual );
+	}
+
+	/**
+	 * Tests that `WP_Automatic_Updater::is_allowed_dir()` returns false
+	 * when the `open_basedir` directive is set and the path is not allowed.
+	 *
+	 * Runs in a separate process to ensure that `open_basedir` changes
+	 * don't impact other tests should an error occur.
+	 *
+	 * This test does not preserve global state to prevent the exception
+	 * "Serialization of 'Closure' is not allowed" when running in
+	 * a separate process.
+	 *
+	 * @ticket 42619
+	 *
+	 * @covers WP_Automatic_Updater::is_allowed_dir
+	 *
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
+	 */
+	public function test_is_allowed_dir_should_return_false_if_open_basedir_is_set_and_path_is_not_allowed() {
+		// The repository for PHPUnit and test suite resources.
+		$abspath_parent      = trailingslashit( dirname( ABSPATH ) );
+		$abspath_grandparent = trailingslashit( dirname( $abspath_parent ) );
+
+		$open_basedir_backup = ini_get( 'open_basedir' );
+		// Allow access to the directory one level above the repository.
+		ini_set( 'open_basedir', wp_normalize_path( $abspath_grandparent ) );
+
+		// Checking a directory not within the allowed path should trigger an `open_basedir` warning.
+		$actual = self::$updater->is_allowed_dir( '/.git' );
+
+		ini_set( 'open_basedir', $open_basedir_backup );
+
+		$this->assertFalse( $actual );
+	}
+
+	/**
+	 * Tests that `WP_Automatic_Updater::is_allowed_dir()` throws `_doing_it_wrong()`
+	 * when an invalid `$dir` argument is provided.
+	 *
+	 * @ticket 42619
+	 *
+	 * @covers WP_Automatic_Updater::is_allowed_dir
+	 *
+	 * @expectedIncorrectUsage WP_Automatic_Updater::is_allowed_dir
+	 *
+	 * @dataProvider data_is_allowed_dir_should_throw_doing_it_wrong_with_invalid_dir
+	 *
+	 * @param mixed $dir The directory to check.
+	 */
+	public function test_is_allowed_dir_should_throw_doing_it_wrong_with_invalid_dir( $dir ) {
+		$this->assertFalse( self::$updater->is_allowed_dir( $dir ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_is_allowed_dir_should_throw_doing_it_wrong_with_invalid_dir() {
+		return array(
+			// Type checks and boolean comparisons.
+			'null'                              => array( 'dir' => null ),
+			'(bool) false'                      => array( 'dir' => false ),
+			'(bool) true'                       => array( 'dir' => true ),
+			'(int) 0'                           => array( 'dir' => 0 ),
+			'(int) -0'                          => array( 'dir' => -0 ),
+			'(int) 1'                           => array( 'dir' => 1 ),
+			'(int) -1'                          => array( 'dir' => -1 ),
+			'(float) 0.0'                       => array( 'dir' => 0.0 ),
+			'(float) -0.0'                      => array( 'dir' => -0.0 ),
+			'(float) 1.0'                       => array( 'dir' => 1.0 ),
+			'empty string'                      => array( 'dir' => '' ),
+			'empty array'                       => array( 'dir' => array() ),
+			'populated array'                   => array( 'dir' => array( ABSPATH ) ),
+			'empty object'                      => array( 'dir' => new stdClass() ),
+			'populated object'                  => array( 'dir' => (object) array( ABSPATH ) ),
+			'INF'                               => array( 'dir' => INF ),
+			'NAN'                               => array( 'dir' => NAN ),
+
+			// Ensures that `trim()` has been called.
+			'string with only spaces'           => array( 'dir' => '   ' ),
+			'string with only tabs'             => array( 'dir' => "\t\t" ),
+			'string with only newlines'         => array( 'dir' => "\n\n" ),
+			'string with only carriage returns' => array( 'dir' => "\r\r" ),
+		);
+	}
+
+	/**
+	 * Tests that `WP_Automatic_Updater::is_vcs_checkout()` returns `false`
+	 * when none of the checked directories are allowed.
+	 *
+	 * @ticket 58563
+	 *
+	 * @covers WP_Automatic_Updater::is_vcs_checkout
+	 */
+	public function test_is_vcs_checkout_should_return_false_when_no_directories_are_allowed() {
+		$updater_mock = $this->getMockBuilder( 'WP_Automatic_Updater' )
+			// Note: setMethods() is deprecated in PHPUnit 9, but still supported.
+			->setMethods( array( 'is_allowed_dir' ) )
+			->getMock();
+
+		/*
+		 * As none of the directories should be allowed, simply mocking `WP_Automatic_Updater`
+		 * and forcing `::is_allowed_dir()` to return `false` removes the need to run the test
+		 * in a separate process due to setting the `open_basedir` PHP directive.
+		 */
+		$updater_mock->expects( $this->any() )->method( 'is_allowed_dir' )->willReturn( false );
+
+		$this->assertFalse( $updater_mock->is_vcs_checkout( get_temp_dir() ) );
+	}
 }
diff --git a/tests/phpunit/tests/admin/wpCommentsListTable.php b/tests/phpunit/tests/admin/wpCommentsListTable.php
index 20fcd836e2cac..a394823d3777c 100644
--- a/tests/phpunit/tests/admin/wpCommentsListTable.php
+++ b/tests/phpunit/tests/admin/wpCommentsListTable.php
@@ -10,7 +10,7 @@ class Tests_Admin_wpCommentsListTable extends WP_UnitTestCase {
 	 */
 	protected $table;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 	}
diff --git a/tests/phpunit/tests/admin/wpCommunityEvents.php b/tests/phpunit/tests/admin/wpCommunityEvents.php
index 6dfd4f044af7a..6b8ccc7f9bc99 100644
--- a/tests/phpunit/tests/admin/wpCommunityEvents.php
+++ b/tests/phpunit/tests/admin/wpCommunityEvents.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.8.0
- */
-
-/**
- * Class Tests_Admin_wpCommunityEvents.
  *
  * @group admin
  * @group community-events
- *
- * @since 4.8.0
  */
 class Tests_Admin_wpCommunityEvents extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/admin/wpGetAdminNotice.php b/tests/phpunit/tests/admin/wpGetAdminNotice.php
new file mode 100644
index 0000000000000..b5ba31133883a
--- /dev/null
+++ b/tests/phpunit/tests/admin/wpGetAdminNotice.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * Tests for `wp_get_admin_notice()`.
+ *
+ * @group admin
+ *
+ * @covers ::wp_get_admin_notice
+ */
+class Tests_Admin_WpGetAdminNotice extends WP_UnitTestCase {
+
+	/**
+	 * Tests that `wp_get_admin_notice()` returns the expected admin notice markup.
+	 *
+	 * @ticket 57791
+	 *
+	 * @dataProvider data_should_return_admin_notice
+	 *
+	 * @param string $message  The message.
+	 * @param array  $args     Arguments for the admin notice.
+	 * @param string $expected The expected admin notice markup.
+	 */
+	public function test_should_return_admin_notice( $message, $args, $expected ) {
+		$this->assertSame( $expected, wp_get_admin_notice( $message, $args ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_return_admin_notice() {
+		return array(
+			'defaults'                                  => array(
+				'message'  => 'A notice with defaults.',
+				'args'     => array(),
+				'expected' => '<div class="notice"><p>A notice with defaults.</p></div>',
+			),
+			'an empty message (used for templates)'     => array(
+				'message'  => '',
+				'args'     => array(
+					'type'               => 'error',
+					'dismissible'        => true,
+					'id'                 => 'message',
+					'additional_classes' => array( 'inline', 'hidden' ),
+				),
+				'expected' => '<div id="message" class="notice notice-error is-dismissible inline hidden"><p></p></div>',
+			),
+			'an empty message (used for templates) without paragraph wrapping' => array(
+				'message'  => '',
+				'args'     => array(
+					'type'               => 'error',
+					'dismissible'        => true,
+					'id'                 => 'message',
+					'additional_classes' => array( 'inline', 'hidden' ),
+					'paragraph_wrap'     => false,
+				),
+				'expected' => '<div id="message" class="notice notice-error is-dismissible inline hidden"></div>',
+			),
+			'an "error" notice'                         => array(
+				'message'  => 'An "error" notice.',
+				'args'     => array(
+					'type' => 'error',
+				),
+				'expected' => '<div class="notice notice-error"><p>An "error" notice.</p></div>',
+			),
+			'a "success" notice'                        => array(
+				'message'  => 'A "success" notice.',
+				'args'     => array(
+					'type' => 'success',
+				),
+				'expected' => '<div class="notice notice-success"><p>A "success" notice.</p></div>',
+			),
+			'a "warning" notice'                        => array(
+				'message'  => 'A "warning" notice.',
+				'args'     => array(
+					'type' => 'warning',
+				),
+				'expected' => '<div class="notice notice-warning"><p>A "warning" notice.</p></div>',
+			),
+			'an "info" notice'                          => array(
+				'message'  => 'An "info" notice.',
+				'args'     => array(
+					'type' => 'info',
+				),
+				'expected' => '<div class="notice notice-info"><p>An "info" notice.</p></div>',
+			),
+			'a type that already starts with "notice-"' => array(
+				'message'  => 'A type that already starts with "notice-".',
+				'args'     => array(
+					'type' => 'notice-info',
+				),
+				'expected' => '<div class="notice notice-notice-info"><p>A type that already starts with "notice-".</p></div>',
+			),
+			'a dismissible notice'                      => array(
+				'message'  => 'A dismissible notice.',
+				'args'     => array(
+					'dismissible' => true,
+				),
+				'expected' => '<div class="notice is-dismissible"><p>A dismissible notice.</p></div>',
+			),
+			'no type and an ID'                         => array(
+				'message'  => 'A notice with an ID.',
+				'args'     => array(
+					'id' => 'message',
+				),
+				'expected' => '<div id="message" class="notice"><p>A notice with an ID.</p></div>',
+			),
+			'a type and an ID'                          => array(
+				'message'  => 'A warning notice with an ID.',
+				'args'     => array(
+					'type' => 'warning',
+					'id'   => 'message',
+				),
+				'expected' => '<div id="message" class="notice notice-warning"><p>A warning notice with an ID.</p></div>',
+			),
+			'no type and additional classes'            => array(
+				'message'  => 'A notice with additional classes.',
+				'args'     => array(
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice error notice-alt"><p>A notice with additional classes.</p></div>',
+			),
+			'a type and additional classes'             => array(
+				'message'  => 'A warning notice with additional classes.',
+				'args'     => array(
+					'type'               => 'warning',
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice notice-warning error notice-alt"><p>A warning notice with additional classes.</p></div>',
+			),
+			'a dismissible notice with a type and additional classes' => array(
+				'message'  => 'A dismissible warning notice with a type and additional classes.',
+				'args'     => array(
+					'type'               => 'warning',
+					'dismissible'        => true,
+					'additional_classes' => array( 'error', 'notice-alt' ),
+				),
+				'expected' => '<div class="notice notice-warning is-dismissible error notice-alt"><p>A dismissible warning notice with a type and additional classes.</p></div>',
+			),
+			'a notice without paragraph wrapping'       => array(
+				'message'  => '<span>A notice without paragraph wrapping.</span>',
+				'args'     => array(
+					'paragraph_wrap' => false,
+				),
+				'expected' => '<div class="notice"><span>A notice without paragraph wrapping.</span></div>',
+			),
+			'an unsafe type'                            => array(
+				'message'  => 'A notice with an unsafe type.',
+				'args'     => array(
+					'type' => '"><script>alert("Howdy,admin!");</script>',
+				),
+				'expected' => '<div class="notice notice-"><script>alert("Howdy,admin!");</script>"><p>A notice with an unsafe type.</p></div>',
+			),
+			'an unsafe ID'                              => array(
+				'message'  => 'A notice with an unsafe ID.',
+				'args'     => array(
+					'id' => '"><script>alert( "Howdy, admin!" );</script> <div class="notice',
+				),
+				'expected' => '<div id=""><script>alert( "Howdy, admin!" );</script> <div class="notice" class="notice"><p>A notice with an unsafe ID.</p></div>',
+			),
+			'unsafe additional classes'                 => array(
+				'message'  => 'A notice with unsafe additional classes.',
+				'args'     => array(
+					'additional_classes' => array( '"><script>alert( "Howdy, admin!" );</script> <div class="notice' ),
+				),
+				'expected' => '<div class="notice "><script>alert( "Howdy, admin!" );</script> <div class="notice"><p>A notice with unsafe additional classes.</p></div>',
+			),
+			'a type that is not a string'               => array(
+				'message'  => 'A notice with a type that is not a string.',
+				'args'     => array(
+					'type' => array(),
+				),
+				'expected' => '<div class="notice"><p>A notice with a type that is not a string.</p></div>',
+			),
+			'a type with only empty space'              => array(
+				'message'  => 'A notice with a type with only empty space.',
+				'args'     => array(
+					'type' => " \t\r\n",
+				),
+				'expected' => '<div class="notice"><p>A notice with a type with only empty space.</p></div>',
+			),
+			'an ID that is not a string'                => array(
+				'message'  => 'A notice with an ID that is not a string.',
+				'args'     => array(
+					'id' => array( 'message' ),
+				),
+				'expected' => '<div class="notice"><p>A notice with an ID that is not a string.</p></div>',
+			),
+			'an ID with only empty space'               => array(
+				'message'  => 'A notice with an ID with only empty space.',
+				'args'     => array(
+					'id' => " \t\r\n",
+				),
+				'expected' => '<div class="notice"><p>A notice with an ID with only empty space.</p></div>',
+			),
+			'dismissible as a truthy value rather than (bool) true' => array(
+				'message'  => 'A notice with dismissible as a truthy value rather than (bool) true.',
+				'args'     => array(
+					'dismissible' => 1,
+				),
+				'expected' => '<div class="notice"><p>A notice with dismissible as a truthy value rather than (bool) true.</p></div>',
+			),
+			'additional classes that are not an array'  => array(
+				'message'  => 'A notice with additional classes that are not an array.',
+				'args'     => array(
+					'additional_classes' => 'class-1 class-2 class-3',
+				),
+				'expected' => '<div class="notice"><p>A notice with additional classes that are not an array.</p></div>',
+			),
+			'paragraph wrapping as a falsy value rather than (bool) false' => array(
+				'message'  => 'A notice with paragraph wrapping as a falsy value rather than (bool) false.',
+				'args'     => array(
+					'paragraph_wrap' => 0,
+				),
+				'expected' => '<div class="notice"><p>A notice with paragraph wrapping as a falsy value rather than (bool) false.</p></div>',
+			),
+		);
+	}
+
+	/**
+	 * Tests that `wp_get_admin_notice()` throws a `_doing_it_wrong()` when
+	 * a 'type' containing spaces is passed.
+	 *
+	 * @ticket 57791
+	 *
+	 * @expectedIncorrectUsage wp_get_admin_notice
+	 */
+	public function test_should_throw_doing_it_wrong_with_a_type_containing_spaces() {
+		$this->assertSame(
+			'<div class="notice notice-first second third fourth"><p>A type containing spaces.</p></div>',
+			wp_get_admin_notice(
+				'A type containing spaces.',
+				array( 'type' => 'first second third fourth' )
+			)
+		);
+	}
+
+	/**
+	 * Tests that `wp_get_admin_notice()` applies filters.
+	 *
+	 * @ticket 57791
+	 *
+	 * @dataProvider data_should_apply_filters
+	 *
+	 * @param string $hook_name The name of the filter hook.
+	 */
+	public function test_should_apply_filters( $hook_name ) {
+		$filter = new MockAction();
+		add_filter( $hook_name, array( $filter, 'filter' ) );
+
+		wp_get_admin_notice( 'A notice.', array( 'type' => 'success' ) );
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_apply_filters() {
+		return array(
+			'wp_admin_notice_args'   => array( 'hook_name' => 'wp_admin_notice_args' ),
+			'wp_admin_notice_markup' => array( 'hook_name' => 'wp_admin_notice_markup' ),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/admin/wpListTable.php b/tests/phpunit/tests/admin/wpListTable.php
index c28113d99f133..4a220bb083e71 100644
--- a/tests/phpunit/tests/admin/wpListTable.php
+++ b/tests/phpunit/tests/admin/wpListTable.php
@@ -12,17 +12,34 @@ class Tests_Admin_WpListTable extends WP_UnitTestCase {
 	 *
 	 * @var WP_List_Table $list_table
 	 */
-	protected static $list_table;
+	private $list_table;
 
-	public static function set_up_before_class() {
-		global $hook_suffix;
+	/**
+	 * Original value of $GLOBALS['hook_suffix'].
+	 *
+	 * @var string
+	 */
+	private static $original_hook_suffix;
 
+	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
+		static::$original_hook_suffix = $GLOBALS['hook_suffix'];
+
 		require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+	}
 
+	public function set_up() {
+		parent::set_up();
+		global $hook_suffix;
 		$hook_suffix      = '_wp_tests';
-		self::$list_table = new WP_List_Table();
+		$this->list_table = new WP_List_Table();
+	}
+
+	public function clean_up_global_scope() {
+		global $hook_suffix;
+		$hook_suffix = static::$original_hook_suffix;
+		parent::clean_up_global_scope();
 	}
 
 	/**
@@ -142,10 +159,10 @@ public function data_should_only_add_primary_column_when_needed() {
 	 * @param array $expected
 	 */
 	public function test_get_views_links( $link_data, $expected ) {
-		$get_views_links = new ReflectionMethod( self::$list_table, 'get_views_links' );
+		$get_views_links = new ReflectionMethod( $this->list_table, 'get_views_links' );
 		$get_views_links->setAccessible( true );
 
-		$actual = $get_views_links->invokeArgs( self::$list_table, array( $link_data ) );
+		$actual = $get_views_links->invokeArgs( $this->list_table, array( $link_data ) );
 
 		$this->assertSameSetsWithIndex( $expected, $actual );
 	}
@@ -257,9 +274,9 @@ public function data_get_views_links() {
 	 * }
 	 */
 	public function test_get_views_links_doing_it_wrong( $link_data ) {
-		$get_views_links = new ReflectionMethod( self::$list_table, 'get_views_links' );
+		$get_views_links = new ReflectionMethod( $this->list_table, 'get_views_links' );
 		$get_views_links->setAccessible( true );
-		$get_views_links->invokeArgs( self::$list_table, array( $link_data ) );
+		$get_views_links->invokeArgs( $this->list_table, array( $link_data ) );
 	}
 
 	/**
@@ -344,4 +361,160 @@ public function data_get_views_links_doing_it_wrong() {
 			),
 		);
 	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__get()
+	 *
+	 * @param string $property_name Property name to get.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_get_compat_fields( $property_name, $expected ) {
+		$list_table = new WP_List_Table( array( 'plural' => '_wp_tests__get' ) );
+
+		if ( 'screen' === $property_name ) {
+			$this->assertInstanceOf( $expected, $list_table->$property_name );
+		} else {
+			$this->assertSame( $expected, $list_table->$property_name );
+		}
+	}
+
+	/**
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__get()
+	 */
+	public function test_should_throw_deprecation_when_getting_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Getting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertNull( $this->list_table->undeclared_property, 'Getting a dynamic property should return null from WP_List_Table::__get()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__set()
+	 *
+	 * @param string $property_name Property name to set.
+	 */
+	public function test_should_set_compat_fields_defined_property( $property_name ) {
+		$value                            = uniqid();
+		$this->list_table->$property_name = $value;
+
+		$this->assertSame( $value, $this->list_table->$property_name );
+	}
+
+	/**
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__set()
+	 */
+	public function test_should_throw_deprecation_when_setting_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Setting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->list_table->undeclared_property = 'some value';
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__isset()
+	 *
+	 * @param string $property_name Property name to check.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_isset_compat_fields( $property_name, $expected ) {
+		$actual = isset( $this->list_table->$property_name );
+		if ( is_null( $expected ) ) {
+			$this->assertFalse( $actual );
+		} else {
+			$this->assertTrue( $actual );
+		}
+	}
+
+	/**
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__isset()
+	 */
+	public function test_should_throw_deprecation_when_isset_of_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Checking `isset()` on a dynamic property ' .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertFalse( isset( $this->list_table->undeclared_property ), 'Checking a dynamic property should return false from WP_List_Table::__isset()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__unset()
+	 *
+	 * @param string $property_name Property name to unset.
+	 */
+	public function test_should_unset_compat_fields_defined_property( $property_name ) {
+		unset( $this->list_table->$property_name );
+		$this->assertFalse( isset( $this->list_table->$property_name ) );
+	}
+
+	/**
+	 * @ticket 58896
+	 *
+	 * @covers WP_List_Table::__unset()
+	 */
+	public function test_should_throw_deprecation_when_unset_of_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'A property `undeclared_property` is not declared. Unsetting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		unset( $this->list_table->undeclared_property );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_compat_fields() {
+		return array(
+			'_args'            => array(
+				'property_name' => '_args',
+				'expected'      => array(
+					'plural'   => '_wp_tests__get',
+					'singular' => '',
+					'ajax'     => false,
+					'screen'   => null,
+				),
+			),
+			'_pagination_args' => array(
+				'property_name' => '_pagination_args',
+				'expected'      => array(),
+			),
+			'screen'           => array(
+				'property_name' => 'screen',
+				'expected'      => WP_Screen::class,
+			),
+			'_actions'         => array(
+				'property_name' => '_actions',
+				'expected'      => null,
+			),
+			'_pagination'      => array(
+				'property_name' => '_pagination',
+				'expected'      => null,
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/admin/wpMediaListTable.php b/tests/phpunit/tests/admin/wpMediaListTable.php
index a130a3250673d..aae2f3862ae76 100644
--- a/tests/phpunit/tests/admin/wpMediaListTable.php
+++ b/tests/phpunit/tests/admin/wpMediaListTable.php
@@ -4,11 +4,109 @@
  * @group admin
  */
 class Tests_Admin_wpMediaListTable extends WP_UnitTestCase {
+	/**
+	 * A list table for testing.
+	 *
+	 * @var WP_Media_List_Table
+	 */
+	protected static $list_table;
+
+	/**
+	 * A reflection of the `$is_trash` property.
+	 *
+	 * @var ReflectionProperty
+	 */
+	protected static $is_trash;
+
+	/**
+	 * The original value of the `$is_trash` property.
+	 *
+	 * @var bool|null
+	 */
+	protected static $is_trash_original;
+
+	/**
+	 * A reflection of the `$detached` property.
+	 *
+	 * @var ReflectionProperty
+	 */
+	protected static $detached;
+
+	/**
+	 * The original value of the `$detached` property.
+	 *
+	 * @var bool|null
+	 */
+	protected static $detached_original;
+
+	/**
+	 * The ID of an 'administrator' user for testing.
+	 *
+	 * @var int
+	 */
+	protected static $admin;
+
+	/**
+	 * The ID of a 'subscriber' user for testing.
+	 *
+	 * @var int
+	 */
+	protected static $subscriber;
+
+	/**
+	 * A post for testing.
+	 *
+	 * @var WP_Post
+	 */
+	protected static $post;
+
+	/**
+	 * An attachment for testing.
+	 *
+	 * @var WP_Post
+	 */
+	protected static $attachment;
 
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
 		require_once ABSPATH . 'wp-admin/includes/class-wp-media-list-table.php';
+
+		self::$list_table = new WP_Media_List_Table();
+		self::$is_trash   = new ReflectionProperty( self::$list_table, 'is_trash' );
+		self::$detached   = new ReflectionProperty( self::$list_table, 'detached' );
+
+		self::$is_trash->setAccessible( true );
+		self::$is_trash_original = self::$is_trash->getValue( self::$list_table );
+		self::$is_trash->setAccessible( false );
+
+		self::$detached->setAccessible( true );
+		self::$detached_original = self::$detached->getValue( self::$list_table );
+		self::$detached->setAccessible( false );
+
+		// Create users.
+		self::$admin      = self::factory()->user->create( array( 'role' => 'administrator' ) );
+		self::$subscriber = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+
+		// Create posts.
+		self::$post       = self::factory()->post->create_and_get();
+		self::$attachment = self::factory()->attachment->create_and_get(
+			array(
+				'post_name'      => 'attachment-name',
+				'file'           => 'image.jpg',
+				'post_mime_type' => 'image/jpeg',
+			)
+		);
+	}
+
+	/**
+	 * Restores reflections to their original values.
+	 */
+	public function tear_down() {
+		self::set_is_trash( self::$is_trash_original );
+		self::set_detached( self::$detached_original );
+
+		parent::tear_down();
 	}
 
 	/**
@@ -16,7 +114,7 @@ public static function set_up_before_class() {
 	 * does not result in a PHP warning.
 	 *
 	 * The warning that we should not see:
-	 * PHP 5.6 - 7.4: `Invalid argument supplied for foreach()`.
+	 * PHP <= 7.4: `Invalid argument supplied for foreach()`.
 	 * PHP 8.0 and higher: `Warning: foreach() argument must be of type array|object, bool given`.
 	 *
 	 * Note: This does not test the actual functioning of the WP_Media_List_Table::prepare_items() method.
@@ -49,4 +147,325 @@ public function test_prepare_items_without_cron_option_does_not_throw_warning()
 		// If this test does not error out due to the PHP warning, we're good.
 		$mock->prepare_items();
 	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` only includes an action
+	 * in certain scenarios.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 *
+	 * @dataProvider data_get_row_actions_should_include_action
+	 *
+	 * @param string    $action   The action that should be included.
+	 * @param string    $role     The role of the current user.
+	 * @param bool|null $trash    Whether the attachment filter is currently 'trash',
+	 *                            or `null` to leave as-is.
+	 * @param bool|null $detached Whether the attachment filter is currently 'detached',
+	 *                            or `null` to leave as-is.
+	 */
+	public function test_get_row_actions_should_include_action( $action, $role, $trash, $detached ) {
+		if ( 'admin' === $role ) {
+			wp_set_current_user( self::$admin );
+		} elseif ( 'subscriber' === $role ) {
+			wp_set_current_user( self::$subscriber );
+		}
+
+		if ( null !== $trash ) {
+			self::set_is_trash( $trash );
+		}
+
+		if ( null !== $detached ) {
+			self::set_detached( $detached );
+		}
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$post, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayHasKey( $action, $actions, "'$action' was not included in the actions." );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_row_actions_should_include_action() {
+		return array(
+			'"edit" while not on "trash"'  => array(
+				'action'   => 'edit',
+				'role'     => 'admin',
+				'trash'    => false,
+				'detached' => null,
+			),
+			'"untrash" while on "trash"'   => array(
+				'action'   => 'untrash',
+				'role'     => 'admin',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"delete" while on "trash"'    => array(
+				'action'   => 'delete',
+				'role'     => 'admin',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"view" while not on "trash"'  => array(
+				'action'   => 'view',
+				'role'     => 'admin',
+				'trash'    => false,
+				'detached' => null,
+			),
+			'"attach" while on "detached"' => array(
+				'action'   => 'attach',
+				'role'     => 'admin',
+				'trash'    => null,
+				'detached' => true,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` does not include an action
+	 * in certain scenarios.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 *
+	 * @dataProvider data_get_row_actions_should_not_include_action
+	 *
+	 * @param string    $action   The action that should not be included.
+	 * @param string    $role     The role of the current user.
+	 * @param bool|null $trash    Whether the attachment filter is currently 'trash',
+	 *                            or `null` to leave as-is.
+	 * @param bool|null $detached Whether the attachment filter is currently 'detached',
+	 *                            or `null` to leave as-is.
+	 */
+	public function test_get_row_actions_should_not_include_action( $action, $role, $trash, $detached ) {
+		if ( 'admin' === $role ) {
+			wp_set_current_user( self::$admin );
+		} elseif ( 'subscriber' === $role ) {
+			wp_set_current_user( self::$subscriber );
+		}
+
+		if ( null !== $trash ) {
+			self::set_is_trash( $trash );
+		}
+
+		if ( null !== $detached ) {
+			self::set_detached( $detached );
+		}
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$post, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayNotHasKey( $action, $actions, "'$action' was included in the actions." );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_row_actions_should_not_include_action() {
+		return array(
+			'"edit" while on "trash"'               => array(
+				'action'   => 'edit',
+				'role'     => 'admin',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"edit" with incorrect capabilities'    => array(
+				'action'   => 'edit',
+				'role'     => 'subscriber',
+				'trash'    => false,
+				'detached' => null,
+			),
+			'"untrash" while not on "trash"'        => array(
+				'action'   => 'untrash',
+				'role'     => 'administrator',
+				'trash'    => false,
+				'detached' => null,
+			),
+			'"untrash" with incorrect capabilities' => array(
+				'action'   => 'untrash',
+				'role'     => 'subscriber',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"trash" while not on "trash"'          => array(
+				'action'   => 'trash',
+				'role'     => 'administrator',
+				'trash'    => false,
+				'detached' => null,
+			),
+			'"trash" with incorrect capabilities'   => array(
+				'action'   => 'trash',
+				'role'     => 'subscriber',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"view" while on "trash"'               => array(
+				'action'   => 'view',
+				'role'     => 'administrator',
+				'trash'    => true,
+				'detached' => null,
+			),
+			'"attach" with incorrect capabilities'  => array(
+				'action'   => 'attach',
+				'role'     => 'subscriber',
+				'trash'    => null,
+				'detached' => true,
+			),
+			'"attach" when not on "detached"'       => array(
+				'action'   => 'attach',
+				'role'     => 'administrator',
+				'trash'    => null,
+				'detached' => false,
+			),
+			'"copy" when on "trash"'                => array(
+				'action'   => 'copy',
+				'role'     => 'administrator',
+				'trash'    => true,
+				'detached' => null,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` does not include the 'view' action
+	 * when a permalink is not available.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 */
+	public function test_get_row_actions_should_not_include_view_without_a_permalink() {
+		self::set_is_trash( false );
+
+		// Ensure the permalink is `false`.
+		add_filter( 'post_link', '__return_false', 10, 0 );
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$post, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayNotHasKey( 'view', $actions, '"view" was included in the actions.' );
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` includes the 'copy' action.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 */
+	public function test_get_row_actions_should_include_copy() {
+		self::set_is_trash( false );
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$attachment, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayHasKey( 'copy', $actions, '"copy" was not included in the actions.' );
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` does not include the 'copy' action
+	 * when an attachment URL is not available.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 */
+	public function test_get_row_actions_should_not_include_copy_without_an_attachment_url() {
+		self::set_is_trash( false );
+
+		// Ensure the attachment URL is `false`.
+		add_filter( 'wp_get_attachment_url', '__return_false', 10, 0 );
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$attachment, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayNotHasKey( 'copy', $actions, '"copy" was included in the actions.' );
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` includes the 'download' action.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 */
+	public function test_get_row_actions_should_include_download() {
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$attachment, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayHasKey( 'download', $actions, '"download" was not included in the actions.' );
+	}
+
+	/**
+	 * Tests that `WP_Media_List_Table::_get_row_actions()` does not include the 'download' action
+	 * when an attachment URL is not available.
+	 *
+	 * @ticket 57893
+	 *
+	 * @covers WP_Media_List_Table::_get_row_actions
+	 */
+	public function test_get_row_actions_should_not_include_download_without_an_attachment_url() {
+		// Ensure the attachment URL is `false`.
+		add_filter( 'wp_get_attachment_url', '__return_false', 10, 0 );
+
+		$_get_row_actions = new ReflectionMethod( self::$list_table, '_get_row_actions' );
+		$_get_row_actions->setAccessible( true );
+		$actions = $_get_row_actions->invoke( self::$list_table, self::$attachment, 'att_title' );
+		$_get_row_actions->setAccessible( false );
+
+		$this->assertIsArray( $actions, 'An array was not returned.' );
+		$this->assertArrayNotHasKey( 'download', $actions, '"download" was included in the actions.' );
+	}
+
+	/**
+	 * Sets the `$is_trash` property.
+	 *
+	 * Helper method.
+	 *
+	 * @param bool $is_trash Whether the attachment filter is currently 'trash'.
+	 */
+	private static function set_is_trash( $is_trash ) {
+		self::$is_trash->setAccessible( true );
+		self::$is_trash->setValue( self::$list_table, $is_trash );
+		self::$is_trash->setAccessible( false );
+	}
+
+	/**
+	 * Sets the `$detached` property.
+	 *
+	 * Helper method.
+	 *
+	 * @param bool $detached Whether the attachment filter is currently 'detached'.
+	 */
+	private static function set_detached( $detached ) {
+		self::$detached->setAccessible( true );
+		self::$detached->setValue( self::$list_table, $detached );
+		self::$detached->setAccessible( false );
+	}
 }
diff --git a/tests/phpunit/tests/admin/wpPluginsListTable.php b/tests/phpunit/tests/admin/wpPluginsListTable.php
index f97059d4754d8..af44861324267 100644
--- a/tests/phpunit/tests/admin/wpPluginsListTable.php
+++ b/tests/phpunit/tests/admin/wpPluginsListTable.php
@@ -11,11 +11,74 @@ class Tests_Admin_wpPluginsListTable extends WP_UnitTestCase {
 	 */
 	public $table = false;
 
+	/**
+	 * An admin user ID.
+	 *
+	 * @var int
+	 */
+	private static $admin_id;
+
+	/**
+	 * The original value of the `$s` global.
+	 *
+	 * @var string|null
+	 */
+	private static $original_s;
+
+	/**
+	 * @var array
+	 */
+	public $fake_plugin = array(
+		'fake-plugin.php' => array(
+			'Name'        => 'Fake Plugin',
+			'PluginURI'   => 'https://wordpress.org/',
+			'Version'     => '1.0.0',
+			'Description' => 'A fake plugin for testing.',
+			'Author'      => 'WordPress',
+			'AuthorURI'   => 'https://wordpress.org/',
+			'TextDomain'  => 'fake-plugin',
+			'DomainPath'  => '/languages',
+			'Network'     => false,
+			'Title'       => 'Fake Plugin',
+			'AuthorName'  => 'WordPress',
+		),
+	);
+
+	/**
+	 * Creates an admin user before any tests run and backs up the `$s` global.
+	 */
+	public static function set_up_before_class() {
+		global $s;
+
+		parent::set_up_before_class();
+
+		self::$admin_id   = self::factory()->user->create(
+			array(
+				'role'       => 'administrator',
+				'user_login' => 'test_wp_plugins_list_table',
+				'user_pass'  => 'password',
+				'user_email' => 'testadmin@test.com',
+			)
+		);
+		self::$original_s = $s;
+	}
+
 	public function set_up() {
 		parent::set_up();
 		$this->table = _get_list_table( 'WP_Plugins_List_Table', array( 'screen' => 'plugins' ) );
 	}
 
+	/**
+	 * Restores the `$s` global after each test.
+	 */
+	public function tear_down() {
+		global $s;
+
+		$s = self::$original_s;
+
+		parent::tear_down();
+	}
+
 	/**
 	 * @ticket 42066
 	 *
@@ -56,4 +119,218 @@ public function test_get_views_should_return_views_by_default() {
 
 		$this->assertSame( $expected, $actual );
 	}
+
+	/**
+	 * Tests that WP_Plugins_List_Table::__construct() does not set
+	 * the 'show_autoupdates' property to false for Must-Use and Drop-in
+	 * plugins.
+	 *
+	 * The 'ms-excluded' group is added as $this->show_autoupdates is already set to false for multisite.
+	 *
+	 * @ticket 54309
+	 * @group ms-excluded
+	 *
+	 * @covers WP_Plugins_List_Table::__construct()
+	 *
+	 * @dataProvider data_status_mustuse_and_dropins
+	 *
+	 * @param string $status The value for $_REQUEST['plugin_status'].
+	 */
+	public function test_construct_should_not_set_show_autoupdates_to_false_for_mustuse_and_dropins( $status ) {
+		$original_status           = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : null;
+		$_REQUEST['plugin_status'] = $status;
+
+		// Enable plugin auto-updates.
+		add_filter( 'plugins_auto_update_enabled', '__return_true' );
+
+		// Use a user with the 'manage_plugins' capability.
+		wp_set_current_user( self::$admin_id );
+
+		$list_table       = new WP_Plugins_List_Table();
+		$show_autoupdates = new ReflectionProperty( $list_table, 'show_autoupdates' );
+
+		$show_autoupdates->setAccessible( true );
+		$actual = $show_autoupdates->getValue( $list_table );
+		$show_autoupdates->setAccessible( false );
+
+		$_REQUEST['plugin_status'] = $original_status;
+
+		$this->assertTrue( $actual );
+	}
+
+	/**
+	 * Tests that WP_Plugins_List_Table::get_columns() does not add
+	 * the auto-update column when not viewing Must-Use or Drop-in plugins.
+	 *
+	 * @ticket 54309
+	 *
+	 * @covers WP_Plugins_List_Table::get_columns
+	 *
+	 * @dataProvider data_status_mustuse_and_dropins
+	 *
+	 * @param string $test_status The value for the global $status variable.
+	 */
+	public function test_get_columns_should_not_add_the_autoupdates_column_when_viewing_mustuse_or_dropins( $test_status ) {
+		global $status;
+
+		$original_status = $status;
+
+		// Enable plugin auto-updates.
+		add_filter( 'plugins_auto_update_enabled', '__return_true' );
+
+		// Use a user with the 'manage_plugins' capability.
+		wp_set_current_user( self::$admin_id );
+
+		$status = $test_status;
+		$actual = $this->table->get_columns();
+		$status = $original_status;
+
+		$this->assertArrayNotHasKey( 'auto-updates', $actual );
+	}
+
+	/**
+	 * Tests that WP_Plugins_List_Table::get_columns() does not add
+	 * the auto-update column when the 'plugins_auto_update_enabled'
+	 * filter returns false.
+	 *
+	 * @ticket 54309
+	 *
+	 * @covers WP_Plugins_List_Table::get_columns
+	 */
+	public function test_get_columns_should_not_add_the_autoupdates_column_when_plugin_auto_update_is_disabled() {
+		global $status;
+
+		$original_status = $status;
+
+		// Enable plugin auto-updates.
+		add_filter( 'plugins_auto_update_enabled', '__return_false' );
+
+		// Use a user with the 'manage_plugins' capability.
+		wp_set_current_user( self::$admin_id );
+
+		$status = 'all';
+		$actual = $this->table->get_columns();
+		$status = $original_status;
+
+		$this->assertArrayNotHasKey( 'auto-updates', $actual );
+	}
+
+	/**
+	 * Tests that WP_Plugins_List_Table::single_row() does not output the
+	 * 'Auto-updates' column for Must-Use or Drop-in plugins.
+	 *
+	 * @ticket 54309
+	 *
+	 * @covers WP_Plugins_List_Table::single_row
+	 *
+	 * @dataProvider data_status_mustuse_and_dropins
+	 *
+	 * @param string $test_status The value for the global $status variable.
+	 */
+	public function test_single_row_should_not_add_the_autoupdates_column_for_mustuse_or_dropins( $test_status ) {
+		global $status;
+
+		$original_status = $status;
+
+		// Enable plugin auto-updates.
+		add_filter( 'plugins_auto_update_enabled', '__return_true' );
+
+		// Use a user with the 'manage_plugins' capability.
+		wp_set_current_user( self::$admin_id );
+
+		$column_info = array(
+			array(
+				'name'         => 'Plugin',
+				'description'  => 'Description',
+				'auto-updates' => 'Auto-updates',
+			),
+			array(),
+			array(),
+			'name',
+		);
+
+		// Mock WP_Plugins_List_Table
+		$list_table_mock = $this->getMockBuilder( 'WP_Plugins_List_Table' )
+			// Note: setMethods() is deprecated in PHPUnit 9, but still supported.
+			->setMethods( array( 'get_column_info' ) )
+			->getMock();
+
+		// Force the return value of the get_column_info() method.
+		$list_table_mock->expects( $this->once() )->method( 'get_column_info' )->willReturn( $column_info );
+
+		$single_row_args = array(
+			'advanced-cache.php',
+			array(
+				'Name'        => 'Advanced caching plugin',
+				'slug'        => 'advanced-cache',
+				'Description' => 'An advanced caching plugin.',
+				'Author'      => 'A plugin author',
+				'Version'     => '1.0.0',
+				'Author URI'  => 'http://example.org',
+				'Text Domain' => 'advanced-cache',
+			),
+		);
+
+		$status = $test_status;
+		ob_start();
+		$list_table_mock->single_row( $single_row_args );
+		$actual = ob_get_clean();
+		$status = $original_status;
+
+		$this->assertIsString( $actual, 'Output was not captured.' );
+		$this->assertNotEmpty( $actual, 'The output string was empty.' );
+		$this->assertStringNotContainsString( 'column-auto-updates', $actual, 'The auto-updates column was output.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_status_mustuse_and_dropins() {
+		return array(
+			'Must-Use' => array( 'mustuse' ),
+			'Drop-ins' => array( 'dropins' ),
+		);
+	}
+
+	/**
+	 * Tests that WP_Plugins_List_Table::prepare_items()
+	 * applies 'plugins_list' filters.
+	 *
+	 * @ticket 57278
+	 *
+	 * @covers WP_Plugins_List_Table::prepare_items
+	 */
+	public function test_plugins_list_filter() {
+		global $status, $s;
+
+		$old_status = $status;
+		$status     = 'mustuse';
+		$s          = '';
+
+		add_filter( 'plugins_list', array( $this, 'plugins_list_filter' ), 10, 1 );
+		$this->table->prepare_items();
+		$plugins = $this->table->items;
+		remove_filter( 'plugins_list', array( $this, 'plugins_list_filter' ), 10 );
+
+		// Restore to default.
+		$status = $old_status;
+		$this->table->prepare_items();
+
+		$this->assertSame( $plugins, $this->fake_plugin );
+	}
+
+	/**
+	 * Adds a fake plugin to an array of plugins.
+	 *
+	 * Used as a callback for the 'plugins_list' hook.
+	 *
+	 * @return array
+	 */
+	public function plugins_list_filter( $plugins_list ) {
+		$plugins_list['mustuse'] = $this->fake_plugin;
+
+		return $plugins_list;
+	}
 }
diff --git a/tests/phpunit/tests/admin/wpPostCommentsListTable.php b/tests/phpunit/tests/admin/wpPostCommentsListTable.php
index 98cb834bff2d7..126126327f0e8 100644
--- a/tests/phpunit/tests/admin/wpPostCommentsListTable.php
+++ b/tests/phpunit/tests/admin/wpPostCommentsListTable.php
@@ -12,7 +12,7 @@ class Tests_Admin_wpPostCommentsListTable extends WP_UnitTestCase {
 	 */
 	protected $table;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-post-comments' ) );
 	}
diff --git a/tests/phpunit/tests/admin/wpPostsListTable.php b/tests/phpunit/tests/admin/wpPostsListTable.php
index 9e19ff3d8a31f..4b2dfe6e0a6a8 100644
--- a/tests/phpunit/tests/admin/wpPostsListTable.php
+++ b/tests/phpunit/tests/admin/wpPostsListTable.php
@@ -14,7 +14,7 @@ class Tests_Admin_wpPostsListTable extends WP_UnitTestCase {
 	 */
 	protected $table;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => 'edit-page' ) );
 	}
@@ -79,7 +79,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_list_hierarchical_pages_first_page() {
+	public function test_list_hierarchical_pages_first_page() {
 		$this->_test_list_hierarchical_page(
 			array(
 				'paged'          => 1,
@@ -98,7 +98,7 @@ function test_list_hierarchical_pages_first_page() {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_list_hierarchical_pages_second_page() {
+	public function test_list_hierarchical_pages_second_page() {
 		$this->_test_list_hierarchical_page(
 			array(
 				'paged'          => 2,
@@ -118,7 +118,7 @@ function test_list_hierarchical_pages_second_page() {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_search_hierarchical_pages_first_page() {
+	public function test_search_hierarchical_pages_first_page() {
 		$this->_test_list_hierarchical_page(
 			array(
 				'paged'          => 1,
@@ -138,7 +138,7 @@ function test_search_hierarchical_pages_first_page() {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_search_hierarchical_pages_second_page() {
+	public function test_search_hierarchical_pages_second_page() {
 		$this->_test_list_hierarchical_page(
 			array(
 				'paged'          => 2,
@@ -158,7 +158,7 @@ function test_search_hierarchical_pages_second_page() {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_grandchildren_hierarchical_pages_first_page() {
+	public function test_grandchildren_hierarchical_pages_first_page() {
 		// Page 6 is the first page with grandchildren.
 		$this->_test_list_hierarchical_page(
 			array(
@@ -180,7 +180,7 @@ function test_grandchildren_hierarchical_pages_first_page() {
 	 * @covers WP_Posts_List_Table::display_rows
 	 * @covers WP_Posts_List_Table::set_hierarchical_display
 	 */
-	function test_grandchildren_hierarchical_pages_second_page() {
+	public function test_grandchildren_hierarchical_pages_second_page() {
 		// Page 7 is the second page with grandchildren.
 		$this->_test_list_hierarchical_page(
 			array(
@@ -203,16 +203,6 @@ function test_grandchildren_hierarchical_pages_second_page() {
 	 * @param array $expected_ids Expected IDs of pages returned.
 	 */
 	protected function _test_list_hierarchical_page( array $args, array $expected_ids ) {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$matches = array();
 
 		$_REQUEST['paged']   = $args['paged'];
@@ -260,7 +250,7 @@ protected function _test_list_hierarchical_page( array $args, array $expected_id
 	 *
 	 * @covers WP_Posts_List_Table::extra_tablenav
 	 */
-	function test_filter_button_should_not_be_shown_if_there_are_no_posts() {
+	public function test_filter_button_should_not_be_shown_if_there_are_no_posts() {
 		// Set post type to a non-existent one.
 		$this->table->screen->post_type = 'foo';
 
@@ -276,7 +266,7 @@ function test_filter_button_should_not_be_shown_if_there_are_no_posts() {
 	 *
 	 * @covers WP_Posts_List_Table::extra_tablenav
 	 */
-	function test_months_dropdown_should_not_be_shown_if_there_are_no_posts() {
+	public function test_months_dropdown_should_not_be_shown_if_there_are_no_posts() {
 		// Set post type to a non-existent one.
 		$this->table->screen->post_type = 'foo';
 
@@ -292,7 +282,7 @@ function test_months_dropdown_should_not_be_shown_if_there_are_no_posts() {
 	 *
 	 * @covers WP_Posts_List_Table::extra_tablenav
 	 */
-	function test_category_dropdown_should_not_be_shown_if_there_are_no_posts() {
+	public function test_category_dropdown_should_not_be_shown_if_there_are_no_posts() {
 		// Set post type to a non-existent one.
 		$this->table->screen->post_type = 'foo';
 
diff --git a/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php b/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
index 7f555c4d250f4..d729a56bafd24 100644
--- a/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
+++ b/tests/phpunit/tests/admin/wpPrivacyRequestsTable.php
@@ -5,15 +5,9 @@
  * @package WordPress\UnitTests
  *
  * @since 5.1.0
- */
-
-/**
- * Tests_Admin_wpPrivacyRequestsTable class.
  *
  * @group admin
  * @group privacy
- *
- * @since 5.1.0
  */
 class Tests_Admin_wpPrivacyRequestsTable extends WP_UnitTestCase {
 
@@ -79,7 +73,7 @@ public function get_mocked_class_instance() {
 	 * @param string|null $search   Search term.
 	 * @param string      $expected Expected in SQL query.
 
-	 * @dataProvider data_test_columns_should_be_sortable
+	 * @dataProvider data_columns_should_be_sortable
 	 * @covers WP_Privacy_Requests_Table::prepare_items
 	 * @ticket 43960
 	 */
@@ -131,7 +125,7 @@ public function filter_posts_request( $request ) {
 	 *     }
 	 * }
 	 */
-	public function data_test_columns_should_be_sortable() {
+	public function data_columns_should_be_sortable() {
 		return array(
 			// Default order (ID) DESC.
 			array(
diff --git a/tests/phpunit/tests/admin/wpSiteHealth.php b/tests/phpunit/tests/admin/wpSiteHealth.php
index 833982179136c..0d7ccb6112cbd 100644
--- a/tests/phpunit/tests/admin/wpSiteHealth.php
+++ b/tests/phpunit/tests/admin/wpSiteHealth.php
@@ -202,7 +202,7 @@ static function () use ( $threshold ) {
 
 		add_filter(
 			'pre_http_request',
-			function ( $r, $parsed_args ) use ( &$responses, &$is_unauthorized, $good_basic_auth, $delay_the_response, $threshold ) {
+			function ( $response, $parsed_args ) use ( &$responses, &$is_unauthorized, $good_basic_auth, $delay_the_response, $threshold ) {
 
 				$expected_response = array_shift( $responses );
 
@@ -421,7 +421,7 @@ public function test_object_cache_default_thresholds_non_multisite() {
 		// Set thresholds so high they should never be exceeded.
 		add_filter(
 			'site_status_persistent_object_cache_thresholds',
-			function() {
+			static function() {
 				return array(
 					'alloptions_count' => PHP_INT_MAX,
 					'alloptions_bytes' => PHP_INT_MAX,
@@ -472,7 +472,7 @@ public function test_object_cache_thresholds_check_can_be_bypassed() {
 	public function test_object_cache_thresholds( $threshold, $count ) {
 		add_filter(
 			'site_status_persistent_object_cache_thresholds',
-			function ( $thresholds ) use ( $threshold, $count ) {
+			static function ( $thresholds ) use ( $threshold, $count ) {
 				return array_merge( $thresholds, array( $threshold => $count ) );
 			}
 		);
diff --git a/tests/phpunit/tests/admin/wpUserSearch.php b/tests/phpunit/tests/admin/wpUserSearch.php
new file mode 100644
index 0000000000000..e24b4d0c6a6e1
--- /dev/null
+++ b/tests/phpunit/tests/admin/wpUserSearch.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @coversDefaultClass WP_User_Search
+ */
+class Tests_Admin_wpUserSearch extends WP_UnitTestCase {
+
+	/**
+	 * @covers ::__construct()
+	 * @expectedDeprecated WP_User_Search
+	 */
+	public function test_class_is_deprecated() {
+		$wp_user_search = new WP_User_Search();
+	}
+}
diff --git a/tests/phpunit/tests/adminbar.php b/tests/phpunit/tests/adminbar.php
index 228063e911b5c..4ca3f64d0d565 100644
--- a/tests/phpunit/tests/adminbar.php
+++ b/tests/phpunit/tests/adminbar.php
@@ -37,7 +37,7 @@ public function test_content_post_type() {
 
 		register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
 
-		$admin_bar = new WP_Admin_Bar;
+		$admin_bar = new WP_Admin_Bar();
 
 		wp_admin_bar_new_content_menu( $admin_bar );
 
@@ -54,7 +54,7 @@ public function test_content_post_type() {
 	public function test_merging_existing_meta_values() {
 		wp_set_current_user( self::$editor_id );
 
-		$admin_bar = new WP_Admin_Bar;
+		$admin_bar = new WP_Admin_Bar();
 
 		$admin_bar->add_node(
 			array(
@@ -469,7 +469,7 @@ public function test_admin_bar_contains_correct_about_link_for_users_with_no_rol
 	 * @group ms-required
 	 */
 	public function test_admin_bar_contains_correct_about_link_for_users_with_no_role_in_multisite() {
-		// User is not a member of a site.
+		// User is not a member of the site.
 		remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
 
 		wp_set_current_user( self::$no_role_id );
@@ -484,6 +484,61 @@ public function test_admin_bar_contains_correct_about_link_for_users_with_no_rol
 		$this->assertNotNull( $about_node );
 	}
 
+	/**
+	 * Tests that the 'contribute' node is added for users with a role in single site.
+	 *
+	 * @ticket 23348
+	 *
+	 * @group ms-excluded
+	 *
+	 * @covers ::wp_admin_bar_wp_menu
+	 */
+	public function test_admin_bar_contains_contribute_node_for_users_with_role() {
+		wp_set_current_user( self::$editor_id );
+
+		$wp_admin_bar = $this->get_standard_admin_bar();
+
+		$this->assertNotNull( $wp_admin_bar->get_node( 'contribute' ) );
+	}
+
+	/**
+	 * Tests that the 'contribute' node is not added for users with no role in single site.
+	 *
+	 * @ticket 23348
+	 *
+	 * @group ms-excluded
+	 *
+	 * @covers ::wp_admin_bar_wp_menu
+	 */
+	public function test_admin_bar_does_not_contain_contribute_node_for_users_with_no_role() {
+		wp_set_current_user( self::$no_role_id );
+
+		$wp_admin_bar = $this->get_standard_admin_bar();
+
+		$this->assertNull( $wp_admin_bar->get_node( 'contribute' ) );
+	}
+
+	/**
+	 * Tests that the 'contribute' node is added for users with no role in multisite.
+	 *
+	 * @ticket 23348
+	 *
+	 * @group multisite
+	 * @group ms-required
+	 *
+	 * @covers ::wp_admin_bar_wp_menu
+	 */
+	public function test_admin_bar_contains_contribute_node_for_users_with_no_role_in_multisite() {
+		// User is not a member of the site.
+		remove_user_from_blog( self::$no_role_id, get_current_blog_id() );
+
+		wp_set_current_user( self::$no_role_id );
+
+		$wp_admin_bar = $this->get_standard_admin_bar();
+
+		$this->assertNotNull( $wp_admin_bar->get_node( 'contribute' ) );
+	}
+
 	/**
 	 * @ticket 34113
 	 */
@@ -754,4 +809,33 @@ private function get_my_sites_network_menu_items() {
 			'network-admin-o'      => 'manage_network_options',
 		);
 	}
+
+	/**
+	 * This test ensures that WP_Admin_Bar::$proto is not defined (including magic methods).
+	 *
+	 * @ticket 56876
+	 * @coversNothing
+	 */
+	public function test_proto_property_is_not_defined() {
+		$admin_bar = new WP_Admin_Bar();
+		$this->assertFalse( property_exists( $admin_bar, 'proto' ), 'WP_Admin_Bar::$proto should not be defined.' );
+		$this->assertFalse( isset( $admin_bar->proto ), 'WP_Admin_Bar::$proto should not be defined.' );
+	}
+
+	/**
+	 * This test ensures that WP_Admin_Bar::$menu is declared as a "regular" class property.
+	 *
+	 * @ticket 56876
+	 * @coversNothing
+	 */
+	public function test_menu_property_is_defined() {
+		$admin_bar = new WP_Admin_Bar();
+		$this->assertTrue( property_exists( $admin_bar, 'menu' ), 'WP_Admin_Bar::$proto property should be defined.' );
+
+		$menu_property = new ReflectionProperty( WP_Admin_Bar::class, 'menu' );
+		$this->assertTrue( $menu_property->isPublic(), 'WP_Admin_Bar::$menu should be public.' );
+
+		$this->assertTrue( isset( $admin_bar->menu ), 'WP_Admin_Bar::$menu should be set.' );
+		$this->assertSame( array(), $admin_bar->menu, 'WP_Admin_Bar::$menu should be equal to an empty array.' );
+	}
 }
diff --git a/tests/phpunit/tests/ajax/wpAjaxImageEditor.php b/tests/phpunit/tests/ajax/wpAjaxImageEditor.php
index f09721b74fd42..ac761c3520341 100644
--- a/tests/phpunit/tests/ajax/wpAjaxImageEditor.php
+++ b/tests/phpunit/tests/ajax/wpAjaxImageEditor.php
@@ -29,13 +29,12 @@ public function tear_down() {
 	}
 
 	/**
-	 * @ticket 22985
+	 * @ticket 26381
 	 * @requires function imagejpeg
 	 *
-	 * @covers ::wp_insert_attachment
 	 * @covers ::wp_save_image
 	 */
-	public function testCropImageThumbnail() {
+	public function testCropImageIntoLargerOne() {
 		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 
 		$filename = DIR_TESTDATA . '/images/canola.jpg';
@@ -45,20 +44,15 @@ public function testCropImageThumbnail() {
 		$id     = $this->_make_attachment( $upload );
 
 		$_REQUEST['action']  = 'image-editor';
-		$_REQUEST['context'] = 'edit-attachment';
 		$_REQUEST['postid']  = $id;
-		$_REQUEST['target']  = 'thumbnail';
-		$_REQUEST['do']      = 'save';
-		$_REQUEST['history'] = '[{"c":{"x":5,"y":8,"w":289,"h":322}}]';
+		$_REQUEST['do']      = 'scale';
+		$_REQUEST['fwidth']  = 700;
+		$_REQUEST['fheight'] = 500;
 
-		$media_meta = wp_get_attachment_metadata( $id );
-		$this->assertArrayHasKey( 'sizes', $media_meta, 'attachment should have size data' );
-		$this->assertArrayHasKey( 'medium', $media_meta['sizes'], 'attachment should have data for medium size' );
 		$ret = wp_save_image( $id );
 
-		$media_meta = wp_get_attachment_metadata( $id );
-		$this->assertArrayHasKey( 'sizes', $media_meta, 'cropped attachment should have size data' );
-		$this->assertArrayHasKey( 'medium', $media_meta['sizes'], 'cropped attachment should have data for medium size' );
+		$this->assertObjectHasProperty( 'error', $ret );
+		$this->assertEquals( 'Images cannot be scaled to a size larger than the original.', $ret->error );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/ajax/wpAjaxInlineSave.php b/tests/phpunit/tests/ajax/wpAjaxInlineSave.php
index ad03e8eb00b85..3537def1dcce2 100644
--- a/tests/phpunit/tests/ajax/wpAjaxInlineSave.php
+++ b/tests/phpunit/tests/ajax/wpAjaxInlineSave.php
@@ -87,4 +87,59 @@ public function test_dont_process_terms_if_taxonomy_does_not_allow_show_on_quick
 		$post_terms_2 = wp_get_object_terms( $post->ID, 'wptests_tax_2' );
 		$this->assertSameSets( array( $t2 ), wp_list_pluck( $post_terms_2, 'term_id' ) );
 	}
+
+	/**
+	 * When updating a draft in quick edit mode, it should not set the publish date of the post when this one will be published.
+	 *
+	 * @ticket 19907
+	 *
+	 * @covers ::edit_post
+	 */
+	public function test_quick_edit_draft_should_not_set_publish_date() {
+		// Become an administrator.
+		$this->_setRole( 'administrator' );
+
+		$user = get_current_user_id();
+
+		$post = self::factory()->post->create_and_get(
+			array(
+				'post_status' => 'draft',
+				'post_author' => $user,
+			)
+		);
+
+		$this->assertSame( 'draft', $post->post_status );
+
+		$this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+
+		// Set up a request.
+		$_POST['_inline_edit'] = wp_create_nonce( 'inlineeditnonce' );
+		$_POST['post_ID']      = $post->ID;
+		$_POST['post_type']    = 'post';
+		$_POST['content']      = 'content test';
+		$_POST['excerpt']      = 'excerpt test';
+		$_POST['_status']      = $post->post_status;
+		$_POST['post_status']  = $post->post_status;
+		$_POST['post_author']  = $user;
+		$_POST['screen']       = 'edit-post';
+		$_POST['post_view']    = 'list';
+		$_POST['edit_date']    = 'false';
+		$_POST['mm']           = '09';
+		$_POST['jj']           = 11;
+		$_POST['aa']           = 2020;
+		$_POST['hh']           = 19;
+		$_POST['mn']           = 20;
+		$_POST['ss']           = 11;
+
+		// Make the request.
+		try {
+			$this->_handleAjax( 'inline-save' );
+		} catch ( WPAjaxDieContinueException $e ) {
+			unset( $e );
+		}
+
+		$post = get_post( $post->ID );
+
+		$this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+	}
 }
diff --git a/tests/phpunit/tests/ajax/wpAjaxReplytoComment.php b/tests/phpunit/tests/ajax/wpAjaxReplytoComment.php
index 3700418b211e6..b67a7ba828439 100644
--- a/tests/phpunit/tests/ajax/wpAjaxReplytoComment.php
+++ b/tests/phpunit/tests/ajax/wpAjaxReplytoComment.php
@@ -98,7 +98,7 @@ public function test_as_admin() {
 	 */
 	public function test_as_subscriber() {
 
-		// Become an administrator.
+		// Become a subscriber.
 		$this->_setRole( 'subscriber' );
 
 		// Get a comment.
diff --git a/tests/phpunit/tests/ajax/wpAjaxSendAttachmentToEditor.php b/tests/phpunit/tests/ajax/wpAjaxSendAttachmentToEditor.php
index 277ce3d299c26..29066ff2877f9 100644
--- a/tests/phpunit/tests/ajax/wpAjaxSendAttachmentToEditor.php
+++ b/tests/phpunit/tests/ajax/wpAjaxSendAttachmentToEditor.php
@@ -101,4 +101,95 @@ public function test_wp_ajax_send_attachment_to_editor_should_return_a_link() {
 		$this->assertTrue( $response['success'] );
 		$this->assertSame( $expected, $response['data'] );
 	}
+
+	public function test_wp_ajax_set_attachment_thumbnail_success() {
+		// Become an administrator.
+		$post    = $_POST;
+		$user_id = self::factory()->user->create(
+			array(
+				'role'       => 'administrator',
+				'user_login' => 'user_36578_administrator',
+				'user_email' => 'user_36578_administrator@example.com',
+			)
+		);
+		wp_set_current_user( $user_id );
+		$_POST = array_merge( $_POST, $post );
+
+		// Upload the attachment itself.
+		$filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+		$contents = file_get_contents( $filename );
+
+		$upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$attachment = $this->_make_attachment( $upload );
+
+		// Upload the thumbnail.
+		$filename = DIR_TESTDATA . '/images/waffles.jpg';
+		$contents = file_get_contents( $filename );
+
+		$upload    = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$thumbnail = $this->_make_attachment( $upload );
+
+		// Set up a default request.
+		$_POST['_ajax_nonce']  = wp_create_nonce( 'set-attachment-thumbnail' );
+		$_POST['thumbnail_id'] = $thumbnail;
+		$_POST['urls']         = array( wp_get_attachment_url( $attachment ) );
+
+		// Make the request.
+		try {
+			$this->_handleAjax( 'set-attachment-thumbnail' );
+		} catch ( WPAjaxDieContinueException $e ) {
+			unset( $e );
+		}
+
+		// Get the response.
+		$response = json_decode( $this->_last_response, true );
+
+		// Ensure everything is correct.
+		$this->assertTrue( $response['success'] );
+	}
+
+	public function test_wp_ajax_set_attachment_thumbnail_missing_nonce() {
+		// Become an administrator.
+		$post    = $_POST;
+		$user_id = self::factory()->user->create(
+			array(
+				'role'       => 'administrator',
+				'user_login' => 'user_36578_administrator',
+				'user_email' => 'user_36578_administrator@example.com',
+			)
+		);
+		wp_set_current_user( $user_id );
+		$_POST = array_merge( $_POST, $post );
+
+		// Upload the attachment itself.
+		$filename = DIR_TESTDATA . '/uploads/small-audio.mp3';
+		$contents = file_get_contents( $filename );
+
+		$upload     = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$attachment = $this->_make_attachment( $upload );
+
+		// Upload the thumbnail.
+		$filename = DIR_TESTDATA . '/images/waffles.jpg';
+		$contents = file_get_contents( $filename );
+
+		$upload    = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$thumbnail = $this->_make_attachment( $upload );
+
+		// Set up a default request.
+		$_POST['thumbnail_id'] = $thumbnail;
+		$_POST['urls']         = array( wp_get_attachment_url( $attachment ) );
+
+		// Make the request.
+		try {
+			$this->_handleAjax( 'set-attachment-thumbnail' );
+		} catch ( WPAjaxDieContinueException $e ) {
+			unset( $e );
+		}
+
+		// Get the response.
+		$response = json_decode( $this->_last_response, true );
+
+		// Check that success is false without sending nonce.
+		$this->assertFalse( $response['success'] );
+	}
 }
diff --git a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
index 068165b991b58..4f76ea12fb52d 100644
--- a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
+++ b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyErasePersonalData.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress\UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Ajax_PrivacyExportPersonalData class.
- *
- * @since 5.2.0
  *
  * @group ajax
  * @group privacy
diff --git a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
index f8e588ff5eafb..51e4cb1391dff 100644
--- a/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
+++ b/tests/phpunit/tests/ajax/wpAjaxWpPrivacyExportPersonalData.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress\UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Ajax_PrivacyExportPersonalData class.
- *
- * @since 5.2.0
  *
  * @group ajax
  * @group privacy
diff --git a/tests/phpunit/tests/auth.php b/tests/phpunit/tests/auth.php
index 2198fadcd0ddb..facd456dd0227 100644
--- a/tests/phpunit/tests/auth.php
+++ b/tests/phpunit/tests/auth.php
@@ -5,6 +5,11 @@
  * @group auth
  */
 class Tests_Auth extends WP_UnitTestCase {
+	// Class User values assigned to constants.
+	const USER_EMAIL = 'test@password.com';
+	const USER_LOGIN = 'password-user';
+	const USER_PASS  = 'password';
+
 	protected $user;
 
 	/**
@@ -22,7 +27,9 @@ class Tests_Auth extends WP_UnitTestCase {
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$_user = $factory->user->create_and_get(
 			array(
-				'user_login' => 'password-tests',
+				'user_login' => self::USER_LOGIN,
+				'user_email' => self::USER_EMAIL,
+				'user_pass'  => self::USER_PASS,
 			)
 		);
 
@@ -46,6 +53,10 @@ public function tear_down() {
 		// Cleanup all the global state.
 		unset( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'], $GLOBALS['wp_rest_application_password_status'], $GLOBALS['wp_rest_application_password_uuid'] );
 
+		// Cleanup manual auth cookie test.
+		unset( $_COOKIE[ AUTH_COOKIE ] );
+		unset( $_COOKIE[ SECURE_AUTH_COOKIE ] );
+
 		parent::tear_down();
 	}
 
@@ -100,6 +111,22 @@ public function test_password_trimming() {
 		}
 	}
 
+	/**
+	 * Tests hooking into wp_set_password().
+	 *
+	 * @ticket 57436
+	 *
+	 * @covers ::wp_set_password
+	 */
+	public function test_wp_set_password_action() {
+		$action = new MockAction();
+
+		add_action( 'wp_set_password', array( $action, 'action' ) );
+		wp_set_password( 'A simple password', self::$user_id );
+
+		$this->assertSame( 1, $action->get_call_count() );
+	}
+
 	/**
 	 * Test wp_hash_password trims whitespace
 	 *
@@ -413,6 +440,129 @@ public function test_log_in_using_email() {
 		$this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_login'], $user_args['user_pass'] ) );
 	}
 
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_wp_user_object() {
+		$result = wp_authenticate_username_password( self::$_user, '', '' );
+		$this->assertSame( $result->ID, self::$user_id );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_login_and_password() {
+		$result = wp_authenticate_username_password( null, self::USER_LOGIN, self::USER_PASS );
+		$this->assertSame( self::$user_id, $result->ID );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_null_password() {
+		$result = wp_authenticate_username_password( null, self::USER_LOGIN, null );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_null_login() {
+		$result = wp_authenticate_username_password( null, null, self::USER_PASS );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_invalid_login() {
+		$result = wp_authenticate_username_password( null, 'invalidlogin', self::USER_PASS );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_username_password_with_invalid_password() {
+		$result = wp_authenticate_username_password( null, self::USER_LOGIN, 'invalidpassword' );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_wp_user_object() {
+		$result = wp_authenticate_email_password( self::$_user, '', '' );
+		$this->assertSame( self::$user_id, $result->ID );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_login_and_password() {
+		$result = wp_authenticate_email_password( null, self::USER_EMAIL, self::USER_PASS );
+		$this->assertSame( self::$user_id, $result->ID );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_null_password() {
+		$result = wp_authenticate_email_password( null, self::USER_EMAIL, null );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_null_email() {
+		$result = wp_authenticate_email_password( null, null, self::USER_PASS );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_invalid_email() {
+		$result = wp_authenticate_email_password( null, 'invalid@example.com', self::USER_PASS );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_email_password_with_invalid_password() {
+		$result = wp_authenticate_email_password( null, self::USER_EMAIL, 'invalidpassword' );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_cookie_with_wp_user_object() {
+		$result = wp_authenticate_cookie( $this->user, null, null );
+		$this->assertSame( self::$user_id, $result->ID );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_cookie_with_null_params() {
+		$result = wp_authenticate_cookie( null, null, null );
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * @ticket 36476
+	 */
+	public function test_wp_authenticate_cookie_with_invalid_cookie() {
+		$_COOKIE[ AUTH_COOKIE ]        = 'invalid_cookie';
+		$_COOKIE[ SECURE_AUTH_COOKIE ] = 'secure_invalid_cookie';
+
+		$result = wp_authenticate_cookie( null, null, null );
+		$this->assertInstanceOf( 'WP_Error', $result );
+	}
+
 	/**
 	 * @ticket 38744
 	 */
@@ -428,6 +578,25 @@ public function test_wp_signon_using_email_with_an_apostrophe() {
 		$this->assertInstanceOf( 'WP_User', wp_signon() );
 	}
 
+	/**
+	 * Tests that PHP 8.1 "passing null to non-nullable" deprecation notices
+	 * are not thrown when `user_login` and `user_password` parameters are empty.
+	 *
+	 * The notices that we should not see:
+	 * `Deprecated: preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated`.
+	 * `Deprecated: trim(): Passing null to parameter #1 ($string) of type string is deprecated`.
+	 *
+	 * @ticket 56850
+	 */
+	public function test_wp_signon_does_not_throw_deprecation_notices_with_default_parameters() {
+		$error = wp_signon();
+		$this->assertWPError( $error, 'The result should be an instance of WP_Error.' );
+
+		$error_codes = $error->get_error_codes();
+		$this->assertContains( 'empty_username', $error_codes, 'The "empty_username" error code should be present.' );
+		$this->assertContains( 'empty_password', $error_codes, 'The "empty_password" error code should be present.' );
+	}
+
 	/**
 	 * HTTP Auth headers are used to determine the current user.
 	 *
diff --git a/tests/phpunit/tests/block-supports/border.php b/tests/phpunit/tests/block-supports/border.php
index 204c8e43a01ef..aae4d4d2cc03b 100644
--- a/tests/phpunit/tests/block-supports/border.php
+++ b/tests/phpunit/tests/block-supports/border.php
@@ -10,12 +10,12 @@ class Test_Block_Supports_Border extends WP_UnitTestCase {
 	 */
 	private $test_block_name;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->test_block_name = null;
 	}
 
-	function tear_down() {
+	public function tear_down() {
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::set_up();
@@ -24,7 +24,7 @@ function tear_down() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_border_color_slug_with_numbers_is_kebab_cased_properly() {
+	public function test_border_color_slug_with_numbers_is_kebab_cased_properly() {
 		$this->test_block_name = 'test/border-color-slug-with-numbers-is-kebab-cased-properly';
 		register_block_type(
 			$this->test_block_name,
@@ -73,7 +73,7 @@ function test_border_color_slug_with_numbers_is_kebab_cased_properly() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_border_with_skipped_serialization_block_supports() {
+	public function test_border_with_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/border-with-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
@@ -117,7 +117,7 @@ function test_border_with_skipped_serialization_block_supports() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_radius_with_individual_skipped_serialization_block_supports() {
+	public function test_radius_with_individual_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/radius-with-individual-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
diff --git a/tests/phpunit/tests/block-supports/colors.php b/tests/phpunit/tests/block-supports/colors.php
index 109709e3d722f..f9d302a741fa7 100644
--- a/tests/phpunit/tests/block-supports/colors.php
+++ b/tests/phpunit/tests/block-supports/colors.php
@@ -10,12 +10,12 @@ class Tests_Block_Supports_Colors extends WP_UnitTestCase {
 	 */
 	private $test_block_name;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->test_block_name = null;
 	}
 
-	function tear_down() {
+	public function tear_down() {
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::set_up();
@@ -24,7 +24,7 @@ function tear_down() {
 	/**
 	 * @ticket 54337
 	 */
-	function test_color_slugs_with_numbers_are_kebab_cased_properly() {
+	public function test_color_slugs_with_numbers_are_kebab_cased_properly() {
 		$this->test_block_name = 'test/color-slug-with-numbers';
 		register_block_type(
 			$this->test_block_name,
@@ -68,7 +68,7 @@ function test_color_slugs_with_numbers_are_kebab_cased_properly() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_color_with_skipped_serialization_block_supports() {
+	public function test_color_with_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/color-with-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
@@ -109,7 +109,7 @@ function test_color_with_skipped_serialization_block_supports() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_gradient_with_individual_skipped_serialization_block_supports() {
+	public function test_gradient_with_individual_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/gradient-with-individual-skipped-serialization-block-support';
 		register_block_type(
 			$this->test_block_name,
diff --git a/tests/phpunit/tests/block-supports/duotone.php b/tests/phpunit/tests/block-supports/duotone.php
new file mode 100644
index 0000000000000..2077ef705b19a
--- /dev/null
+++ b/tests/phpunit/tests/block-supports/duotone.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * Test the block WP_Duotone class.
+ *
+ * @package WordPress
+ */
+
+class Tests_Block_Supports_DuoTones extends WP_UnitTestCase {
+	/**
+	 * Cleans up CSS added to block-supports from duotone styles. We neeed to do this
+	 * in order to avoid impacting other tests.
+	 */
+	public static function wpTearDownAfterClass() {
+		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
+	}
+
+	/**
+	 * Tests whether the duotone preset class is added to the block.
+	 *
+	 * @ticket 58555
+	 *
+	 * @covers ::render_duotone_support
+	 */
+	public function test_render_duotone_support_preset() {
+		$block         = array(
+			'blockName' => 'core/image',
+			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => 'var:preset|duotone|blue-orange' ) ) ),
+		);
+		$wp_block      = new WP_Block( $block );
+		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
+		$expected      = '<figure class="wp-block-image size-full wp-duotone-blue-orange"><img src="/my-image.jpg" /></figure>';
+		$this->assertSame( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
+	}
+
+	/**
+	 * Tests whether the duotone unset class is added to the block.
+	 *
+	 * @ticket 58555
+	 *
+	 * @covers ::render_duotone_support
+	 */
+	public function test_render_duotone_support_css() {
+		$block         = array(
+			'blockName' => 'core/image',
+			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => 'unset' ) ) ),
+		);
+		$wp_block      = new WP_Block( $block );
+		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
+		$expected      = '/<figure class="wp-block-image size-full wp-duotone-unset-\d+"><img src="\\/my-image.jpg" \\/><\\/figure>/';
+		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
+	}
+
+	/**
+	 * Tests whether the duotone custom class is added to the block.
+	 *
+	 * @covers ::render_duotone_support
+	 */
+	public function test_render_duotone_support_custom() {
+		$block         = array(
+			'blockName' => 'core/image',
+			'attrs'     => array( 'style' => array( 'color' => array( 'duotone' => array( '#FFFFFF', '#000000' ) ) ) ),
+		);
+		$wp_block      = new WP_Block( $block );
+		$block_content = '<figure class="wp-block-image size-full"><img src="/my-image.jpg" /></figure>';
+		$expected      = '/<figure class="wp-block-image size-full wp-duotone-ffffff-000000-\d+"><img src="\\/my-image.jpg" \\/><\\/figure>/';
+		$this->assertMatchesRegularExpression( $expected, WP_Duotone::render_duotone_support( $block_content, $block, $wp_block ) );
+	}
+
+	/**
+	 * Tests whether the slug is extracted from the attribute.
+	 *
+	 * @dataProvider data_get_slug_from_attribute
+	 * @covers ::get_slug_from_attribute
+	 */
+	public function test_get_slug_from_attribute( $data_attr, $expected ) {
+
+		$reflection = new ReflectionMethod( 'WP_Duotone', 'get_slug_from_attribute' );
+		$reflection->setAccessible( true );
+
+		$this->assertSame( $expected, $reflection->invoke( null, $data_attr ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[].
+	 */
+	public function data_get_slug_from_attribute() {
+		return array(
+			'pipe-slug'                       => array( 'var:preset|duotone|blue-orange', 'blue-orange' ),
+			'css-var'                         => array( 'var(--wp--preset--duotone--blue-orange)', 'blue-orange' ),
+			'css-var-invalid-slug-chars'      => array( 'var(--wp--preset--duotone--.)', '.' ),
+			'css-var-missing-end-parenthesis' => array( 'var(--wp--preset--duotone--blue-orange', '' ),
+			'invalid'                         => array( 'not a valid attribute', '' ),
+			'css-var-no-value'                => array( 'var(--wp--preset--duotone--)', '' ),
+			'pipe-slug-no-value'              => array( 'var:preset|duotone|', '' ),
+			'css-var-spaces'                  => array( 'var(--wp--preset--duotone--    ', '' ),
+			'pipe-slug-spaces'                => array( 'var:preset|duotone|  ', '' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_is_preset
+	 */
+	public function test_is_preset( $data_attr, $expected ) {
+		$reflection = new ReflectionMethod( 'WP_Duotone', 'is_preset' );
+		$reflection->setAccessible( true );
+
+		$this->assertSame( $expected, $reflection->invoke( null, $data_attr ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[].
+	 */
+	public function data_is_preset() {
+		return array(
+			'pipe-slug'                       => array( 'var:preset|duotone|blue-orange', true ),
+			'css-var'                         => array( 'var(--wp--preset--duotone--blue-orange)', true ),
+			'css-var-invalid-slug-chars'      => array( 'var(--wp--preset--duotone--.)', false ),
+			'css-var-missing-end-parenthesis' => array( 'var(--wp--preset--duotone--blue-orange', false ),
+			'invalid'                         => array( 'not a valid attribute', false ),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/block-supports/elements.php b/tests/phpunit/tests/block-supports/elements.php
index 97026f8092249..02c29dd6e6788 100644
--- a/tests/phpunit/tests/block-supports/elements.php
+++ b/tests/phpunit/tests/block-supports/elements.php
@@ -9,11 +9,11 @@ class Tests_Block_Supports_Elements extends WP_UnitTestCase {
 	 * Given a string containing a class prefixed by "wp-elements-" followed by a unique id,
 	 * this function returns a string where the id is one instead of being unique.
 	 *
-	 * @param  string $string String containing unique id classes.
-	 * @return string                String where the unique id classes were replaced with "wp-elements-1".
+	 * @param string $block_content String containing unique id classes.
+	 * @return string String where the unique id classes were replaced with "wp-elements-1".
 	 */
-	private static function make_unique_id_one( $string ) {
-		return preg_replace( '/wp-elements-[a-zA-Z0-9]+/', 'wp-elements-1', $string );
+	private static function make_unique_id_one( $block_content ) {
+		return preg_replace( '/wp-elements-[a-zA-Z0-9]+/', 'wp-elements-1', $block_content );
 	}
 
 	/**
@@ -73,7 +73,7 @@ public function test_class_paragraph_link_color() {
 		);
 		$this->assertSame(
 			$result,
-			'<p class="wp-elements-1 has-dark-gray-background-color has-background">Hello <a href="http://www.wordpress.org/">WordPress</a>!</p>'
+			'<p class="has-dark-gray-background-color has-background wp-elements-1">Hello <a href="http://www.wordpress.org/">WordPress</a>!</p>'
 		);
 	}
 
@@ -103,7 +103,7 @@ public function test_anchor_paragraph_link_color() {
 		);
 		$this->assertSame(
 			$result,
-			'<p id="anchor" class="wp-elements-1">Hello <a href="http://www.wordpress.org/">WordPress</a>!</p>'
+			'<p class="wp-elements-1" id="anchor">Hello <a href="http://www.wordpress.org/">WordPress</a>!</p>'
 		);
 	}
 }
diff --git a/tests/phpunit/tests/block-supports/layout.php b/tests/phpunit/tests/block-supports/layout.php
index 3611c28efa22e..df0abf9b49922 100644
--- a/tests/phpunit/tests/block-supports/layout.php
+++ b/tests/phpunit/tests/block-supports/layout.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block supports tests for the layout.
+ * Tests for block supports related to layout.
  *
  * @package WordPress
  * @subpackage Block Supports
  * @since 6.0.0
- */
-
-/**
- * Tests for block supports related to layout.
- *
- * @since 6.0.0
  *
  * @group block-supports
  *
@@ -32,7 +26,7 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase {
 	 */
 	private $orig_theme_dir;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->theme_root     = realpath( DIR_TESTDATA . '/themedir1' );
 		$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
@@ -50,7 +44,7 @@ function set_up() {
 		unset( $GLOBALS['wp_themes'] );
 	}
 
-	function tear_down() {
+	public function tear_down() {
 		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
 
 		// Clear up the filters to modify the theme root.
@@ -63,14 +57,14 @@ function tear_down() {
 		parent::tear_down();
 	}
 
-	function filter_set_theme_root() {
+	public function filter_set_theme_root() {
 		return $this->theme_root;
 	}
 
 	/**
 	 * @ticket 55505
 	 */
-	function test_outer_container_not_restored_for_non_aligned_image_block_with_non_themejson_theme() {
+	public function test_outer_container_not_restored_for_non_aligned_image_block_with_non_themejson_theme() {
 		// The "default" theme doesn't have theme.json support.
 		switch_theme( 'default' );
 		$block         = array(
@@ -86,7 +80,7 @@ function test_outer_container_not_restored_for_non_aligned_image_block_with_non_
 	/**
 	 * @ticket 55505
 	 */
-	function test_outer_container_restored_for_aligned_image_block_with_non_themejson_theme() {
+	public function test_outer_container_restored_for_aligned_image_block_with_non_themejson_theme() {
 		// The "default" theme doesn't have theme.json support.
 		switch_theme( 'default' );
 		$block         = array(
@@ -107,7 +101,7 @@ function test_outer_container_restored_for_aligned_image_block_with_non_themejso
 	 * @param string $block_image_html The block image HTML passed to `wp_restore_image_outer_container`.
 	 * @param string $expected         The expected block image HTML.
 	 */
-	function test_additional_styles_moved_to_restored_outer_container_for_aligned_image_block_with_non_themejson_theme( $block_image_html, $expected ) {
+	public function test_additional_styles_moved_to_restored_outer_container_for_aligned_image_block_with_non_themejson_theme( $block_image_html, $expected ) {
 		// The "default" theme doesn't have theme.json support.
 		switch_theme( 'default' );
 		$block = array(
@@ -160,7 +154,7 @@ public function data_block_image_html_restored_outer_container() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_outer_container_not_restored_for_aligned_image_block_with_themejson_theme() {
+	public function test_outer_container_not_restored_for_aligned_image_block_with_themejson_theme() {
 		switch_theme( 'block-theme' );
 		$block         = array(
 			'blockName' => 'core/image',
@@ -173,4 +167,89 @@ function test_outer_container_not_restored_for_aligned_image_block_with_themejso
 
 		$this->assertSame( $expected, wp_restore_image_outer_container( $block_content, $block ) );
 	}
+
+	/**
+	 * @ticket 57584
+	 * @ticket 58548
+	 *
+	 * @dataProvider data_layout_support_flag_renders_classnames_on_wrapper
+	 *
+	 * @covers ::wp_render_layout_support_flag
+	 *
+	 * @param array  $args            Dataset to test.
+	 * @param string $expected_output The expected output.
+	 */
+	public function test_layout_support_flag_renders_classnames_on_wrapper( $args, $expected_output ) {
+		$actual_output = wp_render_layout_support_flag( $args['block_content'], $args['block'] );
+		$this->assertSame( $expected_output, $actual_output );
+	}
+
+	/**
+	 * Data provider for test_layout_support_flag_renders_classnames_on_wrapper.
+	 *
+	 * @return array
+	 */
+	public function data_layout_support_flag_renders_classnames_on_wrapper() {
+		return array(
+			'single wrapper block layout with flow type'   => array(
+				'args'            => array(
+					'block_content' => '<div class="wp-block-group"></div>',
+					'block'         => array(
+						'blockName'    => 'core/group',
+						'attrs'        => array(
+							'layout' => array(
+								'type' => 'default',
+							),
+						),
+						'innerBlocks'  => array(),
+						'innerHTML'    => '<div class="wp-block-group"></div>',
+						'innerContent' => array(
+							'<div class="wp-block-group"></div>',
+						),
+					),
+				),
+				'expected_output' => '<div class="wp-block-group is-layout-flow wp-block-group-is-layout-flow"></div>',
+			),
+			'single wrapper block layout with constrained type' => array(
+				'args'            => array(
+					'block_content' => '<div class="wp-block-group"></div>',
+					'block'         => array(
+						'blockName'    => 'core/group',
+						'attrs'        => array(
+							'layout' => array(
+								'type' => 'constrained',
+							),
+						),
+						'innerBlocks'  => array(),
+						'innerHTML'    => '<div class="wp-block-group"></div>',
+						'innerContent' => array(
+							'<div class="wp-block-group"></div>',
+						),
+					),
+				),
+				'expected_output' => '<div class="wp-block-group is-layout-constrained wp-block-group-is-layout-constrained"></div>',
+			),
+			'multiple wrapper block layout with flow type' => array(
+				'args'            => array(
+					'block_content' => '<div class="wp-block-group"><div class="wp-block-group__inner-wrapper"></div></div>',
+					'block'         => array(
+						'blockName'    => 'core/group',
+						'attrs'        => array(
+							'layout' => array(
+								'type' => 'default',
+							),
+						),
+						'innerBlocks'  => array(),
+						'innerHTML'    => '<div class="wp-block-group"><div class="wp-block-group__inner-wrapper"></div></div>',
+						'innerContent' => array(
+							'<div class="wp-block-group"><div class="wp-block-group__inner-wrapper">',
+							' ',
+							' </div></div>',
+						),
+					),
+				),
+				'expected_output' => '<div class="wp-block-group"><div class="wp-block-group__inner-wrapper is-layout-flow wp-block-group-is-layout-flow"></div></div>',
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/block-supports/shadow.php b/tests/phpunit/tests/block-supports/shadow.php
new file mode 100644
index 0000000000000..b2e9dc80f6f1d
--- /dev/null
+++ b/tests/phpunit/tests/block-supports/shadow.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @group block-supports
+ *
+ * @covers ::wp_apply_shadow_support
+ */
+class Test_Block_Supports_Shadow extends WP_UnitTestCase {
+	/**
+	 * @var string|null
+	 */
+	private $test_block_name;
+
+	public function set_up() {
+		parent::set_up();
+		$this->test_block_name = null;
+	}
+
+	public function tear_down() {
+		unregister_block_type( $this->test_block_name );
+		$this->test_block_name = null;
+		parent::set_up();
+	}
+
+	/**
+	 * @ticket 58590
+	 */
+	public function test_shadow_style_is_applied() {
+		$this->test_block_name = 'test/shadow-style-is-applied';
+		register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 3,
+				'attributes'  => array(
+					'style' => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => array(
+					'shadow' => true,
+				),
+			)
+		);
+		$registry   = WP_Block_Type_Registry::get_instance();
+		$block_type = $registry->get_registered( $this->test_block_name );
+		$block_atts = array(
+			'style' => array(
+				'shadow' => '60px -16px teal',
+			),
+		);
+
+		$actual   = wp_apply_shadow_support( $block_type, $block_atts );
+		$expected = array(
+			'style' => 'box-shadow:60px -16px teal;',
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * @ticket 58590
+	 */
+	public function test_shadow_without_block_supports() {
+		$this->test_block_name = 'test/shadow-with-skipped-serialization-block-supports';
+		register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 2,
+				'attributes'  => array(
+					'style' => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => array(),
+			)
+		);
+		$registry   = WP_Block_Type_Registry::get_instance();
+		$block_type = $registry->get_registered( $this->test_block_name );
+		$block_atts = array(
+			'style' => array(
+				'shadow' => '60px -16px teal',
+			),
+		);
+
+		$actual   = wp_apply_spacing_support( $block_type, $block_atts );
+		$expected = array();
+
+		$this->assertSame( $expected, $actual );
+	}
+}
diff --git a/tests/phpunit/tests/block-supports/spacing.php b/tests/phpunit/tests/block-supports/spacing.php
index e0a849cf6bc30..4b5ada3798740 100644
--- a/tests/phpunit/tests/block-supports/spacing.php
+++ b/tests/phpunit/tests/block-supports/spacing.php
@@ -10,12 +10,12 @@ class Test_Block_Supports_Spacing extends WP_UnitTestCase {
 	 */
 	private $test_block_name;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 		$this->test_block_name = null;
 	}
 
-	function tear_down() {
+	public function tear_down() {
 		unregister_block_type( $this->test_block_name );
 		$this->test_block_name = null;
 		parent::set_up();
@@ -24,7 +24,7 @@ function tear_down() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_spacing_style_is_applied() {
+	public function test_spacing_style_is_applied() {
 		$this->test_block_name = 'test/spacing-style-is-applied';
 		register_block_type(
 			$this->test_block_name,
@@ -72,7 +72,7 @@ function test_spacing_style_is_applied() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_spacing_with_skipped_serialization_block_supports() {
+	public function test_spacing_with_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/spacing-with-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
@@ -119,7 +119,7 @@ function test_spacing_with_skipped_serialization_block_supports() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_margin_with_individual_skipped_serialization_block_supports() {
+	public function test_margin_with_individual_skipped_serialization_block_supports() {
 		$this->test_block_name = 'test/margin-with-individual-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
diff --git a/tests/phpunit/tests/block-supports/typography.php b/tests/phpunit/tests/block-supports/typography.php
index fb97de4deb6eb..1b47ea379beeb 100644
--- a/tests/phpunit/tests/block-supports/typography.php
+++ b/tests/phpunit/tests/block-supports/typography.php
@@ -23,7 +23,7 @@ class Tests_Block_Supports_Typography extends WP_UnitTestCase {
 	 */
 	private $orig_theme_dir;
 
-	function set_up() {
+	public function set_up() {
 		parent::set_up();
 
 		$this->test_block_name = null;
@@ -48,7 +48,7 @@ function set_up() {
 	/**
 	 * Unregisters block type after each test.
 	 */
-	function tear_down() {
+	public function tear_down() {
 		// Restores the original theme directory setup.
 		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
 		wp_clean_themes_cache();
@@ -68,7 +68,7 @@ function tear_down() {
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_kebab_case_font_size_slug_with_numbers() {
+	public function test_should_kebab_case_font_size_slug_with_numbers() {
 		$this->test_block_name = 'test/font-size-slug-with-numbers';
 		register_block_type(
 			$this->test_block_name,
@@ -104,7 +104,7 @@ function test_should_kebab_case_font_size_slug_with_numbers() {
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_generate_font_family_with_legacy_inline_styles_using_a_value() {
+	public function test_should_generate_font_family_with_legacy_inline_styles_using_a_value() {
 		$this->test_block_name = 'test/font-family-with-inline-styles-using-value';
 		register_block_type(
 			$this->test_block_name,
@@ -139,7 +139,7 @@ function test_should_generate_font_family_with_legacy_inline_styles_using_a_valu
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_skip_serialization_for_typography_block_supports() {
+	public function test_should_skip_serialization_for_typography_block_supports() {
 		$this->test_block_name = 'test/typography-with-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
@@ -187,7 +187,7 @@ function test_should_skip_serialization_for_typography_block_supports() {
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_skip_serialization_for_letter_spacing_block_supports() {
+	public function test_should_skip_serialization_for_letter_spacing_block_supports() {
 		$this->test_block_name = 'test/letter-spacing-with-individual-skipped-serialization-block-supports';
 		register_block_type(
 			$this->test_block_name,
@@ -225,7 +225,7 @@ function test_should_skip_serialization_for_letter_spacing_block_supports() {
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_generate_css_var_for_font_family_with_legacy_inline_styles() {
+	public function test_should_generate_css_var_for_font_family_with_legacy_inline_styles() {
 		$this->test_block_name = 'test/font-family-with-inline-styles-using-css-var';
 		register_block_type(
 			$this->test_block_name,
@@ -260,7 +260,7 @@ function test_should_generate_css_var_for_font_family_with_legacy_inline_styles(
 	 *
 	 * @covers ::wp_apply_typography_support
 	 */
-	function test_should_generate_classname_for_font_family() {
+	public function test_should_generate_classname_for_font_family() {
 		$this->test_block_name = 'test/font-family-with-class';
 		register_block_type(
 			$this->test_block_name,
@@ -292,6 +292,8 @@ function test_should_generate_classname_for_font_family() {
 	 * Tests generating font size values, including fluid formulae, from fontSizes preset.
 	 *
 	 * @ticket 56467
+	 * @ticket 57065
+	 * @ticket 58523
 	 *
 	 * @covers ::wp_get_typography_font_size_value
 	 *
@@ -307,7 +309,7 @@ function test_should_generate_classname_for_font_family() {
 	 * @param bool   $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
 	 * @param string $expected_output             Expected output.
 	 */
-	function test_wp_get_typography_font_size_value( $font_size_preset, $should_use_fluid_typography, $expected_output ) {
+	public function test_wp_get_typography_font_size_value( $font_size_preset, $should_use_fluid_typography, $expected_output ) {
 		$actual = wp_get_typography_font_size_value( $font_size_preset, $should_use_fluid_typography );
 
 		$this->assertSame( $expected_output, $actual );
@@ -320,7 +322,7 @@ function test_wp_get_typography_font_size_value( $font_size_preset, $should_use_
 	 */
 	public function data_generate_font_size_preset_fixtures() {
 		return array(
-			'default_return_value'                        => array(
+			'returns value when fluid typography is deactivated' => array(
 				'font_size_preset'            => array(
 					'size' => '28px',
 				),
@@ -328,7 +330,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => '28px',
 			),
 
-			'size: int 0'                                 => array(
+			'returns value where font size is 0'         => array(
 				'font_size_preset'            => array(
 					'size' => 0,
 				),
@@ -336,7 +338,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => 0,
 			),
 
-			'size: string 0'                              => array(
+			"returns value where font size is '0'"       => array(
 				'font_size_preset'            => array(
 					'size' => '0',
 				),
@@ -344,7 +346,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => '0',
 			),
 
-			'default_return_value_when_size_is_undefined' => array(
+			'returns value where `size` is `null`'       => array(
 				'font_size_preset'            => array(
 					'size' => null,
 				),
@@ -352,7 +354,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => null,
 			),
 
-			'default_return_value_when_fluid_is_false'    => array(
+			'returns value when fluid is `false`'        => array(
 				'font_size_preset'            => array(
 					'size'  => '28px',
 					'fluid' => false,
@@ -361,7 +363,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => '28px',
 			),
 
-			'default_return_value_when_value_is_already_clamped' => array(
+			'returns already clamped value'              => array(
 				'font_size_preset'            => array(
 					'size'  => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
 					'fluid' => false,
@@ -370,7 +372,7 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
 			),
 
-			'default_return_value_with_unsupported_unit'  => array(
+			'returns value with unsupported unit'        => array(
 				'font_size_preset'            => array(
 					'size'  => '1000%',
 					'fluid' => false,
@@ -379,57 +381,89 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => '1000%',
 			),
 
-			'return_fluid_value'                          => array(
+			'returns clamp value with rem min and max units' => array(
 				'font_size_preset'            => array(
 					'size' => '1.75rem',
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(1.313rem, 1.313rem + ((1vw - 0.48rem) * 2.523), 2.625rem)',
+				'expected_output'             => 'clamp(1.119rem, 1.119rem + ((1vw - 0.2rem) * 0.789), 1.75rem)',
 			),
 
-			'return_fluid_value_with_floats_with_units'   => array(
-				'font_size_preset'            => array(
-					'size' => '100.175px',
+			'returns clamp value with em min and max units' => array(
+				'font_size'                   => array(
+					'size' => '1.75em',
+				),
+				'should_use_fluid_typography' => true,
+				'expected_output'             => 'clamp(1.119em, 1.119rem + ((1vw - 0.2em) * 0.789), 1.75em)',
+			),
+
+			'returns clamp value for floats'             => array(
+				'font_size'                   => array(
+					'size' => '70.175px',
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(75.131px, 4.696rem + ((1vw - 7.68px) * 9.03), 150.263px)',
+				'expected_output'             => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
 			),
 
-			'return_fluid_value_with_integer_coerced_to_px' => array(
+			'coerces integer to `px` and returns clamp value' => array(
 				'font_size_preset'            => array(
 					'size' => 33,
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(24.75px, 1.547rem + ((1vw - 7.68px) * 2.975), 49.5px)',
+				'expected_output'             => 'clamp(20.515px, 1.282rem + ((1vw - 3.2px) * 0.975), 33px)',
 			),
 
-			'return_fluid_value_with_float_coerced_to_px' => array(
+			'coerces float to `px` and returns clamp value' => array(
 				'font_size_preset'            => array(
-					'size' => 100.23,
+					'size' => 70.175,
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(75.173px, 4.698rem + ((1vw - 7.68px) * 9.035), 150.345px)',
+				'expected_output'             => 'clamp(37.897px, 2.369rem + ((1vw - 3.2px) * 2.522), 70.175px)',
 			),
 
-			'return_default_fluid_values_with_empty_fluid_array' => array(
+			'returns clamp value when `fluid` is empty array' => array(
 				'font_size_preset'            => array(
 					'size'  => '28px',
 					'fluid' => array(),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
+				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
 			),
 
-			'return_default_fluid_values_with_null_value' => array(
+			'returns clamp value when `fluid` is `null`' => array(
 				'font_size_preset'            => array(
 					'size'  => '28px',
 					'fluid' => null,
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 2.524), 42px)',
+				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 0.789), 28px)',
+			),
+
+			'returns clamp value where min and max fluid values defined' => array(
+				'font_size'                   => array(
+					'size'  => '80px',
+					'fluid' => array(
+						'min' => '70px',
+						'max' => '125px',
+					),
+				),
+				'should_use_fluid_typography' => true,
+				'expected_output'             => 'clamp(70px, 4.375rem + ((1vw - 3.2px) * 4.297), 125px)',
+			),
+
+			'returns clamp value where max is equal to size' => array(
+				'font_size'                   => array(
+					'size'  => '7.8125rem',
+					'fluid' => array(
+						'min' => '4.375rem',
+						'max' => '7.8125rem',
+					),
+				),
+				'should_use_fluid_typography' => true,
+				'expected_output'             => 'clamp(4.375rem, 4.375rem + ((1vw - 0.2rem) * 4.298), 7.8125rem)',
 			),
 
-			'return_clamped_value_if_min_font_size_is_greater_than_max' => array(
+			'returns clamp value if min font size is greater than max' => array(
 				'font_size_preset'            => array(
 					'size'  => '3rem',
 					'fluid' => array(
@@ -438,10 +472,10 @@ public function data_generate_font_size_preset_fixtures() {
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(5rem, 5rem + ((1vw - 0.48rem) * -5.769), 32px)',
+				'expected_output'             => 'clamp(5rem, 5rem + ((1vw - 0.2rem) * -3.75), 32px)',
 			),
 
-			'return_size_with_invalid_fluid_units'        => array(
+			'returns value with invalid min/max fluid units' => array(
 				'font_size_preset'            => array(
 					'size'  => '10em',
 					'fluid' => array(
@@ -453,15 +487,23 @@ public function data_generate_font_size_preset_fixtures() {
 				'expected_output'             => '10em',
 			),
 
-			'return_clamped_size_where_no_min_is_given_and_less_than_default_min_size' => array(
+			'returns value when size is < lower bounds and no fluid min/max set' => array(
 				'font_size_preset'            => array(
 					'size' => '3px',
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(3px, 0.188rem + ((1vw - 7.68px) * 0.18), 4.5px)',
+				'expected_output'             => '3px',
+			),
+
+			'returns value when size is equal to lower bounds and no fluid min/max set' => array(
+				'font_size'                   => array(
+					'size' => '14px',
+				),
+				'should_use_fluid_typography' => true,
+				'expected_output'             => '14px',
 			),
 
-			'return_fluid_clamp_value_with_different_min_max_units' => array(
+			'returns clamp value with different min max units' => array(
 				'font_size_preset'            => array(
 					'size'  => '28px',
 					'fluid' => array(
@@ -470,21 +512,21 @@ public function data_generate_font_size_preset_fixtures() {
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(20px, 1.25rem + ((1vw - 7.68px) * 93.75), 50rem)',
+				'expected_output'             => 'clamp(20px, 1.25rem + ((1vw - 3.2px) * 60.938), 50rem)',
 			),
 
-			'return_clamp_value_with_default_fluid_max_value' => array(
+			'returns clamp value where no fluid max size is set' => array(
 				'font_size_preset'            => array(
-					'size'  => '28px',
+					'size'  => '50px',
 					'fluid' => array(
 						'min' => '2.6rem',
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(2.6rem, 2.6rem + ((1vw - 0.48rem) * 0.048), 42px)',
+				'expected_output'             => 'clamp(2.6rem, 2.6rem + ((1vw - 0.2rem) * 0.656), 50px)',
 			),
 
-			'default_return_clamp_value_with_default_fluid_min_value' => array(
+			'returns clamp value where no fluid min size is set' => array(
 				'font_size_preset'            => array(
 					'size'  => '28px',
 					'fluid' => array(
@@ -492,77 +534,80 @@ public function data_generate_font_size_preset_fixtures() {
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(21px, 1.313rem + ((1vw - 7.68px) * 7.091), 80px)',
+				'expected_output'             => 'clamp(17.905px, 1.119rem + ((1vw - 3.2px) * 4.851), 80px)',
 			),
 
-			'should_adjust_computed_min_in_px_to_min_limit' => array(
+			'should not apply lower bound test when fluid values are set' => array(
 				'font_size_preset'            => array(
-					'size' => '14px',
+					'size'  => '1.5rem',
+					'fluid' => array(
+						'min' => '0.5rem',
+						'max' => '5rem',
+					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(14px, 0.875rem + ((1vw - 7.68px) * 0.841), 21px)',
+				'expected_output'             => 'clamp(0.5rem, 0.5rem + ((1vw - 0.2rem) * 5.625), 5rem)',
 			),
 
-			'should_adjust_computed_min_in_rem_to_min_limit' => array(
-				'font_size_preset'            => array(
-					'size' => '1.1rem',
+			'should not apply lower bound test when only fluid min is set' => array(
+				'font_size'                   => array(
+					'size'  => '20px',
+					'fluid' => array(
+						'min' => '12px',
+					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 1.49), 1.65rem)',
+				'expected_output'             => 'clamp(12px, 0.75rem + ((1vw - 3.2px) * 0.625), 20px)',
 			),
 
-			'default_return_clamp_value_with_replaced_fluid_min_value_in_em' => array(
-				'font_size_preset'            => array(
-					'size' => '1.1em',
+			'should not apply lower bound test when only fluid max is set' => array(
+				'font_size'                   => array(
+					'size'  => '0.875rem',
+					'fluid' => array(
+						'max' => '20rem',
+					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.875em, 0.875rem + ((1vw - 0.48em) * 1.49), 1.65em)',
+				'expected_output'             => 'clamp(0.875rem, 0.875rem + ((1vw - 0.2rem) * 23.906), 20rem)',
 			),
 
-			'should_adjust_fluid_min_value_in_px_to_min_limit' => array(
+			'returns clamp value when min and max font sizes are equal' => array(
 				'font_size_preset'            => array(
-					'size'  => '20px',
+					'size'  => '4rem',
 					'fluid' => array(
-						'min' => '12px',
+						'min' => '30px',
+						'max' => '30px',
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(14px, 0.875rem + ((1vw - 7.68px) * 1.923), 30px)',
+				'expected_output'             => 'clamp(30px, 1.875rem + ((1vw - 3.2px) * 1), 30px)',
 			),
 
-			'should_adjust_fluid_min_value_in_rem_to_min_limit' => array(
-				'font_size_preset'            => array(
-					'size'  => '1.5rem',
-					'fluid' => array(
-						'min' => '0.5rem',
-					),
+			'should apply scaled min font size for em values when custom min font size is not set' => array(
+				'font_size'                   => array(
+					'size' => '12rem',
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 2.644), 2.25rem)',
+				'expected_output'             => 'clamp(5.174rem, 5.174rem + ((1vw - 0.2rem) * 8.533), 12rem)',
 			),
 
-			'should_adjust_fluid_min_value_but_honor_max_value' => array(
-				'font_size_preset'            => array(
-					'size'  => '1.5rem',
-					'fluid' => array(
-						'min' => '0.5rem',
-						'max' => '5rem',
-					),
+			'should apply scaled min font size for px values when custom min font size is not set' => array(
+				'font_size'                   => array(
+					'size' => '200px',
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(0.875rem, 0.875rem + ((1vw - 0.48rem) * 7.933), 5rem)',
+				'expected_output'             => 'clamp(85.342px, 5.334rem + ((1vw - 3.2px) * 8.958), 200px)',
 			),
 
-			'should_return_fluid_value_when_min_and_max_font_sizes_are_equal' => array(
-				'font_size_preset'            => array(
-					'size'  => '4rem',
+			'should not apply scaled min font size for minimum font size when custom min font size is set' => array(
+				'font_size'                   => array(
+					'size'  => '200px',
 					'fluid' => array(
-						'min' => '30px',
-						'max' => '30px',
+						'min' => '100px',
 					),
 				),
 				'should_use_fluid_typography' => true,
-				'expected_output'             => 'clamp(30px, 1.875rem + ((1vw - 7.68px) * 1), 30px)',
+				'expected_output'             => 'clamp(100px, 6.25rem + ((1vw - 3.2px) * 7.813), 200px)',
 			),
 		);
 	}
@@ -573,21 +618,21 @@ public function data_generate_font_size_preset_fixtures() {
 	 * when "settings.typography.fluid" is set to true.
 	 *
 	 * @ticket 56467
+	 * @ticket 57065
+	 * @ticket 57529
+	 * @ticket 58522
+	 * @ticket 58523
 	 *
 	 * @covers ::wp_register_typography_support
 	 *
 	 * @dataProvider data_generate_block_supports_font_size_fixtures
 	 *
-	 * @param string $font_size_value             The block supports custom font size value.
-	 * @param bool   $should_use_fluid_typography An override to switch fluid typography "on". Can be used for unit testing.
-	 * @param string $expected_output             Expected value of style property from wp_apply_typography_support().
+	 * @param string $font_size_value The block supports custom font size value.
+	 * @param string $theme_slug      A theme slug corresponding to an available test theme.
+	 * @param string $expected_output Expected value of style property from wp_apply_typography_support().
 	 */
-	public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $should_use_fluid_typography, $expected_output ) {
-		if ( $should_use_fluid_typography ) {
-			switch_theme( 'block-theme-child-with-fluid-typography' );
-		} else {
-			switch_theme( 'default' );
-		}
+	public function test_should_covert_font_sizes_to_fluid_values( $font_size_value, $theme_slug, $expected_output ) {
+		switch_theme( $theme_slug );
 
 		$this->test_block_name = 'test/font-size-fluid-value';
 		register_block_type(
@@ -629,15 +674,30 @@ public function test_should_covert_font_sizes_to_fluid_values( $font_size_value,
 	 */
 	public function data_generate_block_supports_font_size_fixtures() {
 		return array(
-			'default_return_value'               => array(
-				'font_size_value'             => '50px',
-				'should_use_fluid_typography' => false,
-				'expected_output'             => 'font-size:50px;',
-			),
-			'return_value_with_fluid_typography' => array(
-				'font_size_value'             => '50px',
-				'should_use_fluid_typography' => true,
-				'expected_output'             => 'font-size:clamp(37.5px, 2.344rem + ((1vw - 7.68px) * 4.507), 75px);',
+			'returns value when fluid typography is not active' => array(
+				'font_size_value' => '15px',
+				'theme_slug'      => 'default',
+				'expected_output' => 'font-size:15px;',
+			),
+			'returns clamp value using default config' => array(
+				'font_size_value' => '15px',
+				'theme_slug'      => 'block-theme-child-with-fluid-typography',
+				'expected_output' => 'font-size:clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.078), 15px);',
+			),
+			'returns value when font size <= default min font size bound' => array(
+				'font_size_value' => '13px',
+				'theme_slug'      => 'block-theme-child-with-fluid-typography',
+				'expected_output' => 'font-size:13px;',
+			),
+			'returns clamp value using custom fluid config' => array(
+				'font_size_value' => '17px',
+				'theme_slug'      => 'block-theme-child-with-fluid-typography-config',
+				'expected_output' => 'font-size:clamp(16px, 1rem + ((1vw - 3.2px) * 0.147), 17px);',
+			),
+			'returns value when font size <= custom min font size bound' => array(
+				'font_size_value' => '15px',
+				'theme_slug'      => 'block-theme-child-with-fluid-typography-config',
+				'expected_output' => 'font-size:15px;',
 			),
 		);
 	}
@@ -648,6 +708,8 @@ public function data_generate_block_supports_font_size_fixtures() {
 	 * and the correct block content is generated.
 	 *
 	 * @ticket 56467
+	 * @ticket 57065
+	 * @ticket 58523
 	 *
 	 * @dataProvider data_generate_replace_inline_font_styles_with_fluid_values_fixtures
 	 *
@@ -695,7 +757,7 @@ public function data_generate_replace_inline_font_styles_with_fluid_values_fixtu
 				'block_content'               => '<h2 class="has-vivid-red-background-color has-background has-link-color" style="margin-top:var(--wp--preset--spacing--60);font-size:4rem;font-style:normal;font-weight:600;letter-spacing:29px;text-decoration:underline;text-transform:capitalize">This is a heading</h2>',
 				'font_size_value'             => '4rem',
 				'should_use_fluid_typography' => true,
-				'expected_output'             => '<h2 class="has-vivid-red-background-color has-background has-link-color" style="margin-top:var(--wp--preset--spacing--60);font-size:clamp(3rem, 3rem + ((1vw - 0.48rem) * 5.769), 6rem);font-style:normal;font-weight:600;letter-spacing:29px;text-decoration:underline;text-transform:capitalize">This is a heading</h2>',
+				'expected_output'             => '<h2 class="has-vivid-red-background-color has-background has-link-color" style="margin-top:var(--wp--preset--spacing--60);font-size:clamp(2.2rem, 2.2rem + ((1vw - 0.2rem) * 2.25), 4rem);font-style:normal;font-weight:600;letter-spacing:29px;text-decoration:underline;text-transform:capitalize">This is a heading</h2>',
 			),
 			'return_content_if_no_inline_font_size_found'  => array(
 				'block_content'               => '<p class="has-medium-font-size" style="font-style:normal;font-weight:600;letter-spacing:29px;">A paragraph inside a group</p>',
@@ -713,13 +775,13 @@ public function data_generate_replace_inline_font_styles_with_fluid_values_fixtu
 				'block_content'               => '<p class="has-medium-font-size" style="    font-size:   20px   ;    ">A paragraph inside a group</p>',
 				'font_size_value'             => '20px',
 				'should_use_fluid_typography' => true,
-				'expected_output'             => '<p class="has-medium-font-size" style="    font-size:clamp(15px, 0.938rem + ((1vw - 7.68px) * 1.803), 30px);    ">A paragraph inside a group</p>',
+				'expected_output'             => '<p class="has-medium-font-size" style="    font-size:clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.469), 20px);    ">A paragraph inside a group</p>',
 			),
 			'return_content_with_first_match_replace_only' => array(
 				'block_content'               => "<div class=\"wp-block-group\" style=\"font-size:1.5em\"> \n \n<p style=\"font-size:1.5em\">A paragraph inside a group</p></div>",
 				'font_size_value'             => '1.5em',
 				'should_use_fluid_typography' => true,
-				'expected_output'             => "<div class=\"wp-block-group\" style=\"font-size:clamp(1.125em, 1.125rem + ((1vw - 0.48em) * 2.163), 2.25em);\"> \n \n<p style=\"font-size:1.5em\">A paragraph inside a group</p></div>",
+				'expected_output'             => "<div class=\"wp-block-group\" style=\"font-size:clamp(0.984em, 0.984rem + ((1vw - 0.2em) * 0.645), 1.5em);\"> \n \n<p style=\"font-size:1.5em\">A paragraph inside a group</p></div>",
 			),
 		);
 	}
@@ -840,4 +902,90 @@ public function data_invalid_size_wp_get_typography_value_and_unit() {
 			'size: array' => array( array( '10' ) ),
 		);
 	}
+
+	/**
+	 * Tests computed font size values.
+	 *
+	 * @ticket 58522
+	 *
+	 * @covers ::wp_get_computed_fluid_typography_value
+	 *
+	 * @dataProvider data_wp_get_computed_fluid_typography_value
+	 *
+	 * @param array  $args {
+	 *      Optional. An associative array of values to calculate a fluid formula for font size. Default is empty array.
+	 *
+	 *     @type string $maximum_viewport_width Maximum size up to which type will have fluidity.
+	 *     @type string $minimum_viewport_width Minimum viewport size from which type will have fluidity.
+	 *     @type string $maximum_font_size      Maximum font size for any clamp() calculation.
+	 *     @type string $minimum_font_size      Minimum font size for any clamp() calculation.
+	 *     @type int    $scale_factor           A scale factor to determine how fast a font scales within boundaries.
+	 * }
+	 * @param string $expected_output             Expected value of style property from wp_apply_typography_support().
+	 */
+	public function test_wp_get_computed_fluid_typography_value( $args, $expected_output ) {
+		$actual = wp_get_computed_fluid_typography_value( $args );
+		$this->assertSame( $expected_output, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_wp_get_computed_fluid_typography_value() {
+		return array(
+			'returns clamped value with valid args' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '320px',
+					'maximum_viewport_width' => '1000px',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100px',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => 'clamp(50px, 3.125rem + ((1vw - 3.2px) * 7.353), 100px)',
+			),
+			'returns `null` when `maximum_viewport_width` is an unsupported unit' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '320px',
+					'maximum_viewport_width' => 'calc(100% - 60px)',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100px',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
+			'returns `null` when `minimum_viewport_width` is an unsupported unit' => array(
+				'args'            => array(
+					'minimum_viewport_width' => 'calc(100% - 60px)',
+					'maximum_viewport_width' => '1000px',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100px',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
+			'returns `null` when `minimum_font_size` is an unsupported unit' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '320em',
+					'maximum_viewport_width' => '1000em',
+					'minimum_font_size'      => '10vw',
+					'maximum_font_size'      => '100em',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
+			'returns `null` when `maximum_font_size` is an unsupported unit' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '320em',
+					'maximum_viewport_width' => '1000em',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100%',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
+		);
+	}
 }
+
diff --git a/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php b/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php
new file mode 100644
index 0000000000000..a4f2973a06934
--- /dev/null
+++ b/tests/phpunit/tests/block-supports/wpApplyDimensionsSupport.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @group block-supports
+ *
+ * @covers ::wp_apply_dimensions_support
+ */
+class Tests_Block_Supports_WpApplyDimensionsSupport extends WP_UnitTestCase {
+	/**
+	 * @var string|null
+	 */
+	private $test_block_name;
+
+	public function set_up() {
+		parent::set_up();
+		$this->test_block_name = null;
+	}
+
+	public function tear_down() {
+		unregister_block_type( $this->test_block_name );
+		$this->test_block_name = null;
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests that minimum height block support works as expected.
+	 *
+	 * @ticket 57582
+	 *
+	 * @covers ::wp_apply_dimensions_support
+	 *
+	 * @dataProvider data_minimum_height_block_support
+	 *
+	 * @param string $block_name The test block name to register.
+	 * @param mixed  $dimensions The dimensions block support settings.
+	 * @param mixed  $expected   The expected results.
+	 */
+	public function test_minimum_height_block_support( $block_name, $dimensions, $expected ) {
+		$this->test_block_name = $block_name;
+		register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 2,
+				'attributes'  => array(
+					'style' => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => array(
+					'dimensions' => $dimensions,
+				),
+			)
+		);
+		$registry    = WP_Block_Type_Registry::get_instance();
+		$block_type  = $registry->get_registered( $this->test_block_name );
+		$block_attrs = array(
+			'style' => array(
+				'dimensions' => array(
+					'minHeight' => '50vh',
+				),
+			),
+		);
+
+		$actual = wp_apply_dimensions_support( $block_type, $block_attrs );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_minimum_height_block_support() {
+		return array(
+			'style is applied' => array(
+				'block_name' => 'test/dimensions-block-supports',
+				'dimensions' => array(
+					'minHeight' => true,
+				),
+				'expected'   => array(
+					'style' => 'min-height:50vh;',
+				),
+			),
+			'style output is skipped when serialization is skipped' => array(
+				'block_name' => 'test/dimensions-with-skipped-serialization-block-supports',
+				'dimensions' => array(
+					'minHeight'                       => true,
+					'__experimentalSkipSerialization' => true,
+				),
+				'expected'   => array(),
+			),
+			'style output is skipped when individual feature serialization is skipped' => array(
+				'block_name' => 'test/min-height-with-individual-skipped-serialization-block-supports',
+				'dimensions' => array(
+					'minHeight'                       => true,
+					'__experimentalSkipSerialization' => array( 'minHeight' ),
+				),
+				'expected'   => array(),
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php b/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php
index 6ac4d05a96603..91f7df561d6e9 100644
--- a/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php
+++ b/tests/phpunit/tests/block-supports/wpGetLayoutStyle.php
@@ -246,7 +246,7 @@ public function data_wp_get_layout_style() {
 						'verticalAlignment' => 'bottom',
 					),
 				),
-				'expected_output' => '.wp-layout{flex-wrap:nowrap;flex-direction:column;align-items:flex-start;}',
+				'expected_output' => '.wp-layout{flex-wrap:nowrap;flex-direction:column;align-items:flex-start;justify-content:flex-end;}',
 			),
 			'default layout with blockGap to verify converting gap value into valid CSS' => array(
 				'args'            => array(
diff --git a/tests/phpunit/tests/block-supports/wpRenderPositionSupport.php b/tests/phpunit/tests/block-supports/wpRenderPositionSupport.php
new file mode 100644
index 0000000000000..4aa1418fe5eb2
--- /dev/null
+++ b/tests/phpunit/tests/block-supports/wpRenderPositionSupport.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @group block-supports
+ *
+ * @covers ::wp_render_position_support
+ */
+class Tests_Block_Supports_WpRenderPositionSupport extends WP_UnitTestCase {
+	/**
+	 * @var string|null
+	 */
+	private $test_block_name;
+
+	/**
+	 * Theme root directory.
+	 *
+	 * @var string
+	 */
+	private $theme_root;
+
+	/**
+	 * Original theme directory.
+	 *
+	 * @var string
+	 */
+	private $orig_theme_dir;
+
+	public function set_up() {
+		parent::set_up();
+		$this->test_block_name = null;
+		$this->theme_root      = realpath( DIR_TESTDATA . '/themedir1' );
+		$this->orig_theme_dir  = $GLOBALS['wp_theme_directories'];
+
+		// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
+		$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+
+		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+		add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+
+		// Clear caches.
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
+	}
+
+	public function tear_down() {
+		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
+
+		// Clear up the filters to modify the theme root.
+		remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
+		remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
+		remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+
+		wp_clean_themes_cache();
+		unset( $GLOBALS['wp_themes'] );
+		WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
+		unregister_block_type( $this->test_block_name );
+		$this->test_block_name = null;
+		parent::tear_down();
+	}
+
+	public function filter_set_theme_root() {
+		return $this->theme_root;
+	}
+
+	/**
+	 * Tests that position block support works as expected.
+	 *
+	 * @ticket 57618
+	 *
+	 * @covers ::wp_render_position_support
+	 *
+	 * @dataProvider data_position_block_support
+	 *
+	 * @param string $theme_name        The theme to switch to.
+	 * @param string $block_name        The test block name to register.
+	 * @param mixed  $position_settings The position block support settings.
+	 * @param mixed  $position_style    The position styles within the block attributes.
+	 * @param string $expected_wrapper  Expected markup for the block wrapper.
+	 * @param string $expected_styles   Expected styles enqueued by the style engine.
+	 */
+	public function test_position_block_support( $theme_name, $block_name, $position_settings, $position_style, $expected_wrapper, $expected_styles ) {
+		switch_theme( $theme_name );
+		$this->test_block_name = $block_name;
+
+		register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 2,
+				'attributes'  => array(
+					'style' => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => array(
+					'position' => $position_settings,
+				),
+			)
+		);
+
+		$block = array(
+			'blockName' => 'test/position-rules-are-output',
+			'attrs'     => array(
+				'style' => array(
+					'position' => $position_style,
+				),
+			),
+		);
+
+		$actual = wp_render_position_support( '<div>Content</div>', $block );
+
+		$this->assertMatchesRegularExpression(
+			$expected_wrapper,
+			$actual,
+			'Position block wrapper markup should be correct'
+		);
+
+		$actual_stylesheet = wp_style_engine_get_stylesheet_from_context(
+			'block-supports',
+			array(
+				'prettify' => false,
+			)
+		);
+
+		$this->assertMatchesRegularExpression(
+			$expected_styles,
+			$actual_stylesheet,
+			'Position style rules output should be correct'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_position_block_support() {
+		return array(
+			'sticky position style is applied' => array(
+				'theme_name'        => 'block-theme-child-with-fluid-typography',
+				'block_name'        => 'test/position-rules-are-output',
+				'position_settings' => true,
+				'position_style'    => array(
+					'type' => 'sticky',
+					'top'  => '0px',
+				),
+				'expected_wrapper'  => '/^<div class="wp-container-\d+ is-position-sticky">Content<\/div>$/',
+				'expected_styles'   => '/^.wp-container-\d+' . preg_quote( '{top:calc(0px + var(--wp-admin--admin-bar--position-offset, 0px));position:sticky;z-index:10;}' ) . '$/',
+			),
+			'sticky position style is not applied if theme does not support it' => array(
+				'theme_name'        => 'default',
+				'block_name'        => 'test/position-rules-without-theme-support',
+				'position_settings' => true,
+				'position_style'    => array(
+					'type' => 'sticky',
+					'top'  => '0px',
+				),
+				'expected_wrapper'  => '/^<div>Content<\/div>$/',
+				'expected_styles'   => '/^$/',
+			),
+			'sticky position style is not applied if block does not support it' => array(
+				'theme_name'        => 'block-theme-child-with-fluid-typography',
+				'block_name'        => 'test/position-rules-without-block-support',
+				'position_settings' => false,
+				'position_style'    => array(
+					'type' => 'sticky',
+					'top'  => '0px',
+				),
+				'expected_wrapper'  => '/^<div>Content<\/div>$/',
+				'expected_styles'   => '/^$/',
+			),
+			'sticky position style is not applied if type is not valid' => array(
+				'theme_name'        => 'block-theme-child-with-fluid-typography',
+				'block_name'        => 'test/position-rules-with-valid-type',
+				'position_settings' => true,
+				'position_style'    => array(
+					'type' => 'illegal-type',
+					'top'  => '0px',
+				),
+				'expected_wrapper'  => '/^<div>Content<\/div>$/',
+				'expected_styles'   => '/^$/',
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/block-template-utils.php b/tests/phpunit/tests/block-template-utils.php
index 440dbc15d929b..b5587def995a0 100644
--- a/tests/phpunit/tests/block-template-utils.php
+++ b/tests/phpunit/tests/block-template-utils.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * Tests_Block_Template_Utils class
+ * Tests for the Block Templates abstraction layer.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the Block Templates abstraction layer.
  *
  * @group block-templates
  */
@@ -105,6 +101,7 @@ public function test_build_block_template_result_from_post() {
 		$this->assertSame( 'My Template', $template->title );
 		$this->assertSame( 'Description of my template', $template->description );
 		$this->assertSame( 'wp_template', $template->type );
+		$this->assertSame( self::$template_post->post_modified, $template->modified, 'Template result properties match' );
 
 		// Test template parts.
 		$template_part = _build_block_template_result_from_post(
@@ -121,9 +118,10 @@ public function test_build_block_template_result_from_post() {
 		$this->assertSame( 'Description of my template part', $template_part->description );
 		$this->assertSame( 'wp_template_part', $template_part->type );
 		$this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
+		$this->assertSame( self::$template_part_post->post_modified, $template_part->modified, 'Template part result properties match' );
 	}
 
-	function test_build_block_template_result_from_file() {
+	public function test_build_block_template_result_from_file() {
 		$template = _build_block_template_result_from_file(
 			array(
 				'slug' => 'single',
@@ -137,9 +135,10 @@ function test_build_block_template_result_from_file() {
 		$this->assertSame( 'single', $template->slug );
 		$this->assertSame( 'publish', $template->status );
 		$this->assertSame( 'theme', $template->source );
-		$this->assertSame( 'Single', $template->title );
-		$this->assertSame( 'The default template for displaying any single post or attachment.', $template->description );
+		$this->assertSame( 'Single Posts', $template->title );
+		$this->assertSame( 'Displays single posts on your website unless a custom template has been applied to that post or a dedicated template exists.', $template->description );
 		$this->assertSame( 'wp_template', $template->type );
+		$this->assertEmpty( $template->modified );
 
 		// Test template parts.
 		$template_part = _build_block_template_result_from_file(
@@ -159,9 +158,10 @@ function test_build_block_template_result_from_file() {
 		$this->assertSame( '', $template_part->description );
 		$this->assertSame( 'wp_template_part', $template_part->type );
 		$this->assertSame( WP_TEMPLATE_PART_AREA_HEADER, $template_part->area );
+		$this->assertEmpty( $template_part->modified );
 	}
 
-	function test_inject_theme_attribute_in_block_template_content() {
+	public function test_inject_theme_attribute_in_block_template_content() {
 		$theme                           = get_stylesheet();
 		$content_without_theme_attribute = '<!-- wp:template-part {"slug":"header","align":"full", "tagName":"header","className":"site-header"} /-->';
 		$template_content                = _inject_theme_attribute_in_block_template_content(
@@ -207,11 +207,11 @@ function test_inject_theme_attribute_in_block_template_content() {
 	 *
 	 * @dataProvider data_remove_theme_attribute_in_block_template_content
 	 */
-	function test_remove_theme_attribute_in_block_template_content( $template_content, $expected ) {
+	public function test_remove_theme_attribute_in_block_template_content( $template_content, $expected ) {
 		$this->assertSame( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );
 	}
 
-	function data_remove_theme_attribute_in_block_template_content() {
+	public function data_remove_theme_attribute_in_block_template_content() {
 		return array(
 			array(
 				'<!-- wp:template-part {"slug":"header","theme":"tt1-blocks","align":"full","tagName":"header","className":"site-header"} /-->',
@@ -237,7 +237,7 @@ function data_remove_theme_attribute_in_block_template_content() {
 	/**
 	 * Should retrieve the template from the theme files.
 	 */
-	function test_get_block_template_from_file() {
+	public function test_get_block_template_from_file() {
 		$id       = get_stylesheet() . '//' . 'index';
 		$template = get_block_template( $id, 'wp_template' );
 		$this->assertSame( $id, $template->id );
@@ -287,7 +287,7 @@ public function test_get_block_template_from_post() {
 	/**
 	 * Should flatten nested blocks
 	 */
-	function test_flatten_blocks() {
+	public function test_flatten_blocks() {
 		$content_template_part_inside_group = '<!-- wp:group --><!-- wp:template-part {"slug":"header"} /--><!-- /wp:group -->';
 		$blocks                             = parse_blocks( $content_template_part_inside_group );
 		$actual                             = _flatten_blocks( $blocks );
@@ -313,7 +313,7 @@ function test_flatten_blocks() {
 	 * @ticket 54448
 	 * @requires extension zip
 	 */
-	function test_wp_generate_block_templates_export_file() {
+	public function test_wp_generate_block_templates_export_file() {
 		$filename = wp_generate_block_templates_export_file();
 		$this->assertFileExists( $filename, 'zip file is created at the specified path' );
 		$this->assertTrue( filesize( $filename ) > 0, 'zip file is larger than 0 bytes' );
diff --git a/tests/phpunit/tests/block-template.php b/tests/phpunit/tests/block-template.php
index b53aa496b0300..16c0978813ff1 100644
--- a/tests/phpunit/tests/block-template.php
+++ b/tests/phpunit/tests/block-template.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * Tests_Block_Template class
+ * Tests for the block template loading algorithm.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the block template loading algorithm.
  *
  * @group block-templates
  */
@@ -28,7 +24,7 @@ public function tear_down() {
 		parent::tear_down();
 	}
 
-	function test_page_home_block_template_takes_precedence_over_less_specific_block_templates() {
+	public function test_page_home_block_template_takes_precedence_over_less_specific_block_templates() {
 		global $_wp_current_template_content;
 		$type                   = 'page';
 		$templates              = array(
@@ -41,7 +37,7 @@ function test_page_home_block_template_takes_precedence_over_less_specific_block
 		$this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/page-home.html', $_wp_current_template_content );
 	}
 
-	function test_page_block_template_takes_precedence() {
+	public function test_page_block_template_takes_precedence() {
 		global $_wp_current_template_content;
 		$type                   = 'page';
 		$templates              = array(
@@ -54,7 +50,7 @@ function test_page_block_template_takes_precedence() {
 		$this->assertStringEqualsFile( get_stylesheet_directory() . '/templates/page.html', $_wp_current_template_content );
 	}
 
-	function test_block_template_takes_precedence_over_equally_specific_php_template() {
+	public function test_block_template_takes_precedence_over_equally_specific_php_template() {
 		global $_wp_current_template_content;
 		$type                   = 'index';
 		$templates              = array(
@@ -71,7 +67,7 @@ function test_block_template_takes_precedence_over_equally_specific_php_template
 	 *
 	 * Covers https://github.com/WordPress/gutenberg/pull/29026.
 	 */
-	function test_more_specific_php_template_takes_precedence_over_less_specific_block_template() {
+	public function test_more_specific_php_template_takes_precedence_over_less_specific_block_template() {
 		$page_id_template       = 'page-1.php';
 		$page_id_template_path  = get_stylesheet_directory() . '/' . $page_id_template;
 		$type                   = 'page';
@@ -93,7 +89,7 @@ function test_more_specific_php_template_takes_precedence_over_less_specific_blo
 	 * Covers https://core.trac.wordpress.org/ticket/54515.
 	 *
 	 */
-	function test_child_theme_php_template_takes_precedence_over_equally_specific_parent_theme_block_template() {
+	public function test_child_theme_php_template_takes_precedence_over_equally_specific_parent_theme_block_template() {
 		switch_theme( 'block-theme-child' );
 
 		$page_slug_template      = 'page-home.php';
@@ -108,7 +104,7 @@ function test_child_theme_php_template_takes_precedence_over_equally_specific_pa
 		$this->assertSame( $page_slug_template_path, $resolved_template_path );
 	}
 
-	function test_child_theme_block_template_takes_precedence_over_equally_specific_parent_theme_php_template() {
+	public function test_child_theme_block_template_takes_precedence_over_equally_specific_parent_theme_php_template() {
 		global $_wp_current_template_content;
 
 		switch_theme( 'block-theme-child' );
@@ -188,42 +184,4 @@ public function test_template_remains_unchanged_if_templates_array_is_empty() {
 		$resolved_template_path = locate_block_template( '', 'search', array() );
 		$this->assertSame( '', $resolved_template_path );
 	}
-
-	/**
-	 * Covers: https://github.com/WordPress/gutenberg/pull/38817.
-	 *
-	 * @ticket 55505
-	 */
-	public function test_resolve_home_block_template_default_hierarchy() {
-		$template = _resolve_home_block_template();
-
-		$this->assertSame( 'wp_template', $template['postType'] );
-		$this->assertSame( get_stylesheet() . '//index', $template['postId'] );
-	}
-
-	/**
-	 * @ticket 55505
-	 */
-	public function test_resolve_home_block_template_static_homepage() {
-		$post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
-		update_option( 'show_on_front', 'page' );
-		update_option( 'page_on_front', $post_id );
-
-		$template = _resolve_home_block_template();
-
-		$this->assertSame( 'page', $template['postType'] );
-		$this->assertSame( $post_id, $template['postId'] );
-
-		delete_option( 'show_on_front', 'page' );
-	}
-
-	/**
-	 * @ticket 55505
-	 */
-	public function test_resolve_home_block_template_no_resolution() {
-		switch_theme( 'stylesheetonly' );
-		$template = _resolve_home_block_template();
-
-		$this->assertNull( $template );
-	}
 }
diff --git a/tests/phpunit/tests/block-templates/getTemplateHierarchy.php b/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
index e550b22778417..fab91786650bf 100644
--- a/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
+++ b/tests/phpunit/tests/block-templates/getTemplateHierarchy.php
@@ -8,6 +8,26 @@
  */
 class Tests_Block_Templates_GetTemplate_Hierarchy extends WP_Block_Templates_UnitTestCase {
 
+	public function set_up() {
+		parent::set_up();
+		register_post_type(
+			'custom_book',
+			array(
+				'public'       => true,
+				'show_in_rest' => true,
+			)
+		);
+		register_taxonomy( 'book_type', 'custom_book' );
+		register_taxonomy( 'books', 'custom_book' );
+	}
+
+	public function tear_down() {
+		unregister_post_type( 'custom_book' );
+		unregister_taxonomy( 'book_type' );
+		unregister_taxonomy( 'books' );
+		parent::tear_down();
+	}
+
 	/**
 	 * @dataProvider data_get_template_hierarchy
 	 *
@@ -83,14 +103,26 @@ public function data_get_template_hierarchy() {
 				'args'     => array( 'category-fruits', false, 'category' ),
 				'expected' => array( 'category-fruits', 'category', 'archive', 'index' ),
 			),
+			'single word categories no prefix'         => array(
+				'args'     => array( 'category-fruits', false ),
+				'expected' => array( 'category-fruits', 'category', 'archive', 'index' ),
+			),
 			'multi word categories'                    => array(
 				'args'     => array( 'category-fruits-yellow', false, 'category' ),
 				'expected' => array( 'category-fruits-yellow', 'category', 'archive', 'index' ),
 			),
+			'multi word categories no prefix'          => array(
+				'args'     => array( 'category-fruits-yellow', false ),
+				'expected' => array( 'category-fruits-yellow', 'category', 'archive', 'index' ),
+			),
 			'single word taxonomy and term'            => array(
 				'args'     => array( 'taxonomy-books-action', false, 'taxonomy-books' ),
 				'expected' => array( 'taxonomy-books-action', 'taxonomy-books', 'taxonomy', 'archive', 'index' ),
 			),
+			'single word taxonomy and term no prefix'  => array(
+				'args'     => array( 'taxonomy-books-action', false ),
+				'expected' => array( 'taxonomy-books-action', 'taxonomy-books', 'taxonomy', 'archive', 'index' ),
+			),
 			'single word taxonomy and multi word term' => array(
 				'args'     => array( 'taxonomy-books-action-adventure', false, 'taxonomy-books' ),
 				'expected' => array( 'taxonomy-books-action-adventure', 'taxonomy-books', 'taxonomy', 'archive', 'index' ),
@@ -119,6 +151,46 @@ public function data_get_template_hierarchy() {
 				'args'     => array( 'author-rigas', false, 'author' ),
 				'expected' => array( 'author-rigas', 'author', 'archive', 'index' ),
 			),
+			'multiple word taxonomy no prefix'         => array(
+				'args'     => array( 'taxonomy-book_type-adventure', false ),
+				'expected' => array( 'taxonomy-book_type-adventure', 'taxonomy-book_type', 'taxonomy', 'archive', 'index' ),
+			),
+			'single post type no prefix'               => array(
+				'args'     => array( 'single-custom_book', false ),
+				'expected' => array(
+					'single-custom_book',
+					'single',
+					'singular',
+					'index',
+				),
+			),
+			'single post and post type no prefix'      => array(
+				'args'     => array( 'single-custom_book-book-1', false ),
+				'expected' => array(
+					'single-custom_book-book-1',
+					'single-custom_book',
+					'single',
+					'singular',
+					'index',
+				),
+			),
+			'page no prefix'                           => array(
+				'args'     => array( 'page-hi', false ),
+				'expected' => array(
+					'page-hi',
+					'page',
+					'singular',
+					'index',
+				),
+			),
+			'post type archive no prefix'              => array(
+				'args'     => array( 'archive-book', false ),
+				'expected' => array(
+					'archive-book',
+					'archive',
+					'index',
+				),
+			),
 		);
 	}
 }
diff --git a/tests/phpunit/tests/blocks/context.php b/tests/phpunit/tests/blocks/context.php
index 04f9a88176374..76603b7b37a2a 100644
--- a/tests/phpunit/tests/blocks/context.php
+++ b/tests/phpunit/tests/blocks/context.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block context tests
+ * Tests for block context functions.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
- * Tests for block context functions.
- *
- * @since 5.5.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/editor.php b/tests/phpunit/tests/blocks/editor.php
index 53b8d96956379..1d008560e90b5 100644
--- a/tests/phpunit/tests/blocks/editor.php
+++ b/tests/phpunit/tests/blocks/editor.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block editor tests
+ * Tests for the block editor methods.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
- * Tests for the block editor methods.
- *
- * @since 5.5.0
  *
  * @group blocks
  */
@@ -31,14 +25,19 @@ public function set_up() {
 		$post = self::factory()->post->create_and_get( $args );
 
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
+
+		global $post_ID;
+		$post_ID = 1;
 	}
 
 	public function tear_down() {
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
 		$wp_rest_server = null;
+		global $post_ID;
+		$post_ID = null;
 		parent::tear_down();
 	}
 
@@ -240,7 +239,7 @@ public function test_get_default_block_editor_settings() {
 				),
 				array(
 					'slug'  => 'reusable',
-					'title' => 'Reusable Blocks',
+					'title' => 'Patterns',
 					'icon'  => null,
 				),
 			),
@@ -301,6 +300,31 @@ public function test_get_default_block_editor_settings() {
 		$this->assertTrue( $settings['__unstableGalleryWithImageBlocks'] );
 	}
 
+	/**
+	 * @ticket 56815
+	 */
+	public function test_get_default_block_editor_settings_max_upload_file_size() {
+		// Force the return value of wp_max_upload_size() to be 500.
+		add_filter(
+			'upload_size_limit',
+			static function() {
+				return 500;
+			}
+		);
+
+		// Expect 0 when user is not allowed to upload (as wp_max_upload_size() should not be called).
+		$settings = get_default_block_editor_settings();
+		$this->assertSame( 0, $settings['maxUploadFileSize'] );
+
+		// Set up an administrator, as they can upload files.
+		$administrator = self::factory()->user->create( array( 'role' => 'administrator' ) );
+		wp_set_current_user( $administrator );
+
+		// Expect the above 500 as the user is now allowed to upload.
+		$settings = get_default_block_editor_settings();
+		$this->assertSame( 500, $settings['maxUploadFileSize'] );
+	}
+
 	/**
 	 * @ticket 53397
 	 */
@@ -377,6 +401,59 @@ function filter_block_editor_settings_my_editor( $editor_settings ) {
 		$this->assertSame( 12345, $settings['maxUploadFileSize'] );
 	}
 
+	/**
+	 * @ticket 58534
+	 */
+	public function test_wp_get_first_block() {
+		$block_name               = 'core/paragraph';
+		$blocks                   = array(
+			array(
+				'blockName' => 'core/image',
+			),
+			array(
+				'blockName' => $block_name,
+				'attrs'     => array(
+					'content' => 'Hello World!',
+				),
+			),
+			array(
+				'blockName' => 'core/heading',
+			),
+			array(
+				'blockName' => $block_name,
+			),
+		);
+		$blocks_with_no_paragraph = array(
+			array(
+				'blockName' => 'core/image',
+			),
+			array(
+				'blockName' => 'core/heading',
+			),
+		);
+
+		$this->assertSame( $blocks[1], wp_get_first_block( $blocks, $block_name ) );
+
+		$this->assertSame( array(), wp_get_first_block( $blocks_with_no_paragraph, $block_name ) );
+	}
+
+	/**
+	 * @ticket 58534
+	 */
+	public function test_wp_get_post_content_block_attributes() {
+		$attributes_with_layout = array(
+			'layout' => array(
+				'type' => 'constrained',
+			),
+		);
+		// With no block theme, expect an empty array.
+		$this->assertSame( array(), wp_get_post_content_block_attributes() );
+
+		switch_theme( 'block-theme' );
+
+		$this->assertSame( $attributes_with_layout, wp_get_post_content_block_attributes() );
+	}
+
 	/**
 	 * @ticket 53458
 	 */
@@ -437,6 +514,15 @@ public function test_get_block_editor_settings_theme_json_settings() {
 		$this->assertSameSets( array( 'rem' ), $settings['enableCustomUnits'] );
 		// settings.spacing.customPadding
 		$this->assertTrue( $settings['enableCustomSpacing'] );
+		// settings.postContentAttributes
+		$this->assertSameSets(
+			array(
+				'layout' => array(
+					'type' => 'constrained',
+				),
+			),
+			$settings['postContentAttributes']
+		);
 
 		switch_theme( WP_DEFAULT_THEME );
 	}
@@ -543,6 +629,44 @@ public function test_block_editor_rest_api_preload_adds_missing_leading_slash( a
 		$this->assertStringContainsString( $expected, $haystack );
 	}
 
+	/**
+	 * @ticket 57547
+	 *
+	 * @covers ::get_classic_theme_supports_block_editor_settings
+	 */
+	public function test_get_classic_theme_supports_block_editor_settings() {
+		$font_sizes = array(
+			array(
+				'name' => 'Small',
+				'size' => 12,
+				'slug' => 'small',
+			),
+			array(
+				'name' => 'Regular',
+				'size' => 16,
+				'slug' => 'regular',
+			),
+		);
+
+		add_theme_support( 'editor-font-sizes', $font_sizes );
+		$settings = get_classic_theme_supports_block_editor_settings();
+		remove_theme_support( 'editor-font-sizes' );
+
+		$this->assertFalse( $settings['disableCustomColors'], 'Value for array key "disableCustomColors" does not match expectations' );
+		$this->assertFalse( $settings['disableCustomFontSizes'], 'Value for array key "disableCustomFontSizes" does not match expectations' );
+		$this->assertFalse( $settings['disableCustomGradients'], 'Value for array key "disableCustomGradients" does not match expectations' );
+		$this->assertFalse( $settings['disableLayoutStyles'], 'Value for array key "disableLayoutStyles" does not match expectations' );
+		$this->assertFalse( $settings['enableCustomLineHeight'], 'Value for array key "enableCustomLineHeight" does not match expectations' );
+		$this->assertFalse( $settings['enableCustomSpacing'], 'Value for array key "enableCustomSpacing" does not match expectations' );
+		$this->assertFalse( $settings['enableCustomUnits'], 'Value for array key "enableCustomUnits" does not match expectations' );
+
+		$this->assertSame(
+			$font_sizes,
+			$settings['fontSizes'],
+			'Value for array key "fontSizes" does not match expectations'
+		);
+	}
+
 	/**
 	 * Data provider.
 	 *
diff --git a/tests/phpunit/tests/blocks/register.php b/tests/phpunit/tests/blocks/register.php
index ca906086a36aa..0a5047c6d1ce2 100644
--- a/tests/phpunit/tests/blocks/register.php
+++ b/tests/phpunit/tests/blocks/register.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block registration tests
+ * Tests for register_block_type(), unregister_block_type(), get_dynamic_block_names(), and register_block_style().
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for register_block_type(), unregister_block_type(), get_dynamic_block_names(), and register_block_style().
- *
- * @since 5.0.0
  *
  * @group blocks
  */
@@ -328,11 +322,82 @@ public function test_wrong_array_index_do_not_register_block_style_handle() {
 		$this->assertFalse( $result );
 	}
 
+	/**
+	 * @ticket 58605
+	 *
+	 * @dataProvider data_register_block_style_handle_uses_correct_core_stylesheet
+	 *
+	 * @param string      $block_json_path Path to the `block.json` file, relative to ABSPATH.
+	 * @param string      $style_field     Either 'style' or 'editorStyle'.
+	 * @param string|bool $expected_path   Expected path of registered stylesheet, relative to ABSPATH.
+	 */
+	public function test_register_block_style_handle_uses_correct_core_stylesheet( $block_json_path, $style_field, $expected_path ) {
+		$metadata_file = ABSPATH . $block_json_path;
+		$metadata      = wp_json_file_decode( $metadata_file, array( 'associative' => true ) );
+
+		$block_name = str_replace( 'core/', '', $metadata['name'] );
+
+		// Normalize metadata similar to `register_block_type_from_metadata()`.
+		$metadata['file'] = wp_normalize_path( realpath( $metadata_file ) );
+		if ( ! isset( $metadata['style'] ) ) {
+			$metadata['style'] = "wp-block-$block_name";
+		}
+		if ( ! isset( $metadata['editorStyle'] ) ) {
+			$metadata['editorStyle'] = "wp-block-{$block_name}-editor";
+		}
+
+		// Ensure block assets are separately registered.
+		add_filter( 'should_load_separate_core_block_assets', '__return_true' );
+
+		/*
+		 * Account for minified asset path and ensure the file exists.
+		 * This may not be the case in the testing environment since it requires the build process to place them.
+		 */
+		if ( is_string( $expected_path ) ) {
+			$expected_path = str_replace( '.css', wp_scripts_get_suffix() . '.css', $expected_path );
+			self::touch( ABSPATH . $expected_path );
+		}
+
+		$result = register_block_style_handle( $metadata, $style_field );
+		$this->assertSame( $metadata[ $style_field ], $result, 'Core block registration failed' );
+		if ( $expected_path ) {
+			$this->assertStringEndsWith( $expected_path, wp_styles()->registered[ $result ]->src, 'Core block stylesheet path incorrect' );
+		} else {
+			$this->assertFalse( wp_styles()->registered[ $result ]->src, 'Core block stylesheet src should be false' );
+		}
+	}
+
+	public function data_register_block_style_handle_uses_correct_core_stylesheet() {
+		return array(
+			'block with style'           => array(
+				WPINC . '/blocks/archives/block.json',
+				'style',
+				WPINC . '/blocks/archives/style.css',
+			),
+			'block with editor style'    => array(
+				WPINC . '/blocks/archives/block.json',
+				'editorStyle',
+				WPINC . '/blocks/archives/editor.css',
+			),
+			'block without style'        => array(
+				WPINC . '/blocks/widget-group/block.json',
+				'style',
+				false,
+			),
+			'block without editor style' => array(
+				WPINC . '/blocks/widget-group/block.json',
+				'editorStyle',
+				false,
+			),
+		);
+	}
+
 	/**
 	 * @ticket 50263
 	 */
 	public function test_handle_passed_register_block_style_handle() {
 		$metadata = array(
+			'name'  => 'test-block',
 			'style' => 'test-style-handle',
 		);
 		$result   = register_block_style_handle( $metadata, 'style' );
@@ -342,6 +407,7 @@ public function test_handle_passed_register_block_style_handle() {
 
 	public function test_handles_passed_register_block_style_handles() {
 		$metadata = array(
+			'name'  => 'test-block',
 			'style' => array( 'test-style-handle', 'test-style-handle-2' ),
 		);
 
@@ -374,6 +440,58 @@ public function test_success_register_block_style_handle() {
 		);
 	}
 
+	/**
+	 * Tests that register_block_style_handle() loads RTL stylesheets when an RTL locale is set.
+	 *
+	 * @ticket 56325
+	 * @ticket 56797
+	 *
+	 * @covers ::register_block_style_handle
+	 */
+	public function test_register_block_style_handle_should_load_rtl_stylesheets_for_rtl_text_direction() {
+		global $wp_locale;
+
+		$metadata = array(
+			'file'  => DIR_TESTDATA . '/blocks/notice/block.json',
+			'name'  => 'unit-tests/test-block-rtl',
+			'style' => 'file:./block.css',
+		);
+
+		$orig_text_dir             = $wp_locale->text_direction;
+		$wp_locale->text_direction = 'rtl';
+
+		$handle       = register_block_style_handle( $metadata, 'style' );
+		$extra_rtl    = wp_styles()->get_data( 'unit-tests-test-block-rtl-style', 'rtl' );
+		$extra_suffix = wp_styles()->get_data( 'unit-tests-test-block-rtl-style', 'suffix' );
+		$extra_path   = wp_normalize_path( wp_styles()->get_data( 'unit-tests-test-block-rtl-style', 'path' ) );
+
+		$wp_locale->text_direction = $orig_text_dir;
+
+		$this->assertSame(
+			'unit-tests-test-block-rtl-style',
+			$handle,
+			'The handle did not match the expected handle.'
+		);
+
+		$this->assertSame(
+			'replace',
+			$extra_rtl,
+			'The extra "rtl" data was not "replace".'
+		);
+
+		$this->assertSame(
+			'',
+			$extra_suffix,
+			'The extra "suffix" data was not an empty string.'
+		);
+
+		$this->assertSame(
+			wp_normalize_path( realpath( DIR_TESTDATA . '/blocks/notice/block-rtl.css' ) ),
+			$extra_path,
+			'The "path" did not match the expected path.'
+		);
+	}
+
 	/**
 	 * @ticket 56664
 	 */
@@ -407,6 +525,26 @@ public function test_success_register_block_style_handle_in_theme() {
 		$this->assertFalse( wp_styles()->get_data( $expected_style_handle, 'rtl' ) );
 	}
 
+	/**
+	 * @ticket 58528
+	 *
+	 * @covers ::register_block_style_handle
+	 */
+	public function test_success_register_block_style_handle_exists() {
+		$expected_style_handle = 'block-theme-example-block-editor-style';
+		wp_register_style( $expected_style_handle, false );
+		switch_theme( 'block-theme' );
+
+		$metadata = array(
+			'file'        => wp_normalize_path( get_theme_file_path( 'blocks/example-block/block.json' ) ),
+			'name'        => 'block-theme/example-block',
+			'editorStyle' => 'file:./editor-style.css',
+		);
+		$result   = register_block_style_handle( $metadata, 'editorStyle' );
+
+		$this->assertSame( $expected_style_handle, $result );
+	}
+
 	/**
 	 * Tests that the function returns false when the `block.json` is not found
 	 * in the WordPress core.
@@ -437,6 +575,7 @@ public function test_metadata_not_found_in_the_current_directory() {
 	 *
 	 * @ticket 50263
 	 * @ticket 50328
+	 * @ticket 57585
 	 */
 	public function test_block_registers_with_metadata_fixture() {
 		$result = register_block_type_from_metadata(
@@ -469,6 +608,12 @@ public function test_block_registers_with_metadata_fixture() {
 			$result->provides_context
 		);
 		$this->assertSameSets( array( 'groupId' ), $result->uses_context );
+		// @ticket 57585
+		$this->assertSame(
+			array( 'root' => '.wp-block-notice' ),
+			$result->selectors,
+			'Block type should contain selectors from metadata.'
+		);
 		$this->assertSame(
 			array(
 				'align'             => true,
@@ -575,7 +720,7 @@ public function test_register_block_type_accepts_editor_script_array( $editor_sc
 
 		$registry   = WP_Block_Type_Registry::get_instance();
 		$block_type = $registry->get_registered( 'core/test-static' );
-		$this->assertObjectHasAttribute( 'editor_script_handles', $block_type );
+		$this->assertObjectHasProperty( 'editor_script_handles', $block_type );
 		$actual_script         = $block_type->editor_script;
 		$actual_script_handles = $block_type->editor_script_handles;
 
@@ -641,7 +786,7 @@ public function test_register_block_type_throws_doing_it_wrong( $editor_script,
 
 		$registry   = WP_Block_Type_Registry::get_instance();
 		$block_type = $registry->get_registered( 'core/test-static' );
-		$this->assertObjectHasAttribute( 'editor_script_handles', $block_type );
+		$this->assertObjectHasProperty( 'editor_script_handles', $block_type );
 		$actual_script         = $block_type->editor_script;
 		$actual_script_handles = $block_type->editor_script_handles;
 
diff --git a/tests/phpunit/tests/blocks/registerCoreBlockStyleHandles.php b/tests/phpunit/tests/blocks/registerCoreBlockStyleHandles.php
new file mode 100644
index 0000000000000..a4ed1dd418c72
--- /dev/null
+++ b/tests/phpunit/tests/blocks/registerCoreBlockStyleHandles.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * Tests for block style handles.
+ *
+ * @package WordPress
+ * @subpackage Blocks
+ *
+ * @since 6.3.0
+ *
+ * @group blocks
+ *
+ * @covers ::register_core_block_style_handles
+ */
+class Tests_Blocks_registerCoreBlockStyleHandles extends WP_UnitTestCase {
+
+	/**
+	 * @var WP_Styles
+	 */
+	private $old_wp_styles;
+
+	/**
+	 * @var string
+	 */
+	private $includes_url;
+
+	const STYLE_FIELDS = array(
+		'style'       => 'style',
+		'editorStyle' => 'editor',
+	);
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->old_wp_styles = $GLOBALS['wp_styles'];
+
+		$this->includes_url = includes_url();
+
+		remove_action( 'wp_default_styles', 'wp_default_styles' );
+
+		if ( empty( $GLOBALS['wp_styles'] ) ) {
+			$GLOBALS['wp_styles'] = null;
+		}
+	}
+
+	public function tear_down() {
+		$GLOBALS['wp_styles'] = $this->old_wp_styles;
+
+		add_action( 'wp_default_styles', 'wp_default_styles' );
+
+		parent::tear_down();
+	}
+
+	/**
+	 * @ticket 58528
+	 *
+	 * @dataProvider data_block_data
+	 *
+	 * @param string $name   The block name.
+	 * @param array  $schema The block's schema.
+	 */
+	public function test_wp_should_load_separate_core_block_assets_false( $name, $schema ) {
+		register_core_block_style_handles();
+
+		foreach ( self::STYLE_FIELDS as $style_field => $filename ) {
+			$style_handle = $schema[ $style_field ];
+			if ( is_array( $style_handle ) ) {
+				continue;
+			}
+
+			$this->assertArrayNotHasKey( $style_handle, $GLOBALS['wp_styles']->registered, 'The key should not exist, as this style should not be registered' );
+		}
+	}
+
+
+	/**
+	 * @ticket 58528
+	 *
+	 * @dataProvider data_block_data
+	 *
+	 * @param string $name   The block name.
+	 * @param array  $schema The block's schema.
+	 */
+	public function test_wp_should_load_separate_core_block_assets_true( $name, $schema ) {
+		add_filter( 'should_load_separate_core_block_assets', '__return_true' );
+		register_core_block_style_handles();
+
+		$wp_styles = $GLOBALS['wp_styles'];
+
+		foreach ( self::STYLE_FIELDS as $style_field => $filename ) {
+			$style_handle = $schema[ $style_field ];
+			if ( is_array( $style_handle ) ) {
+				continue;
+			}
+
+			$this->assertArrayHasKey( $style_handle, $wp_styles->registered, 'The key should exist, as this style should be registered' );
+			if ( false === $wp_styles->registered[ $style_handle ]->src ) {
+				$this->assertEmpty( $wp_styles->registered[ $style_handle ]->extra, 'If source is false, not style path should be set' );
+			} else {
+				$this->assertStringContainsString( $this->includes_url, $wp_styles->registered[ $style_handle ]->src, 'Source of style should contain the includes url' );
+				$this->assertNotEmpty( $wp_styles->registered[ $style_handle ]->extra, 'The path of the style should exist' );
+				$this->assertArrayHasKey( 'path', $wp_styles->registered[ $style_handle ]->extra, 'The path key of the style should exist in extra array' );
+				$this->assertNotEmpty( $wp_styles->registered[ $style_handle ]->extra['path'], 'The path key of the style should not be empty' );
+			}
+		}
+	}
+
+	/**
+	 * @ticket 58560
+	 *
+	 * @dataProvider data_block_data
+	 *
+	 * @param string $name The block name.
+	 */
+	public function test_wp_should_load_separate_core_block_assets_current_theme_supports( $name ) {
+		add_filter( 'should_load_separate_core_block_assets', '__return_true' );
+		add_theme_support( 'wp-block-styles' );
+		register_core_block_style_handles();
+
+		$wp_styles = $GLOBALS['wp_styles'];
+
+		$style_handle = "wp-block-{$name}-theme";
+
+		$this->assertArrayHasKey( $style_handle, $wp_styles->registered, 'The key should exist, as this style should be registered' );
+		if ( false === $wp_styles->registered[ $style_handle ]->src ) {
+			$this->assertEmpty( $wp_styles->registered[ $style_handle ]->extra, 'If source is false, not style path should be set' );
+		} else {
+			$this->assertStringContainsString( $this->includes_url, $wp_styles->registered[ $style_handle ]->src, 'Source of style should contain the includes url' );
+			$this->assertNotEmpty( $wp_styles->registered[ $style_handle ]->extra, 'The path of the style should exist' );
+			$this->assertArrayHasKey( 'path', $wp_styles->registered[ $style_handle ]->extra, 'The path key of the style should exist in extra array' );
+			$this->assertNotEmpty( $wp_styles->registered[ $style_handle ]->extra['path'], 'The path key of the style should not be empty' );
+		}
+	}
+
+	public function data_block_data() {
+		$core_blocks_meta = require ABSPATH . WPINC . '/blocks/blocks-json.php';
+
+		// Remove this blocks for now, as they are registered elsewhere.
+		unset( $core_blocks_meta['archives'] );
+		unset( $core_blocks_meta['widget-group'] );
+
+		$data = array();
+		foreach ( $core_blocks_meta as $name => $schema ) {
+			if ( ! isset( $schema['style'] ) ) {
+				$schema['style'] = "wp-block-$name";
+			}
+			if ( ! isset( $schema['editorStyle'] ) ) {
+				$schema['editorStyle'] = "wp-block-{$name}-editor";
+			}
+
+			$data[ $name ] = array( $name, $schema );
+		}
+
+		return $data;
+	}
+}
diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php
index e119517d4e498..56905956df7bb 100644
--- a/tests/phpunit/tests/blocks/render.php
+++ b/tests/phpunit/tests/blocks/render.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block rendering tests
+ * Tests for block rendering functions.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for block rendering functions.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
@@ -233,6 +227,10 @@ public function test_do_block_output( $html_filename, $server_html_filename ) {
 		$normalized_html = preg_replace( '/wp-block-gallery-\d+/', 'wp-block-gallery-1', $normalized_html );
 		$expected_html   = self::strip_r( file_get_contents( $server_html_path ) );
 
+		// Convert HTML to be white space insensitive.
+		$normalized_html = preg_replace( '/(\s+$)/m', '', $normalized_html );
+		$expected_html   = preg_replace( '/(\s+$)/m', '', $expected_html );
+
 		$this->assertSame(
 			$expected_html,
 			$normalized_html,
diff --git a/tests/phpunit/tests/blocks/renderCommentTemplate.php b/tests/phpunit/tests/blocks/renderCommentTemplate.php
index 848b2caf38f07..796bbcef8692f 100644
--- a/tests/phpunit/tests/blocks/renderCommentTemplate.php
+++ b/tests/phpunit/tests/blocks/renderCommentTemplate.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Comment Template block rendering tests.
+ * Tests for the Comment Template block rendering.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 6.0.0
- */
-
-/**
- * Tests for the Comment Template block.
- *
- * @since 6.0.0
  *
  * @group blocks
  */
@@ -87,7 +81,7 @@ public function set_up() {
 	 * @ticket 55505
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_with_context() {
+	public function test_build_comment_query_vars_from_block_with_context() {
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
 		);
@@ -118,7 +112,7 @@ function test_build_comment_query_vars_from_block_with_context() {
 	 * @ticket 55567
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_with_context_no_pagination() {
+	public function test_build_comment_query_vars_from_block_with_context_no_pagination() {
 		update_option( 'page_comments', false );
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
@@ -148,7 +142,7 @@ function test_build_comment_query_vars_from_block_with_context_no_pagination() {
 	 * @ticket 55505
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_no_context() {
+	public function test_build_comment_query_vars_from_block_no_context() {
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
 		);
@@ -178,7 +172,7 @@ function test_build_comment_query_vars_from_block_no_context() {
 	 * @ticket 55658
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_pagination_with_no_comments() {
+	public function test_build_comment_query_vars_from_block_pagination_with_no_comments() {
 		$comments_per_page     = get_option( 'comments_per_page' );
 		$default_comments_page = get_option( 'default_comments_page' );
 
@@ -230,7 +224,7 @@ function test_build_comment_query_vars_from_block_pagination_with_no_comments()
 	 * @ticket 55505
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_sets_cpage_var() {
+	public function test_build_comment_query_vars_from_block_sets_cpage_var() {
 
 		// This could be any number, we set a fixed one instead of a random for better performance.
 		$comment_query_max_num_pages = 5;
@@ -267,7 +261,7 @@ function test_build_comment_query_vars_from_block_sets_cpage_var() {
 	 *
 	 * @ticket 55567
 	 */
-	function test_rendering_comment_template() {
+	public function test_rendering_comment_template() {
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
 		);
@@ -295,7 +289,7 @@ function test_rendering_comment_template() {
 	 *
 	 * @ticket 55567
 	 */
-	function test_rendering_comment_template_nested() {
+	public function test_rendering_comment_template_nested() {
 		$first_level_ids = self::factory()->comment->create_post_comments(
 			self::$custom_post->ID,
 			2,
@@ -333,7 +327,7 @@ function test_rendering_comment_template_nested() {
 
 		$top_level_ids = self::$comment_ids;
 		$expected      = str_replace(
-			array( "\n", "\t" ),
+			array( "\r\n", "\n", "\t" ),
 			'',
 			<<<END
 				<ol class="wp-block-comment-template">
@@ -387,7 +381,7 @@ function test_rendering_comment_template_nested() {
 
 		$this->assertSame(
 			$expected,
-			str_replace( array( "\n", "\t" ), '', $block->render() )
+			str_replace( array( "\r\n", "\n", "\t" ), '', $block->render() )
 		);
 	}
 
@@ -396,7 +390,7 @@ function test_rendering_comment_template_nested() {
 	 *
 	 * @ticket 55643
 	 */
-	function test_render_block_core_comment_content_converts_to_html() {
+	public function test_render_block_core_comment_content_converts_to_html() {
 		$comment_id  = self::$comment_ids[0];
 		$new_content = "Paragraph One\n\nP2L1\nP2L2\n\nhttps://example.com/";
 		self::factory()->comment->update_object(
@@ -430,7 +424,7 @@ function test_render_block_core_comment_content_converts_to_html() {
 	 * @ticket 55634
 	 * @covers ::build_comment_query_vars_from_block
 	 */
-	function test_build_comment_query_vars_from_block_with_comment_preview() {
+	public function test_build_comment_query_vars_from_block_with_comment_preview() {
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
 		);
@@ -442,7 +436,7 @@ function test_build_comment_query_vars_from_block_with_comment_preview() {
 			)
 		);
 
-		$commenter_filter = function () {
+		$commenter_filter = static function () {
 			return array(
 				'comment_author_email' => 'unapproved@example.org',
 			);
@@ -471,7 +465,7 @@ function test_build_comment_query_vars_from_block_with_comment_preview() {
 	 *
 	 * @ticket 55643
 	 */
-	function test_rendering_comment_template_unmoderated_preview() {
+	public function test_rendering_comment_template_unmoderated_preview() {
 		$parsed_blocks = parse_blocks(
 			'<!-- wp:comment-template --><!-- wp:comment-author-name /--><!-- wp:comment-content /--><!-- /wp:comment-template -->'
 		);
@@ -518,4 +512,145 @@ function test_rendering_comment_template_unmoderated_preview() {
 			'Should not include any unapproved comments after removing filter'
 		);
 	}
+
+	/**
+	 * Tests that the Comment Template block makes comment ID context available to programmatically inserted child blocks.
+	 *
+	 * @ticket 58839
+	 *
+	 * @covers ::render_block_core_comment_template
+	 * @covers ::block_core_comment_template_render_comments
+	 */
+	public function test_rendering_comment_template_sets_comment_id_context() {
+		$render_block_context_callback = new MockAction();
+		add_filter( 'render_block_context', array( $render_block_context_callback, 'filter' ), 2, 3 );
+
+		$parsed_comment_author_name_block = parse_blocks( '<!-- wp:comment-author-name /-->' )[0];
+		$comment_author_name_block        = new WP_Block(
+			$parsed_comment_author_name_block,
+			array(
+				'commentId' => self::$comment_ids[0],
+			)
+		);
+		$comment_author_name_block_markup = $comment_author_name_block->render();
+
+		add_filter(
+			'render_block',
+			static function( $block_content, $block ) use ( $parsed_comment_author_name_block ) {
+				/*
+				* Insert a Comment Author Name block (which requires `commentId`
+				* block context to work) after the Comment Content block.
+				*/
+				if ( 'core/comment-content' !== $block['blockName'] ) {
+					return $block_content;
+				}
+
+				$inserted_content = render_block( $parsed_comment_author_name_block );
+				return $inserted_content . $block_content;
+			},
+			10,
+			3
+		);
+
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:comment-template --><!-- wp:comment-content /--><!-- /wp:comment-template -->'
+		);
+		$block         = new WP_Block(
+			$parsed_blocks[0],
+			array(
+				'postId' => self::$custom_post->ID,
+			)
+		);
+		$markup        = $block->render();
+
+		$this->assertStringContainsString( $comment_author_name_block_markup, $markup );
+
+		$args    = $render_block_context_callback->get_args();
+		$context = $args[0][0];
+		$this->assertArrayHasKey(
+			'commentId',
+			$context,
+			"commentId block context wasn't set for render_block_context filter at priority 2."
+		);
+		$this->assertSame(
+			strval( self::$comment_ids[0] ),
+			$context['commentId'],
+			"commentId block context wasn't set correctly."
+		);
+	}
+
+	/**
+	 * Tests that an inner block added via the render_block_data filter is retained at render_block stage.
+	 *
+	 * @ticket 58839
+	 *
+	 * @covers ::render_block_core_comment_template
+	 * @covers ::block_core_comment_template_render_comments
+	 */
+	public function test_inner_block_inserted_by_render_block_data_is_retained() {
+		$render_block_callback = new MockAction();
+		add_filter( 'render_block', array( $render_block_callback, 'filter' ), 10, 3 );
+
+		$render_block_data_callback = static function( $parsed_block ) {
+			// Add a Social Links block to a Comment Template block's inner blocks.
+			if ( 'core/comment-template' === $parsed_block['blockName'] ) {
+				$inserted_block_markup = <<<END
+<!-- wp:social-links -->
+<ul class="wp-block-social-links"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /--></ul>
+<!-- /wp:social-links -->'
+END;
+
+				$inserted_blocks = parse_blocks( $inserted_block_markup );
+
+				$parsed_block['innerBlocks'][] = $inserted_blocks[0];
+			}
+			return $parsed_block;
+		};
+
+		add_filter( 'render_block_data', $render_block_data_callback, 10, 1 );
+		$parsed_blocks = parse_blocks(
+			'<!-- wp:comments --><!-- wp:comment-template --><!-- wp:comment-content /--><!-- /wp:comment-template --><!-- /wp:comments -->'
+		);
+		$block         = new WP_Block(
+			$parsed_blocks[0],
+			array(
+				'postId' => self::$custom_post->ID,
+			)
+		);
+		$block->render();
+		remove_filter( 'render_block_data', $render_block_data_callback );
+
+		$this->assertSame(
+			5,
+			$render_block_callback->get_call_count(),
+			"render_block filter wasn't called the correct number of 5 times."
+		);
+
+		$args = $render_block_callback->get_args();
+		$this->assertSame(
+			'core/comment-content',
+			$args[0][2]->name,
+			"render_block filter didn't receive Comment Content block instance upon first call."
+		);
+		$this->assertSame(
+			'core/comment-template',
+			$args[1][2]->name,
+			"render_block filter didn't receive Comment Template block instance upon second call."
+		);
+		$this->assertCount(
+			2,
+			$args[1][2]->inner_blocks,
+			"Inner block inserted by render_block_data filter wasn't retained."
+		);
+		$this->assertInstanceOf(
+			'WP_Block',
+			$args[1][2]->inner_blocks[1],
+			"Inner block inserted by render_block_data isn't a WP_Block class instance."
+		);
+		$this->assertSame(
+			'core/social-links',
+			$args[1][2]->inner_blocks[1]->name,
+			"Inner block inserted by render_block_data isn't named as expected."
+		);
+	}
 }
diff --git a/tests/phpunit/tests/blocks/renderReusable.php b/tests/phpunit/tests/blocks/renderReusable.php
index 086ae678948f6..7609872b774e5 100644
--- a/tests/phpunit/tests/blocks/renderReusable.php
+++ b/tests/phpunit/tests/blocks/renderReusable.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Reusable block rendering tests
+ * Tests for reusable block rendering.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for reusable block rendering.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/serialize.php b/tests/phpunit/tests/blocks/serialize.php
index aa28f212097ac..d8e12f0511ac6 100644
--- a/tests/phpunit/tests/blocks/serialize.php
+++ b/tests/phpunit/tests/blocks/serialize.php
@@ -1,14 +1,9 @@
 <?php
 /**
- * Block serialization tests
+ * Tests for block serialization functions.
  *
  * @package WordPress
  * @subpackage Blocks
- * @since 5.3.3
- */
-
-/**
- * Tests for block serialization functions.
  *
  * @since 5.3.3
  *
diff --git a/tests/phpunit/tests/blocks/supportedStyles.php b/tests/phpunit/tests/blocks/supportedStyles.php
index e4e6c37e9e7fa..95c5326b4542f 100644
--- a/tests/phpunit/tests/blocks/supportedStyles.php
+++ b/tests/phpunit/tests/blocks/supportedStyles.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * Block supported style tests
+ * Test block supported styles.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.6.0
- */
-
-/**
- * Test block supported styles.
- *
- * @since 5.6.0
  *
  * @group blocks
  */
@@ -701,13 +695,14 @@ public function test_render_block_suppresses_warnings_without_at_suppression() {
 		);
 		$this->register_block_type( 'core/example', $block_type_settings );
 
-		$block = array(
+		$block    = array(
 			'blockName'    => 'core/example',
 			'attrs'        => array(),
 			'innerBlock'   => array(),
 			'innerContent' => array(),
 			'innerHTML'    => array(),
 		);
+		$wp_block = new WP_Block( $block );
 
 		// Custom error handler's see Warnings even if they are suppressed by the @ symbol.
 		$errors = array();
@@ -720,7 +715,7 @@ static function ( $errno = 0, $errstr = '' ) use ( &$errors ) {
 
 		// HTML5 elements like <time> are not supported by the DOMDocument parser used by the block supports feature.
 		// This specific example is emitted by the "Display post date" setting in the latest-posts block.
-		apply_filters( 'render_block', '<div><time datetime="2020-06-18T04:01:43+10:00" class="wp-block-latest-posts__post-date">June 18, 2020</time></div>', $block );
+		apply_filters( 'render_block', '<div><time datetime="2020-06-18T04:01:43+10:00" class="wp-block-latest-posts__post-date">June 18, 2020</time></div>', $block, $wp_block );
 
 		restore_error_handler();
 
diff --git a/tests/phpunit/tests/blocks/wpBlock.php b/tests/phpunit/tests/blocks/wpBlock.php
index c67a30df9d641..9fb31206c03d8 100644
--- a/tests/phpunit/tests/blocks/wpBlock.php
+++ b/tests/phpunit/tests/blocks/wpBlock.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_Block tests
+ * Tests for WP_Block.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
- * Tests for WP_Block.
- *
- * @since 5.5.0
  *
  * @group blocks
  */
@@ -604,13 +598,18 @@ public function test_query_loop_block_query_vars_filter() {
 			),
 		);
 		$block         = new WP_Block( $parsed_block, $context, $this->registry );
-		function filterQuery( $query, $block, $page ) {
-			$query['post_type'] = 'book';
-			return $query;
-		}
-		add_filter( 'query_loop_block_query_vars', 'filterQuery', 10, 3 );
+
+		add_filter(
+			'query_loop_block_query_vars',
+			static function( $query, $block, $page ) {
+				$query['post_type'] = 'book';
+				return $query;
+			},
+			10,
+			3
+		);
+
 		$query = build_query_vars_from_query_block( $block, 1 );
-		remove_filter( 'query_loop_block_query_vars', 'filterQuery' );
 		$this->assertSame(
 			$query,
 			array(
@@ -683,6 +682,81 @@ public function test_block_has_support_provided_defaults() {
 		$this->assertFalse( $gradient_support );
 	}
 
+	/**
+	 * @ticket 58532
+	 *
+	 * @dataProvider data_block_has_support_string
+	 *
+	 * @param array  $block_data Block data.
+	 * @param string $support    Support string to check.
+	 * @param bool   $expected   Expected result.
+	 */
+	public function test_block_has_support_string( $block_data, $support, $expected, $message ) {
+		$this->registry->register( 'core/example', $block_data );
+		$block_type  = $this->registry->get_registered( 'core/example' );
+		$has_support = block_has_support( $block_type, $support );
+		$this->assertEquals( $expected, $has_support, $message );
+	}
+
+	/**
+	 * Data provider for test_block_has_support_string
+	 */
+	public function data_block_has_support_string() {
+		return array(
+			array(
+				array(),
+				'color',
+				false,
+				'Block with empty support array.',
+			),
+			array(
+				array(
+					'supports' => array(
+						'align'    => array( 'wide', 'full' ),
+						'fontSize' => true,
+						'color'    => array(
+							'link'     => true,
+							'gradient' => false,
+						),
+					),
+				),
+				'align',
+				true,
+				'Feature present in support array.',
+			),
+			array(
+				array(
+					'supports' => array(
+						'align'    => array( 'wide', 'full' ),
+						'fontSize' => true,
+						'color'    => array(
+							'link'     => true,
+							'gradient' => false,
+						),
+					),
+				),
+				'anchor',
+				false,
+				'Feature not present in support array.',
+			),
+			array(
+				array(
+					'supports' => array(
+						'align'    => array( 'wide', 'full' ),
+						'fontSize' => true,
+						'color'    => array(
+							'link'     => true,
+							'gradient' => false,
+						),
+					),
+				),
+				array( 'align' ),
+				true,
+				'Feature present in support array, single element array.',
+			),
+		);
+	}
+
 	/**
 	 * @ticket 51612
 	 */
@@ -694,7 +768,7 @@ public function test_block_filters_for_inner_blocks() {
 		$this->registry->register(
 			'core/outer',
 			array(
-				'render_callback' => function( $block_attributes, $content ) {
+				'render_callback' => static function( $block_attributes, $content ) {
 					return $content;
 				},
 			)
@@ -703,7 +777,7 @@ public function test_block_filters_for_inner_blocks() {
 		$this->registry->register(
 			'core/inner',
 			array(
-				'render_callback' => function() {
+				'render_callback' => static function() {
 					return 'b';
 				},
 			)
diff --git a/tests/phpunit/tests/blocks/wpBlockList.php b/tests/phpunit/tests/blocks/wpBlockList.php
index e3755a9cd2f9e..6dd2979e7087b 100644
--- a/tests/phpunit/tests/blocks/wpBlockList.php
+++ b/tests/phpunit/tests/blocks/wpBlockList.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_Block_List tests
+ * Tests for WP_Block_List.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.5.0
- */
-
-/**
- * Tests for WP_Block_List.
- *
- * @since 5.5.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/wpBlockParser.php b/tests/phpunit/tests/blocks/wpBlockParser.php
index 8169d4f610903..d88849d956dd6 100644
--- a/tests/phpunit/tests/blocks/wpBlockParser.php
+++ b/tests/phpunit/tests/blocks/wpBlockParser.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_Block_Parser tests
+ * Tests for WP_Block_Parser.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for WP_Block_Parser.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/wpBlockType.php b/tests/phpunit/tests/blocks/wpBlockType.php
index 8ba94be4f5d49..330d082bc2f1c 100644
--- a/tests/phpunit/tests/blocks/wpBlockType.php
+++ b/tests/phpunit/tests/blocks/wpBlockType.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_Block_Type tests
+ * Tests for WP_Block_Type.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for WP_Block_Type.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
index 4d384dc725a23..c97bdc95d43a1 100644
--- a/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
+++ b/tests/phpunit/tests/blocks/wpBlockTypeRegistry.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_Block_Type_Registry tests
+ * Tests for WP_Block_Type_Registry.
  *
  * @package WordPress
  * @subpackage Blocks
  * @since 5.0.0
- */
-
-/**
- * Tests for WP_Block_Type_Registry.
- *
- * @since 5.0.0
  *
  * @group blocks
  */
diff --git a/tests/phpunit/tests/bookmark/getBookmarks.php b/tests/phpunit/tests/bookmark/getBookmarks.php
index 45b5af91d0dda..494737f643629 100644
--- a/tests/phpunit/tests/bookmark/getBookmarks.php
+++ b/tests/phpunit/tests/bookmark/getBookmarks.php
@@ -5,8 +5,6 @@
  */
 class Tests_Bookmark_GetBookmarks extends WP_UnitTestCase {
 	public function test_should_hit_cache() {
-		global $wpdb;
-
 		$bookmarks = self::factory()->bookmark->create_many( 2 );
 
 		$found1 = get_bookmarks(
@@ -15,7 +13,7 @@ public function test_should_hit_cache() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found2 = get_bookmarks(
 			array(
@@ -24,12 +22,10 @@ public function test_should_hit_cache() {
 		);
 
 		$this->assertSameSets( $found1, $found2 );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	public function test_adding_bookmark_should_bust_get_bookmarks_cache() {
-		global $wpdb;
-
 		$bookmarks = self::factory()->bookmark->create_many( 2 );
 
 		// Prime cache.
@@ -39,7 +35,7 @@ public function test_adding_bookmark_should_bust_get_bookmarks_cache() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$bookmarks[] = wp_insert_link(
 			array(
@@ -55,15 +51,13 @@ public function test_adding_bookmark_should_bust_get_bookmarks_cache() {
 		);
 
 		$this->assertEqualSets( $bookmarks, wp_list_pluck( $found2, 'link_id' ) );
-		$this->assertGreaterThan( $num_queries, $wpdb->num_queries );
+		$this->assertGreaterThan( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 18356
 	 */
 	public function test_orderby_rand_should_not_be_cached() {
-		global $wpdb;
-
 		$bookmarks = self::factory()->bookmark->create_many( 2 );
 
 		$found1 = get_bookmarks(
@@ -72,7 +66,7 @@ public function test_orderby_rand_should_not_be_cached() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found2 = get_bookmarks(
 			array(
@@ -82,7 +76,7 @@ public function test_orderby_rand_should_not_be_cached() {
 
 		// Equal sets != same order.
 		$this->assertEqualSets( $found1, $found2 );
-		$this->assertGreaterThan( $num_queries, $wpdb->num_queries );
+		$this->assertGreaterThan( $num_queries, get_num_queries() );
 	}
 
 	public function test_exclude_param_gets_properly_parsed_as_list() {
diff --git a/tests/phpunit/tests/cache.php b/tests/phpunit/tests/cache.php
index f65096c5976d0..faf64de5a0be8 100644
--- a/tests/phpunit/tests/cache.php
+++ b/tests/phpunit/tests/cache.php
@@ -230,7 +230,7 @@ public function test_wp_cache_flush_group() {
 	// Make sure objects are cloned going to and from the cache.
 	public function test_object_refs() {
 		$key           = __FUNCTION__ . '_1';
-		$object_a      = new stdClass;
+		$object_a      = new stdClass();
 		$object_a->foo = 'alpha';
 		$this->cache->set( $key, $object_a );
 		$object_a->foo = 'bravo';
@@ -240,7 +240,7 @@ public function test_object_refs() {
 		$this->assertSame( 'bravo', $object_a->foo );
 
 		$key           = __FUNCTION__ . '_2';
-		$object_a      = new stdClass;
+		$object_a      = new stdClass();
 		$object_a->foo = 'alpha';
 		$this->cache->add( $key, $object_a );
 		$object_a->foo = 'bravo';
diff --git a/tests/phpunit/tests/canonical.php b/tests/phpunit/tests/canonical.php
index 63e5c4078bb51..6d16402112c21 100644
--- a/tests/phpunit/tests/canonical.php
+++ b/tests/phpunit/tests/canonical.php
@@ -375,4 +375,31 @@ public function test_utf8_query_keys_canonical() {
 
 		delete_option( 'page_on_front' );
 	}
+
+	/**
+	 * Ensure NOT EXISTS queries do not trigger not-countable or undefined array key errors.
+	 *
+	 * @ticket 55955
+	 */
+	public function test_feed_canonical_with_not_exists_query() {
+		// Set a NOT EXISTS tax_query on the global query.
+		$global_query        = $GLOBALS['wp_query'];
+		$GLOBALS['wp_query'] = new WP_Query(
+			array(
+				'post_type' => 'post',
+				'tax_query' => array(
+					array(
+						'taxonomy' => 'post_format',
+						'operator' => 'NOT EXISTS',
+					),
+				),
+			)
+		);
+
+		$url = redirect_canonical( get_term_feed_link( self::$terms['/category/parent/'] ), false );
+		// Restore original global.
+		$GLOBALS['wp_query'] = $global_query;
+
+		$this->assertNull( $url );
+	}
 }
diff --git a/tests/phpunit/tests/comment.php b/tests/phpunit/tests/comment.php
index e75d2fd4991e4..5be490107f438 100644
--- a/tests/phpunit/tests/comment.php
+++ b/tests/phpunit/tests/comment.php
@@ -60,7 +60,11 @@ public function test_wp_update_comment() {
 		$this->assertSame( 1, $result );
 
 		$comment = get_comment( $comments[0] );
-		$this->assertEquals( $comments[1], $comment->comment_parent );
+		/*
+		 * ::create_post_comments() returns comment IDs as integers,
+		 * but WP_Comment::$comment_parent is a string.
+		 */
+		$this->assertSame( (string) $comments[1], $comment->comment_parent );
 
 		$result = wp_update_comment(
 			array(
@@ -78,7 +82,8 @@ public function test_wp_update_comment() {
 		);
 
 		$comment = get_comment( $comments[0] );
-		$this->assertEquals( $post2->ID, $comment->comment_post_ID );
+		// WP_Post::$ID is an integer, but WP_Comment::$comment_post_ID is a string.
+		$this->assertSame( (string) $post2->ID, $comment->comment_post_ID );
 	}
 
 	public function test_update_comment_from_privileged_user_by_privileged_user() {
@@ -161,7 +166,7 @@ public function test_update_comment_from_unprivileged_user_by_privileged_user()
 		);
 
 		$comment = get_comment( $comment_id );
-		$this->assertEquals( '<a href="http://example.localhost/something.html" rel="nofollow ugc">click</a>', $comment->comment_content, 'Comment: ' . $comment->comment_content );
+		$this->assertSame( '<a href="http://example.localhost/something.html" rel="nofollow ugc">click</a>', $comment->comment_content, 'Comment: ' . $comment->comment_content );
 		wp_set_current_user( 0 );
 	}
 
@@ -221,7 +226,7 @@ public function test_wp_update_comment_updates_user_id() {
 		);
 
 		$comment = get_comment( $comment_id );
-		$this->assertEquals( 1, $comment->user_id );
+		$this->assertSame( '1', $comment->user_id );
 	}
 
 	/**
@@ -377,6 +382,430 @@ public function test_get_approved_comments_with_post_id_0_should_return_empty_ar
 		$this->assertSame( array(), $found );
 	}
 
+	/**
+	 * Tests that get_cancel_comment_reply_link() returns the expected value.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_get_cancel_comment_reply_link
+	 *
+	 * @covers ::get_cancel_comment_reply_link
+	 *
+	 * @param string        $text       Text to display for cancel reply link.
+	 *                                  If empty, defaults to 'Click here to cancel reply'.
+	 * @param string|int    $post       The post the comment thread is being displayed for.
+	 *                                  Accepts 'POST_ID', 'POST', or an integer post ID.
+	 * @param int|bool|null $replytocom A comment ID (int), whether to generate an approved (true) or unapproved (false) comment,
+	 *                                  or null not to create a comment.
+	 * @param string        $expected   The expected reply link.
+	 */
+	public function test_get_cancel_comment_reply_link( $text, $post, $replytocom, $expected ) {
+		if ( 'POST_ID' === $post ) {
+			$post = self::$post_id;
+		} elseif ( 'POST' === $post ) {
+			$post = self::factory()->post->get_object_by_id( self::$post_id );
+		}
+
+		if ( null === $replytocom ) {
+			unset( $_GET['replytocom'] );
+		} else {
+			$_GET['replytocom'] = $this->create_comment_with_approval_status( $replytocom );
+		}
+
+		$this->assertSame( $expected, get_cancel_comment_reply_link( $text, $post ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_cancel_comment_reply_link() {
+		return array(
+			'text as empty string, a valid post ID and an approved comment'    => array(
+				'text'       => '',
+				'post'       => 'POST_ID',
+				'replytocom' => true,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond">Click here to cancel reply.</a>',
+			),
+			'text as a custom string, a valid post ID and an approved comment' => array(
+				'text'       => 'Leave a reply!',
+				'post'       => 'POST_ID',
+				'replytocom' => true,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond">Leave a reply!</a>',
+			),
+			'text as empty string, a valid WP_Post object and an approved comment' => array(
+				'text'       => '',
+				'post'       => 'POST',
+				'replytocom' => true,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond">Click here to cancel reply.</a>',
+			),
+			'text as a custom string, a valid WP_Post object and an approved comment' => array(
+				'text'       => 'Leave a reply!',
+				'post'       => 'POST',
+				'replytocom' => true,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond">Leave a reply!</a>',
+			),
+			'text as empty string, an invalid post and an approved comment'    => array(
+				'text'       => '',
+				'post'       => -99999,
+				'replytocom' => true,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Click here to cancel reply.</a>',
+			),
+			'text as a custom string, a valid post, but no replytocom' => array(
+				'text'       => 'Leave a reply!',
+				'post'       => 'POST',
+				'replytocom' => null,
+				'expected'   => '<a rel="nofollow" id="cancel-comment-reply-link" href="#respond" style="display:none;">Leave a reply!</a>',
+			),
+		);
+	}
+
+	/**
+	 * Tests that comment_form_title() outputs the author of an approved comment.
+	 *
+	 * @ticket 53962
+	 *
+	 * @covers ::comment_form_title
+	 */
+	public function test_should_output_the_author_of_an_approved_comment() {
+		// Must be set for `comment_form_title()`.
+		$_GET['replytocom'] = $this->create_comment_with_approval_status( true );
+
+		$comment = get_comment( $_GET['replytocom'] );
+		comment_form_title( false, false, false, self::$post_id );
+
+		$this->assertInstanceOf(
+			'WP_Comment',
+			$comment,
+			'The comment is not an instance of WP_Comment.'
+		);
+
+		$this->assertObjectHasProperty(
+			'comment_author',
+			$comment,
+			'The comment object does not have a "comment_author" property.'
+		);
+
+		$this->assertIsString(
+			$comment->comment_author,
+			'The "comment_author" is not a string.'
+		);
+
+		$this->expectOutputString(
+			'Leave a Reply to ' . $comment->comment_author,
+			'The expected string was not output.'
+		);
+	}
+
+	/**
+	 * Tests that get_comment_id_fields() allows replying to an approved comment.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_should_allow_reply_to_an_approved_comment
+	 *
+	 * @covers ::get_comment_id_fields
+	 *
+	 * @param string $comment_post The post of the comment.
+	 *                             Accepts 'POST', 'NEW_POST', 'POST_ID' and 'NEW_POST_ID'.
+	 */
+	public function test_should_allow_reply_to_an_approved_comment( $comment_post ) {
+		// Must be set for `get_comment_id_fields()`.
+		$_GET['replytocom'] = $this->create_comment_with_approval_status( true );
+
+		if ( 'POST_ID' === $comment_post ) {
+			$comment_post = self::$post_id;
+		} elseif ( 'POST' === $comment_post ) {
+			$comment_post = self::factory()->post->get_object_by_id( self::$post_id );
+		}
+
+		$expected  = "<input type='hidden' name='comment_post_ID' value='" . self::$post_id . "' id='comment_post_ID' />\n";
+		$expected .= "<input type='hidden' name='comment_parent' id='comment_parent' value='" . $_GET['replytocom'] . "' />\n";
+		$actual    = get_comment_id_fields( $comment_post );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_allow_reply_to_an_approved_comment() {
+		return array(
+			'a post ID'        => array( 'comment_post' => 'POST_ID' ),
+			'a WP_Post object' => array( 'comment_post' => 'POST' ),
+		);
+	}
+
+	/**
+	 * Tests that get_comment_id_fields() returns an empty string
+	 * when the post cannot be retrieved.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_non_existent_posts
+	 *
+	 * @covers ::get_comment_id_fields
+	 *
+	 * @param bool  $replytocom   Whether to create an approved (true) or unapproved (false) comment.
+	 * @param int   $comment_post The post of the comment.
+	 *
+	 */
+	public function test_should_return_empty_string( $replytocom, $comment_post ) {
+		if ( is_bool( $replytocom ) ) {
+			$replytocom = $this->create_comment_with_approval_status( $replytocom );
+		}
+
+		// Must be set for `get_comment_id_fields()`.
+		$_GET['replytocom'] = $replytocom;
+
+		$actual = get_comment_id_fields( $comment_post );
+
+		$this->assertSame( '', $actual );
+	}
+
+	/**
+	 * Tests that comment_form_title() does not output the author.
+	 *
+	 * @ticket 53962
+	 *
+	 * @covers ::comment_form_title
+	 *
+	 * @dataProvider data_parent_comments
+	 * @dataProvider data_non_existent_posts
+	 *
+	 * @param bool   $replytocom   Whether to create an approved (true) or unapproved (false) comment.
+	 * @param string $comment_post The post of the comment.
+	 *                             Accepts 'POST', 'NEW_POST', 'POST_ID' and 'NEW_POST_ID'.
+	 */
+	public function test_should_not_output_the_author( $replytocom, $comment_post ) {
+		if ( is_bool( $replytocom ) ) {
+			$replytocom = $this->create_comment_with_approval_status( $replytocom );
+		}
+
+		// Must be set for `comment_form_title()`.
+		$_GET['replytocom'] = $replytocom;
+
+		if ( 'NEW_POST_ID' === $comment_post ) {
+			$comment_post = self::factory()->post->create();
+		} elseif ( 'NEW_POST' === $comment_post ) {
+			$comment_post = self::factory()->post->create_and_get();
+		} elseif ( 'POST_ID' === $comment_post ) {
+			$comment_post = self::$post_id;
+		} elseif ( 'POST' === $comment_post ) {
+			$comment_post = self::factory()->post->get_object_by_id( self::$post_id );
+		}
+
+		$comment_post_id = $comment_post instanceof WP_Post ? $comment_post->ID : $comment_post;
+
+		get_comment( $_GET['replytocom'] );
+
+		comment_form_title( false, false, false, $comment_post_id );
+
+		$this->expectOutputString( 'Leave a Reply' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_non_existent_posts() {
+		return array(
+			'an unapproved comment and a non-existent post ID' => array(
+				'replytocom'   => false,
+				'comment_post' => -99999,
+			),
+			'an approved comment and a non-existent post ID' => array(
+				'replytocom'   => true,
+				'comment_post' => -99999,
+			),
+		);
+	}
+
+	/**
+	 * Tests that get_comment_id_fields() does not allow replies when
+	 * the comment does not have a parent post.
+	 *
+	 * @ticket 53962
+	 *
+	 * @covers ::get_comment_id_fields
+	 *
+	 * @dataProvider data_parent_comments
+	 *
+	 * @param mixed  $replytocom   Whether to create an approved (true) or unapproved (false) comment,
+	 *                             or an invalid comment ID.
+	 * @param string $comment_post The post of the comment.
+	 *                             Accepts 'POST', 'NEW_POST', 'POST_ID' and 'NEW_POST_ID'.
+	 */
+	public function test_should_not_allow_reply( $replytocom, $comment_post ) {
+		if ( is_bool( $replytocom ) ) {
+			$replytocom = $this->create_comment_with_approval_status( $replytocom );
+		}
+
+		// Must be set for `get_comment_id_fields()`.
+		$_GET['replytocom'] = $replytocom;
+
+		if ( 'NEW_POST_ID' === $comment_post ) {
+			$comment_post = self::factory()->post->create();
+		} elseif ( 'NEW_POST' === $comment_post ) {
+			$comment_post = self::factory()->post->create_and_get();
+		} elseif ( 'POST_ID' === $comment_post ) {
+			$comment_post = self::$post_id;
+		} elseif ( 'POST' === $comment_post ) {
+			$comment_post = self::factory()->post->get_object_by_id( self::$post_id );
+		}
+
+		$comment_post_id = $comment_post instanceof WP_Post ? $comment_post->ID : $comment_post;
+
+		$expected  = "<input type='hidden' name='comment_post_ID' value='" . $comment_post_id . "' id='comment_post_ID' />\n";
+		$expected .= "<input type='hidden' name='comment_parent' id='comment_parent' value='0' />\n";
+		$actual    = get_comment_id_fields( $comment_post );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_parent_comments() {
+		return array(
+			'an unapproved parent comment (ID)'      => array(
+				'replytocom'   => false,
+				'comment_post' => 'POST_ID',
+			),
+			'an approved parent comment on another post (ID)' => array(
+				'replytocom'   => true,
+				'comment_post' => 'NEW_POST_ID',
+			),
+			'an unapproved parent comment on another post (ID)' => array(
+				'replytocom'   => false,
+				'comment_post' => 'NEW_POST_ID',
+			),
+			'a parent comment ID that cannot be cast to an integer' => array(
+				'replytocom'   => array( 'I cannot be cast to an integer.' ),
+				'comment_post' => 'POST_ID',
+			),
+			'an unapproved parent comment (WP_Post)' => array(
+				'replytocom'   => false,
+				'comment_post' => 'POST',
+			),
+			'an approved parent comment on another post (WP_Post)' => array(
+				'replytocom'   => true,
+				'comment_post' => 'NEW_POST',
+			),
+			'an unapproved parent comment on another post (WP_Post)' => array(
+				'replytocom'   => false,
+				'comment_post' => 'NEW_POST',
+			),
+			'a parent comment WP_Post that cannot be cast to an integer' => array(
+				'replytocom'   => array( 'I cannot be cast to an integer.' ),
+				'comment_post' => 'POST',
+			),
+		);
+	}
+
+	/**
+	 * Helper function to create a comment with an approval status.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param bool $approved Whether or not the comment is approved.
+	 * @return int The comment ID.
+	 */
+	public function create_comment_with_approval_status( $approved ) {
+		return self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => self::$post_id,
+				'comment_approved' => ( $approved ) ? '1' : '0',
+			)
+		);
+	}
+
+	/**
+	 * Tests that _get_comment_reply_id() returns the expected value.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_get_comment_reply_id
+	 *
+	 * @covers ::_get_comment_reply_id
+	 *
+	 * @param int|bool|null $replytocom A comment ID (int), whether to generate an approved (true) or unapproved (false) comment,
+	 *                                  or null not to create a comment.
+	 * @param string|int    $post       The post the comment thread is being displayed for.
+	 *                                  Accepts 'POST_ID', 'POST', or an integer post ID.
+	 * @param int           $expected   The expected result.
+	 */
+	public function test_get_comment_reply_id( $replytocom, $post, $expected ) {
+		if ( false === $replytocom ) {
+			unset( $_GET['replytocom'] );
+		} else {
+			$_GET['replytocom'] = $this->create_comment_with_approval_status( (bool) $replytocom );
+		}
+
+		if ( 'POST_ID' === $post ) {
+			$post = self::$post_id;
+		} elseif ( 'POST' === $post ) {
+			$post = self::factory()->post->get_object_by_id( self::$post_id );
+		}
+
+		if ( 'replytocom' === $expected ) {
+			$expected = $_GET['replytocom'];
+		}
+
+		$this->assertSame( $expected, _get_comment_reply_id( $post ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_comment_reply_id() {
+		return array(
+			'no comment ID set ($_GET["replytocom"])'     => array(
+				'replytocom' => false,
+				'post'       => 0,
+				'expected'   => 0,
+			),
+			'a non-numeric comment ID'                    => array(
+				'replytocom' => 'three',
+				'post'       => 0,
+				'expected'   => 0,
+			),
+			'a non-existent comment ID'                   => array(
+				'replytocom' => -999999,
+				'post'       => 0,
+				'expected'   => 0,
+			),
+			'an unapproved comment'                       => array(
+				'replytocom' => false,
+				'post'       => 0,
+				'expected'   => 0,
+			),
+			'a post that does not match the parent'       => array(
+				'replytocom' => false,
+				'post'       => -999999,
+				'expected'   => 0,
+			),
+			'an approved comment and the correct post ID' => array(
+				'replytocom' => true,
+				'post'       => 'POST_ID',
+				'expected'   => 'replytocom',
+			),
+			'an approved comment and the correct WP_Post object' => array(
+				'replytocom' => true,
+				'post'       => 'POST',
+				'expected'   => 'replytocom',
+			),
+		);
+	}
+
 	/**
 	 * @ticket 14279
 	 *
@@ -523,7 +952,7 @@ public function test_wp_new_comment_respects_comment_agent_empty_string() {
 	/**
 	 * @covers ::wp_new_comment
 	 */
-	public function test_comment_field_lengths() {
+	public function test_wp_new_comment_respects_comment_field_lengths() {
 		$data = array(
 			'comment_post_ID'      => self::$post_id,
 			'comment_author'       => 'Comment Author',
@@ -539,11 +968,13 @@ public function test_comment_field_lengths() {
 
 		$comment = get_comment( $id );
 
-		$this->assertSame( strlen( $comment->comment_content ), 65535 );
+		$this->assertSame( 65535, strlen( $comment->comment_content ) );
 	}
 
 	/**
 	 * @ticket 56244
+	 *
+	 * @covers ::wp_new_comment
 	 */
 	public function test_wp_new_comment_sends_all_expected_parameters_to_preprocess_comment_filter() {
 		$user = get_userdata( self::$user_id );
@@ -1141,244 +1572,8 @@ public function test_wp_get_comment_fields_max_lengths() {
 	}
 
 	/**
-	 * The `wp_comments_personal_data_eraser()` function should erase user's comments.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_comments_personal_data_eraser() {
-
-		$post_id = self::factory()->post->create();
-		$user_id = self::factory()->user->create();
-
-		$args       = array(
-			'user_id'              => $user_id,
-			'comment_post_ID'      => $post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_agent'        => 'COMMENT_AGENT',
-			'comment_content'      => 'Comment Content',
-		);
-		$comment_id = self::factory()->comment->create( $args );
-
-		wp_comments_personal_data_eraser( $args['comment_author_email'] );
-
-		$comment = get_comment( $comment_id );
-
-		$actual = array(
-			'comment_ID'           => $comment->comment_ID,
-			'user_id'              => $comment->user_id,
-			'comment_author'       => $comment->comment_author,
-			'comment_author_email' => $comment->comment_author_email,
-			'comment_author_url'   => $comment->comment_author_url,
-			'comment_author_IP'    => $comment->comment_author_IP,
-			'comment_date'         => $comment->comment_date,
-			'comment_date_gmt'     => $comment->comment_date_gmt,
-			'comment_agent'        => $comment->comment_agent,
-			'comment_content'      => $comment->comment_content,
-		);
-
-		$expected = array(
-			'comment_ID'           => (string) $comment_id,
-			'user_id'              => '0', // Anonymized.
-			'comment_author'       => 'Anonymous', // Anonymized.
-			'comment_author_email' => '', // Anonymized.
-			'comment_author_url'   => '', // Anonymized.
-			'comment_author_IP'    => '192.168.0.0', // Anonymized.
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_date_gmt'     => '2018-04-14 17:20:00',
-			'comment_agent'        => '', // Anonymized.
-			'comment_content'      => 'Comment Content',
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_eraser()` function's output on an empty first page.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_comments_personal_data_eraser_empty_first_page_output() {
-
-		$actual   = wp_comments_personal_data_eraser( 'nocommentsfound@local.host' );
-		$expected = array(
-			'items_removed'  => false,
-			'items_retained' => false,
-			'messages'       => array(),
-			'done'           => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_eraser()` function's output, for the non-empty first page.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_comments_personal_data_eraser_non_empty_first_page_output() {
-
-		$post_id = self::factory()->post->create();
-		$args    = array(
-			'comment_post_ID'      => $post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_agent'        => 'COMMENT_AGENT',
-			'comment_content'      => 'Comment Content',
-		);
-		self::factory()->comment->create( $args );
-
-		$actual   = wp_comments_personal_data_eraser( $args['comment_author_email'] );
-		$expected = array(
-			'items_removed'  => true,
-			'items_retained' => false,
-			'messages'       => array(),
-			'done'           => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_eraser()` function's output, for an empty second page.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_comments_personal_data_eraser_empty_second_page_output() {
-
-		$post_id = self::factory()->post->create();
-		$args    = array(
-			'comment_post_ID'      => $post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_agent'        => 'COMMENT_AGENT',
-			'comment_content'      => 'Comment Content',
-		);
-		self::factory()->comment->create( $args );
-
-		$actual   = wp_comments_personal_data_eraser( $args['comment_author_email'], 2 );
-		$expected = array(
-			'items_removed'  => false,
-			'items_retained' => false,
-			'messages'       => array(),
-			'done'           => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization() {
-
-		$post_id    = self::factory()->post->create();
-		$args       = array(
-			'comment_post_ID'      => $post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_agent'        => 'COMMENT_AGENT',
-			'comment_content'      => 'Comment Content',
-		);
-		$comment_id = self::factory()->comment->create( $args );
-
-		add_filter( 'wp_anonymize_comment', '__return_false' );
-		$actual = wp_comments_personal_data_eraser( $args['comment_author_email'] );
-		remove_filter( 'wp_anonymize_comment', '__return_false' );
-
-		$message = sprintf( 'Comment %d contains personal data but could not be anonymized.', $comment_id );
-
-		$expected = array(
-			'items_removed'  => false,
-			'items_retained' => true,
-			'messages'       => array( $message ),
-			'done'           => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization, with a custom message.
-	 *
-	 * @group privacy
-	 * @ticket 43442
-	 *
-	 * @covers ::wp_comments_personal_data_eraser
-	 */
-	public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization_with_custom_message() {
-
-		$post_id    = self::factory()->post->create();
-		$args       = array(
-			'comment_post_ID'      => $post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-04-14 17:20:00',
-			'comment_agent'        => 'COMMENT_AGENT',
-			'comment_content'      => 'Comment Content',
-		);
-		$comment_id = self::factory()->comment->create( $args );
-
-		add_filter( 'wp_anonymize_comment', array( $this, 'wp_anonymize_comment_custom_message' ), 10, 3 );
-		$actual = wp_comments_personal_data_eraser( $args['comment_author_email'] );
-		remove_filter( 'wp_anonymize_comment', array( $this, 'wp_anonymize_comment_custom_message' ) );
-
-		$message = sprintf( 'Some custom message for comment %d.', $comment_id );
-
-		$expected = array(
-			'items_removed'  => false,
-			'items_retained' => true,
-			'messages'       => array( $message ),
-			'done'           => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Callback for the `wp_anonymize_comment` filter.
-	 *
-	 * @param  bool|string $anonymize          Whether to apply the comment anonymization (bool).
-	 *                                         Custom prevention message (string). Default true.
-	 * @param  WP_Comment  $comment            WP_Comment object.
-	 * @param  array       $anonymized_comment Anonymized comment data.
-	 * @return string
+	 * @covers ::wp_update_comment
 	 */
-	public function wp_anonymize_comment_custom_message( $anonymize, $comment, $anonymized_comment ) {
-		return sprintf( 'Some custom message for comment %d.', $comment->comment_ID );
-	}
-
 	public function test_update_should_invalidate_comment_cache() {
 		global $wpdb;
 
@@ -1470,135 +1665,4 @@ public function test_unspam_should_invalidate_comment_cache() {
 
 		$this->assertSame( '1', $comment->comment_approved );
 	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_exporter()` function.
-	 *
-	 * @group privacy
-	 * @ticket 43440
-	 *
-	 * @covers ::wp_comments_personal_data_exporter
-	 */
-	public function test_wp_comments_personal_data_exporter() {
-		$args = array(
-			'comment_post_ID'      => self::$post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_agent'        => 'SOME_AGENT',
-			'comment_date'         => '2018-03-28 20:05:00',
-			'comment_content'      => 'Comment',
-		);
-
-		$comment_id = self::factory()->comment->create( $args );
-
-		$actual   = wp_comments_personal_data_exporter( $args['comment_author_email'] );
-		$expected = $args;
-
-		$this->assertTrue( $actual['done'] );
-
-		// Number of exported comments.
-		$this->assertCount( 1, $actual['data'] );
-
-		// Number of exported comment properties.
-		$this->assertCount( 8, $actual['data'][0]['data'] );
-
-		// Exported group.
-		$this->assertSame( 'comments', $actual['data'][0]['group_id'] );
-		$this->assertSame( 'Comments', $actual['data'][0]['group_label'] );
-
-		// Exported comment properties.
-		$this->assertSame( $expected['comment_author'], $actual['data'][0]['data'][0]['value'] );
-		$this->assertSame( $expected['comment_author_email'], $actual['data'][0]['data'][1]['value'] );
-		$this->assertSame( $expected['comment_author_url'], $actual['data'][0]['data'][2]['value'] );
-		$this->assertSame( $expected['comment_author_IP'], $actual['data'][0]['data'][3]['value'] );
-		$this->assertSame( $expected['comment_agent'], $actual['data'][0]['data'][4]['value'] );
-		$this->assertSame( $expected['comment_date'], $actual['data'][0]['data'][5]['value'] );
-		$this->assertSame( $expected['comment_content'], $actual['data'][0]['data'][6]['value'] );
-		$this->assertSame( esc_html( get_comment_link( $comment_id ) ), strip_tags( $actual['data'][0]['data'][7]['value'] ) );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_exporter()` function for no comments found.
-	 *
-	 * @group privacy
-	 * @ticket 43440
-	 *
-	 * @covers ::wp_comments_personal_data_exporter
-	 */
-	public function test_wp_comments_personal_data_exporter_no_comments_found() {
-
-		$actual = wp_comments_personal_data_exporter( 'nocommentsfound@local.host' );
-
-		$expected = array(
-			'data' => array(),
-			'done' => true,
-		);
-
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_exporter()` function for an empty comment property.
-	 *
-	 * @group privacy
-	 * @ticket 43440
-	 *
-	 * @covers ::wp_comments_personal_data_exporter
-	 */
-	public function test_wp_comments_personal_data_exporter_empty_comment_prop() {
-		$args = array(
-			'comment_post_ID'      => self::$post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-03-28 20:05:00',
-			'comment_agent'        => '',
-			'comment_content'      => 'Comment',
-		);
-
-		$c = self::factory()->comment->create( $args );
-
-		$actual = wp_comments_personal_data_exporter( $args['comment_author_email'] );
-
-		$this->assertTrue( $actual['done'] );
-
-		// Number of exported comments.
-		$this->assertCount( 1, $actual['data'] );
-
-		// Number of exported comment properties.
-		$this->assertCount( 7, $actual['data'][0]['data'] );
-	}
-
-	/**
-	 * Testing the `wp_comments_personal_data_exporter()` function with an empty second page.
-	 *
-	 * @group privacy
-	 * @ticket 43440
-	 *
-	 * @covers ::wp_comments_personal_data_exporter
-	 */
-	public function test_wp_comments_personal_data_exporter_empty_second_page() {
-		$args = array(
-			'comment_post_ID'      => self::$post_id,
-			'comment_author'       => 'Comment Author',
-			'comment_author_email' => 'personal@local.host',
-			'comment_author_url'   => 'https://local.host/',
-			'comment_author_IP'    => '192.168.0.1',
-			'comment_date'         => '2018-03-28 20:05:00',
-			'comment_agent'        => 'SOME_AGENT',
-			'comment_content'      => 'Comment',
-		);
-
-		$c = self::factory()->comment->create( $args );
-
-		$actual = wp_comments_personal_data_exporter( $args['comment_author_email'], 2 );
-
-		$this->assertTrue( $actual['done'] );
-
-		// Number of exported comments.
-		$this->assertCount( 0, $actual['data'] );
-	}
 }
diff --git a/tests/phpunit/tests/comment/checkComment.php b/tests/phpunit/tests/comment/checkComment.php
index 5efcf9acceedb..c23e1d4dc2b76 100644
--- a/tests/phpunit/tests/comment/checkComment.php
+++ b/tests/phpunit/tests/comment/checkComment.php
@@ -70,7 +70,7 @@ public function test_should_return_true_when_comment_previously_approved_is_enab
 		$this->assertTrue( $results );
 	}
 
-	public function test_should_return_false_when_content_matches_moderation_key() {
+	public function test_should_return_false_when_content_matches_moderation_keys() {
 		update_option( 'comment_previously_approved', 0 );
 
 		$author       = 'WendytheBuilder';
@@ -86,6 +86,25 @@ public function test_should_return_false_when_content_matches_moderation_key() {
 		$this->assertFalse( $results );
 	}
 
+	/**
+	 * @ticket 57207
+	 */
+	public function test_should_return_false_when_content_with_non_latin_words_matches_moderation_keys() {
+		update_option( 'comment_previously_approved', 0 );
+
+		$author       = 'Setup';
+		$author_email = 'setup@example.com';
+		$author_url   = 'http://example.com';
+		$comment      = 'Установка';
+		$author_ip    = '192.168.0.1';
+		$user_agent   = '';
+		$comment_type = '';
+
+		update_option( 'moderation_keys', "установка\nfoo" );
+		$results = check_comment( $author, $author_email, $author_url, $comment, $author_ip, $user_agent, $comment_type );
+		$this->assertFalse( $results );
+	}
+
 	public function test_should_return_true_when_content_does_not_match_moderation_keys() {
 		update_option( 'comment_previously_approved', 0 );
 
diff --git a/tests/phpunit/tests/comment/commentTime.php b/tests/phpunit/tests/comment/commentTime.php
new file mode 100644
index 0000000000000..fd9e8fe6e09c2
--- /dev/null
+++ b/tests/phpunit/tests/comment/commentTime.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * Tests for the comment_time() function.
+ *
+ * @group comment
+ *
+ * @covers ::comment_time
+ */
+class Tests_Comment_CommentTime extends WP_UnitTestCase {
+
+	/**
+	 * A post ID.
+	 *
+	 * @var int
+	 */
+	protected static $post_id;
+
+	/**
+	 * A comment ID.
+	 *
+	 * @var int
+	 */
+	protected static $comment_id;
+
+	/**
+	 * Sets the post ID and comment ID property values before any tests run.
+	 */
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		self::$post_id = self::factory()->post->create(
+			array(
+				'post_title'   => 'Post title for comment_time() tests',
+				'post_content' => 'Post content for comment_time() tests',
+			)
+		);
+
+		self::$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID' => self::$post_id,
+				'user_id'         => 1,
+			)
+		);
+	}
+
+	/**
+	 * Tests that comment_time() displays the same value that get_comment_time() returns.
+	 *
+	 * @ticket 58064
+	 *
+	 * @dataProvider data_should_output_the_same_value_that_get_comment_time_returns
+	 *
+	 * @param string $format PHP date format.
+	 */
+	public function test_should_output_the_same_value_that_get_comment_time_returns( $format ) {
+		$expected = get_comment_time( $format, false, true, self::$comment_id );
+
+		ob_start();
+		comment_time( $format, self::$comment_id );
+		$actual = ob_get_clean();
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_output_the_same_value_that_get_comment_time_returns() {
+		return array(
+			'an empty format'   => array(
+				'format' => '',
+			),
+			'a PHP date format' => array(
+				'format' => 'h:i:s A',
+			),
+		);
+	}
+
+	/**
+	 * Tests that comment_time() defaults to the global comment when comment ID
+	 * is not provided.
+	 *
+	 * @ticket 58064
+	 */
+	public function test_should_default_to_the_global_comment_when_comment_id_is_not_provided() {
+		global $comment;
+
+		// Back up the global comment before setting the value.
+		$comment_backup = $comment;
+		$comment        = self::$comment_id;
+
+		$expected = get_comment_time();
+
+		ob_start();
+		comment_time();
+		$actual = ob_get_clean();
+
+		// Restore the global comment value.
+		$comment = $comment_backup;
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Tests that comment_time() displays an empty string when global comment is not set
+	 * and comment ID is not provided.
+	 *
+	 * @ticket 58064
+	 */
+	public function test_should_output_an_empty_string_when_global_comment_is_not_set_and_comment_id_is_not_provided() {
+		global $comment;
+
+		// Back up the global comment before setting the value.
+		$comment_backup = $comment;
+		$comment        = null;
+
+		ob_start();
+		comment_time();
+		$actual = ob_get_clean();
+
+		// Restore the global comment value.
+		$comment = $comment_backup;
+
+		$this->assertSame( '', $actual );
+	}
+
+}
diff --git a/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php b/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php
index c9acc6732d9ba..7e60b9cc1b194 100644
--- a/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php
+++ b/tests/phpunit/tests/comment/getCommentAuthorUrlLink.php
@@ -20,7 +20,7 @@ protected function parseCommentAuthorUrl( $comment, $linktext = '' ) {
 			$linktext = rtrim( preg_replace( '#http://(www\.)?#', '', $comment->comment_author_url ), '/' );
 		}
 		return sprintf(
-			'<a href=\'%s\' rel=\'external\'>%s</a>',
+			'<a href="%s" rel="external">%s</a>',
 			$comment->comment_author_url,
 			$linktext
 		);
@@ -29,7 +29,7 @@ protected function parseCommentAuthorUrl( $comment, $linktext = '' ) {
 	public function test_no_comment() {
 		$url_link = get_comment_author_url_link();
 
-		$this->assertSame( "<a href='' rel='external'></a>", $url_link );
+		$this->assertSame( '<a href="" rel="external"></a>', $url_link );
 	}
 
 	public function test_global_comment() {
diff --git a/tests/phpunit/tests/comment/getPageOfComment.php b/tests/phpunit/tests/comment/getPageOfComment.php
index e1f19ae345ac5..bfb5c92c30c1b 100644
--- a/tests/phpunit/tests/comment/getPageOfComment.php
+++ b/tests/phpunit/tests/comment/getPageOfComment.php
@@ -100,27 +100,23 @@ public function test_type_pings() {
 	 * @ticket 11334
 	 */
 	public function test_subsequent_calls_should_hit_cache() {
-		global $wpdb;
-
 		$p = self::factory()->post->create();
 		$c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
 		// Prime cache.
 		$page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$page_2      = get_page_of_comment( $c, array( 'per_page' => 3 ) );
 
 		$this->assertSame( $page_1, $page_2 );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 11334
 	 */
 	public function test_cache_hits_should_be_sensitive_to_comment_type() {
-		global $wpdb;
-
 		$p       = self::factory()->post->create();
 		$comment = self::factory()->comment->create(
 			array(
@@ -151,7 +147,7 @@ public function test_cache_hits_should_be_sensitive_to_comment_type() {
 		);
 		$this->assertSame( 2, $page_trackbacks );
 
-		$num_queries   = $wpdb->num_queries;
+		$num_queries   = get_num_queries();
 		$page_comments = get_page_of_comment(
 			$comment,
 			array(
@@ -161,7 +157,7 @@ public function test_cache_hits_should_be_sensitive_to_comment_type() {
 		);
 		$this->assertSame( 1, $page_comments );
 
-		$this->assertNotEquals( $num_queries, $wpdb->num_queries );
+		$this->assertNotEquals( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/comment/isAvatarCommentType.php b/tests/phpunit/tests/comment/isAvatarCommentType.php
index 57ed593b1ba68..f45caae93b2d6 100644
--- a/tests/phpunit/tests/comment/isAvatarCommentType.php
+++ b/tests/phpunit/tests/comment/isAvatarCommentType.php
@@ -5,15 +5,9 @@
  * @package WordPress\UnitTests
  *
  * @since 5.1.0
- */
-
-/**
- * Tests_Comment_IsAvatarCommentType class.
  *
  * @group comment
  *
- * @since 5.1.0
- *
  * @covers ::is_avatar_comment_type
  */
 class Tests_Comment_IsAvatarCommentType extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/comment/metaCache.php b/tests/phpunit/tests/comment/metaCache.php
index bd96e8b3e1abe..5a6d716e914e8 100644
--- a/tests/phpunit/tests/comment/metaCache.php
+++ b/tests/phpunit/tests/comment/metaCache.php
@@ -11,9 +11,40 @@ class Tests_Comment_MetaCache extends WP_UnitTestCase {
 	 *
 	 * @covers ::update_comment_meta
 	 */
-	public function test_update_comment_meta_cache_should_default_to_true() {
-		global $wpdb;
+	public function test_update_comment_meta_cache_should_default_to_lazy_loading() {
+		$p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+		$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
+
+		foreach ( $comment_ids as $cid ) {
+			update_comment_meta( $cid, 'foo', 'bar' );
+		}
 
+		// Clear comment cache, just in case.
+		clean_comment_cache( $comment_ids );
+
+		$num_queries = get_num_queries();
+		$q           = new WP_Comment_Query(
+			array(
+				'post_ID' => $p,
+			)
+		);
+
+		$this->assertSame( 2, get_num_queries() - $num_queries, 'Querying comments is expected to make two queries' );
+
+		$num_queries = get_num_queries();
+		foreach ( $comment_ids as $cid ) {
+			get_comment_meta( $cid, 'foo', 'bar' );
+		}
+
+		$this->assertSame( 1, get_num_queries() - $num_queries, 'Querying comments is expected to make two queries' );
+	}
+
+	/**
+	 * @ticket 57801
+	 *
+	 * @covers ::wp_lazyload_comment_meta
+	 */
+	public function test_update_comment_meta_cache_should_default_to_lazy_loading_fields_id() {
 		$p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 		$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
@@ -24,18 +55,22 @@ public function test_update_comment_meta_cache_should_default_to_true() {
 		// Clear comment cache, just in case.
 		clean_comment_cache( $comment_ids );
 
-		$q = new WP_Comment_Query(
+		$num_queries = get_num_queries();
+		$q           = new WP_Comment_Query(
 			array(
 				'post_ID' => $p,
+				'fields'  => 'ids',
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$this->assertSame( 1, get_num_queries() - $num_queries, 'Querying comments is expected to make two queries' );
+
+		$num_queries = get_num_queries();
 		foreach ( $comment_ids as $cid ) {
 			get_comment_meta( $cid, 'foo', 'bar' );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( 1, get_num_queries() - $num_queries, 'Comment meta is expected to be lazy loaded' );
 	}
 
 	/**
@@ -44,8 +79,6 @@ public function test_update_comment_meta_cache_should_default_to_true() {
 	 * @covers ::update_comment_meta
 	 */
 	public function test_update_comment_meta_cache_true() {
-		global $wpdb;
-
 		$p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 		$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
@@ -56,19 +89,59 @@ public function test_update_comment_meta_cache_true() {
 		// Clear comment cache, just in case.
 		clean_comment_cache( $comment_ids );
 
-		$q = new WP_Comment_Query(
+		$num_queries = get_num_queries();
+		$q           = new WP_Comment_Query(
 			array(
 				'post_ID'                   => $p,
 				'update_comment_meta_cache' => true,
 			)
 		);
+		$this->assertSame( 2, get_num_queries() - $num_queries, 'Comments should be queries and primed in two database queries' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		foreach ( $comment_ids as $cid ) {
 			get_comment_meta( $cid, 'foo', 'bar' );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( 1, get_num_queries() - $num_queries, 'Comment meta should be loaded in one database query' );
+	}
+
+	/**
+	 * @ticket 57801
+	 *
+	 * @covers ::update_comment_meta
+	 */
+	public function test_update_comment_meta_cache_true_multiple() {
+		$posts           = self::factory()->post->create_many( 3 );
+		$all_comment_ids = array();
+		foreach ( $posts as $p ) {
+			$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
+
+			foreach ( $comment_ids as $cid ) {
+				update_comment_meta( $cid, 'foo', 'bar' );
+				$all_comment_ids[] = $cid;
+			}
+
+			$num_queries = get_num_queries();
+			$q           = new WP_Comment_Query(
+				array(
+					'post_ID'                   => $p,
+					'update_comment_meta_cache' => true,
+				)
+			);
+			$this->assertSame( 1, get_num_queries() - $num_queries, 'Comment query should only add one query' );
+		}
+
+		$filter = new MockAction();
+		add_filter( 'update_comment_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		$num_queries = get_num_queries();
+		get_comment_meta( $comment_ids[0], 'foo', 'bar' );
+
+		$this->assertSame( 1, get_num_queries() - $num_queries, 'Comment meta should be loaded in one database query' );
+		$args              = $filter->get_args();
+		$first             = reset( $args );
+		$prime_comment_ids = end( $first );
+		$this->assertSameSets( $prime_comment_ids, $all_comment_ids, 'All comment meta should be loaded all at once' );
 	}
 
 	/**
@@ -77,8 +150,6 @@ public function test_update_comment_meta_cache_true() {
 	 * @covers ::update_comment_meta
 	 */
 	public function test_update_comment_meta_cache_false() {
-		global $wpdb;
-
 		$p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 		$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
@@ -93,12 +164,12 @@ public function test_update_comment_meta_cache_false() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		foreach ( $comment_ids as $cid ) {
 			get_comment_meta( $cid, 'foo', 'bar' );
 		}
 
-		$this->assertSame( $num_queries + 3, $wpdb->num_queries );
+		$this->assertSame( 3, get_num_queries() - $num_queries );
 	}
 
 	/**
@@ -107,8 +178,6 @@ public function test_update_comment_meta_cache_false() {
 	 * @covers ::get_comment_meta
 	 */
 	public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comments_template() {
-		global $wpdb;
-
 		$p           = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 		$comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
@@ -126,14 +195,14 @@ public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comm
 				$cform = get_echo( 'comments_template' );
 
 				// First request will hit the database.
-				$num_queries = $wpdb->num_queries;
+				$num_queries = get_num_queries();
 				get_comment_meta( $comment_ids[0], 'sauce' );
-				$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+				$this->assertSame( 1, get_num_queries() - $num_queries );
 
 				// Second and third requests should be in cache.
 				get_comment_meta( $comment_ids[1], 'sauce' );
 				get_comment_meta( $comment_ids[2], 'sauce' );
-				$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+				$this->assertSame( 1, get_num_queries() - $num_queries );
 			}
 		}
 	}
@@ -142,10 +211,9 @@ public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comm
 	 * @ticket 34047
 	 *
 	 * @covers ::get_comment_meta
+	 * @covers ::wp_lazyload_comment_meta
 	 */
 	public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries() {
-		global $wpdb;
-
 		$posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
 		$now      = time();
@@ -173,29 +241,28 @@ public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries(
 		);
 
 		// First comment will cause the cache to be primed.
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertSame( 'bar', get_comment_meta( $comments[0], 'foo', 'bar' ) );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Second comment from the results should not cause more queries.
 		$this->assertSame( 'bar', get_comment_meta( $comments[1], 'foo', 'bar' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// A comment from outside the results will not be primed.
 		$this->assertSame( 'bar', get_comment_meta( $comments[4], 'foo', 'bar' ) );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 34047
 	 *
 	 * @covers ::get_comment_meta
+	 * @covers ::wp_lazyload_comment_meta
 	 */
 	public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_feed_queries() {
-		global $wpdb;
-
 		$posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
 		$now      = time();
@@ -224,19 +291,19 @@ public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_f
 		);
 
 		// First comment will cause the cache to be primed.
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertSame( 'bar', get_comment_meta( $comments[0], 'foo', 'bar' ) );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Second comment from the results should not cause more queries.
 		$this->assertSame( 'bar', get_comment_meta( $comments[1], 'foo', 'bar' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// A comment from outside the results will not be primed.
 		$this->assertSame( 'bar', get_comment_meta( $comments[4], 'foo', 'bar' ) );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/comment/query.php b/tests/phpunit/tests/comment/query.php
index 5a7ab9441d93c..9f6bb14e54072 100644
--- a/tests/phpunit/tests/comment/query.php
+++ b/tests/phpunit/tests/comment/query.php
@@ -3588,8 +3588,6 @@ public function test_comment_query_object() {
 	 * @covers WP_Comment_Query::query
 	 */
 	public function test_comment_cache_key_should_ignore_custom_params() {
-		global $wpdb;
-
 		$p = self::factory()->post->create();
 		$c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
@@ -3601,7 +3599,7 @@ public function test_comment_cache_key_should_ignore_custom_params() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q2 = new WP_Comment_Query();
 		$q2->query(
@@ -3612,7 +3610,7 @@ public function test_comment_cache_key_should_ignore_custom_params() {
 			)
 		);
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -3629,7 +3627,7 @@ public function test_cache_should_be_sensitive_to_parent__in() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q2 = new WP_Comment_Query(
 			array(
@@ -3637,7 +3635,7 @@ public function test_cache_should_be_sensitive_to_parent__in() {
 			)
 		);
 
-		$this->assertNotEquals( $num_queries, $wpdb->num_queries );
+		$this->assertNotEquals( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -3654,7 +3652,7 @@ public function test_cache_should_be_sensitive_to_parent__not_in() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q2 = new WP_Comment_Query(
 			array(
@@ -3662,7 +3660,7 @@ public function test_cache_should_be_sensitive_to_parent__not_in() {
 			)
 		);
 
-		$this->assertNotEquals( $num_queries, $wpdb->num_queries );
+		$this->assertNotEquals( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -4427,7 +4425,7 @@ public function test_cache_should_be_hit_when_querying_descendants() {
 		);
 		$q1_ids = wp_list_pluck( $q1->comments, 'comment_ID' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q2          = new WP_Comment_Query(
 			array(
 				'post_id'      => $p,
@@ -4437,7 +4435,7 @@ public function test_cache_should_be_hit_when_querying_descendants() {
 		$q2_ids      = wp_list_pluck( $q2->comments, 'comment_ID' );
 
 		$this->assertSameSets( $q1_ids, $q2_ids );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -4590,9 +4588,9 @@ public function test_update_comment_post_cache_should_be_disabled_by_default() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( isset( $q->comments[0]->post_name ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 
 	/**
@@ -4613,9 +4611,9 @@ public function test_should_respect_update_comment_post_cache_true() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( isset( $q->comments[0]->post_name ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -4629,7 +4627,7 @@ public function test_comment_objects_should_be_filled_from_cache() {
 		$comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => self::$post_id ) );
 		clean_comment_cache( $comments );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q           = new WP_Comment_Query(
 			array(
 				'post_id'                   => self::$post_id,
@@ -4645,7 +4643,7 @@ public function test_comment_objects_should_be_filled_from_cache() {
 		$found = wp_list_pluck( $q->comments, 'comment_ID' );
 		$this->assertEqualSets( $comments, $found );
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -4692,7 +4690,7 @@ public function test_comment_query_should_be_cached() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q2 = new WP_Comment_Query(
 			array(
@@ -4701,7 +4699,7 @@ public function test_comment_query_should_be_cached() {
 			)
 		);
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -4724,7 +4722,7 @@ public function test_created_comment_should_invalidate_query_cache() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4733,7 +4731,7 @@ public function test_created_comment_should_invalidate_query_cache() {
 			)
 		);
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array( $c ), $q->comments );
 	}
 
@@ -4766,7 +4764,7 @@ public function test_updated_comment_should_invalidate_query_cache() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4776,7 +4774,7 @@ public function test_updated_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array( $c ), $q->comments );
 	}
 
@@ -4802,7 +4800,7 @@ public function test_deleted_comment_should_invalidate_query_cache() {
 
 		wp_delete_comment( $c );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4812,7 +4810,7 @@ public function test_deleted_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array(), $q->comments );
 	}
 
@@ -4838,7 +4836,7 @@ public function test_trashed_comment_should_invalidate_query_cache() {
 
 		wp_trash_comment( $c );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4848,7 +4846,7 @@ public function test_trashed_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array(), $q->comments );
 	}
 
@@ -4876,7 +4874,7 @@ public function test_untrashed_comment_should_invalidate_query_cache() {
 
 		wp_untrash_comment( $c );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4886,7 +4884,7 @@ public function test_untrashed_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array( $c ), $q->comments );
 	}
 
@@ -4912,7 +4910,7 @@ public function test_spammed_comment_should_invalidate_query_cache() {
 
 		wp_spam_comment( $c );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4922,7 +4920,7 @@ public function test_spammed_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array(), $q->comments );
 	}
 
@@ -4950,7 +4948,7 @@ public function test_unspammed_comment_should_invalidate_query_cache() {
 
 		wp_unspam_comment( $c );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q = new WP_Comment_Query(
 			array(
@@ -4960,7 +4958,7 @@ public function test_unspammed_comment_should_invalidate_query_cache() {
 		);
 
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSameSets( array( $c ), $q->comments );
 	}
 
@@ -4982,7 +4980,7 @@ public function test_count_query_should_miss_noncount_cache() {
 			)
 		);
 
-		$number_of_queries = $wpdb->num_queries;
+		$number_of_queries = get_num_queries();
 
 		$query_2 = $q->query(
 			array(
@@ -4992,7 +4990,7 @@ public function test_count_query_should_miss_noncount_cache() {
 				'count'  => true,
 			)
 		);
-		$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $number_of_queries + 1, get_num_queries() );
 	}
 
 	/**
@@ -5013,7 +5011,7 @@ public function test_count_query_should_hit_count_cache() {
 				'count'  => true,
 			)
 		);
-		$number_of_queries = $wpdb->num_queries;
+		$number_of_queries = get_num_queries();
 
 		$query_2 = $q->query(
 			array(
@@ -5023,7 +5021,7 @@ public function test_count_query_should_hit_count_cache() {
 				'count'  => true,
 			)
 		);
-		$this->assertSame( $number_of_queries, $wpdb->num_queries );
+		$this->assertSame( $number_of_queries, get_num_queries() );
 	}
 
 	/**
@@ -5043,7 +5041,7 @@ public function test_different_values_of_fields_should_share_cached_values() {
 				'order'  => 'ASC',
 			)
 		);
-		$number_of_queries = $wpdb->num_queries;
+		$number_of_queries = get_num_queries();
 
 		$query_2 = $q->query(
 			array(
@@ -5053,7 +5051,7 @@ public function test_different_values_of_fields_should_share_cached_values() {
 			)
 		);
 
-		$this->assertSame( $number_of_queries, $wpdb->num_queries );
+		$this->assertSame( $number_of_queries, get_num_queries() );
 	}
 
 	/**
@@ -5219,7 +5217,7 @@ public function test_comments_pre_query_filter_should_bypass_database_query() {
 
 		add_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query' ), 10, 2 );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q       = new WP_Comment_Query();
 		$results = $q->query( array() );
@@ -5227,7 +5225,7 @@ public function test_comments_pre_query_filter_should_bypass_database_query() {
 		remove_filter( 'comments_pre_query', array( __CLASS__, 'filter_comments_pre_query' ), 10, 2 );
 
 		// Make sure no queries were executed.
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// We manually inserted a non-existing site and overrode the results with it.
 		$this->assertSame( array( 555 ), $results );
diff --git a/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php b/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php
index e478c5dae64d7..28c6e2a25e34f 100644
--- a/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php
+++ b/tests/phpunit/tests/comment/wpCheckCommentDisallowedList.php
@@ -40,6 +40,24 @@ public function test_should_return_true_when_content_with_html_matches_disallowe
 		$this->assertTrue( $result );
 	}
 
+	/**
+	 * @ticket 57207
+	 */
+	public function test_should_return_true_when_content_with_non_latin_words_matches_disallowed_keys() {
+		$author       = 'Setup';
+		$author_email = 'setup@example.com';
+		$author_url   = 'http://example.com';
+		$comment      = 'Установка';
+		$author_ip    = '192.168.0.1';
+		$user_agent   = '';
+
+		update_option( 'disallowed_keys', "установка\nfoo" );
+
+		$result = wp_check_comment_disallowed_list( $author, $author_email, $author_url, $comment, $author_ip, $user_agent );
+
+		$this->assertTrue( $result );
+	}
+
 	public function test_should_return_true_when_author_matches_disallowed_keys() {
 		$author       = 'Sideshow Mel';
 		$author_email = 'mel@example.com';
diff --git a/tests/phpunit/tests/comment/wpCommentsPersonalDataEraser.php b/tests/phpunit/tests/comment/wpCommentsPersonalDataEraser.php
new file mode 100644
index 0000000000000..ef7ccc4091c28
--- /dev/null
+++ b/tests/phpunit/tests/comment/wpCommentsPersonalDataEraser.php
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * @group comment
+ * @group privacy
+ *
+ * @covers ::wp_comments_personal_data_eraser
+ */
+class Tests_Comment_wpCommentsPersonalDataEraser extends WP_UnitTestCase {
+
+	protected static $post_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$post_id = $factory->post->create();
+	}
+
+	/**
+	 * The `wp_comments_personal_data_eraser()` function should erase user's comments.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_comments_personal_data_eraser() {
+
+		$user_id = self::factory()->user->create();
+
+		$args       = array(
+			'user_id'              => $user_id,
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		$comment_id = self::factory()->comment->create( $args );
+
+		wp_comments_personal_data_eraser( $args['comment_author_email'] );
+
+		$comment = get_comment( $comment_id );
+
+		$actual = array(
+			'comment_ID'           => $comment->comment_ID,
+			'user_id'              => $comment->user_id,
+			'comment_author'       => $comment->comment_author,
+			'comment_author_email' => $comment->comment_author_email,
+			'comment_author_url'   => $comment->comment_author_url,
+			'comment_author_IP'    => $comment->comment_author_IP,
+			'comment_date'         => $comment->comment_date,
+			'comment_date_gmt'     => $comment->comment_date_gmt,
+			'comment_agent'        => $comment->comment_agent,
+			'comment_content'      => $comment->comment_content,
+		);
+
+		$expected = array(
+			'comment_ID'           => (string) $comment_id,
+			'user_id'              => '0', // Anonymized.
+			'comment_author'       => 'Anonymous', // Anonymized.
+			'comment_author_email' => '', // Anonymized.
+			'comment_author_url'   => '', // Anonymized.
+			'comment_author_IP'    => '192.168.0.0', // Anonymized.
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_date_gmt'     => '2018-04-14 17:20:00',
+			'comment_agent'        => '', // Anonymized.
+			'comment_content'      => 'Comment Content',
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_eraser()` function's output on an empty first page.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_comments_personal_data_eraser_empty_first_page_output() {
+
+		$actual   = wp_comments_personal_data_eraser( 'nocommentsfound@local.host' );
+		$expected = array(
+			'items_removed'  => false,
+			'items_retained' => false,
+			'messages'       => array(),
+			'done'           => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_eraser()` function's output, for the non-empty first page.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_comments_personal_data_eraser_non_empty_first_page_output() {
+
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		self::factory()->comment->create( $args );
+
+		$actual   = wp_comments_personal_data_eraser( $args['comment_author_email'] );
+		$expected = array(
+			'items_removed'  => true,
+			'items_retained' => false,
+			'messages'       => array(),
+			'done'           => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_eraser()` function's output, for an empty second page.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_comments_personal_data_eraser_empty_second_page_output() {
+
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		self::factory()->comment->create( $args );
+
+		$actual   = wp_comments_personal_data_eraser( $args['comment_author_email'], 2 );
+		$expected = array(
+			'items_removed'  => false,
+			'items_retained' => false,
+			'messages'       => array(),
+			'done'           => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization() {
+
+		$args       = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		$comment_id = self::factory()->comment->create( $args );
+
+		add_filter( 'wp_anonymize_comment', '__return_false' );
+		$actual = wp_comments_personal_data_eraser( $args['comment_author_email'] );
+		remove_filter( 'wp_anonymize_comment', '__return_false' );
+
+		$message = sprintf( 'Comment %d contains personal data but could not be anonymized.', $comment_id );
+
+		$expected = array(
+			'items_removed'  => false,
+			'items_retained' => true,
+			'messages'       => array( $message ),
+			'done'           => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_anonymize_comment` filter, to prevent comment anonymization, with a custom message.
+	 *
+	 * @ticket 43442
+	 */
+	public function test_wp_anonymize_comment_filter_to_prevent_comment_anonymization_with_custom_message() {
+
+		$args       = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		$comment_id = self::factory()->comment->create( $args );
+
+		add_filter( 'wp_anonymize_comment', array( $this, 'wp_anonymize_comment_custom_message' ), 10, 3 );
+		$actual = wp_comments_personal_data_eraser( $args['comment_author_email'] );
+		remove_filter( 'wp_anonymize_comment', array( $this, 'wp_anonymize_comment_custom_message' ) );
+
+		$message = sprintf( 'Some custom message for comment %d.', $comment_id );
+
+		$expected = array(
+			'items_removed'  => false,
+			'items_retained' => true,
+			'messages'       => array( $message ),
+			'done'           => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Callback for the `wp_anonymize_comment` filter.
+	 *
+	 * @param  bool|string $anonymize          Whether to apply the comment anonymization (bool).
+	 *                                         Custom prevention message (string). Default true.
+	 * @param  WP_Comment  $comment            WP_Comment object.
+	 * @param  array       $anonymized_comment Anonymized comment data.
+	 * @return string
+	 */
+	public function wp_anonymize_comment_custom_message( $anonymize, $comment, $anonymized_comment ) {
+		return sprintf( 'Some custom message for comment %d.', $comment->comment_ID );
+	}
+
+	/**
+	 * Testing that `wp_comments_personal_data_eraser()` orders comments by ID.
+	 *
+	 * @ticket 57700
+	 */
+	public function test_wp_comments_personal_data_eraser_orders_comments_by_id() {
+
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-04-14 17:20:00',
+			'comment_agent'        => 'COMMENT_AGENT',
+			'comment_content'      => 'Comment Content',
+		);
+		self::factory()->comment->create( $args );
+
+		$filter = new MockAction();
+		add_filter( 'comments_clauses', array( &$filter, 'filter' ) );
+
+		wp_comments_personal_data_eraser( $args['comment_author_email'] );
+
+		$clauses = $filter->get_args()[0][0];
+
+		$this->assertStringContainsString( 'comment_ID', $clauses['orderby'] );
+	}
+}
diff --git a/tests/phpunit/tests/comment/wpCommentsPersonalDataExporter.php b/tests/phpunit/tests/comment/wpCommentsPersonalDataExporter.php
new file mode 100644
index 0000000000000..f3fce0f80415a
--- /dev/null
+++ b/tests/phpunit/tests/comment/wpCommentsPersonalDataExporter.php
@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * @group comment
+ * @group privacy
+ *
+ * @covers ::wp_comments_personal_data_exporter
+ */
+class Tests_Comment_wpCommentsPersonalDataExporter extends WP_UnitTestCase {
+
+	protected static $post_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$post_id = $factory->post->create();
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_exporter()` function.
+	 *
+	 * @ticket 43440
+	 */
+	public function test_wp_comments_personal_data_exporter() {
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_agent'        => 'SOME_AGENT',
+			'comment_date'         => '2018-03-28 20:05:00',
+			'comment_content'      => 'Comment',
+		);
+
+		$comment_id = self::factory()->comment->create( $args );
+
+		$actual   = wp_comments_personal_data_exporter( $args['comment_author_email'] );
+		$expected = $args;
+
+		$this->assertTrue( $actual['done'] );
+
+		// Number of exported comments.
+		$this->assertCount( 1, $actual['data'] );
+
+		// Number of exported comment properties.
+		$this->assertCount( 8, $actual['data'][0]['data'] );
+
+		// Exported group.
+		$this->assertSame( 'comments', $actual['data'][0]['group_id'] );
+		$this->assertSame( 'Comments', $actual['data'][0]['group_label'] );
+
+		// Exported comment properties.
+		$this->assertSame( $expected['comment_author'], $actual['data'][0]['data'][0]['value'] );
+		$this->assertSame( $expected['comment_author_email'], $actual['data'][0]['data'][1]['value'] );
+		$this->assertSame( $expected['comment_author_url'], $actual['data'][0]['data'][2]['value'] );
+		$this->assertSame( $expected['comment_author_IP'], $actual['data'][0]['data'][3]['value'] );
+		$this->assertSame( $expected['comment_agent'], $actual['data'][0]['data'][4]['value'] );
+		$this->assertSame( $expected['comment_date'], $actual['data'][0]['data'][5]['value'] );
+		$this->assertSame( $expected['comment_content'], $actual['data'][0]['data'][6]['value'] );
+		$this->assertSame( esc_html( get_comment_link( $comment_id ) ), strip_tags( $actual['data'][0]['data'][7]['value'] ) );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_exporter()` function for no comments found.
+	 *
+	 * @ticket 43440
+	 */
+	public function test_wp_comments_personal_data_exporter_no_comments_found() {
+
+		$actual = wp_comments_personal_data_exporter( 'nocommentsfound@local.host' );
+
+		$expected = array(
+			'data' => array(),
+			'done' => true,
+		);
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_exporter()` function for an empty comment property.
+	 *
+	 * @ticket 43440
+	 */
+	public function test_wp_comments_personal_data_exporter_empty_comment_prop() {
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-03-28 20:05:00',
+			'comment_agent'        => '',
+			'comment_content'      => 'Comment',
+		);
+
+		$c = self::factory()->comment->create( $args );
+
+		$actual = wp_comments_personal_data_exporter( $args['comment_author_email'] );
+
+		$this->assertTrue( $actual['done'] );
+
+		// Number of exported comments.
+		$this->assertCount( 1, $actual['data'] );
+
+		// Number of exported comment properties.
+		$this->assertCount( 7, $actual['data'][0]['data'] );
+	}
+
+	/**
+	 * Testing the `wp_comments_personal_data_exporter()` function with an empty second page.
+	 *
+	 * @ticket 43440
+	 */
+	public function test_wp_comments_personal_data_exporter_empty_second_page() {
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-03-28 20:05:00',
+			'comment_agent'        => 'SOME_AGENT',
+			'comment_content'      => 'Comment',
+		);
+
+		$c = self::factory()->comment->create( $args );
+
+		$actual = wp_comments_personal_data_exporter( $args['comment_author_email'], 2 );
+
+		$this->assertTrue( $actual['done'] );
+
+		// Number of exported comments.
+		$this->assertCount( 0, $actual['data'] );
+	}
+
+	/**
+	 * Testing that `wp_comments_personal_data_exporter()` orders comments by ID.
+	 *
+	 * @ticket 57700
+	 */
+	public function test_wp_comments_personal_data_exporter_orders_comments_by_id() {
+
+		$args = array(
+			'comment_post_ID'      => self::$post_id,
+			'comment_author'       => 'Comment Author',
+			'comment_author_email' => 'personal@local.host',
+			'comment_author_url'   => 'https://local.host/',
+			'comment_author_IP'    => '192.168.0.1',
+			'comment_date'         => '2018-03-28 20:05:00',
+			'comment_agent'        => 'SOME_AGENT',
+			'comment_content'      => 'Comment',
+		);
+		self::factory()->comment->create( $args );
+
+		$filter = new MockAction();
+		add_filter( 'comments_clauses', array( &$filter, 'filter' ) );
+
+		wp_comments_personal_data_exporter( $args['comment_author_email'] );
+
+		$clauses = $filter->get_args()[0][0];
+
+		$this->assertStringContainsString( 'comment_ID', $clauses['orderby'] );
+	}
+}
diff --git a/tests/phpunit/tests/comment/wpHandleCommentSubmission.php b/tests/phpunit/tests/comment/wpHandleCommentSubmission.php
index e4ec77af7a320..ff2f3c8b7a256 100644
--- a/tests/phpunit/tests/comment/wpHandleCommentSubmission.php
+++ b/tests/phpunit/tests/comment/wpHandleCommentSubmission.php
@@ -882,4 +882,124 @@ public function test_comments_flood_user_is_admin() {
 		$this->assertNotWPError( $second_comment );
 		$this->assertEquals( self::$post->ID, $second_comment->comment_post_ID );
 	}
+
+	/**
+	 * Tests that wp_handle_comment_submission() only allows replying to
+	 * an approved parent comment.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_should_only_allow_replying_to_an_approved_parent_comment
+	 *
+	 * @param int $approved Whether the parent comment is approved.
+	 */
+	public function test_should_only_allow_replying_to_an_approved_parent_comment( $approved ) {
+		wp_set_current_user( self::$editor_id );
+
+		$comment_parent = self::factory()->comment->create(
+			array(
+				'comment_post_ID'  => self::$post->ID,
+				'comment_approved' => $approved,
+			)
+		);
+
+		$comment = wp_handle_comment_submission(
+			array(
+				'comment_post_ID'      => self::$post->ID,
+				'comment_author'       => 'A comment author',
+				'comment_author_email' => 'comment_author@example.org',
+				'comment'              => 'Howdy, comment!',
+				'comment_parent'       => $comment_parent,
+			)
+		);
+
+		if ( $approved ) {
+			$this->assertInstanceOf(
+				'WP_Comment',
+				$comment,
+				'The comment was not submitted.'
+			);
+		} else {
+			$this->assertWPError( $comment, 'The comment was submitted.' );
+			$this->assertSame(
+				'comment_reply_to_unapproved_comment',
+				$comment->get_error_code(),
+				'The wrong error code was returned.'
+			);
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_only_allow_replying_to_an_approved_parent_comment() {
+		return array(
+			'an approved parent comment'   => array( 'approved' => 1 ),
+			'an unapproved parent comment' => array( 'approved' => 0 ),
+		);
+	}
+
+	/**
+	 * Tests that wp_handle_comment_submission() only allows replying to
+	 * an existing parent comment.
+	 *
+	 * @ticket 53962
+	 *
+	 * @dataProvider data_should_only_allow_replying_to_an_existing_parent_comment
+	 *
+	 * @param bool $exists Whether the parent comment exists.
+	 */
+	public function test_should_only_allow_replying_to_an_existing_parent_comment( $exists ) {
+		wp_set_current_user( self::$editor_id );
+
+		$parent_comment = -99999;
+
+		if ( $exists ) {
+			$parent_comment = self::factory()->comment->create(
+				array(
+					'comment_post_ID'  => self::$post->ID,
+					'comment_approved' => 1,
+				)
+			);
+		}
+
+		$comment = wp_handle_comment_submission(
+			array(
+				'comment_post_ID'      => self::$post->ID,
+				'comment_author'       => 'A comment author',
+				'comment_author_email' => 'comment_author@example.org',
+				'comment'              => 'Howdy, comment!',
+				'comment_parent'       => $parent_comment,
+			)
+		);
+
+		if ( $exists ) {
+			$this->assertInstanceOf(
+				'WP_Comment',
+				$comment,
+				'The comment was not submitted.'
+			);
+		} else {
+			$this->assertWPError( $comment, 'The comment was submitted.' );
+			$this->assertSame(
+				'comment_reply_to_unapproved_comment',
+				$comment->get_error_code(),
+				'The wrong error code was returned.'
+			);
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_only_allow_replying_to_an_existing_parent_comment() {
+		return array(
+			'an existing parent comment'    => array( 'exists' => true ),
+			'a non-existent parent comment' => array( 'exists' => false ),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
index 42af1b0b5c49d..76f890f90f593 100644
--- a/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
+++ b/tests/phpunit/tests/comment/wpUpdateCommentCountNow.php
@@ -14,16 +14,14 @@ public function test_invalid_post_bails_early() {
 	}
 
 	public function test_regular_post_updates_comment_count() {
-		global $wpdb;
-
 		$post_id = self::factory()->post->create();
 
 		self::factory()->comment->create_post_comments( $post_id, 1 );
 		$this->assertSame( '1', get_comments_number( $post_id ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( wp_update_comment_count_now( $post_id ) );
-		$this->assertSame( $num_queries + 2, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 2, get_num_queries() );
 
 		$this->assertSame( '1', get_comments_number( $post_id ) );
 	}
@@ -38,10 +36,10 @@ public function test_using_filter_adjusts_comment_count_without_an_additional_da
 		self::factory()->comment->create_post_comments( $post_id, 1 );
 		$this->assertSame( '100', get_comments_number( $post_id ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( wp_update_comment_count_now( $post_id ) );
 		// Only one query is made instead of two.
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
 		$this->assertSame( '100', get_comments_number( $post_id ) );
 
diff --git a/tests/phpunit/tests/compat/mbStrlen.php b/tests/phpunit/tests/compat/mbStrlen.php
index e34b44534b1e4..bb77e5f2d3668 100644
--- a/tests/phpunit/tests/compat/mbStrlen.php
+++ b/tests/phpunit/tests/compat/mbStrlen.php
@@ -17,26 +17,26 @@ public function test_mb_strlen_availability() {
 	}
 
 	/**
-	 * @dataProvider utf8_string_lengths
+	 * @dataProvider data_utf8_string_lengths
 	 */
-	public function test_mb_strlen( $string, $expected_character_length ) {
-		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+	public function test_mb_strlen( $input_string, $expected_character_length ) {
+		$this->assertSame( $expected_character_length, _mb_strlen( $input_string, 'UTF-8' ) );
 	}
 
 	/**
-	 * @dataProvider utf8_string_lengths
+	 * @dataProvider data_utf8_string_lengths
 	 */
-	public function test_mb_strlen_via_regex( $string, $expected_character_length ) {
+	public function test_mb_strlen_via_regex( $input_string, $expected_character_length ) {
 		_wp_can_use_pcre_u( false );
-		$this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+		$this->assertSame( $expected_character_length, _mb_strlen( $input_string, 'UTF-8' ) );
 		_wp_can_use_pcre_u( 'reset' );
 	}
 
 	/**
-	 * @dataProvider utf8_string_lengths
+	 * @dataProvider data_utf8_string_lengths
 	 */
-	public function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) {
-		$this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) );
+	public function test_8bit_mb_strlen( $input_string, $expected_character_length, $expected_byte_length ) {
+		$this->assertSame( $expected_byte_length, _mb_strlen( $input_string, '8bit' ) );
 	}
 
 	/**
@@ -44,45 +44,45 @@ public function test_8bit_mb_strlen( $string, $expected_character_length, $expec
 	 *
 	 * @return array
 	 */
-	public function utf8_string_lengths() {
+	public function data_utf8_string_lengths() {
 		return array(
 			array(
-				'string'                    => 'баба',
+				'input_string'              => 'баба',
 				'expected_character_length' => 4,
 				'expected_byte_length'      => 8,
 			),
 			array(
-				'string'                    => 'баб',
+				'input_string'              => 'баб',
 				'expected_character_length' => 3,
 				'expected_byte_length'      => 6,
 			),
 			array(
-				'string'                    => 'I am your б',
+				'input_string'              => 'I am your б',
 				'expected_character_length' => 11,
 				'expected_byte_length'      => 12,
 			),
 			array(
-				'string'                    => '1111111111',
+				'input_string'              => '1111111111',
 				'expected_character_length' => 10,
 				'expected_byte_length'      => 10,
 			),
 			array(
-				'string'                    => '²²²²²²²²²²',
+				'input_string'              => '²²²²²²²²²²',
 				'expected_character_length' => 10,
 				'expected_byte_length'      => 20,
 			),
 			array(
-				'string'                    => '３３３３３３３３３３',
+				'input_string'              => '３３３３３３３３３３',
 				'expected_character_length' => 10,
 				'expected_byte_length'      => 30,
 			),
 			array(
-				'string'                    => '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜',
+				'input_string'              => '𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜𝟜',
 				'expected_character_length' => 10,
 				'expected_byte_length'      => 40,
 			),
 			array(
-				'string'                    => '1²３𝟜1²３𝟜1²３𝟜',
+				'input_string'              => '1²３𝟜1²３𝟜1²３𝟜',
 				'expected_character_length' => 12,
 				'expected_byte_length'      => 30,
 			),
diff --git a/tests/phpunit/tests/compat/mbSubstr.php b/tests/phpunit/tests/compat/mbSubstr.php
index f03f5f0f193bf..ddf7e662fb71a 100644
--- a/tests/phpunit/tests/compat/mbSubstr.php
+++ b/tests/phpunit/tests/compat/mbSubstr.php
@@ -17,26 +17,26 @@ public function test_mb_substr_availability() {
 	}
 
 	/**
-	 * @dataProvider utf8_substrings
+	 * @dataProvider data_utf8_substrings
 	 */
-	public function test_mb_substr( $string, $start, $length, $expected_character_substring ) {
-		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+	public function test_mb_substr( $input_string, $start, $length, $expected_character_substring ) {
+		$this->assertSame( $expected_character_substring, _mb_substr( $input_string, $start, $length, 'UTF-8' ) );
 	}
 
 	/**
-	 * @dataProvider utf8_substrings
+	 * @dataProvider data_utf8_substrings
 	 */
-	public function test_mb_substr_via_regex( $string, $start, $length, $expected_character_substring ) {
+	public function test_mb_substr_via_regex( $input_string, $start, $length, $expected_character_substring ) {
 		_wp_can_use_pcre_u( false );
-		$this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+		$this->assertSame( $expected_character_substring, _mb_substr( $input_string, $start, $length, 'UTF-8' ) );
 		_wp_can_use_pcre_u( 'reset' );
 	}
 
 	/**
-	 * @dataProvider utf8_substrings
+	 * @dataProvider data_utf8_substrings
 	 */
-	public function test_8bit_mb_substr( $string, $start, $length, $expected_character_substring, $expected_byte_substring ) {
-		$this->assertSame( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );
+	public function test_8bit_mb_substr( $input_string, $start, $length, $expected_character_substring, $expected_byte_substring ) {
+		$this->assertSame( $expected_byte_substring, _mb_substr( $input_string, $start, $length, '8bit' ) );
 	}
 
 	/**
@@ -44,52 +44,52 @@ public function test_8bit_mb_substr( $string, $start, $length, $expected_charact
 	 *
 	 * @return array
 	 */
-	public function utf8_substrings() {
+	public function data_utf8_substrings() {
 		return array(
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => 0,
 				'length'                       => 3,
 				'expected_character_substring' => 'баб',
 				'expected_byte_substring'      => "б\xD0",
 			),
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => 0,
 				'length'                       => -1,
 				'expected_character_substring' => 'баб',
 				'expected_byte_substring'      => "баб\xD0",
 			),
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => 1,
 				'length'                       => null,
 				'expected_character_substring' => 'аба',
 				'expected_byte_substring'      => "\xB1аба",
 			),
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => -3,
 				'length'                       => null,
 				'expected_character_substring' => 'аба',
 				'expected_byte_substring'      => "\xB1а",
 			),
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => -3,
 				'length'                       => 2,
 				'expected_character_substring' => 'аб',
 				'expected_byte_substring'      => "\xB1\xD0",
 			),
 			array(
-				'string'                       => 'баба',
+				'input_string'                 => 'баба',
 				'start'                        => -1,
 				'length'                       => 2,
 				'expected_character_substring' => 'а',
 				'expected_byte_substring'      => "\xB0",
 			),
 			array(
-				'string'                       => 'I am your баба',
+				'input_string'                 => 'I am your баба',
 				'start'                        => 0,
 				'length'                       => 11,
 				'expected_character_substring' => 'I am your б',
diff --git a/tests/phpunit/tests/cron.php b/tests/phpunit/tests/cron.php
index ebb709fec97a1..e5ecee093b1b6 100644
--- a/tests/phpunit/tests/cron.php
+++ b/tests/phpunit/tests/cron.php
@@ -456,7 +456,7 @@ public function test_pre_schedule_event_filter() {
 	/**
 	 * Filter the scheduling of events to use the preflight array.
 	 */
-	public function filter_pre_schedule_event_filter( $null, $event ) {
+	public function filter_pre_schedule_event_filter( $result, $event ) {
 		$key = md5( serialize( $event->args ) );
 
 		$this->preflight_cron_array[ $event->timestamp ][ $event->hook ][ $key ] = array(
@@ -465,6 +465,7 @@ public function filter_pre_schedule_event_filter( $null, $event ) {
 			'args'     => $event->args,
 		);
 		uksort( $this->preflight_cron_array, 'strnatcasecmp' );
+
 		return true;
 	}
 
diff --git a/tests/phpunit/tests/customize/control.php b/tests/phpunit/tests/customize/control.php
index 2131bdc844cca..d472eacad920a 100644
--- a/tests/phpunit/tests/customize/control.php
+++ b/tests/phpunit/tests/customize/control.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * Test_WP_Customize_Control tests.
+ * Tests for the Test_WP_Customize_Control class.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the Test_WP_Customize_Control class.
  *
  * @todo This is missing dedicated tests for all but one of the methods.
  *
diff --git a/tests/phpunit/tests/customize/custom-css-setting.php b/tests/phpunit/tests/customize/custom-css-setting.php
index f651b509a85e5..015b6308af306 100644
--- a/tests/phpunit/tests/customize/custom-css-setting.php
+++ b/tests/phpunit/tests/customize/custom-css-setting.php
@@ -25,7 +25,7 @@ class Test_WP_Customize_Custom_CSS_Setting extends WP_UnitTestCase {
 	/**
 	 * Set up the test case.
 	 *
-	 * @see WP_UnitTestCase::setup()
+	 * @see WP_UnitTestCase_Base::set_up()
 	 */
 	public function set_up() {
 		parent::set_up();
diff --git a/tests/phpunit/tests/customize/manager.php b/tests/phpunit/tests/customize/manager.php
index 4eb333716b258..d42133a1ba481 100644
--- a/tests/phpunit/tests/customize/manager.php
+++ b/tests/phpunit/tests/customize/manager.php
@@ -271,7 +271,7 @@ public function test_setup_theme_in_customize_admin() {
 	 * @ticket 41039
 	 */
 	public function test_fresh_site_flag_clearing() {
-		global $wp_customize, $wpdb;
+		global $wp_customize;
 
 		// Make sure fresh site flag is cleared when publishing a changeset.
 		update_option( 'fresh_site', '1' );
@@ -283,9 +283,9 @@ public function test_fresh_site_flag_clearing() {
 		wp_load_alloptions();
 
 		// Make sure no DB write is done when publishing and a site is already non-fresh.
-		$query_count = $wpdb->num_queries;
+		$query_count = get_num_queries();
 		do_action( 'customize_save_after', $wp_customize );
-		$this->assertSame( $query_count, $wpdb->num_queries );
+		$this->assertSame( $query_count, get_num_queries() );
 	}
 
 	/**
@@ -764,7 +764,7 @@ public function test_import_theme_starter_content() {
 
 		/*
 		 * Test that adding blogname starter content is ignored now that it is modified,
-		 * but updating a non-modified starter content blog description passes.
+		 * but updating a non-modified starter content site description passes.
 		 */
 		$previous_blogname        = $changeset_data['blogname']['value'];
 		$previous_blogdescription = $changeset_data['blogdescription']['value'];
@@ -3339,45 +3339,45 @@ public function test_add_setting_honoring_dynamic() {
 		$setting_id = 'dynamic';
 		$setting    = $manager->add_setting( $setting_id );
 		$this->assertSame( 'WP_Customize_Setting', get_class( $setting ) );
-		$this->assertObjectNotHasAttribute( 'custom', $setting );
+		$this->assertObjectNotHasProperty( 'custom', $setting );
 		$manager->remove_setting( $setting_id );
 
 		add_filter( 'customize_dynamic_setting_class', array( $this, 'return_dynamic_customize_setting_class' ), 10, 3 );
 		add_filter( 'customize_dynamic_setting_args', array( $this, 'return_dynamic_customize_setting_args' ), 10, 2 );
 		$setting = $manager->add_setting( $setting_id );
 		$this->assertSame( 'Test_Dynamic_Customize_Setting', get_class( $setting ) );
-		$this->assertObjectHasAttribute( 'custom', $setting );
+		$this->assertObjectHasProperty( 'custom', $setting );
 		$this->assertSame( 'foo', $setting->custom );
 	}
 
 	/**
-	 * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
+	 * Returns 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class'.
 	 *
-	 * @param string $class Setting class.
-	 * @param array  $args  Setting args.
-	 * @param string $id    Setting ID.
-	 * @return string       Setting class.
+	 * @param string $setting_class Setting class.
+	 * @param array  $setting_args  Setting args.
+	 * @param string $setting_id    Setting ID.
+	 * @return string Setting class.
 	 */
-	public function return_dynamic_customize_setting_class( $class, $id, $args ) {
-		unset( $args );
-		if ( 0 === strpos( $id, 'dynamic' ) ) {
-			$class = 'Test_Dynamic_Customize_Setting';
+	public function return_dynamic_customize_setting_class( $setting_class, $setting_id, $setting_args ) {
+		unset( $setting_args );
+		if ( 0 === strpos( $setting_id, 'dynamic' ) ) {
+			$setting_class = 'Test_Dynamic_Customize_Setting';
 		}
-		return $class;
+		return $setting_class;
 	}
 
 	/**
-	 * Return 'Test_Dynamic_Customize_Setting' in 'customize_dynamic_setting_class.
+	 * Returns 'foo' in 'customize_dynamic_setting_args'.
 	 *
-	 * @param array  $args Setting args.
-	 * @param string $id   Setting ID.
-	 * @return string      Setting args.
+	 * @param array  $setting_args Setting args.
+	 * @param string $setting_id   Setting ID.
+	 * @return array Setting args.
 	 */
-	public function return_dynamic_customize_setting_args( $args, $id ) {
-		if ( 0 === strpos( $id, 'dynamic' ) ) {
-			$args['custom'] = 'foo';
+	public function return_dynamic_customize_setting_args( $setting_args, $setting_id ) {
+		if ( 0 === strpos( $setting_id, 'dynamic' ) ) {
+			$setting_args['custom'] = 'foo';
 		}
-		return $args;
+		return $setting_args;
 	}
 
 	/**
diff --git a/tests/phpunit/tests/customize/nav-menu-item-setting.php b/tests/phpunit/tests/customize/nav-menu-item-setting.php
index 212f871747ad1..22d4bc7de7de4 100644
--- a/tests/phpunit/tests/customize/nav-menu-item-setting.php
+++ b/tests/phpunit/tests/customize/nav-menu-item-setting.php
@@ -16,7 +16,7 @@ class Test_WP_Customize_Nav_Menu_Item_Setting extends WP_UnitTestCase {
 	/**
 	 * Set up a test case.
 	 *
-	 * @see WP_UnitTestCase::setup()
+	 * @see WP_UnitTestCase_Base::set_up()
 	 */
 	public function set_up() {
 		parent::set_up();
@@ -926,17 +926,17 @@ public function test_value_as_wp_post_nav_menu_item() {
 		$nav_menu_item = $setting->value_as_wp_post_nav_menu_item();
 		$this->assertSame( 'Custom Label', $nav_menu_item->type_label );
 
-		$this->assertObjectNotHasAttribute( 'nav_menu_term_id', $nav_menu_item );
-		$this->assertObjectNotHasAttribute( 'status', $nav_menu_item );
+		$this->assertObjectNotHasProperty( 'nav_menu_term_id', $nav_menu_item );
+		$this->assertObjectNotHasProperty( 'status', $nav_menu_item );
 		$this->assertSame( 'publish', $nav_menu_item->post_status );
 		$this->assertSame( 'nav_menu_item', $nav_menu_item->post_type );
-		$this->assertObjectNotHasAttribute( 'position', $nav_menu_item );
+		$this->assertObjectNotHasProperty( 'position', $nav_menu_item );
 		$this->assertSame( $post_value['position'], $nav_menu_item->menu_order );
 		$this->assertSame( $post_value['title'], $nav_menu_item->post_title );
 		$this->assertSame( 123, $nav_menu_item->ID );
 		$this->assertSame( 123, $nav_menu_item->db_id );
 		$this->assertSame( wp_get_current_user()->ID, $nav_menu_item->post_author );
-		$this->assertObjectHasAttribute( 'type_label', $nav_menu_item );
+		$this->assertObjectHasProperty( 'type_label', $nav_menu_item );
 		$expected = apply_filters( 'nav_menu_attr_title', wp_unslash( apply_filters( 'excerpt_save_pre', wp_slash( $post_value['attr_title'] ) ) ) );
 		$this->assertSame( $expected, $nav_menu_item->attr_title );
 		$this->assertSame( 'Attempted \o/ o&#8217;o markup', $nav_menu_item->description );
@@ -1070,7 +1070,7 @@ public function test_get_original_title() {
 		$this->assertSame( $original_post_title, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( $original_post_title, $item->original_title );
 		$this->assertSame( $original_post_title, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
@@ -1097,7 +1097,7 @@ public function test_get_original_title() {
 		$this->assertSame( $original_post_title, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( $original_post_title, $item->original_title );
 		$this->assertSame( $original_post_title, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
@@ -1124,7 +1124,7 @@ public function test_get_original_title() {
 		$this->assertSame( $original_term_title, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( $original_term_title, $item->original_title );
 		$this->assertSame( $original_term_title, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
@@ -1151,7 +1151,7 @@ public function test_get_original_title() {
 		$this->assertSame( $original_term_title, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( $original_term_title, $item->original_title );
 		$this->assertSame( $original_term_title, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
@@ -1177,7 +1177,7 @@ public function test_get_original_title() {
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
@@ -1203,7 +1203,7 @@ public function test_get_original_title() {
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item_value['original_title'] );
 		$this->assertSame( '', $item_value['title'] );
 		$item = $setting->value_as_wp_post_nav_menu_item();
-		$this->assertObjectHasAttribute( 'type_label', $item );
+		$this->assertObjectHasProperty( 'type_label', $item );
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->original_title );
 		$this->assertSame( get_post_type_object( 'press_release' )->labels->archives, $item->title );
 		$this->assertArrayHasKey( 'type_label', $item_value );
diff --git a/tests/phpunit/tests/customize/nav-menu-setting.php b/tests/phpunit/tests/customize/nav-menu-setting.php
index 4a727618ebec3..6d50c96ee0c62 100644
--- a/tests/phpunit/tests/customize/nav-menu-setting.php
+++ b/tests/phpunit/tests/customize/nav-menu-setting.php
@@ -17,7 +17,7 @@ class Test_WP_Customize_Nav_Menu_Setting extends WP_UnitTestCase {
 	/**
 	 * Set up a test case.
 	 *
-	 * @see WP_UnitTestCase::setup()
+	 * @see WP_UnitTestCase_Base::set_up()
 	 */
 	public function set_up() {
 		parent::set_up();
diff --git a/tests/phpunit/tests/customize/nav-menus.php b/tests/phpunit/tests/customize/nav-menus.php
index 5785558103c95..6cc8f3d08c5b6 100644
--- a/tests/phpunit/tests/customize/nav-menus.php
+++ b/tests/phpunit/tests/customize/nav-menus.php
@@ -17,7 +17,7 @@ class Test_WP_Customize_Nav_Menus extends WP_UnitTestCase {
 	/**
 	 * Set up a test case.
 	 *
-	 * @see WP_UnitTestCase::setup()
+	 * @see WP_UnitTestCase_Base::set_up()
 	 */
 	public function set_up() {
 		parent::set_up();
@@ -57,18 +57,18 @@ public function filter_item_types( $items ) {
 	/**
 	 * Filter to add custom menu items.
 	 *
-	 * @param array  $items  The menu items.
-	 * @param string $type   The object type (e.g. taxonomy).
-	 * @param string $object The object name (e.g. category).
+	 * @param array  $items       The menu items.
+	 * @param string $object_type The object type (e.g. taxonomy).
+	 * @param string $object_name The object name (e.g. category).
 	 * @return array Menu items.
 	 */
-	public function filter_items( $items, $type, $object ) {
+	public function filter_items( $items, $object_type, $object_name ) {
 		$items[] = array(
 			'id'         => 'custom-1',
 			'title'      => 'Cool beans',
-			'type'       => $type,
+			'type'       => $object_type,
 			'type_label' => 'Custom Label',
-			'object'     => $object,
+			'object'     => $object_name,
 			'url'        => home_url( '/cool-beans/' ),
 			'classes'    => 'custom-menu-item cool-beans',
 		);
diff --git a/tests/phpunit/tests/customize/partial.php b/tests/phpunit/tests/customize/partial.php
index 5e173a8acf37c..9fc4a478a49b1 100644
--- a/tests/phpunit/tests/customize/partial.php
+++ b/tests/phpunit/tests/customize/partial.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * Test_WP_Customize_Partial tests.
+ * Tests for the Test_WP_Customize_Partial class.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the Test_WP_Customize_Partial class.
  *
  * @group customize
  */
diff --git a/tests/phpunit/tests/customize/selective-refresh-ajax.php b/tests/phpunit/tests/customize/selective-refresh-ajax.php
index 040697d419e1b..cb225498f39b6 100644
--- a/tests/phpunit/tests/customize/selective-refresh-ajax.php
+++ b/tests/phpunit/tests/customize/selective-refresh-ajax.php
@@ -1,19 +1,15 @@
 <?php
-/**
- * WP_Customize_Selective_Refresh Ajax tests.
- *
- * @package    WordPress
- * @subpackage UnitTests
- */
-
 /**
  * Tests for the WP_Customize_Selective_Refresh class Ajax.
  *
  * Note that this is intentionally not extending WP_Ajax_UnitTestCase because it
  * is not admin ajax.
  *
- * @since      4.5.0
- * @group      ajax
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 4.5.0
+ *
+ * @group ajax
  */
 class Test_WP_Customize_Selective_Refresh_Ajax extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/customize/selective-refresh.php b/tests/phpunit/tests/customize/selective-refresh.php
index b3cf7fd84aaf4..af2239fe60a1b 100644
--- a/tests/phpunit/tests/customize/selective-refresh.php
+++ b/tests/phpunit/tests/customize/selective-refresh.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * WP_Customize_Selective_Refresh tests.
+ * Tests for the WP_Customize_Selective_Refresh class.
  *
  * @package WordPress
- */
-
-/**
- * Tests for the WP_Customize_Selective_Refresh class.
  *
  * @group customize
  */
diff --git a/tests/phpunit/tests/customize/setting.php b/tests/phpunit/tests/customize/setting.php
index 7645ec4c6afdd..ef7ea0d93a081 100644
--- a/tests/phpunit/tests/customize/setting.php
+++ b/tests/phpunit/tests/customize/setting.php
@@ -316,13 +316,13 @@ public function test_preview_standard_types_multidimensional() {
 	 */
 	protected $custom_type_data_previewed;
 
-	private function custom_type_getter( $name, $default = null ) {
+	private function custom_type_getter( $name, $default_value = null ) {
 		if ( did_action( "customize_preview_{$name}" ) && array_key_exists( $name, $this->custom_type_data_previewed ) ) {
 			$value = $this->custom_type_data_previewed[ $name ];
 		} elseif ( array_key_exists( $name, $this->custom_type_data_saved ) ) {
 			$value = $this->custom_type_data_saved[ $name ];
 		} else {
-			$value = $default;
+			$value = $default_value;
 		}
 		return $value;
 	}
@@ -334,17 +334,17 @@ private function custom_type_setter( $name, $value ) {
 	/**
 	 * Filter for `customize_value_{$id_base}`.
 	 *
-	 * @param mixed $default
+	 * @param mixed $default_value
 	 * @param WP_Customize_Setting $setting
 	 *
 	 * @return mixed|null
 	 */
-	public function custom_type_value_filter( $default, $setting = null ) {
+	public function custom_type_value_filter( $default_value, $setting = null ) {
 		$name = preg_replace( '/^customize_value_/', '', current_filter() );
 		$this->assertInstanceOf( 'WP_Customize_Setting', $setting );
 		$id_data = $setting->id_data();
 		$this->assertSame( $name, $id_data['base'] );
-		return $this->custom_type_getter( $name, $default );
+		return $this->custom_type_getter( $name, $default_value );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/customize/widgets.php b/tests/phpunit/tests/customize/widgets.php
index 446bcf5a68ad3..654008a7a9b1a 100644
--- a/tests/phpunit/tests/customize/widgets.php
+++ b/tests/phpunit/tests/customize/widgets.php
@@ -556,7 +556,7 @@ public function test_sanitize_widget_instance_empty_instance() {
 	 */
 	private function get_test_widget_control_args() {
 		global $wp_registered_widgets;
-		require_once ABSPATH . '/wp-admin/includes/widgets.php';
+		require_once ABSPATH . 'wp-admin/includes/widgets.php';
 		$widget_id = 'search-2';
 		$widget    = $wp_registered_widgets[ $widget_id ];
 		$args      = array(
diff --git a/tests/phpunit/tests/date/dateI18n.php b/tests/phpunit/tests/date/dateI18n.php
index dfc98dd369360..544ea9ae47977 100644
--- a/tests/phpunit/tests/date/dateI18n.php
+++ b/tests/phpunit/tests/date/dateI18n.php
@@ -117,10 +117,6 @@ public function test_adjusts_format_based_on_deprecated_timezone_string() {
 		update_option( 'timezone_string', 'America/Buenos_Aires' ); // This timezone was deprecated pre-PHP 5.6.
 
 		$expected = '2022-08-01 00:00:00 -03 -03:00 America/Buenos_Aires';
-		if ( PHP_VERSION_ID < 70000 ) {
-			// PHP 5.6.
-			$expected = '2022-08-01 00:00:00 ART -03:00 America/Buenos_Aires';
-		}
 
 		$this->assertSame( $expected, date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2022-08-01 00:00:00' ) ) );
 	}
@@ -203,7 +199,7 @@ public function test_should_handle_escaped_formats() {
 	/**
 	 * @ticket 25768
 	 *
-	 * @dataProvider dst_times
+	 * @dataProvider data_should_handle_dst
 	 *
 	 * @param string $time     Time to test in Y-m-d H:i:s format.
 	 * @param string $timezone PHP timezone string to use.
@@ -219,7 +215,7 @@ public function test_should_handle_dst( $time, $timezone ) {
 		$this->assertSame( $datetime->format( $format ), date_i18n( $format, $wp_timestamp ) );
 	}
 
-	public function dst_times() {
+	public function data_should_handle_dst() {
 		return array(
 			'Before DST start' => array( '2019-03-31 02:59:00', 'Europe/Helsinki' ),
 			'After DST start'  => array( '2019-03-31 04:01:00', 'Europe/Helsinki' ),
diff --git a/tests/phpunit/tests/date/query.php b/tests/phpunit/tests/date/query.php
index 613d74957beb9..7fc21f3878462 100644
--- a/tests/phpunit/tests/date/query.php
+++ b/tests/phpunit/tests/date/query.php
@@ -531,7 +531,7 @@ public function test_build_mysql_datetime_datetime_non_array() {
 	/**
 	 * @ticket 41782
 	 *
-	 * @dataProvider mysql_datetime_input_provider
+	 * @dataProvider data_build_mysql_datetime
 	 *
 	 * @param array|string $datetime       Array or string date input.
 	 * @param string       $expected       Expected built result.
@@ -546,7 +546,7 @@ public function test_build_mysql_datetime( $datetime, $expected, $default_to_max
 		$this->assertEqualsWithDelta( strtotime( $expected ), strtotime( $found ), 10, $message );
 	}
 
-	public function mysql_datetime_input_provider() {
+	public function data_build_mysql_datetime() {
 		return array(
 			array( '2019-06-04T08:18:24+03:00', '2019-06-04 05:18:24' ),
 			array( '2019-06-04T05:18:24+00:00', '2019-06-04 05:18:24' ),
@@ -564,7 +564,7 @@ public function mysql_datetime_input_provider() {
 	/**
 	 * @ticket 41782
 	 *
-	 * @dataProvider mysql_datetime_input_provider_custom_timezone
+	 * @dataProvider data_build_mysql_datetime_with_custom_timezone
 	 *
 	 * @param array|string $datetime       Array or string date input.
 	 * @param string       $expected       Expected built result.
@@ -582,7 +582,7 @@ public function test_build_mysql_datetime_with_custom_timezone( $datetime, $expe
 
 	}
 
-	public function mysql_datetime_input_provider_custom_timezone() {
+	public function data_build_mysql_datetime_with_custom_timezone() {
 		return array(
 			array( '2019-06-04T08:18:24+03:00', '2019-06-04 08:18:24' ),
 			array( '2019-06-04T05:18:24+00:00', '2019-06-04 08:18:24' ),
@@ -1186,7 +1186,7 @@ public function test_relation_in_query_and() {
 
 		$parts = mb_split( '\)\s+AND\s+\(', $sql );
 		$this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator AND.' );
-		$this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
+		$this->assertSame( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
 
 		$this->assertStringNotContainsString( 'OR', $sql, 'SQL query contains conditions joined by operator OR.' );
 	}
@@ -1233,7 +1233,7 @@ public function test_relation_in_query_or() {
 
 		$parts = mb_split( '\)\s+OR\s+\(', $sql );
 		$this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator OR.' );
-		$this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of OR operators.' );
+		$this->assertSame( 2, count( $parts ), 'SQL query does not contain correct number of OR operators.' );
 
 		// Checking number of occurrences of AND while skipping the one at the beginning.
 		$this->assertSame( 2, substr_count( substr( $sql, 5 ), 'AND' ), 'SQL query does not contain expected number conditions joined by operator AND.' );
@@ -1279,7 +1279,7 @@ public function test_relation_in_query_unsupported() {
 
 		$parts = mb_split( '\)\s+AND\s+\(', $sql );
 		$this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator AND.' );
-		$this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
+		$this->assertSame( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
 
 		$this->assertStringNotContainsString( 'OR', $sql, 'SQL query contains conditions joined by operator OR.' );
 	}
diff --git a/tests/phpunit/tests/date/theDate.php b/tests/phpunit/tests/date/theDate.php
index b5fcb793df9e9..2337ab61ec059 100644
--- a/tests/phpunit/tests/date/theDate.php
+++ b/tests/phpunit/tests/date/theDate.php
@@ -80,7 +80,7 @@ public function test_should_call_hooks() {
 	}
 
 	public function count_hook( $input ) {
-		$this->hooks_called[ current_filter() ] ++;
+		$this->hooks_called[ current_filter() ]++;
 
 		return $input;
 	}
diff --git a/tests/phpunit/tests/date/wpTimezone.php b/tests/phpunit/tests/date/wpTimezone.php
index 3e8b6fef5f9fb..f28ebbf6589be 100644
--- a/tests/phpunit/tests/date/wpTimezone.php
+++ b/tests/phpunit/tests/date/wpTimezone.php
@@ -22,7 +22,7 @@ public function tear_down() {
 	/**
 	 * @ticket 24730
 	 *
-	 * @dataProvider timezone_offset_provider
+	 * @dataProvider data_should_convert_gmt_offset
 	 *
 	 * @param float  $gmt_offset Numeric offset from UTC.
 	 * @param string $tz_name    Expected timezone name.
@@ -38,41 +38,12 @@ public function test_should_convert_gmt_offset( $gmt_offset, $tz_name ) {
 		$this->assertSame( $tz_name, $timezone->getName() );
 	}
 
-	/**
-	 * @ticket 24730
-	 */
-	public function test_should_return_timezone_string() {
-		update_option( 'timezone_string', 'Europe/Helsinki' );
-
-		$this->assertSame( 'Europe/Helsinki', wp_timezone_string() );
-
-		$timezone = wp_timezone();
-
-		$this->assertSame( 'Europe/Helsinki', $timezone->getName() );
-	}
-
-	/**
-	 * Ensures that deprecated timezone strings are handled correctly.
-	 *
-	 * @ticket 56468
-	 */
-	public function test_should_return_deprecated_timezone_string() {
-		$tz_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
-		update_option( 'timezone_string', $tz_string );
-
-		$this->assertSame( $tz_string, wp_timezone_string() );
-
-		$timezone = wp_timezone();
-
-		$this->assertSame( $tz_string, $timezone->getName() );
-	}
-
 	/**
 	 * Data provider to test numeric offset conversion.
 	 *
 	 * @return array
 	 */
-	public function timezone_offset_provider() {
+	public function data_should_convert_gmt_offset() {
 		return array(
 			array( -12, '-12:00' ),
 			array( -11.5, '-11:30' ),
@@ -134,4 +105,33 @@ public function timezone_offset_provider() {
 			array( 14, '+14:00' ),
 		);
 	}
+
+	/**
+	 * @ticket 24730
+	 */
+	public function test_should_return_timezone_string() {
+		update_option( 'timezone_string', 'Europe/Helsinki' );
+
+		$this->assertSame( 'Europe/Helsinki', wp_timezone_string() );
+
+		$timezone = wp_timezone();
+
+		$this->assertSame( 'Europe/Helsinki', $timezone->getName() );
+	}
+
+	/**
+	 * Ensures that deprecated timezone strings are handled correctly.
+	 *
+	 * @ticket 56468
+	 */
+	public function test_should_return_deprecated_timezone_string() {
+		$tz_string = 'America/Buenos_Aires'; // This timezone was deprecated pre-PHP 5.6.
+		update_option( 'timezone_string', $tz_string );
+
+		$this->assertSame( $tz_string, wp_timezone_string() );
+
+		$timezone = wp_timezone();
+
+		$this->assertSame( $tz_string, $timezone->getName() );
+	}
 }
diff --git a/tests/phpunit/tests/db.php b/tests/phpunit/tests/db.php
index 4e4b1b8c02d1f..11e35e45547aa 100644
--- a/tests/phpunit/tests/db.php
+++ b/tests/phpunit/tests/db.php
@@ -494,9 +494,11 @@ public function test_has_cap() {
 		$this->assertTrue( $wpdb->has_cap( 'collation' ) );
 		$this->assertTrue( $wpdb->has_cap( 'group_concat' ) );
 		$this->assertTrue( $wpdb->has_cap( 'subqueries' ) );
+		$this->assertTrue( $wpdb->has_cap( 'identifier_placeholders' ) );
 		$this->assertTrue( $wpdb->has_cap( 'COLLATION' ) );
 		$this->assertTrue( $wpdb->has_cap( 'GROUP_CONCAT' ) );
 		$this->assertTrue( $wpdb->has_cap( 'SUBQUERIES' ) );
+		$this->assertTrue( $wpdb->has_cap( 'IDENTIFIER_PLACEHOLDERS' ) );
 		$this->assertSame(
 			version_compare( $wpdb->db_version(), '5.0.7', '>=' ),
 			$wpdb->has_cap( 'set_charset' )
@@ -576,7 +578,7 @@ public function test_get_row() {
 	 * @param arrray|string|null $last_result The value to assign to `$wpdb->last_result`.
 	 * @param int|string         $column      The column index to retrieve.
 	 *
-	 * @dataProvider data_test_get_col
+	 * @dataProvider data_get_col
 	 *
 	 * @ticket 45299
 	 */
@@ -610,7 +612,7 @@ public function test_get_col( $query, $expected, $last_result, $column ) {
 	 *     @type arrray|string|null $last_result The value to assign to `$wpdb->last_result`.
 	 *     @type int|string         $column      The column index to retrieve.
 	 */
-	public function data_test_get_col() {
+	public function data_get_col() {
 		global $wpdb;
 
 		return array(
@@ -1515,7 +1517,7 @@ public function test_charset_switched_to_utf8() {
 	public function test_prepare_with_placeholders_and_individual_args( $sql, $values, $incorrect_usage, $expected ) {
 		global $wpdb;
 
-		if ( $incorrect_usage ) {
+		if ( is_string( $incorrect_usage ) || true === $incorrect_usage ) {
 			$this->setExpectedIncorrectUsage( 'wpdb::prepare' );
 		}
 
@@ -1525,7 +1527,11 @@ public function test_prepare_with_placeholders_and_individual_args( $sql, $value
 
 		// phpcs:ignore WordPress.DB.PreparedSQL
 		$sql = $wpdb->prepare( $sql, ...$values );
-		$this->assertSame( $expected, $sql );
+		$this->assertSame( $expected, $sql, 'The expected SQL does not match' );
+
+		if ( is_string( $incorrect_usage ) && array_key_exists( 'wpdb::prepare', $this->caught_doing_it_wrong ) ) {
+			$this->assertStringContainsString( $incorrect_usage, $this->caught_doing_it_wrong['wpdb::prepare'], 'The "_doing_it_wrong" message does not match' );
+		}
 	}
 
 	/**
@@ -1534,7 +1540,7 @@ public function test_prepare_with_placeholders_and_individual_args( $sql, $value
 	public function test_prepare_with_placeholders_and_array_args( $sql, $values, $incorrect_usage, $expected ) {
 		global $wpdb;
 
-		if ( $incorrect_usage ) {
+		if ( is_string( $incorrect_usage ) || true === $incorrect_usage ) {
 			$this->setExpectedIncorrectUsage( 'wpdb::prepare' );
 		}
 
@@ -1544,7 +1550,11 @@ public function test_prepare_with_placeholders_and_array_args( $sql, $values, $i
 
 		// phpcs:ignore WordPress.DB.PreparedSQL
 		$sql = $wpdb->prepare( $sql, $values );
-		$this->assertSame( $expected, $sql );
+		$this->assertSame( $expected, $sql, 'The expected SQL does not match' );
+
+		if ( is_string( $incorrect_usage ) && array_key_exists( 'wpdb::prepare', $this->caught_doing_it_wrong ) ) {
+			$this->assertStringContainsString( $incorrect_usage, $this->caught_doing_it_wrong['wpdb::prepare'], 'The "_doing_it_wrong" message does not match' );
+		}
 	}
 
 	public function data_prepare_with_placeholders() {
@@ -1703,35 +1713,407 @@ public function data_prepare_with_placeholders() {
 				true,
 				"'{$placeholder_escape}'{$placeholder_escape}s",
 			),
+
+			/*
+			 * @ticket 56933.
+			 * When preparing a '%%%s%%', test that the inserted value
+			 * is not wrapped in single quotes between the 2 "%".
+			 */
 			array(
-				"'%'%%s%s",
+				'%%s %d',
+				1,
+				false,
+				"{$placeholder_escape}s 1",
+			),
+			array(
+				'%%%s',
 				'hello',
 				false,
-				"'{$placeholder_escape}'{$placeholder_escape}s'hello'",
+				"{$placeholder_escape}hello",
 			),
 			array(
-				"'%'%%s %s",
+				'%%%%s',
 				'hello',
 				false,
-				"'{$placeholder_escape}'{$placeholder_escape}s 'hello'",
+				"{$placeholder_escape}{$placeholder_escape}s",
+			),
+			array(
+				'%%%%%s',
+				'hello',
+				false,
+				"{$placeholder_escape}{$placeholder_escape}hello",
 			),
-			/*
-			 * @ticket 56933.
-			 * When preparing a '%%%s%%', test that the inserted value
-			 * is not wrapped in single quotes between the 2 hex values.
-			 */
 			array(
 				'%%%s%%',
 				'hello',
 				false,
 				"{$placeholder_escape}hello{$placeholder_escape}",
 			),
+			array(
+				"'%'%%s%s",
+				'hello',
+				false,
+				"'{$placeholder_escape}'{$placeholder_escape}s'hello'",
+			),
+			array(
+				"'%'%%s %s",
+				'hello',
+				false,
+				"'{$placeholder_escape}'{$placeholder_escape}s 'hello'",
+			),
 			array(
 				"'%-'#5s' '%'#-+-5s'",
 				array( 'hello', 'foo' ),
 				false,
 				"'hello' 'foo##'",
 			),
+
+			/*
+			 * Before WP 6.2 the "force floats to be locale-unaware" RegEx didn't
+			 * convert "%%%f" to "%%%F" (note the uppercase F).
+			 * This was because it didn't check to see if the leading "%" was escaped.
+			 * And because the "Escape any unescaped percents" RegEx used "[sdF]" in its
+			 * negative lookahead assertion, when there was an odd number of "%", it added
+			 * an extra "%", to give the fully escaped "%%%%f" (not a placeholder).
+			 */
+			array(
+				'%f OR id = %d',
+				array( 3, 5 ),
+				false,
+				'3.000000 OR id = 5',
+			),
+			array(
+				'%%f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}f OR id = 5",
+			),
+			array(
+				'%%%f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}{$placeholder_escape}f OR id = 5",
+			),
+			array(
+				'%%%%f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}{$placeholder_escape}f OR id = 5",
+			),
+			array(
+				"WHERE id = %d AND content LIKE '%.4f'",
+				array( 1, 2 ),
+				false,
+				"WHERE id = 1 AND content LIKE '2.0000'",
+			),
+			array(
+				"WHERE id = %d AND content LIKE '%%.4f'",
+				array( 1 ),
+				false,
+				"WHERE id = 1 AND content LIKE '{$placeholder_escape}.4f'",
+			),
+			array(
+				"WHERE id = %d AND content LIKE '%%%.4f'",
+				array( 1 ),
+				false,
+				"WHERE id = 1 AND content LIKE '{$placeholder_escape}{$placeholder_escape}.4f'",
+			),
+			array(
+				"WHERE id = %d AND content LIKE '%%%%.4f'",
+				array( 1 ),
+				false,
+				"WHERE id = 1 AND content LIKE '{$placeholder_escape}{$placeholder_escape}.4f'",
+			),
+			array(
+				"WHERE id = %d AND content LIKE '%%%%%.4f'",
+				array( 1 ),
+				false,
+				"WHERE id = 1 AND content LIKE '{$placeholder_escape}{$placeholder_escape}{$placeholder_escape}.4f'",
+			),
+			array(
+				'%.4f',
+				array( 1 ),
+				false,
+				'1.0000',
+			),
+			array(
+				'%.4f OR id = %d',
+				array( 1, 5 ),
+				false,
+				'1.0000 OR id = 5',
+			),
+			array(
+				'%%.4f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}.4f OR id = 5",
+			),
+			array(
+				'%%%.4f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}{$placeholder_escape}.4f OR id = 5",
+			),
+			array(
+				'%%%%.4f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}{$placeholder_escape}.4f OR id = 5",
+			),
+			array(
+				'%%%%%.4f OR id = %d',
+				array( 5 ),
+				false,
+				"{$placeholder_escape}{$placeholder_escape}{$placeholder_escape}.4f OR id = 5",
+			),
+
+			/*
+			 * @ticket 52506.
+			 * Adding an escape method for Identifiers (e.g. table/field names).
+			 */
+			array(
+				'SELECT * FROM %i WHERE %i = %d;',
+				array( 'my_table', 'my_field', 321 ),
+				false,
+				'SELECT * FROM `my_table` WHERE `my_field` = 321;',
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'evil_`_field', 321 ),
+				false,
+				'WHERE `evil_``_field` = 321;', // To quote the identifier itself, then you need to double the character, e.g. `a``b`.
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'evil_````````_field', 321 ),
+				false,
+				'WHERE `evil_````````````````_field` = 321;',
+			),
+			array(
+				'WHERE %i = %d;',
+				array( '``evil_field``', 321 ),
+				false,
+				'WHERE `````evil_field````` = 321;',
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'evil\'field', 321 ),
+				false,
+				'WHERE `evil\'field` = 321;',
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'evil_\``_field', 321 ),
+				false,
+				'WHERE `evil_\````_field` = 321;',
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'evil_%s_field', 321 ),
+				false,
+				"WHERE `evil_{$placeholder_escape}s_field` = 321;",
+			),
+			array(
+				'WHERE %i = %d;',
+				array( 'value`', 321 ),
+				false,
+				'WHERE `value``` = 321;',
+			),
+			array(
+				'WHERE `%i = %d;',
+				array( ' AND evil_value', 321 ),
+				false,
+				'WHERE `` AND evil_value` = 321;', // Won't run (SQL parse error: "Unclosed quote").
+			),
+			array(
+				'WHERE %i` = %d;',
+				array( 'evil_value -- ', 321 ),
+				false,
+				'WHERE `evil_value -- `` = 321;', // Won't run (SQL parse error: "Unclosed quote").
+			),
+			array(
+				'WHERE `%i`` = %d;',
+				array( ' AND true -- ', 321 ),
+				false,
+				'WHERE `` AND true -- ``` = 321;', // Won't run (Unknown column '').
+			),
+			array(
+				'WHERE ``%i` = %d;',
+				array( ' AND true -- ', 321 ),
+				false,
+				'WHERE ``` AND true -- `` = 321;', // Won't run (SQL parse error: "Unclosed quote").
+			),
+			array(
+				'WHERE %2$i = %1$d;',
+				array( '1', 'two' ),
+				false,
+				'WHERE `two` = 1;',
+			),
+			array(
+				'WHERE \'%i\' = 1 AND "%i" = 2 AND `%i` = 3 AND ``%i`` = 4 AND %15i = 5',
+				array( 'my_field1', 'my_field2', 'my_field3', 'my_field4', 'my_field5' ),
+				false,
+				'WHERE \'`my_field1`\' = 1 AND "`my_field2`" = 2 AND ``my_field3`` = 3 AND ```my_field4``` = 4 AND `      my_field5` = 5', // Does not remove any existing quotes, always adds it's own (safer).
+			),
+			array(
+				'WHERE id = %d AND %i LIKE %2$s LIMIT 1',
+				array( 123, 'field -- ', false ),
+				'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %i and %2$s',
+				null, // Should be rejected, otherwise the `%1$s` could use Identifier escaping, e.g. 'WHERE `field -- ` LIKE field --  LIMIT 1' (thanks @vortfu).
+			),
+			array(
+				'WHERE %i LIKE %s LIMIT 1',
+				array( "field' -- ", "field' -- " ),
+				false,
+				"WHERE `field' -- ` LIKE 'field\' -- ' LIMIT 1", // In contrast to the above, Identifier vs String escaping is used.
+			),
+			array(
+				'WHERE %2$i IN ( %s , %s ) LIMIT 1',
+				array( 'a', 'b' ),
+				'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %2$i and %s',
+				null,
+			),
+			array(
+				'WHERE %1$i = %1$s',
+				array( 'a', 'b' ),
+				'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %1$i and %1$s',
+				null,
+			),
+			array(
+				'WHERE %1$i = %1$s OR %2$i = %2$s',
+				array( 'a', 'b' ),
+				'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %1$i and %1$s, %2$i and %2$s',
+				null,
+			),
+			array(
+				'WHERE %1$i = %1$s OR %2$i = %1$s',
+				array( 'a', 'b' ),
+				'Arguments cannot be prepared as both an Identifier and Value. Found the following conflicts: %1$i and %1$s and %1$s',
+				null,
+			),
+		);
+	}
+
+	/**
+	 * The wpdb->allow_unsafe_unquoted_parameters is true (for now), purely for backwards compatibility reasons.
+	 *
+	 * @ticket 52506
+	 *
+	 * @dataProvider data_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property
+	 *
+	 * @covers wpdb::prepare
+	 *
+	 * @param bool   $allow    Whether to allow unsafe unquoted parameters.
+	 * @param string $sql      The SQL to prepare.
+	 * @param array  $values   The values for prepare.
+	 * @param string $expected The expected prepared parameters.
+	 */
+	public function test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property( $allow, $sql, $values, $expected ) {
+		global $wpdb;
+
+		$default = $wpdb->allow_unsafe_unquoted_parameters;
+
+		$property = new ReflectionProperty( $wpdb, 'allow_unsafe_unquoted_parameters' );
+		$property->setAccessible( true );
+		$property->setValue( $wpdb, $allow );
+
+		// phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+		$actual = $wpdb->prepare( $sql, $values );
+
+		// Reset.
+		$property->setValue( $wpdb, $default );
+		$property->setAccessible( false );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider for test_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property().
+	 *
+	 * @return array[]
+	 */
+	public function data_prepare_should_respect_the_allow_unsafe_unquoted_parameters_property() {
+		global $wpdb;
+
+		$placeholder_escape = $wpdb->placeholder_escape();
+
+		return array(
+
+			'numbered-true-1'  => array(
+				'allow'    => true,
+				'sql'      => 'WHERE (%i = %s) OR (%3$i = %4$s)',
+				'values'   => array( 'field_a', 'string_a', 'field_b', 'string_b' ),
+				'expected' => 'WHERE (`field_a` = \'string_a\') OR (`field_b` = string_b)',
+			),
+			'numbered-false-1' => array(
+				'allow'    => false,
+				'sql'      => 'WHERE (%i = %s) OR (%3$i = %4$s)',
+				'values'   => array( 'field_a', 'string_a', 'field_b', 'string_b' ),
+				'expected' => 'WHERE (`field_a` = \'string_a\') OR (`field_b` = \'string_b\')',
+			),
+			'numbered-true-2'  => array(
+				'allow'    => true,
+				'sql'      => 'WHERE (%i = %s) OR (%3$i = %4$s)',
+				'values'   => array( 'field_a', 'string_a', 'field_b', '0 OR EvilSQL' ),
+				'expected' => 'WHERE (`field_a` = \'string_a\') OR (`field_b` = 0 OR EvilSQL)',
+			),
+			'numbered-false-2' => array(
+				'allow'    => false,
+				'sql'      => 'WHERE (%i = %s) OR (%3$i = %4$s)',
+				'values'   => array( 'field_a', 'string_a', 'field_b', '0 OR EvilSQL' ),
+				'expected' => 'WHERE (`field_a` = \'string_a\') OR (`field_b` = \'0 OR EvilSQL\')',
+			),
+
+			'format-true-1'    => array(
+				'allow'    => true,
+				'sql'      => 'WHERE (%10i = %10s)',
+				'values'   => array( 'field_a', 'string_a' ),
+				'expected' => 'WHERE (`   field_a` =   string_a)',
+			),
+			'format-false-1'   => array(
+				'allow'    => false,
+				'sql'      => 'WHERE (%10i = %10s)',
+				'values'   => array( 'field_a', 'string_a' ),
+				'expected' => 'WHERE (`   field_a` = \'  string_a\')',
+			),
+			'format-true-2'    => array(
+				'allow'    => true,
+				'sql'      => 'WHERE (%10i = %10s)',
+				'values'   => array( 'field_a', '0 OR EvilSQL' ),
+				'expected' => 'WHERE (`   field_a` = 0 OR EvilSQL)',
+			),
+			'format-false-2'   => array(
+				'allow'    => false,
+				'sql'      => 'WHERE (%10i = %10s)',
+				'values'   => array( 'field_a', '0 OR EvilSQL' ),
+				'expected' => 'WHERE (`   field_a` = \'0 OR EvilSQL\')',
+			),
+
+			'escaped-true-1'   => array(
+				'allow'    => true,
+				'sql'      => 'SELECT 9%%%s',
+				'values'   => array( '7' ),
+				'expected' => "SELECT 9{$placeholder_escape}7", // SELECT 9%7.
+			),
+			'escaped-false-1'  => array(
+				'allow'    => false,
+				'sql'      => 'SELECT 9%%%s',
+				'values'   => array( '7' ),
+				'expected' => "SELECT 9{$placeholder_escape}'7'", // SELECT 9%'7'.
+			),
+			'escaped-true-2'   => array(
+				'allow'    => true,
+				'sql'      => 'SELECT 9%%%s',
+				'values'   => array( '7 OR EvilSQL' ),
+				'expected' => "SELECT 9{$placeholder_escape}7 OR EvilSQL", // SELECT 9%7 OR EvilSQL.
+			),
+			'escaped-false-2'  => array(
+				'allow'    => false,
+				'sql'      => 'SELECT 9%%%s',
+				'values'   => array( '7 OR EvilSQL' ),
+				'expected' => "SELECT 9{$placeholder_escape}'7 OR EvilSQL'", // SELECT 9%'7 OR EvilSQL'.
+			),
+
 		);
 	}
 
@@ -1857,7 +2239,7 @@ public function test_esc_sql_with_unsupported_placeholder_type() {
 	}
 
 	/**
-	 * @dataProvider parse_db_host_data_provider
+	 * @dataProvider data_parse_db_host
 	 * @ticket 41722
 	 * @ticket 54877
 	 */
@@ -1878,7 +2260,7 @@ public function test_parse_db_host( $host_string, $expect_bail, $host, $port, $s
 		}
 	}
 
-	public function parse_db_host_data_provider() {
+	public function data_parse_db_host() {
 		return array(
 			array(
 				'',    // DB_HOST.
diff --git a/tests/phpunit/tests/db/charset.php b/tests/phpunit/tests/db/charset.php
index 627526bff2732..1a79ab911f2fb 100644
--- a/tests/phpunit/tests/db/charset.php
+++ b/tests/phpunit/tests/db/charset.php
@@ -773,7 +773,7 @@ public function test_strip_invalid_text_for_column() {
 	/**
 	 * @ticket 21212
 	 */
-	public function data_test_get_table_charset() {
+	public function data_get_table_charset() {
 		$table_name = 'test_get_table_charset';
 
 		$vars = array();
@@ -788,7 +788,7 @@ public function data_test_get_table_charset() {
 	}
 
 	/**
-	 * @dataProvider data_test_get_table_charset
+	 * @dataProvider data_get_table_charset
 	 * @ticket 21212
 	 *
 	 * @covers wpdb::get_table_charset
@@ -814,7 +814,7 @@ public function test_get_table_charset( $drop, $create, $table, $expected_charse
 	/**
 	 * @ticket 21212
 	 */
-	public function data_test_get_column_charset() {
+	public function data_get_column_charset() {
 		$table_name = 'test_get_column_charset';
 
 		$vars = array();
@@ -829,7 +829,7 @@ public function data_test_get_column_charset() {
 	}
 
 	/**
-	 * @dataProvider data_test_get_column_charset
+	 * @dataProvider data_get_column_charset
 	 * @ticket 21212
 	 *
 	 * @covers wpdb::get_col_charset
@@ -856,7 +856,7 @@ public function test_get_column_charset( $drop, $create, $table, $expected_chars
 	}
 
 	/**
-	 * @dataProvider data_test_get_column_charset
+	 * @dataProvider data_get_column_charset
 	 * @ticket 21212
 	 *
 	 * @covers wpdb::get_col_charset
@@ -883,7 +883,7 @@ public function test_get_column_charset_non_mysql( $drop, $create, $table, $colu
 	}
 
 	/**
-	 * @dataProvider data_test_get_column_charset
+	 * @dataProvider data_get_column_charset
 	 * @ticket 33501
 	 *
 	 * @covers wpdb::get_col_charset
diff --git a/tests/phpunit/tests/db/dbDelta.php b/tests/phpunit/tests/db/dbDelta.php
index 6667f9aba39af..03426fa721997 100644
--- a/tests/phpunit/tests/db/dbDelta.php
+++ b/tests/phpunit/tests/db/dbDelta.php
@@ -99,7 +99,7 @@ public function tear_down() {
 
 		parent::tear_down();
 
-		// This has to be called after the parent `tearDown()` method.
+		// This has to be called after the parent `tear_down()` method.
 		$wpdb->query( "DROP TABLE IF EXISTS {$wpdb->prefix}dbdelta_test" );
 	}
 
diff --git a/tests/phpunit/tests/dependencies.php b/tests/phpunit/tests/dependencies.php
index 0087a0c143d63..e5a7a33a7cb7c 100644
--- a/tests/phpunit/tests/dependencies.php
+++ b/tests/phpunit/tests/dependencies.php
@@ -5,7 +5,7 @@
  */
 class Tests_Dependencies extends WP_UnitTestCase {
 	public function test_add() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -18,7 +18,7 @@ public function test_add() {
 	}
 
 	public function test_remove() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -31,7 +31,7 @@ public function test_remove() {
 	}
 
 	public function test_enqueue() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -47,7 +47,7 @@ public function test_enqueue() {
 	}
 
 	public function test_dequeue() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -67,7 +67,7 @@ public function test_dequeue() {
 	}
 
 	public function test_enqueue_args() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -85,7 +85,7 @@ public function test_enqueue_args() {
 	}
 
 	public function test_dequeue_args() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertTrue( $dep->add( 'two', '' ) );
@@ -112,7 +112,7 @@ public function test_dequeue_args() {
 	 * @ticket 21741
 	 */
 	public function test_query_and_registered_enqueued() {
-		$dep = new WP_Dependencies;
+		$dep = new WP_Dependencies();
 
 		$this->assertTrue( $dep->add( 'one', '' ) );
 		$this->assertInstanceOf( '_WP_Dependency', $dep->query( 'one' ) );
@@ -137,8 +137,8 @@ public function test_query_and_registered_enqueued() {
 
 	}
 
-	function test_enqueue_before_register() {
-		$dep = new WP_Dependencies;
+	public function test_enqueue_before_register() {
+		$dep = new WP_Dependencies();
 
 		$this->assertArrayNotHasKey( 'one', $dep->registered );
 
diff --git a/tests/phpunit/tests/dependencies/jquery.php b/tests/phpunit/tests/dependencies/jquery.php
index 62243fe58149e..8e332484e0a67 100644
--- a/tests/phpunit/tests/dependencies/jquery.php
+++ b/tests/phpunit/tests/dependencies/jquery.php
@@ -10,7 +10,7 @@ class Tests_Dependencies_jQuery extends WP_UnitTestCase {
 	 * @covers WP_Scripts::query
 	 */
 	public function test_location_of_jquery() {
-		$scripts = new WP_Scripts;
+		$scripts = new WP_Scripts();
 		wp_default_scripts( $scripts );
 
 		if ( SCRIPT_DEBUG ) {
@@ -84,20 +84,6 @@ public function test_dont_allow_deregister_core_scripts_in_admin() {
 		}
 	}
 
-	/**
-	 * @ticket 28404
-	 *
-	 * @covers ::wp_script_is
-	 */
-	public function test_wp_script_is_dep_enqueued() {
-		wp_enqueue_script( 'jquery-ui-accordion' );
-
-		$this->assertTrue( wp_script_is( 'jquery', 'enqueued' ) );
-		$this->assertFalse( wp_script_is( 'underscore', 'enqueued' ) );
-
-		unset( $GLOBALS['wp_scripts'] );
-	}
-
 	/**
 	 * Test placing of jQuery in footer.
 	 *
@@ -106,7 +92,7 @@ public function test_wp_script_is_dep_enqueued() {
 	 * @covers WP_Scripts::do_items
 	 */
 	public function test_jquery_in_footer() {
-		$scripts = new WP_Scripts;
+		$scripts = new WP_Scripts();
 		$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ) );
 		$scripts->add( 'jquery-core', '/jquery.js', array() );
 		$scripts->add( 'jquery-migrate', '/jquery-migrate.js', array() );
diff --git a/tests/phpunit/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php
index b64edfeff9e2d..ca88433713113 100644
--- a/tests/phpunit/tests/dependencies/scripts.php
+++ b/tests/phpunit/tests/dependencies/scripts.php
@@ -10,17 +10,35 @@
  * @covers ::wp_set_script_translations
  */
 class Tests_Dependencies_Scripts extends WP_UnitTestCase {
+
+	/**
+	 * @var WP_Scripts
+	 */
 	protected $old_wp_scripts;
 
+	/**
+	 * @var WP_Styles
+	 */
+	protected $old_wp_styles;
+
 	protected $wp_scripts_print_translations_output;
 
+	/**
+	 * Stores a string reference to a default scripts directory name, utilised by certain tests.
+	 *
+	 * @var string
+	 */
+	protected $default_scripts_dir = '/directory/';
+
 	public function set_up() {
 		parent::set_up();
 		$this->old_wp_scripts = isset( $GLOBALS['wp_scripts'] ) ? $GLOBALS['wp_scripts'] : null;
+		$this->old_wp_styles  = isset( $GLOBALS['wp_styles'] ) ? $GLOBALS['wp_styles'] : null;
 		remove_action( 'wp_default_scripts', 'wp_default_scripts' );
 		remove_action( 'wp_default_scripts', 'wp_default_packages' );
 		$GLOBALS['wp_scripts']                  = new WP_Scripts();
 		$GLOBALS['wp_scripts']->default_version = get_bloginfo( 'version' );
+		$GLOBALS['wp_styles']                   = new WP_Styles();
 
 		$this->wp_scripts_print_translations_output  = <<<JS
 <script type='text/javascript' id='__HANDLE__-js-translations'>
@@ -36,6 +54,7 @@ public function set_up() {
 
 	public function tear_down() {
 		$GLOBALS['wp_scripts'] = $this->old_wp_scripts;
+		$GLOBALS['wp_styles']  = $this->old_wp_styles;
 		add_action( 'wp_default_scripts', 'wp_default_scripts' );
 		parent::tear_down();
 	}
@@ -46,14 +65,15 @@ public function tear_down() {
 	 * @ticket 11315
 	 */
 	public function test_wp_enqueue_script() {
+		global $wp_version;
+
 		wp_enqueue_script( 'no-deps-no-version', 'example.com', array() );
 		wp_enqueue_script( 'empty-deps-no-version', 'example.com' );
 		wp_enqueue_script( 'empty-deps-version', 'example.com', array(), 1.2 );
 		wp_enqueue_script( 'empty-deps-null-version', 'example.com', array(), null );
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='http://example.com?ver=$ver' id='no-deps-no-version-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='http://example.com?ver=$ver' id='empty-deps-no-version-js'></script>\n";
+		$expected  = "<script type='text/javascript' src='http://example.com?ver={$wp_version}' id='no-deps-no-version-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='http://example.com?ver={$wp_version}' id='empty-deps-no-version-js'></script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com?ver=1.2' id='empty-deps-version-js'></script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='empty-deps-null-version-js'></script>\n";
 
@@ -63,10 +83,1335 @@ public function test_wp_enqueue_script() {
 		$this->assertSame( '', get_echo( 'wp_print_scripts' ) );
 	}
 
+	/**
+	 * Gets delayed strategies as a data provider.
+	 *
+	 * @return array[] Delayed strategies.
+	 */
+	public function data_provider_delayed_strategies() {
+		return array(
+			'defer' => array( 'defer' ),
+			'async' => array( 'async' ),
+		);
+	}
+
+	/**
+	 * Tests that inline scripts in the `after` position, attached to delayed main scripts, remain unaffected.
+	 *
+	 * If the main script with delayed loading strategy has an `after` inline script,
+	 * the inline script should not be affected.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_inline_script_tag
+	 * @covers ::wp_add_inline_script
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 *
+	 * @param string $strategy Strategy.
+	 */
+	public function test_after_inline_script_with_delayed_main_script( $strategy ) {
+		wp_enqueue_script( 'ms-isa-1', 'http://example.org/ms-isa-1.js', array(), null, compact( 'strategy' ) );
+		wp_add_inline_script( 'ms-isa-1', 'console.log("after one");', 'after' );
+		$output    = get_echo( 'wp_print_scripts' );
+		$expected  = "<script type='text/javascript' src='http://example.org/ms-isa-1.js' id='ms-isa-1-js' data-wp-strategy='{$strategy}'></script>\n";
+		$expected .= wp_get_inline_script_tag(
+			"console.log(\"after one\");\n",
+			array(
+				'id' => 'ms-isa-1-js-after',
+			)
+		);
+		$this->assertSame( $expected, $output, 'Inline scripts in the "after" position, that are attached to a deferred main script, are failing to print/execute.' );
+	}
+
+	/**
+	 * Tests that inline scripts in the `after` position, attached to a blocking main script, are rendered as javascript.
+	 *
+	 * If a main script with a `blocking` strategy has an `after` inline script,
+	 * the inline script should be rendered as type='text/javascript'.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_inline_script_tag
+	 * @covers ::wp_add_inline_script
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_after_inline_script_with_blocking_main_script() {
+		wp_enqueue_script( 'ms-insa-3', 'http://example.org/ms-insa-3.js', array(), null );
+		wp_add_inline_script( 'ms-insa-3', 'console.log("after one");', 'after' );
+		$output = get_echo( 'wp_print_scripts' );
+
+		$expected  = "<script type='text/javascript' src='http://example.org/ms-insa-3.js' id='ms-insa-3-js'></script>\n";
+		$expected .= wp_get_inline_script_tag(
+			"console.log(\"after one\");\n",
+			array(
+				'id' => 'ms-insa-3-js-after',
+			)
+		);
+
+		$this->assertSame( $expected, $output, 'Inline scripts in the "after" position, that are attached to a blocking main script, are failing to print/execute.' );
+	}
+
+	/**
+	 * Tests that inline scripts in the `before` position, attached to a delayed inline main script, results in all
+	 * dependents being delayed.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_inline_script_tag
+	 * @covers ::wp_add_inline_script
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 *
+	 * @param string $strategy
+	 */
+	public function test_before_inline_scripts_with_delayed_main_script( $strategy ) {
+		wp_enqueue_script( 'ds-i1-1', 'http://example.org/ds-i1-1.js', array(), null, compact( 'strategy' ) );
+		wp_add_inline_script( 'ds-i1-1', 'console.log("before first");', 'before' );
+		wp_enqueue_script( 'ds-i1-2', 'http://example.org/ds-i1-2.js', array(), null, compact( 'strategy' ) );
+		wp_enqueue_script( 'ds-i1-3', 'http://example.org/ds-i1-3.js', array(), null, compact( 'strategy' ) );
+		wp_enqueue_script( 'ms-i1-1', 'http://example.org/ms-i1-1.js', array( 'ds-i1-1', 'ds-i1-2', 'ds-i1-3' ), null, compact( 'strategy' ) );
+		wp_add_inline_script( 'ms-i1-1', 'console.log("before last");', 'before' );
+		$output = get_echo( 'wp_print_scripts' );
+
+		$expected  = wp_get_inline_script_tag(
+			"console.log(\"before first\");\n",
+			array(
+				'id' => 'ds-i1-1-js-before',
+			)
+		);
+		$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-1.js' id='ds-i1-1-js' $strategy data-wp-strategy='{$strategy}'></script>\n";
+		$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-2.js' id='ds-i1-2-js' $strategy data-wp-strategy='{$strategy}'></script>\n";
+		$expected .= "<script type='text/javascript' src='http://example.org/ds-i1-3.js' id='ds-i1-3-js' $strategy data-wp-strategy='{$strategy}'></script>\n";
+		$expected .= wp_get_inline_script_tag(
+			"console.log(\"before last\");\n",
+			array(
+				'id'   => 'ms-i1-1-js-before',
+				'type' => 'text/javascript',
+			)
+		);
+		$expected .= "<script type='text/javascript' src='http://example.org/ms-i1-1.js' id='ms-i1-1-js' {$strategy} data-wp-strategy='{$strategy}'></script>\n";
+
+		$this->assertSame( $expected, $output, 'Inline scripts in the "before" position, that are attached to a deferred main script, are failing to print/execute.' );
+	}
+
+	/**
+	 * Tests that scripts registered with an async strategy print with the async attribute.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_valid_async_registration() {
+		// No dependents, No dependencies then async.
+		wp_enqueue_script( 'main-script-a1', '/main-script-a1.js', array(), null, array( 'strategy' => 'async' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-a1.js' id='main-script-a1-js' async data-wp-strategy='async'></script>\n";
+		$this->assertSame( $expected, $output, 'Scripts enqueued with an async loading strategy are failing to have the async attribute applied to the script handle when being printed.' );
+	}
+
+	/**
+	 * Tests that dependents of a blocking dependency script are free to contain any strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 *
+	 * @param string $strategy Strategy.
+	 */
+	public function test_delayed_dependent_with_blocking_dependency( $strategy ) {
+		wp_enqueue_script( 'dependency-script-a2', '/dependency-script-a2.js', array(), null );
+		wp_enqueue_script( 'main-script-a2', '/main-script-a2.js', array( 'dependency-script-a2' ), null, compact( 'strategy' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-a2.js' id='main-script-a2-js' {$strategy} data-wp-strategy='{$strategy}'></script>";
+		$this->assertStringContainsString( $expected, $output, 'Dependents of a blocking dependency are free to have any strategy.' );
+	}
+
+	/**
+	 * Tests that blocking dependents force delayed dependencies to become blocking.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 * @param string $strategy Strategy.
+	 */
+	public function test_blocking_dependent_with_delayed_dependency( $strategy ) {
+		wp_enqueue_script( 'main-script-a3', '/main-script-a3.js', array(), null, compact( 'strategy' ) );
+		wp_enqueue_script( 'dependent-script-a3', '/dependent-script-a3.js', array( 'main-script-a3' ), null );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-a3.js' id='main-script-a3-js' data-wp-strategy='{$strategy}'></script>";
+		$this->assertStringContainsString( $expected, $output, 'Blocking dependents must force delayed dependencies to become blocking.' );
+	}
+
+	/**
+	 * Tests that only enqueued dependents effect the eligible loading strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 * @param string $strategy Strategy.
+	 */
+	public function test_delayed_dependent_with_blocking_dependency_not_enqueued( $strategy ) {
+		wp_enqueue_script( 'main-script-a4', '/main-script-a4.js', array(), null, compact( 'strategy' ) );
+		// This dependent is registered but not enqueued, so it should not factor into the eligible loading strategy.
+		wp_register_script( 'dependent-script-a4', '/dependent-script-a4.js', array( 'main-script-a4' ), null );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-a4.js' id='main-script-a4-js' {$strategy} data-wp-strategy='{$strategy}'></script>";
+		$this->assertStringContainsString( $expected, $output, 'Only enqueued dependents should affect the eligible strategy.' );
+	}
+
+	/**
+	 * Data provider for test_filter_eligible_strategies.
+	 *
+	 * @return array
+	 */
+	public function get_data_to_filter_eligible_strategies() {
+		return array(
+			'no_dependents'                       => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'one_delayed_dependent'               => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'one_blocking_dependent'              => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null );
+					return 'foo';
+				},
+				'expected' => array(),
+			),
+			'one_blocking_dependent_not_enqueued' => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_register_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ), // Because bar was not enqueued, only foo was.
+			),
+			'two_delayed_dependents'              => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'baz', 'https://example.com/baz.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'recursion_not_delayed'               => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array( 'foo' ), null );
+					return 'foo';
+				},
+				'expected' => array(),
+			),
+			'recursion_yes_delayed'               => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'recursion_triple_level'              => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array( 'baz' ), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					wp_enqueue_script( 'baz', 'https://example.com/bar.js', array( 'bar' ), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'async_only_with_async_dependency'    => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'async' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null, array( 'strategy' => 'async' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer', 'async' ),
+			),
+			'async_only_with_defer_dependency'    => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'async' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null, array( 'strategy' => 'defer' ) );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'async_only_with_blocking_dependency' => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'async' ) );
+					wp_enqueue_script( 'bar', 'https://example.com/bar.js', array( 'foo' ), null );
+					return 'foo';
+				},
+				'expected' => array(),
+			),
+			'defer_with_inline_after_script'      => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_add_inline_script( 'foo', 'console.log("foo")', 'after' );
+					return 'foo';
+				},
+				'expected' => array(),
+			),
+			'defer_with_inline_before_script'     => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'defer' ) );
+					wp_add_inline_script( 'foo', 'console.log("foo")', 'before' );
+					return 'foo';
+				},
+				'expected' => array( 'defer' ),
+			),
+			'async_with_inline_after_script'      => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'async' ) );
+					wp_add_inline_script( 'foo', 'console.log("foo")', 'after' );
+					return 'foo';
+				},
+				'expected' => array(),
+			),
+			'async_with_inline_before_script'     => array(
+				'set_up'   => static function () {
+					wp_enqueue_script( 'foo', 'https://example.com/foo.js', array(), null, array( 'strategy' => 'async' ) );
+					wp_add_inline_script( 'foo', 'console.log("foo")', 'before' );
+					return 'foo';
+				},
+				'expected' => array( 'defer', 'async' ),
+			),
+		);
+	}
+
+	/**
+	 * Tests that the filter_eligible_strategies method works as expected and returns the correct value.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 *
+	 * @dataProvider get_data_to_filter_eligible_strategies
+	 *
+	 * @param callable $set_up     Set up.
+	 * @param bool     $async_only Async only.
+	 * @param bool     $expected   Expected return value.
+	 */
+	public function test_filter_eligible_strategies( $set_up, $expected ) {
+		$handle = $set_up();
+
+		$wp_scripts_reflection      = new ReflectionClass( WP_Scripts::class );
+		$filter_eligible_strategies = $wp_scripts_reflection->getMethod( 'filter_eligible_strategies' );
+		$filter_eligible_strategies->setAccessible( true );
+		$this->assertSame( $expected, $filter_eligible_strategies->invokeArgs( wp_scripts(), array( $handle ) ), 'Expected return value of WP_Scripts::filter_eligible_strategies to match.' );
+	}
+
+	/**
+	 * Register test script.
+	 *
+	 * @param string   $handle    Dependency handle to enqueue.
+	 * @param string   $strategy  Strategy to use for dependency.
+	 * @param string[] $deps      Dependencies for the script.
+	 * @param bool     $in_footer Whether to print the script in the footer.
+	 */
+	protected function register_test_script( $handle, $strategy, $deps = array(), $in_footer = false ) {
+		wp_register_script(
+			$handle,
+			add_query_arg(
+				array(
+					'script_event_log' => "$handle: script",
+				),
+				'https://example.com/external.js'
+			),
+			$deps,
+			null
+		);
+		if ( 'blocking' !== $strategy ) {
+			wp_script_add_data( $handle, 'strategy', $strategy );
+		}
+	}
+
+	/**
+	 * Enqueue test script.
+	 *
+	 * @param string   $handle    Dependency handle to enqueue.
+	 * @param string   $strategy  Strategy to use for dependency.
+	 * @param string[] $deps      Dependencies for the script.
+	 * @param bool     $in_footer Whether to print the script in the footer.
+	 */
+	protected function enqueue_test_script( $handle, $strategy, $deps = array(), $in_footer = false ) {
+		$this->register_test_script( $handle, $strategy, $deps, $in_footer );
+		wp_enqueue_script( $handle );
+	}
+
+	/**
+	 * Adds test inline script.
+	 *
+	 * @param string $handle   Dependency handle to enqueue.
+	 * @param string $position Position.
+	 */
+	protected function add_test_inline_script( $handle, $position ) {
+		wp_add_inline_script( $handle, sprintf( 'scriptEventLog.push( %s )', wp_json_encode( "{$handle}: {$position} inline" ) ), $position );
+	}
+
+	/**
+	 * Data provider to test various strategy dependency chains.
+	 *
+	 * @return array[]
+	 */
+	public function data_provider_to_test_various_strategy_dependency_chains() {
+		return array(
+			'async-dependent-with-one-blocking-dependency' => array(
+				'set_up'          => function () {
+					$handle1 = 'blocking-not-async-without-dependency';
+					$handle2 = 'async-with-blocking-dependency';
+					$this->enqueue_test_script( $handle1, 'blocking', array() );
+					$this->enqueue_test_script( $handle2, 'async', array( $handle1 ) );
+					foreach ( array( $handle1, $handle2 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="blocking-not-async-without-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-not-async-without-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-not-async-without-dependency:%20script' id='blocking-not-async-without-dependency-js'></script>
+<script id="blocking-not-async-without-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-not-async-without-dependency: after inline" )
+</script>
+<script id="async-with-blocking-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "async-with-blocking-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-with-blocking-dependency:%20script' id='async-with-blocking-dependency-js' data-wp-strategy='async'></script>
+<script id="async-with-blocking-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "async-with-blocking-dependency: after inline" )
+</script>
+HTML
+				,
+				/*
+				 * Note: The above comma must be on its own line in PHP<7.3 and not after the `HTML` identifier
+				 * terminating the heredoc. Otherwise, a syntax error is raised with the line number being wildly wrong:
+				 *
+				 * PHP Parse error:  syntax error, unexpected '' (T_ENCAPSED_AND_WHITESPACE), expecting '-' or identifier (T_STRING) or variable (T_VARIABLE) or number (T_NUM_STRING)
+				 */
+			),
+			'async-with-async-dependencies'                => array(
+				'set_up'          => function () {
+					$handle1 = 'async-no-dependency';
+					$handle2 = 'async-one-async-dependency';
+					$handle3 = 'async-two-async-dependencies';
+					$this->enqueue_test_script( $handle1, 'async', array() );
+					$this->enqueue_test_script( $handle2, 'async', array( $handle1 ) );
+					$this->enqueue_test_script( $handle3, 'async', array( $handle1, $handle2 ) );
+					foreach ( array( $handle1, $handle2, $handle3 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="async-no-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "async-no-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-no-dependency:%20script' id='async-no-dependency-js' data-wp-strategy='async'></script>
+<script id="async-no-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "async-no-dependency: after inline" )
+</script>
+<script id="async-one-async-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "async-one-async-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-one-async-dependency:%20script' id='async-one-async-dependency-js' data-wp-strategy='async'></script>
+<script id="async-one-async-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "async-one-async-dependency: after inline" )
+</script>
+<script id="async-two-async-dependencies-js-before" type="text/javascript">
+scriptEventLog.push( "async-two-async-dependencies: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-two-async-dependencies:%20script' id='async-two-async-dependencies-js' data-wp-strategy='async'></script>
+<script id="async-two-async-dependencies-js-after" type="text/javascript">
+scriptEventLog.push( "async-two-async-dependencies: after inline" )
+</script>
+HTML
+				,
+			),
+			'async-with-blocking-dependency'               => array(
+				'set_up'          => function () {
+					$handle1 = 'async-with-blocking-dependent';
+					$handle2 = 'blocking-dependent-of-async';
+					$this->enqueue_test_script( $handle1, 'async', array() );
+					$this->enqueue_test_script( $handle2, 'blocking', array( $handle1 ) );
+					foreach ( array( $handle1, $handle2 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="async-with-blocking-dependent-js-before" type="text/javascript">
+scriptEventLog.push( "async-with-blocking-dependent: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-with-blocking-dependent:%20script' id='async-with-blocking-dependent-js' data-wp-strategy='async'></script>
+<script id="async-with-blocking-dependent-js-after" type="text/javascript">
+scriptEventLog.push( "async-with-blocking-dependent: after inline" )
+</script>
+<script id="blocking-dependent-of-async-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-dependent-of-async: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-dependent-of-async:%20script' id='blocking-dependent-of-async-js'></script>
+<script id="blocking-dependent-of-async-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-dependent-of-async: after inline" )
+</script>
+HTML
+				,
+			),
+			'defer-with-async-dependency'                  => array(
+				'set_up'          => function () {
+					$handle1 = 'async-with-defer-dependent';
+					$handle2 = 'defer-dependent-of-async';
+					$this->enqueue_test_script( $handle1, 'async', array() );
+					$this->enqueue_test_script( $handle2, 'defer', array( $handle1 ) );
+					foreach ( array( $handle1, $handle2 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="async-with-defer-dependent-js-before" type="text/javascript">
+scriptEventLog.push( "async-with-defer-dependent: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-with-defer-dependent:%20script' id='async-with-defer-dependent-js' data-wp-strategy='async'></script>
+<script id="async-with-defer-dependent-js-after" type="text/javascript">
+scriptEventLog.push( "async-with-defer-dependent: after inline" )
+</script>
+<script id="defer-dependent-of-async-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-async: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-async:%20script' id='defer-dependent-of-async-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-async-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-async: after inline" )
+</script>
+HTML
+				,
+			),
+			'blocking-bundle-of-none-with-inline-scripts-and-defer-dependent' => array(
+				'set_up'          => function () {
+					$handle1 = 'blocking-bundle-of-none';
+					$handle2 = 'defer-dependent-of-blocking-bundle-of-none';
+
+					wp_register_script( $handle1, false, array(), null );
+					$this->add_test_inline_script( $handle1, 'before' );
+					$this->add_test_inline_script( $handle1, 'after' );
+
+					// Note: the before script for this will be blocking because the dependency is blocking.
+					$this->enqueue_test_script( $handle2, 'defer', array( $handle1 ) );
+					$this->add_test_inline_script( $handle2, 'before' );
+					$this->add_test_inline_script( $handle2, 'after' );
+				},
+				'expected_markup' => <<<HTML
+<script id="blocking-bundle-of-none-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-of-none: before inline" )
+</script>
+<script id="blocking-bundle-of-none-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-of-none: after inline" )
+</script>
+<script id="defer-dependent-of-blocking-bundle-of-none-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-bundle-of-none: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-blocking-bundle-of-none:%20script' id='defer-dependent-of-blocking-bundle-of-none-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-blocking-bundle-of-none-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-bundle-of-none: after inline" )
+</script>
+HTML
+				,
+			),
+			'blocking-bundle-of-two-with-defer-dependent'  => array(
+				'set_up'          => function () {
+					$handle1 = 'blocking-bundle-of-two';
+					$handle2 = 'blocking-bundle-member-one';
+					$handle3 = 'blocking-bundle-member-two';
+					$handle4 = 'defer-dependent-of-blocking-bundle-of-two';
+
+					wp_register_script( $handle1, false, array( $handle2, $handle3 ), null );
+					$this->enqueue_test_script( $handle2, 'blocking' );
+					$this->enqueue_test_script( $handle3, 'blocking' );
+					$this->enqueue_test_script( $handle4, 'defer', array( $handle1 ) );
+
+					foreach ( array( $handle2, $handle3, $handle4 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="blocking-bundle-member-one-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-member-one: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-bundle-member-one:%20script' id='blocking-bundle-member-one-js'></script>
+<script id="blocking-bundle-member-one-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-member-one: after inline" )
+</script>
+<script id="blocking-bundle-member-two-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-member-two: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-bundle-member-two:%20script' id='blocking-bundle-member-two-js'></script>
+<script id="blocking-bundle-member-two-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-bundle-member-two: after inline" )
+</script>
+<script id="defer-dependent-of-blocking-bundle-of-two-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-bundle-of-two: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-blocking-bundle-of-two:%20script' id='defer-dependent-of-blocking-bundle-of-two-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-blocking-bundle-of-two-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-bundle-of-two: after inline" )
+</script>
+HTML
+				,
+			),
+			'defer-bundle-of-none-with-inline-scripts-and-defer-dependents' => array(
+				'set_up'          => function () {
+					$handle1 = 'defer-bundle-of-none';
+					$handle2 = 'defer-dependent-of-defer-bundle-of-none';
+
+					// The eligible loading strategy for this will be forced to be blocking when rendered since $src = false.
+					wp_register_script( $handle1, false, array(), null );
+					wp_scripts()->registered[ $handle1 ]->extra['strategy'] = 'defer'; // Bypass wp_script_add_data() which should no-op with _doing_it_wrong() because of $src=false.
+					$this->add_test_inline_script( $handle1, 'before' );
+					$this->add_test_inline_script( $handle1, 'after' );
+
+					// Note: the before script for this will be blocking because the dependency is blocking.
+					$this->enqueue_test_script( $handle2, 'defer', array( $handle1 ) );
+					$this->add_test_inline_script( $handle2, 'before' );
+					$this->add_test_inline_script( $handle2, 'after' );
+				},
+				'expected_markup' => <<<HTML
+<script id="defer-bundle-of-none-js-before" type="text/javascript">
+scriptEventLog.push( "defer-bundle-of-none: before inline" )
+</script>
+<script id="defer-bundle-of-none-js-after" type="text/javascript">
+scriptEventLog.push( "defer-bundle-of-none: after inline" )
+</script>
+<script id="defer-dependent-of-defer-bundle-of-none-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-defer-bundle-of-none: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-defer-bundle-of-none:%20script' id='defer-dependent-of-defer-bundle-of-none-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-defer-bundle-of-none-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-defer-bundle-of-none: after inline" )
+</script>
+HTML
+				,
+			),
+			'defer-dependent-with-blocking-and-defer-dependencies' => array(
+				'set_up'          => function () {
+					$handle1 = 'blocking-dependency-with-defer-following-dependency';
+					$handle2 = 'defer-dependency-with-blocking-preceding-dependency';
+					$handle3 = 'defer-dependent-of-blocking-and-defer-dependencies';
+					$this->enqueue_test_script( $handle1, 'blocking', array() );
+					$this->enqueue_test_script( $handle2, 'defer', array() );
+					$this->enqueue_test_script( $handle3, 'defer', array( $handle1, $handle2 ) );
+
+					foreach ( array( $handle1, $handle2, $handle3 ) as $dep ) {
+						$this->add_test_inline_script( $dep, 'before' );
+						$this->add_test_inline_script( $dep, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="blocking-dependency-with-defer-following-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-dependency-with-defer-following-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-dependency-with-defer-following-dependency:%20script' id='blocking-dependency-with-defer-following-dependency-js'></script>
+<script id="blocking-dependency-with-defer-following-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-dependency-with-defer-following-dependency: after inline" )
+</script>
+<script id="defer-dependency-with-blocking-preceding-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependency-with-blocking-preceding-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependency-with-blocking-preceding-dependency:%20script' id='defer-dependency-with-blocking-preceding-dependency-js' data-wp-strategy='defer'></script>
+<script id="defer-dependency-with-blocking-preceding-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependency-with-blocking-preceding-dependency: after inline" )
+</script>
+<script id="defer-dependent-of-blocking-and-defer-dependencies-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-and-defer-dependencies: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-blocking-and-defer-dependencies:%20script' id='defer-dependent-of-blocking-and-defer-dependencies-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-blocking-and-defer-dependencies-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-blocking-and-defer-dependencies: after inline" )
+</script>
+HTML
+				,
+			),
+			'defer-dependent-with-defer-and-blocking-dependencies' => array(
+				'set_up'          => function () {
+					$handle1 = 'defer-dependency-with-blocking-following-dependency';
+					$handle2 = 'blocking-dependency-with-defer-preceding-dependency';
+					$handle3 = 'defer-dependent-of-defer-and-blocking-dependencies';
+					$this->enqueue_test_script( $handle1, 'defer', array() );
+					$this->enqueue_test_script( $handle2, 'blocking', array() );
+					$this->enqueue_test_script( $handle3, 'defer', array( $handle1, $handle2 ) );
+
+					foreach ( array( $handle1, $handle2, $handle3 ) as $dep ) {
+						$this->add_test_inline_script( $dep, 'before' );
+						$this->add_test_inline_script( $dep, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="defer-dependency-with-blocking-following-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependency-with-blocking-following-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependency-with-blocking-following-dependency:%20script' id='defer-dependency-with-blocking-following-dependency-js' data-wp-strategy='defer'></script>
+<script id="defer-dependency-with-blocking-following-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependency-with-blocking-following-dependency: after inline" )
+</script>
+<script id="blocking-dependency-with-defer-preceding-dependency-js-before" type="text/javascript">
+scriptEventLog.push( "blocking-dependency-with-defer-preceding-dependency: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=blocking-dependency-with-defer-preceding-dependency:%20script' id='blocking-dependency-with-defer-preceding-dependency-js'></script>
+<script id="blocking-dependency-with-defer-preceding-dependency-js-after" type="text/javascript">
+scriptEventLog.push( "blocking-dependency-with-defer-preceding-dependency: after inline" )
+</script>
+<script id="defer-dependent-of-defer-and-blocking-dependencies-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-defer-and-blocking-dependencies: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-defer-and-blocking-dependencies:%20script' id='defer-dependent-of-defer-and-blocking-dependencies-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-defer-and-blocking-dependencies-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-defer-and-blocking-dependencies: after inline" )
+</script>
+HTML
+				,
+			),
+			'async-with-defer-dependency'                  => array(
+				'set_up'          => function () {
+					$handle1 = 'defer-with-async-dependent';
+					$handle2 = 'async-dependent-of-defer';
+					$this->enqueue_test_script( $handle1, 'defer', array() );
+					$this->enqueue_test_script( $handle2, 'async', array( $handle1 ) );
+					foreach ( array( $handle1, $handle2 ) as $handle ) {
+						$this->add_test_inline_script( $handle, 'before' );
+						$this->add_test_inline_script( $handle, 'after' );
+					}
+				},
+				'expected_markup' => <<<HTML
+<script id="defer-with-async-dependent-js-before" type="text/javascript">
+scriptEventLog.push( "defer-with-async-dependent: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-with-async-dependent:%20script' id='defer-with-async-dependent-js' data-wp-strategy='defer'></script>
+<script id="defer-with-async-dependent-js-after" type="text/javascript">
+scriptEventLog.push( "defer-with-async-dependent: after inline" )
+</script>
+<script id="async-dependent-of-defer-js-before" type="text/javascript">
+scriptEventLog.push( "async-dependent-of-defer: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async-dependent-of-defer:%20script' id='async-dependent-of-defer-js' data-wp-strategy='async'></script>
+<script id="async-dependent-of-defer-js-after" type="text/javascript">
+scriptEventLog.push( "async-dependent-of-defer: after inline" )
+</script>
+HTML
+				,
+			),
+			'defer-with-before-inline-script'              => array(
+				'set_up'          => function () {
+					// Note this should NOT result in no delayed-inline-script-loader script being added.
+					$handle = 'defer-with-before-inline';
+					$this->enqueue_test_script( $handle, 'defer', array() );
+					$this->add_test_inline_script( $handle, 'before' );
+				},
+				'expected_markup' => <<<HTML
+<script id="defer-with-before-inline-js-before" type="text/javascript">
+scriptEventLog.push( "defer-with-before-inline: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-with-before-inline:%20script' id='defer-with-before-inline-js' defer data-wp-strategy='defer'></script>
+HTML
+				,
+			),
+			'defer-with-after-inline-script'               => array(
+				'set_up'          => function () {
+					// Note this SHOULD result in delayed-inline-script-loader script being added.
+					$handle = 'defer-with-after-inline';
+					$this->enqueue_test_script( $handle, 'defer', array() );
+					$this->add_test_inline_script( $handle, 'after' );
+				},
+				'expected_markup' => <<<HTML
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-with-after-inline:%20script' id='defer-with-after-inline-js' data-wp-strategy='defer'></script>
+<script id="defer-with-after-inline-js-after" type="text/javascript">
+scriptEventLog.push( "defer-with-after-inline: after inline" )
+</script>
+HTML
+				,
+			),
+			'jquery-deferred'                              => array(
+				'set_up'          => function () {
+					$wp_scripts = wp_scripts();
+					wp_default_scripts( $wp_scripts );
+					foreach ( $wp_scripts->registered['jquery']->deps as $jquery_dep ) {
+						$wp_scripts->registered[ $jquery_dep ]->add_data( 'strategy', 'defer' );
+						$wp_scripts->registered[ $jquery_dep ]->ver = null; // Just to avoid markup changes in the test when jQuery is upgraded.
+					}
+					wp_enqueue_script( 'theme-functions', 'https://example.com/theme-functions.js', array( 'jquery' ), null, array( 'strategy' => 'defer' ) );
+				},
+				'expected_markup' => <<<HTML
+<script type='text/javascript' src='http://example.org/wp-includes/js/jquery/jquery.js' id='jquery-core-js' defer data-wp-strategy='defer'></script>
+<script type='text/javascript' src='http://example.org/wp-includes/js/jquery/jquery-migrate.js' id='jquery-migrate-js' defer data-wp-strategy='defer'></script>
+<script type='text/javascript' src='https://example.com/theme-functions.js' id='theme-functions-js' defer data-wp-strategy='defer'></script>
+HTML
+				,
+			),
+			'nested-aliases'                               => array(
+				'set_up'          => function () {
+					$outer_alias_handle = 'outer-bundle-of-two';
+					$inner_alias_handle = 'inner-bundle-of-two';
+
+					// The outer alias contains a blocking member, as well as a nested alias that contains defer scripts.
+					wp_register_script( $outer_alias_handle, false, array( $inner_alias_handle, 'outer-bundle-leaf-member' ), null );
+					$this->register_test_script( 'outer-bundle-leaf-member', 'blocking', array() );
+
+					// Inner alias only contains delay scripts.
+					wp_register_script( $inner_alias_handle, false, array( 'inner-bundle-member-one', 'inner-bundle-member-two' ), null );
+					$this->register_test_script( 'inner-bundle-member-one', 'defer', array() );
+					$this->register_test_script( 'inner-bundle-member-two', 'defer', array() );
+
+					$this->enqueue_test_script( 'defer-dependent-of-nested-aliases', 'defer', array( $outer_alias_handle ) );
+					$this->add_test_inline_script( 'defer-dependent-of-nested-aliases', 'before' );
+					$this->add_test_inline_script( 'defer-dependent-of-nested-aliases', 'after' );
+				},
+				'expected_markup' => <<<HTML
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=inner-bundle-member-one:%20script' id='inner-bundle-member-one-js' data-wp-strategy='defer'></script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=inner-bundle-member-two:%20script' id='inner-bundle-member-two-js' data-wp-strategy='defer'></script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=outer-bundle-leaf-member:%20script' id='outer-bundle-leaf-member-js'></script>
+<script id="defer-dependent-of-nested-aliases-js-before" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-nested-aliases: before inline" )
+</script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-nested-aliases:%20script' id='defer-dependent-of-nested-aliases-js' data-wp-strategy='defer'></script>
+<script id="defer-dependent-of-nested-aliases-js-after" type="text/javascript">
+scriptEventLog.push( "defer-dependent-of-nested-aliases: after inline" )
+</script>
+HTML
+				,
+			),
+
+			'async-alias-members-with-defer-dependency'    => array(
+				'set_up'          => function () {
+					$alias_handle = 'async-alias';
+					$async_handle1 = 'async1';
+					$async_handle2 = 'async2';
+
+					wp_register_script( $alias_handle, false, array( $async_handle1, $async_handle2 ), null );
+					$this->register_test_script( $async_handle1, 'async', array() );
+					$this->register_test_script( $async_handle2, 'async', array() );
+
+					$this->enqueue_test_script( 'defer-dependent-of-async-aliases', 'defer', array( $alias_handle ) );
+				},
+				'expected_markup' => <<<HTML
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async1:%20script' id='async1-js' defer data-wp-strategy='async'></script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=async2:%20script' id='async2-js' defer data-wp-strategy='async'></script>
+<script type='text/javascript' src='https://example.com/external.js?script_event_log=defer-dependent-of-async-aliases:%20script' id='defer-dependent-of-async-aliases-js' defer data-wp-strategy='defer'></script>
+HTML
+				,
+			),
+		);
+	}
+
+	/**
+	 * Tests that various loading strategy dependency chains function as expected.
+	 *
+	 * @covers ::wp_enqueue_script()
+	 * @covers ::wp_add_inline_script()
+	 * @covers ::wp_print_scripts()
+	 * @covers WP_Scripts::get_inline_script_tag
+	 *
+	 * @dataProvider data_provider_to_test_various_strategy_dependency_chains
+	 *
+	 * @param callable $set_up          Set up.
+	 * @param string   $expected_markup Expected markup.
+	 */
+	public function test_various_strategy_dependency_chains( $set_up, $expected_markup ) {
+		$set_up();
+		$actual_markup = get_echo( 'wp_print_scripts' );
+		$this->assertEqualMarkup( trim( $expected_markup ), trim( $actual_markup ), "Actual markup:\n{$actual_markup}" );
+	}
+
+	/**
+	 * Tests that defer is the final strategy when registering a script using defer, that has no dependents/dependencies.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_defer_having_no_dependents_nor_dependencies() {
+		wp_enqueue_script( 'main-script-d1', 'http://example.com/main-script-d1.js', array(), null, array( 'strategy' => 'defer' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='http://example.com/main-script-d1.js' id='main-script-d1-js' defer data-wp-strategy='defer'></script>\n";
+		$this->assertStringContainsString( $expected, $output, 'Expected defer, as there is no dependent or dependency' );
+	}
+
+	/**
+	 * Tests that a script registered with defer remains deferred when all dependencies are either deferred or blocking.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_defer_dependent_and_varied_dependencies() {
+		wp_enqueue_script( 'dependency-script-d2-1', 'http://example.com/dependency-script-d2-1.js', array(), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependency-script-d2-2', 'http://example.com/dependency-script-d2-2.js', array(), null );
+		wp_enqueue_script( 'dependency-script-d2-3', 'http://example.com/dependency-script-d2-3.js', array( 'dependency-script-d2-2' ), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'main-script-d2', 'http://example.com/main-script-d2.js', array( 'dependency-script-d2-1', 'dependency-script-d2-3' ), null, array( 'strategy' => 'defer' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='http://example.com/main-script-d2.js' id='main-script-d2-js' defer data-wp-strategy='defer'></script>\n";
+		$this->assertStringContainsString( $expected, $output, 'Expected defer, as all dependencies are either deferred or blocking' );
+	}
+
+	/**
+	 * Tests that scripts registered with defer remain deferred when all dependents are also deferred.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_all_defer_dependencies() {
+		wp_enqueue_script( 'main-script-d3', 'http://example.com/main-script-d3.js', array(), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d3-1', 'http://example.com/dependent-script-d3-1.js', array( 'main-script-d3' ), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d3-2', 'http://example.com/dependent-script-d3-2.js', array( 'dependent-script-d3-1' ), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d3-3', 'http://example.com/dependent-script-d3-3.js', array( 'dependent-script-d3-2' ), null, array( 'strategy' => 'defer' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='http://example.com/main-script-d3.js' id='main-script-d3-js' defer data-wp-strategy='defer'></script>\n";
+		$this->assertStringContainsString( $expected, $output, 'Expected defer, as all dependents have defer loading strategy' );
+	}
+
+	/**
+	 * Tests that dependents that are async but attached to a deferred main script, print with defer as opposed to async.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_defer_with_async_dependent() {
+		// case with one async dependent.
+		wp_enqueue_script( 'main-script-d4', '/main-script-d4.js', array(), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d4-1', '/dependent-script-d4-1.js', array( 'main-script-d4' ), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d4-2', '/dependent-script-d4-2.js', array( 'dependent-script-d4-1' ), null, array( 'strategy' => 'async' ) );
+		wp_enqueue_script( 'dependent-script-d4-3', '/dependent-script-d4-3.js', array( 'dependent-script-d4-2' ), null, array( 'strategy' => 'defer' ) );
+		$output    = get_echo( 'wp_print_scripts' );
+		$expected  = "<script type='text/javascript' src='/main-script-d4.js' id='main-script-d4-js' defer data-wp-strategy='defer'></script>\n";
+		$expected .= "<script type='text/javascript' src='/dependent-script-d4-1.js' id='dependent-script-d4-1-js' defer data-wp-strategy='defer'></script>\n";
+		$expected .= "<script type='text/javascript' src='/dependent-script-d4-2.js' id='dependent-script-d4-2-js' defer data-wp-strategy='async'></script>\n";
+		$expected .= "<script type='text/javascript' src='/dependent-script-d4-3.js' id='dependent-script-d4-3-js' defer data-wp-strategy='defer'></script>\n";
+
+		$this->assertSame( $expected, $output, 'Scripts registered as defer but that have dependents that are async are expected to have said dependents deferred.' );
+	}
+
+	/**
+	 * Tests that scripts registered as defer become blocking when their dependents chain are all blocking.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_invalid_defer_registration() {
+		// Main script is defer and all dependent are not defer. Then main script will have blocking(or no) strategy.
+		wp_enqueue_script( 'main-script-d4', '/main-script-d4.js', array(), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d4-1', '/dependent-script-d4-1.js', array( 'main-script-d4' ), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'dependent-script-d4-2', '/dependent-script-d4-2.js', array( 'dependent-script-d4-1' ), null );
+		wp_enqueue_script( 'dependent-script-d4-3', '/dependent-script-d4-3.js', array( 'dependent-script-d4-2' ), null, array( 'strategy' => 'defer' ) );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-d4.js' id='main-script-d4-js' data-wp-strategy='defer'></script>\n";
+		$this->assertStringContainsString( $expected, $output, 'Scripts registered as defer but that have all dependents with no strategy, should become blocking (no strategy).' );
+	}
+
+	/**
+	 * Tests that scripts registered as default/blocking remain as such when they have no dependencies.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers WP_Scripts::get_eligible_loading_strategy
+	 * @covers WP_Scripts::filter_eligible_strategies
+	 * @covers ::wp_enqueue_script
+	 */
+	public function test_loading_strategy_with_valid_blocking_registration() {
+		wp_enqueue_script( 'main-script-b1', '/main-script-b1.js', array(), null );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-b1.js' id='main-script-b1-js'></script>\n";
+		$this->assertSame( $expected, $output, 'Scripts registered with a "blocking" strategy, and who have no dependencies, should have no loading strategy attributes printed.' );
+
+		// strategy args not set.
+		wp_enqueue_script( 'main-script-b2', '/main-script-b2.js', array(), null, array() );
+		$output   = get_echo( 'wp_print_scripts' );
+		$expected = "<script type='text/javascript' src='/main-script-b2.js' id='main-script-b2-js'></script>\n";
+		$this->assertSame( $expected, $output, 'Scripts registered with no strategy assigned, and who have no dependencies, should have no loading strategy attributes printed.' );
+	}
+
+	/**
+	 * Tests that scripts registered for the head do indeed end up there.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_register_script
+	 */
+	public function test_scripts_targeting_head() {
+		wp_register_script( 'header-old', '/header-old.js', array(), null, false );
+		wp_register_script( 'header-new', '/header-new.js', array( 'header-old' ), null, array( 'in_footer' => false ) );
+		wp_enqueue_script( 'enqueue-header-old', '/enqueue-header-old.js', array( 'header-new' ), null, false );
+		wp_enqueue_script( 'enqueue-header-new', '/enqueue-header-new.js', array( 'enqueue-header-old' ), null, array( 'in_footer' => false ) );
+
+		$actual_header = get_echo( 'wp_print_head_scripts' );
+		$actual_footer = get_echo( 'wp_print_scripts' );
+
+		$expected_header  = "<script type='text/javascript' src='/header-old.js' id='header-old-js'></script>\n";
+		$expected_header .= "<script type='text/javascript' src='/header-new.js' id='header-new-js'></script>\n";
+		$expected_header .= "<script type='text/javascript' src='/enqueue-header-old.js' id='enqueue-header-old-js'></script>\n";
+		$expected_header .= "<script type='text/javascript' src='/enqueue-header-new.js' id='enqueue-header-new-js'></script>\n";
+
+		$this->assertSame( $expected_header, $actual_header, 'Scripts registered/enqueued using the older $in_footer parameter or the newer $args parameter should have the same outcome.' );
+		$this->assertEmpty( $actual_footer, 'Expected footer to be empty since all scripts were for head.' );
+	}
+
+	/**
+	 * Test that scripts registered for the footer do indeed end up there.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_register_script
+	 */
+	public function test_scripts_targeting_footer() {
+		wp_register_script( 'footer-old', '/footer-old.js', array(), null, true );
+		wp_register_script( 'footer-new', '/footer-new.js', array( 'footer-old' ), null, array( 'in_footer' => true ) );
+		wp_enqueue_script( 'enqueue-footer-old', '/enqueue-footer-old.js', array( 'footer-new' ), null, true );
+		wp_enqueue_script( 'enqueue-footer-new', '/enqueue-footer-new.js', array( 'enqueue-footer-old' ), null, array( 'in_footer' => true ) );
+
+		$actual_header = get_echo( 'wp_print_head_scripts' );
+		$actual_footer = get_echo( 'wp_print_scripts' );
+
+		$expected_footer  = "<script type='text/javascript' src='/footer-old.js' id='footer-old-js'></script>\n";
+		$expected_footer .= "<script type='text/javascript' src='/footer-new.js' id='footer-new-js'></script>\n";
+		$expected_footer .= "<script type='text/javascript' src='/enqueue-footer-old.js' id='enqueue-footer-old-js'></script>\n";
+		$expected_footer .= "<script type='text/javascript' src='/enqueue-footer-new.js' id='enqueue-footer-new-js'></script>\n";
+
+		$this->assertEmpty( $actual_header, 'Expected header to be empty since all scripts targeted footer.' );
+		$this->assertSame( $expected_footer, $actual_footer, 'Scripts registered/enqueued using the older $in_footer parameter or the newer $args parameter should have the same outcome.' );
+	}
+
+	/**
+	 * Data provider for test_setting_in_footer_and_strategy.
+	 *
+	 * @return array[]
+	 */
+	public function get_data_for_test_setting_in_footer_and_strategy() {
+		return array(
+			// Passing in_footer and strategy via args array.
+			'async_footer_in_args_array'    => array(
+				'set_up'   => static function ( $handle ) {
+					$args = array(
+						'in_footer' => true,
+						'strategy'  => 'async',
+					);
+					wp_enqueue_script( $handle, '/footer-async.js', array(), null, $args );
+				},
+				'group'    => 1,
+				'strategy' => 'async',
+			),
+
+			// Passing in_footer=true but no strategy.
+			'blocking_footer_in_args_array' => array(
+				'set_up'   => static function ( $handle ) {
+					wp_register_script( $handle, '/defaults.js', array(), null, array( 'in_footer' => true ) );
+				},
+				'group'    => 1,
+				'strategy' => false,
+			),
+
+			// Passing async strategy in script args array.
+			'async_in_args_array'           => array(
+				'set_up'   => static function ( $handle ) {
+					wp_register_script( $handle, '/defaults.js', array(), null, array( 'strategy' => 'async' ) );
+				},
+				'group'    => false,
+				'strategy' => 'async',
+			),
+
+			// Passing empty array as 5th arg.
+			'empty_args_array'              => array(
+				'set_up'   => static function ( $handle ) {
+					wp_register_script( $handle, '/defaults.js', array(), null, array() );
+				},
+				'group'    => false,
+				'strategy' => false,
+			),
+
+			// Passing no value as 5th arg.
+			'undefined_args_param'          => array(
+				'set_up'   => static function ( $handle ) {
+					wp_register_script( $handle, '/defaults.js', array(), null );
+				},
+				'group'    => false,
+				'strategy' => false,
+			),
+
+			// Test backward compatibility, passing $in_footer=true as 5th arg.
+			'passing_bool_as_args_param'    => array(
+				'set_up'   => static function ( $handle ) {
+					wp_enqueue_script( $handle, '/footer-async.js', array(), null, true );
+				},
+				'group'    => 1,
+				'strategy' => false,
+			),
+
+			// Test backward compatibility, passing $in_footer=true as 5th arg and setting strategy via wp_script_add_data().
+			'bool_as_args_and_add_data'     => array(
+				'set_up'   => static function ( $handle ) {
+					wp_register_script( $handle, '/footer-async.js', array(), null, true );
+					wp_script_add_data( $handle, 'strategy', 'defer' );
+				},
+				'group'    => 1,
+				'strategy' => 'defer',
+			),
+		);
+	}
+
+	/**
+	 * Tests that scripts print in the correct group (head/footer) when using in_footer and assigning a strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers ::wp_register_script
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_script_add_data
+	 *
+	 * @dataProvider get_data_for_test_setting_in_footer_and_strategy
+	 *
+	 * @param callable     $set_up            Set up.
+	 * @param int|false    $expected_group    Expected group.
+	 * @param string|false $expected_strategy Expected strategy.
+	 */
+	public function test_setting_in_footer_and_strategy( $set_up, $expected_group, $expected_strategy ) {
+		$handle = 'foo';
+		$set_up( $handle );
+		$this->assertSame( $expected_group, wp_scripts()->get_data( $handle, 'group' ) );
+		$this->assertSame( $expected_strategy, wp_scripts()->get_data( $handle, 'strategy' ) );
+	}
+
+	/**
+	 * Tests that scripts print with no strategy when an incorrect strategy is passed during wp_register_script.
+	 *
+	 * For an invalid strategy defined during script registration, default to a blocking strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::add_data
+	 * @covers ::wp_register_script
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @expectedIncorrectUsage WP_Scripts::add_data
+	 */
+	public function test_script_strategy_doing_it_wrong_via_register() {
+		wp_register_script( 'invalid-strategy', '/defaults.js', array(), null, array( 'strategy' => 'random-strategy' ) );
+		wp_enqueue_script( 'invalid-strategy' );
+
+		$this->assertSame(
+			"<script type='text/javascript' src='/defaults.js' id='invalid-strategy-js'></script>\n",
+			get_echo( 'wp_print_scripts' )
+		);
+	}
+
+	/**
+	 * Tests that scripts print with no strategy when an incorrect strategy is passed via wp_script_add_data().
+	 *
+	 * For an invalid strategy defined during script registration, default to a blocking strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::add_data
+	 * @covers ::wp_script_add_data
+	 * @covers ::wp_register_script
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @expectedIncorrectUsage WP_Scripts::add_data
+	 */
+	public function test_script_strategy_doing_it_wrong_via_add_data() {
+		wp_register_script( 'invalid-strategy', '/defaults.js', array(), null );
+		wp_script_add_data( 'invalid-strategy', 'strategy', 'random-strategy' );
+		wp_enqueue_script( 'invalid-strategy' );
+
+		$this->assertSame(
+			"<script type='text/javascript' src='/defaults.js' id='invalid-strategy-js'></script>\n",
+			get_echo( 'wp_print_scripts' )
+		);
+	}
+
+	/**
+	 * Tests that scripts print with no strategy when an incorrect strategy is passed during wp_enqueue_script.
+	 *
+	 * For an invalid strategy defined during script registration, default to a blocking strategy.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::add_data
+	 * @covers ::wp_enqueue_script
+	 *
+	 * @expectedIncorrectUsage WP_Scripts::add_data
+	 */
+	public function test_script_strategy_doing_it_wrong_via_enqueue() {
+		wp_enqueue_script( 'invalid-strategy', '/defaults.js', array(), null, array( 'strategy' => 'random-strategy' ) );
+
+		$this->assertSame(
+			"<script type='text/javascript' src='/defaults.js' id='invalid-strategy-js'></script>\n",
+			get_echo( 'wp_print_scripts' )
+		);
+	}
+
+	/**
+	 * Tests that scripts registered with a deferred strategy are not included in the script concat loading query.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_register_script
+	 */
+	public function test_concatenate_with_defer_strategy() {
+		global $wp_scripts, $concatenate_scripts, $wp_version;
+
+		$old_value           = $concatenate_scripts;
+		$concatenate_scripts = true;
+
+		$wp_scripts->do_concat    = true;
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
+
+		wp_register_script( 'one-concat-dep', $this->default_scripts_dir . 'script.js' );
+		wp_register_script( 'two-concat-dep', $this->default_scripts_dir . 'script.js' );
+		wp_register_script( 'three-concat-dep', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'main-defer-script', '/main-script.js', array( 'one-concat-dep', 'two-concat-dep', 'three-concat-dep' ), null, array( 'strategy' => 'defer' ) );
+
+		wp_print_scripts();
+		$print_scripts = get_echo( '_print_scripts' );
+
+		// Reset global before asserting.
+		$concatenate_scripts = $old_value;
+
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep,two-concat-dep,three-concat-dep&amp;ver={$wp_version}'></script>\n";
+		$expected .= "<script type='text/javascript' src='/main-script.js' id='main-defer-script-js' defer data-wp-strategy='defer'></script>\n";
+
+		$this->assertSame( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered with a "defer" loading strategy. Deferred scripts should not be part of the script concat loading query.' );
+	}
+
+	/**
+	 * Test script concatenation with `async` main script.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_register_script
+	 */
+	public function test_concatenate_with_async_strategy() {
+		global $wp_scripts, $concatenate_scripts, $wp_version;
+
+		$old_value           = $concatenate_scripts;
+		$concatenate_scripts = true;
+
+		$wp_scripts->do_concat    = true;
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
+
+		wp_enqueue_script( 'one-concat-dep-1', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'two-concat-dep-1', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'three-concat-dep-1', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'main-async-script-1', '/main-script.js', array(), null, array( 'strategy' => 'async' ) );
+
+		wp_print_scripts();
+		$print_scripts = get_echo( '_print_scripts' );
+
+		// Reset global before asserting.
+		$concatenate_scripts = $old_value;
+
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-1,two-concat-dep-1,three-concat-dep-1&amp;ver={$wp_version}'></script>\n";
+		$expected .= "<script type='text/javascript' src='/main-script.js' id='main-async-script-1-js' async data-wp-strategy='async'></script>\n";
+
+		$this->assertSame( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered with an "async" loading strategy. Async scripts should not be part of the script concat loading query.' );
+	}
+
+	/**
+	 * Tests that script concatenation remains correct when a main script is registered as deferred after other blocking
+	 * scripts are registered.
+	 *
+	 * @ticket 12009
+	 *
+	 * @covers WP_Scripts::do_item
+	 * @covers ::wp_enqueue_script
+	 * @covers ::wp_register_script
+	 */
+	public function test_concatenate_with_blocking_script_before_and_after_script_with_defer_strategy() {
+		global $wp_scripts, $concatenate_scripts, $wp_version;
+
+		$old_value           = $concatenate_scripts;
+		$concatenate_scripts = true;
+
+		$wp_scripts->do_concat    = true;
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
+
+		wp_enqueue_script( 'one-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'two-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'three-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'deferred-script-2', '/main-script.js', array(), null, array( 'strategy' => 'defer' ) );
+		wp_enqueue_script( 'four-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'five-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'six-concat-dep-2', $this->default_scripts_dir . 'script.js' );
+
+		wp_print_scripts();
+		$print_scripts = get_echo( '_print_scripts' );
+
+		// Reset global before asserting.
+		$concatenate_scripts = $old_value;
+
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-2,two-concat-dep-2,three-concat-dep-2,four-concat-dep-2,five-concat-dep-2,six-concat-dep-2&amp;ver={$wp_version}'></script>\n";
+		$expected .= "<script type='text/javascript' src='/main-script.js' id='deferred-script-2-js' defer data-wp-strategy='defer'></script>\n";
+
+		$this->assertSame( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered as deferred after other blocking scripts are registered. Deferred scripts should not be part of the script concat loader query string. ' );
+	}
+
 	/**
 	 * @ticket 42804
 	 */
 	public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_attribute() {
+		global $wp_version;
 		add_theme_support( 'html5', array( 'script' ) );
 
 		$GLOBALS['wp_scripts']                  = new WP_Scripts();
@@ -74,8 +1419,7 @@ public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_
 
 		wp_enqueue_script( 'empty-deps-no-version', 'example.com' );
 
-		$ver      = get_bloginfo( 'version' );
-		$expected = "<script src='http://example.com?ver=$ver' id='empty-deps-no-version-js'></script>\n";
+		$expected = "<script src='http://example.com?ver={$wp_version}' id='empty-deps-no-version-js'></script>\n";
 
 		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
 	}
@@ -83,37 +1427,37 @@ public function test_wp_enqueue_script_with_html5_support_does_not_contain_type_
 	/**
 	 * Test the different protocol references in wp_enqueue_script
 	 *
-	 * @global WP_Scripts $wp_scripts
 	 * @ticket 16560
+	 *
+	 * @global WP_Scripts $wp_scripts
 	 */
 	public function test_protocols() {
 		// Init.
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 		$base_url_backup      = $wp_scripts->base_url;
 		$wp_scripts->base_url = 'http://example.com/wordpress';
 		$expected             = '';
-		$ver                  = get_bloginfo( 'version' );
 
 		// Try with an HTTP reference.
 		wp_enqueue_script( 'jquery-http', 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
-		$expected .= "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-http-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver={$wp_version}' id='jquery-http-js'></script>\n";
 
 		// Try with an HTTPS reference.
 		wp_enqueue_script( 'jquery-https', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
-		$expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-https-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver={$wp_version}' id='jquery-https-js'></script>\n";
 
 		// Try with an automatic protocol reference (//).
 		wp_enqueue_script( 'jquery-doubleslash', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
-		$expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-doubleslash-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver={$wp_version}' id='jquery-doubleslash-js'></script>\n";
 
 		// Try with a local resource and an automatic protocol reference (//).
 		$url = '//my_plugin/script.js';
 		wp_enqueue_script( 'plugin-script', $url );
-		$expected .= "<script type='text/javascript' src='$url?ver=$ver' id='plugin-script-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='$url?ver={$wp_version}' id='plugin-script-js'></script>\n";
 
 		// Try with a bad protocol.
 		wp_enqueue_script( 'jquery-ftp', 'ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' );
-		$expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-ftp-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver={$wp_version}' id='jquery-ftp-js'></script>\n";
 
 		// Go!
 		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
@@ -129,20 +1473,19 @@ public function test_protocols() {
 	 * Test script concatenation.
 	 */
 	public function test_script_concatenation() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
-		$wp_scripts->default_dirs = array( '/directory/' );
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
 
-		wp_enqueue_script( 'one', '/directory/script.js' );
-		wp_enqueue_script( 'two', '/directory/script.js' );
-		wp_enqueue_script( 'three', '/directory/script.js' );
+		wp_enqueue_script( 'one', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'two', $this->default_scripts_dir . 'script.js' );
+		wp_enqueue_script( 'three', $this->default_scripts_dir . 'script.js' );
 
 		wp_print_scripts();
 		$print_scripts = get_echo( '_print_scripts' );
 
-		$ver      = get_bloginfo( 'version' );
-		$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two,three&amp;ver={$ver}'></script>\n";
+		$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two,three&amp;ver={$wp_version}'></script>\n";
 
 		$this->assertSame( $expected, $print_scripts );
 	}
@@ -205,7 +1548,7 @@ public function test_wp_script_add_data_with_data_and_conditional_keys() {
 	}
 
 	/**
-	 * Testing `wp_script_add_data` with an anvalid key.
+	 * Testing `wp_script_add_data` with an invalid key.
 	 *
 	 * @ticket 16024
 	 */
@@ -276,7 +1619,7 @@ public function test_wp_enqueue_script_footer_alias() {
 	 * @covers WP_Dependencies::do_items
 	 */
 	public function test_group_mismatch_in_deps() {
-		$scripts = new WP_Scripts;
+		$scripts = new WP_Scripts();
 		$scripts->add( 'one', 'one', array(), 'v1', 1 );
 		$scripts->add( 'two', 'two', array( 'one' ) );
 		$scripts->add( 'three', 'three', array( 'two' ), 'v1', 1 );
@@ -295,7 +1638,7 @@ public function test_group_mismatch_in_deps() {
 		$this->assertContains( 'two', $scripts->done );
 		$this->assertContains( 'three', $scripts->done );
 
-		$scripts = new WP_Scripts;
+		$scripts = new WP_Scripts();
 		$scripts->add( 'one', 'one', array(), 'v1', 1 );
 		$scripts->add( 'two', 'two', array( 'one' ), 'v1', 1 );
 		$scripts->add( 'three', 'three', array( 'one' ) );
@@ -333,8 +1676,8 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer() {
 		$expected_header .= "<script type='text/javascript' src='/child-head.js' id='child-head-js'></script>\n";
 		$expected_footer  = "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n";
 
-		$this->assertSame( $expected_header, $header );
-		$this->assertSame( $expected_footer, $footer );
+		$this->assertSame( $expected_header, $header, 'Expected same header markup.' );
+		$this->assertSame( $expected_footer, $footer, 'Expected same footer markup.' );
 	}
 
 	/**
@@ -354,8 +1697,8 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_
 		$expected_footer  = "<script type='text/javascript' src='/child-footer.js' id='child-footer-js'></script>\n";
 		$expected_footer .= "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n";
 
-		$this->assertSame( $expected_header, $header );
-		$this->assertSame( $expected_footer, $footer );
+		$this->assertSame( $expected_header, $header, 'Expected same header markup.' );
+		$this->assertSame( $expected_footer, $footer, 'Expected same footer markup.' );
 	}
 
 	/**
@@ -385,8 +1728,8 @@ public function test_wp_register_script_with_dependencies_in_head_and_footer_in_
 		$expected_footer .= "<script type='text/javascript' src='/child2-footer.js' id='child2-footer-js'></script>\n";
 		$expected_footer .= "<script type='text/javascript' src='/parent-footer.js' id='parent-footer-js'></script>\n";
 
-		$this->assertSame( $expected_header, $header );
-		$this->assertSame( $expected_footer, $footer );
+		$this->assertSame( $expected_header, $header, 'Expected same header markup.' );
+		$this->assertSame( $expected_footer, $footer, 'Expected same footer markup.' );
 	}
 
 	/**
@@ -416,7 +1759,7 @@ public function test_wp_add_inline_script_before() {
 		$expected  = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -429,7 +1772,7 @@ public function test_wp_add_inline_script_after() {
 		$expected  = "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -444,7 +1787,7 @@ public function test_wp_add_inline_script_before_and_after() {
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -457,7 +1800,7 @@ public function test_wp_add_inline_script_before_for_handle_without_source() {
 
 		$expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -470,7 +1813,7 @@ public function test_wp_add_inline_script_after_for_handle_without_source() {
 
 		$expected = "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -485,7 +1828,7 @@ public function test_wp_add_inline_script_before_and_after_for_handle_without_so
 		$expected  = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -502,7 +1845,7 @@ public function test_wp_add_inline_script_multiple() {
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -519,85 +1862,82 @@ public function test_wp_add_inline_script_localized_data_is_added_first() {
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
 	 * @ticket 14853
 	 */
 	public function test_wp_add_inline_script_before_with_concat() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
-		$wp_scripts->default_dirs = array( '/directory/' );
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
 
-		wp_enqueue_script( 'one', '/directory/one.js' );
-		wp_enqueue_script( 'two', '/directory/two.js' );
-		wp_enqueue_script( 'three', '/directory/three.js' );
+		wp_enqueue_script( 'one', $this->default_scripts_dir . 'one.js' );
+		wp_enqueue_script( 'two', $this->default_scripts_dir . 'two.js' );
+		wp_enqueue_script( 'three', $this->default_scripts_dir . 'three.js' );
 
 		wp_add_inline_script( 'one', 'console.log("before one");', 'before' );
 		wp_add_inline_script( 'two', 'console.log("before two");', 'before' );
 
-		$ver       = get_bloginfo( 'version' );
 		$expected  = "<script type='text/javascript' id='one-js-before'>\nconsole.log(\"before one\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' id='one-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}one.js?ver={$wp_version}' id='one-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='two-js-before'>\nconsole.log(\"before two\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}two.js?ver={$wp_version}' id='two-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}three.js?ver={$wp_version}' id='three-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
 	 * @ticket 14853
 	 */
 	public function test_wp_add_inline_script_before_with_concat2() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
-		$wp_scripts->default_dirs = array( '/directory/' );
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
 
-		wp_enqueue_script( 'one', '/directory/one.js' );
-		wp_enqueue_script( 'two', '/directory/two.js' );
-		wp_enqueue_script( 'three', '/directory/three.js' );
+		wp_enqueue_script( 'one', $this->default_scripts_dir . 'one.js' );
+		wp_enqueue_script( 'two', $this->default_scripts_dir . 'two.js' );
+		wp_enqueue_script( 'three', $this->default_scripts_dir . 'three.js' );
 
 		wp_add_inline_script( 'one', 'console.log("before one");', 'before' );
 
-		$ver       = get_bloginfo( 'version' );
 		$expected  = "<script type='text/javascript' id='one-js-before'>\nconsole.log(\"before one\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' id='one-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}one.js?ver={$wp_version}' id='one-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}two.js?ver={$wp_version}' id='two-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}three.js?ver={$wp_version}' id='three-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
 	 * @ticket 14853
 	 */
 	public function test_wp_add_inline_script_after_with_concat() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
-		$wp_scripts->default_dirs = array( '/directory/' );
+		$wp_scripts->default_dirs = array( $this->default_scripts_dir );
 
-		wp_enqueue_script( 'one', '/directory/one.js' );
-		wp_enqueue_script( 'two', '/directory/two.js' );
-		wp_enqueue_script( 'three', '/directory/three.js' );
-		wp_enqueue_script( 'four', '/directory/four.js' );
+		wp_enqueue_script( 'one', $this->default_scripts_dir . 'one.js' );
+		wp_enqueue_script( 'two', $this->default_scripts_dir . 'two.js' );
+		wp_enqueue_script( 'three', $this->default_scripts_dir . 'three.js' );
+		wp_enqueue_script( 'four', $this->default_scripts_dir . 'four.js' );
 
 		wp_add_inline_script( 'two', 'console.log("after two");' );
 		wp_add_inline_script( 'three', 'console.log("after three");' );
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one&amp;ver={$ver}'></script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one&amp;ver={$wp_version}'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}two.js?ver={$wp_version}' id='two-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='two-js-after'>\nconsole.log(\"after two\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}three.js?ver={$wp_version}' id='three-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='three-js-after'>\nconsole.log(\"after three\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/directory/four.js?ver={$ver}' id='four-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}four.js?ver={$wp_version}' id='four-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
@@ -626,7 +1966,7 @@ public function test_wp_add_inline_script_after_and_before_with_concat_and_condi
 		wp_script_add_data( 'test-example', 'conditional', 'gte IE 9' );
 
 		$this->assertSame( $expected_localized, get_echo( 'wp_print_scripts' ) );
-		$this->assertSame( $expected, $wp_scripts->print_html );
+		$this->assertEqualMarkup( $expected, $wp_scripts->print_html );
 		$this->assertTrue( $wp_scripts->do_concat );
 	}
 
@@ -634,15 +1974,14 @@ public function test_wp_add_inline_script_after_and_before_with_concat_and_condi
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_after_with_concat_and_core_dependency() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		wp_default_scripts( $wp_scripts );
 
 		$wp_scripts->base_url  = '';
 		$wp_scripts->do_concat = true;
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
 
@@ -652,22 +1991,21 @@ public function test_wp_add_inline_script_after_with_concat_and_core_dependency(
 		wp_print_scripts();
 		$print_scripts = get_echo( '_print_scripts' );
 
-		$this->assertSame( $expected, $print_scripts );
+		$this->assertEqualMarkup( $expected, $print_scripts );
 	}
 
 	/**
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_after_with_concat_and_conditional_and_core_dependency() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		wp_default_scripts( $wp_scripts );
 
 		$wp_scripts->base_url  = '';
 		$wp_scripts->do_concat = true;
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<!--[if gte IE 9]>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
@@ -680,14 +2018,14 @@ public function test_wp_add_inline_script_after_with_concat_and_conditional_and_
 		wp_print_scripts();
 		$print_scripts = get_echo( '_print_scripts' );
 
-		$this->assertSame( $expected, $print_scripts );
+		$this->assertEqualMarkup( $expected, $print_scripts );
 	}
 
 	/**
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_before_with_concat_and_core_dependency() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		wp_default_scripts( $wp_scripts );
 		wp_default_packages( $wp_scripts );
@@ -695,8 +2033,7 @@ public function test_wp_add_inline_script_before_with_concat_and_core_dependency
 		$wp_scripts->base_url  = '';
 		$wp_scripts->do_concat = true;
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 
@@ -706,14 +2043,14 @@ public function test_wp_add_inline_script_before_with_concat_and_core_dependency
 		wp_print_scripts();
 		$print_scripts = get_echo( '_print_scripts' );
 
-		$this->assertSame( $expected, $print_scripts );
+		$this->assertEqualMarkup( $expected, $print_scripts );
 	}
 
 	/**
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_before_after_concat_with_core_dependency() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		wp_default_scripts( $wp_scripts );
 		wp_default_packages( $wp_scripts );
@@ -721,9 +2058,7 @@ public function test_wp_add_inline_script_before_after_concat_with_core_dependen
 		$wp_scripts->base_url  = '';
 		$wp_scripts->do_concat = true;
 
-		$ver       = get_bloginfo( 'version' );
-		$suffix    = wp_scripts_get_suffix();
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate,regenerator-runtime,wp-polyfill,wp-dom-ready,wp-hooks&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate,wp-polyfill-inert,regenerator-runtime,wp-polyfill,wp-dom-ready,wp-hooks&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
 		$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
 		$expected .= "<script type='text/javascript' src='/wp-includes/js/dist/i18n.min.js' id='wp-i18n-js'></script>\n";
@@ -758,7 +2093,7 @@ public function test_wp_add_inline_script_before_after_concat_with_core_dependen
 			$print_scripts         // Printed scripts.
 		);
 
-		$this->assertSameIgnoreEOL( $expected, $print_scripts );
+		$this->assertEqualMarkup( $expected, $print_scripts );
 	}
 
 	/**
@@ -790,14 +2125,14 @@ public function test_wp_add_inline_script_customize_dependency() {
 		$print_scripts = $this->getActualOutput();
 
 		$tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js' id='customize-dependency-js'>" ) );
-		$this->assertSame( $expected_tail, $tail );
+		$this->assertEqualMarkup( $expected_tail, $tail );
 	}
 
 	/**
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_after_for_core_scripts_with_concat_is_limited_and_falls_back_to_no_concat() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
 		$wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.
@@ -808,21 +2143,20 @@ public function test_wp_add_inline_script_after_for_core_scripts_with_concat_is_
 		wp_enqueue_script( 'three', '/wp-includes/js/script3.js' );
 		wp_enqueue_script( 'four', '/wp-includes/js/script4.js' );
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-includes/js/script.js?ver={$ver}' id='one-js'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-includes/js/script.js?ver={$wp_version}' id='one-js'></script>\n";
 		$expected .= "<script type='text/javascript' id='one-js-after'>\nconsole.log(\"after one\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js?ver={$ver}' id='two-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js?ver={$wp_version}' id='two-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$wp_version}' id='three-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$wp_version}' id='four-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
 	}
 
 	/**
 	 * @ticket 36392
 	 */
 	public function test_wp_add_inline_script_before_third_core_script_prints_two_concat_scripts() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
 		$wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.
@@ -833,13 +2167,117 @@ public function test_wp_add_inline_script_before_third_core_script_prints_two_co
 		wp_add_inline_script( 'three', 'console.log("before three");', 'before' );
 		wp_enqueue_script( 'four', '/wp-includes/js/script4.js' );
 
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<script type='text/javascript' id='three-js-before'>\nconsole.log(\"before three\");\n</script>\n";
-		$expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n";
-		$expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$wp_version}' id='three-js'></script>\n";
+		$expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$wp_version}' id='four-js'></script>\n";
 
-		$this->assertSame( $expected, get_echo( 'wp_print_scripts' ) );
+		$this->assertEqualMarkup( $expected, get_echo( 'wp_print_scripts' ) );
+	}
+
+	/**
+	 * Data provider to test get_inline_script_data and get_inline_script_tag.
+	 *
+	 * @return array[]
+	 */
+	public function data_provider_to_test_get_inline_script() {
+		return array(
+			'before-blocking' => array(
+				'position'       => 'before',
+				'inline_scripts' => array(
+					'/*before foo 1*/',
+				),
+				'delayed'        => false,
+				'expected_data'  => '/*before foo 1*/',
+				'expected_tag'   => "<script id='foo-js-before' type='text/javascript'>\n/*before foo 1*/\n</script>\n",
+			),
+			'after-blocking'  => array(
+				'position'       => 'after',
+				'inline_scripts' => array(
+					'/*after foo 1*/',
+					'/*after foo 2*/',
+				),
+				'delayed'        => false,
+				'expected_data'  => "/*after foo 1*/\n/*after foo 2*/",
+				'expected_tag'   => "<script id='foo-js-after' type='text/javascript'>\n/*after foo 1*/\n/*after foo 2*/\n</script>\n",
+			),
+			'before-delayed'  => array(
+				'position'       => 'before',
+				'inline_scripts' => array(
+					'/*before foo 1*/',
+				),
+				'delayed'        => true,
+				'expected_data'  => '/*before foo 1*/',
+				'expected_tag'   => "<script id='foo-js-before' type='text/javascript'>\n/*before foo 1*/\n</script>\n",
+			),
+			'after-delayed'   => array(
+				'position'       => 'after',
+				'inline_scripts' => array(
+					'/*after foo 1*/',
+					'/*after foo 2*/',
+				),
+				'delayed'        => true,
+				'expected_data'  => "/*after foo 1*/\n/*after foo 2*/",
+				'expected_tag'   => "<script id='foo-js-after' type='text/javascript'>\n/*after foo 1*/\n/*after foo 2*/\n</script>\n",
+			),
+		);
+	}
+
+	/**
+	 * Test getting inline scripts.
+	 *
+	 * @covers WP_Scripts::get_inline_script_data
+	 * @covers WP_Scripts::get_inline_script_tag
+	 * @covers WP_Scripts::print_inline_script
+	 *
+	 * @expectedDeprecated WP_Scripts::print_inline_script
+	 *
+	 * @dataProvider data_provider_to_test_get_inline_script
+	 *
+	 * @param string   $position       Position.
+	 * @param string[] $inline_scripts Inline scripts.
+	 * @param bool     $delayed        Delayed.
+	 * @param string   $expected_data  Expected data.
+	 * @param string   $expected_tag   Expected tag.
+	 */
+	public function test_get_inline_script( $position, $inline_scripts, $delayed, $expected_data, $expected_tag ) {
+		global $wp_scripts;
+
+		$deps = array();
+		if ( $delayed ) {
+			$wp_scripts->add( 'dep', 'https://example.com/dependency.js', array(), false ); // TODO: Cannot pass strategy to $args e.g. array( 'strategy' => 'defer' )
+			$wp_scripts->add_data( 'dep', 'strategy', 'defer' );
+			$deps[] = 'dep';
+		}
+
+		$handle = 'foo';
+		$wp_scripts->add( $handle, 'https://example.com/foo.js', $deps );
+		if ( $delayed ) {
+			$wp_scripts->add_data( $handle, 'strategy', 'defer' );
+		}
+
+		$this->assertSame( '', $wp_scripts->get_inline_script_data( $handle, $position ) );
+		$this->assertSame( '', $wp_scripts->get_inline_script_tag( $handle, $position ) );
+		$this->assertFalse( $wp_scripts->print_inline_script( $handle, $position, false ) );
+		ob_start();
+		$output = $wp_scripts->print_inline_script( $handle, $position, true );
+		$this->assertSame( '', ob_get_clean() );
+		$this->assertFalse( $output );
+
+		foreach ( $inline_scripts as $inline_script ) {
+			$wp_scripts->add_inline_script( $handle, $inline_script, $position );
+		}
+
+		$this->assertSame( $expected_data, $wp_scripts->get_inline_script_data( $handle, $position ) );
+		$this->assertSame( $expected_data, $wp_scripts->print_inline_script( $handle, $position, false ) );
+		$this->assertEqualMarkup(
+			$expected_tag,
+			$wp_scripts->get_inline_script_tag( $handle, $position )
+		);
+		ob_start();
+		$output = $wp_scripts->print_inline_script( $handle, $position, true );
+		$this->assertEqualMarkup( $expected_tag, ob_get_clean() );
+		$this->assertEquals( $expected_data, $output );
 	}
 
 	/**
@@ -1043,6 +2481,7 @@ public function test_wp_set_script_translations_dependency() {
 	 * Testing `wp_enqueue_code_editor` with file path.
 	 *
 	 * @ticket 41871
+	 *
 	 * @covers ::wp_enqueue_code_editor
 	 */
 	public function test_wp_enqueue_code_editor_when_php_file_will_be_passed() {
@@ -1130,6 +2569,7 @@ public function test_wp_enqueue_code_editor_when_php_file_will_be_passed() {
 	 * Testing `wp_enqueue_code_editor` with `compact`.
 	 *
 	 * @ticket 41871
+	 *
 	 * @covers ::wp_enqueue_code_editor
 	 */
 	public function test_wp_enqueue_code_editor_when_generated_array_by_compact_will_be_passed() {
@@ -1213,6 +2653,7 @@ public function test_wp_enqueue_code_editor_when_generated_array_by_compact_will
 	 * Testing `wp_enqueue_code_editor` with `array_merge`.
 	 *
 	 * @ticket 41871
+	 *
 	 * @covers ::wp_enqueue_code_editor
 	 */
 	public function test_wp_enqueue_code_editor_when_generated_array_by_array_merge_will_be_passed() {
@@ -1310,6 +2751,7 @@ public function test_wp_enqueue_code_editor_when_generated_array_by_array_merge_
 	 * Testing `wp_enqueue_code_editor` with `array`.
 	 *
 	 * @ticket 41871
+	 *
 	 * @covers ::wp_enqueue_code_editor
 	 */
 	public function test_wp_enqueue_code_editor_when_simple_array_will_be_passed() {
@@ -1402,6 +2844,7 @@ public function test_wp_enqueue_code_editor_when_simple_array_will_be_passed() {
 
 	/**
 	 * @ticket 52534
+	 *
 	 * @covers ::wp_localize_script
 	 *
 	 * @dataProvider data_wp_localize_script_data_formats
@@ -1456,10 +2899,11 @@ public function data_wp_localize_script_data_formats() {
 
 	/**
 	 * @ticket 55628
+	 *
 	 * @covers ::wp_set_script_translations
 	 */
 	public function test_wp_external_wp_i18n_print_order() {
-		global $wp_scripts;
+		global $wp_scripts, $wp_version;
 
 		$wp_scripts->do_concat    = true;
 		$wp_scripts->default_dirs = array( '/default/' );
@@ -1473,18 +2917,89 @@ public function test_wp_external_wp_i18n_print_order() {
 		wp_set_script_translations( 'common' );
 
 		$print_scripts = get_echo(
-			function() {
+			static function() {
 				wp_print_scripts();
 				_print_scripts();
 			}
 		);
 
 		// The non-default script should end concatenation and maintain order.
-		$ver       = get_bloginfo( 'version' );
-		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$ver}'></script>\n";
+		$expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$wp_version}'></script>\n";
 		$expected .= "<script type='text/javascript' src='/plugins/wp-i18n.js' id='wp-i18n-js'></script>\n";
 		$expected .= "<script type='text/javascript' src='/default/common.js' id='common-js'></script>\n";
 
 		$this->assertSame( $expected, $print_scripts );
 	}
+
+	/**
+	 * Ensure tinymce scripts aren't loading async.
+	 *
+	 * @ticket 58648
+	 */
+	public function test_printing_tinymce_scripts() {
+		global $wp_scripts;
+
+		wp_register_tinymce_scripts( $wp_scripts, true );
+
+		$actual = get_echo( 'wp_print_scripts', array( array( 'wp-tinymce' ) ) );
+
+		$this->assertStringNotContainsString( 'async', $actual, 'TinyMCE should not have an async attribute.' );
+		$this->assertStringNotContainsString( 'defer', $actual, 'TinyMCE should not have a defer attribute.' );
+	}
+
+	/**
+	 * Make sure scripts with a loading strategy that are printed
+	 * without being enqueued are handled properly.
+	 *
+	 * @ticket 58648
+	 *
+	 * @dataProvider data_provider_delayed_strategies
+	 */
+	public function test_printing_non_enqueued_scripts( $strategy ) {
+		wp_register_script( 'test-script', 'test-script.js', array(), false, array( 'strategy' => $strategy ) );
+
+		$actual = get_echo( 'wp_print_scripts', array( array( 'test-script' ) ) );
+
+		$this->assertStringContainsString( $strategy, $actual );
+	}
+
+	/**
+	 * Parse an HTML markup fragment.
+	 *
+	 * @param string $markup Markup.
+	 * @return DOMElement Body element wrapping supplied markup fragment.
+	 */
+	protected function parse_markup_fragment( $markup ) {
+		$dom = new DOMDocument();
+		$dom->loadHTML(
+			"<!DOCTYPE html><html><head><meta charset=utf8></head><body>{$markup}</body></html>"
+		);
+
+		/** @var DOMElement $body */
+		$body = $dom->getElementsByTagName( 'body' )->item( 0 );
+
+		// Trim whitespace nodes added before/after which can be added when parsing.
+		foreach ( array( $body->firstChild, $body->lastChild ) as $node ) {
+			if ( $node instanceof DOMText && '' === trim( $node->data ) ) {
+				$body->removeChild( $node );
+			}
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Assert markup is equal.
+	 *
+	 * @param string $expected Expected markup.
+	 * @param string $actual   Actual markup.
+	 * @param string $message  Message.
+	 */
+	protected function assertEqualMarkup( $expected, $actual, $message = '' ) {
+		$this->assertEquals(
+			$this->parse_markup_fragment( $expected ),
+			$this->parse_markup_fragment( $actual ),
+			$message
+		);
+	}
 }
diff --git a/tests/phpunit/tests/dependencies/styles.php b/tests/phpunit/tests/dependencies/styles.php
index 34a9847f2f4d8..4b1e46f21d33b 100644
--- a/tests/phpunit/tests/dependencies/styles.php
+++ b/tests/phpunit/tests/dependencies/styles.php
@@ -196,6 +196,7 @@ public function test_inline_styles_concat() {
 	 *
 	 * @ticket 54243
 	 * @ticket 54922
+	 * @ticket 58069
 	 *
 	 * @covers ::_wp_normalize_relative_css_links
 	 *
@@ -240,6 +241,14 @@ public function data_normalize_relative_css_links() {
 				'css'      => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
 				'expected' => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
 			),
+			'URLs with path beginning with http'           => array(
+				'css'      => 'p {background:url( "http-is-awesome.png" );}',
+				'expected' => 'p {background:url( "/wp-content/themes/test/http-is-awesome.png" );}',
+			),
+			'URLs with path beginning with https'          => array(
+				'css'      => 'p {background:url( "https-is-more-awesome.png" );}',
+				'expected' => 'p {background:url( "/wp-content/themes/test/https-is-more-awesome.png" );}',
+			),
 		);
 	}
 
@@ -405,9 +414,9 @@ public function data_styles_with_media() {
 	}
 
 	/**
-	 * Tests that visual block styles are enqueued in the editor even when there is not theme support for 'wp-block-styles'.
+	 * Tests that visual block styles are not be enqueued in the editor when there is not theme support for 'wp-block-styles'.
 	 *
-	 * Visual block styles should always be enqueued when editing to avoid the appearance of a broken editor.
+	 * @ticket 57561
 	 *
 	 * @covers ::wp_enqueue_style
 	 */
@@ -419,7 +428,7 @@ public function test_block_styles_for_editing_without_theme_support() {
 
 		$this->assertFalse( wp_style_is( 'wp-block-library-theme' ) );
 		wp_enqueue_style( 'wp-edit-blocks' );
-		$this->assertTrue( wp_style_is( 'wp-block-library-theme' ) );
+		$this->assertFalse( wp_style_is( 'wp-block-library-theme' ), "The 'wp-block-library-theme' style should not be in the queue after enqueuing 'wp-edit-blocks'" );
 	}
 
 	/**
@@ -508,4 +517,119 @@ public function test_block_styles_for_viewing_with_split_styles() {
 			$GLOBALS['wp_styles']->registered['wp-block-library']->src
 		);
 	}
+
+	/**
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_wp_maybe_inline_styles() {
+		wp_register_style( 'test-handle', '/' . WPINC . '/css/classic-themes.css' );
+		wp_style_add_data( 'test-handle', 'path', ABSPATH . WPINC . '/css/classic-themes.css' );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+
+		$this->assertFalse( $GLOBALS['wp_styles']->registered['test-handle']->src, 'Source of style should be reset to false' );
+
+		$css = file_get_contents( ABSPATH . WPINC . '/css/classic-themes.css' );
+		$this->assertSameSets( $GLOBALS['wp_styles']->registered['test-handle']->extra['after'], array( $css ), 'Source of style should set to after property' );
+	}
+
+	/**
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_wp_maybe_inline_styles_dequeue_styles() {
+		$filter = new MockAction();
+		add_filter( 'pre_wp_filesize', array( $filter, 'filter' ) );
+		wp_register_style( 'test-handle', '/' . WPINC . '/css/classic-themes.css' );
+		wp_style_add_data( 'test-handle', 'path', ABSPATH . WPINC . '/css/classic-themes.css' );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_deregister_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+
+		$this->assertSame( 0, $filter->get_call_count() );
+	}
+
+	/**
+	 * wp_filesize should be only be called once, as on the second run of wp_maybe_inline_styles,
+	 * src will be set to false and filesize will not be requested.
+	 *
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_wp_maybe_inline_styles_multiple_runs() {
+		$filter = new MockAction();
+		add_filter( 'pre_wp_filesize', array( $filter, 'filter' ) );
+		wp_register_style( 'test-handle', '/' . WPINC . '/css/classic-themes.css' );
+		wp_style_add_data( 'test-handle', 'path', ABSPATH . WPINC . '/css/classic-themes.css' );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+		wp_maybe_inline_styles();
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+
+	/**
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_test_wp_maybe_inline_styles_missing_file() {
+		$filter = new MockAction();
+		add_filter( 'pre_wp_filesize', array( $filter, 'filter' ) );
+		$url = '/' . WPINC . '/css/invalid.css';
+		wp_register_style( 'test-handle', $url );
+		wp_style_add_data( 'test-handle', 'path', ABSPATH . WPINC . '/css/invalid.css' );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+
+		$this->assertSame( $GLOBALS['wp_styles']->registered['test-handle']->src, $url, 'Source should not change' );
+		$this->assertArrayNotHasKey( 'after', $GLOBALS['wp_styles']->registered['test-handle']->extra, 'Source of style not should set to after property' );
+		$this->assertSame( 1, $filter->get_call_count(), 'wp_filesize should only be called once' );
+	}
+
+	/**
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_wp_maybe_inline_styles_no_src() {
+		wp_register_style( 'test-handle', false );
+		wp_style_add_data( 'test-handle', 'path', ABSPATH . WPINC . '/css/classic-themes.css' );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+
+		$this->assertFalse( $GLOBALS['wp_styles']->registered['test-handle']->src, 'Source of style should remain false' );
+		$this->assertArrayNotHasKey( 'after', $GLOBALS['wp_styles']->registered['test-handle']->extra, 'Source of style not should set to after property' );
+	}
+
+	/**
+	 * @ticket 58394
+	 *
+	 * @covers ::wp_maybe_inline_styles
+	 */
+	public function test_wp_maybe_inline_styles_no_path() {
+		$url = '/' . WPINC . '/css/classic-themes.css';
+		wp_register_style( 'test-handle', $url );
+
+		wp_enqueue_style( 'test-handle' );
+
+		wp_maybe_inline_styles();
+
+		$this->assertSame( $GLOBALS['wp_styles']->registered['test-handle']->src, $url );
+	}
 }
diff --git a/tests/phpunit/tests/dependencies/wpScriptIs.php b/tests/phpunit/tests/dependencies/wpScriptIs.php
new file mode 100644
index 0000000000000..f2783e4396bc4
--- /dev/null
+++ b/tests/phpunit/tests/dependencies/wpScriptIs.php
@@ -0,0 +1,232 @@
+<?php
+
+/**
+ * Test wp_script_is().
+ *
+ * @group dependencies
+ * @group scripts
+ *
+ * @covers ::wp_script_is
+ * @covers WP_Scripts::query
+ */
+class Tests_Dependencies_WpScriptIs extends WP_UnitTestCase {
+	private static $wp_scripts;
+	private static $wp_scripts_was_set = false;
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		// If the global is set, store it for restoring when done testing.
+		static::$wp_scripts_was_set = array_key_exists( 'wp_scripts', $GLOBALS );
+		if ( static::$wp_scripts_was_set ) {
+			static::$wp_scripts = $GLOBALS['wp_scripts'];
+			unset( $GLOBALS['wp_scripts'] );
+		}
+	}
+
+	public static function tear_down_after_class() {
+		// Restore the global if it was set before running this set of tests.
+		if ( static::$wp_scripts_was_set ) {
+			$GLOBALS['wp_scripts'] = static::$wp_scripts;
+		}
+
+		parent::tear_down_after_class();
+	}
+
+	public function clean_up_global_scope() {
+		unset( $GLOBALS['wp_scripts'] );
+		parent::clean_up_global_scope();
+	}
+
+	public function test_script_is_registered() {
+		$handle = 'test-script';
+		wp_register_script( $handle, 'https://example.org/script.js' );
+
+		$this->assertTrue( wp_script_is( $handle, 'registered' ) );
+	}
+
+	/**
+	 * @dataProvider data_script_handles
+	 *
+	 * @param string $handle Script handle to test.
+	 */
+	public function test_script_is_enqueued( $handle ) {
+		// Test set up.
+		wp_enqueue_script( $handle );
+
+		$this->assertTrue( wp_script_is( $handle ), "Script `{$handle}` should be enqueued after invoking wp_enqueue_script()" );
+	}
+
+	/**
+	 * @dataProvider data_script_handles
+	 *
+	 * @param string $handle Script handle to test.
+	 */
+	public function test_script_is_not_enqueued( $handle ) {
+		$this->assertFalse( wp_script_is( $handle ), "Script `{$handle}` should not be enqueued when test starts" );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_script_handles() {
+		return array(
+			array( 'heartbeat' ),
+			array( 'jquery' ),
+			array( 'wp-lists' ),
+			array( 'wp-pointer' ),
+			array( 'thickbox' ),
+		);
+	}
+
+	/**
+	 * @ticket 28404
+	 *
+	 * @dataProvider data_deps_are_enqueued
+	 *
+	 * @param string   $handle Script handle.
+	 * @param string[] $deps   The deps to test for the given script handle.
+	 */
+	public function test_deps_are_enqueued( $handle, $deps ) {
+		// Check the deps are not enqueued before enqueuing.
+		$this->assertFalse( wp_script_is( $handle ), 'Script `jquery-ui-accordion` should not be enqueued when test starts' );
+		foreach ( $deps as $dep_handle ) {
+			$this->assertFalse( wp_script_is( $dep_handle ), "Dependency `{$dep_handle}` should not be enqueued when test starts" );
+		}
+
+		// Test set up.
+		wp_enqueue_script( $handle );
+
+		foreach ( $deps as $dep_handle ) {
+			$this->assertTrue( wp_script_is( $dep_handle ), "Dependency `{$dep_handle}` should be enqueued" );
+		}
+
+		$this->assertFalse( wp_script_is( 'underscore' ), 'Script "underscore" is not a dependency of "jquery-ui-accordion" and should not be enqueued' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_deps_are_enqueued() {
+		return array(
+			'jquery: 1 level of deps'                 => array(
+				'handle' => 'jquery',
+				'deps'   => array(
+					'jquery-core',
+					'jquery-migrate',
+				),
+			),
+			'mediaelement: 1 level of deps'           => array(
+				'handle' => 'mediaelement',
+				'deps'   => array(
+					'mediaelement-core',
+					'mediaelement-migrate',
+				),
+			),
+			'jquery-effects-core: 2 levels of deps'   => array(
+				'handle' => 'jquery-effects-core',
+				'deps'   => array(
+					// Dep to 'jquery-effects-core'.
+					'jquery',
+					// Deps to 'jquery'.
+					'jquery-core',
+					'jquery-migrate',
+				),
+			),
+			'jquery-ui-accordion: 3 levels of deps'   => array(
+				'handle' => 'jquery-ui-accordion',
+				'deps'   => array(
+					// Dep to 'jquery-ui-accordion'.
+					'jquery-ui-core',
+					// Dep to 'jquery-ui-core'.
+					'jquery',
+					// Deps to 'jquery'.
+					'jquery-core',
+					'jquery-migrate',
+				),
+			),
+			'wp-mediaelement: 2 and 3 levels of deps' => array(
+				'handle' => 'wp-mediaelement',
+				'deps'   => array(
+					// Dep to 'wp-mediaelement'.
+					'mediaelement',
+					// Deps to 'mediaelement'.
+					'jquery',
+					'mediaelement-core',
+					'mediaelement-migrate',
+					// Deps to 'jquery'.
+					'jquery-core',
+					'jquery-migrate',
+				),
+			),
+		);
+	}
+
+	/**
+	 * @ticket 28404
+	 *
+	 * @dataProvider data_non_deps_should_not_enqueue
+	 *
+	 * @param string   $handle   Script handle.
+	 * @param string[] $not_deps The handles that are not deps of the given script handle.
+	 */
+	public function test_non_deps_are_not_enqueued( $handle, $not_deps ) {
+		// Check the deps are not enqueued before enqueuing.
+		$this->assertFalse( wp_script_is( $handle ), "Script `{$handle}` should not be enqueued when test starts" );
+		foreach ( $not_deps as $not_dep_handle ) {
+			$this->assertFalse( wp_script_is( $not_dep_handle ), "Dependency `{$not_dep_handle}` should not be enqueued when test starts" );
+		}
+
+		// Test set up.
+		wp_enqueue_script( $handle );
+
+		foreach ( $not_deps as $not_dep_handle ) {
+			$this->assertFalse( wp_script_is( $not_dep_handle ), "Script `{$not_dep_handle}` should not be enqueued as it is not a dependency of `{$handle}`" );
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_non_deps_should_not_enqueue() {
+		return array(
+			'imagesloaded: no dependencies' => array(
+				'handle'   => 'imagesloaded',
+				'not_deps' => array(
+					'jquery',
+					'masonry',
+				),
+			),
+			'wp-sanitize: no dependencies'  => array(
+				'handle'   => 'wp-sanitize',
+				'not_deps' => array(
+					'jquery',
+					'jquery-core',
+					'jquery-migrate',
+				),
+			),
+			'jquery-ui-accordion'           => array(
+				'handle'   => 'jquery-ui-accordion',
+				'not_deps' => array(
+					'underscore',
+					'thickbox',
+					'jquery-effects-core',
+				),
+			),
+			'jquery-ui-datepicker'          => array(
+				'handle'   => 'jquery-ui-datepicker',
+				'not_deps' => array(
+					'backbone',
+					'jquery-effects-core',
+					'jquery-effects-highlight',
+				),
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/diff/wpTextDiffRendererTable.php b/tests/phpunit/tests/diff/wpTextDiffRendererTable.php
new file mode 100644
index 0000000000000..4dbbdbbefeb4a
--- /dev/null
+++ b/tests/phpunit/tests/diff/wpTextDiffRendererTable.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * Tests for WP_Text_Diff_Renderer_Table.
+ *
+ * @group diff
+ */
+class Tests_Diff_WpTextDiffRendererTable extends WP_UnitTestCase {
+	/**
+	 * @var WP_Text_Diff_Renderer_Table
+	 */
+	private $diff_renderer_table;
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+		require_once ABSPATH . 'wp-includes/Text/Diff/Renderer.php';
+		require_once ABSPATH . 'wp-includes/class-wp-text-diff-renderer-table.php';
+	}
+
+	public function set_up() {
+		parent::set_up();
+		$this->diff_renderer_table = new WP_Text_Diff_Renderer_Table();
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__get()
+	 *
+	 * @param string $property_name Property name to get.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_get_compat_fields( $property_name, $expected ) {
+		$this->assertSame( $expected, $this->diff_renderer_table->$property_name );
+	}
+
+	/**
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__get()
+	 */
+	public function test_should_throw_deprecation_when_getting_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Getting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertNull( $this->diff_renderer_table->undeclared_property, 'Getting a dynamic property should return null from WP_Text_Diff_Renderer_Table::__get()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__set()
+	 *
+	 * @param string $property_name Property name to set.
+	 */
+	public function test_should_set_compat_fields( $property_name ) {
+		$value                                     = uniqid();
+		$this->diff_renderer_table->$property_name = $value;
+
+		$this->assertSame( $value, $this->diff_renderer_table->$property_name );
+	}
+
+	/**
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__set()
+	 */
+	public function test_should_throw_deprecation_when_setting_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Setting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->diff_renderer_table->undeclared_property = 'some value';
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__isset()
+	 *
+	 * @param string $property_name Property name to check.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_isset_compat_fields( $property_name, $expected ) {
+		$actual = isset( $this->diff_renderer_table->$property_name );
+		if ( is_null( $expected ) ) {
+			$this->assertFalse( $actual );
+		} else {
+			$this->assertTrue( $actual );
+		}
+	}
+
+	/**
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__isset()
+	 */
+	public function test_should_throw_deprecation_when_isset_of_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undeclared_property` is not declared. Checking `isset()` on a dynamic property ' .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertFalse( isset( $this->diff_renderer_table->undeclared_property ), 'Checking a dynamic property should return false from WP_Text_Diff_Renderer_Table::__isset()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__unset()
+	 *
+	 * @param string $property_name Property name to unset.
+	 */
+	public function test_should_unset_compat_fields( $property_name ) {
+		unset( $this->diff_renderer_table->$property_name );
+		$this->assertFalse( isset( $this->diff_renderer_table->$property_name ) );
+	}
+
+	/**
+	 * @ticket 58898
+	 *
+	 * @covers WP_Text_Diff_Renderer_Table::__unset()
+	 */
+	public function test_should_throw_deprecation_when_unset_of_dynamic_property() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'A property `undeclared_property` is not declared. Unsetting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		unset( $this->diff_renderer_table->undeclared_property );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_compat_fields() {
+		return array(
+			'_show_split_view'     => array(
+				'property_name' => '_show_split_view',
+				'expected'      => true,
+			),
+			'inline_diff_renderer' => array(
+				'property_name' => 'inline_diff_renderer',
+				'expected'      => 'WP_Text_Diff_Renderer_inline',
+			),
+			'_diff_threshold'      => array(
+				'property_name' => '_diff_threshold',
+				'expected'      => 0.6,
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/editor/classic-to-block-menu-converter.php b/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
new file mode 100644
index 0000000000000..9ec6c04183921
--- /dev/null
+++ b/tests/phpunit/tests/editor/classic-to-block-menu-converter.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * Tests WP_Classic_To_Block_Menu_Converter_Test
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tests for the WP_Classic_To_Block_Menu_Converter_Test class.
+ */
+class WP_Classic_To_Block_Menu_Converter_Test extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::get_fallback
+	 */
+	public function test_class_exists() {
+		$this->assertTrue( class_exists( 'WP_Classic_To_Block_Menu_Converter' ) );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::convert
+	 * @dataProvider provider_test_passing_non_menu_object_to_converter_returns_wp_error
+	 */
+	public function test_passing_non_menu_object_to_converter_returns_wp_error( $data ) {
+
+		$result = WP_Classic_To_Block_Menu_Converter::convert( $data );
+
+		$this->assertTrue( is_wp_error( $result ), 'Should be a WP_Error instance' );
+
+		$this->assertEquals( 'invalid_menu', $result->get_error_code(), 'Error code should indicate invalidity of menu argument.' );
+
+		$this->assertEquals( 'The menu provided is not a valid menu.', $result->get_error_message(), 'Error message should communicate invalidity of menu argument.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::convert
+	 */
+	public function provider_test_passing_non_menu_object_to_converter_returns_wp_error() {
+		return array(
+			array( 1 ),
+			array( -1 ),
+			array( '1' ),
+			array( 'not a menu object' ),
+			array( true ),
+			array( false ),
+			array( array() ),
+			array( new stdClass() ),
+		);
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::convert
+	 */
+	public function test_can_convert_classic_menu_to_blocks() {
+
+		$menu_id = wp_create_nav_menu( 'Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item 1',
+				'menu-item-url'    => '/classic-menu-item-1',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$second_menu_item_id = wp_update_nav_menu_item(
+			$menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item 2',
+				'menu-item-url'    => '/classic-menu-item-2',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		wp_update_nav_menu_item(
+			$menu_id,
+			0,
+			array(
+				'menu-item-title'     => 'Nested Menu Item 1',
+				'menu-item-url'       => '/nested-menu-item-1',
+				'menu-item-status'    => 'publish',
+				'menu-item-parent-id' => $second_menu_item_id,
+			)
+		);
+
+		$classic_nav_menu = wp_get_nav_menu_object( $menu_id );
+
+		$blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
+
+		$this->assertNotEmpty( $blocks );
+
+		$parsed_blocks = parse_blocks( $blocks );
+
+		$first_block  = $parsed_blocks[0];
+		$second_block = $parsed_blocks[1];
+		$nested_block = $parsed_blocks[1]['innerBlocks'][0];
+
+		$this->assertEquals( 'core/navigation-link', $first_block['blockName'], 'First block name should be "core/navigation-link"' );
+
+		$this->assertEquals( 'Classic Menu Item 1', $first_block['attrs']['label'], 'First block label should match.' );
+
+		$this->assertEquals( '/classic-menu-item-1', $first_block['attrs']['url'], 'First block URL should match.' );
+
+		// Assert parent of nested menu item is a submenu block.
+		$this->assertEquals( 'core/navigation-submenu', $second_block['blockName'], 'Second block name should be "core/navigation-submenu"' );
+
+		$this->assertEquals( 'Classic Menu Item 2', $second_block['attrs']['label'], 'Second block label should match.' );
+
+		$this->assertEquals( '/classic-menu-item-2', $second_block['attrs']['url'], 'Second block URL should match.' );
+
+		$this->assertEquals( 'core/navigation-link', $nested_block['blockName'], 'Nested block name should be "core/navigation-link"' );
+
+		$this->assertEquals( 'Nested Menu Item 1', $nested_block['attrs']['label'], 'Nested block label should match.' );
+
+		$this->assertEquals( '/nested-menu-item-1', $nested_block['attrs']['url'], 'Nested block URL should match.' );
+
+		wp_delete_nav_menu( $menu_id );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::convert
+	 */
+	public function test_does_not_convert_menu_items_with_non_publish_status() {
+
+			$menu_id = wp_create_nav_menu( 'Classic Menu' );
+
+			wp_update_nav_menu_item(
+				$menu_id,
+				0,
+				array(
+					'menu-item-title'  => 'Classic Menu Item 1',
+					'menu-item-url'    => '/classic-menu-item-1',
+					'menu-item-status' => 'publish',
+				)
+			);
+
+			wp_update_nav_menu_item(
+				$menu_id,
+				0,
+				array(
+					'menu-item-status' => 'draft',
+					'menu-item-title'  => 'Draft Menu Item',
+					'menu-item-url'    => '/draft-menu-item',
+				)
+			);
+
+			wp_update_nav_menu_item(
+				$menu_id,
+				0,
+				array(
+					'menu-item-status' => 'private',
+					'menu-item-title'  => 'Private Item',
+					'menu-item-url'    => '/private-menu-item',
+				)
+			);
+
+			wp_update_nav_menu_item(
+				$menu_id,
+				0,
+				array(
+					'menu-item-status' => 'pending',
+					'menu-item-title'  => 'Pending Menu Item',
+					'menu-item-url'    => '/pending-menu-item',
+				)
+			);
+
+			wp_update_nav_menu_item(
+				$menu_id,
+				0,
+				array(
+					'menu-item-status' => 'future',
+					'menu-item-title'  => 'Future Menu Item',
+					'menu-item-url'    => '/future-menu-item',
+				)
+			);
+
+			$classic_nav_menu = wp_get_nav_menu_object( $menu_id );
+
+			$blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
+
+			$this->assertNotEmpty( $blocks );
+
+			$parsed_blocks = parse_blocks( $blocks );
+
+			$this->assertCount( 1, $parsed_blocks, 'Should only be one block in the array.' );
+
+			$this->assertEquals( 'core/navigation-link', $parsed_blocks[0]['blockName'], 'First block name should be "core/navigation-link"' );
+
+			$this->assertEquals( 'Classic Menu Item 1', $parsed_blocks[0]['attrs']['label'], 'First block label should match.' );
+
+			$this->assertEquals( '/classic-menu-item-1', $parsed_blocks[0]['attrs']['url'], 'First block URL should match.' );
+
+			wp_delete_nav_menu( $menu_id );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_Classic_To_Block_Menu_Converter::convert
+	 */
+	public function test_returns_empty_string_for_menus_with_no_items() {
+		$menu_id = wp_create_nav_menu( 'Empty Menu' );
+
+		$classic_nav_menu = wp_get_nav_menu_object( $menu_id );
+
+		$blocks = WP_Classic_To_Block_Menu_Converter::convert( $classic_nav_menu );
+
+		$this->assertSame( '', $blocks, 'Result should be empty string.' );
+
+		wp_delete_nav_menu( $menu_id );
+	}
+}
diff --git a/tests/phpunit/tests/editor/navigation-fallback.php b/tests/phpunit/tests/editor/navigation-fallback.php
new file mode 100644
index 0000000000000..46befacc3c985
--- /dev/null
+++ b/tests/phpunit/tests/editor/navigation-fallback.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * Tests WP_Navigation_Fallback
+ *
+ * @package WordPress
+ */
+
+/**
+ * Tests for the WP_Navigation_Fallback class.
+ */
+class WP_Navigation_Fallback_Test extends WP_UnitTestCase {
+
+	protected static $admin_user;
+	protected static $editor_user;
+
+	public static function wpSetUpBeforeClass( $factory ) {
+		self::$admin_user = $factory->user->create( array( 'role' => 'administrator' ) );
+
+		self::$editor_user = $factory->user->create( array( 'role' => 'editor' ) );
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		wp_set_current_user( self::$admin_user );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller
+	 */
+	public function test_it_exists() {
+		$this->assertTrue( class_exists( 'WP_Navigation_Fallback' ), 'WP_Navigation_Fallback class should exist.' );
+	}
+
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_return_a_default_fallback_navigation_menu_in_absence_of_other_fallbacks() {
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'wp_navigation', $data->post_type, 'Fallback menu type should be `wp_navigation`' );
+
+		$this->assertEquals( 'Navigation', $data->post_title, 'Fallback menu title should be the default fallback title' );
+
+		$this->assertEquals( 'navigation', $data->post_name, 'Fallback menu slug (post_name) should be the default slug' );
+
+		$this->assertEquals( '<!-- wp:page-list /-->', $data->post_content );
+
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 1, $navs_in_db, 'The fallback Navigation post should be the only one in the database.' );
+	}
+
+	/**
+	 * @ticket 58750
+	 *
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_not_automatically_create_fallback_if_filter_is_falsey() {
+
+		add_filter( 'wp_navigation_should_create_fallback', '__return_false' );
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertEmpty( $data );
+
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 0, $navs_in_db, 'The fallback Navigation post should not have been created.' );
+
+		remove_filter( 'wp_navigation_should_create_fallback', '__return_false' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_return_a_default_fallback_navigation_menu_with_no_blocks_if_page_list_block_is_not_registered() {
+
+		$original_page_list_block = WP_Block_Type_Registry::get_instance()->get_registered( 'core/page-list' );
+
+		unregister_block_type( 'core/page-list' );
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertNotEquals( '<!-- wp:page-list /-->', $data->post_content, 'Navigation Menu should not contain a Page List block.' );
+
+		$this->assertEmpty( $data->post_content, 'Menu should be empty.' );
+
+		register_block_type( 'core/page-list', $original_page_list_block );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_handle_consecutive_invocations() {
+		// Invoke the method multiple times to ensure that it doesn't create a new fallback menu on each invocation.
+		WP_Navigation_Fallback::get_fallback();
+		WP_Navigation_Fallback::get_fallback();
+
+		// Assert on the final invocation.
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'Navigation', $data->post_title, 'Fallback menu title should be the default title' );
+
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 1, $navs_in_db, 'The fallback Navigation post should be the only one in the database.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_return_the_most_recently_created_navigation_menu() {
+
+		self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_navigation',
+				'post_title'   => 'Existing Navigation Menu 1',
+				'post_content' => '<!-- wp:page-list /-->',
+			)
+		);
+
+		$most_recently_published_nav = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_navigation',
+				'post_title'   => 'Existing Navigation Menu 2',
+				'post_content' => '<!-- wp:navigation-link {"label":"Hello world","type":"post","id":1,"url":"/hello-world","kind":"post-type"} /-->',
+			)
+		);
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( $most_recently_published_nav->post_title, $data->post_title, 'Fallback menu title should be the same as the most recently created menu.' );
+
+		$this->assertEquals( $most_recently_published_nav->post_name, $data->post_name, 'Post name should be the same as the most recently created menu.' );
+
+		$this->assertEquals( $most_recently_published_nav->post_content, $data->post_content, 'Post content should be the same as the most recently created menu.' );
+
+		// Check that no new Navigation menu was created.
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 2, $navs_in_db, 'Only the existing Navigation menus should be present in the database.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_return_fallback_navigation_from_existing_classic_menu_if_no_navigation_menus_exist() {
+		$menu_id = wp_create_nav_menu( 'Existing Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item 1',
+				'menu-item-url'    => '/classic-menu-item-1',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should be the same as the classic menu.' );
+
+		// Assert that the fallback contains a navigation-link block.
+		$this->assertStringContainsString( '<!-- wp:navigation-link', $data->post_content, 'The fallback Navigation Menu should contain a `core/navigation-link` block.' );
+
+		// Assert that fallback post_content contains the expected menu item title.
+		$this->assertStringContainsString( '"label":"Classic Menu Item 1"', $data->post_content, 'The fallback Navigation Menu should contain menu item with a label matching the title of the menu item from the Classic Menu.' );
+
+		// Assert that fallback post_content contains the expected menu item url.
+		$this->assertStringContainsString( '"url":"/classic-menu-item-1"', $data->post_content, 'The fallback Navigation Menu should contain menu item with a url matching the slug of the menu item from the Classic Menu.' );
+
+		// Check that only a single Navigation fallback was created.
+		$navs_in_db = $this->get_navigations_in_database();
+		$this->assertCount( 1, $navs_in_db, 'A single Navigation menu should be present in the database.' );
+
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_prioritise_fallback_to_classic_menu_in_primary_location() {
+		$pl_menu_id = wp_create_nav_menu( 'Classic Menu in Primary Location' );
+
+		wp_update_nav_menu_item(
+			$pl_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'PL Classic Menu Item',
+				'menu-item-url'    => '/pl-classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$another_menu_id = wp_create_nav_menu( 'Another Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$another_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Another Classic Menu Item',
+				'menu-item-url'    => '/another-classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$locations            = get_nav_menu_locations();
+		$locations['primary'] = $pl_menu_id;
+		$locations['header']  = $another_menu_id;
+		set_theme_mod( 'nav_menu_locations', $locations );
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'Classic Menu in Primary Location', $data->post_title, 'Fallback menu title should match the menu in the "primary" location.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_fallback_to_classic_menu_with_primary_slug() {
+
+		// Creates a classic menu with the slug "primary".
+		$primary_menu_id = wp_create_nav_menu( 'Primary' );
+
+		wp_update_nav_menu_item(
+			$primary_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item',
+				'menu-item-url'    => '/classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$another_menu_id = wp_create_nav_menu( 'Another Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$another_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Another Classic Menu Item',
+				'menu-item-url'    => '/another-classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'Primary', $data->post_title, 'Fallback menu title should match the menu with the slug "primary".' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_fallback_to_most_recently_created_classic_menu() {
+
+		// Creates a classic menu with the slug "primary".
+		$primary_menu_id = wp_create_nav_menu( 'Older Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$primary_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item',
+				'menu-item-url'    => '/classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$most_recent_menu_id = wp_create_nav_menu( 'Most Recent Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$most_recent_menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Another Classic Menu Item',
+				'menu-item-url'    => '/another-classic-menu-item',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( 'Most Recent Classic Menu', $data->post_title, 'Fallback menu title should match the menu that was created most recently.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::get_fallback
+	 */
+	public function test_should_not_create_fallback_from_classic_menu_if_a_navigation_menu_already_exists() {
+		$menu_id = wp_create_nav_menu( 'Existing Classic Menu' );
+
+		wp_update_nav_menu_item(
+			$menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Classic Menu Item 1',
+				'menu-item-url'    => '/classic-menu-item-1',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		$existing_navigation_menu = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_navigation',
+				'post_title'   => 'Existing Navigation Menu 1',
+				'post_content' => '<!-- wp:page-list /-->',
+			)
+		);
+
+		$data = WP_Navigation_Fallback::get_fallback();
+
+		$this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
+
+		$this->assertEquals( $existing_navigation_menu->post_title, $data->post_title, 'Fallback menu title should be the same as the existing Navigation menu.' );
+
+		$this->assertNotEquals( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should not be the same as the Classic Menu.' );
+
+		// Check that only a single Navigation fallback was created.
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 1, $navs_in_db, 'Only the existing Navigation menus should be present in the database.' );
+
+	}
+
+	private function get_navigations_in_database() {
+		$navs_in_db = new WP_Query(
+			array(
+				'post_type'      => 'wp_navigation',
+				'post_status'    => 'publish',
+				'posts_per_page' => -1,
+				'orderby'        => 'date',
+				'order'          => 'DESC',
+			)
+		);
+
+		return $navs_in_db->posts ? $navs_in_db->posts : array();
+	}
+
+}
diff --git a/tests/phpunit/tests/feed/rss2.php b/tests/phpunit/tests/feed/rss2.php
index 356b402def992..a3f45e0896fc6 100644
--- a/tests/phpunit/tests/feed/rss2.php
+++ b/tests/phpunit/tests/feed/rss2.php
@@ -487,7 +487,7 @@ public function test_valid_search_feed_endpoint() {
 	 *
 	 * @ticket 4575
 	 *
-	 * @dataProvider data_test_get_feed_build_date
+	 * @dataProvider data_get_feed_build_date
 	 */
 	public function test_get_feed_build_date( $url, $element ) {
 		$this->go_to( $url );
@@ -501,7 +501,7 @@ public function test_get_feed_build_date( $url, $element ) {
 	}
 
 
-	public function data_test_get_feed_build_date() {
+	public function data_get_feed_build_date() {
 		return array(
 			array( '/?feed=rss2', 'rss' ),
 			array( '/?feed=commentsrss2', 'rss' ),
diff --git a/tests/phpunit/tests/feed/wpSimplePieFile.php b/tests/phpunit/tests/feed/wpSimplePieFile.php
index f9748e3a7bcac..466e0df4be838 100644
--- a/tests/phpunit/tests/feed/wpSimplePieFile.php
+++ b/tests/phpunit/tests/feed/wpSimplePieFile.php
@@ -1,26 +1,20 @@
 <?php
 /**
- * Unit tests for methods in `WP_SimplePie_File`.
+ * Tests the `WP_SimplePie_File` class.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.6.1
- */
-
-/**
- * Tests the `WP_SimplePie_File` class.
  *
  * @group feed
  * @group wp-simplepie-file
- *
- * @since 5.6.1
  */
 class Tests_Feed_wpSimplePieFile extends WP_UnitTestCase {
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
-		require_once ABSPATH . '/wp-includes/class-simplepie.php';
-		require_once ABSPATH . '/wp-includes/class-wp-simplepie-file.php';
+		require_once ABSPATH . 'wp-includes/class-simplepie.php';
+		require_once ABSPATH . 'wp-includes/class-wp-simplepie-file.php';
 	}
 
 	/**
@@ -85,7 +79,7 @@ public function mocked_response_single_header_values() {
 		);
 
 		return array(
-			'headers'  => new Requests_Utility_CaseInsensitiveDictionary( $single_value_headers ),
+			'headers'  => new WpOrg\Requests\Utility\CaseInsensitiveDictionary( $single_value_headers ),
 			'body'     => file_get_contents( DIR_TESTDATA . '/feed/wordpress-org-news.xml' ),
 			'response' => array(
 				'code'    => 200,
@@ -114,7 +108,7 @@ public function mocked_response_multiple_header_values() {
 			),
 		);
 
-		$response['headers'] = new Requests_Utility_CaseInsensitiveDictionary( $multiple_value_headers );
+		$response['headers'] = new WpOrg\Requests\Utility\CaseInsensitiveDictionary( $multiple_value_headers );
 
 		return $response;
 	}
diff --git a/tests/phpunit/tests/file.php b/tests/phpunit/tests/file.php
index 8e315e33aa5a0..5102faab51f16 100644
--- a/tests/phpunit/tests/file.php
+++ b/tests/phpunit/tests/file.php
@@ -188,8 +188,8 @@ public function test_unique_filename_no_ext() {
 	/**
 	 * @dataProvider data_wp_tempnam_filenames
 	 */
-	public function test_wp_tempnam( $case ) {
-		$file = wp_tempnam( $case );
+	public function test_wp_tempnam( $filename ) {
+		$file = wp_tempnam( $filename );
 		unlink( $file );
 
 		$this->assertNotEmpty( basename( basename( $file, '.tmp' ), '.zip' ) );
@@ -205,6 +205,199 @@ public function data_wp_tempnam_filenames() {
 		);
 	}
 
+	/**
+	 * Tests that `wp_tempnam()` limits the filename's length to 252 characters.
+	 *
+	 * @ticket 35755
+	 *
+	 * @covers ::wp_tempnam
+	 *
+	 * @dataProvider data_wp_tempnam_should_limit_filename_length_to_252_characters
+	 */
+	public function test_wp_tempnam_should_limit_filename_length_to_252_characters( $filename ) {
+		$file = wp_tempnam( $filename );
+
+		if ( file_exists( $file ) ) {
+			self::unlink( $file );
+		}
+
+		$this->assertLessThanOrEqual( 252, strlen( basename( $file ) ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_tempnam_should_limit_filename_length_to_252_characters() {
+		return array(
+			'the limit before adding characters for uniqueness' => array( 'filename' => str_pad( '', 241, 'filename' ) ),
+			'one more than the limit before adding characters for uniqueness' => array( 'filename' => str_pad( '', 242, 'filename' ) ),
+			'251 characters' => array( 'filename' => str_pad( '', 251, 'filename' ) ),
+			'252 characters' => array( 'filename' => str_pad( '', 252, 'filename' ) ),
+			'253 characters' => array( 'filename' => str_pad( '', 253, 'filename' ) ),
+		);
+	}
+
+	/**
+	 * Tests that `wp_tempnam()` limits the filename's length to 252 characters
+	 * when there is a name conflict.
+	 *
+	 * @ticket 35755
+	 *
+	 * @covers ::wp_tempnam
+	 */
+	public function test_wp_tempnam_should_limit_filename_length_to_252_characters_with_name_conflict() {
+		// Create a conflict by removing the randomness of the generated password.
+		add_filter(
+			'random_password',
+			static function() {
+				return '123456';
+			},
+			10,
+			0
+		);
+
+		// A filename at the limit.
+		$filename = str_pad( '', 252, 'filename' );
+
+		// Create the initial file.
+		$existing_file = wp_tempnam( $filename );
+
+		// Try creating a file with the same name.
+		$actual = wp_tempnam( basename( $existing_file ) );
+
+		self::unlink( $existing_file );
+		self::unlink( $actual );
+
+		$this->assertLessThanOrEqual( 252, strlen( basename( $actual ) ) );
+	}
+
+	/**
+	 * Tests that `wp_tempnam()` limits the filename's length to 252 characters
+	 * when a 'random_password' filter returns passwords longer than 6 characters.
+	 *
+	 * @ticket 35755
+	 *
+	 * @covers ::wp_tempnam
+	 */
+	public function test_wp_tempnam_should_limit_filename_length_to_252_characters_when_random_password_is_filtered() {
+		// Force random passwords to 12 characters.
+		add_filter(
+			'random_password',
+			static function() {
+				return '1a2b3c4d5e6f';
+			},
+			10,
+			0
+		);
+
+		// A filename at the limit.
+		$filename = str_pad( '', 252, 'filename' );
+		$actual   = wp_tempnam( $filename );
+
+		self::unlink( $actual );
+
+		$this->assertLessThanOrEqual( 252, strlen( basename( $actual ) ) );
+	}
+
+	/**
+	 * Tests that `wp_tempnam()` limits the filename's length to 252 characters
+	 * when a 'wp_unique_filename' filter returns a filename longer than 252 characters.
+	 *
+	 * @ticket 35755
+	 *
+	 * @covers ::wp_tempnam
+	 */
+	public function test_wp_tempnam_should_limit_filename_length_to_252_characters_when_wp_unique_filename_is_filtered() {
+		// Determine the number of additional characters added by `wp_tempnam()`.
+		$temp_dir                    = get_temp_dir();
+		$additional_chars_filename   = wp_unique_filename( $temp_dir, 'filename' );
+		$additional_chars_generated  = wp_tempnam( $additional_chars_filename, $temp_dir );
+		$additional_chars_difference = strlen( basename( $additional_chars_generated ) ) - strlen( $additional_chars_filename );
+
+		$filenames_over_limit = 0;
+
+		// Make the filter send the filename over the limit.
+		add_filter(
+			'wp_unique_filename',
+			static function( $filename ) use ( &$filenames_over_limit ) {
+				if ( strlen( $filename ) === 252 ) {
+					$filename .= '1';
+					++$filenames_over_limit;
+				}
+
+				return $filename;
+			},
+			10,
+			1
+		);
+
+		// A filename that will hit the limit when `wp_tempnam()` adds characters.
+		$filename = str_pad( '', 252 - $additional_chars_difference, 'filename' );
+		$actual   = wp_tempnam( $filename );
+
+		self::unlink( $additional_chars_generated );
+		self::unlink( $actual );
+
+		$this->assertLessThanOrEqual( 252, strlen( basename( $actual ) ), 'The final filename was over the limit.' );
+		$this->assertSame( 1, $filenames_over_limit, 'One filename should have been over the limit.' );
+	}
+
+	/**
+	 * Tests that `wp_tempnam()` limits the filename's length to 252 characters
+	 * when both a 'random_password' filter and a 'wp_unique_filename' filter
+	 * cause the filename to be greater than 252 characters.
+	 *
+	 * @ticket 35755
+	 *
+	 * @covers ::wp_tempnam
+	 */
+	public function test_wp_tempnam_should_limit_filename_length_to_252_characters_when_random_password_and_wp_unique_filename_are_filtered() {
+		// Force random passwords to 12 characters.
+		add_filter(
+			'random_password',
+			static function() {
+				return '1a2b3c4d5e6f';
+			},
+			10,
+			0
+		);
+
+		// Determine the number of additional characters added by `wp_tempnam()`.
+		$temp_dir                    = get_temp_dir();
+		$additional_chars_filename   = wp_unique_filename( $temp_dir, 'filename' );
+		$additional_chars_generated  = wp_tempnam( $additional_chars_filename, $temp_dir );
+		$additional_chars_difference = strlen( basename( $additional_chars_generated ) ) - strlen( $additional_chars_filename );
+
+		$filenames_over_limit = 0;
+
+		// Make the filter send the filename over the limit.
+		add_filter(
+			'wp_unique_filename',
+			static function( $filename ) use ( &$filenames_over_limit ) {
+				if ( strlen( $filename ) === 252 ) {
+					$filename .= '1';
+					++$filenames_over_limit;
+				}
+
+				return $filename;
+			},
+			10,
+			1
+		);
+
+		// A filename that will hit the limit when `wp_tempnam()` adds characters.
+		$filename = str_pad( '', 252 - $additional_chars_difference, 'filename' );
+		$actual   = wp_tempnam( $filename );
+
+		self::unlink( $additional_chars_generated );
+		self::unlink( $actual );
+
+		$this->assertLessThanOrEqual( 252, strlen( basename( $actual ) ), 'The final filename was over the limit.' );
+		$this->assertSame( 1, $filenames_over_limit, 'One filename should have been over the limit.' );
+	}
+
 	/**
 	 * @ticket 47186
 	 */
diff --git a/tests/phpunit/tests/filesystem/copyDir.php b/tests/phpunit/tests/filesystem/copyDir.php
new file mode 100644
index 0000000000000..7b03ab88e98d5
--- /dev/null
+++ b/tests/phpunit/tests/filesystem/copyDir.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * Tests copy_dir().
+ *
+ * @group file.php
+ *
+ * @covers ::copy_dir
+ */
+class Tests_Filesystem_CopyDir extends WP_UnitTestCase {
+
+	/**
+	 * The test directory.
+	 *
+	 * @var string $test_dir
+	 */
+	private static $test_dir;
+
+	/**
+	 * Sets up the filesystem and test directory before any tests run.
+	 */
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		require_once ABSPATH . 'wp-admin/includes/file.php';
+		WP_Filesystem();
+
+		self::$test_dir = get_temp_dir() . 'copy_dir/';
+	}
+
+	/**
+	 * Sets up the test directory before each test.
+	 */
+	public function set_up() {
+		global $wp_filesystem;
+
+		parent::set_up();
+
+		// Create the root directory.
+		$wp_filesystem->mkdir( self::$test_dir );
+	}
+
+	/**
+	 * Removes the test directory after each test.
+	 */
+	public function tear_down() {
+		global $wp_filesystem;
+
+		// Delete the root directory and its contents.
+		$wp_filesystem->delete( self::$test_dir, true );
+
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests that the destination is created if it does not already exist.
+	 *
+	 * @ticket 41855
+	 */
+	public function test_should_create_destination_it_if_does_not_exist() {
+		global $wp_filesystem;
+
+		$from = self::$test_dir . 'folder1/folder2/';
+		$to   = self::$test_dir . 'folder3/folder2/';
+
+		// Create the file structure for the test.
+		$wp_filesystem->mkdir( self::$test_dir . 'folder1' );
+		$wp_filesystem->mkdir( self::$test_dir . 'folder3' );
+		$wp_filesystem->mkdir( $from );
+		$wp_filesystem->touch( $from . 'file1.txt' );
+		$wp_filesystem->mkdir( $from . 'subfolder1' );
+		$wp_filesystem->touch( $from . 'subfolder1/file2.txt' );
+
+		$this->assertTrue( copy_dir( $from, $to ), 'copy_dir() failed.' );
+
+		$this->assertDirectoryExists( $to, 'The destination was not created.' );
+		$this->assertFileExists( $to . 'file1.txt', 'The destination file was not created.' );
+
+		$this->assertDirectoryExists( $to . 'subfolder1/', 'The destination subfolder was not created.' );
+		$this->assertFileExists( $to . 'subfolder1/file2.txt', 'The destination subfolder file was not created.' );
+	}
+
+}
diff --git a/tests/phpunit/tests/filesystem/moveDir.php b/tests/phpunit/tests/filesystem/moveDir.php
new file mode 100644
index 0000000000000..4cc013453d6c0
--- /dev/null
+++ b/tests/phpunit/tests/filesystem/moveDir.php
@@ -0,0 +1,312 @@
+<?php
+
+/**
+ * Tests move_dir().
+ *
+ * @group file.php
+ *
+ * @covers ::move_dir
+ */
+class Tests_Filesystem_MoveDir extends WP_UnitTestCase {
+
+	/**
+	 * The test directory.
+	 *
+	 * @var string $test_dir
+	 */
+	private static $test_dir;
+
+	/**
+	 * The existing 'from' directory path.
+	 *
+	 * @var string $existing_from
+	 */
+	private static $existing_from;
+
+	/**
+	 * The existing 'from' sub-directory path.
+	 *
+	 * @var string $existing_from_subdir
+	 */
+	private static $existing_from_subdir;
+
+	/**
+	 * The existing 'from' file path.
+	 *
+	 * @var string $existing_from_file
+	 */
+	private static $existing_from_file;
+
+	/**
+	 * The existing 'from' sub-directory file path.
+	 *
+	 * @var string $existing_from_subdir_file
+	 */
+	private static $existing_from_subdir_file;
+
+	/**
+	 * The existing 'to' directory file path.
+	 *
+	 * @var string $existing_to
+	 */
+	private static $existing_to;
+
+	/**
+	 * The existing 'to' file path.
+	 *
+	 * @var string $existing_to_file
+	 */
+	private static $existing_to_file;
+
+	/**
+	 * Sets up the filesystem and directory structure properties
+	 * before any tests run.
+	 */
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		require_once ABSPATH . 'wp-admin/includes/file.php';
+		WP_Filesystem();
+
+		self::$test_dir                  = get_temp_dir() . 'move_dir/';
+		self::$existing_from             = self::$test_dir . 'existing_from/';
+		self::$existing_from_subdir      = self::$existing_from . 'existing_from_subdir/';
+		self::$existing_from_file        = self::$existing_from . 'existing_from_file.txt';
+		self::$existing_from_subdir_file = self::$existing_from_subdir . 'existing_from_subdir_file.txt';
+		self::$existing_to               = self::$test_dir . 'existing_to/';
+		self::$existing_to_file          = self::$existing_to . 'existing_to_file.txt';
+	}
+
+	/**
+	 * Sets up the directory structure before each test.
+	 */
+	public function set_up() {
+		global $wp_filesystem;
+
+		parent::set_up();
+
+		// Create the root directory.
+		$wp_filesystem->mkdir( self::$test_dir );
+
+		// Create the "from" directory structure.
+		$wp_filesystem->mkdir( self::$existing_from );
+		$wp_filesystem->touch( self::$existing_from_file );
+		$wp_filesystem->mkdir( self::$existing_from_subdir );
+		$wp_filesystem->touch( self::$existing_from_subdir_file );
+
+		// Create the "to" directory structure.
+		$wp_filesystem->mkdir( self::$existing_to );
+		$wp_filesystem->touch( self::$existing_to_file );
+	}
+
+	/**
+	 * Removes the test directory structure after each test.
+	 */
+	public function tear_down() {
+		global $wp_filesystem;
+
+		// Delete the root directory and its contents.
+		$wp_filesystem->delete( self::$test_dir, true );
+
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests that move_dir() returns a WP_Error object.
+	 *
+	 * @ticket 57375
+	 *
+	 * @dataProvider data_should_return_wp_error
+	 *
+	 * @param string $from      The source directory path.
+	 * @param string $to        The destination directory path.
+	 * @param bool   $overwrite Whether to overwrite the destination directory.
+	 * @param string $expected  The expected WP_Error code.
+	 */
+	public function test_should_return_wp_error( $from, $to, $overwrite, $expected ) {
+		global $wp_filesystem;
+
+		$from   = self::$test_dir . $from;
+		$to     = self::$test_dir . $to;
+		$result = move_dir( $from, $to, $overwrite );
+
+		$this->assertWPError(
+			$result,
+			'move_dir() did not return a WP_Error object.'
+		);
+
+		$this->assertSame(
+			$expected,
+			$result->get_error_code(),
+			'The expected error code was not returned.'
+		);
+
+		if ( 'source_destination_same_move_dir' !== $expected ) {
+			$this->assertTrue(
+				$wp_filesystem->exists( $from ),
+				'The $from directory does not exist anymore.'
+			);
+
+			if ( false === $overwrite && 'existing_to' === untrailingslashit( $to ) ) {
+				$this->assertTrue(
+					$wp_filesystem->exists( $to ),
+					'The $to directory does not exist anymore.'
+				);
+			}
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_return_wp_error() {
+		return array(
+			'$overwrite is false and $to exists' => array(
+				'from'      => 'existing_from',
+				'to'        => 'existing_to',
+				'overwrite' => false,
+				'expected'  => 'destination_already_exists_move_dir',
+			),
+			'same source and destination, source has trailing slash' => array(
+				'from'      => 'existing_from/',
+				'to'        => 'existing_from',
+				'overwrite' => false,
+				'expected'  => 'source_destination_same_move_dir',
+			),
+			'same source and destination, destination has trailing slash' => array(
+				'from'      => 'existing_from',
+				'to'        => 'existing_from/',
+				'overwrite' => false,
+				'expected'  => 'source_destination_same_move_dir',
+			),
+			'same source and destination, source lowercase, destination uppercase' => array(
+				'from'      => 'existing_from',
+				'to'        => 'EXISTING_FROM',
+				'overwrite' => false,
+				'expected'  => 'source_destination_same_move_dir',
+			),
+			'same source and destination, source uppercase, destination lowercase' => array(
+				'from'      => 'EXISTING_FROM',
+				'to'        => 'existing_from',
+				'overwrite' => false,
+				'expected'  => 'source_destination_same_move_dir',
+			),
+			'same source and destination, source and destination in inverted case' => array(
+				'from'      => 'ExIsTiNg_FrOm',
+				'to'        => 'eXiStInG_fRoM',
+				'overwrite' => false,
+				'expected'  => 'source_destination_same_move_dir',
+			),
+		);
+	}
+
+	/**
+	 * Tests that move_dir() successfully moves a directory.
+	 *
+	 * @ticket 57375
+	 *
+	 * @dataProvider data_should_move_directory
+	 *
+	 * @param string $from      The source directory path.
+	 * @param string $to        The destination directory path.
+	 * @param bool   $overwrite Whether to overwrite the destination directory.
+	 */
+	public function test_should_move_directory( $from, $to, $overwrite ) {
+		global $wp_filesystem;
+
+		$from   = self::$test_dir . $from;
+		$to     = self::$test_dir . $to;
+		$result = move_dir( $from, $to, $overwrite );
+
+		$this->assertTrue(
+			$result,
+			'The directory was not moved.'
+		);
+
+		$this->assertFalse(
+			$wp_filesystem->exists( $from ),
+			'The source directory still exists.'
+		);
+
+		$this->assertTrue(
+			$wp_filesystem->exists( $to ),
+			'The destination directory does not exist.'
+		);
+
+		$dirlist = $wp_filesystem->dirlist( $to, true, true );
+
+		// Prevent PHP array sorting bugs from breaking tests.
+		$to_contents = array_keys( $dirlist );
+
+		$this->assertSameSets(
+			array(
+				'existing_from_file.txt',
+				'existing_from_subdir',
+			),
+			$to_contents,
+			'The expected files were not moved.'
+		);
+
+		$this->assertSame(
+			array( 'existing_from_subdir_file.txt' ),
+			array_keys( $dirlist['existing_from_subdir']['files'] ),
+			'Sub-directory files failed to move.'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_move_directory() {
+		return array(
+			'$overwrite is false and $to does not exist' => array(
+				'from'      => 'existing_from',
+				'to'        => 'non_existing_to',
+				'overwrite' => false,
+			),
+			'$overwrite is true and $to exists'          => array(
+				'from'      => 'existing_from',
+				'to'        => 'existing_to',
+				'overwrite' => true,
+			),
+		);
+	}
+
+	/**
+	 * Tests that `move_dir()` returns a WP_Error object when overwriting
+	 * is enabled, the destination exists, but cannot be deleted.
+	 *
+	 * @ticket 57375
+	 */
+	public function test_should_return_wp_error_when_overwriting_is_enabled_the_destination_exists_but_cannot_be_deleted() {
+		global $wp_filesystem;
+		$wpfilesystem_backup = $wp_filesystem;
+
+		// Force failure conditions.
+		$filesystem_mock = $this->getMockBuilder( 'WP_Filesystem_Direct' )->setConstructorArgs( array( null ) )->getMock();
+		$filesystem_mock->expects( $this->once() )->method( 'exists' )->willReturn( true );
+		$filesystem_mock->expects( $this->once() )->method( 'delete' )->willReturn( false );
+		$wp_filesystem = $filesystem_mock;
+
+		$actual = move_dir( self::$existing_from, self::$existing_from_subdir, true );
+
+		// Restore the filesystem.
+		$wp_filesystem = $wpfilesystem_backup;
+
+		$this->assertWPError(
+			$actual,
+			'A WP_Error object was not returned.'
+		);
+
+		$this->assertSame(
+			'destination_not_deleted_move_dir',
+			$actual->get_error_code(),
+			'An unexpected error code was returned.'
+		);
+	}
+
+}
diff --git a/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php b/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
new file mode 100644
index 0000000000000..54c71c7ab0352
--- /dev/null
+++ b/tests/phpunit/tests/filesystem/wpOpcacheInvalidateDirectory.php
@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Tests wp_opcache_invalidate_directory().
+ *
+ * @group file.php
+ *
+ * @covers ::wp_opcache_invalidate_directory
+ */
+class Tests_Filesystem_WpOpcacheInvalidateDirectory extends WP_UnitTestCase {
+
+	/**
+	 * Sets up the filesystem before any tests run.
+	 */
+	public static function set_up_before_class() {
+		global $wp_filesystem;
+
+		parent::set_up_before_class();
+
+		if ( ! $wp_filesystem ) {
+			require_once ABSPATH . 'wp-admin/includes/file.php';
+			WP_Filesystem();
+		}
+	}
+
+	/**
+	 * Tests that wp_opcache_invalidate_directory() returns a WP_Error object
+	 * when the $dir argument invalid.
+	 *
+	 * @ticket 57375
+	 *
+	 * @dataProvider data_should_trigger_error_with_invalid_dir
+	 *
+	 * @param mixed $dir An invalid directory path.
+	 */
+	public function test_should_trigger_error_with_invalid_dir( $dir ) {
+		$this->expectError();
+		$this->expectErrorMessage(
+			'<code>wp_opcache_invalidate_directory()</code>',
+			'The expected error was not triggered.'
+		);
+
+		wp_opcache_invalidate_directory( $dir );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_trigger_error_with_invalid_dir() {
+		return array(
+			'an empty string'                => array( '' ),
+			'a string with spaces'           => array( '   ' ),
+			'a string with tabs'             => array( "\t" ),
+			'a string with new lines'        => array( "\n" ),
+			'a string with carriage returns' => array( "\r" ),
+			'int -1'                         => array( -1 ),
+			'int 0'                          => array( 0 ),
+			'int 1'                          => array( 1 ),
+			'float -1.0'                     => array( -1.0 ),
+			'float 0.0'                      => array( 0.0 ),
+			'float 1.0'                      => array( 1.0 ),
+			'false'                          => array( false ),
+			'true'                           => array( true ),
+			'null'                           => array( null ),
+			'an empty array'                 => array( array() ),
+			'a non-empty array'              => array( array( 'directory_path' ) ),
+			'an empty object'                => array( new stdClass() ),
+			'a non-empty object'             => array( (object) array( 'directory_path' ) ),
+			'INF'                            => array( INF ),
+			'NAN'                            => array( NAN ),
+		);
+	}
+
+	/**
+	 * Tests that wp_opcache_invalidate_directory() does not trigger an error
+	 * with a valid directory.
+	 *
+	 * @ticket 57375
+	 *
+	 * @dataProvider data_should_not_trigger_error_wp_opcache_valid_directory
+	 *
+	 * @param string $dir A directory path.
+	 */
+	public function test_should_not_trigger_error_wp_opcache_valid_directory( $dir ) {
+		$this->assertNull( wp_opcache_invalidate_directory( $dir ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_not_trigger_error_wp_opcache_valid_directory() {
+		return array(
+			'an existing directory'    => array( DIR_TESTDATA ),
+			'a non-existent directory' => array( 'non_existent_directory' ),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/formatting/balanceTags.php b/tests/phpunit/tests/formatting/balanceTags.php
index e035275741bdd..2631343ec64b5 100644
--- a/tests/phpunit/tests/formatting/balanceTags.php
+++ b/tests/phpunit/tests/formatting/balanceTags.php
@@ -7,46 +7,17 @@
  */
 class Tests_Formatting_BalanceTags extends WP_UnitTestCase {
 
-	public function nestable_tags() {
-		return array(
-			array( 'article' ),
-			array( 'aside' ),
-			array( 'blockquote' ),
-			array( 'details' ),
-			array( 'div' ),
-			array( 'figure' ),
-			array( 'object' ),
-			array( 'q' ),
-			array( 'section' ),
-			array( 'span' ),
-		);
-	}
+	/**
+	 * @ticket 47014
+	 * @dataProvider data_supported_traditional_tag_names
+	 */
+	public function test_detects_traditional_tag_names( $tag ) {
+		$normalized = strtolower( $tag );
 
-	// This is a complete(?) listing of valid single/self-closing tags.
-	public function single_tags() {
-		return array(
-			array( 'area' ),
-			array( 'base' ),
-			array( 'basefont' ),
-			array( 'br' ),
-			array( 'col' ),
-			array( 'command' ),
-			array( 'embed' ),
-			array( 'frame' ),
-			array( 'hr' ),
-			array( 'img' ),
-			array( 'input' ),
-			array( 'isindex' ),
-			array( 'link' ),
-			array( 'meta' ),
-			array( 'param' ),
-			array( 'source' ),
-			array( 'track' ),
-			array( 'wbr' ),
-		);
+		$this->assertSame( "<$normalized>inside</$normalized>", balanceTags( "<$tag>inside", true ) );
 	}
 
-	public function supported_traditional_tag_names() {
+	public function data_supported_traditional_tag_names() {
 		return array(
 			array( 'a' ),
 			array( 'div' ),
@@ -58,7 +29,15 @@ public function supported_traditional_tag_names() {
 		);
 	}
 
-	public function supported_custom_element_tag_names() {
+	/**
+	 * @ticket 47014
+	 * @dataProvider data_supported_custom_element_tag_names
+	 */
+	public function test_detects_supported_custom_element_tag_names( $tag ) {
+		$this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );
+	}
+
+	public function data_supported_custom_element_tag_names() {
 		return array(
 			array( 'custom-element' ),
 			array( 'my-custom-element' ),
@@ -70,19 +49,35 @@ public function supported_custom_element_tag_names() {
 		);
 	}
 
-	public function invalid_tag_names() {
+	/**
+	 * @ticket 47014
+	 * @dataProvider data_invalid_tag_names
+	 */
+	public function test_ignores_invalid_tag_names( $input, $output ) {
+		$this->assertSame( $output, balanceTags( $input, true ) );
+	}
+
+	public function data_invalid_tag_names() {
 		return array(
 			array( '<0-day>inside', '&lt;0-day>inside' ), // Can't start with a number - handled by the "<3" fix.
 			array( '<UPPERCASE-TAG>inside', '<UPPERCASE-TAG>inside' ), // Custom elements cannot be uppercase.
 		);
 	}
 
+	/**
+	 * @ticket 47014
+	 * @dataProvider data_unsupported_valid_tag_names
+	 */
+	public function test_ignores_unsupported_custom_tag_names( $tag ) {
+		$this->assertSame( "<$tag>inside", balanceTags( "<$tag>inside", true ) );
+	}
+
 	/**
 	 * These are valid custom elements but we don't support them yet.
 	 *
 	 * @see https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
 	 */
-	public function unsupported_valid_tag_names() {
+	public function data_unsupported_valid_tag_names() {
 		return array(
 			// We don't allow ending in a dash.
 			array( '<what->inside' ),
@@ -137,12 +132,20 @@ public function unsupported_valid_tag_names() {
 		);
 	}
 
+	/**
+	 * @ticket 47014
+	 * @dataProvider data_supported_invalid_tag_names
+	 */
+	public function test_detects_supported_invalid_tag_names( $tag ) {
+		$this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );
+	}
+
 	/**
 	 * These are invalid custom elements but we support them right now in order to keep the parser simpler.
 	 *
 	 * @see https://w3c.github.io/webcomponents/spec/custom/#valid-custom-element-name
 	 */
-	public function supported_invalid_tag_names() {
+	public function data_supported_invalid_tag_names() {
 		return array(
 			// Reserved names for custom elements.
 			array( 'annotation-xml' ),
@@ -156,53 +159,11 @@ public function supported_invalid_tag_names() {
 		);
 	}
 
-	/**
-	 * @ticket 47014
-	 * @dataProvider supported_traditional_tag_names
-	 */
-	public function test_detects_traditional_tag_names( $tag ) {
-		$normalized = strtolower( $tag );
-
-		$this->assertSame( "<$normalized>inside</$normalized>", balanceTags( "<$tag>inside", true ) );
-	}
-
-	/**
-	 * @ticket 47014
-	 * @dataProvider supported_custom_element_tag_names
-	 */
-	public function test_detects_supported_custom_element_tag_names( $tag ) {
-		$this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );
-	}
-
-	/**
-	 * @ticket 47014
-	 * @dataProvider invalid_tag_names
-	 */
-	public function test_ignores_invalid_tag_names( $input, $output ) {
-		$this->assertSame( $output, balanceTags( $input, true ) );
-	}
-
-	/**
-	 * @ticket 47014
-	 * @dataProvider unsupported_valid_tag_names
-	 */
-	public function test_ignores_unsupported_custom_tag_names( $tag ) {
-		$this->assertSame( "<$tag>inside", balanceTags( "<$tag>inside", true ) );
-	}
-
-	/**
-	 * @ticket 47014
-	 * @dataProvider supported_invalid_tag_names
-	 */
-	public function test_detects_supported_invalid_tag_names( $tag ) {
-		$this->assertSame( "<$tag>inside</$tag>", balanceTags( "<$tag>inside", true ) );
-	}
-
 	/**
 	 * If a recognized valid single tag appears unclosed, it should get self-closed
 	 *
 	 * @ticket 1597
-	 * @dataProvider single_tags
+	 * @dataProvider data_single_tags
 	 */
 	public function test_selfcloses_unclosed_known_single_tags( $tag ) {
 		$this->assertSame( "<$tag />", balanceTags( "<$tag>", true ) );
@@ -213,12 +174,36 @@ public function test_selfcloses_unclosed_known_single_tags( $tag ) {
 	 *   should get removed and tag should be self-closed.
 	 *
 	 * @ticket 1597
-	 * @dataProvider single_tags
+	 * @dataProvider data_single_tags
 	 */
 	public function test_selfcloses_known_single_tags_having_closing_tag( $tag ) {
 		$this->assertSame( "<$tag />", balanceTags( "<$tag></$tag>", true ) );
 	}
 
+	// This is a complete(?) listing of valid single/self-closing tags.
+	public function data_single_tags() {
+		return array(
+			array( 'area' ),
+			array( 'base' ),
+			array( 'basefont' ),
+			array( 'br' ),
+			array( 'col' ),
+			array( 'command' ),
+			array( 'embed' ),
+			array( 'frame' ),
+			array( 'hr' ),
+			array( 'img' ),
+			array( 'input' ),
+			array( 'isindex' ),
+			array( 'link' ),
+			array( 'meta' ),
+			array( 'param' ),
+			array( 'source' ),
+			array( 'track' ),
+			array( 'wbr' ),
+		);
+	}
+
 	/**
 	 * @ticket 1597
 	 */
@@ -274,7 +259,7 @@ public function test_allows_validly_closed_single_tags() {
 	}
 
 	/**
-	 * @dataProvider nestable_tags
+	 * @dataProvider data_nestable_tags
 	 */
 	public function test_balances_nestable_tags( $tag ) {
 		$inputs   = array(
@@ -293,6 +278,21 @@ public function test_balances_nestable_tags( $tag ) {
 		}
 	}
 
+	public function data_nestable_tags() {
+		return array(
+			array( 'article' ),
+			array( 'aside' ),
+			array( 'blockquote' ),
+			array( 'details' ),
+			array( 'div' ),
+			array( 'figure' ),
+			array( 'object' ),
+			array( 'q' ),
+			array( 'section' ),
+			array( 'span' ),
+		);
+	}
+
 	public function test_allows_adjacent_nestable_tags() {
 		$inputs = array(
 			'<blockquote><blockquote>Example quote</blockquote></blockquote>',
diff --git a/tests/phpunit/tests/formatting/convertSmilies.php b/tests/phpunit/tests/formatting/convertSmilies.php
index 5031b4b51c5dd..c7f080380401b 100644
--- a/tests/phpunit/tests/formatting/convertSmilies.php
+++ b/tests/phpunit/tests/formatting/convertSmilies.php
@@ -9,11 +9,36 @@
 class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
 
 	/**
-	 * Basic Test Content DataProvider
+	 * Basic validation test to confirm that smilies are converted to image
+	 * when use_smilies = 1 and not when use_smilies = 0.
 	 *
-	 * array ( input_txt, converted_output_txt)
+	 * @dataProvider data_convert_standard_smilies
 	 */
-	public function get_smilies_input_output() {
+	public function test_convert_standard_smilies( $input, $converted ) {
+		// Standard smilies, use_smilies: ON.
+		update_option( 'use_smilies', 1 );
+
+		smilies_init();
+
+		$this->assertSame( $converted, convert_smilies( $input ) );
+
+		// Standard smilies, use_smilies: OFF.
+		update_option( 'use_smilies', 0 );
+
+		$this->assertSame( $input, convert_smilies( $input ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input     Input content.
+	 *         @type string $converted Converted output.
+	 *     }
+	 * }
+	 */
+	public function data_convert_standard_smilies() {
 		$includes_path = includes_url( 'images/smilies/' );
 
 		return array(
@@ -45,31 +70,52 @@ public function get_smilies_input_output() {
 	}
 
 	/**
-	 * @dataProvider get_smilies_input_output
+	 * Tests that custom smilies are converted to images when use_smilies = 1.
 	 *
-	 * Basic Validation Test to confirm that smilies are converted to image
-	 * when use_smilies = 1 and not when use_smilies = 0
+	 * @dataProvider data_convert_custom_smilies
 	 */
-	public function test_convert_standard_smilies( $in_txt, $converted_txt ) {
-		// Standard smilies, use_smilies: ON.
+	public function test_convert_custom_smilies( $input, $converted ) {
+		global $wpsmiliestrans;
+
+		// Custom smilies, use_smilies: ON.
 		update_option( 'use_smilies', 1 );
 
+		if ( ! isset( $wpsmiliestrans ) ) {
+			smilies_init();
+		}
+
+		$trans_orig = $wpsmiliestrans; // Save original translations array.
+
+		$wpsmiliestrans = array(
+			':PP'      => 'icon_tongue.gif',
+			':arrow:'  => 'icon_arrow.gif',
+			':monkey:' => 'icon_shock_the_monkey.gif',
+			':nervou:' => 'icon_nervou.gif',
+		);
+
 		smilies_init();
 
-		$this->assertSame( $converted_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $converted, convert_smilies( $input ) );
 
 		// Standard smilies, use_smilies: OFF.
 		update_option( 'use_smilies', 0 );
 
-		$this->assertSame( $in_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $input, convert_smilies( $input ) );
+
+		$wpsmiliestrans = $trans_orig; // Reset original translations array.
 	}
 
 	/**
-	 * Custom Smilies Test Content DataProvider
+	 * Data provider.
 	 *
-	 * array ( input_txt, converted_output_txt)
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input     Input content.
+	 *         @type string $converted Converted output.
+	 *     }
+	 * }
 	 */
-	public function get_custom_smilies_input_output() {
+	public function data_convert_custom_smilies() {
 		$includes_path = includes_url( 'images/smilies/' );
 
 		return array(
@@ -89,46 +135,38 @@ public function get_custom_smilies_input_output() {
 	}
 
 	/**
-	 * @dataProvider get_custom_smilies_input_output
+	 * Tests that conversion of smilies is ignored in pre-determined tags:
+	 * pre, code, script, style.
 	 *
-	 * Validate Custom Smilies are converted to images when use_smilies = 1
+	 * @ticket 16448
+	 * @dataProvider data_ignore_smilies_in_tags
 	 */
-	public function test_convert_custom_smilies( $in_txt, $converted_txt ) {
-		global $wpsmiliestrans;
-
-		// Custom smilies, use_smilies: ON.
-		update_option( 'use_smilies', 1 );
-
-		if ( ! isset( $wpsmiliestrans ) ) {
-			smilies_init();
-		}
+	public function test_ignore_smilies_in_tags( $element ) {
+		$includes_path = includes_url( 'images/smilies/' );
 
-		$trans_orig = $wpsmiliestrans; // Save original translations array.
-
-		$wpsmiliestrans = array(
-			':PP'      => 'icon_tongue.gif',
-			':arrow:'  => 'icon_arrow.gif',
-			':monkey:' => 'icon_shock_the_monkey.gif',
-			':nervou:' => 'icon_nervou.gif',
-		);
+		$input    = 'Do we ignore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
+		$expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
 
+		// Standard smilies, use_smilies: ON.
+		update_option( 'use_smilies', 1 );
 		smilies_init();
 
-		$this->assertSame( $converted_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $expected, convert_smilies( $input ) );
 
 		// Standard smilies, use_smilies: OFF.
 		update_option( 'use_smilies', 0 );
-
-		$this->assertSame( $in_txt, convert_smilies( $in_txt ) );
-
-		$wpsmiliestrans = $trans_orig; // Reset original translations array.
 	}
 
-
 	/**
-	 * DataProvider of HTML elements/tags that smilie matches should be ignored in
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $element HTML tag name.
+	 *     }
+	 * }
 	 */
-	public function get_smilies_ignore_tags() {
+	public function data_ignore_smilies_in_tags() {
 		return array(
 			array( 'pre' ),
 			array( 'code' ),
@@ -139,32 +177,36 @@ public function get_smilies_ignore_tags() {
 	}
 
 	/**
-	 * Validate Conversion of Smilies is ignored in pre-determined tags
-	 * pre, code, script, style
+	 * Tests that combinations of smilies separated by a single space
+	 * are converted correctly.
 	 *
-	 * @ticket 16448
-	 * @dataProvider get_smilies_ignore_tags
+	 * @ticket 20124
+	 * @dataProvider data_smilies_combinations
 	 */
-	public function test_ignore_smilies_in_tags( $element ) {
-		$includes_path = includes_url( 'images/smilies/' );
-
-		$in_str  = 'Do we ingore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: </' . $element . '>';
-		$exp_str = "Do we ingore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: </$element>";
-
-		// Standard smilies, use_smilies: ON.
+	public function test_smilies_combinations( $input, $converted ) {
+		// Custom smilies, use_smilies: ON.
 		update_option( 'use_smilies', 1 );
 		smilies_init();
 
-		$this->assertSame( $exp_str, convert_smilies( $in_str ) );
+		$this->assertSame( $converted, convert_smilies( $input ) );
 
-		// Standard smilies, use_smilies: OFF.
+		// Custom smilies, use_smilies: OFF.
 		update_option( 'use_smilies', 0 );
+
+		$this->assertSame( $input, convert_smilies( $input ) );
 	}
 
 	/**
-	 * DataProvider of Smilie Combinations
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input     Input content.
+	 *         @type string $converted Converted output.
+	 *     }
+	 * }
 	 */
-	public function get_smilies_combinations() {
+	public function data_smilies_combinations() {
 		$includes_path = includes_url( 'images/smilies/' );
 
 		return array(
@@ -196,29 +238,51 @@ public function get_smilies_combinations() {
 	}
 
 	/**
-	 * Validate Combinations of Smilies separated by single space
-	 * are converted correctly
+	 * Tests that smilies are converted for single smilie in
+	 * the $wpsmiliestrans global array.
 	 *
-	 * @ticket 20124
-	 * @dataProvider get_smilies_combinations
+	 * @ticket 25303
+	 * @dataProvider data_single_smilies_in_wpsmiliestrans
 	 */
-	public function test_smilies_combinations( $in_txt, $converted_txt ) {
-		// Custom smilies, use_smilies: ON.
+	public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
+		global $wpsmiliestrans;
+
+		// Standard smilies, use_smilies: ON.
 		update_option( 'use_smilies', 1 );
+
+		if ( ! isset( $wpsmiliestrans ) ) {
+			smilies_init();
+		}
+
+		$orig_trans = $wpsmiliestrans; // Save original tranlations array.
+
+		$wpsmiliestrans = array(
+			':)' => 'simple-smile.png',
+		);
+
 		smilies_init();
 
-		$this->assertSame( $converted_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $converted, convert_smilies( $input ) );
 
-		// Custom smilies, use_smilies: OFF.
+		// Standard smilies, use_smilies: OFF.
 		update_option( 'use_smilies', 0 );
 
-		$this->assertSame( $in_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $input, convert_smilies( $input ) );
+
+		$wpsmiliestrans = $orig_trans; // Reset original translations array.
 	}
 
 	/**
-	 * DataProvider of Single Smilies input and converted output
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input     Input content.
+	 *         @type string $converted Converted output.
+	 *     }
+	 * }
 	 */
-	public function get_single_smilies_input_output() {
+	public function data_single_smilies_in_wpsmiliestrans() {
 		$includes_path = includes_url( 'images/smilies/' );
 
 		return array(
@@ -238,41 +302,38 @@ public function get_single_smilies_input_output() {
 	}
 
 	/**
-	 * Validate Smilies are converted for single smilie in
-	 * the $wpsmiliestrans global array
+	 * Tests that $wp_smiliessearch pattern will match smilies
+	 * between spaces, but never capture those spaces.
 	 *
-	 * @ticket 25303
-	 * @dataProvider get_single_smilies_input_output
+	 * Further tests that spaces aren't randomly deleted
+	 * or added when replacing the text with an image.
+	 *
+	 * @ticket 22692
+	 * @dataProvider data_spaces_around_smilies
 	 */
-	public function test_single_smilies_in_wpsmiliestrans( $in_txt, $converted_txt ) {
-		global $wpsmiliestrans;
-
+	public function test_spaces_around_smilies( $input, $converted ) {
 		// Standard smilies, use_smilies: ON.
 		update_option( 'use_smilies', 1 );
 
-		if ( ! isset( $wpsmiliestrans ) ) {
-			smilies_init();
-		}
-
-		$orig_trans = $wpsmiliestrans; // Save original tranlations array.
-
-		$wpsmiliestrans = array(
-			':)' => 'simple-smile.png',
-		);
-
 		smilies_init();
 
-		$this->assertSame( $converted_txt, convert_smilies( $in_txt ) );
+		$this->assertSame( $converted, convert_smilies( $input ) );
 
 		// Standard smilies, use_smilies: OFF.
 		update_option( 'use_smilies', 0 );
-
-		$this->assertSame( $in_txt, convert_smilies( $in_txt ) );
-
-		$wpsmiliestrans = $orig_trans; // Reset original translations array.
 	}
 
-	public function get_spaces_around_smilies() {
+	/**
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input     Input content.
+	 *         @type string $converted Converted output.
+	 *     }
+	 * }
+	 */
+	public function data_spaces_around_smilies() {
 		$nbsp = "\xC2\xA0";
 
 		return array(
@@ -291,28 +352,6 @@ public function get_spaces_around_smilies() {
 		);
 	}
 
-	/**
-	 * Check that $wp_smiliessearch pattern will match smilies
-	 * between spaces, but never capture those spaces.
-	 *
-	 * Further check that spaces aren't randomly deleted
-	 * or added when replacing the text with an image.
-	 *
-	 * @ticket 22692
-	 * @dataProvider get_spaces_around_smilies
-	 */
-	public function test_spaces_around_smilies( $in_txt, $converted_txt ) {
-		// Standard smilies, use_smilies: ON.
-		update_option( 'use_smilies', 1 );
-
-		smilies_init();
-
-		$this->assertSame( $converted_txt, convert_smilies( $in_txt ) );
-
-		// Standard smilies, use_smilies: OFF.
-		update_option( 'use_smilies', 0 );
-	}
-
 	/**
 	 * Test to ensure smilies can be removed with a filter
 	 *
diff --git a/tests/phpunit/tests/formatting/date.php b/tests/phpunit/tests/formatting/date.php
index 684cf86d975d2..8e090dd9c1264 100644
--- a/tests/phpunit/tests/formatting/date.php
+++ b/tests/phpunit/tests/formatting/date.php
@@ -130,11 +130,11 @@ public function test_get_gmt_from_date_string_date_no_timezone() {
 	/**
 	 * @ticket 31809
 	 *
-	 * @dataProvider timezone_provider
+	 * @dataProvider data_timezone_provider
 	 *
 	 * @covers ::get_gmt_from_date
 	 */
-	public function test_gmt_from_date_correct_time( $timezone_string, $gmt_offset ) {
+	public function test_get_gmt_from_date_correct_time( $timezone_string, $gmt_offset ) {
 		update_option( 'timezone_string', $timezone_string );
 		update_option( 'gmt_offset', $gmt_offset );
 
@@ -148,11 +148,11 @@ public function test_gmt_from_date_correct_time( $timezone_string, $gmt_offset )
 	/**
 	 * @ticket 31809
 	 *
-	 * @dataProvider timezone_provider
+	 * @dataProvider data_timezone_provider
 	 *
 	 * @covers ::get_date_from_gmt
 	 */
-	public function test_date_from_gmt_correct_time( $timezone_string, $gmt_offset ) {
+	public function test_get_date_from_gmt_correct_time( $timezone_string, $gmt_offset ) {
 		update_option( 'timezone_string', $timezone_string );
 		update_option( 'gmt_offset', $gmt_offset );
 
@@ -166,7 +166,7 @@ public function test_date_from_gmt_correct_time( $timezone_string, $gmt_offset )
 	/**
 	 * @ticket 31809
 	 *
-	 * @dataProvider timezone_provider
+	 * @dataProvider data_timezone_provider
 	 *
 	 * @covers ::iso8601_to_datetime
 	 */
@@ -230,7 +230,7 @@ public function test_is8601_to_datetime_correct_time( $timezone_string, $gmt_off
 	 *
 	 * @return array
 	 */
-	public function timezone_provider() {
+	public function data_timezone_provider() {
 		return array(
 			array(
 				'timezone_string' => 'Europe/Helsinki',
diff --git a/tests/phpunit/tests/formatting/ent2ncr.php b/tests/phpunit/tests/formatting/ent2ncr.php
index daf7f44b4d094..ea5e2885bfb74 100644
--- a/tests/phpunit/tests/formatting/ent2ncr.php
+++ b/tests/phpunit/tests/formatting/ent2ncr.php
@@ -7,7 +7,7 @@
  */
 class Tests_Formatting_Ent2ncr extends WP_UnitTestCase {
 	/**
-	 * @dataProvider entities
+	 * @dataProvider data_entities
 	 */
 	public function test_converts_named_entities_to_numeric_character_references( $entity, $ncr ) {
 		$entity = '&' . $entity . ';';
@@ -19,7 +19,7 @@ public function test_converts_named_entities_to_numeric_character_references( $e
 	 * Get test data from files, one test per line.
 	 * Comments start with "###".
 	 */
-	public function entities() {
+	public function data_entities() {
 		$entities      = file( DIR_TESTDATA . '/formatting/entities.txt' );
 		$data_provided = array();
 		foreach ( $entities as $line ) {
diff --git a/tests/phpunit/tests/formatting/escXml.php b/tests/phpunit/tests/formatting/escXml.php
index bce29da9df953..6fdbd136a7236 100644
--- a/tests/phpunit/tests/formatting/escXml.php
+++ b/tests/phpunit/tests/formatting/escXml.php
@@ -9,7 +9,7 @@ class Tests_Formatting_EscXml extends WP_UnitTestCase {
 	/**
 	 * Test basic escaping
 	 *
-	 * @dataProvider _test_esc_xml_basics_dataprovider
+	 * @dataProvider data_esc_xml_basics
 	 *
 	 * @param string $source   The source string to be escaped.
 	 * @param string $expected The expected escaped value of `$source`.
@@ -27,7 +27,7 @@ public function test_esc_xml_basics( $source, $expected ) {
 	 *     @type string $expected The expected escaped value of `$source`.
 	 * }
 	 */
-	public function _test_esc_xml_basics_dataprovider() {
+	public function data_esc_xml_basics() {
 		return array(
 			// Simple string.
 			array(
@@ -84,7 +84,7 @@ public function test_ignores_existing_entities() {
 	/**
 	 * Test that CDATA Sections are not escaped.
 	 *
-	 * @dataProvider _test_ignores_cdata_sections_dataprovider
+	 * @dataProvider data_ignores_cdata_sections
 	 *
 	 * @param string $source   The source string to be escaped.
 	 * @param string $expected The expected escaped value of `$source`.
@@ -102,7 +102,7 @@ public function test_ignores_cdata_sections( $source, $expected ) {
 	 *     @type string $expected The expected escaped value of `$source`.
 	 * }
 	 */
-	public function _test_ignores_cdata_sections_dataprovider() {
+	public function data_ignores_cdata_sections() {
 		return array(
 			// basic CDATA Section containing chars that would otherwise be escaped if not in a CDATA Section
 			// not to mention the CDATA Section markup itself :-)
diff --git a/tests/phpunit/tests/formatting/excerptRemoveFootnotes.php b/tests/phpunit/tests/formatting/excerptRemoveFootnotes.php
new file mode 100644
index 0000000000000..12ea3acb04cbe
--- /dev/null
+++ b/tests/phpunit/tests/formatting/excerptRemoveFootnotes.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @group formatting
+ * @ticket 58805
+ *
+ * @covers ::excerpt_remove_footnotes
+ */
+
+class Tests_Formatting_ExcerptRemoveFootnotes extends WP_UnitTestCase {
+	/**
+	 * @ticket 58805
+	 *
+	 * @dataProvider data_remove_footnotes
+	 *
+	 * @param string $expected Expected output.
+	 * @param string $content  Content to run strip_shortcodes() on.
+	 */
+	public function test_remove_footnotes( $expected, $content ) {
+		$this->assertSame( $expected, excerpt_remove_footnotes( $content ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_remove_footnotes() {
+		return array(
+			'no footnote'                         => array(
+				'expected' => '<p>This is a paragraph<sup class="fn" id="1"><a href="#1" id="1a">1</a></sup>.</p>',
+				'content'  => '<p>This is a paragraph<sup class="fn" id="1"><a href="#1" id="1a">1</a></sup>.</p>',
+			),
+			'one footnote'                        => array(
+				'expected' => '<p>This is a <a href="https://wordpress.org" data-type="URL" data-id="https://wordpress.org">paragraph</a>.</p>',
+				'content'  => '<p>This is a <a href="https://wordpress.org" data-type="URL" data-id="https://wordpress.org">paragraph</a><sup data-fn="d3b825b6-1890-4cb3-b276-002137515e99" class="fn"><a href="#d3b825b6-1890-4cb3-b276-002137515e99" id="d3b825b6-1890-4cb3-b276-002137515e99-link">1</a></sup>.</p>',
+
+			),
+			'multiple footnotes in block content' => array(
+				'expected' => '<!-- wp:list --><ul><!-- wp:list-item --><li><strong>This</strong><em><strong><sup></sup></strong></em><strong> is a list</strong></li><!-- /wp:list-item --></ul><!-- /wp:list -->',
+				'content'  => '<!-- wp:list --><ul><!-- wp:list-item --><li><strong>This</strong><em><strong><sup><sup data-fn="e2fce624-74a5-4068-a20c-6ef793f1644c" class="fn"><a href="#e2fce624-74a5-4068-a20c-6ef793f1644c" id="e2fce624-74a5-4068-a20c-6ef793f1644c-link">2</a></sup></sup></strong></em><strong> is a list</strong><sup data-fn="ea7e892e-7bc2-424b-936b-36ec64f1c2fc" class="fn"><a href="#ea7e892e-7bc2-424b-936b-36ec64f1c2fc" id="ea7e892e-7bc2-424b-936b-36ec64f1c2fc-link">3</a></sup></li><!-- /wp:list-item --></ul><!-- /wp:list -->',
+			),
+			'footnotes around non-latin script'   => array(
+				'expected' => '<h2 class="wp-block-heading has-background" style="background-color:#f93b3b">これは見出しです</h2>',
+				'content'  => '<h2 class="wp-block-heading has-background" style="background-color:#f93b3b">これは<sup data-fn="382b3e39-4b0d-4b83-8461-c13f82fdbcfb" class="fn"><a href="#382b3e39-4b0d-4b83-8461-c13f82fdbcfb" id="382b3e39-4b0d-4b83-8461-c13f82fdbcfb-link">1</a></sup>見出しです<sup data-fn="addb0459-a048-453a-9101-dba64f63a630" class="fn"><a href="#addb0459-a048-453a-9101-dba64f63a630" id="addb0459-a048-453a-9101-dba64f63a630-link">2</a></sup></h2>',
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/formatting/getBloginfo.php b/tests/phpunit/tests/formatting/getBloginfo.php
index 0b6ab77358786..37f449bac6ab5 100644
--- a/tests/phpunit/tests/formatting/getBloginfo.php
+++ b/tests/phpunit/tests/formatting/getBloginfo.php
@@ -8,7 +8,7 @@
 class Tests_Formatting_GetBloginfo extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider locales
+	 * @dataProvider data_get_bloginfo_language
 	 * @ticket 28303
 	 */
 	public function test_get_bloginfo_language( $test_locale, $expected ) {
@@ -22,7 +22,7 @@ public function test_get_bloginfo_language( $test_locale, $expected ) {
 		$locale = $old_locale;
 	}
 
-	public function locales() {
+	public function data_get_bloginfo_language() {
 		return array(
 			// Locale, language code.
 			array( 'en_US', 'en-US' ),
diff --git a/tests/phpunit/tests/formatting/getUrlInContent.php b/tests/phpunit/tests/formatting/getUrlInContent.php
index dd797699985ca..ce99099ef5ad1 100644
--- a/tests/phpunit/tests/formatting/getUrlInContent.php
+++ b/tests/phpunit/tests/formatting/getUrlInContent.php
@@ -8,11 +8,25 @@
 class Tests_Formatting_GetUrlInContent extends WP_UnitTestCase {
 
 	/**
-	 * URL Content Data Provider
+	 * Tests the get_url_in_content() function.
 	 *
-	 * array ( input_txt, converted_output_txt )
+	 * @dataProvider data_get_url_in_content
 	 */
-	public function get_input_output() {
+	public function test_get_url_in_content( $input, $expected ) {
+		$this->assertSame( $expected, get_url_in_content( $input ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input    Input content.
+	 *         @type string $expected Expected output.
+	 *     }
+	 * }
+	 */
+	public function data_get_url_in_content() {
 		return array(
 			array( // Empty content.
 				'',
@@ -40,13 +54,4 @@ public function get_input_output() {
 			),
 		);
 	}
-
-	/**
-	 * Validate the get_url_in_content function
-	 *
-	 * @dataProvider get_input_output
-	 */
-	public function test_get_url_in_content( $in_str, $exp_str ) {
-		$this->assertSame( $exp_str, get_url_in_content( $in_str ) );
-	}
 }
diff --git a/tests/phpunit/tests/formatting/humanTimeDiff.php b/tests/phpunit/tests/formatting/humanTimeDiff.php
index 829487c370c11..0a2bffb367b5a 100644
--- a/tests/phpunit/tests/formatting/humanTimeDiff.php
+++ b/tests/phpunit/tests/formatting/humanTimeDiff.php
@@ -11,7 +11,7 @@ class Tests_Formatting_HumanTimeDiff extends WP_UnitTestCase {
 	/**
 	 * @group formatting
 	 * @ticket 38773
-	 * @dataProvider data_test_human_time_diff
+	 * @dataProvider data_human_time_diff
 	 */
 	public function test_human_time_diff( $expected, $stopdate, $message ) {
 		$startdate = new DateTime( '2016-01-01 12:00:00' );
@@ -19,7 +19,7 @@ public function test_human_time_diff( $expected, $stopdate, $message ) {
 	}
 
 	// Data for test_human_time_diff.
-	public function data_test_human_time_diff() {
+	public function data_human_time_diff() {
 		return array(
 			array(
 				'37 seconds',
diff --git a/tests/phpunit/tests/formatting/linksAddTarget.php b/tests/phpunit/tests/formatting/linksAddTarget.php
index 2bf582824fdf7..1c9a6fedf3016 100644
--- a/tests/phpunit/tests/formatting/linksAddTarget.php
+++ b/tests/phpunit/tests/formatting/linksAddTarget.php
@@ -5,12 +5,35 @@
  * @covers ::links_add_target
  */
 class Tests_Formatting_LinksAddTarget extends WP_UnitTestCase {
+
+	/**
+	 * Tests the links_add_target() function.
+	 *
+	 * @dataProvider data_links_add_target
+	 */
+	public function test_links_add_target( $content, $target, $tags, $expected ) {
+		if ( is_null( $target ) ) {
+			$this->assertSame( $expected, links_add_target( $content ) );
+		} elseif ( is_null( $tags ) ) {
+			$this->assertSame( $expected, links_add_target( $content, $target ) );
+		} else {
+			$this->assertSame( $expected, links_add_target( $content, $target, $tags ) );
+		}
+	}
+
 	/**
-	 * Test Content DataProvider
+	 * Data provider.
 	 *
-	 * array ( input_txt, converted_output_txt)
+	 * @return array {
+	 *     @type array {
+	 *         @type string $content  String to search for links in.
+	 *         @type string $target   The target to add to the links.
+	 *         @type string $tags     An array of tags to apply to.
+	 *         @type string $expected Expected output.
+	 *     }
+	 * }
 	 */
-	public function get_input_output() {
+	public function data_links_add_target() {
 		return array(
 			array(
 				'MY CONTENT <div> SOME ADDITIONAL TEXT <a href="XYZ" src="ABC">LINK</a> HERE </div> END TEXT',
@@ -92,19 +115,4 @@ public function get_input_output() {
 			),
 		);
 	}
-
-	/**
-	 * Validate the normalize_whitespace function
-	 *
-	 * @dataProvider get_input_output
-	 */
-	public function test_normalize_whitespace( $content, $target, $tags, $exp_str ) {
-		if ( true === is_null( $target ) ) {
-			$this->assertSame( $exp_str, links_add_target( $content ) );
-		} elseif ( true === is_null( $tags ) ) {
-			$this->assertSame( $exp_str, links_add_target( $content, $target ) );
-		} else {
-			$this->assertSame( $exp_str, links_add_target( $content, $target, $tags ) );
-		}
-	}
 }
diff --git a/tests/phpunit/tests/formatting/makeClickable.php b/tests/phpunit/tests/formatting/makeClickable.php
index 18dbe2da0c093..658689605956f 100644
--- a/tests/phpunit/tests/formatting/makeClickable.php
+++ b/tests/phpunit/tests/formatting/makeClickable.php
@@ -11,369 +11,420 @@ public function test_mailto_xss() {
 		$this->assertSame( $in, make_clickable( $in ) );
 	}
 
-	public function test_valid_mailto() {
-		$valid_emails = array(
-			'foo@example.com',
-			'foo.bar@example.com',
-			'Foo.Bar@a.b.c.d.example.com',
-			'0@example.com',
-			'foo@example-example.com',
-		);
-		foreach ( $valid_emails as $email ) {
-			$this->assertSame( '<a href="mailto:' . $email . '">' . $email . '</a>', make_clickable( $email ) );
-		}
-	}
-
-	public function test_invalid_mailto() {
-		$invalid_emails = array(
-			'foo',
-			'foo@',
-			'foo@@example.com',
-			'@example.com',
-			'foo @example.com',
-			'foo@example',
-		);
-		foreach ( $invalid_emails as $email ) {
-			$this->assertSame( $email, make_clickable( $email ) );
-		}
-	}
-
 	/**
-	 * Tests that make_clickable() will not link trailing periods, commas,
-	 * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).
+	 * @dataProvider data_valid_mailto
+	 *
+	 * @param string $email Email to test.
 	 */
-	public function test_strip_trailing_with_protocol() {
-		$urls_before   = array(
-			'http://wordpress.org/hello.html',
-			'There was a spoon named http://wordpress.org. Alice!',
-			'There was a spoon named http://wordpress.org, said Alice.',
-			'There was a spoon named http://wordpress.org; said Alice.',
-			'There was a spoon named http://wordpress.org: said Alice.',
-			'There was a spoon named (http://wordpress.org) said Alice.',
-		);
-		$urls_expected = array(
-			'<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>. Alice!',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>, said Alice.',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>; said Alice.',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>: said Alice.',
-			'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>) said Alice.',
-		);
-
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
+	public function test_valid_mailto( $email ) {
+		$this->assertSame( '<a href="mailto:' . $email . '">' . $email . '</a>', make_clickable( $email ) );
 	}
 
 	/**
-	 * Tests that make_clickable() will not link trailing periods, commas,
-	 * and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).
+	 * Data provider.
+	 *
+	 * @return array
 	 */
-	public function test_strip_trailing_with_protocol_nothing_afterwards() {
-		$urls_before   = array(
-			'http://wordpress.org/hello.html',
-			'There was a spoon named http://wordpress.org.',
-			'There was a spoon named http://wordpress.org,',
-			'There was a spoon named http://wordpress.org;',
-			'There was a spoon named http://wordpress.org:',
-			'There was a spoon named (http://wordpress.org)',
-			'There was a spoon named (http://wordpress.org)x',
-		);
-		$urls_expected = array(
-			'<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>.',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>,',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>;',
-			'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>:',
-			'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)',
-			'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)x',
+	public function data_valid_mailto() {
+		return array(
+			array( 'foo@example.com' ),
+			array( 'foo.bar@example.com' ),
+			array( 'Foo.Bar@a.b.c.d.example.com' ),
+			array( '0@example.com' ),
+			array( 'foo@example-example.com' ),
 		);
-
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
 	}
 
 	/**
-	 * Tests that make_clickable() will not link trailing periods, commas,
-	 * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
+	 * @dataProvider data_invalid_mailto
+	 *
+	 * @param string $email Email to test.
 	 */
-	public function test_strip_trailing_without_protocol() {
-		$urls_before   = array(
-			'www.wordpress.org',
-			'There was a spoon named www.wordpress.org. Alice!',
-			'There was a spoon named www.wordpress.org, said Alice.',
-			'There was a spoon named www.wordpress.org; said Alice.',
-			'There was a spoon named www.wordpress.org: said Alice.',
-			'There was a spoon named www.wordpress.org) said Alice.',
-		);
-		$urls_expected = array(
-			'<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>. Alice!',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>, said Alice.',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>; said Alice.',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>: said Alice.',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>) said Alice.',
-		);
-
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
+	public function test_invalid_mailto( $email ) {
+		$this->assertSame( $email, make_clickable( $email ) );
 	}
 
 	/**
-	 * Tests that make_clickable() will not link trailing periods, commas,
-	 * and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
+	 * Data provider.
+	 *
+	 * @return array
 	 */
-	public function test_strip_trailing_without_protocol_nothing_afterwards() {
-		$urls_before   = array(
-			'www.wordpress.org',
-			'There was a spoon named www.wordpress.org.',
-			'There was a spoon named www.wordpress.org,',
-			'There was a spoon named www.wordpress.org;',
-			'There was a spoon named www.wordpress.org:',
-			'There was a spoon named www.wordpress.org)',
-		);
-		$urls_expected = array(
-			'<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>.',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>,',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>;',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>:',
-			'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>)',
+	public function data_invalid_mailto() {
+		return array(
+			array( 'foo' ),
+			array( 'foo@' ),
+			array( 'foo@@example.com' ),
+			array( '@example.com' ),
+			array( 'foo @example.com' ),
+			array( 'foo@example' ),
 		);
-
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
 	}
 
 	/**
 	 * @ticket 4570
-	 */
-	public function test_iri() {
-		$urls_before   = array(
-			'http://www.詹姆斯.com/',
-			'http://bg.wikipedia.org/Баба',
-			'http://example.com/?a=баба&b=дядо',
-		);
-		$urls_expected = array(
-			'<a href="http://www.詹姆斯.com/" rel="nofollow">http://www.詹姆斯.com/</a>',
-			'<a href="http://bg.wikipedia.org/Баба" rel="nofollow">http://bg.wikipedia.org/Баба</a>',
-			'<a href="http://example.com/?a=баба&#038;b=дядо" rel="nofollow">http://example.com/?a=баба&#038;b=дядо</a>',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
-	}
-
-	/**
 	 * @ticket 10990
+	 * @ticket 11211
+	 * @ticket 14993
+	 * @ticket 16892
+	 *
+	 * @dataProvider data_urls
+	 *
+	 * @param string $text     Content to test.
+	 * @param string $expected Expected results.
 	 */
-	public function test_brackets_in_urls() {
-		$urls_before   = array(
-			'http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)',
-			'(http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software))',
-			'blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software) blah',
-			'blah (http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah',
-			'blah blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software) blah blah',
-			'blah blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah blah',
-			'blah blah (http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah blah',
-			'blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software).) blah blah',
-			'blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software).)moreurl blah blah',
-			'In his famous speech “You and Your research” (here:
-			http://www.cs.virginia.edu/~robins/YouAndYourResearch.html)
-			Richard Hamming wrote about people getting more done with their doors closed, but',
-		);
-		$urls_expected = array(
-			'<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>',
-			'(<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>)',
-			'blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah',
-			'blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah',
-			'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah blah',
-			'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
-			'blah blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
-			'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.) blah blah',
-			'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.)moreurl blah blah',
-			'In his famous speech “You and Your research” (here:
-			<a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>)
-			Richard Hamming wrote about people getting more done with their doors closed, but',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
+	public function test_urls( $text, $expected ) {
+		$this->assertSame( $expected, make_clickable( $text ) );
 	}
 
 	/**
-	 * Based on real comments which were incorrectly linked.
+	 * Data provider.
 	 *
-	 * @ticket 11211
+	 * @return array
 	 */
-	public function test_real_world_examples() {
-		$urls_before   = array(
-			'Example: WordPress, test (some text), I love example.com (http://example.org), it is brilliant',
-			'Example: WordPress, test (some text), I love example.com (http://example.com), it is brilliant',
-			'Some text followed by a bracketed link with a trailing elipsis (http://example.com)...',
-			'In his famous speech “You and Your research” (here: http://www.cs.virginia.edu/~robins/YouAndYourResearch.html) Richard Hamming wrote about people getting more done with their doors closed...',
-		);
-		$urls_expected = array(
-			'Example: WordPress, test (some text), I love example.com (<a href="http://example.org" rel="nofollow">http://example.org</a>), it is brilliant',
-			'Example: WordPress, test (some text), I love example.com (<a href="http://example.com" rel="nofollow">http://example.com</a>), it is brilliant',
-			'Some text followed by a bracketed link with a trailing elipsis (<a href="http://example.com" rel="nofollow">http://example.com</a>)...',
-			'In his famous speech “You and Your research” (here: <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>) Richard Hamming wrote about people getting more done with their doors closed...',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
-	}
+	public function data_urls() {
+		return array(
+			// Does not link trailing periods, commas, and (semi-)colons in URLs with protocol (i.e. http://wordpress.org).
+			'URL only'                                   => array(
+				'text'     => 'http://wordpress.org/hello.html',
+				'expected' => '<a href="http://wordpress.org/hello.html" rel="nofollow">http://wordpress.org/hello.html</a>',
+			),
+			'URL. with more content after'               => array(
+				'text'     => 'There was a spoon named http://wordpress.org. Alice!',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>. Alice!',
+			),
+			'URL, with more content after'               => array(
+				'text'     => 'There was a spoon named http://wordpress.org, said Alice.',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>, said Alice.',
+			),
+			'URL; with more content after'               => array(
+				'text'     => 'There was a spoon named http://wordpress.org; said Alice.',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>; said Alice.',
+			),
+			'URL: with more content after'               => array(
+				'text'     => 'There was a spoon named http://wordpress.org: said Alice.',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>: said Alice.',
+			),
+			'URL) with more content after'               => array(
+				'text'     => 'There was a spoon named (http://wordpress.org) said Alice.',
+				'expected' => 'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>) said Alice.',
+			),
 
-	/**
-	 * @ticket 14993
-	 */
-	public function test_twitter_hash_bang() {
-		$urls_before   = array(
-			'http://twitter.com/#!/wordpress/status/25907440233',
-			'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233 !',
-			'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233!',
-		);
-		$urls_expected = array(
-			'<a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>',
-			'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a> !',
-			'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>!',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// Does not link trailing periods, commas, and (semi-)colons in URLs with protocol (i.e. http://wordpress.org) with nothing afterwards.
+			'URL.'                                       => array(
+				'text'     => 'There was a spoon named http://wordpress.org.',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>.',
+			),
+			'URL,'                                       => array(
+				'text'     => 'There was a spoon named http://wordpress.org,',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>,',
+			),
+			'URL;'                                       => array(
+				'text'     => 'There was a spoon named http://wordpress.org;',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>;',
+			),
+			'URL:'                                       => array(
+				'text'     => 'There was a spoon named http://wordpress.org:',
+				'expected' => 'There was a spoon named <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>:',
+			),
+			'URL)'                                       => array(
+				'text'     => 'There was a spoon named (http://wordpress.org)',
+				'expected' => 'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)',
+			),
+			'URL)x'                                      => array(
+				'text'     => 'There was a spoon named (http://wordpress.org)x',
+				'expected' => 'There was a spoon named (<a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>)x',
+			),
 
-	public function test_wrapped_in_angles() {
-		$before   = array(
-			'URL wrapped in angle brackets <http://example.com/>',
-			'URL wrapped in angle brackets with padding < http://example.com/ >',
-			'mailto wrapped in angle brackets <foo@example.com>',
-		);
-		$expected = array(
-			'URL wrapped in angle brackets <<a href="http://example.com/" rel="nofollow">http://example.com/</a>>',
-			'URL wrapped in angle brackets with padding < <a href="http://example.com/" rel="nofollow">http://example.com/</a> >',
-			'mailto wrapped in angle brackets <foo@example.com>',
-		);
-		foreach ( $before as $key => $url ) {
-			$this->assertSame( $expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// Strip trailing without protocol: will not link trailing periods, commas, and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
+			'No protocol www.URL. with content after'    => array(
+				'text'     => 'There was a spoon named www.wordpress.org. Alice!',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>. Alice!',
+			),
+			'No protocol www.URL, with content after'    => array(
+				'text'     => 'There was a spoon named www.wordpress.org, said Alice.',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>, said Alice.',
+			),
+			'No protocol www.URL; with content after'    => array(
+				'text'     => 'There was a spoon named www.wordpress.org; said Alice.',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>; said Alice.',
+			),
+			'No protocol www.URL: with content after'    => array(
+				'text'     => 'There was a spoon named www.wordpress.org: said Alice.',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>: said Alice.',
+			),
+			'No protocol www.URL) with content after'    => array(
+				'text'     => 'There was a spoon named www.wordpress.org) said Alice.',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>) said Alice.',
+			),
 
-	public function test_preceded_by_punctuation() {
-		$before   = array(
-			'Comma then URL,http://example.com/',
-			'Period then URL.http://example.com/',
-			'Semi-colon then URL;http://example.com/',
-			'Colon then URL:http://example.com/',
-			'Exclamation mark then URL!http://example.com/',
-			'Question mark then URL?http://example.com/',
-		);
-		$expected = array(
-			'Comma then URL,<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-			'Period then URL.<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-			'Semi-colon then URL;<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-			'Colon then URL:<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-			'Exclamation mark then URL!<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-			'Question mark then URL?<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
-		);
-		foreach ( $before as $key => $url ) {
-			$this->assertSame( $expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// Should not link trailing periods, commas, and (semi-)colons in URLs without protocol (i.e. www.wordpress.org).
+			'No protocol www.URL'                        => array(
+				'text'     => 'www.wordpress.org',
+				'expected' => '<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
+			),
+			'No protocol www.URL.'                       => array(
+				'text'     => 'There was a spoon named www.wordpress.org.',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>.',
+			),
+			'No protocol www.URL,'                       => array(
+				'text'     => 'There was a spoon named www.wordpress.org,',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>,',
+			),
+			'No protocol www.URL;'                       => array(
+				'text'     => 'There was a spoon named www.wordpress.org;',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>;',
+			),
+			'No protocol www.URL:'                       => array(
+				'text'     => 'There was a spoon named www.wordpress.org:',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>:',
+			),
+			'No protocol www.URL)'                       => array(
+				'text'     => 'There was a spoon named www.wordpress.org)',
+				'expected' => 'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>)',
+			),
 
-	public function test_dont_break_attributes() {
-		$urls_before   = array(
-			"<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
-			"(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"http://trunk.domain/testing#something (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"http://trunk.domain/testing#something
-			(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"<span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' /> <param name='allowfullscreen' value='true' /> <param name='wmode' value='opaque' /> <embed src='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' type='application/x-shockwave-flash' allowfullscreen='true' width='425' height='350' wmode='opaque'></embed> </object></span>",
-			'<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',
-		);
-		$urls_expected = array(
-			"<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
-			"(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a> (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a>
-			(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
-			"<span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' /> <param name='allowfullscreen' value='true' /> <param name='wmode' value='opaque' /> <embed src='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' type='application/x-shockwave-flash' allowfullscreen='true' width='425' height='350' wmode='opaque'></embed> </object></span>",
-			'<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// @ticket 4570
+			// Test IRI.
+			'IRI in domain'                              => array(
+				'text'     => 'http://www.詹姆斯.com/',
+				'expected' => '<a href="http://www.詹姆斯.com/" rel="nofollow">http://www.詹姆斯.com/</a>',
+			),
+			'IRI in path'                                => array(
+				'text'     => 'http://bg.wikipedia.org/Баба',
+				'expected' => '<a href="http://bg.wikipedia.org/Баба" rel="nofollow">http://bg.wikipedia.org/Баба</a>',
+			),
+			'IRI in query string'                        => array(
+				'text'     => 'http://example.com/?a=баба&b=дядо',
+				'expected' => '<a href="http://example.com/?a=баба&#038;b=дядо" rel="nofollow">http://example.com/?a=баба&#038;b=дядо</a>',
+			),
 
-	/**
-	 * @ticket 23756
-	 */
-	public function test_no_links_inside_pre_or_code() {
-		$before = array(
-			'<pre>http://wordpress.org</pre>',
-			'<code>http://wordpress.org</code>',
-			'<pre class="foobar" id="foo">http://wordpress.org</pre>',
-			'<code class="foobar" id="foo">http://wordpress.org</code>',
-			'<precustomtag>http://wordpress.org</precustomtag>',
-			'<codecustomtag>http://wordpress.org</codecustomtag>',
-			'URL before pre http://wordpress.org<pre>http://wordpress.org</pre>',
-			'URL before code http://wordpress.org<code>http://wordpress.org</code>',
-			'URL after pre <PRE>http://wordpress.org</PRE>http://wordpress.org',
-			'URL after code <code>http://wordpress.org</code>http://wordpress.org',
-			'URL before and after pre http://wordpress.org<pre>http://wordpress.org</pre>http://wordpress.org',
-			'URL before and after code http://wordpress.org<code>http://wordpress.org</code>http://wordpress.org',
-			'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
-		);
+			// @ticket 10990
+			// Test URLS with brackets (within the URL).
+			'URL with brackets in path'                  => array(
+				'text'     => 'http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)',
+				'expected' => '<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>',
+			),
+			'(URL with brackets in path)'                => array(
+				'text'     => '(http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software))',
+				'expected' => '(<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>)',
+			),
+			'URL with brackets in path: word before and after' => array(
+				'text'     => 'blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software) blah',
+				'expected' => 'blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah',
+			),
+			'URL with brackets in path: trailing ) blah' => array(
+				'text'     => 'blah (http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah',
+				'expected' => 'blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah',
+			),
+			'URL with brackets in path: within content'  => array(
+				'text'     => 'blah blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software) blah blah',
+				'expected' => 'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a> blah blah',
+			),
+			'URL with brackets in path: trailing ) within content' => array(
+				'text'     => 'blah blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah blah',
+				'expected' => 'blah blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
+			),
+			'(URL with brackets in path) within content' => array(
+				'text'     => 'blah blah (http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)) blah blah',
+				'expected' => 'blah blah (<a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>) blah blah',
+			),
+			'URL with brackets in path: trailing .)'     => array(
+				'text'     => 'blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software).) blah blah',
+				'expected' => 'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.) blah blah',
+			),
+			'URL with brackets in path: trailing .)moreurl' => array(
+				'text'     => 'blah blah http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software).)moreurl blah blah',
+				'expected' => 'blah blah <a href="http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)" rel="nofollow">http://en.wikipedia.org/wiki/PC_Tools_(Central_Point_Software)</a>.)moreurl blah blah',
+			),
+			'multiline content with URL with brackets in path' => array(
+				'text'     => 'In his famous speech “You and Your research” (here:
+							   http://www.cs.virginia.edu/~robins/YouAndYourResearch.html)
+							   Richard Hamming wrote about people getting more done with their doors closed, but',
+				'expected' => 'In his famous speech “You and Your research” (here:
+							   <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>)
+							   Richard Hamming wrote about people getting more done with their doors closed, but',
+			),
 
-		$expected = array(
-			'<pre>http://wordpress.org</pre>',
-			'<code>http://wordpress.org</code>',
-			'<pre class="foobar" id="foo">http://wordpress.org</pre>',
-			'<code class="foobar" id="foo">http://wordpress.org</code>',
-			'<precustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></precustomtag>',
-			'<codecustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></codecustomtag>',
-			'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
-			'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
-			'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-			'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-			'URL before and after pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-			'URL before and after code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
-			'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
-		);
+			// @ticket 11211
+			// Test with real comments which were incorrectly linked.
+			'real world: example.com text (.org URL)'    => array(
+				'text'     => 'Example: WordPress, test (some text), I love example.com (http://example.org), it is brilliant',
+				'expected' => 'Example: WordPress, test (some text), I love example.com (<a href="http://example.org">http://example.org</a>), it is brilliant',
+			),
+			'real world: example.com text (.com URL)'    => array(
+				'text'     => 'Example: WordPress, test (some text), I love example.com (http://example.com), it is brilliant',
+				'expected' => 'Example: WordPress, test (some text), I love example.com (<a href="http://example.com" rel="nofollow">http://example.com</a>), it is brilliant',
+			),
+			'real world: (URL)...'                       => array(
+				'text'     => 'Some text followed by a bracketed link with a trailing elipsis (http://example.com)...',
+				'expected' => 'Some text followed by a bracketed link with a trailing elipsis (<a href="http://example.com" rel="nofollow">http://example.com</a>)...',
+			),
+			'real world: (here: URL)'                    => array(
+				'text'     => 'In his famous speech “You and Your research” (here: http://www.cs.virginia.edu/~robins/YouAndYourResearch.html) Richard Hamming wrote about people getting more done with their doors closed...',
+				'expected' => 'In his famous speech “You and Your research” (here: <a href="http://www.cs.virginia.edu/~robins/YouAndYourResearch.html" rel="nofollow">http://www.cs.virginia.edu/~robins/YouAndYourResearch.html</a>) Richard Hamming wrote about people getting more done with their doors closed...',
+			),
 
-		foreach ( $before as $key => $url ) {
-			$this->assertSame( $expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// @ticket 14993
+			// Test Twitter hash bang URL.
+			'Twitter hash bang URL'                      => array(
+				'text'     => 'http://twitter.com/#!/wordpress/status/25907440233',
+				'expected' => '<a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>',
+			),
+			'Twitter hash bang URL in sentence'          => array(
+				'text'     => 'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233 !',
+				'expected' => 'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a> !',
+			),
+			'Twitter hash bang in sentence with trailing !' => array(
+				'text'     => 'This is a really good tweet http://twitter.com/#!/wordpress/status/25907440233!',
+				'expected' => 'This is a really good tweet <a href="http://twitter.com/#!/wordpress/status/25907440233" rel="nofollow">http://twitter.com/#!/wordpress/status/25907440233</a>!',
+			),
 
-	/**
-	 * @ticket 16892
-	 */
-	public function test_click_inside_html() {
-		$urls_before   = array(
-			'<span>http://example.com</span>',
-			'<p>http://example.com/</p>',
-		);
-		$urls_expected = array(
-			'<span><a href="http://example.com" rel="nofollow">http://example.com</a></span>',
-			'<p><a href="http://example.com/" rel="nofollow">http://example.com/</a></p>',
-		);
-		foreach ( $urls_before as $key => $url ) {
-			$this->assertSame( $urls_expected[ $key ], make_clickable( $url ) );
-		}
-	}
+			// Test URLs wrapped in angled brackets, i.e. < >.
+			'<URL>'                                      => array(
+				'text'     => 'URL wrapped in angle brackets <http://example.com/>',
+				'expected' => 'URL wrapped in angle brackets <<a href="http://example.com/" rel="nofollow">http://example.com/</a>>',
+			),
+			'< URL >'                                    => array(
+				'text'     => 'URL wrapped in angle brackets with padding < http://example.com/ >',
+				'expected' => 'URL wrapped in angle brackets with padding < <a href="http://example.com/" rel="nofollow">http://example.com/</a> >',
+			),
+			'<email>'                                    => array(
+				'text'     => 'mailto wrapped in angle brackets <foo@example.com>',
+				'expected' => 'mailto wrapped in angle brackets <foo@example.com>',
+			),
+
+			// Test URLs preceded by punctuation.
+			',URL'                                       => array(
+				'text'     => 'Comma then URL,http://example.com/',
+				'expected' => 'Comma then URL,<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+			'.URL'                                       => array(
+				'text'     => 'Period then URL.http://example.com/',
+				'expected' => 'Period then URL.<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+			';URL'                                       => array(
+				'text'     => 'Semi-colon then URL;http://example.com/',
+				'expected' => 'Semi-colon then URL;<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+			':URL'                                       => array(
+				'text'     => 'Colon then URL:http://example.com/',
+				'expected' => 'Colon then URL:<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+			'!URL'                                       => array(
+				'text'     => 'Exclamation mark then URL!http://example.com/',
+				'expected' => 'Exclamation mark then URL!<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+			'?URL'                                       => array(
+				'text'     => 'Question mark then URL?http://example.com/',
+				'expected' => 'Question mark then URL?<a href="http://example.com/" rel="nofollow">http://example.com/</a>',
+			),
+
+			// Test it doesn't break tag attributes.
+			'<img src=URL with attributes>'              => array(
+				'text'     => "<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
+				'expected' => "<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>",
+			),
+			'(<img src=URL with attributes>)'            => array(
+				'text'     => "(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+				'expected' => "(<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+			),
+			'URL (<img src=URL with attributes>)'        => array(
+				'text'     => "http://trunk.domain/testing#something (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+				'expected' => "<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a> (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+			),
+			'multiline URL (<img src=URL with attributes>)' => array(
+				'text'     => "http://trunk.domain/testing#something
+						  (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+				'expected' => "<a href=\"http://trunk.domain/testing#something\" rel=\"nofollow\">http://trunk.domain/testing#something</a>
+						  (<img src='http://trunk.domain/wp-includes/images/smilies/icon_smile.gif' alt=':)' class='wp-smiley'>)",
+			),
+			'<param value=URL><embed src=URL>'           => array(
+				'text'     => "<span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' /> <param name='allowfullscreen' value='true' /> <param name='wmode' value='opaque' /> <embed src='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' type='application/x-shockwave-flash' allowfullscreen='true' width='425' height='350' wmode='opaque'></embed> </object></span>",
+				'expected' => "<span style='text-align:center; display: block;'><object width='425' height='350'><param name='movie' value='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' /> <param name='allowfullscreen' value='true' /> <param name='wmode' value='opaque' /> <embed src='https://www.youtube.com/watch?v=72xdCU__XCk&rel=1&fs=1&showsearch=0&showinfo=1&iv_load_policy=1' type='application/x-shockwave-flash' allowfullscreen='true' width='425' height='350' wmode='opaque'></embed> </object></span>",
+			),
+			'<a src=URL title=URL></a>'                  => array(
+				'text'     => '<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',
+				'expected' => '<a href="http://example.com/example.gif" title="Image from http://example.com">Look at this image!</a>',
+			),
+
+			// Test doesn't add links within <pre> or <code> elements.
+			'Does not add link within <pre>'             => array(
+				'text'     => '<pre>http://wordpress.org</pre>',
+				'expected' => '<pre>http://wordpress.org</pre>',
+			),
+			'Does not add link within <code>'            => array(
+				'text'     => '<code>http://wordpress.org</code>',
+				'expected' => '<code>http://wordpress.org</code>',
+			),
+			'Does not add link within <pre with attributes>' => array(
+				'text'     => '<pre class="foobar" id="foo">http://wordpress.org</pre>',
+				'expected' => '<pre class="foobar" id="foo">http://wordpress.org</pre>',
+			),
+			'Does not add link within <code with attributes>' => array(
+				'text'     => '<code class="foobar" id="foo">http://wordpress.org</code>',
+				'expected' => '<code class="foobar" id="foo">http://wordpress.org</code>',
+			),
+			'Adds link within <precustomtag>'            => array(
+				'text'     => '<precustomtag>http://wordpress.org</precustomtag>',
+				'expected' => '<precustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></precustomtag>',
+			),
+			'Adds link within <codecustomtag>'           => array(
+				'text'     => '<codecustomtag>http://wordpress.org</codecustomtag>',
+				'expected' => '<codecustomtag><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a></codecustomtag>',
+			),
+			'Adds link to URL before <pre>, but does not add link within <pre>' => array(
+				'text'     => 'URL before pre http://wordpress.org<pre>http://wordpress.org</pre>',
+				'expected' => 'URL before pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre>',
+			),
+			'Adds link to URL before <code>, but does not add link within <code>' => array(
+				'text'     => 'URL before code http://wordpress.org<code>http://wordpress.org</code>',
+				'expected' => 'URL before code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code>',
+			),
+			'Does not add link to <PRE>, but does add link to URL after <PRE>' => array(
+				'text'     => 'URL after pre <PRE>http://wordpress.org</PRE>http://wordpress.org',
+				'expected' => 'URL after pre <PRE>http://wordpress.org</PRE><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+			),
+			'Does not add link within <code>, but does add link to URL after <code>' => array(
+				'text'     => 'URL after code <code>http://wordpress.org</code>http://wordpress.org',
+				'expected' => 'URL after code <code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+			),
+			'Adds link to before and after URLs, but does not add link within <pre>' => array(
+				'text'     => 'URL before and after pre http://wordpress.org<pre>http://wordpress.org</pre>http://wordpress.org',
+				'expected' => 'URL before and after pre <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><pre>http://wordpress.org</pre><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+			),
+			'Adds link to before and after URLs, but does not add link within <code>' => array(
+				'text'     => 'URL before and after code http://wordpress.org<code>http://wordpress.org</code>http://wordpress.org',
+				'expected' => 'URL before and after code <a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a><code>http://wordpress.org</code><a href="http://wordpress.org" rel="nofollow">http://wordpress.org</a>',
+			),
+			'Does not add links within nested <pre>URL <code>URL</code> </pre>' => array(
+				'text'     => 'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
+				'expected' => 'code inside pre <pre>http://wordpress.org <code>http://wordpress.org</code> http://wordpress.org</pre>',
+			),
+
+			// @ticket 16892
+			// Test adds link inside of HTML elements.
+			'<span>URL</span>'                           => array(
+				'text'     => '<span>http://example.com</span>',
+				'expected' => '<span><a href="http://example.com" rel="nofollow">http://example.com</a></span>',
+			),
+			'<p>URL</p>'                                 => array(
+				'text'     => '<p>http://example.com/</p>',
+				'expected' => '<p><a href="http://example.com/" rel="nofollow">http://example.com/</a></p>',
+			),
 
-	public function test_no_links_within_links() {
-		$in = array(
-			'Some text with a link <a href="http://example.com">http://example.com</a>',
-			// '<a href="http://wordpress.org">This is already a link www.wordpress.org</a>', // Fails in 3.3.1 too.
+			// Test does not add links within the <a> element.
+			'<a>URL</a>'                                 => array(
+				'text'     => 'Some text with a link <a href="http://example.com">http://example.com</a>',
+				'expected' => 'Some text with a link <a href="http://example.com">http://example.com</a>',
+			),
+			/*
+			Fails in 3.3.1 too.
+			'<a>text www.URL</a>'                        => array(
+				'text'     => '<a href="http://wordpress.org">This is already a link www.wordpress.org</a>',
+				'expected' => '<a href="http://wordpress.org">This is already a link www.wordpress.org</a>',
+			),
+			*/
 		);
-		foreach ( $in as $text ) {
-			$this->assertSame( $text, make_clickable( $text ) );
-		}
 	}
 
 	/**
@@ -421,6 +472,7 @@ public function data_script_and_style_tags() {
 
 	/**
 	 * @ticket 48022
+	 * @ticket 56444
 	 * @dataProvider data_add_rel_ugc_in_comments
 	 */
 	public function test_add_rel_ugc_in_comments( $content, $expected ) {
@@ -438,7 +490,11 @@ public function test_add_rel_ugc_in_comments( $content, $expected ) {
 	}
 
 	public function data_add_rel_ugc_in_comments() {
+		$home_url_http  = set_url_scheme( home_url(), 'http' );
+		$home_url_https = set_url_scheme( home_url(), 'https' );
+
 		return array(
+			// @ticket 48022
 			array(
 				'http://wordpress.org',
 				'<a href="http://wordpress.org" rel="nofollow ugc">http://wordpress.org</a>',
@@ -447,6 +503,19 @@ public function data_add_rel_ugc_in_comments() {
 				'www.wordpress.org',
 				'<p><a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>',
 			),
+			// @ticket 56444
+			array(
+				'www.example.org',
+				'<p><a href="http://www.example.org" rel="nofollow ugc">http://www.example.org</a>',
+			),
+			array(
+				$home_url_http,
+				'<a href="' . $home_url_http . '" rel="ugc">' . $home_url_http . '</a>',
+			),
+			array(
+				$home_url_https,
+				'<a href="' . $home_url_https . '" rel="ugc">' . $home_url_https . '</a>',
+			),
 		);
 	}
 
diff --git a/tests/phpunit/tests/formatting/normalizeWhitespace.php b/tests/phpunit/tests/formatting/normalizeWhitespace.php
index cdb9a0062def7..b14647b32e6c0 100644
--- a/tests/phpunit/tests/formatting/normalizeWhitespace.php
+++ b/tests/phpunit/tests/formatting/normalizeWhitespace.php
@@ -5,12 +5,27 @@
  * @covers ::normalize_whitespace
  */
 class Tests_Formatting_NormalizeWhitespace extends WP_UnitTestCase {
+
+	/**
+	 * Tests the the normalize_whitespace() function.
+	 *
+	 * @dataProvider data_normalize_whitespace
+	 */
+	public function test_normalize_whitespace( $input, $expected ) {
+		$this->assertSame( $expected, normalize_whitespace( $input ) );
+	}
+
 	/**
-	 * WhitespaceTest Content DataProvider
+	 * Data provider.
 	 *
-	 * array( input_txt, converted_output_txt)
+	 * @return array {
+	 *     @type array {
+	 *         @type string $input    Input content.
+	 *         @type string $expected Expected output.
+	 *     }
+	 * }
 	 */
-	public function get_input_output() {
+	public function data_normalize_whitespace() {
 		return array(
 			array(
 				'		',
@@ -42,13 +57,4 @@ public function get_input_output() {
 			),
 		);
 	}
-
-	/**
-	 * Validate the normalize_whitespace function
-	 *
-	 * @dataProvider get_input_output
-	 */
-	public function test_normalize_whitespace( $in_str, $exp_str ) {
-		$this->assertSame( $exp_str, normalize_whitespace( $in_str ) );
-	}
 }
diff --git a/tests/phpunit/tests/formatting/redirect.php b/tests/phpunit/tests/formatting/redirect.php
index 213ba36bf5fb2..99e4c8a882848 100644
--- a/tests/phpunit/tests/formatting/redirect.php
+++ b/tests/phpunit/tests/formatting/redirect.php
@@ -18,7 +18,7 @@ public function home_url() {
 	/**
 	 * @ticket 44317
 	 *
-	 * @dataProvider get_bad_status_codes
+	 * @dataProvider data_wp_redirect_bad_status_code
 	 *
 	 * @covers ::wp_redirect
 	 *
@@ -31,7 +31,7 @@ public function test_wp_redirect_bad_status_code( $location, $status ) {
 		wp_redirect( $location, $status );
 	}
 
-	public function get_bad_status_codes() {
+	public function data_wp_redirect_bad_status_code() {
 		return array(
 			// Tests for bad arguments.
 			array( '/wp-admin', 404 ),
@@ -73,7 +73,7 @@ public function test_wp_sanitize_redirect_should_encode_spaces() {
 	}
 
 	/**
-	 * @dataProvider valid_url_provider
+	 * @dataProvider data_wp_validate_redirect_valid_url
 	 *
 	 * @covers ::wp_validate_redirect
 	 */
@@ -81,16 +81,7 @@ public function test_wp_validate_redirect_valid_url( $url, $expected ) {
 		$this->assertSame( $expected, wp_validate_redirect( $url ) );
 	}
 
-	/**
-	 * @dataProvider invalid_url_provider
-	 *
-	 * @covers ::wp_validate_redirect
-	 */
-	public function test_wp_validate_redirect_invalid_url( $url ) {
-		$this->assertEquals( false, wp_validate_redirect( $url, false ) );
-	}
-
-	public function valid_url_provider() {
+	public function data_wp_validate_redirect_valid_url() {
 		return array(
 			array( 'http://example.com', 'http://example.com' ),
 			array( 'http://example.com/', 'http://example.com/' ),
@@ -106,7 +97,16 @@ public function valid_url_provider() {
 		);
 	}
 
-	public function invalid_url_provider() {
+	/**
+	 * @dataProvider data_wp_validate_redirect_invalid_url
+	 *
+	 * @covers ::wp_validate_redirect
+	 */
+	public function test_wp_validate_redirect_invalid_url( $url ) {
+		$this->assertEquals( false, wp_validate_redirect( $url, false ) );
+	}
+
+	public function data_wp_validate_redirect_invalid_url() {
 		return array(
 			// parse_url() fails.
 			array( '' ),
@@ -176,7 +176,7 @@ public function invalid_url_provider() {
 
 	/**
 	 * @ticket 47980
-	 * @dataProvider relative_url_provider
+	 * @dataProvider data_wp_validate_redirect_relative_url
 	 *
 	 * @covers ::wp_validate_redirect
 	 */
@@ -211,7 +211,7 @@ public function test_wp_validate_redirect_relative_url( $current_uri, $url, $exp
 	 *      string Expected destination.
 	 * }
 	 */
-	public function relative_url_provider() {
+	public function data_wp_validate_redirect_relative_url() {
 		return array(
 			array(
 				'/',
diff --git a/tests/phpunit/tests/formatting/sanitizeFileName.php b/tests/phpunit/tests/formatting/sanitizeFileName.php
index 06c2f10976f6a..d0fac9e2326da 100644
--- a/tests/phpunit/tests/formatting/sanitizeFileName.php
+++ b/tests/phpunit/tests/formatting/sanitizeFileName.php
@@ -95,4 +95,53 @@ public function data_wp_filenames() {
 			array( 'demo' . json_decode( '"\u00a0"' ) . 'bar.png', 'demo-bar.png' ),
 		);
 	}
+
+	/**
+	 * Tests that sanitize_file_name() replaces consecutive periods
+	 * with a single period.
+	 *
+	 * @ticket 57242
+	 *
+	 * @dataProvider data_sanitize_file_name_should_replace_consecutive_periods_with_a_single_period
+	 *
+	 * @param string $filename A filename with consecutive periods.
+	 * @param string $expected The expected filename after sanitization.
+	 */
+	public function test_sanitize_file_name_should_replace_consecutive_periods_with_a_single_period( $filename, $expected ) {
+		$this->assertSame( $expected, sanitize_file_name( $filename ) );
+	}
+
+	/**
+	 * Data provider for test_sanitize_file_name_should_replace_consecutive_periods_with_a_single_period().
+	 *
+	 * @return array[]
+	 */
+	public function data_sanitize_file_name_should_replace_consecutive_periods_with_a_single_period() {
+		return array(
+			'consecutive periods at the start'         => array(
+				'filename' => '...filename.png',
+				'expected' => 'filename.png',
+			),
+			'consecutive periods in the middle'        => array(
+				'filename' => 'file.......name.png',
+				'expected' => 'file.name_.png',
+			),
+			'consecutive periods before the extension' => array(
+				'filename' => 'filename....png',
+				'expected' => 'filename.png',
+			),
+			'consecutive periods after the extension'  => array(
+				'filename' => 'filename.png...',
+				'expected' => 'filename.png',
+			),
+			'consecutive periods at the start, middle, before, after the extension' => array(
+				'filename' => '.....file....name...png......',
+				'expected' => 'file.name_.png',
+			),
+			'consecutive periods and no extension'     => array(
+				'filename' => 'filename...',
+				'expected' => 'filename',
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/formatting/sanitizeLocaleName.php b/tests/phpunit/tests/formatting/sanitizeLocaleName.php
new file mode 100644
index 0000000000000..cd22acbf2c60a
--- /dev/null
+++ b/tests/phpunit/tests/formatting/sanitizeLocaleName.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @group formatting
+ *
+ * @covers ::sanitize_locale_name
+ */
+class Tests_Formatting_SanitizeLocaleName extends WP_UnitTestCase {
+	/**
+	 * @dataProvider data_sanitize_locale_name_returns_non_empty_string
+	 */
+	public function test_sanitize_locale_name_returns_non_empty_string( $expected, $input ) {
+		$this->assertSame( $expected, sanitize_locale_name( $input ) );
+	}
+
+	public function data_sanitize_locale_name_returns_non_empty_string() {
+		return array(
+			// array( expected, input )
+			array( 'en_US', 'en_US' ),
+			array( 'en', 'en' ),
+			array( 'fr_FR', 'fr_FR' ),
+			array( 'fr_FR', 'fr_FR' ),
+			array( 'fr_FR-e2791ba830489d23043be8650a22a22b', 'fr_FR-e2791ba830489d23043be8650a22a22b' ),
+			array( '-fr_FRmo', '-fr_FR.mo' ),
+			array( '12324', '$12324' ),
+			array( '4124FRRa', '/4124$$$%%FRRa' ),
+			array( 'FR', '<FR' ),
+			array( 'FR_FR', 'FR_FR' ),
+			array( '--__', '--__' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_sanitize_locale_name_returns_empty_string
+	 */
+	public function test_sanitize_locale_name_returns_empty_string( $input ) {
+		$this->assertSame( '', sanitize_locale_name( $input ) );
+	}
+
+	public function data_sanitize_locale_name_returns_empty_string() {
+		return array(
+			// array( input )
+			array( '$<>' ),
+			array( '/$$$%%\\)' ),
+			array( '....' ),
+			array( '@///' ),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/formatting/sanitizeOrderby.php b/tests/phpunit/tests/formatting/sanitizeOrderby.php
index 8384f8a4b242e..fec1d417134e5 100644
--- a/tests/phpunit/tests/formatting/sanitizeOrderby.php
+++ b/tests/phpunit/tests/formatting/sanitizeOrderby.php
@@ -8,12 +8,12 @@
 class Tests_Formatting_SanitizeOrderby extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider valid_orderbys
+	 * @dataProvider data_sanitize_sql_orderby_valid
 	 */
-	public function test_valid( $orderby ) {
+	public function test_sanitize_sql_orderby_valid( $orderby ) {
 		$this->assertSame( $orderby, sanitize_sql_orderby( $orderby ) );
 	}
-	public function valid_orderbys() {
+	public function data_sanitize_sql_orderby_valid() {
 		return array(
 			array( '1' ),
 			array( '1 ASC' ),
@@ -34,12 +34,12 @@ public function valid_orderbys() {
 	}
 
 	/**
-	 * @dataProvider invalid_orderbys
+	 * @dataProvider data_sanitize_sql_orderby_invalid
 	 */
-	public function test_invalid( $orderby ) {
+	public function test_sanitize_sql_orderby_invalid( $orderby ) {
 		$this->assertFalse( sanitize_sql_orderby( $orderby ) );
 	}
-	public function invalid_orderbys() {
+	public function data_sanitize_sql_orderby_invalid() {
 		return array(
 			array( '' ),
 			array( '1 2' ),
diff --git a/tests/phpunit/tests/formatting/sanitizeTextField.php b/tests/phpunit/tests/formatting/sanitizeTextField.php
index 15e903ac95cf8..2d184ebb1373f 100644
--- a/tests/phpunit/tests/formatting/sanitizeTextField.php
+++ b/tests/phpunit/tests/formatting/sanitizeTextField.php
@@ -7,6 +7,24 @@
  * @covers ::sanitize_textarea_field
  */
 class Tests_Formatting_SanitizeTextField extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 32257
+	 * @dataProvider data_sanitize_text_field
+	 */
+	public function test_sanitize_text_field( $str, $expected ) {
+		if ( is_array( $expected ) ) {
+			$expected_oneline   = $expected['oneline'];
+			$expected_multiline = $expected['multiline'];
+		} else {
+			$expected_oneline   = $expected;
+			$expected_multiline = $expected;
+		}
+		$this->assertSame( $expected_oneline, sanitize_text_field( $str ) );
+		$this->assertSameIgnoreEOL( $expected_multiline, sanitize_textarea_field( $str ) );
+
+	}
+
 	public function data_sanitize_text_field() {
 		return array(
 			array(
@@ -105,7 +123,7 @@ public function data_sanitize_text_field() {
 				'',
 			),
 			array(
-				new WP_Query,
+				new WP_Query(),
 				'',
 			),
 			array(
@@ -126,21 +144,4 @@ public function data_sanitize_text_field() {
 			),
 		);
 	}
-
-	/**
-	 * @ticket 32257
-	 * @dataProvider data_sanitize_text_field
-	 */
-	public function test_sanitize_text_field( $string, $expected ) {
-		if ( is_array( $expected ) ) {
-			$expected_oneline   = $expected['oneline'];
-			$expected_multiline = $expected['multiline'];
-		} else {
-			$expected_oneline   = $expected;
-			$expected_multiline = $expected;
-		}
-		$this->assertSame( $expected_oneline, sanitize_text_field( $string ) );
-		$this->assertSameIgnoreEOL( $expected_multiline, sanitize_textarea_field( $string ) );
-
-	}
 }
diff --git a/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php b/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php
index 9e9c096a76ec5..b560ad5c75530 100644
--- a/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php
+++ b/tests/phpunit/tests/formatting/sanitizeTrackbackUrls.php
@@ -8,13 +8,16 @@
 class Tests_Formatting_SanitizeTrackbackUrls extends WP_UnitTestCase {
 	/**
 	 * @ticket 21624
-	 * @dataProvider breaks
+	 * @dataProvider data_sanitize_trackback_urls_with_multiple_urls
 	 */
-	public function test_sanitize_trackback_urls_with_multiple_urls( $break ) {
-		$this->assertSame( "http://example.com\nhttp://example.org", sanitize_trackback_urls( "http://example.com{$break}http://example.org" ) );
+	public function test_sanitize_trackback_urls_with_multiple_urls( $separator ) {
+		$this->assertSame(
+			"http://example.com\nhttp://example.org",
+			sanitize_trackback_urls( "http://example.com{$separator}http://example.org" )
+		);
 	}
 
-	public function breaks() {
+	public function data_sanitize_trackback_urls_with_multiple_urls() {
 		return array(
 			array( "\r\n\t " ),
 			array( "\r" ),
diff --git a/tests/phpunit/tests/formatting/seemsUtf8.php b/tests/phpunit/tests/formatting/seemsUtf8.php
index 5e9bb8e8a1488..b6a67950e9870 100644
--- a/tests/phpunit/tests/formatting/seemsUtf8.php
+++ b/tests/phpunit/tests/formatting/seemsUtf8.php
@@ -10,14 +10,14 @@ class Tests_Formatting_SeemsUtf8 extends WP_UnitTestCase {
 	/**
 	 * `seems_utf8` returns true for utf-8 strings, false otherwise.
 	 *
-	 * @dataProvider utf8_strings
+	 * @dataProvider data_seems_utf8_returns_true_for_utf8_strings
 	 */
-	public function test_returns_true_for_utf8_strings( $utf8_string ) {
+	public function test_seems_utf8_returns_true_for_utf8_strings( $utf8_string ) {
 		// From http://www.i18nguy.com/unicode-example.html
 		$this->assertTrue( seems_utf8( $utf8_string ) );
 	}
 
-	public function utf8_strings() {
+	public function data_seems_utf8_returns_true_for_utf8_strings() {
 		$utf8_strings = file( DIR_TESTDATA . '/formatting/utf-8/utf-8.txt' );
 		foreach ( $utf8_strings as &$string ) {
 			$string = (array) trim( $string );
@@ -27,13 +27,13 @@ public function utf8_strings() {
 	}
 
 	/**
-	 * @dataProvider big5_strings
+	 * @dataProvider data_seems_utf8_returns_false_for_non_utf8_strings
 	 */
-	public function test_returns_false_for_non_utf8_strings( $big5_string ) {
+	public function test_seems_utf8_returns_false_for_non_utf8_strings( $big5_string ) {
 		$this->assertFalse( seems_utf8( $big5_string ) );
 	}
 
-	public function big5_strings() {
+	public function data_seems_utf8_returns_false_for_non_utf8_strings() {
 		// Get data from formatting/big5.txt.
 		$big5_strings = file( DIR_TESTDATA . '/formatting/big5.txt' );
 		foreach ( $big5_strings as &$string ) {
diff --git a/tests/phpunit/tests/formatting/stripslashesDeep.php b/tests/phpunit/tests/formatting/stripslashesDeep.php
index 76f9e8b019f67..ea2c9139545be 100644
--- a/tests/phpunit/tests/formatting/stripslashesDeep.php
+++ b/tests/phpunit/tests/formatting/stripslashesDeep.php
@@ -26,7 +26,7 @@ public function test_preserves_original_datatype() {
 		$this->assertSame( $arr, stripslashes_deep( $arr ) ); // Keyed array.
 		$this->assertSame( array_values( $arr ), stripslashes_deep( array_values( $arr ) ) ); // Non-keyed.
 
-		$obj = new stdClass;
+		$obj = new stdClass();
 		foreach ( $arr as $k => $v ) {
 			$obj->$k = $v;
 		}
@@ -41,9 +41,9 @@ public function test_strips_slashes() {
 		$this->assertSame( array( 'a' => $new ), stripslashes_deep( array( 'a' => $old ) ) ); // Keyed array.
 		$this->assertSame( array( $new ), stripslashes_deep( array( $old ) ) ); // Non-keyed.
 
-		$obj_old    = new stdClass;
+		$obj_old    = new stdClass();
 		$obj_old->a = $old;
-		$obj_new    = new stdClass;
+		$obj_new    = new stdClass();
 		$obj_new->a = $new;
 		$this->assertEquals( $obj_new, stripslashes_deep( $obj_old ) );
 	}
diff --git a/tests/phpunit/tests/formatting/urlencodeDeep.php b/tests/phpunit/tests/formatting/urlencodeDeep.php
index a3b461a6ae78f..632f4083c09bf 100644
--- a/tests/phpunit/tests/formatting/urlencodeDeep.php
+++ b/tests/phpunit/tests/formatting/urlencodeDeep.php
@@ -9,9 +9,21 @@
 class Tests_Formatting_UrlencodeDeep extends WP_UnitTestCase {
 
 	/**
-	 * Data Provider
+	 * Tests the urlencode_deep() function pair by pair.
+	 *
+	 * @dataProvider data_urlencode_deep
+	 *
+	 * @param string $input
+	 * @param string $expected
+	 */
+	public function test_urlencode_deep_should_encode_individual_value( $input, $expected ) {
+		$this->assertSame( $expected, urlencode_deep( $input ) );
+	}
+
+	/**
+	 * Data provider.
 	 */
-	public function data_test_values() {
+	public function data_urlencode_deep() {
 		return array(
 			array( 'qwerty123456', 'qwerty123456' ),
 			array( '|!"£$%&/()=?', '%7C%21%22%C2%A3%24%25%26%2F%28%29%3D%3F' ),
@@ -22,22 +34,10 @@ public function data_test_values() {
 	}
 
 	/**
-	 * Validate the urlencode_deep function pair by pair
-	 *
-	 * @dataProvider data_test_values
-	 *
-	 * @param string $actual
-	 * @param string $expected
-	 */
-	public function test_urlencode_deep_should_encode_individual_value( $actual, $expected ) {
-		$this->assertSame( $expected, urlencode_deep( $actual ) );
-	}
-
-	/**
-	 * Test the whole array as input
+	 * Tests the whole array as input.
 	 */
 	public function test_urlencode_deep_should_encode_all_values_in_array() {
-		$data = $this->data_test_values();
+		$data = $this->data_urlencode_deep();
 
 		$actual   = wp_list_pluck( $data, 0 );
 		$expected = wp_list_pluck( $data, 1 );
diff --git a/tests/phpunit/tests/formatting/wpAutop.php b/tests/phpunit/tests/formatting/wpAutop.php
index 315a0c9794e34..6630782963568 100644
--- a/tests/phpunit/tests/formatting/wpAutop.php
+++ b/tests/phpunit/tests/formatting/wpAutop.php
@@ -104,6 +104,63 @@ public function test_skip_input_elements() {
 		$this->assertSame( "<p>$str</p>", trim( wpautop( $str ) ) );
 	}
 
+	/**
+	 * wpautop() Should add <p> around inline "<math>" elements.
+	 *
+	 * @ticket 13340
+	 */
+	public function test_wrap_inline_math_elements() {
+		$str = '<math><mrow><msup><mi>a</mi><mn>2</mn></msup><mo>+</mo><msup><mi>b</mi><mn>2</mn></msup><mo>=</mo><msup><mi>c</mi><mn>2</mn></msup></mrow></math>';
+
+		$this->assertSame( "<p>$str</p>", trim( wpautop( $str ) ) );
+	}
+
+	/**
+	 * wpautop() Should not add <br> inside block "<math>" elements.
+	 *
+	 * @ticket 13340
+	 */
+	public function test_skip_block_math_elements() {
+		$str = '<math display="block">
+	<mtable>
+		<mtr>
+			<mtd>
+				<msup><mrow><mo>(</mo><mi>a</mi><mo>+</mo><mi>b</mi><mo>)</mo></mrow><mn>2</mn></msup>
+			</mtd>
+			<mtd>
+				<mo>=</mo>
+			</mtd>
+			<mtd>
+				<msup><mi>c</mi><mn>2</mn></msup>
+				<mo>+</mo><mn>4</mn><mo>⋅</mo>
+				<mo>(</mo><mfrac><mn>1</mn><mn>2</mn></mfrac><mi>a</mi><mi>b</mi><mo>)</mo>
+			</mtd>
+		</mtr>
+		<mtr>
+			<mtd>
+				<msup><mi>a</mi><mn>2</mn></msup>
+				<mo>+</mo><mn>2</mn><mi>a</mi><mi>b</mi><mo>+</mo>
+				<msup><mi>b</mi><mn>2</mn></msup>
+			</mtd>
+			<mtd>
+				<mo>=</mo>
+			</mtd>
+			<mtd>
+				<msup><mi>c</mi><mn>2</mn></msup>
+				<mo>+</mo><mn>2</mn><mi>a</mi><mi>b</mi>
+			</mtd>
+		</mtr>
+		<mtr>
+			<mtd><msup><mi>a</mi><mn>2</mn></msup><mo>+</mo><msup><mi>b</mi><mn>2</mn></msup></mtd>
+			<mtd><mo>=</mo></mtd>
+			<mtd><msup><mi>c</mi><mn>2</mn></msup></mtd>
+		</mtr>
+	</mtable>
+</math>';
+
+		$this->assertSameIgnoreEOL( "<p>$str</p>", trim( wpautop( $str ) ) );
+	}
+
 	/**
 	 * wpautop() Should not add <p> and <br/> around <source> and <track>
 	 *
@@ -308,7 +365,6 @@ public function test_that_wpautop_treats_block_level_elements_as_blocks() {
 			'map',
 			'area',
 			'address',
-			'math',
 			'style',
 			'p',
 			'h1',
diff --git a/tests/phpunit/tests/formatting/wpParseStr.php b/tests/phpunit/tests/formatting/wpParseStr.php
index 7a44d5fe96b08..502715b97bf3b 100644
--- a/tests/phpunit/tests/formatting/wpParseStr.php
+++ b/tests/phpunit/tests/formatting/wpParseStr.php
@@ -24,7 +24,7 @@ public function test_wp_parse_str( $input, $expected ) {
 	}
 
 	/**
-	 * Data Provider.
+	 * Data provider.
 	 *
 	 * @return array
 	 */
diff --git a/tests/phpunit/tests/formatting/wpRelNofollow.php b/tests/phpunit/tests/formatting/wpRelNofollow.php
index 0b45d22e1526e..41cf835313444 100644
--- a/tests/phpunit/tests/formatting/wpRelNofollow.php
+++ b/tests/phpunit/tests/formatting/wpRelNofollow.php
@@ -11,16 +11,6 @@ class Tests_Formatting_wpRelNofollow extends WP_UnitTestCase {
 	 * @ticket 9959
 	 */
 	public function test_add_no_follow() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$content  = '<p>This is some cool <a href="/">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow\">Code</a></p>';
 		$this->assertSame( $expected, wp_rel_nofollow( $content ) );
@@ -30,16 +20,6 @@ public function test_add_no_follow() {
 	 * @ticket 9959
 	 */
 	public function test_convert_no_follow() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$content  = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow\">Code</a></p>';
 		$this->assertSame( $expected, wp_rel_nofollow( $content ) );
@@ -50,16 +30,6 @@ public function test_convert_no_follow() {
 	 * @dataProvider data_wp_rel_nofollow
 	 */
 	public function test_wp_rel_nofollow( $input, $output, $expect_deprecation = false ) {
-		if ( true === $expect_deprecation && PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$this->assertSame( wp_slash( $output ), wp_rel_nofollow( $input ) );
 	}
 
@@ -109,16 +79,6 @@ public function data_wp_rel_nofollow() {
 	}
 
 	public function test_append_no_follow_with_valueless_attribute() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$content  = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow\">Code</a></p>';
 		$this->assertSame( $expected, wp_rel_nofollow( $content ) );
diff --git a/tests/phpunit/tests/formatting/wpRelUgc.php b/tests/phpunit/tests/formatting/wpRelUgc.php
index 4b8b11dafa7ec..6f5f942596ec4 100644
--- a/tests/phpunit/tests/formatting/wpRelUgc.php
+++ b/tests/phpunit/tests/formatting/wpRelUgc.php
@@ -11,16 +11,6 @@ class Tests_Formatting_wpRelUgc extends WP_UnitTestCase {
 	 * @ticket 48022
 	 */
 	public function test_add_ugc() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$content  = '<p>This is some cool <a href="/">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"nofollow ugc\">Code</a></p>';
 		$this->assertSame( $expected, wp_rel_ugc( $content ) );
@@ -30,16 +20,6 @@ public function test_add_ugc() {
 	 * @ticket 48022
 	 */
 	public function test_convert_ugc() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$content  = '<p>This is some cool <a href="/" rel="weird">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"/\" rel=\"weird nofollow ugc\">Code</a></p>';
 		$this->assertSame( $expected, wp_rel_ugc( $content ) );
@@ -50,16 +30,6 @@ public function test_convert_ugc() {
 	 * @dataProvider data_wp_rel_ugc
 	 */
 	public function test_wp_rel_ugc( $input, $output, $expect_deprecation = false ) {
-		if ( true === $expect_deprecation && PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
-
 		$this->assertSame( wp_slash( $output ), wp_rel_ugc( $input ) );
 	}
 
@@ -99,25 +69,16 @@ public function data_wp_rel_ugc() {
 			),
 			array(
 				'<a href="' . $home_url_http . '/some-url">Home URL (http)</a>',
-				'<a href="' . $home_url_http . '/some-url">Home URL (http)</a>',
+				'<a href="' . $home_url_http . '/some-url" rel="ugc">Home URL (http)</a>',
 			),
 			array(
 				'<a href="' . $home_url_https . '/some-url">Home URL (https)</a>',
-				'<a href="' . $home_url_https . '/some-url">Home URL (https)</a>',
+				'<a href="' . $home_url_https . '/some-url" rel="ugc">Home URL (https)</a>',
 			),
 		);
 	}
 
 	public function test_append_ugc_with_valueless_attribute() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, ignoring PHP 8.1 "null to non-nullable" deprecations coming in
-			 * via hooked in filter functions until a more structural solution to the
-			 * "missing input validation" conundrum has been architected and implemented.
-			 */
-			$this->expectDeprecation();
-			$this->expectDeprecationMessageMatches( '`Passing null to parameter \#[0-9]+ \(\$[^\)]+\) of type [^ ]+ is deprecated`' );
-		}
 
 		$content  = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';
 		$expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow ugc\">Code</a></p>';
diff --git a/tests/phpunit/tests/formatting/wpSlash.php b/tests/phpunit/tests/formatting/wpSlash.php
index 39a7c32a010e2..a1ac591c7ae02 100644
--- a/tests/phpunit/tests/formatting/wpSlash.php
+++ b/tests/phpunit/tests/formatting/wpSlash.php
@@ -84,7 +84,7 @@ public function test_preserves_original_datatype() {
 		$this->assertSame( $arr, wp_slash( $arr ) ); // Keyed array.
 		$this->assertSame( array_values( $arr ), wp_slash( array_values( $arr ) ) ); // Non-keyed.
 
-		$obj = new stdClass;
+		$obj = new stdClass();
 		foreach ( $arr as $k => $v ) {
 			$obj->$k = $v;
 		}
diff --git a/tests/phpunit/tests/formatting/wpStripAllTags.php b/tests/phpunit/tests/formatting/wpStripAllTags.php
index 2ef332e62edb8..3efe479deca07 100644
--- a/tests/phpunit/tests/formatting/wpStripAllTags.php
+++ b/tests/phpunit/tests/formatting/wpStripAllTags.php
@@ -31,5 +31,76 @@ public function test_wp_strip_all_tags() {
 		$text = "lorem<style>* { display: 'none' }<script>alert( document.cookie )</script></style>ipsum";
 		$this->assertSame( 'loremipsum', wp_strip_all_tags( $text ) );
 	}
+
+	/**
+	 * Tests that `wp_strip_all_tags()` returns an empty string when null is passed.
+	 *
+	 * @ticket 56434
+	 */
+	public function test_wp_strip_all_tags_should_return_empty_string_for_a_null_arg() {
+		$this->assertSame( '', wp_strip_all_tags( null ) );
+	}
+
+	/**
+	 * Tests that `wp_strip_all_tags()` triggers a warning and returns
+	 * an empty string when passed a non-string argument.
+	 *
+	 * @ticket 56434
+	 *
+	 * @dataProvider data_wp_strip_all_tags_should_return_empty_string_and_trigger_an_error_for_non_string_arg
+	 *
+	 * @param mixed $non_string A non-string value.
+	 */
+	public function test_wp_strip_all_tags_should_return_empty_string_and_trigger_an_error_for_non_string_arg( $non_string ) {
+		$type = gettype( $non_string );
+		$this->expectError();
+		$this->expectErrorMessage( "Warning: wp_strip_all_tags expects parameter #1 (\$text) to be a string, $type given." );
+		$this->assertSame( '', wp_strip_all_tags( $non_string ) );
+	}
+
+	/**
+	 * Data provider for test_wp_strip_all_tags_should_return_empty_string_and_trigger_an_error_for_non_string_arg().
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_strip_all_tags_should_return_empty_string_and_trigger_an_error_for_non_string_arg() {
+		return array(
+			'an empty array'     => array( 'non_string' => array() ),
+			'a non-empty array'  => array( 'non_string' => array( 'a string' ) ),
+			'an empty object'    => array( 'non_string' => new stdClass() ),
+			'a non-empty object' => array( 'non_string' => (object) array( 'howdy' => 'admin' ) ),
+		);
+	}
+
+	/**
+	 * Tests that `wp_strip_all_tags()` casts scalar values to string.
+	 *
+	 * @ticket 56434
+	 *
+	 * @dataProvider data_wp_strip_all_tags_should_cast_scalar_values_to_string
+	 *
+	 * @param mixed $text A scalar value.
+	 */
+	public function test_wp_strip_all_tags_should_cast_scalar_values_to_string( $text ) {
+		$this->assertSame( (string) $text, wp_strip_all_tags( $text ) );
+	}
+
+	/**
+	 * Data provider for test_wp_strip_all_tags_should_cast_scalar_values_to_string()/
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_strip_all_tags_should_cast_scalar_values_to_string() {
+		return array(
+			'(int) 0'      => array( 'text' => 0 ),
+			'(int) 1'      => array( 'text' => 1 ),
+			'(int) -1'     => array( 'text' => -1 ),
+			'(float) 0.0'  => array( 'text' => 0.0 ),
+			'(float) 1.0'  => array( 'text' => 1.0 ),
+			'(float) -1.0' => array( 'text' => -1.0 ),
+			'(bool) false' => array( 'text' => false ),
+			'(bool) true'  => array( 'text' => true ),
+		);
+	}
 }
 
diff --git a/tests/phpunit/tests/formatting/wpTrimExcerpt.php b/tests/phpunit/tests/formatting/wpTrimExcerpt.php
index c3ab336bf9316..1cb4389ee9a35 100644
--- a/tests/phpunit/tests/formatting/wpTrimExcerpt.php
+++ b/tests/phpunit/tests/formatting/wpTrimExcerpt.php
@@ -92,4 +92,60 @@ public function test_should_generate_excerpt_for_empty_values() {
 		$this->assertSame( 'Post content', wp_trim_excerpt( null, $post ) );
 		$this->assertSame( 'Post content', wp_trim_excerpt( false, $post ) );
 	}
+
+	/**
+	 * Tests that `wp_trim_excerpt()` unhooks `wp_filter_content_tags()` from 'the_content' filter.
+	 *
+	 * @ticket 56588
+	 */
+	public function test_wp_trim_excerpt_unhooks_wp_filter_content_tags() {
+		$post = self::factory()->post->create();
+
+		/*
+		 * Record that during 'the_content' filter run by wp_trim_excerpt() the
+		 * wp_filter_content_tags() callback is not used.
+		 */
+		$has_filter = true;
+		add_filter(
+			'the_content',
+			static function( $content ) use ( &$has_filter ) {
+				$has_filter = has_filter( 'the_content', 'wp_filter_content_tags' );
+				return $content;
+			}
+		);
+
+		wp_trim_excerpt( '', $post );
+
+		$this->assertFalse( $has_filter, 'wp_filter_content_tags() was not unhooked in wp_trim_excerpt()' );
+	}
+
+	/**
+	 * Tests that `wp_trim_excerpt()` doesn't permanently unhook `wp_filter_content_tags()` from 'the_content' filter.
+	 *
+	 * @ticket 56588
+	 */
+	public function test_wp_trim_excerpt_should_not_permanently_unhook_wp_filter_content_tags() {
+		$post = self::factory()->post->create();
+
+		wp_trim_excerpt( '', $post );
+
+		$this->assertSame( 10, has_filter( 'the_content', 'wp_filter_content_tags' ), 'wp_filter_content_tags() was not restored in wp_trim_excerpt()' );
+	}
+
+	/**
+	 * Tests that `wp_trim_excerpt()` doesn't restore `wp_filter_content_tags()` if it was previously unhooked.
+	 *
+	 * @ticket 56588
+	 */
+	public function test_wp_trim_excerpt_does_not_restore_wp_filter_content_tags_if_previously_unhooked() {
+		$post = self::factory()->post->create();
+
+		// Remove wp_filter_content_tags() from 'the_content' filter generally.
+		remove_filter( 'the_content', 'wp_filter_content_tags' );
+
+		wp_trim_excerpt( '', $post );
+
+		// Assert that the filter callback was not restored after running 'the_content'.
+		$this->assertFalse( has_filter( 'the_content', 'wp_filter_content_tags' ) );
+	}
 }
diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php
index ea7488a5d95f3..32fa2bd1e64aa 100644
--- a/tests/phpunit/tests/functions.php
+++ b/tests/phpunit/tests/functions.php
@@ -5,7 +5,7 @@
  */
 class Tests_Functions extends WP_UnitTestCase {
 	public function test_wp_parse_args_object() {
-		$x        = new MockClass;
+		$x        = new MockClass();
 		$x->_baba = 5;
 		$x->yZ    = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		$x->a     = array( 5, 111, 'x' );
@@ -17,7 +17,7 @@ public function test_wp_parse_args_object() {
 			),
 			wp_parse_args( $x )
 		);
-		$y = new MockClass;
+		$y = new MockClass();
 		$this->assertSame( array(), wp_parse_args( $y ) );
 	}
 
@@ -41,7 +41,7 @@ public function test_wp_parse_args_array() {
 	}
 
 	public function test_wp_parse_args_defaults() {
-		$x        = new MockClass;
+		$x        = new MockClass();
 		$x->_baba = 5;
 		$x->yZ    = 'baba'; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 		$x->a     = array( 5, 111, 'x' );
@@ -133,7 +133,7 @@ public function test_path_is_not_absolute() {
 	 * Tests path_join().
 	 *
 	 * @ticket 55897
-	 * @dataProvider path_join_data_provider
+	 * @dataProvider data_path_join
 	 */
 	public function test_path_join( $base, $path, $expected ) {
 		$this->assertSame( $expected, path_join( $base, $path ) );
@@ -144,7 +144,7 @@ public function test_path_join( $base, $path, $expected ) {
 	 *
 	 * @return string[][]
 	 */
-	public function path_join_data_provider() {
+	public function data_path_join() {
 		return array(
 			// Absolute paths.
 			'absolute path should return path' => array(
@@ -258,7 +258,7 @@ public function test_wp_unique_filename() {
 		$this->assertSame( 'abcdefgh.png', wp_unique_filename( $testdir, 'abcdefg"h.png' ), 'File with quote failed' );
 
 		// Test crazy name (useful for regression tests).
-		$this->assertSame( '12af34567890@..^_qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty  fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );
+		$this->assertSame( '12af34567890@.^_qwerty-fghjkl-zx.png', wp_unique_filename( $testdir, '12%af34567890#~!@#$..%^&*()|_+qwerty  fgh`jkl zx<>?:"{}[]="\'/?.png' ), 'Failed crazy file name' );
 
 		// Test slashes in names.
 		$this->assertSame( 'abcdefg.png', wp_unique_filename( $testdir, 'abcde\fg.png' ), 'Slash not removed' );
@@ -1113,7 +1113,7 @@ public function test_wp_json_encode_array() {
 	 * @ticket 28786
 	 */
 	public function test_wp_json_encode_object() {
-		$object    = new stdClass;
+		$object    = new stdClass();
 		$object->a = 'b';
 		$this->assertSame( wp_json_encode( $object ), '{"a":"b"}' );
 	}
@@ -1158,7 +1158,7 @@ public function test_wp_json_file_decode_associative_array() {
 
 	/**
 	 * @ticket 36054
-	 * @dataProvider datetime_provider
+	 * @dataProvider data_mysql_to_rfc3339
 	 */
 	public function test_mysql_to_rfc3339( $expected, $actual ) {
 		$date_return = mysql_to_rfc3339( $actual );
@@ -1169,7 +1169,7 @@ public function test_mysql_to_rfc3339( $expected, $actual ) {
 		$this->assertEquals( new DateTime( $expected ), new DateTime( $date_return ), 'The date is not the same after the call method' );
 	}
 
-	public function datetime_provider() {
+	public function data_mysql_to_rfc3339() {
 		return array(
 			array( '2016-03-15T18:54:46', '15-03-2016 18:54:46' ),
 			array( '2016-03-02T19:13:25', '2016-03-02 19:13:25' ),
@@ -1334,7 +1334,7 @@ public function test_wp_unique_id() {
 
 	/**
 	 * @ticket 40017
-	 * @dataProvider wp_get_image_mime
+	 * @dataProvider data_wp_get_image_mime
 	 */
 	public function test_wp_get_image_mime( $file, $expected ) {
 		if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
@@ -1344,106 +1344,10 @@ public function test_wp_get_image_mime( $file, $expected ) {
 		$this->assertSame( $expected, wp_get_image_mime( $file ) );
 	}
 
-	/**
-	 * @ticket 35725
-	 * @dataProvider data_wp_getimagesize
-	 */
-	public function test_wp_getimagesize( $file, $expected ) {
-		if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
-			$this->markTestSkipped( 'The exif PHP extension is not loaded.' );
-		}
-
-		$result = wp_getimagesize( $file );
-
-		// The getimagesize() function varies in its response, so
-		// let's restrict comparison to expected keys only.
-		if ( is_array( $expected ) ) {
-			foreach ( $expected as $k => $v ) {
-				$this->assertArrayHasKey( $k, $result );
-				$this->assertSame( $expected[ $k ], $result[ $k ] );
-			}
-		} else {
-			$this->assertSame( $expected, $result );
-		}
-	}
-
-	/**
-	 * @ticket 39550
-	 * @dataProvider wp_check_filetype_and_ext_data
-	 * @requires extension fileinfo
-	 */
-	public function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
-		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
-	}
-
-	/**
-	 * @ticket 39550
-	 * @group ms-excluded
-	 * @requires extension fileinfo
-	 */
-	public function test_wp_check_filetype_and_ext_with_filtered_svg() {
-		$file     = DIR_TESTDATA . '/uploads/video-play.svg';
-		$filename = 'video-play.svg';
-
-		$expected = array(
-			'ext'             => 'svg',
-			'type'            => 'image/svg+xml',
-			'proper_filename' => false,
-		);
-
-		add_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
-		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
-
-		// Cleanup.
-		remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
-	}
-
-	/**
-	 * @ticket 39550
-	 * @group ms-excluded
-	 * @requires extension fileinfo
-	 */
-	public function test_wp_check_filetype_and_ext_with_filtered_woff() {
-		if ( PHP_VERSION_ID >= 80100 ) {
-			/*
-			 * For the time being, this test is marked skipped on PHP 8.1+ as a recent change introduced
-			 * an inconsistency with how the mime-type for WOFF files are handled compared to older versions.
-			 *
-			 * See https://core.trac.wordpress.org/ticket/56817 for more details.
-			 */
-			$this->markTestSkipped( 'This test currently fails on PHP 8.1+ and requires further investigation.' );
-		}
-
-		$file     = DIR_TESTDATA . '/uploads/dashicons.woff';
-		$filename = 'dashicons.woff';
-
-		$expected = array(
-			'ext'             => 'woff',
-			'type'            => 'application/font-woff',
-			'proper_filename' => false,
-		);
-
-		add_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
-		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
-
-		// Cleanup.
-		remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
-	}
-
-	public function filter_mime_types_svg( $mimes ) {
-		$mimes['svg'] = 'image/svg+xml';
-		return $mimes;
-	}
-
-	public function filter_mime_types_woff( $mimes ) {
-		$mimes['woff'] = 'application/font-woff';
-		return $mimes;
-	}
-
 	/**
 	 * Data provider for test_wp_get_image_mime().
 	 */
-	public function wp_get_image_mime() {
+	public function data_wp_get_image_mime() {
 		$data = array(
 			// Standard JPEG.
 			array(
@@ -1495,6 +1399,29 @@ public function wp_get_image_mime() {
 		return $data;
 	}
 
+	/**
+	 * @ticket 35725
+	 * @dataProvider data_wp_getimagesize
+	 */
+	public function test_wp_getimagesize( $file, $expected ) {
+		if ( ! is_callable( 'exif_imagetype' ) && ! function_exists( 'getimagesize' ) ) {
+			$this->markTestSkipped( 'The exif PHP extension is not loaded.' );
+		}
+
+		$result = wp_getimagesize( $file );
+
+		// The getimagesize() function varies in its response, so
+		// let's restrict comparison to expected keys only.
+		if ( is_array( $expected ) ) {
+			foreach ( $expected as $k => $v ) {
+				$this->assertArrayHasKey( $k, $result );
+				$this->assertSame( $expected[ $k ], $result[ $k ] );
+			}
+		} else {
+			$this->assertSame( $expected, $result );
+		}
+	}
+
 	/**
 	 * Data profider for test_wp_getimagesize().
 	 */
@@ -1598,7 +1525,16 @@ public function data_wp_getimagesize() {
 		return $data;
 	}
 
-	public function wp_check_filetype_and_ext_data() {
+	/**
+	 * @ticket 39550
+	 * @dataProvider data_wp_check_filetype_and_ext
+	 * @requires extension fileinfo
+	 */
+	public function test_wp_check_filetype_and_ext( $file, $filename, $expected ) {
+		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+	}
+
+	public function data_wp_check_filetype_and_ext() {
 		$data = array(
 			// Standard image.
 			array(
@@ -1763,11 +1699,75 @@ public function wp_check_filetype_and_ext_data() {
 		return $data;
 	}
 
+	/**
+	 * @ticket 39550
+	 * @group ms-excluded
+	 * @requires extension fileinfo
+	 */
+	public function test_wp_check_filetype_and_ext_with_filtered_svg() {
+		$file     = DIR_TESTDATA . '/uploads/video-play.svg';
+		$filename = 'video-play.svg';
+
+		$expected = array(
+			'ext'             => 'svg',
+			'type'            => 'image/svg+xml',
+			'proper_filename' => false,
+		);
+
+		add_filter(
+			'upload_mimes',
+			static function( $mimes ) {
+				$mimes['svg'] = 'image/svg+xml';
+				return $mimes;
+			}
+		);
+
+		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+	}
+
+	/**
+	 * @ticket 39550
+	 * @group ms-excluded
+	 * @requires extension fileinfo
+	 */
+	public function test_wp_check_filetype_and_ext_with_filtered_woff() {
+		$file     = DIR_TESTDATA . '/uploads/dashicons.woff';
+		$filename = 'dashicons.woff';
+
+		$woff_mime_type = 'application/font-woff';
+
+		/*
+		 * As of PHP 8.1.12, which includes libmagic/file update to version 5.42,
+		 * the expected mime type for WOFF files is 'font/woff'.
+		 *
+		 * See https://github.com/php/php-src/issues/8805.
+		 */
+		if ( PHP_VERSION_ID >= 80112 ) {
+			$woff_mime_type = 'font/woff';
+		}
+
+		$expected = array(
+			'ext'             => 'woff',
+			'type'            => $woff_mime_type,
+			'proper_filename' => false,
+		);
+
+		add_filter(
+			'upload_mimes',
+			static function( $mimes ) use ( $woff_mime_type ) {
+				$mimes['woff'] = $woff_mime_type;
+				return $mimes;
+			}
+		);
+
+		$this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
+	}
+
 	/**
 	 * Test file path validation
 	 *
 	 * @ticket 42016
-	 * @dataProvider data_test_validate_file()
+	 * @dataProvider data_validate_file
 	 *
 	 * @param string $file          File path.
 	 * @param array  $allowed_files List of allowed files.
@@ -1781,14 +1781,14 @@ public function test_validate_file( $file, $allowed_files, $expected ) {
 	 * Data provider for file validation.
 	 *
 	 * @return array {
-	 *     @type array $0... {
+	 *     @type array ...$0 {
 	 *         @type string $0 File path.
 	 *         @type array  $1 List of allowed files.
 	 *         @type int    $2 Expected result.
 	 *     }
 	 * }
 	 */
-	public function data_test_validate_file() {
+	public function data_validate_file() {
 		return array(
 
 			// Allowed files:
@@ -1910,7 +1910,7 @@ public function data_test_validate_file() {
 	/**
 	 * Test stream URL validation.
 	 *
-	 * @dataProvider data_test_wp_is_stream
+	 * @dataProvider data_wp_is_stream
 	 *
 	 * @param string $path     The resource path or URL.
 	 * @param bool   $expected Expected result.
@@ -1927,13 +1927,13 @@ public function test_wp_is_stream( $path, $expected ) {
 	 * Data provider for stream URL validation.
 	 *
 	 * @return array {
-	 *     @type array $0... {
+	 *     @type array ...$0 {
 	 *         @type string $0 The resource path or URL.
 	 *         @type bool   $1 Expected result.
 	 *     }
 	 * }
 	 */
-	public function data_test_wp_is_stream() {
+	public function data_wp_is_stream() {
 		return array(
 			// Legitimate stream examples.
 			array( 'http://example.com', true ),
@@ -1954,7 +1954,7 @@ public function data_test_wp_is_stream() {
 	 * Test human_readable_duration().
 	 *
 	 * @ticket 39667
-	 * @dataProvider data_test_human_readable_duration
+	 * @dataProvider data_human_readable_duration
 	 *
 	 * @param string $input    Duration.
 	 * @param string $expected Expected human readable duration.
@@ -1964,7 +1964,7 @@ public function test_human_readable_duration( $input, $expected ) {
 	}
 
 	/**
-	 * Dataprovider for test_duration_format().
+	 * Data provider for test_duration_format().
 	 *
 	 * @return array {
 	 *     @type array {
@@ -1973,7 +1973,7 @@ public function test_human_readable_duration( $input, $expected ) {
 	 *     }
 	 * }
 	 */
-	public function data_test_human_readable_duration() {
+	public function data_human_readable_duration() {
 		return array(
 			// Valid ii:ss cases.
 			array( '0:0', '0 minutes, 0 seconds' ),
@@ -2030,14 +2030,14 @@ public function data_test_human_readable_duration() {
 
 	/**
 	 * @ticket 49404
-	 * @dataProvider data_test_wp_is_json_media_type
+	 * @dataProvider data_wp_is_json_media_type
 	 */
 	public function test_wp_is_json_media_type( $input, $expected ) {
 		$this->assertSame( $expected, wp_is_json_media_type( $input ) );
 	}
 
 
-	public function data_test_wp_is_json_media_type() {
+	public function data_wp_is_json_media_type() {
 		return array(
 			array( 'application/ld+json', true ),
 			array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', true ),
@@ -2065,46 +2065,11 @@ public function test_wp_get_default_extension_for_mime_type() {
 		$this->assertFalse( wp_get_default_extension_for_mime_type( null ), 'false not returned when null as mime type supplied' );
 	}
 
-	/**
-	 * @ticket 49412
-	 * @covers ::wp_filesize
-	 */
-	function test_wp_filesize_with_nonexistent_file() {
-		$file = 'nonexistent/file.jpg';
-		$this->assertSame( 0, wp_filesize( $file ) );
-	}
-
-	/**
-	 * @ticket 49412
-	 * @covers ::wp_filesize
-	 */
-	function test_wp_filesize() {
-		$file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
-
-		$this->assertSame( filesize( $file ), wp_filesize( $file ) );
-
-		$filter = function() {
-			return 999;
-		};
-
-		add_filter( 'wp_filesize', $filter );
-
-		$this->assertSame( 999, wp_filesize( $file ) );
-
-		$pre_filter = function() {
-			return 111;
-		};
-
-		add_filter( 'pre_wp_filesize', $pre_filter );
-
-		$this->assertSame( 111, wp_filesize( $file ) );
-	}
-
 	/**
 	 * @ticket 55505
 	 * @covers ::wp_recursive_ksort
 	 */
-	function test_wp_recursive_ksort() {
+	public function test_wp_recursive_ksort() {
 		// Create an array to test.
 		$theme_json = array(
 			'version'  => 1,
diff --git a/tests/phpunit/tests/functions/anonymization.php b/tests/phpunit/tests/functions/anonymization.php
index 3e0cea6fa7268..a7849ddf46152 100644
--- a/tests/phpunit/tests/functions/anonymization.php
+++ b/tests/phpunit/tests/functions/anonymization.php
@@ -5,12 +5,6 @@
  * @package WordPress\UnitTests
  *
  * @since 4.9.6
- */
-
-/**
- * Class Tests_Functions_Anonymization.
- *
- * @since 4.9.6
  *
  * @group functions.php
  * @group privacy
diff --git a/tests/phpunit/tests/functions/deprecated.php b/tests/phpunit/tests/functions/deprecated.php
deleted file mode 100644
index b1d4a9f6e7bc9..0000000000000
--- a/tests/phpunit/tests/functions/deprecated.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * Test cases for deprecated functions, arguments, and files
- *
- * @package WordPress
- * @subpackage Unit Tests
- *
- * @since 3.5.0
- *
- * @group functions.php
- * @group deprecated
- */
-class Tests_Functions_Deprecated extends WP_UnitTestCase {
-
-	/**
-	 * List of functions that have been passed through _deprecated_function().
-	 *
-	 * @var string[]
-	 */
-	protected $_deprecated_functions = array();
-
-	/**
-	 * List of arguments that have been passed through _deprecated_argument().
-	 *
-	 * @var string[]
-	 */
-	protected $_deprecated_arguments = array();
-
-	/**
-	 * List of files that have been passed through _deprecated_file().
-	 *
-	 * @var string[]
-	 */
-	protected $_deprecated_files = array();
-
-	/**
-	 * Sets up the test fixture.
-	 */
-	public function set_up() {
-		parent::set_up();
-		$this->_deprecated_functions = array();
-		$this->_deprecated_arguments = array();
-		$this->_deprecated_files     = array();
-		add_action( 'deprecated_function_run', array( $this, 'deprecated_function' ), 10, 3 );
-		add_action( 'deprecated_function_trigger_error', '__return_false' );
-		add_action( 'deprecated_argument_run', array( $this, 'deprecated_argument' ), 10, 3 );
-		add_action( 'deprecated_argument_trigger_error', '__return_false' );
-		add_action( 'deprecated_file_included', array( $this, 'deprecated_file' ), 10, 4 );
-		add_action( 'deprecated_file_trigger_error', '__return_false' );
-	}
-
-	/**
-	 * Tears down the test fixture.
-	 */
-	public function tear_down() {
-		remove_action( 'deprecated_function_run', array( $this, 'deprecated_function' ), 10, 3 );
-		remove_action( 'deprecated_function_trigger_error', '__return_false' );
-		remove_action( 'deprecated_argument_run', array( $this, 'deprecated_argument' ), 10, 3 );
-		remove_action( 'deprecated_argument_trigger_error', '__return_false' );
-		remove_action( 'deprecated_file_included', array( $this, 'deprecated_argument' ), 10, 4 );
-		remove_action( 'deprecated_file_trigger_error', '__return_false' );
-		parent::tear_down();
-	}
-
-	/**
-	 * Catches functions that have passed through _deprecated_function().
-	 *
-	 * @param string $function
-	 * @param string $replacement
-	 * @param float $version
-	 */
-	public function deprecated_function( $function, $replacement, $version ) {
-		$this->_deprecated_functions[] = array(
-			'function'    => $function,
-			'replacement' => $replacement,
-			'version'     => $version,
-		);
-	}
-
-	/**
-	 * Catches arguments that have passed through _deprecated_argument().
-	 *
-	 * @param string $argument
-	 * @param string $message
-	 * @param float $version
-	 */
-	public function deprecated_argument( $argument, $message, $version ) {
-		$this->_deprecated_arguments[] = array(
-			'argument' => $argument,
-			'message'  => $message,
-			'version'  => $version,
-		);
-	}
-
-	/**
-	 * Catches arguments that have passed through _deprecated_argument().
-	 *
-	 * @param string $argument
-	 * @param string $message
-	 * @param float $version
-	 */
-	public function deprecated_file( $file, $version, $replacement, $message ) {
-		$this->_deprecated_files[] = array(
-			'file'        => $file,
-			'version'     => $version,
-			'replacement' => $replacement,
-			'message'     => $message,
-		);
-	}
-
-	/**
-	 * Checks if something was deprecated.
-	 *
-	 * @param string $type argument|function|file
-	 * @param string $name
-	 * @return array|false
-	 */
-	protected function was_deprecated( $type, $name ) {
-		switch ( $type ) {
-			case 'argument':
-				$search = $this->_deprecated_arguments;
-				$key    = 'argument';
-				break;
-			case 'function':
-				$search = $this->_deprecated_functions;
-				$key    = 'function';
-				break;
-			default:
-				$search = $this->_deprecated_files;
-				$key    = 'file';
-		}
-		foreach ( $search as $v ) {
-			if ( $name === $v[ $key ] ) {
-				return $v;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Tests that wp_save_image_file() has a deprecated argument when passed a GD resource.
-	 *
-	 * @ticket 6821
-	 * @expectedDeprecated wp_save_image_file
-	 * @requires function imagejpeg
-	 *
-	 * @covers ::wp_save_image_file
-	 */
-	public function test_wp_save_image_file_deprecated_with_gd_resource() {
-		// Call wp_save_image_file().
-		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
-		$file = wp_tempnam();
-		$img  = imagecreatefromjpeg( DIR_TESTDATA . '/images/canola.jpg' );
-		wp_save_image_file( $file, $img, 'image/jpeg', 1 );
-		imagedestroy( $img );
-		unlink( $file );
-
-		// Check if the arg was deprecated.
-		$check = $this->was_deprecated( 'argument', 'wp_save_image_file' );
-		$this->assertNotEmpty( $check );
-	}
-
-	/**
-	 * Tests that wp_save_image_file() doesn't have a deprecated argument when passed a WP_Image_Editor.
-	 *
-	 * @ticket 6821
-	 * @requires function imagejpeg
-	 *
-	 * @covers ::wp_save_image_file
-	 */
-	public function test_wp_save_image_file_not_deprecated_with_wp_image_editor() {
-		// Call wp_save_image_file().
-		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
-		$file = wp_tempnam();
-		$img  = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
-		wp_save_image_file( $file, $img, 'image/jpeg', 1 );
-		unset( $img );
-		unlink( $file );
-
-		// Check if the arg was deprecated.
-		$check = $this->was_deprecated( 'argument', 'wp_save_image_file' );
-		$this->assertFalse( $check );
-	}
-}
diff --git a/tests/phpunit/tests/functions/doEnclose.php b/tests/phpunit/tests/functions/doEnclose.php
index 6c06f35182fa9..5611878bd258b 100644
--- a/tests/phpunit/tests/functions/doEnclose.php
+++ b/tests/phpunit/tests/functions/doEnclose.php
@@ -1,16 +1,11 @@
 <?php
+
 /**
  * Test cases for the `do_enclose()` function.
  *
  * @package WordPress\UnitTests
  *
  * @since 5.3.0
- */
-
-/**
- * Tests_Functions_DoEnclose class.
- *
- * @since 5.3.0
  *
  * @group functions.php
  * @group post
@@ -33,7 +28,7 @@ public function set_up() {
 	 *
 	 * @since 5.3.0
 	 *
-	 * @dataProvider data_test_do_enclose
+	 * @dataProvider data_do_enclose
 	 */
 	public function test_function_with_explicit_content_input( $content, $expected ) {
 		$post_id = self::factory()->post->create();
@@ -49,7 +44,7 @@ public function test_function_with_explicit_content_input( $content, $expected )
 	 *
 	 * @since 5.3.0
 	 *
-	 * @dataProvider data_test_do_enclose
+	 * @dataProvider data_do_enclose
 	 */
 	public function test_function_with_implicit_content_input( $content, $expected ) {
 		$post_id = self::factory()->post->create(
@@ -77,7 +72,7 @@ public function test_function_with_implicit_content_input( $content, $expected )
 	 *     }
 	 * }
 	 */
-	public function data_test_do_enclose() {
+	public function data_do_enclose() {
 		return array(
 			'null'                  => array(
 				'content'  => null,
@@ -149,7 +144,7 @@ public function test_function_should_return_false_when_invalid_post_id() {
 	 * @since 5.3.0
 	 */
 	public function test_function_should_delete_enclosed_link_when_no_longer_in_post_content() {
-		$data = $this->data_test_do_enclose();
+		$data = $this->data_do_enclose();
 
 		// Create a post with a single movie link.
 		$post_id = self::factory()->post->create(
@@ -183,7 +178,7 @@ public function test_function_should_delete_enclosed_link_when_no_longer_in_post
 	 * @since 5.3.0
 	 */
 	public function test_function_should_support_post_object_input() {
-		$data = $this->data_test_do_enclose();
+		$data = $this->data_do_enclose();
 
 		$post_object = self::factory()->post->create_and_get(
 			array(
@@ -203,7 +198,7 @@ public function test_function_should_support_post_object_input() {
 	 * @since 5.3.0
 	 */
 	public function test_function_enclosure_links_should_be_filterable() {
-		$data = $this->data_test_do_enclose();
+		$data = $this->data_do_enclose();
 
 		$post_id = self::factory()->post->create(
 			array(
@@ -254,25 +249,25 @@ protected function get_enclosed_by_post_id( $post_id ) {
 	 *
 	 * @since 5.3.0
 	 *
-	 * @param bool   $false     False.
-	 * @param array  $arguments Request arguments.
-	 * @param string $url       Request URL.
-	 * @return array            Header.
+	 * @param false|array|WP_Error $response    A preemptive return value of an HTTP request. Default false.
+	 * @param array                $parsed_args HTTP request arguments.
+	 * @param string               $url         The request URL.
+	 * @return array Response data.
 	 */
-	public function mock_http_request( $false, $arguments, $url ) {
+	public function mock_http_request( $response, $parsed_args, $url ) {
 
 		// Video and audio headers.
 		$fake_headers = array(
 			'mp4' => array(
 				'headers' => array(
-					'content-length' => 123,
-					'content-type'   => 'video/mp4',
+					'Content-Length' => 123,
+					'Content-Type'   => 'video/mp4',
 				),
 			),
 			'ogg' => array(
 				'headers' => array(
-					'content-length' => 321,
-					'content-type'   => 'audio/ogg',
+					'Content-Length' => 321,
+					'Content-Type'   => 'audio/ogg',
 				),
 			),
 		);
@@ -289,8 +284,8 @@ public function mock_http_request( $false, $arguments, $url ) {
 		// Fallback header.
 		return array(
 			'headers' => array(
-				'content-length' => 0,
-				'content-type'   => '',
+				'Content-Length' => 0,
+				'Content-Type'   => '',
 			),
 		);
 	}
diff --git a/tests/phpunit/tests/functions/getNonCachedIds.php b/tests/phpunit/tests/functions/getNonCachedIds.php
new file mode 100644
index 0000000000000..07943bbdc844f
--- /dev/null
+++ b/tests/phpunit/tests/functions/getNonCachedIds.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Test class for `_get_non_cached_ids()`.
+ *
+ * @package WordPress
+ *
+ * @group cache
+ *
+ * @covers ::_get_non_cached_ids
+ * @covers ::_validate_cache_id
+ */
+class Tests_Functions_GetNonCachedIds extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 57593
+	 */
+	public function test_uncached_valid_ids_should_be_unique() {
+		$object_id = 1;
+
+		$this->assertSame(
+			array( $object_id ),
+			_get_non_cached_ids( array( $object_id, $object_id, (string) $object_id ), 'fake-group' ),
+			'Duplicate object IDs should be removed.'
+		);
+	}
+
+	/**
+	 * @ticket 57593
+	 *
+	 * @dataProvider data_valid_ids_should_be_returned_as_integers
+	 *
+	 * @param mixed $object_id The object ID.
+	 */
+	public function test_valid_ids_should_be_returned_as_integers( $object_id ) {
+		$this->assertSame(
+			array( (int) $object_id ),
+			_get_non_cached_ids( array( $object_id ), 'fake-group' ),
+			'Object IDs should be returned as integers.'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_valid_ids_should_be_returned_as_integers() {
+		return array(
+			'(int) 1'    => array( 1 ),
+			'(string) 1' => array( '1' ),
+		);
+	}
+
+	/**
+	 * @ticket 57593
+	 */
+	public function test_mix_of_valid_and_invalid_ids_should_return_the_valid_ids_and_throw_a_notice() {
+		$object_id = 1;
+
+		$this->setExpectedIncorrectUsage( '_get_non_cached_ids' );
+		$this->assertSame(
+			array( $object_id ),
+			_get_non_cached_ids( array( $object_id, null ), 'fake-group' ),
+			'Valid object IDs should be returned.'
+		);
+	}
+
+	/**
+	 * @ticket 57593
+	 *
+	 * @dataProvider data_invalid_cache_ids_should_throw_a_notice
+	 *
+	 * @param mixed $object_id The object ID.
+	 */
+	public function test_invalid_cache_ids_should_throw_a_notice( $object_id ) {
+		$this->setExpectedIncorrectUsage( '_get_non_cached_ids' );
+		$this->assertSame(
+			array(),
+			_get_non_cached_ids( array( $object_id ), 'fake-group' ),
+			'Invalid object IDs should be dropped.'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_invalid_cache_ids_should_throw_a_notice() {
+		return array(
+			'null'         => array( null ),
+			'false'        => array( false ),
+			'true'         => array( true ),
+			'(float) 1.0'  => array( 1.0 ),
+			'(string) 5.0' => array( '5.0' ),
+			'string'       => array( 'johnny cache' ),
+			'empty string' => array( '' ),
+			'array'        => array( array( 1 ) ),
+			'empty array'  => array( array() ),
+			'stdClass'     => array( new stdClass() ),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/functions/getStatusHeaderDesc.php b/tests/phpunit/tests/functions/getStatusHeaderDesc.php
index a7b253fcdd69c..c3826c5dc8801 100644
--- a/tests/phpunit/tests/functions/getStatusHeaderDesc.php
+++ b/tests/phpunit/tests/functions/getStatusHeaderDesc.php
@@ -11,7 +11,7 @@
 class Tests_Functions_GetStatusHeaderDesc extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider _status_strings
+	 * @dataProvider data_get_status_header_desc
 	 *
 	 * @param int    $code     HTTP status code.
 	 * @param string $expected Status description.
@@ -25,7 +25,7 @@ public function test_get_status_header_desc( $code, $expected ) {
 	 *
 	 * @return array
 	 */
-	public function _status_strings() {
+	public function data_get_status_header_desc() {
 		return array(
 			array( 200, 'OK' ),
 			array( 301, 'Moved Permanently' ),
diff --git a/tests/phpunit/tests/functions/isNewDay.php b/tests/phpunit/tests/functions/isNewDay.php
index 3201717fe0dde..f852c8908faba 100644
--- a/tests/phpunit/tests/functions/isNewDay.php
+++ b/tests/phpunit/tests/functions/isNewDay.php
@@ -11,7 +11,7 @@ class Tests_Functions_IsNewDate extends WP_UnitTestCase {
 
 	/**
 	 * @ticket 46627
-	 * @dataProvider _data_is_new_date
+	 * @dataProvider data_is_new_date
 	 *
 	 * @param string $currentday_string  The day of the current post in the loop.
 	 * @param string $previousday_string The day of the previous post in the loop.
@@ -26,7 +26,7 @@ public function test_is_new_date( $currentday_string, $previousday_string, $expe
 		$this->assertSame( $expected, is_new_day() );
 	}
 
-	public function _data_is_new_date() {
+	public function data_is_new_date() {
 		return array(
 			array( '21.05.19', '21.05.19', 0 ),
 			array( '21.05.19', '20.05.19', 1 ),
diff --git a/tests/phpunit/tests/functions/listFiles.php b/tests/phpunit/tests/functions/listFiles.php
index a70a05894010d..bfdd080f8bf71 100644
--- a/tests/phpunit/tests/functions/listFiles.php
+++ b/tests/phpunit/tests/functions/listFiles.php
@@ -19,4 +19,63 @@ public function test_list_files_can_exclude_files() {
 		$admin_files = list_files( ABSPATH . 'wp-admin/', 100, array( 'index.php' ) );
 		$this->assertNotContains( ABSPATH . 'wp-admin/index.php', $admin_files );
 	}
+
+	/**
+	 * Tests that list_files() optionally includes hidden files.
+	 *
+	 * @ticket 53659
+	 *
+	 * @dataProvider data_list_files_should_optionally_include_hidden_files
+	 *
+	 * @param string   $filename       The name of the hidden file.
+	 * @param bool     $include_hidden Whether to include hidden ("." prefixed) files.
+	 * @param string[] $exclusions     List of folders and files to skip.
+	 * @param bool     $expected       Whether the file should be included in the results.
+	 */
+	public function test_list_files_should_optionally_include_hidden_files( $filename, $include_hidden, $exclusions, $expected ) {
+		$test_dir    = get_temp_dir() . 'test-list-files/';
+		$hidden_file = $test_dir . $filename;
+
+		mkdir( $test_dir );
+		touch( $hidden_file );
+
+		$actual = list_files( $test_dir, 100, $exclusions, $include_hidden );
+
+		unlink( $hidden_file );
+		rmdir( $test_dir );
+
+		if ( $expected ) {
+			$this->assertContains( $hidden_file, $actual, 'The file was not included.' );
+		} else {
+			$this->assertNotContains( $hidden_file, $actual, 'The file was included.' );
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_list_files_should_optionally_include_hidden_files() {
+		return array(
+			'$include_hidden = false and no exclusions' => array(
+				'filename'       => '.hidden_file',
+				'include_hidden' => false,
+				'exclusions'     => array(),
+				'expected'       => false,
+			),
+			'$include_hidden = true and no exclusions'  => array(
+				'filename'       => '.hidden_file',
+				'include_hidden' => true,
+				'exclusions'     => array(),
+				'expected'       => true,
+			),
+			'$include_hidden = true and an excluded filename' => array(
+				'filename'       => '.hidden_file',
+				'include_hidden' => true,
+				'exclusions'     => array( '.hidden_file' ),
+				'expected'       => false,
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/functions/maybeSerialize.php b/tests/phpunit/tests/functions/maybeSerialize.php
index 104c1b1134374..e8986d9818fa3 100644
--- a/tests/phpunit/tests/functions/maybeSerialize.php
+++ b/tests/phpunit/tests/functions/maybeSerialize.php
@@ -213,9 +213,9 @@ public function data_is_not_serialized() {
 	public function test_deserialize_request_utility_filtered_iterator_objects( $value ) {
 		$serialized = maybe_serialize( $value );
 
-		if ( get_class( $value ) === 'Requests_Utility_FilteredIterator' ) {
+		if ( get_class( $value ) === 'WpOrg\Requests\Utility\FilteredIterator' ) {
 			$new_value = unserialize( $serialized );
-			$property  = ( new ReflectionClass( 'Requests_Utility_FilteredIterator' ) )->getProperty( 'callback' );
+			$property  = ( new ReflectionClass( 'WpOrg\Requests\Utility\FilteredIterator' ) )->getProperty( 'callback' );
 			$property->setAccessible( true );
 			$callback_value = $property->getValue( $new_value );
 
@@ -233,10 +233,10 @@ public function test_deserialize_request_utility_filtered_iterator_objects( $val
 	public function data_serialize_deserialize_objects() {
 		return array(
 			'filtered iterator using md5'  => array(
-				new Requests_Utility_FilteredIterator( array( 1 ), 'md5' ),
+				new WpOrg\Requests\Utility\FilteredIterator( array( 1 ), 'md5' ),
 			),
 			'filtered iterator using sha1' => array(
-				new Requests_Utility_FilteredIterator( array( 1, 2 ), 'sha1' ),
+				new WpOrg\Requests\Utility\FilteredIterator( array( 1, 2 ), 'sha1' ),
 			),
 			'array iterator'               => array(
 				new ArrayIterator( array( 1, 2, 3 ) ),
diff --git a/tests/phpunit/tests/functions/referer.php b/tests/phpunit/tests/functions/referer.php
index b1d113afcf5c9..0abe528c48151 100644
--- a/tests/phpunit/tests/functions/referer.php
+++ b/tests/phpunit/tests/functions/referer.php
@@ -156,4 +156,12 @@ public function test_raw_referer_both() {
 		$_REQUEST['_wp_http_referer'] = addslashes( 'http://foo.bar/baz' );
 		$this->assertSame( 'http://foo.bar/baz', wp_get_raw_referer() );
 	}
+
+	/**
+	 * @ticket 57670
+	 */
+	public function test_raw_referer_is_false_on_invalid_request_parameter() {
+		$_REQUEST['_wp_http_referer'] = array( 'demo' );
+		$this->assertFalse( wp_get_raw_referer() );
+	}
 }
diff --git a/tests/phpunit/tests/functions/removeQueryArg.php b/tests/phpunit/tests/functions/removeQueryArg.php
index b8130abe8dedd..8d05a6c230b2c 100644
--- a/tests/phpunit/tests/functions/removeQueryArg.php
+++ b/tests/phpunit/tests/functions/removeQueryArg.php
@@ -7,7 +7,7 @@
 class Tests_Functions_RemoveQueryArg extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider remove_query_arg_provider
+	 * @dataProvider data_remove_query_arg
 	 */
 	public function test_remove_query_arg( $keys_to_remove, $url, $expected ) {
 		$actual = remove_query_arg( $keys_to_remove, $url );
@@ -16,7 +16,7 @@ public function test_remove_query_arg( $keys_to_remove, $url, $expected ) {
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function remove_query_arg_provider() {
+	public function data_remove_query_arg() {
 		return array(
 			array( 'foo', 'edit.php?foo=test1&baz=test1', 'edit.php?baz=test1' ),
 			array( array( 'foo' ), 'edit.php?foo=test2&baz=test2', 'edit.php?baz=test2' ),
diff --git a/tests/phpunit/tests/functions/sizeFormat.php b/tests/phpunit/tests/functions/sizeFormat.php
index 1337bb39c8087..bed09d15aaf1b 100644
--- a/tests/phpunit/tests/functions/sizeFormat.php
+++ b/tests/phpunit/tests/functions/sizeFormat.php
@@ -12,67 +12,67 @@
  */
 class Tests_Functions_SizeFormat extends WP_UnitTestCase {
 
-	public function _data_size_format() {
+	public function data_size_format() {
 		return array(
-			// Invalid values
+			// Invalid values.
 			array( array(), 0, false ),
 			array( 'baba', 0, false ),
 			array( '', 0, false ),
 			array( '-1', 0, false ),
 			array( -1, 0, false ),
-			// Bytes
+			// Bytes.
 			array( 0, 0, '0 B' ),
 			array( 1, 0, '1 B' ),
 			array( 1023, 0, '1,023 B' ),
-			// Kilobytes
+			// Kilobytes.
 			array( KB_IN_BYTES, 0, '1 KB' ),
 			array( KB_IN_BYTES, 2, '1.00 KB' ),
 			array( 2.5 * KB_IN_BYTES, 0, '3 KB' ),
 			array( 2.5 * KB_IN_BYTES, 2, '2.50 KB' ),
 			array( 10 * KB_IN_BYTES, 0, '10 KB' ),
-			// Megabytes
+			// Megabytes.
 			array( (string) 1024 * KB_IN_BYTES, 2, '1.00 MB' ),
 			array( MB_IN_BYTES, 0, '1 MB' ),
 			array( 2.5 * MB_IN_BYTES, 0, '3 MB' ),
 			array( 2.5 * MB_IN_BYTES, 2, '2.50 MB' ),
-			// Gigabytes
+			// Gigabytes.
 			array( (string) 1024 * MB_IN_BYTES, 2, '1.00 GB' ),
 			array( GB_IN_BYTES, 0, '1 GB' ),
 			array( 2.5 * GB_IN_BYTES, 0, '3 GB' ),
 			array( 2.5 * GB_IN_BYTES, 2, '2.50 GB' ),
-			// Terabytes
+			// Terabytes.
 			array( (string) 1024 * GB_IN_BYTES, 2, '1.00 TB' ),
 			array( TB_IN_BYTES, 0, '1 TB' ),
 			array( 2.5 * TB_IN_BYTES, 0, '3 TB' ),
 			array( 2.5 * TB_IN_BYTES, 2, '2.50 TB' ),
-			// Petabytes
+			// Petabytes.
 			array( (string) 1024 * TB_IN_BYTES, 2, '1.00 PB' ),
 			array( PB_IN_BYTES, 0, '1 PB' ),
 			array( 2.5 * PB_IN_BYTES, 0, '3 PB' ),
 			array( 2.5 * PB_IN_BYTES, 2, '2.50 PB' ),
-			// Exabytes
+			// Exabytes.
 			array( (string) 1024 * PB_IN_BYTES, 2, '1.00 EB' ),
 			array( EB_IN_BYTES, 0, '1 EB' ),
 			array( 2.5 * EB_IN_BYTES, 0, '3 EB' ),
 			array( 2.5 * EB_IN_BYTES, 2, '2.50 EB' ),
-			// Zettabytes
+			// Zettabytes.
 			array( (string) 1024 * EB_IN_BYTES, 2, '1.00 ZB' ),
 			array( ZB_IN_BYTES, 0, '1 ZB' ),
 			array( 2.5 * ZB_IN_BYTES, 0, '3 ZB' ),
 			array( 2.5 * ZB_IN_BYTES, 2, '2.50 ZB' ),
-			// Yottabytes
+			// Yottabytes.
 			array( (string) 1024 * ZB_IN_BYTES, 2, '1.00 YB' ),
 			array( YB_IN_BYTES, 0, '1 YB' ),
 			array( 2.5 * YB_IN_BYTES, 0, '3 YB' ),
 			array( 2.5 * YB_IN_BYTES, 2, '2.50 YB' ),
-			// Edge values
+			// Edge values.
 			array( TB_IN_BYTES + ( TB_IN_BYTES / 2 ) + MB_IN_BYTES, 1, '1.5 TB' ),
 			array( TB_IN_BYTES - MB_IN_BYTES - KB_IN_BYTES, 3, '1,023.999 GB' ),
 		);
 	}
 
 	/**
-	 * @dataProvider _data_size_format
+	 * @dataProvider data_size_format
 	 *
 	 * @param $bytes
 	 * @param $decimals
diff --git a/tests/phpunit/tests/functions/wpCheckFiletype.php b/tests/phpunit/tests/functions/wpCheckFiletype.php
new file mode 100644
index 0000000000000..ad947c628b253
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpCheckFiletype.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * Tests for wp_check_filetype().
+ *
+ * @group functions.php
+ * @group upload
+ *
+ * @covers ::wp_check_filetype
+ */
+class Tests_Functions_WpCheckFiletype extends WP_UnitTestCase {
+
+	/**
+	 * Tests that wp_check_filetype() returns the correct extension and MIME type.
+	 *
+	 * @ticket 57151
+	 *
+	 * @dataProvider data_wp_check_filetype
+	 *
+	 * @param string     $filename   The filename to check.
+	 * @param array|null $mimes      An array of MIME types, or null.
+	 * @param array      $expected   An array containing the expected extension and MIME type.
+	 */
+	public function test_wp_check_filetype( $filename, $mimes, $expected ) {
+		$this->assertSame( $expected, wp_check_filetype( $filename, $mimes ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return[]
+	 */
+	public function data_wp_check_filetype() {
+		return array(
+			'.jpg filename and default allowed'       => array(
+				'filename' => 'canola.jpg',
+				'mimes'    => null,
+				'expected' => array(
+					'ext'  => 'jpg',
+					'type' => 'image/jpeg',
+				),
+			),
+			'.jpg filename and jpg|jpeg|jpe'          => array(
+				'filename' => 'canola.jpg',
+				'mimes'    => array(
+					'jpg|jpeg|jpe' => 'image/jpeg',
+					'gif'          => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => 'jpg',
+					'type' => 'image/jpeg',
+				),
+			),
+			'.jpeg filename and jpg|jpeg|jpe'         => array(
+				'filename' => 'canola.jpeg',
+				'mimes'    => array(
+					'jpg|jpeg|jpe' => 'image/jpeg',
+					'gif'          => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => 'jpeg',
+					'type' => 'image/jpeg',
+				),
+			),
+			'.jpe filename and jpg|jpeg|jpe'          => array(
+				'filename' => 'canola.jpe',
+				'mimes'    => array(
+					'jpg|jpeg|jpe' => 'image/jpeg',
+					'gif'          => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => 'jpe',
+					'type' => 'image/jpeg',
+				),
+			),
+			'uppercase filename and jpg|jpeg|jpe'     => array(
+				'filename' => 'canola.JPG',
+				'mimes'    => array(
+					'jpg|jpeg|jpe' => 'image/jpeg',
+					'gif'          => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => 'JPG',
+					'type' => 'image/jpeg',
+				),
+			),
+			'.XXX filename and no matching MIME type' => array(
+				'filename' => 'canola.XXX',
+				'mimes'    => array(
+					'jpg|jpeg|jpe' => 'image/jpeg',
+					'gif'          => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => false,
+					'type' => false,
+				),
+			),
+			'.jpg filename but only gif allowed'      => array(
+				'filename' => 'canola.jpg',
+				'mimes'    => array(
+					'gif' => 'image/gif',
+				),
+				'expected' => array(
+					'ext'  => false,
+					'type' => false,
+				),
+			),
+
+		);
+	}
+}
diff --git a/tests/phpunit/tests/functions/wpFilesize.php b/tests/phpunit/tests/functions/wpFilesize.php
new file mode 100644
index 0000000000000..f0e510ddc5943
--- /dev/null
+++ b/tests/phpunit/tests/functions/wpFilesize.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Tests for the wp_filesize() function.
+ *
+ * @group functions.php
+ * @covers ::wp_filesize
+ */
+class Tests_Functions_wpFilesize extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 49412
+	 */
+	public function test_wp_filesize() {
+		$file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
+
+		$this->assertSame( filesize( $file ), wp_filesize( $file ) );
+	}
+
+	/**
+	 * @ticket 49412
+	 */
+	public function test_wp_filesize_filters() {
+		$file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
+
+		add_filter(
+			'wp_filesize',
+			static function() {
+				return 999;
+			}
+		);
+
+		$this->assertSame( 999, wp_filesize( $file ) );
+
+		add_filter(
+			'pre_wp_filesize',
+			static function() {
+				return 111;
+			}
+		);
+
+		$this->assertSame( 111, wp_filesize( $file ) );
+	}
+
+	/**
+	 * @ticket 49412
+	 */
+	public function test_wp_filesize_with_nonexistent_file() {
+		$file = 'nonexistent/file.jpg';
+
+		$this->assertSame( 0, wp_filesize( $file ) );
+	}
+}
diff --git a/tests/phpunit/tests/functions/wpListFilter.php b/tests/phpunit/tests/functions/wpListFilter.php
index 45ea4f9601f6e..042325227e34e 100644
--- a/tests/phpunit/tests/functions/wpListFilter.php
+++ b/tests/phpunit/tests/functions/wpListFilter.php
@@ -9,19 +9,19 @@
 class Tests_Functions_wpListFilter extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider data_test_wp_list_filter
+	 * @dataProvider data_wp_list_filter
 	 *
-	 * @param array  $list     An array of objects to filter.
-	 * @param array  $args     An array of key => value arguments to match
-	 *                         against each object.
-	 * @param string $operator The logical operation to perform.
-	 * @param array  $expected Expected result.
+	 * @param array  $input_list An array of objects to filter.
+	 * @param array  $args       An array of key => value arguments to match
+	 *                           against each object.
+	 * @param string $operator   The logical operation to perform.
+	 * @param array  $expected   Expected result.
 	 */
-	public function test_wp_list_filter( $list, $args, $operator, $expected ) {
-		$this->assertEqualSetsWithIndex( $expected, wp_list_filter( $list, $args, $operator ) );
+	public function test_wp_list_filter( $input_list, $args, $operator, $expected ) {
+		$this->assertEqualSetsWithIndex( $expected, wp_list_filter( $input_list, $args, $operator ) );
 	}
 
-	public function data_test_wp_list_filter() {
+	public function data_wp_list_filter() {
 		return array(
 			'string instead of array'  => array(
 				'foo',
@@ -210,6 +210,20 @@ public function data_test_wp_list_filter() {
 					),
 				),
 			),
+			'string to int comparison' => array(
+				array(
+					(object) array(
+						'foo' => '1',
+					),
+				),
+				array( 'foo' => 1 ),
+				'AND',
+				array(
+					0 => (object) array(
+						'foo' => '1',
+					),
+				),
+			),
 		);
 	}
 }
diff --git a/tests/phpunit/tests/functions/wpListPluck.php b/tests/phpunit/tests/functions/wpListPluck.php
index 10c78ed9bd3ff..cb3c4bfe2789f 100644
--- a/tests/phpunit/tests/functions/wpListPluck.php
+++ b/tests/phpunit/tests/functions/wpListPluck.php
@@ -11,7 +11,18 @@ class Tests_Functions_wpListPluck extends WP_UnitTestCase {
 	public $array_list  = array();
 
 	public function set_up() {
-		parent::set_up();
+		/*
+		 * This method deliberately does not call parent::set_up(). Why?
+		 *
+		 * The call stack for WP_UnitTestCase_Base::set_up() includes a call to
+		 * WP_List_Util::pluck(), which creates an inaccurate coverage report
+		 * for this method.
+		 *
+		 * To ensure that deprecation and incorrect usage notices continue to be
+		 * detectable, this method uses WP_UnitTestCase_Base::expectDeprecated().
+		 */
+		$this->expectDeprecated();
+
 		$this->array_list['foo'] = array(
 			'name'   => 'foo',
 			'id'     => 'f',
@@ -193,18 +204,18 @@ public function test_wp_list_pluck_containing_references_keys() {
 	}
 
 	/**
-	 * @dataProvider data_test_wp_list_pluck
+	 * @dataProvider data_wp_list_pluck
 	 *
-	 * @param array      $list      List of objects or arrays.
-	 * @param int|string $field     Field from the object to place instead of the entire object
-	 * @param int|string $index_key Field from the object to use as keys for the new array.
-	 * @param array      $expected  Expected result.
+	 * @param array      $input_list List of objects or arrays.
+	 * @param int|string $field      Field from the object to place instead of the entire object
+	 * @param int|string $index_key  Field from the object to use as keys for the new array.
+	 * @param array      $expected   Expected result.
 	 */
-	public function test_wp_list_pluck( $list, $field, $index_key, $expected ) {
-		$this->assertSameSetsWithIndex( $expected, wp_list_pluck( $list, $field, $index_key ) );
+	public function test_wp_list_pluck( $input_list, $field, $index_key, $expected ) {
+		$this->assertSameSetsWithIndex( $expected, wp_list_pluck( $input_list, $field, $index_key ) );
 	}
 
-	public function data_test_wp_list_pluck() {
+	public function data_wp_list_pluck() {
 		return array(
 			'arrays'                         => array(
 				array(
diff --git a/tests/phpunit/tests/functions/wpListSort.php b/tests/phpunit/tests/functions/wpListSort.php
index 7159af4937687..63c495dd84841 100644
--- a/tests/phpunit/tests/functions/wpListSort.php
+++ b/tests/phpunit/tests/functions/wpListSort.php
@@ -9,17 +9,17 @@
 class Tests_Functions_wpListSort extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider data_test_wp_list_sort
+	 * @dataProvider data_wp_list_sort
 	 *
 	 * @param string|array $orderby Either the field name to order by or an array
-	 *                              of multiple orderby fields as $orderby => $order.
+	 *                              of multiple orderby fields as `$orderby => $order`.
 	 * @param string       $order   Either 'ASC' or 'DESC'.
 	 */
-	public function test_wp_list_sort( $list, $orderby, $order, $expected ) {
-		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order ) );
+	public function test_wp_list_sort( $input_list, $orderby, $order, $expected ) {
+		$this->assertSame( $expected, wp_list_sort( $input_list, $orderby, $order ) );
 	}
 
-	public function data_test_wp_list_sort() {
+	public function data_wp_list_sort() {
 		return array(
 			'single orderby ascending'        => array(
 				array(
@@ -334,17 +334,17 @@ public function data_test_wp_list_sort() {
 	}
 
 	/**
-	 * @dataProvider data_test_wp_list_sort_preserve_keys
+	 * @dataProvider data_wp_list_sort_preserve_keys
 	 *
 	 * @param string|array $orderby Either the field name to order by or an array
-	 *                              of multiple orderby fields as $orderby => $order.
+	 *                              of multiple orderby fields as `$orderby => $order`.
 	 * @param string       $order   Either 'ASC' or 'DESC'.
 	 */
-	public function test_wp_list_sort_preserve_keys( $list, $orderby, $order, $expected ) {
-		$this->assertSame( $expected, wp_list_sort( $list, $orderby, $order, true ) );
+	public function test_wp_list_sort_preserve_keys( $input_list, $orderby, $order, $expected ) {
+		$this->assertSame( $expected, wp_list_sort( $input_list, $orderby, $order, true ) );
 	}
 
-	public function data_test_wp_list_sort_preserve_keys() {
+	public function data_wp_list_sort_preserve_keys() {
 		return array(
 			'single orderby ascending'        => array(
 				array(
diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php
index e27831fc560a6..752ea1382caee 100644
--- a/tests/phpunit/tests/functions/wpListUtil.php
+++ b/tests/phpunit/tests/functions/wpListUtil.php
@@ -64,7 +64,8 @@ public function test_wp_list_util_get_output() {
 	 * @param array  $target_array The array to create the list from.
 	 * @param string $target_key   The key to pluck.
 	 * @param array  $expected     The expected array.
-	 * @param string $index_key    Optional. Field from the element to use as keys for the new array. Default null.
+	 * @param string $index_key    Optional. Field from the element to use as keys for the new array.
+	 *                             Default null.
 	 */
 	public function test_wp_list_util_pluck( $target_array, $target_key, $expected, $index_key = null ) {
 		$util   = new WP_List_Util( $target_array );
@@ -84,7 +85,7 @@ public function test_wp_list_util_pluck( $target_array, $target_key, $expected,
 	}
 
 	/**
-	 * Data provider for test_wp_list_util_pluck_simple().
+	 * Data provider for test_wp_list_util_pluck().
 	 *
 	 * @return array[]
 	 */
@@ -107,6 +108,65 @@ public function data_wp_list_util_pluck() {
 		);
 	}
 
+	/**
+	 * Tests that wp_list_pluck() throws _doing_it_wrong() with invalid input.
+	 *
+	 * @ticket 56650
+	 *
+	 * @dataProvider data_wp_list_pluck_should_throw_doing_it_wrong_with_invalid_input
+	 *
+	 * @covers WP_List_Util::pluck
+	 * @covers ::wp_list_pluck
+	 *
+	 * @expectedIncorrectUsage WP_List_Util::pluck
+	 *
+	 * @param array $input An invalid input array.
+	 */
+	public function test_wp_list_pluck_should_throw_doing_it_wrong_with_invalid_input( $input ) {
+		$this->assertSame( array(), wp_list_pluck( $input, 'a_field' ) );
+	}
+
+	/**
+	 * Tests that wp_list_pluck() throws _doing_it_wrong() with an index key and invalid input.
+	 *
+	 * @ticket 56650
+	 *
+	 * @dataProvider data_wp_list_pluck_should_throw_doing_it_wrong_with_invalid_input
+	 *
+	 * @covers WP_List_Util::pluck
+	 * @covers ::wp_list_pluck
+	 *
+	 * @expectedIncorrectUsage WP_List_Util::pluck
+	 *
+	 * @param array $input An invalid input array.
+	 */
+	public function test_wp_list_pluck_should_throw_doing_it_wrong_with_index_key_and_invalid_input( $input ) {
+		$this->assertSame( array(), wp_list_pluck( $input, 'a_field', 'an_index_key' ) );
+	}
+
+	/**
+	 * Data provider that provides invalid input arrays.
+	 *
+	 * @return array
+	 */
+	public function data_wp_list_pluck_should_throw_doing_it_wrong_with_invalid_input() {
+		return array(
+			'int[] 0'                   => array( array( 0 ) ),
+			'int[] 1'                   => array( array( 1 ) ),
+			'int[] -1'                  => array( array( -1 ) ),
+			'float[] 0.0'               => array( array( 0.0 ) ),
+			'float[] 1.0'               => array( array( 1.0 ) ),
+			'float[] -1.0'              => array( array( -1.0 ) ),
+			'string[] and empty string' => array( array( '' ) ),
+			'string[] and "0"'          => array( array( '0' ) ),
+			'string[] and "1"'          => array( array( '1' ) ),
+			'string[] and "-1"'         => array( array( '-1' ) ),
+			'array and null'            => array( array( null ) ),
+			'array and false'           => array( array( false ) ),
+			'array and true'            => array( array( true ) ),
+		);
+	}
+
 	/**
 	 * @ticket 55300
 	 *
@@ -150,15 +210,18 @@ public function test_wp_list_util_sort_simple() {
 	 * @dataProvider data_wp_list_util_sort_int_arrays
 	 * @dataProvider data_wp_list_util_sort_arrays_of_arrays
 	 * @dataProvider data_wp_list_util_sort_object_arrays
+	 * @dataProvider data_wp_list_util_sort_non_existent_orderby_fields
 	 *
 	 * @covers WP_List_Util::sort
 	 * @covers ::wp_list_sort
 	 *
 	 * @param array  $expected      The expected array.
 	 * @param array  $target_array  The array to create a list from.
-	 * @param array  $orderby       Optional. Either the field name to order by or an array of multiple orderby fields as $orderby => $order.
+	 * @param array  $orderby       Optional. Either the field name to order by or an array
+	 *                              of multiple orderby fields as `$orderby => $order`.
 	 *                              Default empty array.
-	 * @param string $order         Optional. Either 'ASC' or 'DESC'. Only used if $orderby is a string. Default 'ASC'.
+	 * @param string $order         Optional. Either 'ASC' or 'DESC'. Only used if `$orderby`
+	 *                              is a string. Default 'ASC'.
 	 * @param bool   $preserve_keys Optional. Whether to preserve keys. Default false.
 	 */
 	public function test_wp_list_util_sort( $expected, $target_array, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
@@ -940,52 +1003,11 @@ public function data_wp_list_util_sort_object_arrays() {
 	}
 
 	/**
-	 * Tests non-existent '$orderby' fields.
-	 *
-	 * In PHP < 7.0.0, the sorting behavior is different, which Core does not
-	 * currently handle. Until this is fixed, or the minimum PHP version is
-	 * raised to PHP 7.0.0+, these tests will be skipped on PHP < 7.0.0.
-	 *
-	 * @ticket 55300
-	 *
-	 * @dataProvider data_wp_list_util_sort_php_7_or_greater
-	 *
-	 * @covers WP_List_Util::sort
-	 * @covers ::wp_list_sort
-	 *
-	 * @param array  $expected      The expected array.
-	 * @param array  $target_array  The array to create a list from.
-	 * @param array  $orderby       Optional. Either the field name to order by or an array of multiple orderby fields as $orderby => $order.
-	 *                              Default empty array.
-	 * @param string $order         Optional. Either 'ASC' or 'DESC'. Only used if $orderby is a string. Default 'ASC'.
-	 * @param bool   $preserve_keys Optional. Whether to preserve keys. Default false.
-	 */
-	public function test_wp_list_util_sort_php_7_or_greater( $expected, $target_array, $orderby = array(), $order = 'ASC', $preserve_keys = false ) {
-		if ( version_compare( PHP_VERSION, '7.0.0', '<' ) ) {
-			$this->markTestSkipped( 'This test can only run on PHP 7.0 or greater due to an unstable sort order.' );
-		}
-
-		$util   = new WP_List_Util( $target_array );
-		$actual = $util->sort( $orderby, $order, $preserve_keys );
-
-		$this->assertEqualSetsWithIndex(
-			$expected,
-			$actual,
-			'The sorted value did not match the expected value.'
-		);
-		$this->assertEqualSetsWithIndex(
-			$expected,
-			$util->get_output(),
-			'::get_output() did not return the expected value.'
-		);
-	}
-
-	/**
-	 * Data provider for test_wp_list_util_sort_php_7_or_greater().
+	 * Data provider for test_wp_list_util_sort().
 	 *
 	 * @return array[]
 	 */
-	public function data_wp_list_util_sort_php_7_or_greater() {
+	public function data_wp_list_util_sort_non_existent_orderby_fields() {
 		return array(
 			'int[], int keys, $orderby a non-existent field, $order = ASC and $preserve_keys = false' => array(
 				'expected'      => array( 4, 2, 3, 1 ),
diff --git a/tests/phpunit/tests/functions/wpNonceField.php b/tests/phpunit/tests/functions/wpNonceField.php
index ec2c68727d33b..78116f01e5c69 100644
--- a/tests/phpunit/tests/functions/wpNonceField.php
+++ b/tests/phpunit/tests/functions/wpNonceField.php
@@ -14,9 +14,11 @@ class Tests_Functions_wpNonceField extends WP_UnitTestCase {
 	 * @ticket 55578
 	 */
 	public function test_wp_nonce_field() {
-
 		wp_nonce_field();
-		$this->expectOutputRegex( '#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" /><input type="hidden" name="_wp_http_referer" value="" />$#' );
+		$this->expectOutputRegex(
+			'#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" />' .
+			'<input type="hidden" name="_wp_http_referer" value="" />$#'
+		);
 	}
 
 	/**
@@ -24,14 +26,18 @@ public function test_wp_nonce_field() {
 	 *
 	 * @dataProvider data_wp_nonce_field
 	 *
-	 * @param int|string $action Action name.
-	 * @param string     $name Nonce name.
-	 * @param bool       $referer Whether to set the referer field fior validation.
-	 * @param string     $expected_reg_exp The expected regular expression.
+	 * @param int|string $action          Action name.
+	 * @param string     $name            Nonce name.
+	 * @param bool       $referer         Whether to set the referer field for validation.
+	 * @param string     $expected_regexp The expected regular expression.
 	 */
-	public function test_wp_nonce_field_return( $action, $name, $referer, $expected_reg_exp ) {
+	public function test_wp_nonce_field_return( $action, $name, $referer, $expected_regexp ) {
+		if ( -1 !== $action ) {
+			$nonce_value     = wp_create_nonce( $action );
+			$expected_regexp = str_replace( '%%NONCE_VALUE%%', $nonce_value, $expected_regexp );
+		}
 
-		$this->assertMatchesRegularExpression( $expected_reg_exp, wp_nonce_field( $action, $name, $referer, false ) );
+		$this->assertMatchesRegularExpression( $expected_regexp, wp_nonce_field( $action, $name, $referer, false ) );
 	}
 
 	/**
@@ -40,37 +46,44 @@ public function test_wp_nonce_field_return( $action, $name, $referer, $expected_
 	 * @return array
 	 */
 	public function data_wp_nonce_field() {
-
 		return array(
 			'default'     => array(
-				'action'           => - 1,
-				'name'             => '_wpnonce',
-				'referer'          => true,
-				'expected_reg_exp' => '#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" /><input type="hidden" name="_wp_http_referer" value="" />$#',
-			),
-			'nonce_name'  => array(
-				'action'           => - 1,
-				'name'             => 'nonce_name',
-				'referer'          => true,
-				'expected_reg_exp' => '#^<input type="hidden" id="nonce_name" name="nonce_name" value=".{10}" /><input type="hidden" name="_wp_http_referer" value="" />$#',
+				'action'          => -1,
+				'name'            => '_wpnonce',
+				'referer'         => true,
+				'expected_regexp' =>
+					'#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" />' .
+					'<input type="hidden" name="_wp_http_referer" value="" />$#',
 			),
 			'action_name' => array(
-				'action'           => 'action_name',
-				'name'             => '_wpnonce',
-				'referer'          => true,
-				'expected_reg_exp' => '#^<input type="hidden" id="_wpnonce" name="_wpnonce" value="' . wp_create_nonce( 'action_name' ) . '" /><input type="hidden" name="_wp_http_referer" value="" />$#',
+				'action'          => 'action_name',
+				'name'            => '_wpnonce',
+				'referer'         => true,
+				'expected_regexp' =>
+					'#^<input type="hidden" id="_wpnonce" name="_wpnonce" value="%%NONCE_VALUE%%" />' .
+					'<input type="hidden" name="_wp_http_referer" value="" />$#',
+			),
+			'nonce_name'  => array(
+				'action'          => -1,
+				'name'            => 'nonce_name',
+				'referer'         => true,
+				'expected_regexp' =>
+					'#^<input type="hidden" id="nonce_name" name="nonce_name" value=".{10}" />' .
+					'<input type="hidden" name="_wp_http_referer" value="" />$#',
 			),
 			'no_referer'  => array(
-				'action'           => - 1,
-				'name'             => '_wpnonce',
-				'referer'          => false,
-				'expected_reg_exp' => '#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" />$#',
+				'action'          => -1,
+				'name'            => '_wpnonce',
+				'referer'         => false,
+				'expected_regexp' =>
+					'#^<input type="hidden" id="_wpnonce" name="_wpnonce" value=".{10}" />$#',
 			),
 			'& in name'   => array(
-				'action'           => - 1,
-				'name'             => 'a&b',
-				'referer'          => false,
-				'expected_reg_exp' => '#^<input type="hidden" id="a\&amp;b" name="a\&amp;b" value=".{10}" />$#',
+				'action'          => -1,
+				'name'            => 'a&b',
+				'referer'         => false,
+				'expected_regexp' =>
+					'#^<input type="hidden" id="a\&amp;b" name="a\&amp;b" value=".{10}" />$#',
 			),
 		);
 	}
diff --git a/tests/phpunit/tests/functions/wpRefererField.php b/tests/phpunit/tests/functions/wpRefererField.php
index 6442e7a0b9ad9..227fee71f41bd 100644
--- a/tests/phpunit/tests/functions/wpRefererField.php
+++ b/tests/phpunit/tests/functions/wpRefererField.php
@@ -14,8 +14,8 @@ class Tests_Functions_wpRefererField extends WP_UnitTestCase {
 	 * @ticket 55578
 	 */
 	public function test_wp_referer_field() {
-
 		$_SERVER['REQUEST_URI'] = '/test/';
+
 		wp_referer_field();
 		$this->expectOutputString( '<input type="hidden" name="_wp_http_referer" value="/test/" />' );
 	}
@@ -24,33 +24,32 @@ public function test_wp_referer_field() {
 	 * @ticket 55578
 	 */
 	public function test_wp_referer_field_return() {
-
 		$_SERVER['REQUEST_URI'] = '/test/';
 
 		$this->assertSame( '<input type="hidden" name="_wp_http_referer" value="/test/" />', wp_referer_field( false ) );
 	}
 
 	/**
-	 * Tests that the echo argument is respected.
+	 * Tests that the display argument is respected.
 	 *
 	 * @ticket 54106
 	 *
-	 * @dataProvider data_wp_referer_field_should_respect_echo_arg
+	 * @dataProvider data_wp_referer_field_should_respect_display_arg
 	 *
-	 * @param mixed $echo Whether to echo or return the referer field.
+	 * @param mixed $display Whether to echo or return the referer field.
 	 */
-	public function test_wp_referer_field_should_respect_echo_arg( $echo ) {
-		$actual = $echo ? get_echo( 'wp_referer_field' ) : wp_referer_field( false );
+	public function test_wp_referer_field_should_respect_display_arg( $display ) {
+		$actual = $display ? get_echo( 'wp_referer_field' ) : wp_referer_field( false );
 
 		$this->assertSame( '<input type="hidden" name="_wp_http_referer" value="" />', $actual );
 	}
 
 	/**
-	 * Data provider for test_wp_referer_field_should_respect_echo_arg().
+	 * Data provider for test_wp_referer_field_should_respect_display_arg().
 	 *
 	 * @return array
 	 */
-	public function data_wp_referer_field_should_respect_echo_arg() {
+	public function data_wp_referer_field_should_respect_display_arg() {
 		return array(
 			'true'         => array( true ),
 			'(int) 1'      => array( 1 ),
diff --git a/tests/phpunit/tests/general/feedLinksExtra.php b/tests/phpunit/tests/general/feedLinksExtra.php
index d6a688da0d24f..ee7f93640f1fe 100644
--- a/tests/phpunit/tests/general/feedLinksExtra.php
+++ b/tests/phpunit/tests/general/feedLinksExtra.php
@@ -172,7 +172,7 @@ public function set_up() {
 	 * @param array  $args {
 	 *        Optional arguments. Default empty.
 	 *
-	 *        @type string $separator     The separator between blog name and feed type.
+	 *        @type string $separator     The separator between site name and feed type.
 	 *        @type string $singletitle   The title of the comments feed.
 	 *        @type string $cattitle      The title of the category feed.
 	 *        @type string $tagtitle      The title of the tag feed.
diff --git a/tests/phpunit/tests/general/wpGetArchives.php b/tests/phpunit/tests/general/wpGetArchives.php
index 5409795fd71e1..8d506a6bb2c33 100644
--- a/tests/phpunit/tests/general/wpGetArchives.php
+++ b/tests/phpunit/tests/general/wpGetArchives.php
@@ -16,13 +16,11 @@ public function set_up() {
 	 * @ticket 23206
 	 */
 	public function test_get_archives_cache() {
-		global $wpdb;
-
 		self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
 		wp_cache_delete( 'last_changed', 'posts' );
 		$this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -34,9 +32,9 @@ public function test_get_archives_cache() {
 		$this->assertIsString( $result );
 		$time1 = wp_cache_get( 'last_changed', 'posts' );
 		$this->assertNotEmpty( $time1 );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -47,7 +45,7 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Change args, resulting in a different query string. Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -59,9 +57,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -73,9 +71,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Change type. Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -86,9 +84,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -99,7 +97,7 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Change type. Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -110,9 +108,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -123,7 +121,7 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Change type. Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -134,9 +132,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -147,7 +145,7 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Change type. Cache is not primed, expect 1 query.
 		$result = wp_get_archives(
@@ -158,9 +156,9 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Cache is primed, expect no queries.
 		$result = wp_get_archives(
@@ -171,6 +169,6 @@ public function test_get_archives_cache() {
 		);
 		$this->assertIsString( $result );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 }
diff --git a/tests/phpunit/tests/general/wpPreloadResources.php b/tests/phpunit/tests/general/wpPreloadResources.php
index 53fd2646a6e7b..fe2a4e6fa51c0 100644
--- a/tests/phpunit/tests/general/wpPreloadResources.php
+++ b/tests/phpunit/tests/general/wpPreloadResources.php
@@ -14,7 +14,7 @@ class Tests_General_wpPreloadResources extends WP_UnitTestCase {
 	 * @ticket 42438
 	 */
 	public function test_preload_resources( $expected, $preload_resources ) {
-		$callback = function () use ( $preload_resources ) {
+		$callback = static function () use ( $preload_resources ) {
 			return $preload_resources;
 		};
 
diff --git a/tests/phpunit/tests/hooks/addFilter.php b/tests/phpunit/tests/hooks/addFilter.php
index afa526b4848dd..df4db364c5877 100644
--- a/tests/phpunit/tests/hooks/addFilter.php
+++ b/tests/phpunit/tests/hooks/addFilter.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * Test the add_filter method of WP_Hook
  *
@@ -189,33 +188,33 @@ public function test_remove_and_recurse_and_add() {
 		$this->assertSame( '1-134-234', $value );
 	}
 
-	public function _filter_remove_and_add1( $string ) {
-		return $string . '1';
+	public function _filter_remove_and_add1( $value ) {
+		return $value . '1';
 	}
 
-	public function _filter_remove_and_add2( $string ) {
+	public function _filter_remove_and_add2( $value ) {
 		$this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11 );
 		$this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_add2' ), 11, 1 );
 
-		return $string . '2';
+		return $value . '2';
 	}
 
-	public function _filter_remove_and_recurse_and_add2( $string ) {
+	public function _filter_remove_and_recurse_and_add2( $value ) {
 		$this->hook->remove_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11 );
 
-		$string .= '-' . $this->hook->apply_filters( '', array() ) . '-';
+		$value .= '-' . $this->hook->apply_filters( '', array() ) . '-';
 
 		$this->hook->add_filter( 'remove_and_add', array( $this, '_filter_remove_and_recurse_and_add2' ), 11, 1 );
 
-		return $string . '2';
+		return $value . '2';
 	}
 
-	public function _filter_remove_and_add3( $string ) {
-		return $string . '3';
+	public function _filter_remove_and_add3( $value ) {
+		return $value . '3';
 	}
 
-	public function _filter_remove_and_add4( $string ) {
-		return $string . '4';
+	public function _filter_remove_and_add4( $value ) {
+		return $value . '4';
 	}
 
 	public function test_remove_and_add_action() {
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
new file mode 100644
index 0000000000000..6a666c19cf27c
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Processor functionality.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.4.0
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlProcessor extends WP_UnitTestCase {
+	/**
+	 * Ensure that the HTML Processor's public constructor function warns a developer to call
+	 * the static creator methods instead of directly instantiating a new class.
+	 *
+	 * The Tag Processor's constructor method is public and PHP doesn't allow changing the
+	 * visibility for a method on a subclass, which means that the HTML Processor must
+	 * maintain the public interface. However, constructors cannot fail to construct, so
+	 * if there are pre-conditions (such as the context node, the encoding form, and the
+	 * parsing mode with the HTML Processor) these must be handled through static factory
+	 * methods on the class.
+	 *
+	 * The HTML Processor requires a sentinel string as an optional parameter that hints
+	 * at using the static methods. In the absence of the optional parameter it instructs
+	 * the callee that it should be using those static methods instead.
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::__construct
+	 */
+	public function test_warns_that_the_static_creator_methods_should_be_called_instead_of_the_public_constructor() {
+		$this->setExpectedIncorrectUsage( 'WP_HTML_Processor::__construct' );
+
+		new WP_HTML_Processor( '<p>Light roast.</p>' );
+
+		$this->assertNotNull(
+			$this->caught_doing_it_wrong['WP_HTML_Processor::__construct'],
+			"Calling the public constructor should warn to call the static creator methods instead, but didn't."
+		);
+	}
+
+	/**
+	 * Ensures that the HTML Processor maintains its internal state through seek calls.
+	 *
+	 * Because the HTML Processor must track a stack of open elements and active formatting
+	 * elements, when it seeks to another location within its document it must adjust those
+	 * stacks, its internal state, in such a way that they remain valid after the seek.
+	 *
+	 * For instance, if currently matched inside an LI element and the Processor seeks to
+	 * an earlier location before the parent UL, then it should not report that it's still
+	 * inside an open LI element.
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::next_tag
+	 * @covers WP_HTML_Processor::seek
+	 *
+	 * @throws WP_HTML_Unsupported_Exception
+	 */
+	public function test_clear_to_navigate_after_seeking() {
+		$p = WP_HTML_Processor::createFragment( '<div one><strong></strong></div><p><strong two></strong></p>' );
+
+		while ( $p->next_tag() ) {
+			// Create a bookmark before entering a stack of elements and formatting elements.
+			if ( null !== $p->get_attribute( 'one' ) ) {
+				$this->assertTrue( $p->set_bookmark( 'one' ) );
+				continue;
+			}
+
+			// Create a bookmark inside of that stack.
+			if ( null !== $p->get_attribute( 'two' ) ) {
+				$p->set_bookmark( 'two' );
+				break;
+			}
+		}
+
+		// Ensure that it's possible to seek back to the outside location.
+		$this->assertTrue( $p->seek( 'one' ), 'Could not seek to earlier-seen location.' );
+		$this->assertSame( 'DIV', $p->get_tag(), "Should have jumped back to DIV but found {$p->get_tag()} instead." );
+
+		/*
+		 * Ensure that the P element from the inner location isn't still on the stack of open elements.
+		 * If it were, then the first STRONG element, inside the outer DIV would match the next call.
+		 */
+		$this->assertTrue( $p->next_tag( array( 'breadcrumbs' => array( 'P', 'STRONG' ) ) ), 'Failed to find given location after seeking.' );
+
+		// Only if the stack is properly managed will the processor advance to the inner STRONG element.
+		$this->assertTrue( $p->get_attribute( 'two' ), "Found the wrong location given the breadcrumbs, at {$p->get_tag()}." );
+
+		// Ensure that in seeking backwards the processor reports the correct full set of breadcrumbs.
+		$this->assertTrue( $p->seek( 'one' ), 'Failed to jump back to first bookmark.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV' ), $p->get_breadcrumbs(), 'Found wrong set of breadcrumbs navigating to node "one".' );
+
+		// Ensure that in seeking forwards the processor reports the correct full set of breadcrumbs.
+		$this->assertTrue( $p->seek( 'two' ), 'Failed to jump forward to second bookmark.' );
+		$this->assertTrue( $p->get_attribute( 'two' ), "Found the wrong location given the bookmark, at {$p->get_tag()}." );
+
+		$this->assertSame( array( 'HTML', 'BODY', 'P', 'STRONG' ), $p->get_breadcrumbs(), 'Found wrong set of bookmarks navigating to node "two".' );
+	}
+
+	/**
+	 * Ensures that support is added for reconstructing active formatting elements
+	 * before the HTML Processor handles situations with unclosed formats requiring it.
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::reconstruct_active_formatting_elements
+	 */
+	public function test_fails_to_reconstruct_formatting_elements() {
+		$p = WP_HTML_Processor::createFragment( '<p><em>One<p><em>Two<p><em>Three<p><em>Four' );
+
+		$this->assertTrue( $p->next_tag( 'EM' ), 'Could not find first EM.' );
+		$this->assertFalse( $p->next_tag( 'EM' ), 'Should have aborted before finding second EM as it required reconstructing the first EM.' );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php
new file mode 100644
index 0000000000000..28a7414a6ed52
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php
@@ -0,0 +1,427 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Processor functionality.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.4.0
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlProcessorBreadcrumbs extends WP_UnitTestCase {
+	/**
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::step
+	 *
+	 * @dataProvider data_single_tag_of_supported_elements
+	 *
+	 * @param string $html     HTML with at least one tag to scan.
+	 * @param string $tag_name Name of first tag in HTML (because HTML treats IMAGE as IMG this may not match the HTML).
+	 */
+	public function test_navigates_into_normative_html_for_supported_elements( $html, $tag_name ) {
+		$p = WP_HTML_Processor::createFragment( $html );
+
+		$this->assertTrue( $p->step(), "Failed to step into supported {$tag_name} element." );
+		$this->assertSame( $tag_name, $p->get_tag(), "Misread {$tag_name} as a {$p->get_tag()} element." );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_single_tag_of_supported_elements() {
+		$supported_elements = array(
+			'A',
+			'B',
+			'BIG',
+			'BUTTON',
+			'CODE',
+			'DIV',
+			'EM',
+			'FIGCAPTION',
+			'FIGURE',
+			'FONT',
+			'I',
+			'IMG',
+			'P',
+			'SMALL',
+			'SPAN',
+			'STRIKE',
+			'STRONG',
+			'TT',
+			'U',
+		);
+
+		$data = array();
+		foreach ( $supported_elements as $tag_name ) {
+			$data[ $tag_name ] = array( "<{$tag_name}>", $tag_name );
+		}
+
+		$data['IMAGE (treated as an IMG)'] = array( '<image>', 'IMG' );
+
+		return $data;
+	}
+
+	/**
+	 * Ensures that no new HTML elements are accidentally partially-supported.
+	 *
+	 * When introducing support for new HTML elements, there are multiple places
+	 * in the HTML Processor that need to be updated, until the time that the class
+	 * has full HTML5 support. Because of this, these tests lock down the interface
+	 * to ensure that support isn't accidentally updated in one place for a new
+	 * element while overlooked in another.
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::step
+	 *
+	 * @dataProvider data_unsupported_elements
+	 *
+	 * @param string $html HTML string containing unsupported elements.
+	 */
+	public function test_fails_when_encountering_unsupported_tag( $html ) {
+		$p = WP_HTML_Processor::createFragment( $html );
+
+		$this->assertFalse( $p->step(), "Should not have stepped into unsupported {$p->get_tag()} element." );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_unsupported_elements() {
+		$unsupported_elements = array(
+			'ABBR',
+			'ACRONYM', // Neutralized
+			'ADDRESS',
+			'APPLET', // Deprecated
+			'AREA',
+			'ARTICLE',
+			'ASIDE',
+			'AUDIO',
+			'BASE',
+			'BDI',
+			'BDO',
+			'BGSOUND', // Deprecated; self-closing if self-closing flag provided, otherwise normal.
+			'BLINK', // Deprecated
+			'BODY',
+			'BR',
+			'CANVAS',
+			'CAPTION',
+			'CENTER', // Neutralized
+			'CITE',
+			'COL',
+			'COLGROUP',
+			'DATA',
+			'DATALIST',
+			'DD',
+			'DEL',
+			'DETAILS',
+			'DEFN',
+			'DIALOG',
+			'DL',
+			'DT',
+			'EMBED',
+			'FIELDSET',
+			'FOOTER',
+			'FORM',
+			'FRAME',
+			'FRAMESET',
+			'H1',
+			'H2',
+			'H3',
+			'H4',
+			'H5',
+			'H6',
+			'HEAD',
+			'HEADER',
+			'HGROUP',
+			'HR',
+			'HTML',
+			'IFRAME',
+			'INPUT',
+			'INS',
+			'ISINDEX', // Deprecated
+			'KBD',
+			'KEYGEN', // Deprecated; void
+			'LABEL',
+			'LEGEND',
+			'LI',
+			'LINK',
+			'LISTING', // Deprecated, use PRE instead.
+			'MAIN',
+			'MAP',
+			'MARK',
+			'MARQUEE', // Deprecated
+			'MATH',
+			'MENU',
+			'META',
+			'METER',
+			'MULTICOL', // Deprecated
+			'NAV',
+			'NEXTID', // Deprecated
+			'NOBR', // Neutralized
+			'NOEMBED', // Neutralized
+			'NOFRAMES', // Neutralized
+			'NOSCRIPT',
+			'OBJECT',
+			'OL',
+			'OPTGROUP',
+			'OPTION',
+			'OUTPUT',
+			'PICTURE',
+			'PLAINTEXT', // Neutralized
+			'PRE',
+			'PROGRESS',
+			'Q',
+			'RB', // Neutralized
+			'RP',
+			'RT',
+			'RTC', // Neutralized
+			'RUBY',
+			'SAMP',
+			'SCRIPT',
+			'SECTION',
+			'SELECT',
+			'SLOT',
+			'SOURCE',
+			'SPACER', // Deprecated
+			'STYLE',
+			'SUB',
+			'SUMMARY',
+			'SUP',
+			'SVG',
+			'TABLE',
+			'TBODY',
+			'TD',
+			'TEMPLATE',
+			'TEXTAREA',
+			'TFOOT',
+			'TH',
+			'THEAD',
+			'TIME',
+			'TITLE',
+			'TR',
+			'TRACK',
+			'UL',
+			'VAR',
+			'VIDEO',
+			'WBR',
+			'XMP', // Deprecated, use PRE instead.
+
+			// Made up elements, custom elements.
+			'X-NOT-AN-HTML-ELEMENT',
+			'HUMAN-TIME',
+		);
+
+		$data = array();
+		foreach ( $unsupported_elements as $tag_name ) {
+			$data[ $tag_name ] = array( "<{$tag_name}>" );
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @ticket 58517
+	 *
+	 * @dataProvider data_unsupported_markup
+	 *
+	 * @param string $html HTML containing unsupported markup.
+	 */
+	public function test_fails_when_encountering_unsupported_markup( $html, $description ) {
+		$p = WP_HTML_Processor::createFragment( $html );
+
+		while ( $p->step() && null === $p->get_attribute( 'supported' ) ) {
+			continue;
+		}
+
+		$this->assertTrue( $p->get_attribute( 'supported' ), 'Did not find required supported element.' );
+		$this->assertFalse( $p->step(), "Didn't properly reject unsupported markup: {$description}" );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_unsupported_markup() {
+		return array(
+			'A with formatting following unclosed A' => array(
+				'<a><strong>Click <a supported><big unsupported>Here</big></a></strong></a>',
+				'Unclosed formatting requires complicated reconstruction.',
+			),
+
+			'A after unclosed A inside DIV'          => array(
+				'<a><div supported><a unsupported></div></a>',
+				'A is a formatting element, which requires more complicated reconstruction.',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::next_tag
+	 *
+	 * @dataProvider data_html_target_with_breadcrumbs
+	 *
+	 * @param string $html        HTML string with tags in it, one of which contains the "target" attribute.
+	 * @param array  $breadcrumbs Breadcrumbs of element with "target" attribute set.
+	 * @param int    $n           How many breadcrumb matches to scan through in order to find "target" element.
+	 */
+	public function test_finds_correct_tag_given_breadcrumbs( $html, $breadcrumbs, $n ) {
+		$p = WP_HTML_Processor::createFragment( $html );
+
+		$p->next_tag(
+			array(
+				'breadcrumbs'  => $breadcrumbs,
+				'match_offset' => $n,
+			)
+		);
+
+		$this->assertNotNull( $p->get_tag(), 'Failed to find target node.' );
+		$this->assertTrue( $p->get_attribute( 'target' ), "Found {$p->get_tag()} element didn't contain the necessary 'target' attribute." );
+	}
+
+	/**
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::get_breadcrumbs
+	 *
+	 * @dataProvider data_html_target_with_breadcrumbs
+	 *
+	 * @param string $html        HTML string with tags in it, one of which contains the "target" attribute.
+	 * @param array  $breadcrumbs Breadcrumbs of element with "target" attribute set.
+	 * @param int    $ignored_n   Not used in this test but provided in the dataset for other tests.
+	 * @return void
+	 */
+	public function test_reports_correct_breadcrumbs_for_html( $html, $breadcrumbs, $ignored_n ) {
+		$p = WP_HTML_Processor::createFragment( $html );
+
+		while ( $p->next_tag() && null === $p->get_attribute( 'target' ) ) {
+			continue;
+		}
+
+		$this->assertNotNull( $p->get_tag(), 'Failed to find the target node.' );
+		$this->assertSame( $breadcrumbs, $p->get_breadcrumbs(), 'Found the wrong path from the root of the HTML document to the target node.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_html_target_with_breadcrumbs() {
+		return array(
+			'Simple IMG tag'                        => array( '<img target>', array( 'HTML', 'BODY', 'IMG' ), 1 ),
+			'Two sibling IMG tags'                  => array( '<img><img target>', array( 'HTML', 'BODY', 'IMG' ), 2 ),
+			'Three sibling IMG tags, an IMAGE in last place' => array( '<img><img><image target>', array( 'HTML', 'BODY', 'IMG' ), 3 ),
+			'IMG inside a DIV'                      => array( '<div><img target></div>', array( 'HTML', 'BODY', 'DIV', 'IMG' ), 1 ),
+			'DIV inside a DIV'                      => array( '<div><div target></div>', array( 'HTML', 'BODY', 'DIV', 'DIV' ), 1 ),
+			'IMG inside many DIVS'                  => array( '<div><div><div><div><img target></div></div></div></div>', array( 'HTML', 'BODY', 'DIV', 'DIV', 'DIV', 'DIV', 'IMG' ), 1 ),
+			'DIV inside DIV after IMG'              => array( '<div><img><div target></div></div>', array( 'HTML', 'BODY', 'DIV', 'DIV' ), 1 ),
+			'IMG after DIV'                         => array( '<div></div><img target>', array( 'HTML', 'BODY', 'IMG' ), 1 ),
+			'IMG after two DIVs'                    => array( '<div></div><div></div><img target>', array( 'HTML', 'BODY', 'IMG' ), 1 ),
+			'IMG after two DIVs with nesting'       => array( '<div><div><img></div></div><div></div><img target>', array( 'HTML', 'BODY', 'IMG' ), 1 ),
+			'IMG after invalid DIV closer'          => array( '</div><img target>', array( 'HTML', 'BODY', 'IMG' ), 1 ),
+			'EM inside DIV'                         => array( '<div>The weather is <em target>beautiful</em>.</div>', array( 'HTML', 'BODY', 'DIV', 'EM' ), 1 ),
+			'EM after closed EM'                    => array( '<em></em><em target></em>', array( 'HTML', 'BODY', 'EM' ), 2 ),
+			'EM after closed EMs'                   => array( '<em></em><em><em></em></em><em></em><em></em><em target></em>', array( 'HTML', 'BODY', 'EM' ), 6 ),
+			'EM after unclosed EM'                  => array( '<em><em target></em>', array( 'HTML', 'BODY', 'EM', 'EM' ), 1 ),
+			'EM after unclosed EM after DIV'        => array( '<em><div><em target>', array( 'HTML', 'BODY', 'EM', 'DIV', 'EM' ), 1 ),
+			// This should work for all formatting elements, but if two work, the others probably do too.
+			'CODE after unclosed CODE after DIV'    => array( '<code><div><code target>', array( 'HTML', 'BODY', 'CODE', 'DIV', 'CODE' ), 1 ),
+			'P after unclosed P'                    => array( '<p><p target>', array( 'HTML', 'BODY', 'P' ), 2 ),
+			'Unclosed EM inside P after unclosed P' => array( '<em><p><p><em target>', array( 'HTML', 'BODY', 'EM', 'P', 'EM' ), 1 ),
+			'P after closed P'                      => array( '<p><i>something</i></p><p target>This one</p>', array( 'HTML', 'BODY', 'P' ), 2 ),
+			'A after unclosed A'                    => array( '<a><a target>', array( 'HTML', 'BODY', 'A' ), 2 ),
+			'A after unclosed A, after a P'         => array( '<p><a><a target>', array( 'HTML', 'BODY', 'P', 'A' ), 2 ),
+			// This one adds a test at a deep stack depth to ensure things work for situations beyond short test docs.
+			'Large HTML document with deep P'       => array(
+				'<div><div><div><div><div><div><div><div><p></p><p></p><p><div><strong><em><code></code></em></strong></div></p></div></div></div></div></div></div></div></div><div><div><div><div><div><div><div><div><p></p><p></p><p><div><strong><em><code target></code></em></strong></div></p></div></div></div></div></div></div></div></div>',
+				array( 'HTML', 'BODY', 'DIV', 'DIV', 'DIV', 'DIV', 'DIV', 'DIV', 'DIV', 'DIV', 'DIV', 'STRONG', 'EM', 'CODE' ),
+				2,
+			),
+		);
+	}
+
+	/**
+	 * Ensures that the ability to set attributes isn't broken by the HTML Processor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::set_attribute
+	 */
+	public function test_can_modify_attributes_after_finding_tag() {
+		$p = WP_HTML_Processor::createFragment( '<div><figure><img><figcaption>test</figcaption></figure>' );
+
+		$this->assertTrue( $p->next_tag( array( 'breadcrumbs' => array( 'figcaption' ) ) ), 'Unable to find given tag.' );
+
+		$p->set_attribute( 'found-it', true );
+		$this->assertSame( '<div><figure><img><figcaption found-it>test</figcaption></figure>', $p->get_updated_html() );
+	}
+
+	/**
+	 * Ensures that the ability to scan for a given tag name isn't broken by the HTML Processor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::next_tag
+	 */
+	public function test_can_query_an_element_by_tag_name() {
+		$p = WP_HTML_Processor::createFragment( '<div><DIV><strong><img></strong></DIV>' );
+		$p->next_tag( 'IMG' );
+		$p->set_attribute( 'loading', 'lazy' );
+
+		$this->assertSame( '<div><DIV><strong><img loading="lazy"></strong></DIV>', $p->get_updated_html() );
+	}
+
+	/**
+	 * Ensures that basic seeking behavior isn't broken by the HTML Processor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Processor::seek
+	 */
+	public function test_can_seek_back_and_forth() {
+		$p = WP_HTML_Processor::createFragment( '<div><p one><div><p><div two><p><div><p><div><p three>' );
+
+		// Find first tag of interest.
+		while ( $p->next_tag() && null === $p->get_attribute( 'one' ) ) {
+			continue;
+		}
+		$p->set_bookmark( 'first' );
+
+		// Find second tag of interest.
+		while ( $p->next_tag() && null === $p->get_attribute( 'two' ) ) {
+			continue;
+		}
+		$p->set_bookmark( 'second' );
+
+		// Find third tag of interest.
+		while ( $p->next_tag() && null === $p->get_attribute( 'three' ) ) {
+			continue;
+		}
+		$p->set_bookmark( 'third' );
+
+		// Seek backwards.
+		$p->seek( 'first' );
+
+		// Seek forwards. If the current token isn't also updated this could appear like a backwards seek.
+		$p->seek( 'second' );
+		$this->assertTrue( $p->get_attribute( 'two' ) );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
new file mode 100644
index 0000000000000..8fd3661ea03ea
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Processor compliance with HTML5 semantic parsing rules.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.4.0
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlProcessorSemanticRules extends WP_UnitTestCase {
+	/*******************************************************************
+	 * RULES FOR "IN BODY" MODE
+	 *******************************************************************/
+
+	/**
+	 * Verifies that when encountering an end tag for which there is no corresponding
+	 * element in scope, that it skips the tag entirely.
+	 *
+	 * @ticket 58961
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception
+	 */
+	public function test_in_body_skips_unexpected_button_closer() {
+		$p = WP_HTML_Processor::createFragment( '<div>Test</button></div>' );
+
+		$p->step();
+		$this->assertEquals( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
+		$this->assertFalse( $p->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
+
+		/*
+		 * When encountering the BUTTON closing tag, there is no BUTTON in the stack of open elements.
+		 * It should be ignored as there's no BUTTON to close.
+		 */
+		$this->assertTrue( $p->step(), 'Found no further tags when it should have found the closing DIV' );
+		$this->assertEquals( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
+		$this->assertTrue( $p->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
+	}
+
+	/**
+	 * Verifies insertion of a BUTTON element when no existing BUTTON is already in scope.
+	 *
+	 * @ticket 58961
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception
+	 */
+	public function test_in_body_button_with_no_button_in_scope() {
+		$p = WP_HTML_Processor::createFragment( '<div><p>Click the button <button one>here</button>!</p></div><button two>not here</button>' );
+
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected first button.' );
+		$this->assertTrue( $p->get_attribute( 'one' ), 'Failed to match expected attribute on first button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'P', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for first button.' );
+
+		/*
+		 * There's nothing special about this HTML construction, but it's important to verify that
+		 * the HTML Processor can find a BUTTON under normal and normative scenarios, not just the
+		 * malformed and unexpected ones.
+		 */
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected second button.' );
+		$this->assertTrue( $p->get_attribute( 'two' ), 'Failed to match expected attribute on second button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for second button.' );
+	}
+
+	/**
+	 * Verifies what when inserting a BUTTON element, when a BUTTON is already in scope,
+	 * that the open button is closed with all other elements inside of it.
+	 *
+	 * @ticket 58961
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception
+	 */
+	public function test_in_body_button_with_button_in_scope_as_parent() {
+		$p = WP_HTML_Processor::createFragment( '<div><p>Click the button <button one>almost<button two>here</button>!</p></div><button three>not here</button>' );
+
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected first button.' );
+		$this->assertTrue( $p->get_attribute( 'one' ), 'Failed to match expected attribute on first button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'P', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for first button.' );
+
+		/*
+		 * A naive parser might skip the second BUTTON because it's looking for the close of the first one,
+		 * or it may place it as a child of the first one, but it implicitly closes the open BUTTON.
+		 */
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected second button.' );
+		$this->assertTrue( $p->get_attribute( 'two' ), 'Failed to match expected attribute on second button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'P', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for second button.' );
+
+		/*
+		 * This is another form of the test for the second button, but from a different side. The test is
+		 * looking for proper handling of the open and close sequence for the BUTTON tags.
+		 */
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected third button.' );
+		$this->assertTrue( $p->get_attribute( 'three' ), 'Failed to match expected attribute on third button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for third button.' );
+	}
+
+	/**
+	 * Verifies what when inserting a BUTTON element, when a BUTTON is already in scope,
+	 * that the open button is closed with all other elements inside of it, even if the
+	 * BUTTON in scope is not a direct parent of the new BUTTON element.
+	 *
+	 * @ticket 58961
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception
+	 */
+	public function test_in_body_button_with_button_in_scope_as_ancestor() {
+		$p = WP_HTML_Processor::createFragment( '<div><button one><p>Click the button <span><button two>here</button>!</span></p></div><button three>not here</button>' );
+
+		// This button finds itself normally nesting inside the DIV.
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected first button.' );
+		$this->assertTrue( $p->get_attribute( 'one' ), 'Failed to match expected attribute on first button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for first button.' );
+
+		/*
+		 * Because the second button appears while a BUTTON is in scope, it generates implied end tags and closes
+		 * the BUTTON, P, and SPAN elements. It looks like the BUTTON is inside the SPAN, but it's another case
+		 * of an unexpected closing SPAN tag because the SPAN was closed by the second BUTTON. This element finds
+		 * itself a child of the most-recent open element above the most-recent BUTTON, or the DIV.
+		 */
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected second button.' );
+		$this->assertTrue( $p->get_attribute( 'two' ), 'Failed to match expected attribute on second button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for second button.' );
+
+		// The third button is back to normal, because everything has been implicitly or explicitly closed by now.
+		$this->assertTrue( $p->next_tag( 'BUTTON' ), 'Could not find expected third button.' );
+		$this->assertTrue( $p->get_attribute( 'three' ), 'Failed to match expected attribute on third button.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'BUTTON' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting for third button.' );
+	}
+
+	/*
+	 * Verifies that when "in body" and encountering "any other end tag"
+	 * that the HTML processor ignores the end tag if there's a special
+	 * element on the stack of open elements before the matching opening.
+	 *
+	 * @ticket 58907
+	 *
+	 * @since 6.4.0
+	 *
+	 * @covers WP_HTML_Processor::step_in_body
+	 */
+	public function test_in_body_any_other_end_tag_with_unclosed_special_element() {
+		$p = WP_HTML_Processor::createFragment( '<div><span><p></span><div>' );
+
+		$p->next_tag( 'P' );
+		$this->assertSame( 'P', $p->get_tag(), "Expected to start test on P element but found {$p->get_tag()} instead." );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'SPAN', 'P' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting.' );
+
+		$this->assertTrue( $p->next_tag(), 'Failed to advance past P tag to expected DIV opener.' );
+		$this->assertSame( 'DIV', $p->get_tag(), "Expected to find DIV element, but found {$p->get_tag()} instead." );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'SPAN', 'DIV' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting: SPAN should still be open and DIV should be its child.' );
+	}
+
+	/*
+	 * Verifies that when "in body" and encountering "any other end tag"
+	 * that the HTML processor closes appropriate elements on the stack of
+	 * open elements up to the matching opening.
+	 *
+	 * @ticket 58907
+	 *
+	 * @since 6.4.0
+	 *
+	 * @covers WP_HTML_Processor::step_in_body
+	 */
+	public function test_in_body_any_other_end_tag_with_unclosed_non_special_element() {
+		$p = WP_HTML_Processor::createFragment( '<div><span><code></span><div>' );
+
+		$p->next_tag( 'CODE' );
+		$this->assertSame( 'CODE', $p->get_tag(), "Expected to start test on CODE element but found {$p->get_tag()} instead." );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'SPAN', 'CODE' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting.' );
+
+		$this->assertTrue( $p->step(), 'Failed to advance past CODE tag to expected SPAN closer.' );
+		$this->assertTrue( $p->is_tag_closer(), 'Expected to find closing SPAN, but found opener instead.' );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV' ), $p->get_breadcrumbs(), 'Failed to advance past CODE tag to expected DIV opener.' );
+
+		$this->assertTrue( $p->next_tag(), 'Failed to advance past SPAN closer to expected DIV opener.' );
+		$this->assertSame( 'DIV', $p->get_tag(), "Expected to find DIV element, but found {$p->get_tag()} instead." );
+		$this->assertSame( array( 'HTML', 'BODY', 'DIV', 'DIV' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting: SPAN should be closed and DIV should be its sibling.' );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php
new file mode 100644
index 0000000000000..b9dbbc8cb8bb0
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredHtmlProcessor.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Unit tests for the HTML API indicating that changes are needed to the
+ * WP_HTML_Processor class before specific features are added to the API.
+ *
+ * Note! Duplication of test cases and the helper function in this file are intentional.
+ * This test file exists to warn developers of related areas of code that need to update
+ * together when adding support for new elements to the HTML Processor. For example,
+ * when adding support for the LI element it's necessary to update the function which
+ * generates implied end tags. This is because each element might bring with it semantic
+ * rules that impact the way the document should be parsed.
+ *
+ * Without these tests a developer needs to investigate all possible places they
+ * might need to update when adding support for more elements and risks overlooking
+ * important parts that, in the absence of the related support, will lead to errors.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.4.0
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlSupportRequiredHtmlProcessor extends WP_UnitTestCase {
+	/**
+	 * Fails to assert if the HTML Processor handles the given tag.
+	 *
+	 * This test helper is used throughout this test file for one purpose only: to
+	 * fail a test if the HTML Processor handles the given tag. In other words, it
+	 * ensures that the HTML Processor aborts when encountering the given tag.
+	 *
+	 * This is used to ensure that when support for a new tag is added to the
+	 * HTML Processor it receives full support and not partial support, which
+	 * could lead to a variety of issues.
+	 *
+	 * Do not remove this helper function as it provides semantic meaning to the
+	 * assertions in the tests in this file and its behavior is incredibly specific
+	 * and limited and doesn't warrant adding a new abstraction into WP_UnitTestCase.
+	 *
+	 * @param string $tag_name the HTML Processor should abort when encountering this tag, e.g. "BUTTON".
+	 */
+	private function ensure_support_is_added_everywhere( $tag_name ) {
+		$p = WP_HTML_Processor::createFragment( "<$tag_name>" );
+
+		$this->assertFalse( $p->step(), "Must support terminating elements in specific scope check before adding support for the {$tag_name} element." );
+	}
+
+	/**
+	 * Generating implied end tags walks up the stack of open elements
+	 * as long as any of the following missing elements is the current node.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58907
+	 *
+	 * @covers WP_HTML_Processor::generate_implied_end_tags
+	 */
+	public function test_generate_implied_end_tags_needs_support() {
+		$this->ensure_support_is_added_everywhere( 'DD' );
+		$this->ensure_support_is_added_everywhere( 'DT' );
+		$this->ensure_support_is_added_everywhere( 'LI' );
+		$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
+		$this->ensure_support_is_added_everywhere( 'OPTION' );
+		$this->ensure_support_is_added_everywhere( 'RB' );
+		$this->ensure_support_is_added_everywhere( 'RP' );
+		$this->ensure_support_is_added_everywhere( 'RT' );
+		$this->ensure_support_is_added_everywhere( 'RTC' );
+	}
+
+	/**
+	 * Generating implied end tags thoroughly walks up the stack of open elements
+	 * as long as any of the following missing elements is the current node.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58907
+	 *
+	 * @covers WP_HTML_Processor::generate_implied_end_tags_thoroughly
+	 */
+	public function test_generate_implied_end_tags_thoroughly_needs_support() {
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'COLGROUP' );
+		$this->ensure_support_is_added_everywhere( 'DD' );
+		$this->ensure_support_is_added_everywhere( 'DT' );
+		$this->ensure_support_is_added_everywhere( 'LI' );
+		$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
+		$this->ensure_support_is_added_everywhere( 'OPTION' );
+		$this->ensure_support_is_added_everywhere( 'RB' );
+		$this->ensure_support_is_added_everywhere( 'RP' );
+		$this->ensure_support_is_added_everywhere( 'RT' );
+		$this->ensure_support_is_added_everywhere( 'RTC' );
+		$this->ensure_support_is_added_everywhere( 'TBODY' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TFOOT' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'HEAD' );
+		$this->ensure_support_is_added_everywhere( 'TR' );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
new file mode 100644
index 0000000000000..afc619a869305
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlSupportRequiredOpenElements.php
@@ -0,0 +1,358 @@
+<?php
+/**
+ * Unit tests for the HTML API indicating that changes are needed to the
+ * WP_HTML_Open_Elements class before specific features are added to the API.
+ *
+ * Note! Duplication of test cases and the helper function in this file are intentional.
+ * This test file exists to warn developers of related areas of code that need to update
+ * together when adding support for new elements to the HTML Processor. For example,
+ * when adding support for the BUTTON element it's necessary to update multiple methods
+ * in the class governing the stack of open elements as well as the HTML Processor class
+ * itself. This is because each element might bring with it semantic rules that impact
+ * the way the document should be parsed. BUTTON creates a kind of boundary in the
+ * DOM tree and implicitly closes existing open BUTTON elements.
+ *
+ * Without these tests a developer needs to investigate all possible places they
+ * might need to update when adding support for more elements and risks overlooking
+ * important parts that, in the absence of the related support, will lead to errors.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ *
+ * @since 6.4.0
+ *
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Processor
+ */
+class Tests_HtmlApi_WpHtmlSupportRequiredOpenElements extends WP_UnitTestCase {
+	/**
+	 * Fails to assert if the HTML Processor handles the given tag.
+	 *
+	 * This test helper is used throughout this test file for one purpose only: to
+	 * fail a test if the HTML Processor handles the given tag. In other words, it
+	 * ensures that the HTML Processor aborts when encountering the given tag.
+	 *
+	 * This is used to ensure that when support for a new tag is added to the
+	 * HTML Processor it receives full support and not partial support, which
+	 * could lead to a variety of issues.
+	 *
+	 * Do not remove this helper function as it provides semantic meaning to the
+	 * assertions in the tests in this file and its behavior is incredibly specific
+	 * and limited and doesn't warrant adding a new abstraction into WP_UnitTestCase.
+	 *
+	 * @param string $tag_name the HTML Processor should abort when encountering this tag, e.g. "BUTTON".
+	 */
+	private function ensure_support_is_added_everywhere( $tag_name ) {
+		$p = WP_HTML_Processor::createFragment( "<$tag_name>" );
+
+		$this->assertFalse( $p->step(), "Must support terminating elements in specific scope check before adding support for the {$tag_name} element." );
+	}
+
+	/**
+	 * The check for whether an element is in a scope depends on
+	 * looking for a number of terminating elements in the stack of open
+	 * elements. Until the listed elements are supported in the HTML
+	 * processor, there are no terminating elements and there's no
+	 * point in taking the time to look for them.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 */
+	public function test_has_element_in_scope_needs_support() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+	}
+
+	/**
+	 * The check for whether an element is in list item scope depends on
+	 * the elements for any scope, plus UL and OL.
+	 *
+	 * The method for asserting list item scope doesn't currently exist
+	 * because the LI element isn't yet supported and the LI element is
+	 * the only element that needs to know about list item scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::has_element_in_list_item_scope
+	 */
+	public function test_has_element_in_list_item_scope_needs_support() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+
+		// These elements are specific to list item scope.
+		$this->ensure_support_is_added_everywhere( 'OL' );
+		$this->ensure_support_is_added_everywhere( 'UL' );
+
+		// This element is the only element that depends on list item scope.
+		$this->ensure_support_is_added_everywhere( 'LI' );
+	}
+
+	/**
+	 * The check for whether an element is in BUTTON scope depends on
+	 * the elements for any scope, plus BUTTON.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::has_element_in_button_scope
+	 */
+	public function test_has_element_in_button_scope_needs_support() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+	}
+
+	/**
+	 * The optimization maintaining a flag for "P is in BUTTON scope" requires
+	 * updating that flag every time an element is popped from the stack of
+	 * open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::after_element_pop
+	 */
+	public function test_after_element_pop_must_maintain_p_in_button_scope_flag() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+	}
+
+	/**
+	 * The optimization maintaining a flag for "P is in BUTTON scope" requires
+	 * updating that flag every time an element is pushed onto the stack of
+	 * open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::after_element_push
+	 */
+	public function test_after_element_push_must_maintain_p_in_button_scope_flag() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+	}
+
+	/**
+	 * The check for whether an element is in TABLE scope depends on
+	 * the HTML, TABLE, and TEMPLATE elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::has_element_in_table_scope
+	 */
+	public function test_has_element_in_table_scope_needs_support() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+
+		// These elements are specific to TABLE scope.
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// These elements depend on table scope.
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'COL' );
+		$this->ensure_support_is_added_everywhere( 'COLGROUP' );
+		$this->ensure_support_is_added_everywhere( 'TBODY' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TFOOT' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'THEAD' );
+		$this->ensure_support_is_added_everywhere( 'TR' );
+	}
+
+	/**
+	 * The check for whether an element is in SELECT scope depends on
+	 * the OPTGROUP and OPTION elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @ticket 58517
+	 *
+	 * @covers WP_HTML_Open_Elements::has_element_in_select_scope
+	 */
+	public function test_has_element_in_select_scope_needs_support() {
+		// These elements impact all scopes.
+		$this->ensure_support_is_added_everywhere( 'APPLET' );
+		$this->ensure_support_is_added_everywhere( 'CAPTION' );
+		$this->ensure_support_is_added_everywhere( 'HTML' );
+		$this->ensure_support_is_added_everywhere( 'TABLE' );
+		$this->ensure_support_is_added_everywhere( 'TD' );
+		$this->ensure_support_is_added_everywhere( 'TH' );
+		$this->ensure_support_is_added_everywhere( 'MARQUEE' );
+		$this->ensure_support_is_added_everywhere( 'OBJECT' );
+		$this->ensure_support_is_added_everywhere( 'TEMPLATE' );
+
+		// MathML Elements
+		$this->ensure_support_is_added_everywhere( 'MI' );
+		$this->ensure_support_is_added_everywhere( 'MO' );
+		$this->ensure_support_is_added_everywhere( 'MN' );
+		$this->ensure_support_is_added_everywhere( 'MS' );
+		$this->ensure_support_is_added_everywhere( 'MTEXT' );
+		$this->ensure_support_is_added_everywhere( 'ANNOTATION-XML' );
+
+		/*
+		 * SVG elements: note that TITLE is both an HTML element and an SVG element
+		 * so care must be taken when adding support for either one.
+		 */
+		$this->ensure_support_is_added_everywhere( 'FOREIGNOBJECT' );
+		$this->ensure_support_is_added_everywhere( 'DESC' );
+		$this->ensure_support_is_added_everywhere( 'TITLE' );
+
+		// These elements are specific to SELECT scope.
+		$this->ensure_support_is_added_everywhere( 'OPTGROUP' );
+		$this->ensure_support_is_added_everywhere( 'OPTION' );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php
new file mode 100644
index 0000000000000..90adfb20be955
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php
@@ -0,0 +1,438 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Tag_Processor bookmark functionality.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ */
+
+/**
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Tag_Processor
+ */
+class Tests_HtmlApi_WpHtmlTagProcessor_Bookmark extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_bookmark
+	 */
+	public function test_set_bookmark() {
+		$p = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
+		$p->next_tag( 'li' );
+		$this->assertTrue( $p->set_bookmark( 'first li' ), 'Could not allocate a "first li" bookmark' );
+		$p->next_tag( 'li' );
+		$this->assertTrue( $p->set_bookmark( 'second li' ), 'Could not allocate a "second li" bookmark' );
+		$this->assertTrue( $p->set_bookmark( 'first li' ), 'Could not move the "first li" bookmark' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::release_bookmark
+	 */
+	public function test_release_bookmark() {
+		$p = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
+		$p->next_tag( 'li' );
+		$this->assertFalse( $p->release_bookmark( 'first li' ), 'Released a non-existing bookmark' );
+		$p->set_bookmark( 'first li' );
+		$this->assertTrue( $p->release_bookmark( 'first li' ), 'Could not release a bookmark' );
+	}
+
+	/**
+	 * @ticket 57788
+	 *
+	 * @covers WP_HTML_Tag_Processor::has_bookmark
+	 */
+	public function test_has_bookmark_returns_false_if_bookmark_does_not_exist() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+		$this->assertFalse( $p->has_bookmark( 'my-bookmark' ) );
+	}
+
+	/**
+	 * @ticket 57788
+	 *
+	 * @covers WP_HTML_Tag_Processor::has_bookmark
+	 */
+	public function test_has_bookmark_returns_true_if_bookmark_exists() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'my-bookmark' );
+		$this->assertTrue( $p->has_bookmark( 'my-bookmark' ) );
+	}
+
+	/**
+	 * @ticket 57788
+	 *
+	 * @covers WP_HTML_Tag_Processor::has_bookmark
+	 */
+	public function test_has_bookmark_returns_false_if_bookmark_has_been_released() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'my-bookmark' );
+		$p->release_bookmark( 'my-bookmark' );
+		$this->assertFalse( $p->has_bookmark( 'my-bookmark' ) );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_seek() {
+		$p = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
+		$p->next_tag( 'li' );
+		$p->set_bookmark( 'first li' );
+
+		$p->next_tag( 'li' );
+		$p->set_attribute( 'foo-2', 'bar-2' );
+
+		$p->seek( 'first li' );
+		$p->set_attribute( 'foo-1', 'bar-1' );
+
+		$this->assertSame(
+			'<ul><li foo-1="bar-1">One</li><li foo-2="bar-2">Two</li><li>Three</li></ul>',
+			$p->get_updated_html(),
+			'Did not seek to the intended bookmark locations'
+		);
+	}
+
+	/**
+	 * @ticket 57787
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_seeks_to_tag_closer_bookmark() {
+		$p = new WP_HTML_Tag_Processor( '<div>First</div><span>Second</span>' );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->set_bookmark( 'first' );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->set_bookmark( 'second' );
+
+		$p->seek( 'first' );
+		$p->seek( 'second' );
+
+		$this->assertSame(
+			'DIV',
+			$p->get_tag(),
+			'Did not seek to the intended bookmark location'
+		);
+	}
+
+	/**
+	 * WP_HTML_Tag_Processor used to test for the diffs affecting
+	 * the adjusted bookmark position while simultaneously adjusting
+	 * the bookmark in question. As a result, updating the bookmarks
+	 * of a next tag while removing two subsequent attributes in
+	 * a previous tag unfolded like this:
+	 *
+	 * 1. Check if the first removed attribute is before the bookmark:
+	 *
+	 * <button twenty_one_characters 7_chars></button><button></button>
+	 *         ^-------------------^                  ^
+	 *           diff applied here           the bookmark is here
+	 *
+	 *    (Yes it is)
+	 *
+	 * 2. Move the bookmark to the left by the attribute length:
+	 *
+	 * <button twenty_one_characters 7_chars></button><button></button>
+	 *                           ^
+	 *                   the bookmark is here
+	 *
+	 * 3. Check if the second removed attribute is before the bookmark:
+	 *
+	 * <button twenty_one_characters 7_chars></button><button></button>
+	 *                           ^   ^-----^
+	 *                    bookmark    diff
+	 *
+	 *    This time, it isn't!
+	 *
+	 * The fix in the WP_HTML_Tag_Processor involves doing all the checks
+	 * before moving the bookmark. This test is here to guard us from
+	 * the erroneous behavior accidentally returning one day.
+	 *
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 * @covers WP_HTML_Tag_Processor::set_bookmark
+	 */
+	public function test_removing_long_attributes_doesnt_break_seek() {
+		$input = <<<HTML
+		<button twenty_one_characters 7_chars></button><button></button>
+HTML;
+		$p     = new WP_HTML_Tag_Processor( $input );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'first' );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'second' );
+
+		$this->assertTrue(
+			$p->seek( 'first' ),
+			'Seek() to the first button has failed'
+		);
+		$p->remove_attribute( 'twenty_one_characters' );
+		$p->remove_attribute( '7_chars' );
+
+		$this->assertTrue(
+			$p->seek( 'second' ),
+			'Seek() to the second button has failed'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 * @covers WP_HTML_Tag_Processor::set_bookmark
+	 */
+	public function test_bookmarks_complex_use_case() {
+		$input           = <<<HTML
+<div selected class="merge-message" checked>
+	<div class="select-menu d-inline-block">
+		<div checked class="BtnGroup MixedCaseHTML position-relative" />
+		<div checked class="BtnGroup MixedCaseHTML position-relative">
+			<button type="button" class="merge-box-button btn-group-merge rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Merge pull request
+			</button>
+
+			<button type="button" class="merge-box-button btn-group-squash rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Squash and merge
+			</button>
+
+			<button type="button" class="merge-box-button btn-group-rebase rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Rebase and merge
+			</button>
+
+			<button aria-label="Select merge method" disabled="disabled" type="button" data-view-component="true" class="select-menu-button btn BtnGroup-item"></button>
+		</div>
+	</div>
+</div>
+HTML;
+		$expected_output = <<<HTML
+<div selected class="merge-message" checked>
+	<div class="select-menu d-inline-block">
+		<div  class="BtnGroup MixedCaseHTML position-relative" />
+		<div checked class="BtnGroup MixedCaseHTML position-relative">
+			<button type="submit" class="merge-box-button btn-group-merge rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Merge pull request
+			</button>
+
+			<button  class="hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Squash and merge
+			</button>
+
+			<button id="rebase-and-merge"     disabled="">
+			  Rebase and merge
+			</button>
+
+			<button id="last-button"     ></button>
+		</div>
+	</div>
+</div>
+HTML;
+		$p               = new WP_HTML_Tag_Processor( $input );
+		$p->next_tag( 'div' );
+		$p->next_tag( 'div' );
+		$p->next_tag( 'div' );
+		$p->set_bookmark( 'first div' );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'first button' );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'second button' );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'third button' );
+		$p->next_tag( 'button' );
+		$p->set_bookmark( 'fourth button' );
+
+		$p->seek( 'first button' );
+		$p->set_attribute( 'type', 'submit' );
+
+		$this->assertTrue(
+			$p->seek( 'third button' ),
+			'Seek() to the third button failed'
+		);
+		$p->remove_attribute( 'class' );
+		$p->remove_attribute( 'type' );
+		$p->remove_attribute( 'aria-expanded' );
+		$p->set_attribute( 'id', 'rebase-and-merge' );
+		$p->remove_attribute( 'data-details-container' );
+
+		$this->assertTrue(
+			$p->seek( 'first div' ),
+			'Seek() to the first div failed'
+		);
+		$p->set_attribute( 'checked', false );
+
+		$this->assertTrue(
+			$p->seek( 'fourth button' ),
+			'Seek() to the fourth button failed'
+		);
+		$p->set_attribute( 'id', 'last-button' );
+		$p->remove_attribute( 'class' );
+		$p->remove_attribute( 'type' );
+		$p->remove_attribute( 'checked' );
+		$p->remove_attribute( 'aria-label' );
+		$p->remove_attribute( 'disabled' );
+		$p->remove_attribute( 'data-view-component' );
+
+		$this->assertTrue(
+			$p->seek( 'second button' ),
+			'Seek() to the second button failed'
+		);
+		$p->remove_attribute( 'type' );
+		$p->set_attribute( 'class', 'hx_create-pr-button' );
+
+		$this->assertSame(
+			$expected_output,
+			$p->get_updated_html(),
+			'Performing several attribute updates on different tags does not produce the expected HTML snippet'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_updates_bookmark_for_additions_after_both_sides() {
+		$p = new WP_HTML_Tag_Processor( '<div>First</div><div>Second</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'first' );
+		$p->next_tag();
+		$p->add_class( 'second' );
+
+		$p->seek( 'first' );
+		$p->add_class( 'first' );
+
+		$this->assertSame(
+			'<div class="first">First</div><div class="second">Second</div>',
+			$p->get_updated_html(),
+			'The bookmark was updated incorrectly in response to HTML markup updates'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_updates_bookmark_for_additions_before_both_sides() {
+		$p = new WP_HTML_Tag_Processor( '<div>First</div><div>Second</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'first' );
+		$p->next_tag();
+		$p->set_bookmark( 'second' );
+
+		$p->seek( 'first' );
+		$p->add_class( 'first' );
+
+		$p->seek( 'second' );
+		$p->add_class( 'second' );
+
+		$this->assertSame(
+			'<div class="first">First</div><div class="second">Second</div>',
+			$p->get_updated_html(),
+			'The bookmark was updated incorrectly in response to HTML markup updates'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_updates_bookmark_for_deletions_after_both_sides() {
+		$p = new WP_HTML_Tag_Processor( '<div>First</div><div disabled>Second</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'first' );
+		$p->next_tag();
+		$p->remove_attribute( 'disabled' );
+
+		$p->seek( 'first' );
+		$p->set_attribute( 'untouched', true );
+
+		$this->assertSame(
+			/*
+			 * It shouldn't be necessary to assert the extra space after the tag
+			 * following the attribute removal, but doing so makes the test easier
+			 * to see than it would be if parsing the output HTML for proper
+			 * validation. If the Tag Processor changes so that this space no longer
+			 * appears then this test should be updated to reflect that. The space
+			 * is not required.
+			 */
+			'<div untouched>First</div><div >Second</div>',
+			$p->get_updated_html(),
+			'The bookmark was incorrectly in response to HTML markup updates'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_updates_bookmark_for_deletions_before_both_sides() {
+		$p = new WP_HTML_Tag_Processor( '<div disabled>First</div><div>Second</div>' );
+		$p->next_tag();
+		$p->set_bookmark( 'first' );
+		$p->next_tag();
+		$p->set_bookmark( 'second' );
+
+		$p->seek( 'first' );
+		$p->remove_attribute( 'disabled' );
+
+		$p->seek( 'second' );
+		$p->set_attribute( 'safe', true );
+
+		$this->assertSame(
+			/*
+			 * It shouldn't be necessary to assert the extra space after the tag
+			 * following the attribute removal, but doing so makes the test easier
+			 * to see than it would be if parsing the output HTML for proper
+			 * validation. If the Tag Processor changes so that this space no longer
+			 * appears then this test should be updated to reflect that. The space
+			 * is not required.
+			 */
+			'<div >First</div><div safe>Second</div>',
+			$p->get_updated_html(),
+			'The bookmark was updated incorrectly in response to HTML markup updates'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_bookmark
+	 */
+	public function test_limits_the_number_of_bookmarks() {
+		$p = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
+		$p->next_tag( 'li' );
+
+		for ( $i = 0; $i < WP_HTML_Tag_Processor::MAX_BOOKMARKS; $i++ ) {
+			$this->assertTrue( $p->set_bookmark( "bookmark $i" ), "Could not allocate the bookmark #$i" );
+		}
+
+		$this->setExpectedIncorrectUsage( 'WP_HTML_Tag_Processor::set_bookmark' );
+		$this->assertFalse( $p->set_bookmark( 'final bookmark' ), "Allocated $i bookmarks, which is one above the limit" );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::seek
+	 */
+	public function test_limits_the_number_of_seek_calls() {
+		$p = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
+		$p->next_tag( 'li' );
+		$p->set_bookmark( 'bookmark' );
+
+		for ( $i = 0; $i < WP_HTML_Tag_Processor::MAX_SEEK_OPS; $i++ ) {
+			$this->assertTrue( $p->seek( 'bookmark' ), 'Could not seek to the "bookmark"' );
+		}
+
+		$this->setExpectedIncorrectUsage( 'WP_HTML_Tag_Processor::seek' );
+		$this->assertFalse( $p->seek( 'bookmark' ), "$i-th seek() to the bookmark succeeded, even though it should exceed the allowed limit" );
+	}
+}
diff --git a/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php b/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
new file mode 100644
index 0000000000000..659ffb848ecb8
--- /dev/null
+++ b/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
@@ -0,0 +1,2345 @@
+<?php
+/**
+ * Unit tests covering WP_HTML_Tag_Processor functionality.
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ */
+
+/**
+ * @group html-api
+ *
+ * @coversDefaultClass WP_HTML_Tag_Processor
+ */
+class Tests_HtmlApi_WpHtmlTagProcessor extends WP_UnitTestCase {
+	const HTML_SIMPLE       = '<div id="first"><span id="second">Text</span></div>';
+	const HTML_WITH_CLASSES = '<div class="main with-border" id="first"><span class="not-main bold with-border" id="second">Text</span></div>';
+	const HTML_MALFORMED    = '<div><span class="d-md-none" Notifications</span><span class="d-none d-md-inline">Back to notifications</span></div>';
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_tag
+	 */
+	public function test_get_tag_returns_null_before_finding_tags() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+
+		$this->assertNull( $p->get_tag(), 'Calling get_tag() without selecting a tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_tag
+	 */
+	public function test_get_tag_returns_null_when_not_in_open_tag() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+
+		$this->assertFalse( $p->next_tag( 'p' ), 'Querying a non-existing tag did not return false' );
+		$this->assertNull( $p->get_tag(), 'Accessing a non-existing tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_tag
+	 */
+	public function test_get_tag_returns_open_tag_name() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+
+		$this->assertTrue( $p->next_tag( 'div' ), 'Querying an existing tag did not return true' );
+		$this->assertSame( 'DIV', $p->get_tag(), 'Accessing an existing tag name did not return "div"' );
+	}
+
+	/**
+	 * @ticket 58009
+	 *
+	 * @covers WP_HTML_Tag_Processor::has_self_closing_flag
+	 *
+	 * @dataProvider data_has_self_closing_flag
+	 *
+	 * @param string $html Input HTML whose first tag might contain the self-closing flag `/`.
+	 * @param bool $flag_is_set Whether the input HTML's first tag contains the self-closing flag.
+	 */
+	public function test_has_self_closing_flag_matches_input_html( $html, $flag_is_set ) {
+		$p = new WP_HTML_Tag_Processor( $html );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+
+		if ( $flag_is_set ) {
+			$this->assertTrue( $p->has_self_closing_flag(), 'Did not find the self-closing tag when it was present.' );
+		} else {
+			$this->assertFalse( $p->has_self_closing_flag(), 'Found the self-closing tag when it was absent.' );
+		}
+	}
+
+	/**
+	 * Data provider. HTML tags which might have a self-closing flag, and an indicator if they do.
+	 *
+	 * @return array[]
+	 */
+	public function data_has_self_closing_flag() {
+		return array(
+			// These should not have a self-closer, and will leave an element un-closed if it's assumed they are self-closing.
+			'Self-closing flag on non-void HTML element' => array( '<div />', true ),
+			'No self-closing flag on non-void HTML element' => array( '<div>', false ),
+			// These should not have a self-closer, but are benign when used because the elements are void.
+			'Self-closing flag on void HTML element'     => array( '<img />', true ),
+			'No self-closing flag on void HTML element'  => array( '<img>', false ),
+			'Self-closing flag on void HTML element without spacing' => array( '<img/>', true ),
+			// These should not have a self-closer, but as part of a tag closer they are entirely ignored.
+			'Self-closing flag on tag closer'            => array( '</textarea />', true ),
+			'No self-closing flag on tag closer'         => array( '</textarea>', false ),
+			// These can and should have self-closers, and will leave an element un-closed if it's assumed they aren't self-closing.
+			'Self-closing flag on a foreign element'     => array( '<circle />', true ),
+			'No self-closing flag on a foreign element'  => array( '<circle>', false ),
+			// These involve syntax peculiarities.
+			'Self-closing flag after extra spaces'       => array( '<div      />', true ),
+			'Self-closing flag after attribute'          => array( '<div id=test/>', true ),
+			'Self-closing flag after quoted attribute'   => array( '<div id="test"/>', true ),
+			'Self-closing flag after boolean attribute'  => array( '<div enabled/>', true ),
+			'Boolean attribute that looks like a self-closer' => array( '<div / >', false ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_null_before_finding_tags() {
+		$p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+
+		$this->assertNull( $p->get_attribute( 'class' ), 'Accessing an attribute without selecting a tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_null_when_not_in_open_tag() {
+		$p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+
+		$this->assertFalse( $p->next_tag( 'p' ), 'Querying a non-existing tag did not return false' );
+		$this->assertNull( $p->get_attribute( 'class' ), 'Accessing an attribute of a non-existing tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_null_when_in_closing_tag() {
+		$p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag( 'div' ), 'Querying an existing tag did not return true' );
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Querying an existing closing tag did not return true' );
+		$this->assertNull( $p->get_attribute( 'class' ), 'Accessing an attribute of a closing tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_null_when_attribute_missing() {
+		$p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag( 'div' ), 'Querying an existing tag did not return true' );
+		$this->assertNull( $p->get_attribute( 'test-id' ), 'Accessing a non-existing attribute did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_attribute_value() {
+		$p = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag( 'div' ), 'Querying an existing tag did not return true' );
+		$this->assertSame( 'test', $p->get_attribute( 'class' ), 'Accessing a class="test" attribute value did not return "test"' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_true_for_boolean_attribute() {
+		$p = new WP_HTML_Tag_Processor( '<div enabled class="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag( array( 'class_name' => 'test' ) ), 'Querying an existing tag did not return true' );
+		$this->assertTrue( $p->get_attribute( 'enabled' ), 'Accessing a boolean "enabled" attribute value did not return true' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_string_for_truthy_attributes() {
+		$p = new WP_HTML_Tag_Processor( '<div enabled=enabled checked=1 hidden="true" class="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag(), 'Querying an existing tag did not return true' );
+		$this->assertSame( 'enabled', $p->get_attribute( 'enabled' ), 'Accessing a boolean "enabled" attribute value did not return true' );
+		$this->assertSame( '1', $p->get_attribute( 'checked' ), 'Accessing a checked=1 attribute value did not return "1"' );
+		$this->assertSame( 'true', $p->get_attribute( 'hidden' ), 'Accessing a hidden="true" attribute value did not return "true"' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_decodes_html_character_references() {
+		$p = new WP_HTML_Tag_Processor( '<div id="the &quot;grande&quot; is &lt; &#x033;&#50;oz&dagger;"></div>' );
+		$p->next_tag();
+
+		$this->assertSame( 'the "grande" is < 32oz†', $p->get_attribute( 'id' ), 'HTML Attribute value was returned without decoding character references' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_attributes_parser_treats_slash_as_attribute_separator() {
+		$p = new WP_HTML_Tag_Processor( '<div a/b/c/d/e="test">Test</div>' );
+
+		$this->assertTrue( $p->next_tag(), 'Querying an existing tag did not return true' );
+		$this->assertTrue( $p->get_attribute( 'a' ), 'Accessing an existing attribute did not return true' );
+		$this->assertTrue( $p->get_attribute( 'b' ), 'Accessing an existing attribute did not return true' );
+		$this->assertTrue( $p->get_attribute( 'c' ), 'Accessing an existing attribute did not return true' );
+		$this->assertTrue( $p->get_attribute( 'd' ), 'Accessing an existing attribute did not return true' );
+		$this->assertSame( 'test', $p->get_attribute( 'e' ), 'Accessing an existing e="test" did not return "test"' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 *
+	 * @dataProvider data_attribute_name_case_variants
+	 *
+	 * @param string $attribute_name Name of data-enabled attribute with case variations.
+	 */
+	public function test_get_attribute_is_case_insensitive_for_attributes_with_values( $attribute_name ) {
+		$p = new WP_HTML_Tag_Processor( '<div DATA-enabled="true">Test</div>' );
+		$p->next_tag();
+
+		$this->assertSame(
+			'true',
+			$p->get_attribute( $attribute_name ),
+			'Accessing an attribute by a differently-cased name did not return its value'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 *
+	 * @dataProvider data_attribute_name_case_variants
+	 *
+	 * @param string $attribute_name Name of data-enabled attribute with case variations.
+	 */
+	public function test_attributes_parser_is_case_insensitive_for_attributes_without_values( $attribute_name ) {
+		$p = new WP_HTML_Tag_Processor( '<div DATA-enabled>Test</div>' );
+		$p->next_tag();
+
+		$this->assertTrue(
+			$p->get_attribute( $attribute_name ),
+			'Accessing an attribute by a differently-cased name did not return its value'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[].
+	 */
+	public function data_attribute_name_case_variants() {
+		return array(
+			array( 'DATA-enabled' ),
+			array( 'data-enabled' ),
+			array( 'DATA-ENABLED' ),
+			array( 'DatA-EnABled' ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 */
+	public function test_remove_attribute_is_case_insensitive() {
+		$p = new WP_HTML_Tag_Processor( '<div DATA-enabled="true">Test</div>' );
+		$p->next_tag();
+		$p->remove_attribute( 'data-enabled' );
+
+		$this->assertSame( '<div >Test</div>', $p->get_updated_html(), 'A case-insensitive remove_attribute call did not remove the attribute' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_is_case_insensitive() {
+		$p = new WP_HTML_Tag_Processor( '<div DATA-enabled="true">Test</div>' );
+		$p->next_tag();
+		$p->set_attribute( 'data-enabled', 'abc' );
+
+		$this->assertSame( '<div data-enabled="abc">Test</div>', $p->get_updated_html(), 'A case-insensitive set_attribute call did not update the existing attribute' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_null_before_finding_tags() {
+		$p = new WP_HTML_Tag_Processor( '<div data-foo="bar">Test</div>' );
+		$this->assertNull(
+			$p->get_attribute_names_with_prefix( 'data-' ),
+			'Accessing attributes by their prefix did not return null when no tag was selected'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_null_when_not_in_open_tag() {
+		$p = new WP_HTML_Tag_Processor( '<div data-foo="bar">Test</div>' );
+		$p->next_tag( 'p' );
+		$this->assertNull( $p->get_attribute_names_with_prefix( 'data-' ), 'Accessing attributes of a non-existing tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_null_when_in_closing_tag() {
+		$p = new WP_HTML_Tag_Processor( '<div data-foo="bar">Test</div>' );
+		$p->next_tag( 'div' );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+
+		$this->assertNull( $p->get_attribute_names_with_prefix( 'data-' ), 'Accessing attributes of a closing tag did not return null' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_empty_array_when_no_attributes_present() {
+		$p = new WP_HTML_Tag_Processor( '<div>Test</div>' );
+		$p->next_tag( 'div' );
+
+		$this->assertSame( array(), $p->get_attribute_names_with_prefix( 'data-' ), 'Accessing the attributes on a tag without any did not return an empty array' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_matching_attribute_names_in_lowercase() {
+		$p = new WP_HTML_Tag_Processor( '<div DATA-enabled class="test" data-test-ID="14">Test</div>' );
+		$p->next_tag();
+
+		$this->assertSame(
+			array( 'data-enabled', 'data-test-id' ),
+			$p->get_attribute_names_with_prefix( 'data-' ),
+			'Accessing attributes by their prefix did not return their lowercase names'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute_names_with_prefix
+	 */
+	public function test_get_attribute_names_with_prefix_returns_attribute_added_by_set_attribute() {
+		$p = new WP_HTML_Tag_Processor( '<div data-foo="bar">Test</div>' );
+		$p->next_tag();
+		$p->set_attribute( 'data-test-id', '14' );
+
+		$this->assertSame(
+			'<div data-test-id="14" data-foo="bar">Test</div>',
+			$p->get_updated_html(),
+			"Updated HTML doesn't include attribute added via set_attribute"
+		);
+		$this->assertSame(
+			array( 'data-test-id', 'data-foo' ),
+			$p->get_attribute_names_with_prefix( 'data-' ),
+			"Accessing attribute names doesn't find attribute added via set_attribute"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::__toString
+	 */
+	public function test_to_string_returns_updated_html() {
+		$p = new WP_HTML_Tag_Processor( '<hr id="remove" /><div enabled class="test">Test</div><span id="span-id"></span>' );
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$p->next_tag();
+		$p->set_attribute( 'id', 'div-id-1' );
+		$p->add_class( 'new_class_1' );
+
+		$this->assertSame(
+			$p->get_updated_html(),
+			(string) $p,
+			'get_updated_html() returned a different value than __toString()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_updated_html
+	 */
+	public function test_get_updated_html_applies_the_updates_so_far_and_keeps_the_processor_on_the_current_tag() {
+		$p = new WP_HTML_Tag_Processor( '<hr id="remove" /><div enabled class="test">Test</div><span id="span-id"></span>' );
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$p->next_tag();
+		$p->set_attribute( 'id', 'div-id-1' );
+		$p->add_class( 'new_class_1' );
+
+		$this->assertSame(
+			'<hr  /><div id="div-id-1" enabled class="test new_class_1">Test</div><span id="span-id"></span>',
+			$p->get_updated_html(),
+			'Calling get_updated_html after updating the attributes of the second tag returned different HTML than expected'
+		);
+
+		$p->set_attribute( 'id', 'div-id-2' );
+		$p->add_class( 'new_class_2' );
+
+		$this->assertSame(
+			'<hr  /><div id="div-id-2" enabled class="test new_class_1 new_class_2">Test</div><span id="span-id"></span>',
+			$p->get_updated_html(),
+			'Calling get_updated_html after updating the attributes of the second tag for the second time returned different HTML than expected'
+		);
+
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$this->assertSame(
+			'<hr  /><div id="div-id-2" enabled class="test new_class_1 new_class_2">Test</div><span ></span>',
+			$p->get_updated_html(),
+			'Calling get_updated_html after removing the id attribute of the third tag returned different HTML than expected'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_updated_html
+	 */
+	public function test_get_updated_html_without_updating_any_attributes_returns_the_original_html() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+
+		$this->assertSame(
+			self::HTML_SIMPLE,
+			$p->get_updated_html(),
+			'Casting WP_HTML_Tag_Processor to a string without performing any updates did not return the initial HTML snippet'
+		);
+	}
+
+	/**
+	 * Ensures that when seeking to an earlier spot in the document that
+	 * all previously-enqueued updates are applied as they ought to be.
+	 *
+	 * @ticket 58160
+	 */
+	public function test_get_updated_html_applies_updates_to_content_after_seeking_to_before_parsed_bytes() {
+		$p = new WP_HTML_Tag_Processor( '<div><img hidden></div>' );
+
+		$p->next_tag();
+		$p->set_attribute( 'wonky', true );
+		$p->next_tag();
+		$p->set_bookmark( 'here' );
+
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->seek( 'here' );
+
+		$this->assertSame( '<div wonky><img hidden></div>', $p->get_updated_html() );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 */
+	public function test_next_tag_with_no_arguments_should_find_the_next_existing_tag() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+
+		$this->assertTrue( $p->next_tag(), 'Querying an existing tag did not return true' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 */
+	public function test_next_tag_should_return_false_for_a_non_existing_tag() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+
+		$this->assertFalse( $p->next_tag( 'p' ), 'Querying a non-existing tag did not return false' );
+	}
+
+	/**
+	 * @ticket 56299
+	 * @ticket 57852
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 * @covers WP_HTML_Tag_Processor::is_tag_closer
+	 */
+	public function test_next_tag_should_stop_on_closers_only_when_requested() {
+		$p = new WP_HTML_Tag_Processor( '<div><img /></div>' );
+
+		$this->assertTrue( $p->next_tag( array( 'tag_name' => 'div' ) ), 'Did not find desired tag opener' );
+		$this->assertFalse( $p->next_tag( array( 'tag_name' => 'div' ) ), 'Visited an unwanted tag, a tag closer' );
+
+		$p = new WP_HTML_Tag_Processor( '<div><img /></div>' );
+		$p->next_tag(
+			array(
+				'tag_name'    => 'div',
+				'tag_closers' => 'visit',
+			)
+		);
+
+		$this->assertFalse( $p->is_tag_closer(), 'Indicated a tag opener is a tag closer' );
+		$this->assertTrue(
+			$p->next_tag(
+				array(
+					'tag_name'    => 'div',
+					'tag_closers' => 'visit',
+				)
+			),
+			'Did not stop at desired tag closer'
+		);
+		$this->assertTrue( $p->is_tag_closer(), 'Indicated a tag closer is a tag opener' );
+
+		$p = new WP_HTML_Tag_Processor( '<div>' );
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), "Did not find a tag opener when tag_closers was set to 'visit'" );
+		$this->assertFalse( $p->next_tag( array( 'tag_closers' => 'visit' ) ), "Found a closer where there wasn't one" );
+	}
+
+	/**
+	 * @ticket 57852
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 * @covers WP_HTML_Tag_Processor::is_tag_closer
+	 */
+	public function test_next_tag_should_stop_on_rcdata_and_script_tag_closers_when_requested() {
+		$p = new WP_HTML_Tag_Processor( '<script>abc</script>' );
+
+		$p->next_tag();
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </script> tag closer' );
+		$this->assertTrue( $p->is_tag_closer(), 'Indicated a <script> tag opener is a tag closer' );
+
+		$p = new WP_HTML_Tag_Processor( 'abc</script>' );
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </script> tag closer when there was no tag opener' );
+
+		$p = new WP_HTML_Tag_Processor( '<textarea>abc</textarea>' );
+
+		$p->next_tag();
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </textarea> tag closer' );
+		$this->assertTrue( $p->is_tag_closer(), 'Indicated a <textarea> tag opener is a tag closer' );
+
+		$p = new WP_HTML_Tag_Processor( 'abc</textarea>' );
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </textarea> tag closer when there was no tag opener' );
+
+		$p = new WP_HTML_Tag_Processor( '<title>abc</title>' );
+
+		$p->next_tag();
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </title> tag closer' );
+		$this->assertTrue( $p->is_tag_closer(), 'Indicated a <title> tag opener is a tag closer' );
+
+		$p = new WP_HTML_Tag_Processor( 'abc</title>' );
+		$this->assertTrue( $p->next_tag( array( 'tag_closers' => 'visit' ) ), 'Did not find the </title> tag closer when there was no tag opener' );
+	}
+
+	/**
+	 * Verifies that updates to a document before calls to `get_updated_html()` don't
+	 * lead to the Tag Processor jumping to the wrong tag after the updates.
+	 *
+	 * @ticket 58179
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_updated_html
+	 */
+	public function test_internal_pointer_returns_to_original_spot_after_inserting_content_before_cursor() {
+		$tags = new WP_HTML_Tag_Processor( '<div>outside</div><section><div><img>inside</div></section>' );
+
+		$tags->next_tag();
+		$tags->add_class( 'foo' );
+		$tags->next_tag( 'section' );
+
+		// Return to this spot after moving ahead.
+		$tags->set_bookmark( 'here' );
+
+		// Move ahead.
+		$tags->next_tag( 'img' );
+		$tags->seek( 'here' );
+		$this->assertSame( '<div class="foo">outside</div><section><div><img>inside</div></section>', $tags->get_updated_html() );
+		$this->assertSame( 'SECTION', $tags->get_tag() );
+		$this->assertFalse( $tags->is_tag_closer() );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_on_a_non_existing_tag_does_not_change_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+
+		$this->assertFalse( $p->next_tag( 'p' ), 'Querying a non-existing tag did not return false' );
+		$this->assertFalse( $p->next_tag( 'div' ), 'Querying a non-existing tag did not return false' );
+
+		$p->set_attribute( 'id', 'primary' );
+
+		$this->assertSame(
+			self::HTML_SIMPLE,
+			$p->get_updated_html(),
+			'Calling get_updated_html after updating a non-existing tag returned an HTML that was different from the original HTML'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_attribute_ops_on_tag_closer_do_not_change_the_markup() {
+		$p = new WP_HTML_Tag_Processor( '<div id=3></div invalid-id=4>' );
+		$p->next_tag(
+			array(
+				'tag_name'    => 'div',
+				'tag_closers' => 'visit',
+			)
+		);
+
+		$this->assertFalse( $p->is_tag_closer(), 'Skipped tag opener' );
+
+		$p->next_tag(
+			array(
+				'tag_name'    => 'div',
+				'tag_closers' => 'visit',
+			)
+		);
+
+		$this->assertTrue( $p->is_tag_closer(), 'Skipped tag closer' );
+		$this->assertFalse( $p->set_attribute( 'id', 'test' ), "Allowed setting an attribute on a tag closer when it shouldn't have" );
+		$this->assertFalse( $p->remove_attribute( 'invalid-id' ), "Allowed removing an attribute on a tag closer when it shouldn't have" );
+		$this->assertFalse( $p->add_class( 'sneaky' ), "Allowed adding a class on a tag closer when it shouldn't have" );
+		$this->assertFalse( $p->remove_class( 'not-appearing-in-this-test' ), "Allowed removing a class on a tag closer when it shouldn't have" );
+		$this->assertSame(
+			'<div id=3></div invalid-id=4>',
+			$p->get_updated_html(),
+			'Calling get_updated_html after updating a non-existing tag returned an HTML that was different from the original HTML'
+		);
+	}
+
+	/**
+	 * Passing a double quote inside of an attribute value could lead to an XSS attack as follows:
+	 *
+	 * ```php
+	 *     $p = new WP_HTML_Tag_Processor( '<div class="header"></div>' );
+	 *     $p->next_tag();
+	 *     $p->set_attribute('class', '" onclick="alert');
+	 *     echo $p;
+	 *     // <div class="" onclick="alert"></div>
+	 * ```
+	 *
+	 * To prevent it, `set_attribute` calls `esc_attr()` on its given values.
+	 *
+	 * ```php
+	 *    <div class="&quot; onclick=&quot;alert"></div>
+	 * ```
+	 *
+	 * @ticket 56299
+	 *
+	 * @dataProvider data_set_attribute_prevents_xss
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 *
+	 * @param string $attribute_value A value with potential XSS exploit.
+	 */
+	public function test_set_attribute_prevents_xss( $attribute_value ) {
+		$p = new WP_HTML_Tag_Processor( '<div></div>' );
+		$p->next_tag();
+		$p->set_attribute( 'test', $attribute_value );
+
+		/*
+		 * Testing the escaping is hard using tools that properly parse
+		 * HTML because they might interpret the escaped values. It's hard
+		 * with tools that don't understand HTML because they might get
+		 * confused by improperly-escaped values.
+		 *
+		 * Since the input HTML is known, the test will do what looks like
+		 * the opposite of what is expected to be done with this library.
+		 * But by doing so, the test (a) has full control over the
+		 * content and (b) looks at the raw values.
+		 */
+		$match = null;
+		preg_match( '~^<div test=(.*)></div>$~', $p->get_updated_html(), $match );
+		list( , $actual_value ) = $match;
+
+		$this->assertSame( '"' . esc_attr( $attribute_value ) . '"', $actual_value, 'Entities were not properly escaped in the attribute value' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return string[][].
+	 */
+	public function data_set_attribute_prevents_xss() {
+		return array(
+			array( '"' ),
+			array( '&quot;' ),
+			array( '&' ),
+			array( '&amp;' ),
+			array( '&euro;' ),
+			array( "'" ),
+			array( '<>' ),
+			array( '&quot";' ),
+			array( '" onclick="alert(\'1\');"><span onclick=""></span><script>alert("1")</script>' ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_with_a_non_existing_attribute_adds_a_new_attribute_to_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'test-attribute', 'test-value' );
+
+		$this->assertSame(
+			'<div test-attribute="test-value" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include attribute added via set_attribute()'
+		);
+		$this->assertSame(
+			'test-value',
+			$p->get_attribute( 'test-attribute' ),
+			'get_attribute() (called after get_updated_html()) did not return attribute added via set_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_updated_values_before_they_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'test-attribute', 'test-value' );
+
+		$this->assertSame(
+			'test-value',
+			$p->get_attribute( 'test-attribute' ),
+			'get_attribute() (called before get_updated_html()) did not return attribute added via set_attribute()'
+		);
+		$this->assertSame(
+			'<div test-attribute="test-value" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include attribute added via set_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_returns_updated_values_before_they_are_applied_with_different_name_casing() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'test-ATTribute', 'test-value' );
+
+		$this->assertSame(
+			'test-value',
+			$p->get_attribute( 'test-attribute' ),
+			'get_attribute() (called before get_updated_html()) did not return attribute added via set_attribute()'
+		);
+		$this->assertSame(
+			'<div test-ATTribute="test-value" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include attribute added via set_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_added_class_names_before_they_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->add_class( 'my-class' );
+
+		$this->assertSame(
+			'my-class',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) did not return class name added via add_class()'
+		);
+		$this->assertSame(
+			'<div class="my-class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include class name added via add_class()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_added_class_names_before_they_are_applied_and_retains_classes_from_previous_add_class_calls() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->add_class( 'my-class' );
+
+		$this->assertSame(
+			'my-class',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) did not return class name added via add_class()'
+		);
+
+		$p->add_class( 'my-other-class' );
+
+		$this->assertSame(
+			'my-class my-other-class',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) did not return class names added via subsequent add_class() calls'
+		);
+		$this->assertSame(
+			'<div class="my-class my-other-class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include class names added via subsequent add_class() calls'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_removed_attribute_before_it_is_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$this->assertNull(
+			$p->get_attribute( 'id' ),
+			'get_attribute() (called before get_updated_html()) returned attribute that was removed by remove_attribute()'
+		);
+		$this->assertSame(
+			'<div ><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML includes attribute that was removed by remove_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_adding_and_then_removing_an_attribute_before_those_updates_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'test-attribute', 'test-value' );
+		$p->remove_attribute( 'test-attribute' );
+
+		$this->assertNull(
+			$p->get_attribute( 'test-attribute' ),
+			'get_attribute() (called before get_updated_html()) returned attribute that was added via set_attribute() and then removed by remove_attribute()'
+		);
+		$this->assertSame(
+			self::HTML_SIMPLE,
+			$p->get_updated_html(),
+			'Updated HTML includes attribute that was added via set_attribute() and then removed by remove_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_setting_and_then_removing_an_existing_attribute_before_those_updates_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'id', 'test-value' );
+		$p->remove_attribute( 'id' );
+
+		$this->assertNull(
+			$p->get_attribute( 'id' ),
+			'get_attribute() (called before get_updated_html()) returned attribute that was overwritten by set_attribute() and then removed by remove_attribute()'
+		);
+		$this->assertSame(
+			'<div ><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML includes attribute that was overwritten by set_attribute() and then removed by remove_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_removed_class_names_before_they_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->remove_class( 'with-border' );
+
+		$this->assertSame(
+			'main',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) returned the wrong attribute after calling remove_attribute()'
+		);
+		$this->assertSame(
+			'<div class="main" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML includes wrong attribute after calling remove_attribute()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_setting_and_then_removing_a_class_name_before_those_updates_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'foo-class' );
+		$p->remove_class( 'foo-class' );
+
+		$this->assertSame(
+			'main with-border',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) returned class name that was added via add_class() and then removed by remove_class()'
+		);
+		$this->assertSame(
+			self::HTML_WITH_CLASSES,
+			$p->get_updated_html(),
+			'Updated HTML includes class that was added via add_class() and then removed by remove_class()'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::get_attribute
+	 */
+	public function test_get_attribute_reflects_duplicating_and_then_removing_an_existing_class_name_before_those_updates_are_applied() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'with-border' );
+		$p->remove_class( 'with-border' );
+
+		$this->assertSame(
+			'main',
+			$p->get_attribute( 'class' ),
+			'get_attribute() (called before get_updated_html()) returned class name that was duplicated via add_class() and then removed by remove_class()'
+		);
+		$this->assertSame(
+			'<div class="main" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML includes class that was duplicated via add_class() and then removed by remove_class()'
+		);
+	}
+
+	/**
+	 * According to HTML spec, only the first instance of an attribute counts.
+	 * The other ones are ignored.
+	 *
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_update_first_attribute_when_duplicated_attributes_exist() {
+		$p = new WP_HTML_Tag_Processor( '<div id="update-me" id="ignored-id"><span id="second">Text</span></div>' );
+		$p->next_tag();
+		$p->set_attribute( 'id', 'updated-id' );
+
+		$this->assertSame(
+			'<div id="updated-id" id="ignored-id"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Proper (first) appearance of attribute was not updated when duplicates exist'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_with_an_existing_attribute_name_updates_its_value_in_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'id', 'new-id' );
+		$this->assertSame(
+			'<div id="new-id"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Existing attribute was not updated'
+		);
+	}
+
+	/**
+	 * Ensures that when setting an attribute multiple times that only
+	 * one update flushes out into the updated HTML.
+	 *
+	 * @ticket 58146
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_with_case_variants_updates_only_the_original_first_copy() {
+		$p = new WP_HTML_Tag_Processor( '<div data-enabled="5">' );
+		$p->next_tag();
+		$p->set_attribute( 'DATA-ENABLED', 'canary' );
+		$p->set_attribute( 'Data-Enabled', 'canary' );
+		$p->set_attribute( 'dATa-EnABled', 'canary' );
+
+		$this->assertSame( '<div data-enabled="canary">', strtolower( $p->get_updated_html() ) );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_next_tag_and_set_attribute_in_a_loop_update_all_tags_in_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		while ( $p->next_tag() ) {
+			$p->set_attribute( 'data-foo', 'bar' );
+		}
+
+		$this->assertSame(
+			'<div data-foo="bar" id="first"><span data-foo="bar" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Not all tags were updated when looping with next_tag() and set_attribute()'
+		);
+	}
+
+	/**
+	 * Removing an attribute that's listed many times, e.g. `<div id="a" id="b" />` should remove
+	 * all its instances and output just `<div />`.
+	 *
+	 * Today, however, WP_HTML_Tag_Processor only removes the first such attribute. It seems like a corner case
+	 * and introducing additional complexity to correctly handle this scenario doesn't seem to be worth it.
+	 * Let's revisit if and when this becomes a problem.
+	 *
+	 * This test is in place to confirm this behavior, which while incorrect, is well-defined.
+	 * A later fix introduced to the Tag Processor should update this test to reflect the
+	 * wanted and correct behavior.
+	 *
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 */
+	public function test_remove_first_when_duplicated_attribute() {
+		$p = new WP_HTML_Tag_Processor( '<div id="update-me" id="ignored-id"><span id="second">Text</span></div>' );
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$this->assertSame(
+			'<div  id="ignored-id"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'First attribute (when duplicates exist) was not removed'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 */
+	public function test_remove_attribute_with_an_existing_attribute_name_removes_it_from_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->remove_attribute( 'id' );
+
+		$this->assertSame(
+			'<div ><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Attribute was not removed'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 */
+	public function test_remove_attribute_with_a_non_existing_attribute_name_does_not_change_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->remove_attribute( 'no-such-attribute' );
+
+		$this->assertSame(
+			self::HTML_SIMPLE,
+			$p->get_updated_html(),
+			'Content was changed when attempting to remove an attribute that did not exist'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_creates_a_class_attribute_when_there_is_none() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->add_class( 'foo-class' );
+
+		$this->assertSame(
+			'<div class="foo-class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include class name added via add_class()'
+		);
+		$this->assertSame(
+			'foo-class',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) did not return class name added via add_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_calling_add_class_twice_creates_a_class_attribute_with_both_class_names_when_there_is_no_class_attribute() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->add_class( 'foo-class' );
+		$p->add_class( 'bar-class' );
+
+		$this->assertSame(
+			'<div class="foo-class bar-class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not include class names added via subsequent add_class() calls'
+		);
+		$this->assertSame(
+			'foo-class bar-class',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) did not return class names added via subsequent add_class() calls"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_remove_class_does_not_change_the_markup_when_there_is_no_class_attribute() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->remove_class( 'foo-class' );
+
+		$this->assertSame(
+			self::HTML_SIMPLE,
+			$p->get_updated_html(),
+			'Updated HTML includes class name that was removed by remove_class()'
+		);
+		$this->assertNull(
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) did not return null for class name that was removed by remove_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_appends_class_names_to_the_existing_class_attribute_when_one_already_exists() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'foo-class' );
+		$p->add_class( 'bar-class' );
+
+		$this->assertSame(
+			'<div class="main with-border foo-class bar-class" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect class names added to existing class attribute via subsequent add_class() calls'
+		);
+		$this->assertSame(
+			'main with-border foo-class bar-class',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect class names added to existing class attribute via subsequent add_class() calls"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_remove_class_removes_a_single_class_from_the_class_attribute_when_one_exists() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->remove_class( 'main' );
+
+		$this->assertSame(
+			'<div class=" with-border" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect class name removed from existing class attribute via remove_class()'
+		);
+		$this->assertSame(
+			' with-border',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect class name removed from existing class attribute via remove_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_calling_remove_class_with_all_listed_class_names_removes_the_existing_class_attribute_from_the_markup() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->remove_class( 'main' );
+		$p->remove_class( 'with-border' );
+
+		$this->assertSame(
+			'<div  id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect class attribute removed via subesequent remove_class() calls'
+		);
+		$this->assertNull(
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) did not return null for class attribute removed via subesequent remove_class() calls"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_does_not_add_duplicate_class_names() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'with-border' );
+
+		$this->assertSame(
+			'<div class="main with-border" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect deduplicated class name added via add_class()'
+		);
+		$this->assertSame(
+			'main with-border',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect deduplicated class name added via add_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_preserves_class_name_order_when_a_duplicate_class_name_is_added() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'main' );
+
+		$this->assertSame(
+			'<div class="main with-border" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect class name order after adding duplicated class name via add_class()'
+		);
+		$this->assertSame(
+			'main with-border',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect class name order after adding duplicated class name added via add_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_when_there_is_a_class_attribute_with_excessive_whitespaces() {
+		$p = new WP_HTML_Tag_Processor(
+			'<div class="   main   with-border   " id="first"><span class="not-main bold with-border" id="second">Text</span></div>'
+		);
+		$p->next_tag();
+		$p->add_class( 'foo-class' );
+
+		$this->assertSame(
+			'<div class="   main   with-border foo-class" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect existing excessive whitespace after adding class name via add_class()'
+		);
+		$this->assertSame(
+			'   main   with-border foo-class',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect existing excessive whitespace after adding class name via add_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_remove_class_preserves_whitespaces_when_there_is_a_class_attribute_with_excessive_whitespaces() {
+		$p = new WP_HTML_Tag_Processor(
+			'<div class="   main   with-border   " id="first"><span class="not-main bold with-border" id="second">Text</span></div>'
+		);
+		$p->next_tag();
+		$p->remove_class( 'with-border' );
+
+		$this->assertSame(
+			'<div class="   main" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect existing excessive whitespace after removing class name via remove_class()'
+		);
+		$this->assertSame(
+			'   main',
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) does not reflect existing excessive whitespace after removing class name via removing_class()"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 */
+	public function test_removing_all_classes_removes_the_existing_class_attribute_from_the_markup_even_when_excessive_whitespaces_are_present() {
+		$p = new WP_HTML_Tag_Processor(
+			'<div class="   main   with-border   " id="first"><span class="not-main bold with-border" id="second">Text</span></div>'
+		);
+		$p->next_tag();
+		$p->remove_class( 'main' );
+		$p->remove_class( 'with-border' );
+		$this->assertSame(
+			'<div  id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			'Updated HTML does not reflect removed class attribute after removing all class names via remove_class()'
+		);
+		$this->assertNull(
+			$p->get_attribute( 'class' ),
+			"get_attribute( 'class' ) did not return null after removing all class names via remove_class()"
+		);
+	}
+
+	/**
+	 * When add_class( $different_value ) is called _after_ set_attribute( 'class', $value ), the
+	 * final class name should be "$value $different_value". In other words, the `add_class` call
+	 * should append its class to the one(s) set by `set_attribute`. When `add_class( $different_value )`
+	 * is called _before_ `set_attribute( 'class', $value )`, however, the final class name should be
+	 * "$value" instead, as any direct updates to the `class` attribute supersede any changes enqueued
+	 * via the class builder methods.
+	 *
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_takes_priority_over_add_class() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'add_class' );
+		$p->set_attribute( 'class', 'set_attribute' );
+		$this->assertSame(
+			'<div class="set_attribute" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+		);
+		$this->assertSame(
+			'set_attribute',
+			$p->get_attribute( 'class' ),
+			"Calling get_attribute after updating first tag's attributes did not return the expected class name"
+		);
+
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->set_attribute( 'class', 'set_attribute' );
+		$p->add_class( 'add_class' );
+		$this->assertSame(
+			'<div class="set_attribute add_class" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+		);
+		$this->assertSame(
+			'set_attribute add_class',
+			$p->get_attribute( 'class' ),
+			"Calling get_attribute after updating first tag's attributes did not return the expected class name"
+		);
+	}
+
+	/**
+	 * When add_class( $different_value ) is called _after_ set_attribute( 'class', $value ), the
+	 * final class name should be "$value $different_value". In other words, the `add_class` call
+	 * should append its class to the one(s) set by `set_attribute`. When `add_class( $different_value )`
+	 * is called _before_ `set_attribute( 'class', $value )`, however, the final class name should be
+	 * "$value" instead, as any direct updates to the `class` attribute supersede any changes enqueued
+	 * via the class builder methods.
+	 *
+	 * This is still true when reading enqueued updates before calling `get_updated_html()`.
+	 *
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_takes_priority_over_add_class_even_before_updating() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->add_class( 'add_class' );
+		$p->set_attribute( 'class', 'set_attribute' );
+		$this->assertSame(
+			'set_attribute',
+			$p->get_attribute( 'class' ),
+			"Calling get_attribute after updating first tag's attributes did not return the expected class name"
+		);
+		$this->assertSame(
+			'<div class="set_attribute" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+		);
+
+		$p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+		$p->next_tag();
+		$p->set_attribute( 'class', 'set_attribute' );
+		$p->add_class( 'add_class' );
+		$this->assertSame(
+			'set_attribute add_class',
+			$p->get_attribute( 'class' ),
+			"Calling get_attribute after updating first tag's attributes did not return the expected class name"
+		);
+		$this->assertSame(
+			'<div class="set_attribute add_class" id="first"><span class="not-main bold with-border" id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_overrides_boolean_class_attribute() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'class', true );
+		$p->add_class( 'add_class' );
+		$this->assertSame(
+			'<div class="add_class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
+		);
+		$this->assertSame(
+			'add_class',
+			$p->get_attribute( 'class' ),
+			"get_attribute (called after get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 */
+	public function test_add_class_overrides_boolean_class_attribute_even_before_updating() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+		$p->next_tag();
+		$p->set_attribute( 'class', true );
+		$p->add_class( 'add_class' );
+		$this->assertSame(
+			'add_class',
+			$p->get_attribute( 'class' ),
+			"get_attribute (called before get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
+		);
+		$this->assertSame(
+			'<div class="add_class" id="first"><span id="second">Text</span></div>',
+			$p->get_updated_html(),
+			"Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::remove_class
+	 * @covers WP_HTML_Tag_Processor::get_updated_html
+	 */
+	public function test_advanced_use_case() {
+		$input = <<<HTML
+<div selected class="merge-message" checked>
+	<div class="select-menu d-inline-block">
+		<div checked class="BtnGroup MixedCaseHTML position-relative" />
+		<div checked class="BtnGroup MixedCaseHTML position-relative">
+			<button type="button" class="merge-box-button btn-group-merge rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Merge pull request
+			</button>
+
+			<button type="button" class="merge-box-button btn-group-squash rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Squash and merge
+			</button>
+
+			<button type="button" class="merge-box-button btn-group-rebase rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Rebase and merge
+			</button>
+
+			<button aria-label="Select merge method" disabled="disabled" type="button" data-view-component="true" class="select-menu-button btn BtnGroup-item"></button>
+		</div>
+	</div>
+</div>
+HTML;
+
+		$expected_output = <<<HTML
+<div data-details="{ &quot;key&quot;: &quot;value&quot; }" selected class="merge-message is-processed" checked>
+	<div class="select-menu d-inline-block">
+		<div checked class=" MixedCaseHTML position-relative button-group Another-Mixed-Case" />
+		<div checked class=" MixedCaseHTML position-relative button-group Another-Mixed-Case">
+			<button type="button" class="merge-box-button btn-group-merge rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Merge pull request
+			</button>
+
+			<button type="button" class="merge-box-button btn-group-squash rounded-left-2 btn  BtnGroup-item js-details-target hx_create-pr-button" aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Squash and merge
+			</button>
+
+			<button type="button"  aria-expanded="false" data-details-container=".js-merge-pr" disabled="">
+			  Rebase and merge
+			</button>
+
+			<button aria-label="Select merge method" disabled="disabled" type="button" data-view-component="true" class="select-menu-button btn BtnGroup-item"></button>
+		</div>
+	</div>
+</div>
+HTML;
+
+		$p = new WP_HTML_Tag_Processor( $input );
+		$this->assertTrue( $p->next_tag( 'div' ), 'Did not find first DIV tag in input.' );
+		$p->set_attribute( 'data-details', '{ "key": "value" }' );
+		$p->add_class( 'is-processed' );
+		$this->assertTrue(
+			$p->next_tag(
+				array(
+					'tag_name'   => 'div',
+					'class_name' => 'BtnGroup',
+				)
+			),
+			'Did not find the first BtnGroup DIV tag'
+		);
+		$p->remove_class( 'BtnGroup' );
+		$p->add_class( 'button-group' );
+		$p->add_class( 'Another-Mixed-Case' );
+		$this->assertTrue(
+			$p->next_tag(
+				array(
+					'tag_name'   => 'div',
+					'class_name' => 'BtnGroup',
+				)
+			),
+			'Did not find the second BtnGroup DIV tag'
+		);
+		$p->remove_class( 'BtnGroup' );
+		$p->add_class( 'button-group' );
+		$p->add_class( 'Another-Mixed-Case' );
+		$this->assertTrue(
+			$p->next_tag(
+				array(
+					'tag_name'     => 'button',
+					'class_name'   => 'btn',
+					'match_offset' => 3,
+				)
+			),
+			'Did not find third BUTTON tag with "btn" CSS class'
+		);
+		$p->remove_attribute( 'class' );
+		$this->assertFalse( $p->next_tag( 'non-existent' ), "Found a {$p->get_tag()} tag when none should have been found." );
+		$p->set_attribute( 'class', 'test' );
+		$this->assertSame( $expected_output, $p->get_updated_html(), 'Calling get_updated_html after updating the attributes did not return the expected HTML' );
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 */
+	public function test_correctly_parses_html_attributes_wrapped_in_single_quotation_marks() {
+		$p = new WP_HTML_Tag_Processor(
+			'<div id=\'first\'><span id=\'second\'>Text</span></div>'
+		);
+		$p->next_tag(
+			array(
+				'tag_name' => 'div',
+				'id'       => 'first',
+			)
+		);
+		$p->remove_attribute( 'id' );
+		$p->next_tag(
+			array(
+				'tag_name' => 'span',
+				'id'       => 'second',
+			)
+		);
+		$p->set_attribute( 'id', 'single-quote' );
+		$this->assertSame(
+			'<div ><span id="single-quote">Text</span></div>',
+			$p->get_updated_html(),
+			'Did not remove single-quoted attribute'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_set_attribute_with_value_equal_to_true_adds_a_boolean_html_attribute_with_implicit_value() {
+		$p = new WP_HTML_Tag_Processor(
+			'<form action="/action_page.php"><input type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>'
+		);
+		$p->next_tag( 'input' );
+		$p->set_attribute( 'checked', true );
+		$this->assertSame(
+			'<form action="/action_page.php"><input checked type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>',
+			$p->get_updated_html(),
+			'Did not add "checked" as an expected boolean attribute'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_setting_a_boolean_attribute_to_false_removes_it_from_the_markup() {
+		$p = new WP_HTML_Tag_Processor(
+			'<form action="/action_page.php"><input checked type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>'
+		);
+		$p->next_tag( 'input' );
+		$p->set_attribute( 'checked', false );
+		$this->assertSame(
+			'<form action="/action_page.php"><input  type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>',
+			$p->get_updated_html(),
+			'Did not remove boolean attribute when set to false'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_setting_a_missing_attribute_to_false_does_not_change_the_markup() {
+		$html_input = '<form action="/action_page.php"><input type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>';
+		$p          = new WP_HTML_Tag_Processor( $html_input );
+		$p->next_tag( 'input' );
+		$p->set_attribute( 'checked', false );
+		$this->assertSame(
+			$html_input,
+			$p->get_updated_html(),
+			'Changed the markup unexpectedly when setting a non-existing attribute to false'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_setting_a_boolean_attribute_to_a_string_value_adds_explicit_value_to_the_markup() {
+		$p = new WP_HTML_Tag_Processor(
+			'<form action="/action_page.php"><input checked type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>'
+		);
+		$p->next_tag( 'input' );
+		$p->set_attribute( 'checked', 'checked' );
+		$this->assertSame(
+			'<form action="/action_page.php"><input checked="checked" type="checkbox" name="vehicle" value="Bike"><label for="vehicle">I have a bike</label></form>',
+			$p->get_updated_html(),
+			'Did not add string value to existing boolean attribute'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 */
+	public function test_unclosed_script_tag_should_not_cause_an_infinite_loop() {
+		$p = new WP_HTML_Tag_Processor( '<script>' );
+		$p->next_tag();
+		$this->assertSame( 'SCRIPT', $p->get_tag(), 'Did not find script tag' );
+		$p->next_tag();
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_next_tag_ignores_script_tag_contents
+	 *
+	 * @param string $script_then_div HTML to test.
+	 */
+	public function test_next_tag_ignores_script_tag_contents( $script_then_div ) {
+		$p = new WP_HTML_Tag_Processor( $script_then_div );
+		$p->next_tag();
+		$this->assertSame( 'SCRIPT', $p->get_tag(), 'The first found tag was not "script"' );
+		$p->next_tag();
+		$this->assertSame( 'DIV', $p->get_tag(), 'The second found tag was not "div"' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[].
+	 */
+	public function data_next_tag_ignores_script_tag_contents() {
+		return array(
+			'Simple script tag'                          => array(
+				'<script><span class="d-none d-md-inline">Back to notifications</span></script><div></div>',
+			),
+
+			'Simple uppercase script tag'                => array(
+				'<script><span class="d-none d-md-inline">Back to notifications</span></SCRIPT><div></div>',
+			),
+
+			'Script with a comment opener inside should end at the next script tag closer (dash dash escaped state)' => array(
+				'<script class="d-md-none"><!--</script><div></div>-->',
+			),
+
+			'Script with a comment opener and a script tag opener inside should end two script tag closer later (double escaped state)' => array(
+				'<script class="d-md-none"><!--<script><span1></script><span2></span2></script><div></div>-->',
+			),
+
+			'Double escaped script with a tricky opener' => array(
+				'<script class="d-md-none"><!--<script attr="</script>"></script>"><div></div>',
+			),
+
+			'Double escaped script with a tricky closer' => array(
+				'<script class="d-md-none"><!--<script><span></script attr="</script>"><div></div>',
+			),
+
+			'Double escaped, then escaped, then double escaped' => array(
+				'<script class="d-md-none"><!--<script></script><script></script><span></span></script><div></div>',
+			),
+
+			'Script with a commented a script tag opener inside should at the next tag closer (dash dash escaped state)' => array(
+				'<script class="d-md-none"><!--<script>--><span></script><div></div>-->',
+			),
+
+			'Script closer with another script tag in closer attributes' => array(
+				'<script><span class="d-none d-md-inline">Back to notifications</title</span></script <script><div></div>',
+			),
+
+			'Script closer with attributes'              => array(
+				'<script class="d-md-none"><span class="d-none d-md-inline">Back to notifications</span></script id="test"><div></div>',
+			),
+
+			'Script opener with title closer inside'     => array(
+				'<script class="d-md-none"></title></script><div></div>',
+			),
+
+			'Complex script with many parsing states'    => array(
+				'<script class="d-md-none"><!--<script>--><scRipt><span><!--<span><Script</script>--></scripT><div></div>-->',
+			),
+		);
+	}
+
+	/**
+	 * Invalid tag names are comments on tag closers.
+	 *
+	 * @ticket 58007
+	 *
+	 * @link https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
+	 *
+	 * @dataProvider data_next_tag_ignores_invalid_first_character_of_tag_name_comments
+	 *
+	 * @param string $html_with_markers HTML containing an invalid tag closer whose element before and
+	 *                                  element after contain the "start" and "end" CSS classes.
+	 */
+	public function test_next_tag_ignores_invalid_first_character_of_tag_name_comments( $html_with_markers ) {
+		$p = new WP_HTML_Tag_Processor( $html_with_markers );
+		$p->next_tag( array( 'class_name' => 'start' ) );
+		$p->next_tag();
+
+		$this->assertSame( 'end', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_next_tag_ignores_invalid_first_character_of_tag_name_comments() {
+		return array(
+			'Invalid tag openers as normal text'           => array(
+				'<ul><li><div class=start>I <3 when outflow > inflow</div><img class=end></li></ul>',
+			),
+
+			'Invalid tag closers as comments'              => array(
+				'<ul><li><div class=start>I </3 when <img> outflow <br class=end> inflow</div></li></ul>',
+			),
+
+			'Unexpected question mark instead of tag name' => array(
+				'<div class=start><?xml-stylesheet type="text/css" href="style.css"?><hr class=end>',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_next_tag_ignores_contents_of_rcdata_tag
+	 *
+	 * @param string $rcdata_then_div HTML with RCDATA before a DIV.
+	 * @param string $rcdata_tag      RCDATA tag.
+	 */
+	public function test_next_tag_ignores_contents_of_rcdata_tag( $rcdata_then_div, $rcdata_tag ) {
+		$p = new WP_HTML_Tag_Processor( $rcdata_then_div );
+		$p->next_tag();
+		$this->assertSame( $rcdata_tag, $p->get_tag(), "The first found tag was not '$rcdata_tag'" );
+		$p->next_tag();
+		$this->assertSame( 'DIV', $p->get_tag(), "The second found tag was not 'div'" );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_next_tag_ignores_contents_of_rcdata_tag() {
+		return array(
+			'simple textarea'                          => array(
+				'rcdata_then_div' => '<textarea><span class="d-none d-md-inline">Back to notifications</span></textarea><div></div>',
+				'rcdata_tag'      => 'TEXTAREA',
+			),
+			'simple title'                             => array(
+				'rcdata_then_div' => '<title><span class="d-none d-md-inline">Back to notifications</title</span></title><div></div>',
+				'rcdata_tag'      => 'TITLE',
+			),
+			'comment opener inside a textarea tag should be ignored' => array(
+				'rcdata_then_div' => '<textarea class="d-md-none"><!--</textarea><div></div>-->',
+				'rcdata_tag'      => 'TEXTAREA',
+			),
+			'textarea closer with another textarea tag in closer attributes' => array(
+				'rcdata_then_div' => '<textarea><span class="d-none d-md-inline">Back to notifications</title</span></textarea <textarea><div></div>',
+				'rcdata_tag'      => 'TEXTAREA',
+			),
+			'textarea closer with attributes'          => array(
+				'rcdata_then_div' => '<textarea class="d-md-none"><span class="d-none d-md-inline">Back to notifications</span></textarea id="test"><div></div>',
+				'rcdata_tag'      => 'TEXTAREA',
+			),
+			'textarea opener with title closer inside' => array(
+				'rcdata_then_div' => '<textarea class="d-md-none"></title></textarea><div></div>',
+				'rcdata_tag'      => 'TEXTAREA',
+			),
+		);
+	}
+
+	/**
+	 * Ensures that the invalid comment closing syntax "--!>" properly closes a comment.
+	 *
+	 * @ticket 58007
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 */
+	public function test_allows_incorrectly_closed_comments() {
+		$p = new WP_HTML_Tag_Processor( '<img id=before><!-- <img id=inside> --!><img id=after>--><img id=final>' );
+
+		$p->next_tag();
+		$this->assertSame( 'before', $p->get_attribute( 'id' ), 'Did not find starting tag.' );
+
+		$p->next_tag();
+		$this->assertSame( 'after', $p->get_attribute( 'id' ), 'Did not properly close improperly-closed comment.' );
+
+		$p->next_tag();
+		$this->assertSame( 'final', $p->get_attribute( 'id' ), 'Did not skip over unopened comment-closer.' );
+	}
+
+	/**
+	 * Ensures that unclosed and invalid comments don't trigger warnings or errors.
+	 *
+	 * @ticket 58007
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_html_with_unclosed_comments
+	 *
+	 * @param string $html_ending_before_comment_close HTML with opened comments that aren't closed
+	 */
+	public function test_documents_may_end_with_unclosed_comment( $html_ending_before_comment_close ) {
+		$p = new WP_HTML_Tag_Processor( $html_ending_before_comment_close );
+
+		$this->assertFalse( $p->next_tag() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_html_with_unclosed_comments() {
+		return array(
+			'Shortest open valid comment'      => array( '<!--' ),
+			'Basic truncated comment'          => array( '<!-- this ends --' ),
+			'Comment with closer look-alike'   => array( '<!-- this ends --x' ),
+			'Comment with closer look-alike 2' => array( '<!-- this ends --!x' ),
+			'Invalid tag-closer comment'       => array( '</(when will this madness end?)' ),
+			'Invalid tag-closer comment 2'     => array( '</(when will this madness end?)--' ),
+		);
+	}
+
+	/**
+	 * Ensures that abruptly-closed empty comments are properly closed.
+	 *
+	 * @ticket 58007
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_abruptly_closed_empty_comments
+	 *
+	 * @param string $html_with_after_marker HTML to test with "id=after" on element immediately following an abruptly closed comment.
+	 */
+	public function test_closes_abrupt_closing_of_empty_comment( $html_with_after_marker ) {
+		$p = new WP_HTML_Tag_Processor( $html_with_after_marker );
+		$p->next_tag();
+		$p->next_tag();
+
+		$this->assertSame( 'after', $p->get_attribute( 'id' ), 'Did not find tag after closing abruptly-closed comment' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_abruptly_closed_empty_comments() {
+		return array(
+			'Empty comment with two dashes only' => array( '<hr><!--><hr id=after>' ),
+			'Empty comment with two dashes only, improperly closed' => array( '<hr><!--!><hr id=inside>--><hr id=after>' ),
+			'Comment with two dashes only, improperly closed twice' => array( '<hr><!--!><hr id=inside>--!><hr id=after>' ),
+			'Empty comment with three dashes'    => array( '<hr><!---><hr id=after>' ),
+			'Empty comment with three dashes, improperly closed' => array( '<hr><!---!><hr id=inside>--><hr id=after>' ),
+			'Comment with three dashes, improperly closed twice' => array( '<hr><!---!><hr id=inside>--!><hr id=after>' ),
+			'Empty comment with four dashes'     => array( '<hr><!----><hr id=after>' ),
+			'Empty comment with four dashes, improperly closed' => array( '<hr><!----!><hr id=after>--><hr id=final>' ),
+			'Comment with four dashes, improperly closed twice' => array( '<hr><!----!><hr id=after>--!><hr id=final>' ),
+			'Comment with almost-closer inside'  => array( '<hr><!-- ---!><hr id=after>--!><hr id=final>' ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_skips_contents_of_script_and_rcdata_regions
+	 *
+	 * @param $input_html HTML with multiple divs, one of which carries the "target" attribute.
+	 */
+	public function test_skips_contents_of_script_and_rcdata_regions( $input_html ) {
+		$p = new WP_HTML_Tag_Processor( $input_html );
+		$p->next_tag( 'div' );
+
+		$this->assertTrue(
+			$p->get_attribute( 'target' ),
+			'Did not properly skip over script and rcdata regions; incorrectly found tags inside'
+		);
+	}
+
+	/**
+	 * Data provider
+	 *
+	 * @return array[]
+	 */
+	public function data_skips_contents_of_script_and_rcdata_regions() {
+		return array(
+			'Balanced SCRIPT tags'                => array( '<script>console.log("<div>");</script><div target><div>' ),
+			'Unexpected SCRIPT closer after DIV'  => array( 'console.log("<div target>")</script><div><div>' ),
+			'Unexpected SCRIPT closer before DIV' => array( 'console.log("<span>")</script><div target><div>' ),
+			'Missing SCRIPT closer'               => array( '<script>console.log("<div>");<div><div></script><div target>' ),
+			'TITLE before DIV'                    => array( '<title><div></title><div target><div>' ),
+			'SCRIPT inside TITLE'                 => array( '<title><script><div></title><div target><div></script><div>' ),
+			'TITLE in TEXTAREA'                   => array( '<textarea><div><title><div></textarea><div target></title><div>' ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_can_query_and_update_wrongly_nested_tags() {
+		$p = new WP_HTML_Tag_Processor(
+			'<span>123<p>456</span>789</p>'
+		);
+		$p->next_tag( 'span' );
+		$p->set_attribute( 'class', 'span-class' );
+		$p->next_tag( 'p' );
+		$p->set_attribute( 'class', 'p-class' );
+		$this->assertSame(
+			'<span class="span-class">123<p class="p-class">456</span>789</p>',
+			$p->get_updated_html(),
+			'Did not find overlapping p tag'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 * @covers WP_HTML_Tag_Processor::remove_attribute
+	 */
+	public function test_removing_specific_attributes_in_malformed_html() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
+		$p->next_tag( 'span' );
+		$p->remove_attribute( 'Notifications<' );
+		$this->assertSame(
+			'<div><span class="d-md-none" /span><span class="d-none d-md-inline">Back to notifications</span></div>',
+			$p->get_updated_html(),
+			'Did not remove "Notifications<" attribute in malformed input'
+		);
+	}
+
+	/**
+	 * @ticket 58637
+	 *
+	 * @covers WP_HTML_Tag_Processor::next_tag
+	 *
+	 * @dataProvider data_incomplete_syntax_elements
+	 *
+	 * @param string $incomplete_html HTML text containing some kind of incomplete syntax.
+	 */
+	public function test_returns_false_for_incomplete_syntax_elements( $incomplete_html ) {
+		$p = new WP_HTML_Tag_Processor( $incomplete_html );
+		$this->assertFalse( $p->next_tag() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_incomplete_syntax_elements() {
+		return array(
+			'No tags'                              => array( 'this is nothing more than a text node' ),
+			'Incomplete tag name'                  => array( '<swit' ),
+			'Incomplete tag (no attributes)'       => array( '<div' ),
+			'Incomplete tag (attributes)'          => array( '<div inert title="test"' ),
+			'Incomplete attribute (unquoted)'      => array( '<button disabled' ),
+			'Incomplete attribute (single quoted)' => array( "<li class='just-another class" ),
+			'Incomplete attribute (double quoted)' => array( '<iframe src="https://www.example.com/embed/abcdef' ),
+			'Incomplete comment (normative)'       => array( '<!-- without end' ),
+			'Incomplete comment (missing --)'      => array( '<!-- without end --' ),
+			'Incomplete comment (--!)'             => array( '<!-- without end --!' ),
+			'Incomplete comment (bogus comment)'   => array( '</3 is not a tag' ),
+			'Incomplete DOCTYPE'                   => array( '<!DOCTYPE html' ),
+			'Partial DOCTYPE'                      => array( '<!DOCTY' ),
+			'Incomplete CDATA'                     => array( '<[CDATA[something inside of here needs to get out' ),
+			'Partial CDATA'                        => array( '<[CDA' ),
+			'Partially closed CDATA]'              => array( '<[CDATA[cannot escape]' ),
+			'Partially closed CDATA]>'             => array( '<[CDATA[cannot escape]>' ),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 */
+	public function test_updating_specific_attributes_in_malformed_html() {
+		$p = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
+		$p->next_tag( 'span' );
+		$p->set_attribute( 'id', 'first' );
+		$p->next_tag( 'span' );
+		$p->set_attribute( 'id', 'second' );
+		$this->assertSame(
+			'<div><span id="first" class="d-md-none" Notifications</span><span id="second" class="d-none d-md-inline">Back to notifications</span></div>',
+			$p->get_updated_html(),
+			'Did not add id attributes properly to malformed input'
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 *
+	 * @dataProvider data_updating_attributes
+	 *
+	 * @param string $html     HTML to process.
+	 * @param string $expected Expected updated HTML.
+	 */
+	public function test_updating_attributes( $html, $expected ) {
+		$p = new WP_HTML_Tag_Processor( $html );
+		$p->next_tag();
+		$p->set_attribute( 'foo', 'bar' );
+		$p->add_class( 'firstTag' );
+		$p->next_tag();
+		$p->add_class( 'secondTag' );
+
+		$this->assertSame(
+			$expected,
+			$p->get_updated_html(),
+			'Did not properly add attributes and class names'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_updating_attributes() {
+		return array(
+			'tags inside of a comment' => array(
+				'input'    => '<!-- this is a comment. no <strong>tags</strong> allowed --><span>test</span>',
+				'expected' => '<!-- this is a comment. no <strong>tags</strong> allowed --><span class="firstTag" foo="bar">test</span>',
+			),
+			'does not parse <3'        => array(
+				'input'    => '<3 is a heart but <t3> is a tag.<span>test</span>',
+				'expected' => '<3 is a heart but <t3 class="firstTag" foo="bar"> is a tag.<span class="secondTag">test</span>',
+			),
+			'does not parse <*'        => array(
+				'input'    => 'The applicative operator <* works well in Haskell; is what?<span>test</span>',
+				'expected' => 'The applicative operator <* works well in Haskell; is what?<span class="firstTag" foo="bar">test</span>',
+			),
+			'</> in content'           => array(
+				'input'    => '</><span>test</span>',
+				'expected' => '</><span class="firstTag" foo="bar">test</span>',
+			),
+			'custom asdf attribute'    => array(
+				'input'    => '<hr asdf="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" asdf="test"><span class="secondTag">test</span>',
+			),
+			'custom data-* attribute'  => array(
+				'input'    => '<div data-foo="bar"><p>Some content for a <span>test</span></p></div>',
+				'expected' => '<div class="firstTag" foo="bar" data-foo="bar"><p class="secondTag">Some content for a <span>test</span></p></div>',
+			),
+			'tag inside of CDATA'      => array(
+				'input'    => '<![CDATA[This <is> a <strong id="yes">HTML Tag</strong>]]><span>test</span>',
+				'expected' => '<![CDATA[This <is> a <strong id="yes">HTML Tag</strong>]]><span class="firstTag" foo="bar">test</span>',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 56299
+	 *
+	 * @covers WP_HTML_Tag_Processor::add_class
+	 * @covers WP_HTML_Tag_Processor::set_attribute
+	 *
+	 * @dataProvider data_updating_attributes_in_malformed_html
+	 *
+	 * @param string $html     HTML to process.
+	 * @param string $expected Expected updated HTML.
+	 */
+	public function test_updating_attributes_in_malformed_html( $html, $expected ) {
+		$p = new WP_HTML_Tag_Processor( $html );
+		$p->next_tag();
+		$p->set_attribute( 'foo', 'bar' );
+		$p->add_class( 'firstTag' );
+		$p->next_tag();
+		$p->add_class( 'secondTag' );
+
+		$this->assertSame(
+			$expected,
+			$p->get_updated_html(),
+			'Did not properly update attributes and classnames given malformed input'
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_updating_attributes_in_malformed_html() {
+		$null_byte = chr( 0 );
+
+		return array(
+			'Invalid entity inside attribute value'        => array(
+				'input'    => '<img src="https://s0.wp.com/i/atat.png" title="&; First &lt;title&gt; is &notit;" TITLE="second title" title="An Imperial &imperial; AT-AT"><span>test</span>',
+				'expected' => '<img class="firstTag" foo="bar" src="https://s0.wp.com/i/atat.png" title="&; First &lt;title&gt; is &notit;" TITLE="second title" title="An Imperial &imperial; AT-AT"><span class="secondTag">test</span>',
+			),
+			'HTML tag opening inside attribute value'      => array(
+				'input'    => '<pre id="<code" class="wp-block-code <code is poetry&gt;"><code>This &lt;is> a &lt;strong is="true">thing.</code></pre><span>test</span>',
+				'expected' => '<pre foo="bar" id="<code" class="wp-block-code &lt;code is poetry&gt; firstTag"><code class="secondTag">This &lt;is> a &lt;strong is="true">thing.</code></pre><span>test</span>',
+			),
+			'HTML tag brackets in attribute values and data markup' => array(
+				'input'    => '<pre id="<code-&gt;-block-&gt;" class="wp-block-code <code is poetry&gt;"><code>This &lt;is> a &lt;strong is="true">thing.</code></pre><span>test</span>',
+				'expected' => '<pre foo="bar" id="<code-&gt;-block-&gt;" class="wp-block-code &lt;code is poetry&gt; firstTag"><code class="secondTag">This &lt;is> a &lt;strong is="true">thing.</code></pre><span>test</span>',
+			),
+			'Single and double quotes in attribute value'  => array(
+				'input'    => '<p title="Demonstrating how to use single quote (\') and double quote (&quot;)"><span>test</span>',
+				'expected' => '<p class="firstTag" foo="bar" title="Demonstrating how to use single quote (\') and double quote (&quot;)"><span class="secondTag">test</span>',
+			),
+			'Unquoted attribute values'                    => array(
+				'input'    => '<hr a=1 a=2 a=3 a=5 /><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" a=1 a=2 a=3 a=5 /><span class="secondTag">test</span>',
+			),
+			'Double-quotes escaped in double-quote attribute value' => array(
+				'input'    => '<hr title="This is a &quot;double-quote&quot;"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" title="This is a &quot;double-quote&quot;"><span class="secondTag">test</span>',
+			),
+			'Unquoted attribute value'                     => array(
+				'input'    => '<hr id=code><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id=code><span class="secondTag">test</span>',
+			),
+			'Unquoted attribute value with tag-like value' => array(
+				'input'    => '<hr id= 	<code> ><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id= 	<code> ><span class="secondTag">test</span>',
+			),
+			'Unquoted attribute value with tag-like value followed by tag-like data' => array(
+				'input'    => '<hr id=code>><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id=code>><span class="secondTag">test</span>',
+			),
+			'id=&quo;code'                                 => array(
+				'input'    => '<hr id=&quo;code><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id=&quo;code><span class="secondTag">test</span>',
+			),
+			'id/test=5'                                    => array(
+				'input'    => '<hr id/test=5><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id/test=5><span class="secondTag">test</span>',
+			),
+			'<hr> as the id value'                         => array(
+				'input'    => '<hr title="<hr>"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" title="<hr>"><span class="secondTag">test</span>',
+			),
+			'id=>code'                                     => array(
+				'input'    => '<hr id=>code><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id=>code><span class="secondTag">test</span>',
+			),
+			'id"quo="test"'                                => array(
+				'input'    => '<hr id"quo="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id"quo="test"><span class="secondTag">test</span>',
+			),
+			'id without double quotation marks around null byte' => array(
+				'input'    => '<hr id' . $null_byte . 'zero="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id' . $null_byte . 'zero="test"><span class="secondTag">test</span>',
+			),
+			'Unexpected > before an attribute'             => array(
+				'input'    => '<hr >id="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" >id="test"><span class="secondTag">test</span>',
+			),
+			'Unexpected = before an attribute'             => array(
+				'input'    => '<hr =id="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" =id="test"><span class="secondTag">test</span>',
+			),
+			'Unexpected === before an attribute'           => array(
+				'input'    => '<hr ===name="value"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" ===name="value"><span class="secondTag">test</span>',
+			),
+			'Missing closing data-tag tag'                 => array(
+				'input'    => 'The applicative operator <* works well in Haskell; <data-tag> is what?<span>test</span>',
+				'expected' => 'The applicative operator <* works well in Haskell; <data-tag class="firstTag" foo="bar"> is what?<span class="secondTag">test</span>',
+			),
+			'Missing closing t3 tag'                       => array(
+				'input'    => '<3 is a heart but <t3> is a tag.<span>test</span>',
+				'expected' => '<3 is a heart but <t3 class="firstTag" foo="bar"> is a tag.<span class="secondTag">test</span>',
+			),
+			'invalid comment opening tag'                  => array(
+				'input'    => '<?comment --><span>test</span>',
+				'expected' => '<?comment --><span class="firstTag" foo="bar">test</span>',
+			),
+			'=asdf as attribute name'                      => array(
+				'input'    => '<hr =asdf="tes"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" =asdf="tes"><span class="secondTag">test</span>',
+			),
+			'== as attribute name with value'              => array(
+				'input'    => '<hr ==="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" ==="test"><span class="secondTag">test</span>',
+			),
+			'=5 as attribute'                              => array(
+				'input'    => '<hr =5><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" =5><span class="secondTag">test</span>',
+			),
+			'= as attribute'                               => array(
+				'input'    => '<hr =><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" =><span class="secondTag">test</span>',
+			),
+			'== as attribute'                              => array(
+				'input'    => '<hr ==><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" ==><span class="secondTag">test</span>',
+			),
+			'=== as attribute'                             => array(
+				'input'    => '<hr ===><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" ===><span class="secondTag">test</span>',
+			),
+			'unsupported disabled attribute'               => array(
+				'input'    => '<hr disabled><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" disabled><span class="secondTag">test</span>',
+			),
+			'malformed custom attributes'                  => array(
+				'input'    => '<hr a"sdf="test"><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" a"sdf="test"><span class="secondTag">test</span>',
+			),
+			'Multiple unclosed tags treated as a single tag' => array(
+				'input'    => <<<HTML
+					<hr id=">"code
+					<hr id="value>"code
+					<hr id="/>"code
+					<hr id="value/>"code
+					/>
+					<span>test</span>
+HTML
+				,
+				'expected' => <<<HTML
+					<hr class="firstTag" foo="bar" id=">"code
+					<hr id="value>"code
+					<hr id="/>"code
+					<hr id="value/>"code
+					/>
+					<span class="secondTag">test</span>
+HTML
+			,
+			),
+			'<hr id   =5>'                                 => array(
+				'input'    => '<hr id   =5><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id   =5><span class="secondTag">test</span>',
+			),
+			'<hr id a  =5>'                                => array(
+				'input'    => '<hr id a  =5><span>test</span>',
+				'expected' => '<hr class="firstTag" foo="bar" id a  =5><span class="secondTag">test</span>',
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/http/base.php b/tests/phpunit/tests/http/base.php
index ee42056bb3d36..00abf1655bacd 100644
--- a/tests/phpunit/tests/http/base.php
+++ b/tests/phpunit/tests/http/base.php
@@ -8,7 +8,7 @@
  * You may also need `-d safe_mode_gid=1` to relax the safe_mode checks to allow
  * inclusion of PEAR.
  *
- * The WP_HTTP tests require a class-http.php file of r17550 or later.
+ * The WP_Http tests require a class-http.php file of r17550 or later.
  */
 abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase {
 	// You can use your own version of data/WPHTTP-testcase-redirection-script.php here.
@@ -283,7 +283,7 @@ public function test_file_stream() {
 		$this->skipTestOnTimeout( $res );
 		$this->assertNotWPError( $res );
 		$this->assertSame( '', $res['body'] ); // The body should be empty.
-		$this->assertEquals( $size, $res['headers']['content-length'] );   // Check the headers are returned (and the size is the same).
+		$this->assertEquals( $size, $res['headers']['Content-Length'] );   // Check the headers are returned (and the size is the same).
 		$this->assertSame( $size, $filesize ); // Check that the file is written to disk correctly without any extra characters.
 		$this->assertStringStartsWith( get_temp_dir(), $res['filename'] ); // Check it's saving within the temp directory.
 	}
@@ -435,31 +435,6 @@ public function test_https_url_without_ssl_verification() {
 		$this->assertNotWPError( $res );
 	}
 
-	/**
-	 * Test HTTP Redirects with multiple Location headers specified.
-	 *
-	 * @ticket 16890
-	 *
-	 * @covers ::wp_remote_head
-	 * @covers ::wp_remote_retrieve_header
-	 * @covers ::wp_remote_get
-	 * @covers ::wp_remote_retrieve_body
-	 */
-	public function test_multiple_location_headers() {
-		$url = 'http://api.wordpress.org/core/tests/1.0/redirection.php?multiple-location-headers=1';
-		$res = wp_remote_head( $url, array( 'timeout' => 30 ) );
-
-		$this->skipTestOnTimeout( $res );
-		$this->assertIsArray( wp_remote_retrieve_header( $res, 'location' ) );
-		$this->assertCount( 2, wp_remote_retrieve_header( $res, 'location' ) );
-
-		$res = wp_remote_get( $url, array( 'timeout' => 30 ) );
-
-		$this->skipTestOnTimeout( $res );
-		$this->assertSame( 'PASS', wp_remote_retrieve_body( $res ) );
-
-	}
-
 	/**
 	 * Test HTTP Cookie handling.
 	 *
diff --git a/tests/phpunit/tests/http/functions.php b/tests/phpunit/tests/http/functions.php
index 49854e0053ef8..cb0045fd504cb 100644
--- a/tests/phpunit/tests/http/functions.php
+++ b/tests/phpunit/tests/http/functions.php
@@ -20,8 +20,8 @@ public function test_head_request() {
 
 		$this->assertIsArray( $response );
 
-		$this->assertSame( 'image/jpeg', $headers['content-type'] );
-		$this->assertSame( '40148', $headers['content-length'] );
+		$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
+		$this->assertSame( '40148', $headers['Content-Length'] );
 		$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
 	}
 
@@ -65,8 +65,8 @@ public function test_get_request() {
 		$this->assertIsArray( $response );
 
 		// Should return the same headers as a HEAD request.
-		$this->assertSame( 'image/jpeg', $headers['content-type'] );
-		$this->assertSame( '40148', $headers['content-length'] );
+		$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
+		$this->assertSame( '40148', $headers['Content-Length'] );
 		$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
 	}
 
@@ -86,8 +86,8 @@ public function test_get_redirect() {
 		$headers = wp_remote_retrieve_headers( $response );
 
 		// Should return the same headers as a HEAD request.
-		$this->assertSame( 'image/jpeg', $headers['content-type'] );
-		$this->assertSame( '40148', $headers['content-length'] );
+		$this->assertSame( 'image/jpeg', $headers['Content-Type'] );
+		$this->assertSame( '40148', $headers['Content-Length'] );
 		$this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
 	}
 
@@ -216,9 +216,9 @@ public function test_get_response_cookies_with_name_value_array() {
 	 */
 	public function test_get_cookie_host_only() {
 		// Emulate WP_Http::request() internals.
-		$requests_response = new Requests_Response();
+		$requests_response = new WpOrg\Requests\Response();
 
-		$requests_response->cookies['test'] = Requests_Cookie::parse( 'test=foo; domain=.wordpress.org' );
+		$requests_response->cookies['test'] = WpOrg\Requests\Cookie::parse( 'test=foo; domain=.wordpress.org' );
 
 		$requests_response->cookies['test']->flags['host-only'] = false; // https://github.com/WordPress/Requests/issues/306
 
@@ -231,7 +231,7 @@ public function test_get_cookie_host_only() {
 		$this->assertSame( $cookie->domain, 'wordpress.org' );
 		$this->assertFalse( $cookie->host_only, 'host-only flag not set' );
 
-		// Regurgitate (Requests_Cookie -> WP_Http_Cookie -> Requests_Cookie).
+		// Regurgitate (WpOrg\Requests\Cookie -> WP_Http_Cookie -> WpOrg\Requests\Cookie).
 		$cookies = WP_Http::normalize_cookies( wp_remote_retrieve_cookies( $response ) );
 		$this->assertFalse( $cookies['test']->flags['host-only'], 'host-only flag data lost' );
 	}
diff --git a/tests/phpunit/tests/http/http.php b/tests/phpunit/tests/http/http.php
index 23a28f4d75fd8..47d169e619326 100644
--- a/tests/phpunit/tests/http/http.php
+++ b/tests/phpunit/tests/http/http.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Non-transport-specific WP_HTTP Tests
+ * Non-transport-specific WP_Http Tests
  *
  * @group http
  */
@@ -9,7 +9,10 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase {
 	const FULL_TEST_URL = 'http://username:password@host.name:9090/path?arg1=value1&arg2=value2#anchor';
 
 	/**
-	 * @dataProvider make_absolute_url_testcases
+	 * @ticket 20434
+	 * @ticket 56231
+	 *
+	 * @dataProvider data_make_absolute_url
 	 *
 	 * @covers WP_Http::make_absolute_url
 	 */
@@ -18,7 +21,7 @@ public function test_make_absolute_url( $relative_url, $absolute_url, $expected
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function make_absolute_url_testcases() {
+	public function data_make_absolute_url() {
 		// 0: The Location header, 1: The current URL, 3: The expected URL.
 		return array(
 			// Absolute URL provided.
@@ -66,11 +69,18 @@ public function make_absolute_url_testcases() {
 
 			// Schemeless URL's (not valid in HTTP Headers, but may be used elsewhere).
 			array( '//example.com/sub/', 'https://example.net', 'https://example.com/sub/' ),
+
+			// URLs with fragments.
+			array( '/path#frag', 'http://example.org/', 'http://example.org/path#frag' ),
+			array( '/path/#frag', 'http://example.org/', 'http://example.org/path/#frag' ),
+			array( '/path#frag&ment=1', 'http://example.org/', 'http://example.org/path#frag&ment=1' ),
+			array( '/path?query=string#frag', 'http://example.org/', 'http://example.org/path?query=string#frag' ),
+			array( '/path?query=string%23frag', 'http://example.org/', 'http://example.org/path?query=string%23frag' ),
 		);
 	}
 
 	/**
-	 * @dataProvider parse_url_testcases
+	 * @dataProvider data_wp_parse_url
 	 *
 	 * @covers ::wp_parse_url
 	 */
@@ -79,7 +89,7 @@ public function test_wp_parse_url( $url, $expected ) {
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function parse_url_testcases() {
+	public function data_wp_parse_url() {
 		// 0: The URL, 1: The expected resulting structure.
 		return array(
 			array(
@@ -207,7 +217,7 @@ public function test_wp_parse_url_with_default_component() {
 	/**
 	 * @ticket 36356
 	 *
-	 * @dataProvider parse_url_component_testcases
+	 * @dataProvider data_wp_parse_url_with_component
 	 *
 	 * @covers ::wp_parse_url
 	 */
@@ -216,7 +226,7 @@ public function test_wp_parse_url_with_component( $url, $component, $expected )
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function parse_url_component_testcases() {
+	public function data_wp_parse_url_with_component() {
 		// 0: The URL, 1: The requested component, 2: The expected resulting structure.
 		return array(
 			array( self::FULL_TEST_URL, PHP_URL_SCHEME, 'http' ),
@@ -309,13 +319,13 @@ public function test_normalize_cookies_scalar_values() {
 			)
 		);
 
-		$this->assertInstanceOf( 'Requests_Cookie_Jar', $cookie_jar );
+		$this->assertInstanceOf( 'WpOrg\Requests\Cookie\Jar', $cookie_jar );
 
 		foreach ( array_keys( $cookies ) as $cookie ) {
 			if ( 'foo' === $cookie ) {
 				$this->assertArrayNotHasKey( $cookie, $cookie_jar );
 			} else {
-				$this->assertInstanceOf( 'Requests_Cookie', $cookie_jar[ $cookie ] );
+				$this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar[ $cookie ] );
 			}
 		}
 	}
@@ -323,7 +333,7 @@ public function test_normalize_cookies_scalar_values() {
 	/**
 	 * @ticket 36356
 	 *
-	 * @dataProvider get_component_from_parsed_url_array_testcases
+	 * @dataProvider data_get_component_from_parsed_url_array
 	 *
 	 * @covers ::wp_parse_url
 	 * @covers ::_get_component_from_parsed_url_array
@@ -334,7 +344,7 @@ public function test_get_component_from_parsed_url_array( $url, $component, $exp
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function get_component_from_parsed_url_array_testcases() {
+	public function data_get_component_from_parsed_url_array() {
 		// 0: A URL, 1: PHP URL constant, 2: The expected result.
 		return array(
 			array(
@@ -365,7 +375,7 @@ public function get_component_from_parsed_url_array_testcases() {
 	/**
 	 * @ticket 36356
 	 *
-	 * @dataProvider wp_translate_php_url_constant_to_key_testcases
+	 * @dataProvider data_wp_translate_php_url_constant_to_key
 	 *
 	 * @covers ::_wp_translate_php_url_constant_to_key
 	 */
@@ -374,7 +384,7 @@ public function test_wp_translate_php_url_constant_to_key( $input, $expected ) {
 		$this->assertSame( $expected, $actual );
 	}
 
-	public function wp_translate_php_url_constant_to_key_testcases() {
+	public function data_wp_translate_php_url_constant_to_key() {
 		// 0: PHP URL constant, 1: The expected result.
 		return array(
 			array( PHP_URL_SCHEME, 'scheme' ),
@@ -567,4 +577,89 @@ public function callback_custom_safe_ports( $ports ) {
 	public function callback_remove_safe_ports( $ports ) {
 		return array();
 	}
+
+	/**
+	 * Test HTTP Redirects with multiple Location headers specified.
+	 *
+	 * Ensure the WP_Http::handle_redirects() method handles multiple Location headers
+	 * and the HTTP request it makes uses the last Location header.
+	 *
+	 * @ticket 16890
+	 * @ticket 57306
+	 *
+	 * @covers WP_Http::handle_redirects
+	 */
+	public function test_multiple_location_headers() {
+		$pre_http_request_filter_has_run = false;
+		// Filter the response made by WP_Http::handle_redirects().
+		add_filter(
+			'pre_http_request',
+			function( $response, $parsed_args, $url ) use ( &$pre_http_request_filter_has_run ) {
+				$pre_http_request_filter_has_run = true;
+
+				// Assert the redirect URL is correct.
+				$this->assertSame(
+					$url,
+					'http://example.com/?multiple-location-headers=1&redirected=two'
+				);
+
+				if ( 'http://example.com/?multiple-location-headers=1&redirected=two' === $url ) {
+					$body = 'PASS';
+				} else {
+					$body = 'FAIL';
+				}
+
+				return array(
+					'headers'  => array(),
+					'body'     => $body,
+					'response' => array(
+						'code'    => 200,
+						'message' => 'OK',
+					),
+					'cookies'  => array(),
+					'filename' => null,
+				);
+			},
+			10,
+			3
+		);
+
+		$headers = array(
+			'server'       => 'nginx',
+			'date'         => 'Sun, 11 Dec 2022 23:11:22 GMT',
+			'content-type' => 'text/html; charset=utf-8',
+			'location'     => array(
+				'http://example.com/?multiple-location-headers=1&redirected=one',
+				'http://example.com/?multiple-location-headers=1&redirected=two',
+			),
+		);
+
+		// Test the tests: ensure multiple locations are passed to WP_Http::handle_redirects().
+		$this->assertIsArray( $headers['location'], 'Location header is expected to be an array.' );
+		$this->assertCount( 2, $headers['location'], 'Location header is expected to contain two values.' );
+
+		$args = array(
+			'timeout'      => 30,
+			'_redirection' => 3,
+			'redirection'  => 2,
+			'method'       => 'GET',
+		);
+
+		$redirect_response = WP_Http::handle_redirects(
+			'http://example.com/?multiple-location-headers=1',
+			$args,
+			array(
+				'headers'  => $headers,
+				'body'     => '',
+				'cookies'  => array(),
+				'filename' => null,
+				'response' => array(
+					'code'    => 302,
+					'message' => 'Found',
+				),
+			)
+		);
+		$this->assertSame( 'PASS', wp_remote_retrieve_body( $redirect_response ), 'Redirect response body is expected to be PASS.' );
+		$this->assertTrue( $pre_http_request_filter_has_run, 'The pre_http_request filter is expected to run.' );
+	}
 }
diff --git a/tests/phpunit/tests/http/includeOldRequestsClass.php b/tests/phpunit/tests/http/includeOldRequestsClass.php
new file mode 100644
index 0000000000000..3be2173b6c566
--- /dev/null
+++ b/tests/phpunit/tests/http/includeOldRequestsClass.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Tests that the old Requests class is included
+ * for plugins or themes that still use it.
+ *
+ * @group http
+ */
+class Tests_HTTP_IncludeOldRequestsClass extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 57341
+	 *
+	 * @coversNothing
+	 */
+	public function test_should_include_old_requests_class() {
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage( 'The PSR-0 `Requests_...` class names in the Requests library are deprecated.' );
+
+		new Requests();
+	}
+}
diff --git a/tests/phpunit/tests/http/wpGetHttpHeaders.php b/tests/phpunit/tests/http/wpGetHttpHeaders.php
index b462d7d8da1e3..aa5be431d8754 100644
--- a/tests/phpunit/tests/http/wpGetHttpHeaders.php
+++ b/tests/phpunit/tests/http/wpGetHttpHeaders.php
@@ -44,16 +44,16 @@ public function test_wp_get_http_headers_deprecated_argument() {
 	/**
 	 * Mock the HTTP request response
 	 *
-	 * @param bool   $false     False.
-	 * @param array  $arguments Request arguments.
-	 * @param string $url       Request URL.
-	 * @return array|bool
+	 * @param false|array|WP_Error $response    A preemptive return value of an HTTP request. Default false.
+	 * @param array                $parsed_args HTTP request arguments.
+	 * @param string               $url         The request URL.
+	 * @return false|array|WP_Error Response data.
 	 */
-	public function mock_http_request( $false, $arguments, $url ) {
+	public function mock_http_request( $response, $parsed_args, $url ) {
 		if ( 'http://example.com' === $url ) {
 			return array( 'headers' => true );
 		}
 
-		return false;
+		return $response;
 	}
 }
diff --git a/tests/phpunit/tests/https-detection.php b/tests/phpunit/tests/https-detection.php
index 1ae5af13091e1..820f39fc6e47a 100644
--- a/tests/phpunit/tests/https-detection.php
+++ b/tests/phpunit/tests/https-detection.php
@@ -196,39 +196,11 @@ public function test_wp_is_local_html_output_via_rsd_link() {
 		$this->assertFalse( wp_is_local_html_output( $html ) );
 	}
 
-	/**
-	 * @ticket 47577
-	 */
-	public function test_wp_is_local_html_output_via_wlwmanifest_link() {
-		remove_action( 'wp_head', 'rsd_link' );
-
-		// HTML includes WLW manifest link.
-		$head_tag = get_echo( 'wlwmanifest_link' );
-		$html     = $this->get_sample_html_string( $head_tag );
-		$this->assertTrue( wp_is_local_html_output( $html ) );
-
-		// HTML includes modified WLW manifest link but same URL.
-		$head_tag = str_replace( ' />', '>', get_echo( 'wlwmanifest_link' ) );
-		$html     = $this->get_sample_html_string( $head_tag );
-		$this->assertTrue( wp_is_local_html_output( $html ) );
-
-		// HTML includes WLW manifest link with alternative URL scheme.
-		$head_tag = get_echo( 'wlwmanifest_link' );
-		$head_tag = false !== strpos( $head_tag, 'https://' ) ? str_replace( 'https://', 'http://', $head_tag ) : str_replace( 'http://', 'https://', $head_tag );
-		$html     = $this->get_sample_html_string( $head_tag );
-		$this->assertTrue( wp_is_local_html_output( $html ) );
-
-		// HTML does not include WLW manifest link.
-		$html = $this->get_sample_html_string();
-		$this->assertFalse( wp_is_local_html_output( $html ) );
-	}
-
 	/**
 	 * @ticket 47577
 	 */
 	public function test_wp_is_local_html_output_via_rest_link() {
 		remove_action( 'wp_head', 'rsd_link' );
-		remove_action( 'wp_head', 'wlwmanifest_link' );
 
 		// HTML includes REST API link.
 		$head_tag = get_echo( 'rest_output_link_wp_head' );
@@ -256,7 +228,6 @@ public function test_wp_is_local_html_output_via_rest_link() {
 	 */
 	public function test_wp_is_local_html_output_cannot_determine() {
 		remove_action( 'wp_head', 'rsd_link' );
-		remove_action( 'wp_head', 'wlwmanifest_link' );
 		remove_action( 'wp_head', 'rest_output_link_wp_head' );
 
 		// The HTML here doesn't matter because all hooks are removed.
@@ -264,37 +235,37 @@ public function test_wp_is_local_html_output_cannot_determine() {
 		$this->assertNull( wp_is_local_html_output( $html ) );
 	}
 
-	public function record_request_url( $preempt, $parsed_args, $url ) {
+	public function record_request_url( $response, $parsed_args, $url ) {
 		$this->last_request_url = $url;
-		return $preempt;
+		return $response;
 	}
 
-	public function mock_success_with_sslverify( $preempt, $parsed_args ) {
+	public function mock_success_with_sslverify( $response, $parsed_args ) {
 		if ( ! empty( $parsed_args['sslverify'] ) ) {
 			return $this->mock_success();
 		}
-		return $preempt;
+		return $response;
 	}
 
-	public function mock_error_with_sslverify( $preempt, $parsed_args ) {
+	public function mock_error_with_sslverify( $response, $parsed_args ) {
 		if ( ! empty( $parsed_args['sslverify'] ) ) {
 			return $this->mock_error();
 		}
-		return $preempt;
+		return $response;
 	}
 
-	public function mock_success_without_sslverify( $preempt, $parsed_args ) {
+	public function mock_success_without_sslverify( $response, $parsed_args ) {
 		if ( empty( $parsed_args['sslverify'] ) ) {
 			return $this->mock_success();
 		}
-		return $preempt;
+		return $response;
 	}
 
-	public function mock_error_without_sslverify( $preempt, $parsed_args ) {
+	public function mock_error_without_sslverify( $response, $parsed_args ) {
 		if ( empty( $parsed_args['sslverify'] ) ) {
 			return $this->mock_error();
 		}
-		return $preempt;
+		return $response;
 	}
 
 	public function mock_not_found() {
diff --git a/tests/phpunit/tests/image/editor.php b/tests/phpunit/tests/image/editor.php
index be4591451d8ec..6e800deb7af12 100644
--- a/tests/phpunit/tests/image/editor.php
+++ b/tests/phpunit/tests/image/editor.php
@@ -288,7 +288,7 @@ public function test_get_suffix() {
 	 * Test wp_get_webp_info.
 	 *
 	 * @ticket 35725
-	 * @dataProvider _test_wp_get_webp_info
+	 * @dataProvider data_wp_get_webp_info
 	 *
 	 */
 	public function test_wp_get_webp_info( $file, $expected ) {
@@ -305,7 +305,7 @@ public function test_wp_get_webp_info( $file, $expected ) {
 	/**
 	 * Data provider for test_wp_get_webp_info().
 	 */
-	public function _test_wp_get_webp_info() {
+	public function data_wp_get_webp_info() {
 		return array(
 			// Standard JPEG.
 			array(
diff --git a/tests/phpunit/tests/image/editorImagick.php b/tests/phpunit/tests/image/editorImagick.php
index a8db8a3210123..1209203904033 100644
--- a/tests/phpunit/tests/image/editorImagick.php
+++ b/tests/phpunit/tests/image/editorImagick.php
@@ -641,4 +641,54 @@ public function test_directory_creation() {
 
 		$this->assertNotWPError( $saved );
 	}
+
+	/**
+	 * Tests that the alpha channel of PDFs is removed from PDF previews.
+	 *
+	 * Only affects systems with Ghostscript version >= 9.14.
+	 *
+	 * @ticket 39216
+	 *
+	 * @covers WP_Image_Editor_Imagick::remove_pdf_alpha_channel
+	 */
+	public function test_remove_pdf_alpha_channel_should_remove_the_alpha_channel_in_preview() {
+		if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
+			$this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
+		}
+
+		$test_file     = DIR_TESTDATA . '/images/test-alpha.pdf';
+		$attachment_id = $this->factory->attachment->create_upload_object( $test_file );
+		$this->assertNotEmpty( $attachment_id, 'The attachment was not created before testing.' );
+
+		$attached_file = get_attached_file( $attachment_id );
+		$this->assertNotEmpty( $attached_file, 'The attached file was not returned.' );
+
+		$rgb = array(
+			'r' => true,
+			'g' => true,
+			'b' => true,
+		);
+
+		// White.
+		$expected = array(
+			'r' => 1,
+			'g' => 1,
+			'b' => 1,
+		);
+
+		$check = image_get_intermediate_size( $attachment_id, 'full' );
+		$this->assertIsArray( $check, 'The intermediate size could not be retrieved.' );
+		$this->assertArrayHasKey( 'file', $check, 'The intermediate size file was not found.' );
+
+		$check_file = path_join( dirname( $attached_file ), $check['file'] );
+		$imagick    = new Imagick( $check_file );
+		$output     = array_map(
+			static function( $value ) {
+				return (int) round( $value );
+			},
+			array_intersect_key( $imagick->getImagePixelColor( 100, 100 )->getColor( true /* normalized */ ), $rgb )
+		);
+		$imagick->destroy();
+		$this->assertSame( $expected, $output, 'The image color of the generated thumb does not match expected opaque background.' ); // Allow for floating point equivalence.
+	}
 }
diff --git a/tests/phpunit/tests/image/functions.php b/tests/phpunit/tests/image/functions.php
index 38ef2892a644e..356b2dceacd8c 100644
--- a/tests/phpunit/tests/image/functions.php
+++ b/tests/phpunit/tests/image/functions.php
@@ -283,8 +283,8 @@ public function test_wp_save_image_file( $class_name, $mime_type ) {
 		$ret  = wp_save_image_file( $file, $img, $mime_type, 1 );
 
 		// Make assertions.
-		$this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
 		$this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+		$this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
 		$this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image does not match.' );
 
 		// Clean up.
@@ -327,6 +327,114 @@ public function data_wp_save_image_file() {
 		return $data;
 	}
 
+	/**
+	 * Tests that wp_save_image_file() throws a deprecated argument notice when passed a GD resource.
+	 *
+	 * @ticket 6821
+	 * @expectedDeprecated wp_save_image_file
+	 * @requires function imagejpeg
+	 *
+	 * @covers ::wp_save_image_file
+	 */
+	public function test_wp_save_image_file_deprecated_argument_with_gd_resource() {
+		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+
+		// Call wp_save_image_file().
+		$file = wp_tempnam();
+		$img  = imagecreatefromjpeg( DIR_TESTDATA . '/images/canola.jpg' );
+		$ret  = wp_save_image_file( $file, $img, 'image/jpeg', 1 );
+
+		imagedestroy( $img );
+		unlink( $file );
+
+		$this->assertTrue( $ret, 'Image failed to save.' );
+	}
+
+	/**
+	 * Tests that `wp_image_editor()` applies 'image_edit_thumbnails_separately' filters.
+	 *
+	 * @ticket 53161
+	 *
+	 * @covers ::wp_image_editor
+	 */
+	public function test_wp_image_editor_should_apply_image_edit_thumbnails_separately_filters() {
+		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+
+		$filename = DIR_TESTDATA . '/images/canola.jpg';
+		$contents = file_get_contents( $filename );
+		$upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$id       = $this->_make_attachment( $upload );
+
+		$filter = new MockAction();
+		add_filter( 'image_edit_thumbnails_separately', array( &$filter, 'filter' ) );
+
+		ob_start();
+		wp_image_editor( $id );
+		ob_end_clean();
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+
+	/**
+	 * Tests that `wp_image_editor()` conditionally outputs markup for editing thumbnails separately
+	 * based on the result of applying 'image_edit_thumbnails_separately' filters.
+	 *
+	 * @ticket 53161
+	 *
+	 * @covers ::wp_image_editor
+	 *
+	 * @dataProvider data_wp_image_editor_should_respect_image_edit_thumbnails_separately_filters
+	 *
+	 * @param string $callback The name of the callback for the 'image_edit_thumbnails_separately' hook.
+	 * @param bool   $expected Whether the markup should be output.
+	 */
+	public function test_wp_image_editor_should_respect_image_edit_thumbnails_separately_filters( $callback, $expected ) {
+		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+
+		$filename = DIR_TESTDATA . '/images/canola.jpg';
+		$contents = file_get_contents( $filename );
+		$upload   = wp_upload_bits( wp_basename( $filename ), null, $contents );
+		$id       = $this->_make_attachment( $upload );
+
+		add_filter( 'image_edit_thumbnails_separately', $callback );
+
+		ob_start();
+		wp_image_editor( $id );
+		$actual = ob_get_clean();
+
+		if ( $expected ) {
+			$this->assertStringContainsString(
+				'imgedit-applyto',
+				$actual,
+				'The markup should have been output.'
+			);
+		} else {
+			$this->assertStringNotContainsString(
+				'imgedit-applyto',
+				$actual,
+				'The markup should not have been output.'
+			);
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_image_editor_should_respect_image_edit_thumbnails_separately_filters() {
+		return array(
+			'true'  => array(
+				'callback' => '__return_true',
+				'expected' => true,
+			),
+			'false' => array(
+				'callback' => '__return_false',
+				'expected' => false,
+			),
+		);
+	}
+
 	/**
 	 * Tests that a passed mime type overrides the extension in the filename when saving an image.
 	 *
@@ -351,8 +459,8 @@ public function test_mime_overrides_filename_when_saving_an_image( $class_name )
 		$ret       = $img->save( $file, $mime_type );
 
 		// Make assertions.
-		$this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
 		$this->assertNotWPError( $ret, 'Image failed to save - WP_Error returned.' );
+		$this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
 		$this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image did not override file name.' );
 
 		// Clean up.
@@ -397,8 +505,8 @@ public function test_inferred_mime_types_when_saving_an_image( $class_name, $ext
 		$ret  = $img->save( trailingslashit( $temp ) . $file );
 
 		// Make assertions.
-		$this->assertNotEmpty( $ret, 'Image failed to save - "empty" response returned.' );
 		$this->assertNotWPError( $ret, 'Image failed to save - WP Error returned.' );
+		$this->assertIsArray( $ret, 'Image failed to save - non-array response returned.' );
 		$this->assertSame( $mime_type, $this->get_mime_type( $ret['path'] ), 'Mime type of the saved image was not inferred correctly.' );
 
 		// Clean up.
@@ -656,7 +764,8 @@ public function test_wp_generate_attachment_metadata_pdf() {
 			)
 		);
 
-		$this->assertNotEmpty( $attachment_id );
+		$this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+		$this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
 		$temp_dir = get_temp_dir();
 
@@ -733,7 +842,8 @@ public function test_crop_setting_for_pdf() {
 			)
 		);
 
-		$this->assertNotEmpty( $attachment_id );
+		$this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+		$this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
 		$temp_dir = get_temp_dir();
 
@@ -806,7 +916,8 @@ public function test_fallback_intermediate_image_sizes() {
 			)
 		);
 
-		$this->assertNotEmpty( $attachment_id );
+		$this->assertNotWPError( $attachment_id, 'Could not create attachment - WP_Error returned.' );
+		$this->assertIsInt( $attachment_id, 'Could not create attachment - non-integer response returned.' );
 
 		add_image_size( 'test-size', 100, 100 );
 		add_filter( 'fallback_intermediate_image_sizes', array( $this, 'filter_fallback_intermediate_image_sizes' ), 10, 2 );
diff --git a/tests/phpunit/tests/import/parser.php b/tests/phpunit/tests/import/parser.php
index 2c05bb8f354c8..f302cefa29441 100644
--- a/tests/phpunit/tests/import/parser.php
+++ b/tests/phpunit/tests/import/parser.php
@@ -33,7 +33,7 @@ public function test_malformed_wxr() {
 
 		// Regex based parser cannot detect malformed XML.
 		foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML' ) as $p ) {
-			$parser = new $p;
+			$parser = new $p();
 			$result = $parser->parse( $file );
 			$this->assertWPError( $result );
 			$this->assertSame( 'There was an error when reading this WXR file', $result->get_error_message() );
@@ -51,7 +51,7 @@ public function test_invalid_wxr() {
 
 		foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
 			foreach ( array( $f1, $f2 ) as $file ) {
-				$parser = new $p;
+				$parser = new $p();
 				$result = $parser->parse( $file );
 				$this->assertWPError( $result );
 				$this->assertSame( 'This does not appear to be a WXR file, missing/invalid WXR version number', $result->get_error_message() );
@@ -69,7 +69,7 @@ public function test_wxr_version_1_1() {
 
 		foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
 			$message = $p . ' failed';
-			$parser  = new $p;
+			$parser  = new $p();
 			$result  = $parser->parse( $file );
 
 			$this->assertIsArray( $result, $message );
@@ -167,7 +167,7 @@ public function test_wxr_version_1_0() {
 
 		foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
 			$message = $p . ' failed';
-			$parser  = new $p;
+			$parser  = new $p();
 			$result  = $parser->parse( $file );
 
 			$this->assertIsArray( $result, $message );
@@ -265,7 +265,7 @@ public function test_escaped_cdata_closing_sequence() {
 
 		foreach ( array( 'WXR_Parser_SimpleXML', 'WXR_Parser_XML', 'WXR_Parser_Regex' ) as $p ) {
 			$message = 'Parser ' . $p;
-			$parser  = new $p;
+			$parser  = new $p();
 			$result  = $parser->parse( $file );
 
 			$post = $result['posts'][0];
@@ -298,7 +298,7 @@ public function test_escaped_cdata_closing_sequence() {
 	public function test_unescaped_cdata_closing_sequence() {
 		$file = DIR_TESTDATA . '/export/crazy-cdata.xml';
 
-		$parser = new WXR_Parser_Regex;
+		$parser = new WXR_Parser_Regex();
 		$result = $parser->parse( $file );
 
 		$post = $result['posts'][0];
diff --git a/tests/phpunit/tests/kses.php b/tests/phpunit/tests/kses.php
index 294cb84779465..a19df38626a7a 100644
--- a/tests/phpunit/tests/kses.php
+++ b/tests/phpunit/tests/kses.php
@@ -11,21 +11,21 @@ class Tests_Kses extends WP_UnitTestCase {
 	 * @dataProvider data_wp_filter_post_kses_address
 	 * @ticket 20210
 	 *
-	 * @param string $string        Test string for kses.
-	 * @param string $expect_string Expected result after passing through kses.
+	 * @param string $content  Test string for kses.
+	 * @param string $expected Expected result after passing through kses.
 	 */
-	public function test_wp_filter_post_kses_address( $string, $expect_string ) {
+	public function test_wp_filter_post_kses_address( $content, $expected ) {
 		global $allowedposttags;
 
-		$this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+		$this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
 	 * Data provider for test_wp_filter_post_kses_address.
 	 *
 	 * @return array[] Arguments {
-	 *     @type string $string        Test string for kses.
-	 *     @type string $expect_string Expected result after passing through kses.
+	 *     @type string $content  Test string for kses.
+	 *     @type string $expected Expected result after passing through kses.
 	 * }
 	 */
 	public function data_wp_filter_post_kses_address() {
@@ -45,10 +45,10 @@ public function data_wp_filter_post_kses_address() {
 
 		foreach ( $attributes as $name => $values ) {
 			foreach ( (array) $values as $value ) {
-				$string        = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
-				$expect_string = "<address $name='" . str_replace( '; ', ';', trim( $value, ';' ) ) . "'>1 WordPress Avenue, The Internet.</address>";
+				$content  = "<address $name='$value'>1 WordPress Avenue, The Internet.</address>";
+				$expected = "<address $name='" . str_replace( '; ', ';', trim( $value, ';' ) ) . "'>1 WordPress Avenue, The Internet.</address>";
 
-				$data[] = array( $string, $expect_string );
+				$data[] = array( $content, $expected );
 			}
 		}
 
@@ -59,21 +59,21 @@ public function data_wp_filter_post_kses_address() {
 	 * @dataProvider data_wp_filter_post_kses_a
 	 * @ticket 20210
 	 *
-	 * @param string $string        Test string for kses.
-	 * @param string $expect_string Expected result after passing through kses.
+	 * @param string $content  Test string for kses.
+	 * @param string $expected Expected result after passing through kses.
 	 */
-	public function test_wp_filter_post_kses_a( $string, $expect_string ) {
+	public function test_wp_filter_post_kses_a( $content, $expected ) {
 		global $allowedposttags;
 
-		$this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+		$this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
 	 * Data provider for test_wp_filter_post_kses_a.
 	 *
 	 * @return array[] Arguments {
-	 *     @type string $string        Test string for kses.
-	 *     @type string $expect_string Expected result after passing through kses.
+	 *     @type string $content  Test string for kses.
+	 *     @type string $expected Expected result after passing through kses.
 	 * }
 	 */
 	public function data_wp_filter_post_kses_a() {
@@ -100,9 +100,9 @@ public function data_wp_filter_post_kses_a() {
 				$attr          = $name;
 				$expected_attr = $name;
 			}
-			$string        = "<a $attr>I link this</a>";
-			$expect_string = "<a $expected_attr>I link this</a>";
-			$data[]        = array( $string, $expect_string );
+			$content  = "<a $attr>I link this</a>";
+			$expected = "<a $expected_attr>I link this</a>";
+			$data[]   = array( $content, $expected );
 		}
 
 		return $data;
@@ -120,8 +120,7 @@ public function data_wp_filter_post_kses_a() {
 	 * @param string $expected Expected output following KSES parsing.
 	 */
 	public function test_wp_kses_video( $source, $context, $expected ) {
-		$actual = wp_kses( $source, $context );
-		$this->assertSame( $expected, $actual );
+		$this->assertSame( $expected, wp_kses( $source, $context ) );
 	}
 
 	/**
@@ -166,21 +165,21 @@ public function data_wp_kses_video() {
 	 * @dataProvider data_wp_filter_post_kses_abbr
 	 * @ticket 20210
 	 *
-	 * @param string $string        Test string for kses.
-	 * @param string $expect_string Expected result after passing through kses.
+	 * @param string $content  Test string for kses.
+	 * @param string $expected Expected result after passing through kses.
 	 */
-	public function test_wp_filter_post_kses_abbr( $string, $expect_string ) {
+	public function test_wp_filter_post_kses_abbr( $content, $expected ) {
 		global $allowedposttags;
 
-		$this->assertSame( $expect_string, wp_kses( $string, $allowedposttags ) );
+		$this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
 	 * Data provider for data_wp_filter_post_kses_abbr.
 	 *
 	 * @return array[] Arguments {
-	 *     @type string $string        Test string for kses.
-	 *     @type string $expect_string Expected result after passing through kses.
+	 *     @type string $content  Test string for kses.
+	 *     @type string $expected Expected result after passing through kses.
 	 * }
 	 */
 	public function data_wp_filter_post_kses_abbr() {
@@ -194,9 +193,9 @@ public function data_wp_filter_post_kses_abbr() {
 		$data = array();
 
 		foreach ( $attributes as $name => $value ) {
-			$string        = "<abbr $name='$value'>WP</abbr>";
-			$expect_string = "<abbr $name='" . trim( $value, ';' ) . "'>WP</abbr>";
-			$data[]        = array( $string, $expect_string );
+			$content  = "<abbr $name='$value'>WP</abbr>";
+			$expected = "<abbr $name='" . trim( $value, ';' ) . "'>WP</abbr>";
+			$data[]   = array( $content, $expected );
 		}
 
 		return $data;
@@ -535,17 +534,18 @@ public function test_wp_kses_allowed_html() {
 	}
 
 	public function test_hyphenated_tag() {
-		$string                 = '<hyphenated-tag attribute="value" otherattribute="value2">Alot of hyphens.</hyphenated-tag>';
-		$custom_tags            = array(
+		$content     = '<hyphenated-tag attribute="value" otherattribute="value2">Alot of hyphens.</hyphenated-tag>';
+		$custom_tags = array(
 			'hyphenated-tag' => array(
 				'attribute' => true,
 			),
 		);
-		$expect_stripped_string = 'Alot of hyphens.';
 
-		$expect_valid_string = '<hyphenated-tag attribute="value">Alot of hyphens.</hyphenated-tag>';
-		$this->assertSame( $expect_stripped_string, wp_kses_post( $string ) );
-		$this->assertSame( $expect_valid_string, wp_kses( $string, $custom_tags ) );
+		$expect_stripped_content = 'Alot of hyphens.';
+		$expect_valid_content    = '<hyphenated-tag attribute="value">Alot of hyphens.</hyphenated-tag>';
+
+		$this->assertSame( $expect_stripped_content, wp_kses_post( $content ) );
+		$this->assertSame( $expect_valid_content, wp_kses( $content, $custom_tags ) );
 	}
 
 	/**
@@ -569,10 +569,10 @@ public function test_wp_kses_normalize_entities() {
 	 * @ticket 28506
 	 * @dataProvider data_ctrl_removal
 	 */
-	public function test_ctrl_removal( $input, $output ) {
+	public function test_ctrl_removal( $content, $expected ) {
 		global $allowedposttags;
 
-		return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
+		return $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
 	}
 
 	public function data_ctrl_removal() {
@@ -606,10 +606,10 @@ public function data_ctrl_removal() {
 	 * @ticket 28699
 	 * @dataProvider data_slash_zero_removal
 	 */
-	public function test_slash_zero_removal( $input, $output ) {
+	public function test_slash_zero_removal( $content, $expected ) {
 		global $allowedposttags;
 
-		return $this->assertSame( $output, wp_kses( $input, $allowedposttags ) );
+		return $this->assertSame( $expected, wp_kses( $content, $allowedposttags ) );
 	}
 
 	public function data_slash_zero_removal() {
@@ -862,9 +862,9 @@ public function data_one_attr() {
 	public function test_bdo_tag_allowed() {
 		global $allowedposttags;
 
-		$input = '<p>This is <bdo dir="rtl">a BDO tag</bdo>. Weird, <bdo dir="ltr">right?</bdo></p>';
+		$content = '<p>This is <bdo dir="rtl">a BDO tag</bdo>. Weird, <bdo dir="ltr">right?</bdo></p>';
 
-		$this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
+		$this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
@@ -873,9 +873,9 @@ public function test_bdo_tag_allowed() {
 	public function test_ruby_tag_allowed() {
 		global $allowedposttags;
 
-		$input = '<ruby>✶<rp>: </rp><rt>Star</rt><rp>, </rp><rt lang="fr">Étoile</rt><rp>.</rp></ruby>';
+		$content = '<ruby>✶<rp>: </rp><rt>Star</rt><rp>, </rp><rt lang="fr">Étoile</rt><rp>.</rp></ruby>';
 
-		$this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
+		$this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
@@ -884,9 +884,9 @@ public function test_ruby_tag_allowed() {
 	public function test_ol_reversed_attribute_allowed() {
 		global $allowedposttags;
 
-		$input = '<ol reversed="reversed"><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>';
+		$content = '<ol reversed="reversed"><li>Item 1</li><li>Item 2</li><li>Item 3</li></ol>';
 
-		$this->assertSame( $input, wp_kses( $input, $allowedposttags ) );
+		$this->assertSame( $content, wp_kses( $content, $allowedposttags ) );
 	}
 
 	/**
@@ -937,7 +937,8 @@ public function test_wp_kses_attr_no_attributes_allowed_with_false() {
 	 * @ticket 48376
 	 * @ticket 55966
 	 * @ticket 56122
-	 * @dataProvider data_test_safecss_filter_attr
+	 * @ticket 58551
+	 * @dataProvider data_safecss_filter_attr
 	 *
 	 * @param string $css      A string of CSS rules.
 	 * @param string $expected Expected string of CSS rules.
@@ -947,7 +948,7 @@ public function test_safecss_filter_attr( $css, $expected ) {
 	}
 
 	/**
-	 * Data Provider for test_safecss_filter_attr().
+	 * Data provider for test_safecss_filter_attr().
 	 *
 	 * @return array {
 	 *     @type array {
@@ -956,7 +957,7 @@ public function test_safecss_filter_attr( $css, $expected ) {
 	 *     }
 	 * }
 	 */
-	public function data_test_safecss_filter_attr() {
+	public function data_safecss_filter_attr() {
 		return array(
 			// Empty input, empty output.
 			array(
@@ -1047,9 +1048,9 @@ public function data_test_safecss_filter_attr() {
 				'css'      => 'grid-template-rows: 40px 4em 40px;grid-auto-rows: min-content;grid-row-start: -1;grid-row-end: 3;grid-row-gap: 1em',
 				'expected' => 'grid-template-rows: 40px 4em 40px;grid-auto-rows: min-content;grid-row-start: -1;grid-row-end: 3;grid-row-gap: 1em',
 			),
-			// `grid` does not yet support functions or `\`.
+			// `grid` does not yet support `\`.
 			array(
-				'css'      => 'grid-template-columns: repeat(2, 50px 1fr);grid-template: 1em / 20% 20px 1fr',
+				'css'      => 'grid-template: 1em / 20% 20px 1fr',
 				'expected' => '',
 			),
 			// `flex` and `grid` alignments introduced in 5.3.
@@ -1278,6 +1279,68 @@ public function data_test_safecss_filter_attr() {
 				'css'      => '--?><.%-not-allowed: red;',
 				'expected' => '',
 			),
+			// Position properties introduced in 6.2.
+			array(
+				'css'      => 'position: sticky;top: 0;left: 0;right: 0;bottom: 0;z-index: 10;',
+				'expected' => 'position: sticky;top: 0;left: 0;right: 0;bottom: 0;z-index: 10',
+			),
+			// `aspect-ratio` introduced in 6.2.
+			array(
+				'css'      => 'aspect-ratio: auto;',
+				'expected' => 'aspect-ratio: auto',
+			),
+			array(
+				'css'      => 'aspect-ratio: 0.5;',
+				'expected' => 'aspect-ratio: 0.5',
+			),
+			array(
+				'css'      => 'aspect-ratio: 1;',
+				'expected' => 'aspect-ratio: 1',
+			),
+			array(
+				'css'      => 'aspect-ratio: 16 / 9;',
+				'expected' => 'aspect-ratio: 16 / 9',
+			),
+			array(
+				'css'      => 'aspect-ratio: expression( 16 / 9 );',
+				'expected' => '',
+			),
+			array(
+				'css'      => 'aspect-ratio: calc( 16 / 9;',
+				'expected' => '',
+			),
+			array(
+				'css'      => 'aspect-ratio: calc( 16 / 9 );',
+				'expected' => 'aspect-ratio: calc( 16 / 9 )',
+			),
+			array(
+				'css'      => 'aspect-ratio: url( https://wordpress.org/wp-content/uploads/aspect-ratio.jpg );',
+				'expected' => '',
+			),
+			// URL support for `filter` introduced in 6.3.
+			array(
+				'css'      => 'filter: url( my-file.svg#svg-blur );',
+				'expected' => 'filter: url( my-file.svg#svg-blur )',
+			),
+			// Support for `repeat` function.
+			array(
+				'css'      => 'grid-template-columns: repeat(4, minmax(0, 1fr))',
+				'expected' => 'grid-template-columns: repeat(4, minmax(0, 1fr))',
+			),
+			array(
+				'css'      => 'grid-template-columns: repeat(auto-fill, minmax(min(12rem, 100%), 1fr))',
+				'expected' => 'grid-template-columns: repeat(auto-fill, minmax(min(12rem, 100%), 1fr))',
+			),
+			// Malformed repeat, no closing `)`.
+			array(
+				'css'      => 'grid-template-columns: repeat(4, minmax(0, 1fr)',
+				'expected' => '',
+			),
+			// Malformed repeat, contains unsupported function.
+			array(
+				'css'      => 'grid-template-columns: repeat(4, unsupported(0, 1fr)',
+				'expected' => '',
+			),
 		);
 	}
 
@@ -1306,10 +1369,10 @@ public function test_wildcard_requires_hyphen_after_prefix() {
 			),
 		);
 
-		$string   = '<div datamelformed-prefix="gone" data="gone" data-="gone" onclick="alert(1)">Malformed attributes</div>';
+		$content  = '<div datamelformed-prefix="gone" data="gone" data-="gone" onclick="alert(1)">Malformed attributes</div>';
 		$expected = '<div>Malformed attributes</div>';
 
-		$actual = wp_kses( $string, $allowed_html );
+		$actual = wp_kses( $content, $allowed_html );
 
 		$this->assertSame( $expected, $actual );
 	}
@@ -1326,10 +1389,10 @@ public function test_wildcard_allows_two_hyphens() {
 			),
 		);
 
-		$string   = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
+		$content  = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
 		$expected = '<div data-wp-id="pens-and-pencils">Well formed attribute</div>';
 
-		$actual = wp_kses( $string, $allowed_html );
+		$actual = wp_kses( $content, $allowed_html );
 
 		$this->assertSame( $expected, $actual );
 	}
@@ -1530,7 +1593,7 @@ public function data_kses_style_attr_with_url() {
 	 *
 	 * @ticket 37134
 	 *
-	 * @dataProvider data_test_safecss_filter_attr_filtered
+	 * @dataProvider data_safecss_filter_attr_filtered
 	 *
 	 * @param string $css      A string of CSS rules.
 	 * @param string $expected Expected string of CSS rules.
@@ -1542,7 +1605,7 @@ public function test_safecss_filter_attr_filtered( $css, $expected ) {
 	}
 
 	/**
-	 * Data Provider for test_safecss_filter_attr_filtered().
+	 * Data provider for test_safecss_filter_attr_filtered().
 	 *
 	 * @return array {
 	 *     @type array {
@@ -1551,7 +1614,7 @@ public function test_safecss_filter_attr_filtered( $css, $expected ) {
 	 *     }
 	 * }
 	 */
-	public function data_test_safecss_filter_attr_filtered() {
+	public function data_safecss_filter_attr_filtered() {
 		return array(
 
 			// A single attribute name, with a single value.
@@ -1647,14 +1710,14 @@ public function test_wp_kses_main_tag_standard_attributes() {
 	 * @param string $html     A string of HTML to test.
 	 * @param string $expected The expected result from KSES.
 	 */
-	function test_wp_kses_object_tag_allowed( $html, $expected ) {
+	public function test_wp_kses_object_tag_allowed( $html, $expected ) {
 		$this->assertSame( $expected, wp_kses_post( $html ) );
 	}
 
 	/**
 	 * Data provider for test_wp_kses_object_tag_allowed().
 	 */
-	function data_wp_kses_object_tag_allowed() {
+	public function data_wp_kses_object_tag_allowed() {
 		return array(
 			'valid value for type'                    => array(
 				'<object type="application/pdf" data="https://example.org/foo.pdf" />',
@@ -1757,7 +1820,7 @@ function data_wp_kses_object_tag_allowed() {
 	 * @param string $html     A string of HTML to test.
 	 * @param string $expected The expected result from KSES.
 	 */
-	function test_wp_kses_object_data_url_with_port_number_allowed( $html, $expected ) {
+	public function test_wp_kses_object_data_url_with_port_number_allowed( $html, $expected ) {
 		add_filter( 'upload_dir', array( $this, 'wp_kses_upload_dir_filter' ), 10, 2 );
 		$this->assertSame( $expected, wp_kses_post( $html ) );
 	}
@@ -1765,7 +1828,7 @@ function test_wp_kses_object_data_url_with_port_number_allowed( $html, $expected
 	/**
 	 * Data provider for test_wp_kses_object_data_url_with_port_number_allowed().
 	 */
-	function data_wp_kses_object_data_url_with_port_number_allowed() {
+	public function data_wp_kses_object_data_url_with_port_number_allowed() {
 		return array(
 			'url with port number'                   => array(
 				'<object type="application/pdf" data="https://example.org:8888/cat/foo.pdf" />',
@@ -1804,7 +1867,7 @@ public function wp_kses_upload_dir_filter( $param ) {
 	 *
 	 * @ticket 54261
 	 */
-	function test_wp_kses_object_added_in_html_filter() {
+	public function test_wp_kses_object_added_in_html_filter() {
 		$html = <<<HTML
 <object type="application/pdf" data="https://wordpress.org/foo.pdf" />
 <object type="application/x-shockwave-flash" data="https://wordpress.org/foo.swf">
@@ -1821,7 +1884,7 @@ function test_wp_kses_object_added_in_html_filter() {
 		$this->assertSame( $html, $filtered_html );
 	}
 
-	function filter_wp_kses_object_added_in_html_filter( $tags, $context ) {
+	public function filter_wp_kses_object_added_in_html_filter( $tags, $context ) {
 		if ( 'post' === $context ) {
 			$tags['object'] = array(
 				'type' => true,
@@ -1844,18 +1907,18 @@ function filter_wp_kses_object_added_in_html_filter( $tags, $context ) {
 	 *
 	 * @dataProvider data_wp_kses_allowed_values_list
 	 *
-	 * @param string $html         A string of HTML to test.
+	 * @param string $content      A string of HTML to test.
 	 * @param string $expected     The expected result from KSES.
 	 * @param array  $allowed_html The allowed HTML to pass to KSES.
 	 */
-	function test_wp_kses_allowed_values_list( $html, $expected, $allowed_html ) {
-		$this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
+	public function test_wp_kses_allowed_values_list( $content, $expected, $allowed_html ) {
+		$this->assertSame( $expected, wp_kses( $content, $allowed_html ) );
 	}
 
 	/**
 	 * Data provider for test_wp_kses_allowed_values_list().
 	 */
-	function data_wp_kses_allowed_values_list() {
+	public function data_wp_kses_allowed_values_list() {
 		$data = array(
 			'valid dir attribute value'             => array(
 				'<p dir="ltr">foo</p>',
@@ -1880,7 +1943,7 @@ function data_wp_kses_allowed_values_list() {
 		);
 
 		return array_map(
-			function ( $datum ) {
+			static function ( $datum ) {
 				$datum[] = array(
 					'p' => array(
 						'dir' => array(
@@ -1902,18 +1965,18 @@ function ( $datum ) {
 	 *
 	 * @dataProvider data_wp_kses_required_attribute
 	 *
-	 * @param string $html         A string of HTML to test.
+	 * @param string $content      A string of HTML to test.
 	 * @param string $expected     The expected result from KSES.
 	 * @param array  $allowed_html The allowed HTML to pass to KSES.
 	 */
-	function test_wp_kses_required_attribute( $html, $expected, $allowed_html ) {
-		$this->assertSame( $expected, wp_kses( $html, $allowed_html ) );
+	public function test_wp_kses_required_attribute( $content, $expected, $allowed_html ) {
+		$this->assertSame( $expected, wp_kses( $content, $allowed_html ) );
 	}
 
 	/**
 	 * Data provider for test_wp_kses_required_attribute().
 	 */
-	function data_wp_kses_required_attribute() {
+	public function data_wp_kses_required_attribute() {
 		$data = array(
 			'valid dir attribute value'             => array(
 				'<p dir="ltr">foo</p>', // Test HTML.
@@ -2092,10 +2155,10 @@ public function data_wp_kses_xml_named_entities() {
 	 *
 	 * @ticket 54060
 	 *
-	 * @param string $global The name of the global variable.
+	 * @param string $global_name The name of the global variable.
 	 */
-	public function test_kses_globals_are_defined( $global ) {
-		$this->assertArrayHasKey( $global, $GLOBALS );
+	public function test_kses_globals_are_defined( $global_name ) {
+		$this->assertArrayHasKey( $global_name, $GLOBALS );
 	}
 
 	/**
@@ -2104,13 +2167,13 @@ public function test_kses_globals_are_defined( $global ) {
 	 * @return array
 	 */
 	public function data_kses_globals_are_defined() {
-		$globals = array(
+		$required_kses_globals = array(
 			'allowedposttags',
 			'allowedtags',
 			'allowedentitynames',
 			'allowedxmlentitynames',
 		);
 
-		return $this->text_array_to_dataprovider( $globals );
+		return $this->text_array_to_dataprovider( $required_kses_globals );
 	}
 }
diff --git a/tests/phpunit/tests/l10n/determineLocale.php b/tests/phpunit/tests/l10n/determineLocale.php
new file mode 100644
index 0000000000000..a2c3febd4a0ab
--- /dev/null
+++ b/tests/phpunit/tests/l10n/determineLocale.php
@@ -0,0 +1,276 @@
+<?php
+
+/**
+ * @group l10n
+ * @group i18n
+ *
+ * @covers ::determine_locale
+ */
+class Tests_L10n_DetermineLocale extends WP_UnitTestCase {
+	protected $locale;
+	protected static $user_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$user_id = $factory->user->create(
+			array(
+				'role'   => 'administrator',
+				'locale' => 'userLocale',
+			)
+		);
+	}
+
+	public function tear_down() {
+		unset( $_SERVER['CONTENT_TYPE'], $_GET['_locale'], $_COOKIE['wp_lang'], $GLOBALS['pagenow'] );
+
+		parent::tear_down();
+	}
+
+	public function test_short_circuit_empty() {
+		add_filter( 'pre_determine_locale', '__return_false' );
+		$this->assertNotFalse( determine_locale() );
+	}
+
+	public function test_short_circuit_no_string() {
+		add_filter(
+			'pre_determine_locale',
+			static function() {
+				return 1234;
+			}
+		);
+		$this->assertNotFalse( determine_locale() );
+	}
+
+	public function test_short_circuit_string() {
+		add_filter(
+			'pre_determine_locale',
+			static function() {
+					return 'myNewLocale';
+			}
+		);
+		$this->assertSame( 'myNewLocale', determine_locale() );
+	}
+
+	public function test_defaults_to_site_locale() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		$this->assertSame( get_locale(), determine_locale() );
+	}
+
+	public function test_is_admin_no_user() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		set_current_screen( 'dashboard' );
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_is_admin_user_locale() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		set_current_screen( 'dashboard' );
+		wp_set_current_user( self::$user_id );
+
+		$this->assertSame( 'userLocale', determine_locale() );
+	}
+
+	public function test_json_request_user_locale() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		$_GET['_locale']         = 'user';
+
+		$this->assertSame( 'userLocale', determine_locale() );
+	}
+
+	public function test_json_request_user_locale_no_user() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		$_GET['_locale']         = 'user';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_json_request_missing_get_param() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_json_request_incorrect_get_param() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		$_GET['_locale']         = 'foo';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_get_param_but_no_json_request() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_GET['_locale'] = 'user';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_wp_login_get_param_not_on_login_page() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_GET['wp_lang'] = 'de_DE';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_wp_login_get_param_on_login_page() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$GLOBALS['pagenow'] = 'wp-login.php';
+		$_GET['wp_lang']    = 'de_DE';
+
+		$this->assertSame( 'de_DE', determine_locale() );
+	}
+
+	public function test_wp_login_get_param_on_login_page_empty_string() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$GLOBALS['pagenow'] = 'wp-login.php';
+		$_GET['wp_lang']    = '';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_wp_login_get_param_on_login_page_incorrect_string() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$GLOBALS['pagenow'] = 'wp-login.php';
+		$_GET['wp_lang']    = '###'; // Something sanitize_locale_name() strips away.
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_wp_login_cookie_not_on_login_page() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$_COOKIE['wp_lang'] = 'de_DE';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+
+	public function test_wp_login_cookie_on_login_page() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$GLOBALS['pagenow'] = 'wp-login.php';
+		$_COOKIE['wp_lang'] = 'de_DE';
+
+		$this->assertSame( 'de_DE', determine_locale() );
+	}
+
+	public function test_wp_login_cookie_on_login_page_empty_string() {
+		add_filter(
+			'locale',
+			static function() {
+				return 'siteLocale';
+			}
+		);
+
+		wp_set_current_user( self::$user_id );
+
+		$GLOBALS['pagenow'] = 'wp-login.php';
+		$_COOKIE['wp_lang'] = '';
+
+		$this->assertSame( 'siteLocale', determine_locale() );
+	}
+}
diff --git a/tests/phpunit/tests/l10n/loadScriptTextdomain.php b/tests/phpunit/tests/l10n/loadScriptTextdomain.php
index fab8aa8b5a999..80313f5f37ca7 100644
--- a/tests/phpunit/tests/l10n/loadScriptTextdomain.php
+++ b/tests/phpunit/tests/l10n/loadScriptTextdomain.php
@@ -14,7 +14,7 @@ class Tests_L10n_LoadScriptTextdomain extends WP_UnitTestCase {
 	 * @ticket 46387
 	 * @ticket 49145
 	 *
-	 * @dataProvider data_test_resolve_relative_path
+	 * @dataProvider data_resolve_relative_path
 	 */
 	public function test_resolve_relative_path( $translation_path, $handle, $src, $textdomain, $filter = array() ) {
 		if ( ! empty( $filter ) ) {
@@ -26,7 +26,7 @@ public function test_resolve_relative_path( $translation_path, $handle, $src, $t
 		$this->assertSame( $expected, load_script_textdomain( $handle, $textdomain, DIR_TESTDATA . '/languages' ) );
 	}
 
-	public function data_test_resolve_relative_path() {
+	public function data_resolve_relative_path() {
 		return array(
 			// @ticket 45528
 			array(
diff --git a/tests/phpunit/tests/l10n/loadTextdomain.php b/tests/phpunit/tests/l10n/loadTextdomain.php
index 26e567d6638ff..234e98015ad49 100644
--- a/tests/phpunit/tests/l10n/loadTextdomain.php
+++ b/tests/phpunit/tests/l10n/loadTextdomain.php
@@ -300,4 +300,20 @@ public function test_load_theme_textdomain_user_locale() {
 
 		$this->assertSame( get_user_locale(), $this->locale );
 	}
+
+	/**
+	 * @ticket 58035
+	 *
+	 * @covers ::load_theme_textdomain
+	 */
+	public function test_pre_load_textdomain_filter() {
+		$override_load_textdomain_callback = new MockAction();
+		add_filter( 'override_load_textdomain', array( $override_load_textdomain_callback, 'action' ) );
+
+		add_filter( 'pre_load_textdomain', '__return_true' );
+		load_plugin_textdomain( 'wp-tests-domain' );
+		remove_filter( 'pre_load_textdomain', '__return_true' );
+
+		$this->assertSame( 0, $override_load_textdomain_callback->get_call_count(), 'Expected override_load_textdomain not to be called.' );
+	}
 }
diff --git a/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php b/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
index 4f29c0c586bc1..3b93d4a975660 100644
--- a/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
+++ b/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
@@ -121,6 +121,27 @@ public function test_get_translations_for_domain_does_not_return_null_if_overrid
 		$this->assertInstanceOf( 'NOOP_Translations', $translations );
 	}
 
+	/**
+	 * @ticket 58321
+	 *
+	 * @covers ::get_translations_for_domain
+	 */
+	public function test_get_translations_for_domain_get_locale_is_called_only_once() {
+		$filter_locale = new MockAction();
+		add_filter( 'locale', array( $filter_locale, 'filter' ) );
+
+		get_translations_for_domain( 'internationalized-plugin' );
+		get_translations_for_domain( 'internationalized-plugin' );
+		get_translations_for_domain( 'internationalized-plugin' );
+		$translations = get_translations_for_domain( 'internationalized-plugin' );
+
+		remove_filter( 'locale', array( $filter_locale, 'filter' ) );
+
+		$this->assertSame( 1, $filter_locale->get_call_count() );
+		$this->assertInstanceOf( 'NOOP_Translations', $translations );
+		$this->assertFalse( is_textdomain_loaded( 'internationalized-plugin' ) );
+	}
+
 	/**
 	 * @ticket 37113
 	 *
diff --git a/tests/phpunit/tests/l10n/wpGetListItemSeparator.php b/tests/phpunit/tests/l10n/wpGetListItemSeparator.php
new file mode 100644
index 0000000000000..5fc3d9e6f32d2
--- /dev/null
+++ b/tests/phpunit/tests/l10n/wpGetListItemSeparator.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @group l10n
+ * @group i18n
+ *
+ * @covers ::wp_get_list_item_separator
+ */
+class Tests_L10n_wpGetListItemSeparator extends WP_UnitTestCase {
+
+	/**
+	 * Tests that the function returns a value when the $wp_locale global is not set.
+	 *
+	 * @ticket 56698
+	 */
+	public function test_should_return_default_value_if_wp_locale_is_not_set() {
+		global $wp_locale;
+
+		$original_locale = $wp_locale;
+		$wp_locale       = null;
+
+		$actual = wp_get_list_item_separator();
+
+		$wp_locale = $original_locale;
+
+		$this->assertSame( __( ', ' ), $actual );
+	}
+}
diff --git a/tests/phpunit/tests/l10n/wpGetWordCountType.php b/tests/phpunit/tests/l10n/wpGetWordCountType.php
new file mode 100644
index 0000000000000..3a4b03220562c
--- /dev/null
+++ b/tests/phpunit/tests/l10n/wpGetWordCountType.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @group l10n
+ * @group i18n
+ *
+ * @covers ::wp_get_word_count_type
+ */
+class Tests_L10n_wpGetWordCountType extends WP_UnitTestCase {
+
+	/**
+	 * Tests that the function returns a value when the $wp_locale global is not set.
+	 *
+	 * @ticket 56698
+	 */
+	public function test_should_return_default_value_if_wp_locale_is_not_set() {
+		global $wp_locale;
+
+		$original_locale = $wp_locale;
+		$wp_locale       = null;
+
+		$actual = wp_get_word_count_type();
+
+		$wp_locale = $original_locale;
+
+		$this->assertSame( 'words', $actual );
+	}
+}
diff --git a/tests/phpunit/tests/l10n/wpLocaleSwitcher.php b/tests/phpunit/tests/l10n/wpLocaleSwitcher.php
index 3fbea448c7ca5..1b0b8f796d42a 100644
--- a/tests/phpunit/tests/l10n/wpLocaleSwitcher.php
+++ b/tests/phpunit/tests/l10n/wpLocaleSwitcher.php
@@ -16,6 +16,20 @@ class Tests_L10n_wpLocaleSwitcher extends WP_UnitTestCase {
 	 */
 	protected $previous_locale = '';
 
+	/**
+	 * @var int
+	 */
+	protected static $user_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$user_id = $factory->user->create(
+			array(
+				'role'   => 'administrator',
+				'locale' => 'de_DE',
+			)
+		);
+	}
+
 	public function set_up() {
 		parent::set_up();
 
@@ -24,20 +38,30 @@ public function set_up() {
 
 		unset( $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
 
-		/** @var WP_Textdomain_Registry $wp_textdomain_registry */
-		global $wp_textdomain_registry;
+		global $wp_textdomain_registry, $wp_locale_switcher;
 
 		$wp_textdomain_registry = new WP_Textdomain_Registry();
+
+		remove_filter( 'locale', array( $wp_locale_switcher, 'filter_locale' ) );
+		$wp_locale_switcher = new WP_Locale_Switcher();
+		$wp_locale_switcher->init();
 	}
 
 	public function tear_down() {
 		unset( $GLOBALS['l10n'], $GLOBALS['l10n_unloaded'] );
 
-		/** @var WP_Textdomain_Registry $wp_textdomain_registry */
-		global $wp_textdomain_registry;
+		global $wp_textdomain_registry, $wp_locale_switcher;
 
 		$wp_textdomain_registry = new WP_Textdomain_Registry();
 
+		// Clean up after any tests that don't restore the locale afterwards,
+		// before resetting $wp_locale_switcher.
+		restore_current_locale();
+
+		remove_filter( 'locale', array( $wp_locale_switcher, 'filter_locale' ) );
+		$wp_locale_switcher = new WP_Locale_Switcher();
+		$wp_locale_switcher->init();
+
 		parent::tear_down();
 	}
 
@@ -83,6 +107,22 @@ public function test_switch_to_locale_changes_the_locale() {
 		$this->assertSame( 'en_GB', $locale );
 	}
 
+	/**
+	 * @ticket 57123
+	 *
+	 * @covers ::switch_to_locale
+	 */
+	public function test_switch_to_locale_changes_determined_locale() {
+		switch_to_locale( 'en_GB' );
+
+		$locale = determine_locale();
+
+		// Cleanup.
+		restore_previous_locale();
+
+		$this->assertSame( 'en_GB', $locale );
+	}
+
 	/**
 	 * @covers ::switch_to_locale
 	 * @covers ::translate
@@ -326,18 +366,11 @@ public function test_switch_to_site_locale_if_user_locale_is_set() {
 
 		$site_locale = get_locale();
 
-		$user_id = self::factory()->user->create(
-			array(
-				'role'   => 'administrator',
-				'locale' => 'de_DE',
-			)
-		);
-
-		wp_set_current_user( $user_id );
+		wp_set_current_user( self::$user_id );
 		set_current_screen( 'dashboard' );
 
-		$locale_switcher = clone $wp_locale_switcher;
-
+		// Reset $wp_locale_switcher so it thinks es_ES is the original locale.
+		remove_filter( 'locale', array( $wp_locale_switcher, 'filter_locale' ) );
 		$wp_locale_switcher = new WP_Locale_Switcher();
 		$wp_locale_switcher->init();
 
@@ -351,14 +384,12 @@ public function test_switch_to_site_locale_if_user_locale_is_set() {
 		$locale_switched_user_locale  = switch_to_locale( $user_locale ); // False.
 		$locale_switched_site_locale  = switch_to_locale( $site_locale ); // True.
 		$site_locale_after_switch     = get_locale();
-		$language_header_after_switch = isset( $l10n['default'] ); // en_US
+		$language_header_after_switch = is_textdomain_loaded( 'default' ); // en_US
 
 		restore_current_locale();
 
 		$language_header_after_restore = $l10n['default']->headers['Language']; // de_DE
 
-		$wp_locale_switcher = $locale_switcher;
-
 		$this->assertFalse( $locale_switched_user_locale );
 		$this->assertTrue( $locale_switched_site_locale );
 		$this->assertSame( $site_locale, $site_locale_after_switch );
@@ -378,18 +409,11 @@ public function test_switch_to_different_site_locale_if_user_locale_is_set() {
 
 		$site_locale = get_locale();
 
-		$user_id = self::factory()->user->create(
-			array(
-				'role'   => 'administrator',
-				'locale' => 'de_DE',
-			)
-		);
-
-		wp_set_current_user( $user_id );
+		wp_set_current_user( self::$user_id );
 		set_current_screen( 'dashboard' );
 
-		$locale_switcher = clone $wp_locale_switcher;
-
+		// Reset $wp_locale_switcher so it thinks es_ES is the original locale.
+		remove_filter( 'locale', array( $wp_locale_switcher, 'filter_locale' ) );
 		$wp_locale_switcher = new WP_Locale_Switcher();
 		$wp_locale_switcher->init();
 
@@ -409,8 +433,6 @@ public function test_switch_to_different_site_locale_if_user_locale_is_set() {
 
 		$language_header_after_restore = $l10n['default']->headers['Language']; // de_DE
 
-		$wp_locale_switcher = $locale_switcher;
-
 		remove_filter( 'locale', array( $this, 'filter_locale' ) );
 
 		$this->assertFalse( $locale_switched_user_locale );
@@ -426,25 +448,12 @@ public function test_switch_to_different_site_locale_if_user_locale_is_set() {
 	 * @covers ::load_default_textdomain
 	 */
 	public function test_multiple_switches_to_site_locale_and_user_locale() {
-		global $wp_locale_switcher;
-
 		$site_locale = get_locale();
 
-		$user_id = self::factory()->user->create(
-			array(
-				'role'   => 'administrator',
-				'locale' => 'en_GB',
-			)
-		);
-
-		wp_set_current_user( $user_id );
+		wp_set_current_user( self::$user_id );
+		update_user_meta( self::$user_id, 'locale', 'en_GB' );
 		set_current_screen( 'dashboard' );
 
-		$locale_switcher = clone $wp_locale_switcher;
-
-		$wp_locale_switcher = new WP_Locale_Switcher();
-		$wp_locale_switcher->init();
-
 		$user_locale = get_user_locale();
 
 		load_default_textdomain( $user_locale );
@@ -458,8 +467,6 @@ public function test_multiple_switches_to_site_locale_and_user_locale() {
 
 		restore_current_locale();
 
-		$wp_locale_switcher = $locale_switcher;
-
 		$this->assertSame( 'en_US', get_locale() );
 		$this->assertSame( 'This is a dummy plugin', $actual );
 	}
@@ -469,12 +476,7 @@ public function test_multiple_switches_to_site_locale_and_user_locale() {
 	 */
 	public function test_switch_reloads_plugin_translations_outside_wp_lang_dir() {
 		/** @var WP_Textdomain_Registry $wp_textdomain_registry */
-		global $wp_locale_switcher, $wp_textdomain_registry;
-
-		$locale_switcher = clone $wp_locale_switcher;
-
-		$wp_locale_switcher = new WP_Locale_Switcher();
-		$wp_locale_switcher->init();
+		global $wp_textdomain_registry;
 
 		require_once DIR_TESTDATA . '/plugins/custom-internationalized-plugin/custom-internationalized-plugin.php';
 
@@ -494,8 +496,6 @@ public function test_switch_reloads_plugin_translations_outside_wp_lang_dir() {
 
 		restore_current_locale();
 
-		$wp_locale_switcher = $locale_switcher;
-
 		$this->assertSame( 'This is a dummy plugin', $actual );
 		$this->assertSame( WP_PLUGIN_DIR . '/custom-internationalized-plugin/languages/', $registry_value );
 		$this->assertSame( 'Das ist ein Dummy Plugin', $actual_de_de );
@@ -503,16 +503,51 @@ public function test_switch_reloads_plugin_translations_outside_wp_lang_dir() {
 	}
 
 	/**
-	 * @ticket 39210
+	 * @ticket 57116
 	 */
-	public function test_switch_reloads_theme_translations_outside_wp_lang_dir() {
+	public function test_switch_reloads_plugin_translations() {
 		/** @var WP_Textdomain_Registry $wp_textdomain_registry */
-		global $wp_locale_switcher, $wp_textdomain_registry;
+		global $wp_textdomain_registry;
 
-		$locale_switcher = clone $wp_locale_switcher;
+		$has_translations_1 = $wp_textdomain_registry->has( 'internationalized-plugin' );
 
-		$wp_locale_switcher = new WP_Locale_Switcher();
-		$wp_locale_switcher->init();
+		require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+		$actual = i18n_plugin_test();
+
+		switch_to_locale( 'es_ES' );
+
+		$lang_path_es_es = $wp_textdomain_registry->get( 'internationalized-plugin', determine_locale() );
+
+		switch_to_locale( 'de_DE' );
+
+		$actual_de_de = i18n_plugin_test();
+
+		$has_translations_3 = $wp_textdomain_registry->has( 'internationalized-plugin' );
+
+		restore_previous_locale();
+
+		$actual_es_es = i18n_plugin_test();
+
+		restore_current_locale();
+
+		$lang_path_en_us = $wp_textdomain_registry->get( 'internationalized-plugin', determine_locale() );
+
+		$this->assertSame( 'This is a dummy plugin', $actual );
+		$this->assertSame( 'Das ist ein Dummy Plugin', $actual_de_de );
+		$this->assertSame( 'Este es un plugin dummy', $actual_es_es );
+		$this->assertTrue( $has_translations_1 );
+		$this->assertTrue( $has_translations_3 );
+		$this->assertSame( WP_LANG_DIR . '/plugins/', $lang_path_es_es );
+		$this->assertFalse( $lang_path_en_us );
+	}
+
+	/**
+	 * @ticket 39210
+	 */
+	public function test_switch_reloads_theme_translations_outside_wp_lang_dir() {
+		/** @var WP_Textdomain_Registry $wp_textdomain_registry */
+		global $wp_textdomain_registry;
 
 		switch_theme( 'custom-internationalized-theme' );
 
@@ -534,14 +569,133 @@ public function test_switch_reloads_theme_translations_outside_wp_lang_dir() {
 
 		restore_current_locale();
 
-		$wp_locale_switcher = $locale_switcher;
-
 		$this->assertSame( get_template_directory() . '/languages/', $registry_value );
 		$this->assertSame( 'This is a dummy theme', $actual );
 		$this->assertSame( 'Das ist ein Dummy Theme', $actual_de_de );
 		$this->assertSame( 'Este es un tema dummy', $actual_es_es );
 	}
 
+	/**
+	 * @ticket 57116
+	 */
+	public function test_switch_to_locale_should_work() {
+		global $wp_textdomain_registry;
+		require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+		$has_translations = $wp_textdomain_registry->has( 'internationalized-plugin' );
+		$path             = $wp_textdomain_registry->get( 'internationalized-plugin', 'es_ES' );
+
+		$actual = i18n_plugin_test();
+
+		switch_to_locale( 'es_ES' );
+
+		$actual_es_es = i18n_plugin_test();
+
+		$this->assertTrue( $has_translations );
+		$this->assertNotEmpty( $path );
+		$this->assertSame( 'This is a dummy plugin', $actual );
+		$this->assertSame( 'Este es un plugin dummy', $actual_es_es );
+	}
+
+	/**
+	 * @ticket 57123
+	 *
+	 * @covers ::switch_to_locale
+	 * @covers ::switch_to_user_locale
+	 * @covers WP_Locale_Switcher::get_switched_locale
+	 * @covers WP_Locale_Switcher::get_switched_user_id
+	 */
+	public function test_returns_current_locale_and_user_after_switching() {
+		global $wp_locale_switcher;
+
+		$user_2 = self::factory()->user->create(
+			array(
+				'role'   => 'administrator',
+				'locale' => 'es_ES',
+			)
+		);
+
+		$locale_1  = $wp_locale_switcher->get_switched_locale();
+		$user_id_1 = $wp_locale_switcher->get_switched_user_id();
+
+		switch_to_user_locale( self::$user_id );
+
+		$locale_2  = $wp_locale_switcher->get_switched_locale();
+		$user_id_2 = $wp_locale_switcher->get_switched_user_id();
+
+		switch_to_locale( 'en_GB' );
+
+		$locale_3  = $wp_locale_switcher->get_switched_locale();
+		$user_id_3 = $wp_locale_switcher->get_switched_user_id();
+
+		switch_to_user_locale( $user_2 );
+
+		$locale_4  = $wp_locale_switcher->get_switched_locale();
+		$user_id_4 = $wp_locale_switcher->get_switched_user_id();
+
+		restore_current_locale();
+
+		$locale_5  = $wp_locale_switcher->get_switched_locale();
+		$user_id_5 = $wp_locale_switcher->get_switched_user_id();
+
+		$this->assertFalse( $locale_1, 'Locale should be false before switching' );
+		$this->assertFalse( $user_id_1, 'User ID should be false before switching' );
+
+		$this->assertSame( 'de_DE', $locale_2, 'The locale was not changed to de_DE' );
+		$this->assertSame( self::$user_id, $user_id_2, 'User ID should match the main admin ID' );
+
+		$this->assertSame( 'en_GB', $locale_3, 'The locale was not changed to en_GB' );
+		$this->assertFalse( $user_id_3, 'User ID should be false after normal locale switching' );
+
+		$this->assertSame( 'es_ES', $locale_4, 'The locale was not changed to es_ES' );
+		$this->assertSame( $user_2, $user_id_4, 'User ID should match the second admin ID' );
+
+		$this->assertFalse( $locale_5, 'Locale should be false after restoring' );
+		$this->assertFalse( $user_id_5, 'User ID should be false after restoring' );
+	}
+
+	/**
+	 * @ticket 57123
+	 *
+	 * @covers ::switch_to_locale
+	 * @covers ::switch_to_user_locale
+	 * @covers WP_Locale_Switcher::get_switched_locale
+	 * @covers WP_Locale_Switcher::get_switched_user_id
+	 */
+	public function test_returns_previous_locale_and_user_after_switching() {
+		global $wp_locale_switcher;
+
+		$locale_1  = $wp_locale_switcher->get_switched_locale();
+		$user_id_1 = $wp_locale_switcher->get_switched_user_id();
+
+		switch_to_user_locale( self::$user_id );
+
+		$locale_2  = $wp_locale_switcher->get_switched_locale();
+		$user_id_2 = $wp_locale_switcher->get_switched_user_id();
+
+		switch_to_locale( 'en_GB' );
+
+		$locale_3  = $wp_locale_switcher->get_switched_locale();
+		$user_id_3 = $wp_locale_switcher->get_switched_user_id();
+
+		restore_previous_locale();
+
+		$locale_4  = $wp_locale_switcher->get_switched_locale();
+		$user_id_4 = $wp_locale_switcher->get_switched_user_id();
+
+		$this->assertFalse( $locale_1, 'Locale should be false before switching' );
+		$this->assertFalse( $user_id_1, 'User ID should be false before switching' );
+
+		$this->assertSame( 'de_DE', $locale_2, 'The locale was not changed to de_DE' );
+		$this->assertSame( self::$user_id, $user_id_2, 'User ID should match the main admin ID' );
+
+		$this->assertSame( 'en_GB', $locale_3, 'The locale was not changed to en_GB' );
+		$this->assertFalse( $user_id_3, 'User ID should be false after normal locale switching' );
+
+		$this->assertSame( 'de_DE', $locale_4, 'The locale was not changed back to de_DE' );
+		$this->assertSame( self::$user_id, $user_id_4, 'User ID should match the main admin ID again' );
+	}
+
 	public function filter_locale() {
 		return 'es_ES';
 	}
diff --git a/tests/phpunit/tests/l10n/wpTextdomainRegistry.php b/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
index 4186d8555aeb5..fc53dd9c56c13 100644
--- a/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
+++ b/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
@@ -28,7 +28,7 @@ public function test_set_custom_path() {
 		$reflection_property = $reflection->getProperty( 'cached_mo_files' );
 		$reflection_property->setAccessible( true );
 
-		$this->assertNull(
+		$this->assertEmpty(
 			$reflection_property->getValue( $this->instance ),
 			'Cache not empty by default'
 		);
@@ -78,28 +78,6 @@ public function test_get( $domain, $locale, $expected ) {
 		);
 	}
 
-	/**
-	 * @covers ::get_path_from_lang_dir
-	 */
-	public function test_get_does_not_check_themes_directory_for_plugin() {
-		$reflection          = new ReflectionClass( $this->instance );
-		$reflection_property = $reflection->getProperty( 'cached_mo_files' );
-		$reflection_property->setAccessible( true );
-
-		$this->instance->get( 'internationalized-plugin', 'de_DE' );
-
-		$this->assertArrayHasKey(
-			WP_LANG_DIR . '/plugins',
-			$reflection_property->getValue( $this->instance ),
-			'Default plugins path missing from cache'
-		);
-		$this->assertArrayNotHasKey(
-			WP_LANG_DIR . '/themes',
-			$reflection_property->getValue( $this->instance ),
-			'Default themes path should not be in cache'
-		);
-	}
-
 	/**
 	 * @covers ::set
 	 * @covers ::get
diff --git a/tests/phpunit/tests/link/getAdjacentPost.php b/tests/phpunit/tests/link/getAdjacentPost.php
index 505d52a1dccde..d365aa49dd7d9 100644
--- a/tests/phpunit/tests/link/getAdjacentPost.php
+++ b/tests/phpunit/tests/link/getAdjacentPost.php
@@ -350,4 +350,82 @@ public function filter_excluded_terms( $excluded_terms ) {
 		$excluded_terms[] = $this->exclude_term;
 		return $excluded_terms;
 	}
+
+	/**
+	 * @ticket 41131
+	 */
+	public function test_get_adjacent_post_cache() {
+		// Need some sample posts to test adjacency.
+		$post_one = self::factory()->post->create_and_get(
+			array(
+				'post_title' => 'First',
+				'post_date'  => '2012-01-01 12:00:00',
+			)
+		);
+
+		$post_two = self::factory()->post->create_and_get(
+			array(
+				'post_title' => 'Second',
+				'post_date'  => '2012-02-01 12:00:00',
+			)
+		);
+
+		$post_three = self::factory()->post->create_and_get(
+			array(
+				'post_title' => 'Third',
+				'post_date'  => '2012-03-01 12:00:00',
+			)
+		);
+
+		$post_four = self::factory()->post->create_and_get(
+			array(
+				'post_title' => 'Fourth',
+				'post_date'  => '2012-04-01 12:00:00',
+			)
+		);
+
+		// Assign some terms.
+		wp_set_object_terms( $post_one->ID, 'WordPress', 'category', false );
+		wp_set_object_terms( $post_three->ID, 'WordPress', 'category', false );
+
+		wp_set_object_terms( $post_two->ID, 'plugins', 'post_tag', false );
+		wp_set_object_terms( $post_four->ID, 'plugins', 'post_tag', false );
+
+		// Test normal post adjacency.
+		$this->go_to( get_permalink( $post_two->ID ) );
+
+		// Test getting the right result.
+		$first_run = get_adjacent_post( false, '', true );
+		$this->assertEquals( $post_one, $first_run, 'Did not get first post when on second post' );
+		$this->assertNotEquals( $post_two, $first_run, 'Got second post when on second post' );
+
+		// Query count to test caching.
+		$num_queries = get_num_queries();
+		$second_run  = get_adjacent_post( false, '', true );
+		$this->assertNotEquals( $post_two, $second_run, 'Got second post when on second post on second run' );
+		$this->assertEquals( $post_one, $second_run, 'Did not get first post when on second post on second run' );
+		$this->assertSame( $num_queries, get_num_queries() );
+
+		// Test creating new post busts cache.
+		$post_five   = self::factory()->post->create_and_get(
+			array(
+				'post_title' => 'Five',
+				'post_date'  => '2012-04-01 12:00:00',
+			)
+		);
+		$num_queries = get_num_queries();
+
+		$this->assertEquals( $post_one, get_adjacent_post( false, '', true ), 'Did not get first post after new post is added' );
+		$this->assertSame( get_num_queries() - $num_queries, 1, 'Number of queries run was not one after new post is added' );
+
+		$this->assertEquals( $post_four, get_adjacent_post( true, '', false ), 'Did not get forth post after new post is added' );
+		$num_queries = get_num_queries();
+		$this->assertEquals( $post_four, get_adjacent_post( true, '', false ), 'Did not get forth post after new post is added' );
+		$this->assertSame( $num_queries, get_num_queries() );
+		wp_set_object_terms( $post_four->ID, 'themes', 'post_tag', false );
+
+		$num_queries = get_num_queries();
+		$this->assertEquals( $post_four, get_adjacent_post( true, '', false ), 'Result of function call is wrong after after adding new term' );
+		$this->assertSame( get_num_queries() - $num_queries, 2, 'Number of queries run was not two after adding new term' );
+	}
 }
diff --git a/tests/phpunit/tests/link/getEditPostLink.php b/tests/phpunit/tests/link/getEditPostLink.php
new file mode 100644
index 0000000000000..2a17e69f75ebb
--- /dev/null
+++ b/tests/phpunit/tests/link/getEditPostLink.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Tests the `get_edit_post_link()` function.
+ *
+ * @since 6.3.0
+ *
+ * @group link
+ *
+ * @covers ::get_edit_post_link
+ */
+class Tests_Link_GetEditPostLink extends WP_UnitTestCase {
+	/**
+	 * The name of the theme to use for the test.
+	 *
+	 * @since 6.3.0
+	 * @var string
+	 */
+	const TEST_THEME = 'block-theme';
+
+	/**
+	 * The id of the user to use for the test.
+	 *
+	 * @since 6.3.0
+	 * @var int
+	 */
+	private static $admin_id;
+
+	/**
+	 * Creates admin user before tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		// Create an admin user because get_edit_post_link() requires 'edit_post' capability.
+		self::$admin_id = $factory->user->create( array( 'role' => 'administrator' ) );
+	}
+
+	/**
+	 * Performs setup tasks for every test.
+	 *
+	 * @since 6.3.0
+	 */
+	public function set_up() {
+		parent::set_up();
+		wp_set_current_user( self::$admin_id );
+		switch_theme( self::TEST_THEME );
+	}
+
+	/**
+	 * Tests getting the edit post link for a post.
+	 */
+	public function test_get_edit_post_link() {
+		$post                 = self::factory()->post->create_and_get(
+			array(
+				'post_type'   => 'post',
+				'post_title'  => 'Test Post',
+				'post_name'   => 'test-post',
+				'post_status' => 'publish',
+			)
+		);
+		$post_type_object     = get_post_type_object( $post->post_type );
+		$link_default_context = admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=edit', $post->ID ) );
+		$link_custom_context  = admin_url( sprintf( $post_type_object->_edit_link . '&action=edit', $post->ID ) );
+
+		$this->assertSame( $link_default_context, get_edit_post_link( $post ), 'Second argument `$context` has a default context of `"display"`.' );
+		$this->assertSame( $link_custom_context, get_edit_post_link( $post, 'something-else' ), 'Pass non-default value in second argument.' );
+	}
+
+	/**
+	 * Tests getting the edit post link for a template post type.
+	 *
+	 * @ticket 57709
+	 */
+	public function test_get_edit_post_link_for_wp_template_post_type() {
+		$template_post = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_template',
+				'post_name'    => 'my_template',
+				'post_title'   => 'My Template',
+				'post_content' => 'Content',
+				'post_excerpt' => 'Description of my template',
+				'tax_input'    => array(
+					'wp_theme' => array(
+						self::TEST_THEME,
+					),
+				),
+			)
+		);
+
+		wp_set_post_terms( $template_post->ID, self::TEST_THEME, 'wp_theme' );
+
+		$post_type_object     = get_post_type_object( $template_post->post_type );
+		$link_default_context = admin_url( sprintf( $post_type_object->_edit_link, $template_post->post_type, get_stylesheet() . '%2F%2Fmy_template' ) );
+		$link_custom_context  = admin_url( sprintf( $post_type_object->_edit_link, $template_post->post_type, get_stylesheet() . '%2F%2Fmy_template' ) );
+
+		$this->assertSame( $link_default_context, get_edit_post_link( $template_post ), 'Second argument `$context` has a default context of `"display"`.' );
+		$this->assertSame( $link_custom_context, get_edit_post_link( $template_post, 'something-else' ), 'Pass non-default value in second argument.' );
+	}
+
+	/**
+	 * Tests getting the edit post link for a template part post type.
+	 *
+	 * @ticket 57709
+	 */
+	public function test_get_edit_post_link_for_wp_template_part_post_type() {
+		$template_part_post = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_template_part',
+				'post_name'    => 'my_template_part',
+				'post_title'   => 'My Template Part',
+				'post_content' => 'Content',
+				'post_excerpt' => 'Description of my template part',
+				'tax_input'    => array(
+					'wp_theme'              => array(
+						self::TEST_THEME,
+					),
+					'wp_template_part_area' => array(
+						WP_TEMPLATE_PART_AREA_HEADER,
+					),
+				),
+			)
+		);
+
+		wp_set_post_terms( $template_part_post->ID, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
+		wp_set_post_terms( $template_part_post->ID, self::TEST_THEME, 'wp_theme' );
+
+		$post_type_object     = get_post_type_object( $template_part_post->post_type );
+		$link_default_context = admin_url( sprintf( $post_type_object->_edit_link, $template_part_post->post_type, get_stylesheet() . '%2F%2Fmy_template_part' ) );
+		$link_custom_context  = admin_url( sprintf( $post_type_object->_edit_link, $template_part_post->post_type, get_stylesheet() . '%2F%2Fmy_template_part' ) );
+
+		$this->assertSame( $link_default_context, get_edit_post_link( $template_part_post ), 'Second argument `$context` has a default context of `"display"`.' );
+		$this->assertSame( $link_custom_context, get_edit_post_link( $template_part_post, 'something-else' ), 'Pass non-default value in second argument.' );
+	}
+
+	/**
+	 * Tests getting the edit post link for a wp_navigation post type.
+	 *
+	 * @ticket 58589
+	 * */
+	public function test_get_edit_post_link_for_wp_navigation_post_type() {
+		$navigation_post = self::factory()->post->create_and_get(
+			array(
+				'post_type'    => 'wp_navigation',
+				'post_name'    => 'my_navigation',
+				'post_title'   => 'My Navigation',
+				'post_content' => '<!-- wp:navigation-link {"label":"WordPress","type":"custom","url":"http://www.wordpress.org/","kind":"custom"} /-->',
+				'post_excerpt' => 'Description of my Navigation',
+			)
+		);
+
+		$post_type_object = get_post_type_object( $navigation_post->post_type );
+
+		$link_default_context = admin_url( sprintf( $post_type_object->_edit_link, $navigation_post->ID ) );
+		$link_custom_context  = admin_url( sprintf( $post_type_object->_edit_link, $navigation_post->ID ) );
+
+		$this->assertSame( $link_default_context, get_edit_post_link( $navigation_post ), 'Second argument `$context` has a default context of `"display"`.' );
+		$this->assertSame( $link_custom_context, get_edit_post_link( $navigation_post, 'something-else' ), 'Pass non-default value in second argument.' );
+	}
+}
diff --git a/tests/phpunit/tests/link/getNextPostsLink.php b/tests/phpunit/tests/link/getNextPostsLink.php
new file mode 100644
index 0000000000000..8df7d10ff0250
--- /dev/null
+++ b/tests/phpunit/tests/link/getNextPostsLink.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Tests the `get_next_posts_link()` function.
+ *
+ * @since 6.2.0
+ *
+ * @group link
+ *
+ * @covers ::get_next_posts_link
+ */
+class Tests_Link_GetNextPostsLink extends WP_UnitTestCase {
+
+	/**
+	 * Creates posts before any tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		global $wp_query, $paged;
+
+		$factory->post->create_many( 3 );
+		$paged    = 2;
+		$wp_query = new WP_Query(
+			array(
+				'post_type'      => 'post',
+				'posts_per_page' => 1,
+				'paged'          => $paged,
+			)
+		);
+	}
+
+	/**
+	 * Tests that the 'next_posts_link_attributes' filter is applied correctly.
+	 *
+	 * @ticket 55751
+	 */
+	public function test_get_next_posts_link_should_apply_next_posts_link_attributes_filter() {
+		$filter = new MockAction();
+		add_filter( 'next_posts_link_attributes', array( &$filter, 'filter' ) );
+
+		get_next_posts_link();
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+}
diff --git a/tests/phpunit/tests/link/getPreviousPostsLink.php b/tests/phpunit/tests/link/getPreviousPostsLink.php
new file mode 100644
index 0000000000000..ea7220b2dcb69
--- /dev/null
+++ b/tests/phpunit/tests/link/getPreviousPostsLink.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Tests the `get_previous_posts_link()` function.
+ *
+ * @since 6.2.0
+ *
+ * @group link
+ *
+ * @covers ::get_previous_posts_link
+ */
+class Tests_Link_GetPreviousPostsLink extends WP_UnitTestCase {
+
+	/**
+	 * Creates posts before any tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		global $wp_query, $paged;
+
+		$factory->post->create_many( 3 );
+		$paged    = 2;
+		$wp_query = new WP_Query(
+			array(
+				'post_type'      => 'post',
+				'posts_per_page' => 1,
+				'paged'          => $paged,
+			)
+		);
+	}
+
+	/**
+	 * Tests that the 'previous_posts_link_attributes' filter is applied correctly.
+	 *
+	 * @ticket 55751
+	 */
+	public function test_get_previous_posts_link_should_apply_previous_posts_link_attributes_filter() {
+		$filter = new MockAction();
+		add_filter( 'previous_posts_link_attributes', array( &$filter, 'filter' ) );
+
+		get_previous_posts_link();
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+}
diff --git a/tests/phpunit/tests/link/getThePostsNavigation.php b/tests/phpunit/tests/link/getThePostsNavigation.php
new file mode 100644
index 0000000000000..83c262d911bae
--- /dev/null
+++ b/tests/phpunit/tests/link/getThePostsNavigation.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * Tests the `get_the_posts_navigation()` function.
+ *
+ * @since 6.2.0
+ *
+ * @group link
+ *
+ * @covers ::get_the_posts_navigation
+ */
+class Tests_Link_GetThePostsNavigation extends WP_UnitTestCase {
+
+	/**
+	 * Creates posts before any tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		$factory->post->create_many( 3 );
+	}
+
+	/**
+	 * Tests that get_the_posts_navigation() only includes the "Older posts" and "Newer" posts
+	 * links when appropriate.
+	 *
+	 * @ticket 55751
+	 *
+	 * @dataProvider data_get_the_posts_navigation
+	 *
+	 * @param int  $per_page  Posts per page to be queried.
+	 * @param int  $paged_num Pagination page number.
+	 * @param bool $older     Whether an "Older posts" link should be included.
+	 * @param bool $newer     Whether a "Newer posts" link should be included.
+	 */
+	public function test_get_the_posts_navigation( $per_page, $paged_num, $older, $newer ) {
+		global $wp_query, $paged;
+
+		$paged    = $paged_num;
+		$wp_query = new WP_Query(
+			array(
+				'post_type'      => 'post',
+				'posts_per_page' => $per_page,
+				'paged'          => $paged,
+			)
+		);
+
+		$actual = get_the_posts_navigation();
+
+		if ( $older ) {
+			$this->assertStringContainsString(
+				'Older posts',
+				$actual,
+				'Posts navigation must contain an "Older posts" link.'
+			);
+		}
+
+		if ( $newer ) {
+			$this->assertStringContainsString(
+				'Newer posts',
+				$actual,
+				'Posts navigation must contain a "Newer posts" link.'
+			);
+		}
+
+		if ( ! $older && ! $newer ) {
+			$this->assertEmpty(
+				$actual,
+				'Posts navigation must be an empty string.'
+			);
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_the_posts_navigation() {
+		return array(
+			'older posts'                 => array(
+				'post_per_page' => 1,
+				'paged_num'     => 1,
+				'older'         => true,
+				'newer'         => false,
+			),
+			'newer posts'                 => array(
+				'post_per_page' => 1,
+				'paged_num'     => 3,
+				'older'         => false,
+				'newer'         => true,
+			),
+			'newer posts and older posts' => array(
+				'post_per_page' => 1,
+				'paged_num'     => 2,
+				'older'         => true,
+				'newer'         => true,
+			),
+			'empty posts'                 => array(
+				'post_per_page' => 3,
+				'paged_num'     => 1,
+				'older'         => false,
+				'newer'         => false,
+			),
+		);
+	}
+
+}
diff --git a/tests/phpunit/tests/link/getThePrivacyPolicyLink.php b/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
index 942ae20c41c89..ca489bf177d7c 100644
--- a/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
+++ b/tests/phpunit/tests/link/getThePrivacyPolicyLink.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * Define a class to test the `get_the_privacy_policy_link()` function.
+ * Test cases for the `get_the_privacy_policy_link()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Test cases for the `get_the_privacy_policy_link()` function.
  *
  * @group link
  * @group privacy
  * @covers ::get_the_privacy_policy_link
- *
- * @since 4.9.6
  */
 class Tests_Link_GetThePrivacyPolicyLink extends WP_UnitTestCase {
 	/**
@@ -160,4 +154,15 @@ public function test_get_the_privacy_policy_link_should_be_filterable() {
 	public static function modify_link_markup( $link, $privacy_policy_url ) {
 		return 'Policy: ' . $privacy_policy_url;
 	}
+
+	/**
+	 * Tests that `get_the_privacy_policy_link()` adds `rel="privacy-policy"`.
+	 *
+	 * @ticket 56345
+	 */
+	public function test_get_the_privacy_policy_link_should_add_rel_privacy_policy() {
+		update_option( 'wp_page_for_privacy_policy', self::$privacy_policy_page_id );
+
+		$this->assertStringContainsString( 'rel="privacy-policy"', get_the_privacy_policy_link() );
+	}
 }
diff --git a/tests/phpunit/tests/load/wpDebugMode.php b/tests/phpunit/tests/load/wpDebugMode.php
index d527235e55cf6..f873ad906958c 100644
--- a/tests/phpunit/tests/load/wpDebugMode.php
+++ b/tests/phpunit/tests/load/wpDebugMode.php
@@ -6,16 +6,10 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.9.0
- */
-
-/**
- * Class Test_WP_Debug_Mode.
  *
  * @group load.php
  * @group wp-debug-mode
  * @covers ::wp_debug_mode
- *
- * @since 5.9.0
  */
 class Test_WP_Debug_Mode extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/load/wpGetDevelopmentMode.php b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
new file mode 100644
index 0000000000000..430c6b4948b26
--- /dev/null
+++ b/tests/phpunit/tests/load/wpGetDevelopmentMode.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Unit tests for `wp_get_development_mode()`.
+ *
+ * @package WordPress
+ * @subpackage UnitTests
+ * @since 6.3.0
+ *
+ * @group load.php
+ * @covers ::wp_get_development_mode
+ * @covers ::wp_is_development_mode
+ */
+class Test_WP_Get_Development_Mode extends WP_UnitTestCase {
+
+	/**
+	 * Tests that `wp_get_development_mode()` returns the value of the `WP_DEVELOPMENT_MODE` constant.
+	 *
+	 * @ticket 57487
+	 */
+	public function test_wp_get_development_mode_constant() {
+		$this->assertSame( WP_DEVELOPMENT_MODE, wp_get_development_mode() );
+	}
+
+	/**
+	 * Tests that `wp_get_development_mode()` allows test overrides.
+	 *
+	 * @ticket 57487
+	 */
+	public function test_wp_get_development_mode_test_overrides() {
+		global $_wp_tests_development_mode;
+
+		$_wp_tests_development_mode = 'plugin';
+		$this->assertSame( 'plugin', wp_get_development_mode() );
+	}
+
+	/**
+	 * Tests that `wp_get_development_mode()` ignores invalid filter values.
+	 *
+	 * @ticket 57487
+	 */
+	public function test_wp_get_development_mode_filter_invalid_value() {
+		global $_wp_tests_development_mode;
+
+		$_wp_tests_development_mode = 'invalid';
+		$this->assertSame( '', wp_get_development_mode() );
+	}
+
+	/**
+	 * Tests that `wp_is_development_mode()` returns expected results.
+	 *
+	 * @ticket 57487
+	 * @dataProvider data_wp_is_development_mode
+	 */
+	public function test_wp_is_development_mode( $current, $given, $expected ) {
+		global $_wp_tests_development_mode;
+
+		$_wp_tests_development_mode = $current;
+
+		if ( $expected ) {
+			$this->assertTrue( wp_is_development_mode( $given ), "{$given} is expected to pass in {$current} mode" );
+		} else {
+			$this->assertFalse( wp_is_development_mode( $given ), "{$given} is expected to fail in {$current} mode" );
+		}
+	}
+
+	/**
+	 * Data provider that returns test scenarios for the `test_wp_is_development_mode()` method.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_is_development_mode() {
+		return array(
+			'core mode, testing for core'              => array(
+				'core',
+				'core',
+				true,
+			),
+			'plugin mode, testing for plugin'          => array(
+				'plugin',
+				'plugin',
+				true,
+			),
+			'theme mode, testing for theme'            => array(
+				'theme',
+				'theme',
+				true,
+			),
+			'core mode, testing for plugin'            => array(
+				'core',
+				'plugin',
+				false,
+			),
+			'core mode, testing for theme'             => array(
+				'core',
+				'theme',
+				false,
+			),
+			'plugin mode, testing for core'            => array(
+				'plugin',
+				'core',
+				false,
+			),
+			'plugin mode, testing for theme'           => array(
+				'plugin',
+				'theme',
+				false,
+			),
+			'theme mode, testing for core'             => array(
+				'theme',
+				'core',
+				false,
+			),
+			'theme mode, testing for plugin'           => array(
+				'theme',
+				'plugin',
+				false,
+			),
+			'all mode, testing for core'               => array(
+				'all',
+				'core',
+				true,
+			),
+			'all mode, testing for plugin'             => array(
+				'all',
+				'plugin',
+				true,
+			),
+			'all mode, testing for theme'              => array(
+				'all',
+				'theme',
+				true,
+			),
+			'all mode, testing for all'                => array(
+				'all',
+				'all',
+				true,
+			),
+			'all mode, testing for non-standard value' => array(
+				'all',
+				'random',
+				true,
+			),
+			'invalid mode, testing for core'           => array(
+				'invalid',
+				'core',
+				false,
+			),
+			'invalid mode, testing for plugin'         => array(
+				'invalid',
+				'plugin',
+				false,
+			),
+			'invalid mode, testing for theme'          => array(
+				'invalid',
+				'theme',
+				false,
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/locale.php b/tests/phpunit/tests/locale.php
index 2e7daa87e17c4..b672d08121fac 100644
--- a/tests/phpunit/tests/locale.php
+++ b/tests/phpunit/tests/locale.php
@@ -15,6 +15,39 @@ public function set_up() {
 		$this->locale = new WP_Locale();
 	}
 
+	/**
+	 * @ticket 57427
+	 *
+	 * @dataProvider data_property_initializes_to_array
+	 *
+	 * @param string $name Property name to test.
+	 */
+	public function test_property_initializes_to_array( $name ) {
+		$this->assertIsArray( $this->locale->$name, "WP_Locale::{$name} property should be an array" );
+
+		// Test a custom implementation when `init()` is not invoked in the constructor.
+		$wp_locale = new Custom_WP_Locale();
+		$this->assertIsArray( $wp_locale->$name, "Custom_WP_Locale::{$name} property should be an array" );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_property_initializes_to_array() {
+		return array(
+			'weekday'         => array( 'weekday' ),
+			'weekday_initial' => array( 'weekday_initial' ),
+			'weekday_abbrev'  => array( 'weekday_abbrev' ),
+			'month'           => array( 'month' ),
+			'month_genitive'  => array( 'month_genitive' ),
+			'month_abbrev'    => array( 'month_abbrev' ),
+			'meridiem'        => array( 'meridiem' ),
+			'number_format'   => array( 'number_format' ),
+		);
+	}
+
 	/**
 	 * @covers WP_Locale::get_weekday
 	 */
@@ -140,4 +173,68 @@ public function test_is_rtl() {
 		$this->locale->text_direction = 'ltr';
 		$this->assertFalse( $this->locale->is_rtl() );
 	}
+
+	/**
+	 * Tests that `WP_Locale::get_word_count_type()` returns
+	 * the appropriate value.
+	 *
+	 * @ticket 56698
+	 *
+	 * @covers WP_Locale::get_word_count_type
+	 *
+	 * @dataProvider data_get_word_count_type
+	 *
+	 * @param string $word_count_type The word count type.
+	 * @param string $expected        The expected return value.
+	 */
+	public function test_get_word_count_type( $word_count_type, $expected ) {
+		if ( is_string( $word_count_type ) ) {
+			$this->locale->word_count_type = $word_count_type;
+
+		}
+
+		$this->assertSame( $expected, $this->locale->get_word_count_type() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_word_count_type() {
+		return array(
+			'default'                   => array(
+				'word_count_type' => null,
+				'expected'        => 'words',
+			),
+			'empty string'              => array(
+				'word_count_type' => '',
+				'expected'        => 'words',
+			),
+			'an invalid option - "foo"' => array(
+				'word_count_type' => 'foo',
+				'expected'        => 'words',
+			),
+			'a valid option - "words"'  => array(
+				'word_count_type' => 'words',
+				'expected'        => 'words',
+			),
+			'a valid option - "characters_excluding_spaces"' => array(
+				'word_count_type' => 'characters_excluding_spaces',
+				'expected'        => 'characters_excluding_spaces',
+			),
+			'a valid option - "characters_including_spaces"' => array(
+				'word_count_type' => 'characters_including_spaces',
+				'expected'        => 'characters_including_spaces',
+			),
+		);
+	}
+}
+
+class Custom_WP_Locale extends WP_Locale {
+	public function __construct() {
+		// Do not initialize to test property initialization.
+		// $this->init();
+		$this->register_globals();
+	}
 }
diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php
index 0d5ac7586369b..54ac0b71b5158 100644
--- a/tests/phpunit/tests/media.php
+++ b/tests/phpunit/tests/media.php
@@ -75,6 +75,17 @@ public static function tear_down_after_class() {
 		parent::tear_down_after_class();
 	}
 
+	/**
+	 * Ensures that the static content media count, fetchpriority element flag and related filter are reset between tests.
+	 */
+	public function tear_down() {
+		parent::tear_down();
+
+		$this->reset_content_media_count();
+		$this->reset_omit_loading_attr_filter();
+		$this->reset_high_priority_element_flag();
+	}
+
 	public function test_img_caption_shortcode_added() {
 		global $shortcode_tags;
 		$this->assertSame( 'img_caption_shortcode', $shortcode_tags['caption'] );
@@ -361,7 +372,7 @@ public function data_autoembed() {
 	 * @dataProvider data_autoembed
 	 */
 	public function test_autoembed( $content, $result = null ) {
-		$wp_embed = new Test_Autoembed;
+		$wp_embed = new Test_Autoembed();
 
 		$this->assertSame( $wp_embed->autoembed( $content ), $result ? $result : $content );
 	}
@@ -2279,7 +2290,7 @@ public function test_wp_filter_content_tags_srcset_sizes() {
 	 */
 	public function test_wp_filter_content_tags_srcset_sizes_wrong() {
 		$img = get_image_tag( self::$large_id, '', '', '', 'medium' );
-		$img = wp_img_tag_add_loading_attr( $img, 'test' );
+		$img = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
 		$img = wp_img_tag_add_decoding_attr( $img, 'the_content' );
 
 		// Replace the src URL.
@@ -2294,7 +2305,7 @@ public function test_wp_filter_content_tags_srcset_sizes_wrong() {
 	public function test_wp_filter_content_tags_srcset_sizes_with_preexisting_srcset() {
 		// Generate HTML and add a dummy srcset attribute.
 		$img = get_image_tag( self::$large_id, '', '', '', 'medium' );
-		$img = wp_img_tag_add_loading_attr( $img, 'test' );
+		$img = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
 		$img = wp_img_tag_add_decoding_attr( $img, 'the_content' );
 		$img = preg_replace( '|<img ([^>]+) />|', '<img $1 ' . 'srcset="image2x.jpg 2x" />', $img );
 
@@ -2348,7 +2359,7 @@ public function test_wp_filter_content_tags_filter_with_identical_image_tags_cus
 
 		add_filter(
 			'wp_content_img_tag',
-			function( $filtered_image ) {
+			static function( $filtered_image ) {
 				return "<span>$filtered_image</span>";
 			}
 		);
@@ -2372,7 +2383,7 @@ public function test_wp_filter_content_tags_filter_with_identical_image_tags_dis
 
 		add_filter(
 			'wp_content_img_tag',
-			function( $filtered_image ) {
+			static function( $filtered_image ) {
 				return "<span>$filtered_image</span>";
 			}
 		);
@@ -2439,7 +2450,7 @@ public function test_wp_filter_content_tags_schemes() {
 
 		// Build HTML for the editor.
 		$img          = get_image_tag( self::$large_id, '', '', '', 'medium' );
-		$img          = wp_img_tag_add_loading_attr( $img, 'test' );
+		$img          = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
 		$img_https    = str_replace( 'http://', 'https://', $img );
 		$img_relative = str_replace( 'http://', '//', $img );
 
@@ -2980,6 +2991,7 @@ public function test_wp_filter_content_tags_width_height() {
 	 * @ticket 44427
 	 * @ticket 50367
 	 * @ticket 50756
+	 * @ticket 58235
 	 * @requires function imagejpeg
 	 */
 	public function test_wp_filter_content_tags_loading_lazy() {
@@ -2994,13 +3006,13 @@ public function test_wp_filter_content_tags_loading_lazy() {
 		$iframe                 = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
 		$iframe_no_width_height = '<iframe src="https://www.example.com"></iframe>';
 
-		$lazy_img       = wp_img_tag_add_loading_attr( $img, 'test' );
-		$lazy_img_xhtml = wp_img_tag_add_loading_attr( $img_xhtml, 'test' );
-		$lazy_img_html5 = wp_img_tag_add_loading_attr( $img_html5, 'test' );
+		$lazy_img       = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
+		$lazy_img_xhtml = wp_img_tag_add_loading_optimization_attrs( $img_xhtml, 'test' );
+		$lazy_img_html5 = wp_img_tag_add_loading_optimization_attrs( $img_html5, 'test' );
 		$lazy_iframe    = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
 
 		// The following should not be modified because there already is a 'loading' attribute.
-		$img_eager    = str_replace( ' />', ' loading="eager" />', $img );
+		$img_eager    = str_replace( ' />', ' loading="eager" fetchpriority="high" />', $img );
 		$iframe_eager = str_replace( '">', '" loading="eager">', $iframe );
 
 		$content = '
@@ -3059,10 +3071,11 @@ public function test_wp_filter_content_tags_loading_lazy() {
 	/**
 	 * @ticket 44427
 	 * @ticket 50756
+	 * @ticket 58235
 	 */
 	public function test_wp_filter_content_tags_loading_lazy_opted_in() {
 		$img         = get_image_tag( self::$large_id, '', '', '', 'medium' );
-		$lazy_img    = wp_img_tag_add_loading_attr( $img, 'test' );
+		$lazy_img    = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
 		$lazy_img    = wp_img_tag_add_decoding_attr( $lazy_img, 'the_content' );
 		$iframe      = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
 		$lazy_iframe = wp_iframe_tag_add_loading_attr( $iframe, 'test' );
@@ -3117,6 +3130,9 @@ public function test_wp_filter_content_tags_loading_lazy_opted_out() {
 	/**
 	 * @ticket 44427
 	 * @ticket 50367
+	 *
+	 * @expectedDeprecated wp_img_tag_add_loading_attr
+	 * @expectedDeprecated wp_get_loading_attr_default
 	 */
 	public function test_wp_img_tag_add_loading_attr() {
 		$img = '<img src="example.png" alt=" width="300" height="225" />';
@@ -3128,6 +3144,9 @@ public function test_wp_img_tag_add_loading_attr() {
 	/**
 	 * @ticket 44427
 	 * @ticket 50367
+	 *
+	 * @expectedDeprecated wp_img_tag_add_loading_attr
+	 * @expectedDeprecated wp_get_loading_attr_default
 	 */
 	public function test_wp_img_tag_add_loading_attr_without_src() {
 		$img = '<img alt=" width="300" height="225" />';
@@ -3139,6 +3158,9 @@ public function test_wp_img_tag_add_loading_attr_without_src() {
 	/**
 	 * @ticket 44427
 	 * @ticket 50367
+	 *
+	 * @expectedDeprecated wp_img_tag_add_loading_attr
+	 * @expectedDeprecated wp_get_loading_attr_default
 	 */
 	public function test_wp_img_tag_add_loading_attr_with_single_quotes() {
 		$img = "<img src='example.png' alt=' width='300' height='225' />";
@@ -3162,6 +3184,28 @@ public function test_wp_img_tag_add_loading_attr_opt_out() {
 		$this->assertStringNotContainsString( ' loading=', $img );
 	}
 
+	/**
+	 * Test that decoding="async" is not applied to img tags with single quotes.
+	 *
+	 * @ticket 56969
+	 */
+	public function test_wp_img_tag_add_decoding_attr_with_single_quotes() {
+		$img = "<img src='example.png' alt='' width='300' height='225' />";
+		$img = wp_img_tag_add_decoding_attr( $img, 'test' );
+		$this->assertStringNotContainsString( ' decoding="async"', $img );
+	}
+
+	/**
+	 * Test that decoding="async" is not applied to img tags inside JSON.
+	 *
+	 * @ticket 56969
+	 */
+	public function test_decoding_async_not_applied_to_json() {
+		$content = '{"image": "<img src=\"example.png\" alt=\"\" width=\"300\" height=\"225\" />"}';
+		$content = wp_filter_content_tags( $content );
+		$this->assertStringNotContainsString( ' decoding="async"', $content );
+	}
+
 	/**
 	 * @ticket 50756
 	 */
@@ -3256,6 +3300,168 @@ public function test_wp_get_attachment_image_loading_opt_out_individual() {
 		$this->assertStringNotContainsString( ' loading=', $img );
 	}
 
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_attachment_image
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_attachment_image_fetchpriority_not_present_by_default() {
+		$img = wp_get_attachment_image( self::$large_id );
+
+		$this->assertStringNotContainsString( ' fetchpriority="high"', $img );
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_attachment_image
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_attachment_image_fetchpriority_high_when_not_lazy_loaded() {
+		$img = wp_get_attachment_image( self::$large_id, 'large', false, array( 'loading' => false ) );
+
+		$this->assertStringContainsString( ' fetchpriority="high"', $img );
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @dataProvider data_provider_fetchpriority_values
+	 *
+	 * @covers ::wp_get_attachment_image
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_attachment_image_fetchpriority_original_value_respected( $value ) {
+		$img = wp_get_attachment_image(
+			self::$large_id,
+			'large',
+			false,
+			array(
+				'loading'       => false,
+				'fetchpriority' => $value,
+			)
+		);
+
+		$this->assertStringContainsString( ' fetchpriority="' . $value . '"', $img );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_provider_fetchpriority_values() {
+		return self::text_array_to_dataprovider( array( 'high', 'low', 'auto' ) );
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_attachment_image
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_attachment_image_fetchpriority_stripped_when_false() {
+		$img = wp_get_attachment_image(
+			self::$large_id,
+			'large',
+			false,
+			array(
+				'loading'       => false,
+				'fetchpriority' => false,
+			)
+		);
+
+		$this->assertStringNotContainsString( ' fetchpriority=', $img );
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_attachment_image
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_attachment_image_fetchpriority_high_prevents_lazy_loading() {
+		$img = wp_get_attachment_image( self::$large_id, 'large', false, array( 'fetchpriority' => 'high' ) );
+
+		$this->assertStringNotContainsString( ' loading="lazy"', $img );
+	}
+
+	/**
+	 * @ticket 57086
+	 *
+	 * @dataProvider data_wp_get_attachment_image_decoding_attr
+	 *
+	 * @covers ::wp_get_attachment_image
+	 */
+	public function test_wp_get_attachment_image_decoding_attr( $decoding, $expected ) {
+		if ( 'no value' === $decoding ) {
+			$image = wp_get_attachment_image( self::$large_id, 'thumbnail', false, array() );
+		} else {
+			$image = wp_get_attachment_image( self::$large_id, 'thumbnail', false, array( 'decoding' => $decoding ) );
+		}
+
+		if ( 'no value' === $expected ) {
+			$this->assertStringNotContainsString( ' decoding=', $image );
+		} else {
+			$this->assertStringContainsString( ' decoding="' . esc_attr( $expected ) . '"', $image );
+		}
+	}
+
+	/**
+	 * Data provider for test_wp_get_attachment_image_decoding_attr().
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_get_attachment_image_decoding_attr() {
+		return array(
+			'default'     => array(
+				'decoding' => 'no value',
+				'expected' => 'async',
+			),
+			'async'       => array(
+				'decoding' => 'async',
+				'expected' => 'async',
+			),
+			'sync'        => array(
+				'decoding' => 'sync',
+				'expected' => 'sync',
+			),
+			'auto'        => array(
+				'decoding' => 'auto',
+				'expected' => 'auto',
+			),
+			'empty'       => array(
+				'decoding' => '',
+				'expected' => 'no value',
+			),
+			'false'       => array(
+				'decoding' => false,
+				'expected' => 'no value',
+			),
+			'null'        => array(
+				'decoding' => null,
+				'expected' => 'no value',
+			),
+			'zero'        => array(
+				'decoding' => 0,
+				'expected' => 'no value',
+			),
+			'zero string' => array(
+				'decoding' => '0',
+				'expected' => 'no value',
+			),
+			'zero float'  => array(
+				'decoding' => 0.0,
+				'expected' => 'no value',
+			),
+			'invalid'     => array(
+				'decoding' => 'invalid',
+				'expected' => 'no value',
+			),
+		);
+	}
+
 	/**
 	 * @ticket 44427
 	 * @ticket 50425
@@ -3450,14 +3656,20 @@ public function data_attachment_permalinks_based_on_parent_status() {
 	}
 
 	/**
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value.
+	 *
 	 * @ticket 53675
+	 * @ticket 56930
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
 	 * @dataProvider data_wp_get_loading_attr_default
 	 *
 	 * @param string $context
 	 */
-	function test_wp_get_loading_attr_default( $context ) {
-		global $wp_query, $wp_the_query;
-
+	public function test_wp_get_loading_attr_default( $context ) {
 		// Return 'lazy' by default.
 		$this->assertSame( 'lazy', wp_get_loading_attr_default( 'test' ) );
 		$this->assertSame( 'lazy', wp_get_loading_attr_default( 'wp_get_attachment_image' ) );
@@ -3465,9 +3677,7 @@ function test_wp_get_loading_attr_default( $context ) {
 		// Return 'lazy' if not in the loop or the main query.
 		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 
-		$wp_query = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) );
-		$this->reset_content_media_count();
-		$this->reset_omit_loading_attr_filter();
+		$query = $this->get_new_wp_query_for_published_post();
 
 		while ( have_posts() ) {
 			the_post();
@@ -3476,14 +3686,18 @@ function test_wp_get_loading_attr_default( $context ) {
 			$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 
 			// Set as main query.
-			$wp_the_query = $wp_query;
+			$this->set_main_query( $query );
 
-			// For contexts other than for the main content, still return 'lazy' even in the loop
-			// and in the main query, and do not increase the content media count.
+			/*
+			 * For contexts other than for the main content, still return 'lazy' even in the loop
+			 * and in the main query, and do not increase the content media count.
+			 */
 			$this->assertSame( 'lazy', wp_get_loading_attr_default( 'wp_get_attachment_image' ) );
 
-			// Return `false` if in the loop and in the main query and it is the first element.
-			$this->assertFalse( wp_get_loading_attr_default( $context ) );
+			// Return `false` in the main query for first three element.
+			$this->assertFalse( wp_get_loading_attr_default( $context ), 'Expected first image to not be lazy-loaded.' );
+			$this->assertFalse( wp_get_loading_attr_default( $context ), 'Expected second image to not be lazy-loaded.' );
+			$this->assertFalse( wp_get_loading_attr_default( $context ), 'Expected third image to not be lazy-loaded.' );
 
 			// Return 'lazy' if in the loop and in the main query for any subsequent elements.
 			$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
@@ -3491,9 +3705,13 @@ function test_wp_get_loading_attr_default( $context ) {
 			// Yes, for all subsequent elements.
 			$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 		}
+
+		// Exceptions: In the following contexts, images shouldn't be lazy-loaded by default.
+		$this->assertFalse( wp_get_loading_attr_default( 'template' ), 'Images run through the overall block template filter should not be lazy-loaded.' );
+		$this->assertFalse( wp_get_loading_attr_default( 'template_part_' . WP_TEMPLATE_PART_AREA_HEADER ), 'Images in the footer block template part should not be lazy-loaded.' );
 	}
 
-	function data_wp_get_loading_attr_default() {
+	public function data_wp_get_loading_attr_default() {
 		return array(
 			array( 'the_content' ),
 			array( 'the_post_thumbnail' ),
@@ -3502,68 +3720,69 @@ function data_wp_get_loading_attr_default() {
 
 	/**
 	 * @ticket 53675
+	 * @ticket 58235
 	 */
-	function test_wp_omit_loading_attr_threshold_filter() {
-		global $wp_query, $wp_the_query;
+	public function test_wp_omit_loading_attr_threshold_filter() {
+		// Using a smaller image here.
+		$attr = array(
+			'width'  => 100,
+			'height' => 100,
+		);
 
-		$wp_query     = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) );
-		$wp_the_query = $wp_query;
-		$this->reset_content_media_count();
-		$this->reset_omit_loading_attr_filter();
+		$query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $query );
 
-		// Use the filter to alter the threshold for not lazy-loading to the first three elements.
-		add_filter(
-			'wp_omit_loading_attr_threshold',
-			function() {
-				return 3;
-			}
-		);
+		// Use the filter to alter the threshold for not lazy-loading to the first five elements.
+		$this->force_omit_loading_attr_threshold( 5 );
 
 		while ( have_posts() ) {
 			the_post();
 
-			// Due to the filter, now the first three elements should not be lazy-loaded, i.e. return `false`.
-			for ( $i = 0; $i < 3; $i++ ) {
-				$this->assertFalse( wp_get_loading_attr_default( 'the_content' ) );
+			// Due to the filter, now the first five elements should not be lazy-loaded, i.e. return `false`.
+			for ( $i = 0; $i < 5; $i++ ) {
+				$this->assertEmpty(
+					wp_get_loading_optimization_attributes( 'img', $attr, 'the_content' ),
+					'Expected second image to not be lazy-loaded.'
+				);
 			}
 
 			// For following elements, lazy-load them again.
-			$this->assertSame( 'lazy', wp_get_loading_attr_default( 'the_content' ) );
+			$this->assertSame(
+				array( 'loading' => 'lazy' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, 'the_content' )
+			);
 		}
 	}
 
 	/**
 	 * @ticket 53675
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_filter_content_tags
+	 * @covers ::wp_img_tag_add_loading_optimization_attrs
+	 * @covers ::wp_get_loading_optimization_attributes
 	 */
-	function test_wp_filter_content_tags_with_wp_get_loading_attr_default() {
-		global $wp_query, $wp_the_query;
-
+	public function test_wp_filter_content_tags_with_loading_optimization_attrs() {
 		$img1         = get_image_tag( self::$large_id, '', '', '', 'large' );
 		$iframe1      = '<iframe src="https://www.example.com" width="640" height="360"></iframe>';
 		$img2         = get_image_tag( self::$large_id, '', '', '', 'medium' );
 		$img3         = get_image_tag( self::$large_id, '', '', '', 'thumbnail' );
 		$iframe2      = '<iframe src="https://wordpress.org" width="640" height="360"></iframe>';
-		$lazy_img2    = wp_img_tag_add_loading_attr( $img2, 'the_content' );
-		$lazy_img3    = wp_img_tag_add_loading_attr( $img3, 'the_content' );
+		$prio_img1    = str_replace( ' src=', ' fetchpriority="high" src=', $img1 );
+		$lazy_img2    = wp_img_tag_add_loading_optimization_attrs( $img2, 'the_content' );
+		$lazy_img3    = wp_img_tag_add_loading_optimization_attrs( $img3, 'the_content' );
 		$lazy_iframe2 = wp_iframe_tag_add_loading_attr( $iframe2, 'the_content' );
 
 		// Use a threshold of 2.
-		add_filter(
-			'wp_omit_loading_attr_threshold',
-			function() {
-				return 2;
-			}
-		);
+		$this->force_omit_loading_attr_threshold( 2 );
 
 		// Following the threshold of 2, the first two content media elements should not be lazy-loaded.
 		$content_unfiltered = $img1 . $iframe1 . $img2 . $img3 . $iframe2;
-		$content_expected   = $img1 . $iframe1 . $lazy_img2 . $lazy_img3 . $lazy_iframe2;
+		$content_expected   = $prio_img1 . $iframe1 . $lazy_img2 . $lazy_img3 . $lazy_iframe2;
 		$content_expected   = wp_img_tag_add_decoding_attr( $content_expected, 'the_content' );
 
-		$wp_query     = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) );
-		$wp_the_query = $wp_query;
-		$this->reset_content_media_count();
-		$this->reset_omit_loading_attr_filter();
+		$query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $query );
 
 		while ( have_posts() ) {
 			the_post();
@@ -3583,135 +3802,1607 @@ function() {
 	public function test_wp_omit_loading_attr_threshold() {
 		$this->reset_omit_loading_attr_filter();
 
-		// Apply filter, ensure default value of 1.
+		// Apply filter, ensure default value of 3.
 		$omit_threshold = wp_omit_loading_attr_threshold();
-		$this->assertSame( 1, $omit_threshold );
+		$this->assertSame( 3, $omit_threshold );
+
+		// Add a filter that changes the value to 1. However, the filter is not applied a subsequent time in a single
+		// page load by default, so the value is still 3.
+		$this->force_omit_loading_attr_threshold( 1 );
 
-		// Add a filter that changes the value to 3. However, the filter is not applied a subsequent time in a single
-		// page load by default, so the value is still 1.
-		add_filter(
-			'wp_omit_loading_attr_threshold',
-			function() {
-				return 3;
-			}
-		);
 		$omit_threshold = wp_omit_loading_attr_threshold();
-		$this->assertSame( 1, $omit_threshold );
+		$this->assertSame( 3, $omit_threshold );
 
 		// Only by enforcing a fresh check, the filter gets re-applied.
 		$omit_threshold = wp_omit_loading_attr_threshold( true );
-		$this->assertSame( 3, $omit_threshold );
+		$this->assertSame( 1, $omit_threshold );
 	}
 
-	private function reset_content_media_count() {
-		// Get current value without increasing.
-		$content_media_count = wp_increase_content_media_count( 0 );
-
-		// Decrease it by its current value to "reset" it back to 0.
-		wp_increase_content_media_count( - $content_media_count );
-	}
+	/**
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value before loop but after get_header if not main query.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_attr_default_before_loop_if_not_main_query( $context ) {
+		global $wp_query;
 
-	private function reset_omit_loading_attr_filter() {
-		// Add filter to "reset" omit threshold back to null (unset).
-		add_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
+		$wp_query = $this->get_new_wp_query_for_published_post();
 
-		// Force filter application to re-run.
-		wp_omit_loading_attr_threshold( true );
+		do_action( 'get_header' );
 
-		// Clean up the above filter.
-		remove_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
+		// Lazy if not main query.
+		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 	}
 
 	/**
-	 * Test that generated files with the `image_editor_output_format` applied use the correct
-	 * quality level based on their mime type.
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value before loop but after get_header in main query but header was not called.
 	 *
-	 * @ticket 56442
+	 * @ticket 58211
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
 	 */
-	public function test_quality_with_image_conversion_file_sizes() {
-		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_jpeg' ) );
-		$temp_dir = get_temp_dir();
-		$file     = $temp_dir . '/33772.jpg';
-		copy( DIR_TESTDATA . '/images/33772.jpg', $file );
+	public function test_wp_get_loading_attr_default_before_loop_in_main_query_but_header_not_called( $context ) {
+		global $wp_query;
 
-		// Set JPEG output quality very low and WebP quality very high, this should force all generated WebP images to
-		// be larger than the the matching generated JPEGs.
-		add_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality_low_jpeg' ), 10, 2 );
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
 
-		$editor = wp_get_image_editor( $file );
+		// Lazy if header not called.
+		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
+	}
 
-		// Verify that the selected editor supports WebP output.
-		if ( ! $editor->supports_mime_type( 'image/webp' ) ) {
-			$this->markTestSkipped( 'WebP is not supported by the selected image editor.' );
-		}
+	/**
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value before loop but after get_header for main query.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_attr_default_before_loop_if_main_query( $context ) {
+		global $wp_query;
 
-		$attachment_id = self::factory()->attachment->create_object(
-			array(
-				'post_mime_type' => 'image/jpeg',
-				'file'           => $file,
-			)
-		);
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
 
-		add_filter( 'big_image_size_threshold', array( $this, 'add_big_image_size_threshold' ) );
+		do_action( 'get_header' );
+		$this->assertFalse( wp_get_loading_attr_default( $context ) );
+	}
 
-		// Generate all sizes as JPEGs.
-		$jpeg_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
-		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_jpeg' ) );
+	/**
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value after get_header and after loop.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_attr_default_after_loop( $context ) {
+		global $wp_query;
 
-		// Generate all sizes as WebP.
-		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_webp' ) );
-		$webp_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
-		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_webp' ) );
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
 
-		// The main (scaled) image: the JPEG should be smaller than the WebP.
-		$this->assertLessThan( $webp_sizes['filesize'], $jpeg_sizes['filesize'], 'The JPEG should be smaller than the WebP.' );
+		do_action( 'get_header' );
 
-		// Sub-sizes: for each size, the JPEGs should be smaller than the WebP.
-		$sizes_to_compare = array_intersect_key( $jpeg_sizes['sizes'], $webp_sizes['sizes'] );
-		foreach ( $sizes_to_compare as $size => $size_data ) {
-			$this->assertLessThan( $webp_sizes['sizes'][ $size ]['filesize'], $jpeg_sizes['sizes'][ $size ]['filesize'] );
+		while ( have_posts() ) {
+			the_post();
 		}
+		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 	}
 
 	/**
-	 * Add threshold to create a `-scaled` output image for testing.
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute if no loop.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
 	 */
-	public function add_big_image_size_threshold() {
-		return 1000;
-	}
+	public function test_wp_get_loading_attr_default_no_loop( $context ) {
+		global $wp_query;
 
-	/**
-	 * Output JPEG files.
-	 */
-	public function image_editor_output_jpeg() {
-		return array( 'image/jpeg' => 'image/jpeg' );
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+
+		// Ensure header and footer is called.
+		do_action( 'get_header' );
+		do_action( 'get_footer' );
+
+		// Load lazy if the there is no loop and footer was called.
+		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
 	}
 
 	/**
-	 * Output WebP files.
+	 * Data provider.
+	 *
+	 * @return array[]
 	 */
-	public function image_editor_output_webp() {
-		return array( 'image/jpeg' => 'image/webp' );
+	public function data_wp_get_loading_attr_default_before_and_no_loop() {
+		return array(
+			array( 'wp_get_attachment_image' ),
+			array( 'the_post_thumbnail' ),
+		);
 	}
 
 	/**
-	 * Changes the quality using very low quality for JPEGs and very high quality
-	 * for WebPs, used to verify the filter is applying correctly.
+	 * Tests that wp_filter_content_tags() does not add loading="lazy" to the first
+	 * image in the loop when using a block theme.
 	 *
-	 * @param int    $quality   Default quality.
-	 * @param string $mime_type Image mime-type.
-	 * @return int The changed quality.
+	 * @ticket 56930
+	 * @ticket 58548
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_filter_content_tags
+	 * @covers ::wp_img_tag_add_loading_optimization_attrs
+	 * @covers ::wp_get_loading_optimization_attributes
 	 */
-	public function image_editor_change_quality_low_jpeg( $quality, $mime_type ) {
-		if ( 'image/jpeg' === $mime_type ) {
-			return 1;
-		} elseif ( 'image/webp' === $mime_type ) {
-			return 100;
-		} else {
+	public function test_wp_filter_content_tags_does_not_lazy_load_first_image_in_block_theme() {
+		global $_wp_current_template_content, $wp_query, $wp_the_query, $post;
+
+		// Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
+		add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+		add_filter( 'wp_img_tag_add_decoding_attr', '__return_false' );
+		$this->force_omit_loading_attr_threshold( 1 );
+
+		$img1      = get_image_tag( self::$large_id, '', '', '', 'large' );
+		$img2      = get_image_tag( self::$large_id, '', '', '', 'medium' );
+		$prio_img1 = str_replace( ' src=', ' fetchpriority="high" src=', $img1 );
+		$lazy_img2 = wp_img_tag_add_loading_optimization_attrs( $img2, 'the_content' );
+
+		// Only the second image should be lazy-loaded.
+		$post_content     = $img1 . $img2;
+		$expected_content = wpautop( $prio_img1 . $lazy_img2 );
+
+		// Update the post to test with so that it has the above post content.
+		wp_update_post(
+			array(
+				'ID'                    => self::$post_ids['publish'],
+				'post_content'          => $post_content,
+				'post_content_filtered' => $post_content,
+			)
+		);
+
+		$wp_query     = new WP_Query( array( 'p' => self::$post_ids['publish'] ) );
+		$wp_the_query = $wp_query;
+		$post         = get_post( self::$post_ids['publish'] );
+
+		$_wp_current_template_content = '<!-- wp:post-content /-->';
+
+		$html = get_the_block_template_html();
+		$this->assertSame( '<div class="wp-site-blocks"><div class="entry-content wp-block-post-content is-layout-flow wp-block-post-content-is-layout-flow">' . $expected_content . '</div></div>', $html );
+	}
+
+	/**
+	 * Tests that wp_filter_content_tags() does not add loading="lazy"
+	 * to the featured image when using a block theme.
+	 *
+	 * @ticket 56930
+	 * @ticket 58548
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_filter_content_tags
+	 * @covers ::wp_img_tag_add_loading_optimization_attrs
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_filter_content_tags_does_not_lazy_load_first_featured_image_in_block_theme() {
+		global $_wp_current_template_content, $wp_query, $wp_the_query, $post;
+
+		// Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
+		add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+		add_filter( 'wp_img_tag_add_decoding_attr', '__return_false' );
+		add_filter(
+			'wp_get_attachment_image_attributes',
+			static function( $attr ) {
+				unset( $attr['srcset'], $attr['sizes'], $attr['decoding'] );
+				return $attr;
+			}
+		);
+		$this->force_omit_loading_attr_threshold( 1 );
+
+		$content_img      = get_image_tag( self::$large_id, '', '', '', 'large' );
+		$lazy_content_img = wp_img_tag_add_loading_optimization_attrs( $content_img, 'the_content' );
+
+		// The featured image should not be lazy-loaded as it is the first image.
+		$featured_image_id = self::$large_id;
+		update_post_meta( self::$post_ids['publish'], '_thumbnail_id', $featured_image_id );
+		$expected_featured_image = '<figure class="wp-block-post-featured-image">' . get_the_post_thumbnail(
+			self::$post_ids['publish'],
+			'post-thumbnail',
+			array(
+				'loading'       => false,
+				'style'         => 'object-fit:cover;',
+				'fetchpriority' => 'high',
+			)
+		) . '</figure>';
+
+		// Reset high priority flag as the forced `fetchpriority="high"` above already modified it.
+		$this->reset_high_priority_element_flag();
+
+		// The post content image should be lazy-loaded since the featured image appears above.
+		$post_content     = $content_img;
+		$expected_content = wpautop( $lazy_content_img );
+
+		// Update the post to test with so that it has the above post content.
+		wp_update_post(
+			array(
+				'ID'                    => self::$post_ids['publish'],
+				'post_content'          => $post_content,
+				'post_content_filtered' => $post_content,
+			)
+		);
+		$wp_query     = new WP_Query( array( 'p' => self::$post_ids['publish'] ) );
+		$wp_the_query = $wp_query;
+		$post         = get_post( self::$post_ids['publish'] );
+
+		$_wp_current_template_content = '<!-- wp:post-featured-image /--> <!-- wp:post-content /-->';
+
+		$html = get_the_block_template_html();
+		$this->assertSame( '<div class="wp-site-blocks">' . $expected_featured_image . ' <div class="entry-content wp-block-post-content is-layout-flow wp-block-post-content-is-layout-flow">' . $expected_content . '</div></div>', $html );
+	}
+
+	/**
+	 * Tests that wp_filter_content_tags() does not add loading="lazy" to images
+	 * in a "Header" template part.
+	 *
+	 * @ticket 56930
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_filter_content_tags
+	 * @covers ::wp_img_tag_add_loading_optimization_attrs
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_filter_content_tags_does_not_lazy_load_images_in_header() {
+		global $_wp_current_template_content;
+
+		// Do not add srcset, sizes, or decoding attributes as they are irrelevant for this test.
+		add_filter( 'wp_img_tag_add_srcset_and_sizes_attr', '__return_false' );
+		add_filter( 'wp_img_tag_add_decoding_attr', '__return_false' );
+
+		// Use a single image for each header and footer template parts.
+		$header_img = get_image_tag( self::$large_id, '', '', '', 'large' );
+		// Since header_img is qualified candidate for LCP, fetchpriority high is applied to it.
+		$header_img = str_replace( '<img', '<img fetchpriority="high"', $header_img );
+
+		$footer_img = get_image_tag( self::$large_id, '', '', '', 'medium' );
+
+		// Create header and footer template parts.
+		$header_post_id = self::factory()->post->create(
+			array(
+				'post_type'    => 'wp_template_part',
+				'post_status'  => 'publish',
+				'post_name'    => 'header',
+				'post_content' => $header_img,
+			)
+		);
+		wp_set_post_terms( $header_post_id, WP_TEMPLATE_PART_AREA_HEADER, 'wp_template_part_area' );
+		wp_set_post_terms( $header_post_id, get_stylesheet(), 'wp_theme' );
+		$footer_post_id = self::factory()->post->create(
+			array(
+				'post_type'    => 'wp_template_part',
+				'post_status'  => 'publish',
+				'post_name'    => 'footer',
+				'post_content' => $footer_img,
+			)
+		);
+		wp_set_post_terms( $footer_post_id, WP_TEMPLATE_PART_AREA_FOOTER, 'wp_template_part_area' );
+		wp_set_post_terms( $footer_post_id, get_stylesheet(), 'wp_theme' );
+
+		$_wp_current_template_content = '<!-- wp:template-part {"slug":"header","theme":"' . get_stylesheet() . '","tagName":"header"} /--><!-- wp:template-part {"slug":"footer","theme":"' . get_stylesheet() . '","tagName":"footer"} /-->';
+
+		// Header image should not be lazy-loaded, footer image should be lazy-loaded.
+		$expected_template_content  = '<header class="wp-block-template-part">' . $header_img . '</header>';
+		$expected_template_content .= '<footer class="wp-block-template-part">' . wp_img_tag_add_loading_optimization_attrs( $footer_img, 'force-lazy' ) . '</footer>';
+
+		$html = get_the_block_template_html();
+		$this->assertSame( '<div class="wp-site-blocks">' . $expected_template_content . '</div>', $html );
+	}
+
+	/**
+	 * @ticket 58089
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_filter_content_tags
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_filter_content_tags_does_not_apply_loading_optimization_to_special_images_within_the_content() {
+		global $wp_query, $wp_the_query;
+
+		// Force no lazy-loading or fetchpriority on the image tag expected in the content.
+		$expected_image = wp_get_attachment_image(
+			self::$large_id,
+			'large',
+			false,
+			array(
+				'loading'       => false,
+				'fetchpriority' => false,
+			)
+		);
+
+		// Reset high priority flag as the forced `fetchpriority="high"` above already modified it.
+		$this->reset_high_priority_element_flag();
+
+		$image_within_content = '';
+
+		// Overwrite post content with an image.
+		add_filter(
+			'the_content',
+			static function() use ( &$image_within_content ) {
+				// Replace content with an image tag, i.e. the 'wp_get_attachment_image' context is used while running 'the_content' filter.
+				$image_within_content = wp_get_attachment_image( self::$large_id, 'large', false );
+				return $image_within_content;
+			},
+			9 // Run before wp_filter_content_tags().
+		);
+
+		/*
+		 * We have to run a main query loop so that the first 'the_content' context image is not
+		 * lazy-loaded.
+		 * Without the fix from 58089, the image would still be lazy-loaded since the check for the
+		 * separately invoked 'wp_get_attachment_image' context would lead to that.
+		 */
+		$wp_query     = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) );
+		$wp_the_query = $wp_query;
+
+		$content = '';
+		while ( have_posts() ) {
+			the_post();
+			$content = get_echo( 'the_content' );
+		}
+
+		// Ensure that parsed image within content does not receive any loading optimization attributes.
+		$this->assertSame( $expected_image, $image_within_content, 'Image with wp_get_attachment_image context within post content should not receive loading optimization attributes' );
+
+		// Ensure that parsed content has the image with fetchpriority as it is the first large image.
+		$expected_content = wpautop( str_replace( '<img ', '<img fetchpriority="high" ', $expected_image ) );
+		$this->assertSame( $expected_content, $content, 'Post content with programmatically injected image is missing loading optimization attributes' );
+	}
+
+	/**
+	 * Tests that wp_get_loading_attr_default() returns 'lazy' for special contexts when they're used outside of 'the_content' filter.
+	 *
+	 * @ticket 58089
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_special_contexts_for_the_content_wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_attr_default_should_return_lazy_for_special_contexts_outside_of_the_content( $context ) {
+		$this->assertSame( 'lazy', wp_get_loading_attr_default( $context ) );
+	}
+
+	/**
+	 * Tests that wp_get_loading_attr_default() returns false for special contexts when they're used within 'the_content' filter.
+	 *
+	 * @ticket 58089
+	 *
+	 * @covers ::wp_get_loading_attr_default
+	 *
+	 * @expectedDeprecated wp_get_loading_attr_default
+	 *
+	 * @dataProvider data_special_contexts_for_the_content_wp_get_loading_attr_default
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_attr_default_should_return_false_for_special_contexts_within_the_content( $context ) {
+		remove_all_filters( 'the_content' );
+
+		$result = null;
+		add_filter(
+			'the_content',
+			static function( $content ) use ( &$result, $context ) {
+				$result = wp_get_loading_attr_default( $context );
+				return $content;
+			}
+		);
+		apply_filters( 'the_content', '' );
+		$this->assertFalse( $result );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_special_contexts_for_the_content() {
+		return array(
+			'widget_media_image'      => array( 'context' => 'widget_media_image' ),
+			'the_post_thumbnail'      => array( 'context' => 'the_post_thumbnail' ),
+			'wp_get_attachment_image' => array( 'context' => 'wp_get_attachment_image' ),
+		);
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_special_contexts_for_the_content_wp_get_loading_attr_default() {
+		return array(
+			'the_post_thumbnail'      => array( 'context' => 'the_post_thumbnail' ),
+			'wp_get_attachment_image' => array( 'context' => 'wp_get_attachment_image' ),
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_attr_default() returns the expected loading attribute value.
+	 *
+	 * @ticket 53675
+	 * @ticket 56930
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default
+	 *
+	 * @param string $context
+	 */
+	public function test_wp_get_loading_optimization_attributes( $context ) {
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Return 'lazy' by default.
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'test' )
+		);
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'wp_get_attachment_image' )
+		);
+
+		// Return 'lazy' if not in the loop or the main query.
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+
+		$query = $this->get_new_wp_query_for_published_post();
+
+		while ( have_posts() ) {
+			the_post();
+
+			// Return 'lazy' if in the loop but not in the main query.
+			$this->assertSame(
+				array( 'loading' => 'lazy' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, $context )
+			);
+
+			// Set as main query.
+			$this->set_main_query( $query );
+
+			/*
+			 * For contexts other than for the main content, still return 'lazy' even in the loop
+			 * and in the main query, and do not increase the content media count.
+			 */
+			$this->assertSame(
+				array( 'loading' => 'lazy' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, 'wp_get_attachment_image' )
+			);
+
+			// First three element are not lazy loaded. However, first image is loaded with fetchpriority high.
+			$this->assertSame(
+				array( 'fetchpriority' => 'high' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, $context ),
+				"Expected first image to not be lazy-loaded. First large image get's high fetchpriority."
+			);
+			$this->assertEmpty(
+				wp_get_loading_optimization_attributes( 'img', $attr, $context ),
+				'Expected second image to not be lazy-loaded.'
+			);
+			$this->assertEmpty(
+				wp_get_loading_optimization_attributes( 'img', $attr, $context ),
+				'Expected third image to not be lazy-loaded.'
+			);
+
+			// Return 'lazy' if in the loop and in the main query for any subsequent elements.
+			$this->assertSame(
+				array( 'loading' => 'lazy' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, $context )
+			);
+
+			// Yes, for all subsequent elements.
+			$this->assertSame(
+				array( 'loading' => 'lazy' ),
+				wp_get_loading_optimization_attributes( 'img', $attr, $context )
+			);
+		}
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns the expected loading attribute value before loop but after get_header if not main query.
+	 *
+	 * @ticket 58211
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_before_loop_if_not_main_query( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+
+		do_action( 'get_header' );
+
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Lazy if not main query.
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns the expected loading attribute value before loop but after get_header in main query but header was not called.
+	 *
+	 * @ticket 58211
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_before_loop_in_main_query_but_header_not_called( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Lazy if header not called.
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns the expected loading attribute value before loop but after get_header for main query.
+	 *
+	 * @ticket 58211
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_before_loop_if_main_query( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+		do_action( 'get_header' );
+
+		$attr = $this->get_width_height_for_high_priority();
+
+		// First image is loaded with high fetchpriority.
+		$this->assertSame(
+			array( 'fetchpriority' => 'high' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context ),
+			'Expected first image to not be lazy-loaded. First large image is loaded with high fetchpriority.'
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns the expected loading attribute value after get_header and after loop.
+	 *
+	 * @ticket 58211
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_after_loop( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+
+		do_action( 'get_header' );
+
+		while ( have_posts() ) {
+			the_post();
+		}
+
+		$attr = $this->get_width_height_for_high_priority();
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns the expected loading attribute if no loop.
+	 *
+	 * @ticket 58211
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_no_loop( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+
+		// Ensure header and footer is called.
+		do_action( 'get_header' );
+		do_action( 'get_footer' );
+
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Load lazy if the there is no loop and footer was called.
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() returns 'lazy' for special contexts when they're used outside of 'the_content' filter.
+	 *
+	 * @ticket 58089
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_special_contexts_for_the_content
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_should_return_lazy_for_special_contexts_outside_of_the_content( $context ) {
+		$attr = $this->get_width_height_for_high_priority();
+		$this->assertSame(
+			array( 'loading' => 'lazy' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, $context )
+		);
+	}
+
+	/**
+	 * Tests that wp_get_loading_optimization_attributes() does not modify any attributes for special contexts when they're used within 'the_content' filter.
+	 *
+	 * @ticket 58089
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_special_contexts_for_the_content
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_should_not_modify_images_for_special_contexts_within_the_content( $context ) {
+		remove_all_filters( 'the_content' );
+
+		$result = null;
+		add_filter(
+			'the_content',
+			function( $content ) use ( &$result, $context ) {
+				$attr   = $this->get_width_height_for_high_priority();
+				$result = wp_get_loading_optimization_attributes( 'img', $attr, $context );
+				return $content;
+			}
+		);
+		apply_filters( 'the_content', '' );
+
+		$this->assertSame( array(), $result );
+	}
+
+	/**
+	 * @ticket 44427
+	 * @ticket 50367
+	 * @ticket 58235
+	 */
+	public function test_wp_img_tag_add_loading_optimization_attrs() {
+		$img = '<img src="example.png" alt=" width="300" height="225" />';
+		$img = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
+
+		$this->assertStringContainsString( ' loading="lazy"', $img );
+	}
+
+	/**
+	 * @ticket 44427
+	 * @ticket 50367
+	 * @ticket 58235
+	 */
+	public function test_wp_img_tag_add_loading_optimization_attrs_without_src() {
+		$img = '<img alt="" width="300" height="225" />';
+		$img = wp_img_tag_add_loading_optimization_attrs( $img, 'test' );
+
+		$this->assertStringNotContainsString( ' loading=', $img );
+	}
+
+	/**
+	 * Tests that the content media count is not affected by `the_excerpt()` calls for posts that contain images.
+	 *
+	 * @ticket 56588
+	 *
+	 * @covers ::wp_trim_excerpt
+	 */
+	public function test_the_excerpt_does_not_affect_content_media_count() {
+		global $wp_query, $wp_the_query;
+
+		/*
+		 * Use the filter to alter the threshold for not lazy-loading to the first 2 elements,
+		 * then use a post that contains exactly 2 images.
+		 */
+		$this->force_omit_loading_attr_threshold( 2 );
+		$post_content  = '<img src="example.jpg" width="800" height="600">';
+		$post_content .= '<p>Some text.</p>';
+		$post_content .= '<img src="example2.jpg" width="800" height="600">';
+
+		$post_id = self::factory()->post->create(
+			array(
+				'post_content' => $post_content,
+				'post_excerpt' => '',
+			)
+		);
+
+		$wp_query     = new WP_Query( array( 'post__in' => array( $post_id ) ) );
+		$wp_the_query = $wp_query;
+
+		while ( have_posts() ) {
+			the_post();
+
+			// Call `the_excerpt()` without generating output.
+			get_echo( 'the_excerpt' );
+		}
+
+		// The only way to access the value is by calling this function without increasing the value.
+		$content_media_count = wp_increase_content_media_count( 0 );
+
+		// Assert that the media count was not increased even though there are 3 images in the post's content.
+		$this->assertSame( 0, $content_media_count );
+	}
+
+	/**
+	 * Tests that the lazy-loading result is not affected by `the_excerpt()` calls for posts that
+	 * contain images.
+	 *
+	 * Printing the excerpt for a post that contains images in its content prior to its featured image should result in
+	 * that featured image not being lazy-loaded, since the images in the post content aren't displayed in the excerpt.
+	 *
+	 * @ticket 56588
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_trim_excerpt
+	 */
+	public function test_the_excerpt_does_not_affect_omit_lazy_loading_logic() {
+		global $wp_query, $wp_the_query;
+
+		/*
+		 * Use the filter to alter the threshold for not lazy-loading to the first 2 elements,
+		 * then use a post that contains exactly 2 images.
+		 */
+		$this->force_omit_loading_attr_threshold( 2 );
+
+		$post_content  = '<img src="example.jpg" width="800" height="600">';
+		$post_content .= '<p>Some text.</p>';
+		$post_content .= '<img src="example2.jpg" width="800" height="600">';
+
+		$post_id           = self::factory()->post->create(
+			array(
+				'post_content' => $post_content,
+				'post_excerpt' => '',
+			)
+		);
+		$featured_image_id = self::$large_id;
+		update_post_meta( $post_id, '_thumbnail_id', $featured_image_id );
+
+		$expected_image_tag = get_the_post_thumbnail(
+			$post_id,
+			'post-thumbnail',
+			array(
+				'loading'       => false,
+				'fetchpriority' => 'high',
+			)
+		);
+
+		// Reset high priority flag as the forced `fetchpriority="high"` above already modified it.
+		$this->reset_high_priority_element_flag();
+
+		$wp_query     = new WP_Query( array( 'post__in' => array( $post_id ) ) );
+		$wp_the_query = $wp_query;
+
+		$output = '';
+		while ( have_posts() ) {
+			the_post();
+
+			// Print excerpt first, then the featured image.
+			$output .= get_echo( 'the_excerpt' );
+			$output .= get_echo( 'the_post_thumbnail' );
+		}
+
+		$this->assertStringContainsString( $expected_image_tag, $output );
+	}
+
+	private function reset_content_media_count() {
+		// Get current value without increasing.
+		$content_media_count = wp_increase_content_media_count( 0 );
+
+		// Decrease it by its current value to "reset" it back to 0.
+		wp_increase_content_media_count( - $content_media_count );
+	}
+
+	private function reset_omit_loading_attr_filter() {
+		// Add filter to "reset" omit threshold back to null (unset).
+		add_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
+
+		// Force filter application to re-run.
+		wp_omit_loading_attr_threshold( true );
+
+		// Clean up the above filter.
+		remove_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
+	}
+
+	private function reset_high_priority_element_flag() {
+		wp_high_priority_element_flag( true );
+	}
+
+	/**
+	 * Test that generated files with the `image_editor_output_format` applied use the correct
+	 * quality level based on their mime type.
+	 *
+	 * @ticket 56442
+	 */
+	public function test_quality_with_image_conversion_file_sizes() {
+		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_jpeg' ) );
+		$temp_dir = get_temp_dir();
+		$file     = $temp_dir . '/33772.jpg';
+		copy( DIR_TESTDATA . '/images/33772.jpg', $file );
+
+		// Set JPEG output quality very low and WebP quality very high, this should force all generated WebP images to
+		// be larger than the the matching generated JPEGs.
+		add_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality_low_jpeg' ), 10, 2 );
+
+		$editor = wp_get_image_editor( $file );
+
+		// Verify that the selected editor supports WebP output.
+		if ( ! $editor->supports_mime_type( 'image/webp' ) ) {
+			$this->markTestSkipped( 'WebP is not supported by the selected image editor.' );
+		}
+
+		$attachment_id = self::factory()->attachment->create_object(
+			array(
+				'post_mime_type' => 'image/jpeg',
+				'file'           => $file,
+			)
+		);
+
+		add_filter( 'big_image_size_threshold', array( $this, 'add_big_image_size_threshold' ) );
+
+		// Generate all sizes as JPEGs.
+		$jpeg_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
+		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_jpeg' ) );
+
+		// Generate all sizes as WebP.
+		add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_webp' ) );
+		$webp_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
+		remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_webp' ) );
+
+		// The main (scaled) image: the JPEG should be smaller than the WebP.
+		$this->assertLessThan( $webp_sizes['filesize'], $jpeg_sizes['filesize'], 'The JPEG should be smaller than the WebP.' );
+
+		// Sub-sizes: for each size, the JPEGs should be smaller than the WebP.
+		$sizes_to_compare = array_intersect_key( $jpeg_sizes['sizes'], $webp_sizes['sizes'] );
+		foreach ( $sizes_to_compare as $size => $size_data ) {
+			$this->assertLessThan( $webp_sizes['sizes'][ $size ]['filesize'], $jpeg_sizes['sizes'][ $size ]['filesize'] );
+		}
+	}
+
+	/**
+	 * Test that an image size isn't generated if it matches the original image size.
+	 *
+	 * @ticket 57370
+	 */
+	public function test_wp_generate_attachment_metadata_doesnt_generate_sizes_for_150_square_image() {
+		$temp_dir = get_temp_dir();
+		$file     = $temp_dir . '/test-square-150.jpg';
+		copy( DIR_TESTDATA . '/images/test-square-150.jpg', $file );
+
+		$attachment_id = self::factory()->attachment->create_object(
+			array(
+				'post_mime_type' => 'image/jpeg',
+				'file'           => $file,
+			)
+		);
+
+		$metadata = wp_generate_attachment_metadata( $attachment_id, $file );
+		$this->assertSame(
+			array(),
+			$metadata['sizes'],
+			'The sizes should be an empty array'
+		);
+		$this->assertSame(
+			'test-square-150.jpg',
+			basename( $metadata['file'] ),
+			'The file basename should match the given filename'
+		);
+		$this->assertSame(
+			150,
+			$metadata['width'],
+			'The width should be 150 (integer)'
+		);
+		$this->assertSame(
+			150,
+			$metadata['height'],
+			'The height should be 150 (integer)'
+		);
+	}
+
+	/**
+	 * Tests that `wp_get_attachment_image()` uses the correct default context.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::wp_get_attachment_image
+	 */
+	public function test_wp_get_attachment_image_context_filter_default() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		wp_get_attachment_image( self::$large_id );
+		$this->assertSame( 'wp_get_attachment_image', $last_context );
+	}
+
+	/**
+	 * Tests that `wp_get_attachment_image()` allows overriding the context via filter.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::wp_get_attachment_image
+	 */
+	public function test_wp_get_attachment_image_context_filter_value_is_passed_correctly() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		// Add a filter that modifies the context.
+		add_filter(
+			'wp_get_attachment_image_context',
+			static function() {
+				return 'my_custom_context';
+			}
+		);
+
+		wp_get_attachment_image( self::$large_id );
+		$this->assertSame( 'my_custom_context', $last_context );
+	}
+
+	/**
+	 * Tests tag restriction for `wp_get_loading_optimization_attributes()`.
+	 *
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_optimization_attributes_min_required_attrs
+	 *
+	 * @param string $tag_name The tag name.
+	 * @param string $attr Element attributes.
+	 * @param array  $expected Expected return value.
+	 * @param string $message Message to display if the test fails.
+	 */
+	public function test_wp_get_loading_optimization_attributes_min_required_attrs( $tag_name, $attr, $expected, $message ) {
+		$context = 'the_post_thumbnail';
+		$this->assertSame( wp_get_loading_optimization_attributes( $tag_name, $attr, $context ), $expected, $message );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_get_loading_optimization_attributes_min_required_attrs() {
+		return array(
+			'img_with_min_attrs' => array(
+				'img',
+				array(
+					'width'  => 100,
+					'height' => 100,
+				),
+				array( 'loading' => 'lazy' ),
+				'Expected default `loading="lazy"`.',
+			),
+			'img_without_height' => array(
+				'img',
+				array( 'width' => 100 ),
+				array(),
+				'Expected blank array as height is required.',
+			),
+			'img_without_width'  => array(
+				'img',
+				array( 'height' => 100 ),
+				array(),
+				'Expected blank array as width is required.',
+			),
+		);
+	}
+
+	/**
+	 * Tests tag restriction for `wp_get_loading_optimization_attributes()`.
+	 *
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_optimization_attributes_check_allowed_tags
+	 *
+	 * @param string $tag_name The tag name.
+	 * @param array  $expected Expected return value.
+	 * @param string $message Message to display if the test fails.
+	 */
+	public function test_wp_get_loading_optimization_attributes_check_allowed_tags( $tag_name, $expected, $message ) {
+		$attr    = $this->get_width_height_for_high_priority();
+		$context = 'the_post_thumbnail';
+		$this->assertSame( wp_get_loading_optimization_attributes( $tag_name, $attr, $context ), $expected, $message );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_get_loading_optimization_attributes_check_allowed_tags() {
+		return array(
+			'img'    => array(
+				'img',
+				array( 'loading' => 'lazy' ),
+				'Expected `loading="lazy"` for the img.',
+			),
+			'iframe' => array(
+				'iframe',
+				array(
+					'loading' => 'lazy',
+				),
+				'Expected `loading="lazy"` for the iframe.',
+			),
+			'video'  =>
+			array(
+				'video',
+				array(),
+				'Function should return empty array as video tag is not supported.',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_skip_for_block_template() {
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Skip logic if context is `template`.
+		$this->assertSame(
+			array(),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'template' ),
+			'Skip logic and return blank array for block template.'
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_header_block_template() {
+		$attr = $this->get_width_height_for_high_priority();
+
+		// Skip logic if context is `template`.
+		$this->assertSame(
+			array( 'fetchpriority' => 'high' ),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'template_part_' . WP_TEMPLATE_PART_AREA_HEADER ),
+			'Images in the header block template part should not be lazy-loaded and first large image is set high fetchpriority.'
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 * @expectedIncorrectUsage wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_incorrect_loading_attrs() {
+		$attr                  = $this->get_width_height_for_high_priority();
+		$attr['loading']       = 'lazy';
+		$attr['fetchpriority'] = 'high';
+
+		$this->assertEqualSetsWithIndex(
+			array(
+				'loading'       => 'lazy',
+				'fetchpriority' => 'high',
+			),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'test' ),
+			'This should return both lazy-loading and high fetchpriority, but with doing_it_wrong message.'
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_if_loading_attr_present() {
+		$attr            = $this->get_width_height_for_high_priority();
+		$attr['loading'] = 'eager';
+
+		// Check fetchpriority high logic if loading attribute is present.
+		$this->assertSame(
+			array(
+				'fetchpriority' => 'high',
+			),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'test' ),
+			'fetchpriority should be set to high.'
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_low_res_image() {
+		$attr = array(
+			'width'   => 100,
+			'height'  => 100,
+			'loading' => 'eager',
+		);
+
+		// fetchpriority not set as image is of lower resolution.
+		$this->assertSame(
+			array(),
+			wp_get_loading_optimization_attributes( 'img', $attr, 'test' ),
+			'loading optimization attr array should be empty.'
+		);
+	}
+
+	/**
+	 * @ticket 58681
+	 *
+	 * @dataProvider data_wp_get_loading_optimization_attributes_in_shortcodes
+	 */
+	public function test_wp_get_loading_optimization_attributes_in_shortcodes( $setup, $expected, $message ) {
+		$attr = $this->get_width_height_for_high_priority();
+		$setup();
+
+		// The first image processed in a shortcode should have fetchpriority set to high.
+		$this->assertSame(
+			$expected,
+			wp_get_loading_optimization_attributes( 'img', $attr, 'do_shortcode' ),
+			$message
+		);
+	}
+
+	public function data_wp_get_loading_optimization_attributes_in_shortcodes() {
+		return array(
+			'main_shortcode_image_should_have_fetchpriority_high'  => array(
+				'setup'    => function () {
+					global $wp_query;
+
+					// Set WP_Query to be in the loop and the main query.
+					$wp_query->in_the_loop = true;
+					$this->set_main_query( $wp_query );
+				},
+				'expected' => array(
+					'fetchpriority' => 'high',
+				),
+				'message'  => 'Fetch priority not applied to during shortcode rendering.',
+			),
+			'main_shortcode_image_after_threshold_is_loading_lazy' => array(
+				'setup'    => function () {
+					global $wp_query;
+
+					// Set WP_Query to be in the loop and the main query.
+					$wp_query->in_the_loop = true;
+					$this->set_main_query( $wp_query );
+
+					// Set internal flags so lazy should be applied.
+					wp_high_priority_element_flag( false );
+					wp_increase_content_media_count( 3 );
+				},
+				'expected' => array(
+					'loading' => 'lazy',
+				),
+				'message'  => 'Lazy-loading not applied to during shortcode rendering.',
+			),
+			'shortcode_image_outside_of_the_loop_are_loaded_lazy'  => array(
+				'setup'    => function () {
+					// Avoid setting up the WP_Query object for the loop.
+					return;
+				},
+				'expected' => array(
+					'loading' => 'lazy',
+				),
+				'message'  => 'Lazy-loading not applied to shortcodes outside the loop.',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 58681
+	 */
+	public function test_content_rendering_with_shortcodes() {
+		// The gallery shortcode will dynamically create image markup that should be optimized.
+		$content = "[gallery ids='" . self::$large_id . "' size='large']";
+		$actual  = apply_filters( 'the_content', $content );
+
+		$this->assertStringContainsString(
+			// Since the main query and loop isn't set, this should be lazily loaded.
+			'loading="lazy"',
+			$actual,
+			'Could not confirm shortcodes get optimizations applied.'
+		);
+	}
+
+	/**
+	 * @ticket 58681
+	 */
+	public function test_content_rendering_with_shortcodes_nested() {
+		global $wp_query;
+
+		// Set WP_Query to be in the loop and the main query.
+		$wp_query->in_the_loop = true;
+		$this->set_main_query( $wp_query );
+
+		add_shortcode(
+			'div',
+			function ( $atts, $content = null ) {
+				$parsed_atts = shortcode_atts(
+					array(
+						'class' => '',
+					),
+					$atts
+				);
+
+				$class = ! empty( $parsed_atts['class'] ) ? sprintf( ' class="%s"', $parsed_atts['class'] ) : null;
+
+				return sprintf( '<div %s>%s</div>', $class, do_shortcode( $content ) );
+			}
+		);
+
+		// The gallery shortcode will dynamically create image markup that should be optimized.
+		$content = "[div][gallery ids='" . self::$large_id . "' size='large'][div]";
+		$actual  = apply_filters( 'the_content', $content );
+
+		$this->assertStringContainsString(
+			// Since this is in the loop, it should have a high fetchpriority.
+			'fetchpriority="high"',
+			$actual,
+			'Could not confirm shortcodes get optimizations applied.'
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_maybe_add_fetchpriority_high_attr
+	 *
+	 * @dataProvider data_wp_maybe_add_fetchpriority_high_attr
+	 */
+	public function test_wp_maybe_add_fetchpriority_high_attr( $loading_attrs, $tag_name, $attr, $expected_fetchpriority ) {
+		$loading_attrs = wp_maybe_add_fetchpriority_high_attr( $loading_attrs, $tag_name, $attr );
+
+		if ( $expected_fetchpriority ) {
+			$this->assertArrayHasKey( 'fetchpriority', $loading_attrs, 'fetchpriority attribute should be present' );
+			$this->assertSame( $expected_fetchpriority, $loading_attrs['fetchpriority'], 'fetchpriority attribute has incorrect value' );
+		} else {
+			$this->assertArrayNotHasKey( 'fetchpriority', $loading_attrs, 'fetchpriority attribute should not be present' );
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_maybe_add_fetchpriority_high_attr() {
+		return array(
+			'small image'                   => array(
+				array(),
+				'img',
+				$this->get_insufficient_width_height_for_high_priority(),
+				false,
+			),
+			'large image'                   => array(
+				array(),
+				'img',
+				$this->get_width_height_for_high_priority(),
+				'high',
+			),
+			'image with loading=lazy'       => array(
+				array( 'loading' => 'lazy' ),
+				'img',
+				$this->get_width_height_for_high_priority(),
+				false,
+			),
+			'image with loading=eager'      => array(
+				array( 'loading' => 'eager' ),
+				'img',
+				$this->get_width_height_for_high_priority(),
+				'high',
+			),
+			'image with fetchpriority=high' => array(
+				array(),
+				'img',
+				array_merge(
+					$this->get_insufficient_width_height_for_high_priority(),
+					array( 'fetchpriority' => 'high' )
+				),
+				'high',
+			),
+			'image with fetchpriority=low'  => array(
+				array(),
+				'img',
+				array_merge(
+					$this->get_insufficient_width_height_for_high_priority(),
+					array( 'fetchpriority' => 'low' )
+				),
+				false,
+			),
+			'non-image element'             => array(
+				array(),
+				'video',
+				$this->get_width_height_for_high_priority(),
+				false,
+			),
+		);
+	}
+
+	/**
+	 * @ticket 58235
+	 *
+	 * @covers ::wp_maybe_add_fetchpriority_high_attr
+	 */
+	public function test_wp_maybe_add_fetchpriority_high_attr_min_priority_filter() {
+		$attr = array(
+			'width'  => 50,
+			'height' => 50,
+		);
+
+		add_filter(
+			'wp_min_priority_img_pixels',
+			static function( $res ) {
+				return 2500; // 50*50=2500
+			}
+		);
+
+		// fetchpriority set to high as resolution is equal to (or greater than) 2500.
+		$this->assertSame(
+			array(
+				'fetchpriority' => 'high',
+			),
+			wp_maybe_add_fetchpriority_high_attr( array(), 'img', $attr )
+		);
+	}
+
+	/**
+	 * @ticket 58635
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_header_block_template_increase_media_count() {
+		$attr = $this->get_width_height_for_high_priority();
+		wp_get_loading_optimization_attributes( 'img', $attr, 'template_part_' . WP_TEMPLATE_PART_AREA_HEADER );
+
+		// Images with a certain minimum size in the header of the page are also counted towards the threshold.
+		$this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+	}
+
+	/**
+	 * @ticket 58635
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 */
+	public function test_wp_get_loading_optimization_attributes_header_image_tag_increase_media_count() {
+		$attr = $this->get_width_height_for_high_priority();
+		wp_get_loading_optimization_attributes( 'img', $attr, 'get_header_image_tag' );
+
+		// Images with a certain minimum size in the header of the page are also counted towards the threshold.
+		$this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+	}
+
+	/**
+	 * @ticket 58635
+	 *
+	 * @covers ::wp_get_loading_optimization_attributes
+	 *
+	 * @dataProvider data_wp_get_loading_attr_default_before_and_no_loop
+	 *
+	 * @param string $context Context for the element for which the `loading` attribute value is requested.
+	 */
+	public function test_wp_get_loading_optimization_attributes_image_before_loop_increase_media_count( $context ) {
+		global $wp_query;
+
+		$wp_query = $this->get_new_wp_query_for_published_post();
+		$this->set_main_query( $wp_query );
+		do_action( 'get_header' );
+
+		$attr = $this->get_width_height_for_high_priority();
+		wp_get_loading_optimization_attributes( 'img', $attr, $context );
+
+		// Images with a certain minimum size in the header of the page are also counted towards the threshold.
+		$this->assertSame( 1, wp_increase_content_media_count( 0 ) );
+	}
+
+	/**
+	 * Helper method to keep track of the last context returned by the 'wp_get_attachment_image_context' filter.
+	 *
+	 * The method parameter is passed by reference and therefore will always contain the last context value.
+	 *
+	 * @param mixed $last_context Variable to track last context. Passed by reference.
+	 */
+	private function track_last_attachment_image_context( &$last_context ) {
+		add_filter(
+			'wp_get_attachment_image_context',
+			static function( $context ) use ( &$last_context ) {
+				$last_context = $context;
+				return $context;
+			},
+			11
+		);
+	}
+
+	/**
+	 * Add threshold to create a `-scaled` output image for testing.
+	 */
+	public function add_big_image_size_threshold() {
+		return 1000;
+	}
+
+	/**
+	 * Output JPEG files.
+	 */
+	public function image_editor_output_jpeg() {
+		return array( 'image/jpeg' => 'image/jpeg' );
+	}
+
+	/**
+	 * Output WebP files.
+	 */
+	public function image_editor_output_webp() {
+		return array( 'image/jpeg' => 'image/webp' );
+	}
+
+	/**
+	 * Changes the quality using very low quality for JPEGs and very high quality
+	 * for WebPs, used to verify the filter is applying correctly.
+	 *
+	 * @param int    $quality   Default quality.
+	 * @param string $mime_type Image mime-type.
+	 * @return int The changed quality.
+	 */
+	public function image_editor_change_quality_low_jpeg( $quality, $mime_type ) {
+		if ( 'image/jpeg' === $mime_type ) {
+			return 1;
+		} elseif ( 'image/webp' === $mime_type ) {
+			return 100;
+		} else {
 			return 30;
 		}
 	}
 
+	/**
+	 * Change the omit loading attribute threshold value.
+	 *
+	 * @param int $threshold Threshold value to change.
+	 */
+	public function force_omit_loading_attr_threshold( $threshold ) {
+		add_filter(
+			'wp_omit_loading_attr_threshold',
+			static function() use ( $threshold ) {
+				return $threshold;
+			}
+		);
+	}
+
+	/**
+	 * Returns a new WP_Query.
+	 *
+	 * @global WP_Query $wp_query WordPress Query object.
+	 *
+	 * @return WP_Query a new query.
+	 */
+	public function get_new_wp_query_for_published_post() {
+		global $wp_query;
+
+		// New query to $wp_query. update global for the loop.
+		$wp_query = new WP_Query( array( 'post__in' => array( self::$post_ids['publish'] ) ) );
+
+		return $wp_query;
+	}
+
+	/**
+	 * Sets a query as main query.
+	 *
+	 * @global WP_Query $wp_the_query WordPress Query object.
+	 *
+	 * @param WP_Query $query query to be set as main query.
+	 */
+	public function set_main_query( $query ) {
+		global $wp_the_query;
+		$wp_the_query = $query;
+	}
+
+	/**
+	 * Returns an array with dimension attribute values eligible for a high priority image.
+	 *
+	 * @return array Associative array with 'width' and 'height' keys.
+	 */
+	private function get_width_height_for_high_priority() {
+		/*
+		 * The product of width * height must be >50000 to qualify for high priority image.
+		 * 300 * 200 = 60000
+		 */
+		return array(
+			'width'  => 300,
+			'height' => 200,
+		);
+	}
+
+	/**
+	 * Returns an array with dimension attribute values ineligible for a high priority image.
+	 *
+	 * @return array Associative array with 'width' and 'height' keys.
+	 */
+	private function get_insufficient_width_height_for_high_priority() {
+		/*
+		 * The product of width * height must be >50000 to qualify for high priority image.
+		 * 200 * 100 = 20000
+		 */
+		return array(
+			'width'  => 200,
+			'height' => 100,
+		);
+	}
 }
 
 /**
diff --git a/tests/phpunit/tests/media/wpGenerateAttachmentMetadata.php b/tests/phpunit/tests/media/wpGenerateAttachmentMetadata.php
new file mode 100644
index 0000000000000..82fe7dabd61b2
--- /dev/null
+++ b/tests/phpunit/tests/media/wpGenerateAttachmentMetadata.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Tests for the `wp_generate_attachment_metadata()` function.
+ *
+ * @group media
+ * @covers ::wp_generate_attachment_metadata
+ */
+class Tests_Media_wpGenerateAttachmentMetadata extends WP_UnitTestCase {
+
+	public function tear_down() {
+		$this->remove_added_uploads();
+
+		parent::tear_down();
+	}
+
+	/**
+	 * Tests that filesize meta is generated for JPEGs.
+	 *
+	 * @ticket 49412
+	 *
+	 * @covers ::wp_create_image_subsizes
+	 */
+	public function test_wp_generate_attachment_metadata_includes_filesize_in_jpg_meta() {
+		$attachment = $this->factory->attachment->create_upload_object( DIR_TESTDATA . '/images/canola.jpg' );
+
+		$metadata = wp_get_attachment_metadata( $attachment );
+
+		$this->assertSame( wp_filesize( get_attached_file( $attachment ) ), $metadata['filesize'] );
+
+		foreach ( $metadata['sizes'] as $intermediate_size ) {
+			$this->assertArrayHasKey( 'filesize', $intermediate_size );
+			$this->assertNotEmpty( $intermediate_size['filesize'] );
+			$this->assertIsNumeric( $intermediate_size['filesize'] );
+		}
+	}
+
+	/**
+	 * Checks that filesize meta is generated for PNGs.
+	 *
+	 * @ticket 49412
+	 *
+	 * @covers ::wp_create_image_subsizes
+	 */
+	public function test_wp_generate_attachment_metadata_includes_filesize_in_png_meta() {
+		$attachment = $this->factory->attachment->create_upload_object( DIR_TESTDATA . '/images/test-image.png' );
+
+		$metadata = wp_get_attachment_metadata( $attachment );
+
+		$this->assertSame( wp_filesize( get_attached_file( $attachment ) ), $metadata['filesize'] );
+	}
+
+	/**
+	 * Checks that filesize meta is generated for PDFs.
+	 *
+	 * @ticket 49412
+	 */
+	public function test_wp_generate_attachment_metadata_includes_filesize_in_pdf_meta() {
+		$attachment = $this->factory->attachment->create_upload_object( DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf' );
+
+		$metadata = wp_get_attachment_metadata( $attachment );
+
+		$this->assertSame( wp_filesize( get_attached_file( $attachment ) ), $metadata['filesize'] );
+	}
+
+	/**
+	 * Checks that filesize meta is generated for PSDs.
+	 *
+	 * @ticket 49412
+	 */
+	public function test_wp_generate_attachment_metadata_includes_filesize_in_psd_meta() {
+		if ( is_multisite() ) {
+			// PSD mime type is not allowed by default on multisite.
+			add_filter(
+				'upload_mimes',
+				static function( $mimes ) {
+					$mimes['psd'] = 'application/octet-stream';
+					return $mimes;
+				}
+			);
+		}
+
+		$attachment = $this->factory->attachment->create_upload_object( DIR_TESTDATA . '/images/test-image.psd' );
+
+		$metadata = wp_get_attachment_metadata( $attachment );
+
+		$this->assertSame( wp_filesize( get_attached_file( $attachment ) ), $metadata['filesize'] );
+	}
+}
diff --git a/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php b/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
index 76fa203b7e73d..3ffe1bc6b4a19 100644
--- a/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
+++ b/tests/phpunit/tests/media/wpImageTagAddDecodingAttr.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Tests the `wp_img_tag_add_decoding_attr()` function.
+ * Tests for the `wp_img_tag_add_decoding_attr()` function.
  *
  * @group media
  * @covers ::wp_img_tag_add_decoding_attr
diff --git a/tests/phpunit/tests/menu/walker-nav-menu.php b/tests/phpunit/tests/menu/walker-nav-menu.php
index 1dda827c1e0cc..1fa255ef61305 100644
--- a/tests/phpunit/tests/menu/walker-nav-menu.php
+++ b/tests/phpunit/tests/menu/walker-nav-menu.php
@@ -152,4 +152,330 @@ public function data_start_el_with_empty_attributes() {
 			),
 		);
 	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_el()` adds `rel="privacy-policy"`.
+	 *
+	 * @ticket 56345
+	 *
+	 * @covers Walker_Nav_Menu::start_el
+	 *
+	 * @dataProvider data_walker_nav_menu_start_el_should_add_rel_privacy_policy_to_privacy_policy_url
+	 *
+	 * @param string $expected The expected substring containing the "rel" attribute and value.
+	 * @param string $xfn      Optional. The XFN value. Default empty string.
+	 * @param string $target   Optional. The target value. Default empty string.
+	 */
+	public function test_walker_nav_menu_start_el_should_add_rel_privacy_policy_to_privacy_policy_url( $expected, $xfn = '', $target = '' ) {
+		$post_id = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_title'  => 'Test Privacy Policy',
+				'post_status' => 'publish',
+			)
+		);
+
+		// Set the privacy policy page.
+		update_option( 'wp_page_for_privacy_policy', $post_id );
+		$privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
+		$output = '';
+
+		$item = array(
+			'ID'        => $privacy_policy_id,
+			'object_id' => $privacy_policy_id,
+			'title'     => 'Privacy Policy',
+			'target'    => $target,
+			'xfn'       => $xfn,
+			'current'   => false,
+			'url'       => get_privacy_policy_url(),
+		);
+
+		$args = array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$this->walker->start_el( $output, (object) $item, 0, (object) $args );
+
+		$this->assertStringContainsString( $expected, $output );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_walker_nav_menu_start_el_should_add_rel_privacy_policy_to_privacy_policy_url() {
+		return array(
+			'no xfn value'                          => array(
+				'expected' => 'rel="privacy-policy"',
+			),
+			'an xfn value'                          => array(
+				'expected' => 'rel="nofollow privacy-policy"',
+				'xfn'      => 'nofollow',
+			),
+			'no xfn value and a target of "_blank"' => array(
+				'expected' => 'rel="noopener privacy-policy"',
+				'xfn'      => '',
+				'target'   => '_blank',
+			),
+			'an xfn value and a target of "_blank"' => array(
+				'expected' => 'rel="nofollow privacy-policy"',
+				'xfn'      => 'nofollow',
+				'target'   => '_blank',
+			),
+		);
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_el()` does not add `rel="privacy-policy"` when no
+	 * privacy policy page exists.
+	 *
+	 * @ticket 56345
+	 *
+	 * @covers Walker_Nav_Menu::start_el
+	 */
+	public function test_walker_nav_menu_start_el_should_not_add_rel_privacy_policy_when_no_privacy_policy_exists() {
+		$post_id = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_title'  => 'Test Privacy Policy',
+				'post_status' => 'publish',
+			)
+		);
+
+		// Do not set the privacy policy page.
+
+		$output = '';
+
+		$item = array(
+			'ID'        => $post_id,
+			'object_id' => $post_id,
+			'title'     => 'Privacy Policy',
+			'target'    => '',
+			'xfn'       => '',
+			'current'   => false,
+			'url'       => get_the_permalink( $post_id ),
+		);
+
+		$args = array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$this->walker->start_el( $output, (object) $item, 0, (object) $args );
+
+		$this->assertStringNotContainsString( 'rel="privacy-policy"', $output );
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_el()` does not add `rel="privacy-policy"` when no URL
+	 * is passed in the menu item object.
+	 *
+	 * @ticket 56345
+	 *
+	 * @covers Walker_Nav_Menu::start_el
+	 */
+	public function test_walker_nav_menu_start_el_should_not_add_rel_privacy_policy_when_no_url_is_passed() {
+		$post_id = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_title'  => 'Test Privacy Policy',
+				'post_status' => 'publish',
+			)
+		);
+
+		// Set the privacy policy page.
+		update_option( 'wp_page_for_privacy_policy', $post_id );
+		$privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
+		$output = '';
+
+		$item = array(
+			'ID'        => $privacy_policy_id,
+			'object_id' => $privacy_policy_id,
+			'title'     => 'Privacy Policy',
+			'target'    => '',
+			'xfn'       => '',
+			'current'   => false,
+			// Do not pass URL.
+		);
+
+		$args = array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$this->walker->start_el( $output, (object) $item, 0, (object) $args );
+
+		$this->assertStringNotContainsString( 'rel="privacy-policy"', $output );
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_el()` does not add `rel="privacy-policy"` when the
+	 * menu item's ID does not match the privacy policy page, but the URL does.
+	 *
+	 * @ticket 56345
+	 *
+	 * @covers Walker_Nav_Menu::start_el
+	 */
+	public function test_walker_nav_menu_start_el_should_add_rel_privacy_policy_when_id_does_not_match_but_url_does() {
+		$post_id = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_title'  => 'Test Privacy Policy',
+				'post_status' => 'publish',
+			)
+		);
+
+		// Set the privacy policy page.
+		update_option( 'wp_page_for_privacy_policy', $post_id );
+		$privacy_policy_id = (int) get_option( 'wp_page_for_privacy_policy' );
+
+		$output = '';
+
+		// Ensure the ID does not match the privacy policy.
+		$not_privacy_policy_id = $privacy_policy_id - 1;
+
+		$item = array(
+			'ID'        => $not_privacy_policy_id,
+			'object_id' => $not_privacy_policy_id,
+			'title'     => 'Privacy Policy',
+			'target'    => '',
+			'xfn'       => '',
+			'current'   => false,
+			'url'       => get_privacy_policy_url(),
+		);
+
+		$args = array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$this->walker->start_el( $output, (object) $item, 0, (object) $args );
+
+		$this->assertStringContainsString( 'rel="privacy-policy"', $output );
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_lvl()` applies 'nav_menu_submenu_attributes' filters.
+	 *
+	 * @ticket 57278
+	 *
+	 * @covers Walker_Nav_Menu::start_lvl
+	 */
+	public function test_start_lvl_should_apply_nav_menu_submenu_attributes_filters() {
+		$output = '';
+		$args   = (object) array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$filter = new MockAction();
+		add_filter( 'nav_menu_submenu_attributes', array( $filter, 'filter' ) );
+
+		$this->walker->start_lvl( $output, 0, $args );
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::start_el()` applies 'nav_menu_item_attributes' filters.
+	 *
+	 * @ticket 57278
+	 *
+	 * @covers Walker_Nav_Menu::start_el
+	 */
+	public function test_start_el_should_apply_nav_menu_item_attributes_filters() {
+		$output  = '';
+		$post_id = self::factory()->post->create();
+		$item    = (object) array(
+			'ID'        => $post_id,
+			'object_id' => $post_id,
+			'title'     => get_the_title( $post_id ),
+			'target'    => '',
+			'xfn'       => '',
+			'current'   => false,
+		);
+		$args    = (object) array(
+			'before'      => '',
+			'after'       => '',
+			'link_before' => '',
+			'link_after'  => '',
+		);
+
+		$filter = new MockAction();
+		add_filter( 'nav_menu_item_attributes', array( $filter, 'filter' ) );
+
+		$this->walker->start_el( $output, $item, 0, $args );
+
+		$this->assertSame( 1, $filter->get_call_count() );
+	}
+
+	/**
+	 * Tests that `Walker_Nav_Menu::build_atts()` builds attributes correctly.
+	 *
+	 * @ticket 57278
+	 *
+	 * @covers Walker_Nav_Menu::build_atts
+	 *
+	 * @dataProvider data_build_atts_should_build_attributes
+	 *
+	 * @param array  $atts     An array of HTML attribute key/value pairs.
+	 * @param string $expected The expected built attributes.
+	 */
+	public function test_build_atts_should_build_attributes( $atts, $expected ) {
+		$build_atts_reflection = new ReflectionMethod( $this->walker, 'build_atts' );
+
+		$build_atts_reflection->setAccessible( true );
+		$actual = $build_atts_reflection->invoke( $this->walker, $atts );
+		$build_atts_reflection->setAccessible( false );
+
+		$this->assertSame( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_build_atts_should_build_attributes() {
+		return array(
+			'an empty attributes array'                   => array(
+				'atts'     => array(),
+				'expected' => '',
+			),
+			'attributes containing a (bool) false value'  => array(
+				'atts'     => array( 'disabled' => false ),
+				'expected' => '',
+			),
+			'attributes containing an empty string value' => array(
+				'atts'     => array( 'id' => '' ),
+				'expected' => '',
+			),
+			'attributes containing a non-scalar value'    => array(
+				'atts'     => array( 'data-items' => new stdClass() ),
+				'expected' => '',
+			),
+			'attributes containing a "href" -> should escape the URL' => array(
+				'atts'     => array( 'href' => 'https://example.org/A File With Spaces.pdf' ),
+				'expected' => ' href="https://example.org/A%20File%20With%20Spaces.pdf"',
+			),
+			'attributes containing a non-"href" attribute -> should escape the value' => array(
+				'atts'     => array( 'id' => 'hello&goodbye' ),
+				'expected' => ' id="hello&amp;goodbye"',
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/menu/wp-nav-menu.php b/tests/phpunit/tests/menu/wp-nav-menu.php
index 60a523bfd1710..298b222e0115c 100644
--- a/tests/phpunit/tests/menu/wp-nav-menu.php
+++ b/tests/phpunit/tests/menu/wp-nav-menu.php
@@ -7,10 +7,11 @@
  */
 class Tests_Menu_wpNavMenu extends WP_UnitTestCase {
 
-	static $menu_id        = 0;
-	static $lvl0_menu_item = 0;
-	static $lvl1_menu_item = 0;
-	static $lvl2_menu_item = 0;
+	private static $menu_id        = 0;
+	private static $lvl0_menu_item = 0;
+	private static $lvl1_menu_item = 0;
+	private static $lvl2_menu_item = 0;
+	private static $lvl3_menu_item = 0;
 
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
@@ -53,6 +54,18 @@ public static function set_up_before_class() {
 			)
 		);
 
+		// Create lvl3 menu item.
+		self::$lvl3_menu_item = wp_update_nav_menu_item(
+			self::$menu_id,
+			0,
+			array(
+				'menu-item-title'     => 'Lvl3 menu item',
+				'menu-item-url'       => '#',
+				'menu-item-parent-id' => self::$lvl2_menu_item,
+				'menu-item-status'    => 'publish',
+			)
+		);
+
 		/*
 		 * This filter is used to prevent reusing a menu item ID more that once.
 		 * It caused the tests to fail after the first one since the IDs are missing
@@ -81,6 +94,7 @@ public static function tear_down_after_class() {
 	 * when displaying the menu without specifying a custom depth.
 	 *
 	 * @ticket 28620
+	 * @ticket 56946
 	 */
 	public function test_wp_nav_menu_should_have_has_children_class_without_custom_depth() {
 
@@ -112,11 +126,20 @@ public function test_wp_nav_menu_should_have_has_children_class_without_custom_d
 
 		$this->assertStringContainsString(
 			sprintf(
-				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
 				self::$lvl2_menu_item
 			),
 			$menu_html,
-			'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
+			'Level 2 should be present in the HTML output and have the `menu-item-has-children` class.'
+		);
+
+		$this->assertStringContainsString(
+			sprintf(
+				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+				self::$lvl3_menu_item
+			),
+			$menu_html,
+			'Level 3 should be present in the HTML output and not have the `menu-item-has-children` class since it has no children.'
 		);
 	}
 
@@ -125,6 +148,7 @@ public function test_wp_nav_menu_should_have_has_children_class_without_custom_d
 	 * `menu-item-has-children` even if it's the case when displaying the full menu.
 	 *
 	 * @ticket 28620
+	 * @ticket 56946
 	 */
 	public function test_wp_nav_menu_should_not_have_has_children_class_with_custom_depth() {
 
@@ -132,7 +156,7 @@ public function test_wp_nav_menu_should_not_have_has_children_class_with_custom_
 		$menu_html = wp_nav_menu(
 			array(
 				'menu'  => self::$menu_id,
-				'depth' => 2,
+				'depth' => 3,
 				'echo'  => false,
 			)
 		);
@@ -148,20 +172,77 @@ public function test_wp_nav_menu_should_not_have_has_children_class_with_custom_
 
 		$this->assertStringContainsString(
 			sprintf(
-				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
 				self::$lvl1_menu_item
 			),
 			$menu_html,
-			'Level 1 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
+			'Level 1 should be present in the HTML output and have the `menu-item-has-children` class.'
+		);
+
+		$this->assertStringContainsString(
+			sprintf(
+				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-%1$d">',
+				self::$lvl2_menu_item
+			),
+			$menu_html,
+			'Level 2 should be present in the HTML output and not have the `menu-item-has-children` class since it is the last item to be rendered.'
 		);
 
 		$this->assertStringNotContainsString(
 			sprintf(
 				'<li id="menu-item-%d"',
-				self::$lvl2_menu_item
+				self::$lvl3_menu_item
 			),
 			$menu_html,
-			'Level 2 should not be present in the HTML output.'
+			'Level 3 should not be present in the HTML output.'
 		);
 	}
+
+	/**
+	 * The order in which parent/child menu items are created should not matter.
+	 *
+	 * @ticket 57122
+	 */
+	public function test_parent_with_higher_id_should_not_error() {
+		// Create a new level zero menu item.
+		$new_lvl0_menu_item = wp_update_nav_menu_item(
+			self::$menu_id,
+			0,
+			array(
+				'menu-item-title'  => 'Root menu item with high ID',
+				'menu-item-url'    => '#',
+				'menu-item-status' => 'publish',
+			)
+		);
+
+		// Reparent level 1 menu item to the new level zero menu item.
+		self::$lvl1_menu_item = wp_update_nav_menu_item(
+			self::$menu_id,
+			self::$lvl1_menu_item,
+			array(
+				'menu-item-parent-id' => $new_lvl0_menu_item,
+			)
+		);
+
+		// Delete the old level zero menu item.
+		wp_delete_post( self::$lvl0_menu_item, true );
+
+		// Render the menu.
+		$menu_html = wp_nav_menu(
+			array(
+				'menu' => self::$menu_id,
+				'echo' => false,
+			)
+		);
+
+		$this->assertStringContainsString(
+			sprintf(
+				'<li id="menu-item-%1$d" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-has-children menu-item-%1$d">',
+				$new_lvl0_menu_item
+			),
+			$menu_html,
+			'The level zero menu item should appear in the menu.'
+		);
+
+	}
 }
diff --git a/tests/phpunit/tests/menu/wpExpandNavMenuPostData.php b/tests/phpunit/tests/menu/wpExpandNavMenuPostData.php
index 7d5c21fde83fe..b7e6b17c23950 100644
--- a/tests/phpunit/tests/menu/wpExpandNavMenuPostData.php
+++ b/tests/phpunit/tests/menu/wpExpandNavMenuPostData.php
@@ -13,7 +13,7 @@ public function test_unnested_data_should_expand() {
 		}
 
 		$data                   = array();
-		$data[0]                = new StdClass;
+		$data[0]                = new StdClass();
 		$data[0]->name          = 'yesorno';
 		$data[0]->value         = 'yes';
 		$_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
@@ -36,7 +36,7 @@ public function test_multidimensional_nested_array_should_expand() {
 		}
 
 		$data                   = array();
-		$data[0]                = new StdClass;
+		$data[0]                = new StdClass();
 		$data[0]->name          = 'would[1][do][the][trick]';
 		$data[0]->value         = 'yes';
 		$_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
@@ -66,13 +66,13 @@ public function test_multidimensional_nested_array_should_expand_and_merge() {
 		}
 
 		$data                   = array();
-		$data[0]                = new StdClass;
+		$data[0]                = new StdClass();
 		$data[0]->name          = 'would[1][do][the][trick]';
 		$data[0]->value         = 'yes';
-		$data[1]                = new StdClass;
+		$data[1]                = new StdClass();
 		$data[1]->name          = 'would[2][do][the][trick]';
 		$data[1]->value         = 'yes';
-		$data[2]                = new StdClass;
+		$data[2]                = new StdClass();
 		$data[2]->name          = 'would[2][do][the][job]';
 		$data[2]->value         = 'yes';
 		$_POST['nav-menu-data'] = addslashes( json_encode( $data ) );
diff --git a/tests/phpunit/tests/menu/wpNavMenuRemoveMenuItemHasChildrenClass.php b/tests/phpunit/tests/menu/wpNavMenuRemoveMenuItemHasChildrenClass.php
new file mode 100644
index 0000000000000..535eba068e3f0
--- /dev/null
+++ b/tests/phpunit/tests/menu/wpNavMenuRemoveMenuItemHasChildrenClass.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @group menu
+ */
+class Tests_Menu_WpNavMenuRemoveMenuItemHasChildrenClass extends WP_UnitTestCase {
+
+	/**
+	 * Ensure calling filter in legacy ways does not throw an error.
+	 *
+	 * @ticket 56926
+	 */
+	public function test_legacy_filter_should_not_throw_an_error() {
+		$classes = array( 'menu-item-has-children', 'menu-item', 'menu-item-123' );
+
+		$menu_item = (object) array(
+			'classes' => $classes,
+		);
+
+		$args = (object) array(
+			'depth' => 2,
+		);
+
+		$depth = 2;
+
+		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item ) );
+		$this->assertStringContainsString( 'menu-item-has-children', $class_names, 'Class name should be retained when filter is called with two arguments.' );
+		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item, $args ) );
+		$this->assertStringContainsString( 'menu-item-has-children', $class_names, 'Class name should be retained when filter is called with three arguments.' );
+		$class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $menu_item, $args, $depth ) );
+		$this->assertStringNotContainsString( 'menu-item-has-children', $class_names, 'Class name should not be retained when filter is called with four arguments.' );
+	}
+
+	/**
+	 * Ensure menu-item-has-children class is removed or retained as expected.
+	 *
+	 * @dataProvider data_menu_item_has_children_class_should_be_removed_or_retained_as_expected
+	 * @ticket 56926
+	 */
+	public function test_menu_item_has_children_class_should_be_removed_or_retained_as_expected( $args, $depth, $should_be_retained ) {
+		$classes = array( 'menu-item-has-children', 'menu-item', 'menu-item-123' );
+
+		$menu_item = (object) array(
+			'classes' => $classes,
+		);
+
+		$class_names = wp_nav_menu_remove_menu_item_has_children_class( $classes, $menu_item, $args, $depth );
+		if ( $should_be_retained ) {
+			$this->assertContains( 'menu-item-has-children', $class_names, 'Class name should be retained.' );
+			return;
+		}
+
+		$this->assertNotContains( 'menu-item-has-children', $class_names, 'Class name should not be retained.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_menu_item_has_children_class_should_be_removed_or_retained_as_expected() {
+		return array(
+			'Depth not set'                          => array(
+				'args'               => (object) array( 'depth' => 1 ),
+				'depth'              => false,
+				'should_be_retained' => true,
+			),
+			'Neither depth nor args set'             => array(
+				'args'               => false,
+				'depth'              => false,
+				'should_be_retained' => true,
+			),
+			'Max depth is set to minus 1'            => array(
+				'args'               => (object) array( 'depth' => -1 ),
+				'depth'              => 1,
+				'should_be_retained' => false,
+			),
+			'Max depth is set to zero'               => array(
+				'args'               => (object) array( 'depth' => 0 ),
+				'depth'              => 1,
+				'should_be_retained' => true,
+			),
+			'Item depth exceeds max depth'           => array(
+				'args'               => (object) array( 'depth' => 2 ),
+				'depth'              => 3,
+				'should_be_retained' => false,
+			),
+			'Item depth is lower than max depth'     => array(
+				'args'               => (object) array( 'depth' => 5 ),
+				'depth'              => 3,
+				'should_be_retained' => true,
+			),
+			'Item depth is one lower than max depth' => array(
+				'args'               => (object) array( 'depth' => 2 ),
+				'depth'              => 1,
+				'should_be_retained' => false, // Depth is zero-based, max depth is not.
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/meta.php b/tests/phpunit/tests/meta.php
index d49f10682184a..83dcefd1ba4c9 100644
--- a/tests/phpunit/tests/meta.php
+++ b/tests/phpunit/tests/meta.php
@@ -401,7 +401,7 @@ public function test_get_metadata_with_empty_key_array_value() {
 	 * @ticket 15030
 	 */
 	public function test_get_metadata_with_empty_key_object_value() {
-		$data      = new stdClass;
+		$data      = new stdClass();
 		$data->foo = 'bar';
 		$value     = serialize( $data );
 		add_metadata( 'user', $this->author->ID, 'foo', $data );
diff --git a/tests/phpunit/tests/meta/isProtectedMeta.php b/tests/phpunit/tests/meta/isProtectedMeta.php
index c204d381f530d..ba3eeed9a2bf7 100644
--- a/tests/phpunit/tests/meta/isProtectedMeta.php
+++ b/tests/phpunit/tests/meta/isProtectedMeta.php
@@ -7,20 +7,20 @@
 class Tests_Meta_isProtectedMeta extends WP_UnitTestCase {
 
 	/**
-	 * @dataProvider protected_data
+	 * @dataProvider data_is_protected_meta_true
 	 */
-	public function test_protected( $key ) {
+	public function test_is_protected_meta_true( $key ) {
 		$this->assertTrue( is_protected_meta( $key ) );
 	}
 
-	public function protected_data() {
+	public function data_is_protected_meta_true() {
 		$protected_keys = array(
 			array( '_wp_attachment' ),
 		);
-		for ( $i = 0, $max = 31; $i < $max; $i ++ ) {
+		for ( $i = 0, $max = 31; $i < $max; $i++ ) {
 			$protected_keys[] = array( chr( $i ) . '_wp_attachment' );
 		}
-		for ( $i = 127, $max = 159; $i <= $max; $i ++ ) {
+		for ( $i = 127, $max = 159; $i <= $max; $i++ ) {
 			$protected_keys[] = array( chr( $i ) . '_wp_attachment' );
 		}
 		$protected_keys[] = array( chr( 95 ) . '_wp_attachment' );
@@ -29,23 +29,23 @@ public function protected_data() {
 	}
 
 	/**
-	 * @dataProvider unprotected_data
+	 * @dataProvider data_is_protected_meta_false
 	 */
-	public function test_unprotected( $key ) {
+	public function test_is_protected_meta_false( $key ) {
 		$this->assertFalse( is_protected_meta( $key ) );
 	}
 
-	public function unprotected_data() {
+	public function data_is_protected_meta_false() {
 		$unprotected_keys = array(
 			array( 'singleword' ),
 			array( 'two_words' ),
 			array( 'ąŌ_not_so_protected_meta' ),
 		);
 
-		for ( $i = 32, $max = 94; $i <= $max; $i ++ ) {
+		for ( $i = 32, $max = 94; $i <= $max; $i++ ) {
 			$unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
 		}
-		for ( $i = 96, $max = 126; $i <= $max; $i ++ ) {
+		for ( $i = 96, $max = 126; $i <= $max; $i++ ) {
 			$unprotected_keys[] = array( chr( $i ) . '_wp_attachment' );
 		}
 
diff --git a/tests/phpunit/tests/meta/updateMetadata.php b/tests/phpunit/tests/meta/updateMetadata.php
index 5e376425b6875..7f5aff32cdb34 100644
--- a/tests/phpunit/tests/meta/updateMetadata.php
+++ b/tests/phpunit/tests/meta/updateMetadata.php
@@ -27,4 +27,83 @@ public function test_slashed_key_for_existing_metadata() {
 		$found = get_metadata( 'post', 123, 'foo\foo', true );
 		$this->assertSame( 'baz', $found );
 	}
+
+	/**
+	 * @ticket 54316
+	 *
+	 * @group user
+	 *
+	 * @covers ::clean_user_cache
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 */
+	public function test_clear_user_metadata_caches() {
+		global $wpdb;
+
+		$user_id = self::factory()->user->create();
+
+		update_metadata( 'user', $user_id, 'key', 'value1' );
+
+		$found = get_metadata( 'user', $user_id, 'key', true );
+		$this->assertSame( 'value1', $found );
+
+		// Simulate updating the DB from outside of WordPress.
+		$wpdb->update(
+			$wpdb->usermeta,
+			array(
+				'meta_value' => 'value2',
+			),
+			array(
+				'user_id'  => $user_id,
+				'meta_key' => 'key',
+			)
+		);
+
+		// Clear the user caches.
+		clean_user_cache( $user_id );
+
+		// Verify metadata cache was cleared.
+		$found = get_metadata( 'user', $user_id, 'key', true );
+		$this->assertSame( 'value2', $found );
+	}
+
+	/**
+	 * @ticket 54316
+	 *
+	 * @group user
+	 *
+	 * @covers ::clean_user_cache
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 */
+	public function test_clear_post_metadata_caches() {
+		global $wpdb;
+
+		$post_id = self::factory()->post->create();
+
+		update_metadata( 'post', $post_id, 'key', 'value1' );
+
+		$found = get_metadata( 'post', $post_id, 'key', true );
+		$this->assertSame( 'value1', $found );
+
+		// Simulate updating the DB from outside of WordPress.
+		$wpdb->update(
+			$wpdb->postmeta,
+			array(
+				'meta_value' => 'value2',
+			),
+			array(
+				'post_id'  => $post_id,
+				'meta_key' => 'key',
+			)
+		);
+
+		// Clear the post caches.
+		clean_post_cache( $post_id );
+
+		// Verify metadata cache was cleared.
+		$found = get_metadata( 'post', $post_id, 'key', true );
+		$this->assertSame( 'value2', $found );
+	}
+
 }
diff --git a/tests/phpunit/tests/multisite/msFilesRewriting.php b/tests/phpunit/tests/multisite/msFilesRewriting.php
index 38818b50288bf..7d469769ba32a 100644
--- a/tests/phpunit/tests/multisite/msFilesRewriting.php
+++ b/tests/phpunit/tests/multisite/msFilesRewriting.php
@@ -72,6 +72,8 @@ public function test_upload_directories_after_multiple_wpmu_delete_blog_with_ms_
 			// The file on the main site should still exist. The file on the deleted site should not.
 			$this->assertFileExists( $file1['file'] );
 			$this->assertFileDoesNotExist( $file2['file'] );
+
+			unlink( $file1['file'] );
 		}
 	}
 
diff --git a/tests/phpunit/tests/multisite/network.php b/tests/phpunit/tests/multisite/network.php
index 630f76ebaf189..db1f35b6d0466 100644
--- a/tests/phpunit/tests/multisite/network.php
+++ b/tests/phpunit/tests/multisite/network.php
@@ -590,14 +590,12 @@ public function test_network_blog_id_set() {
 		 * @ticket 42251
 		 */
 		public function test_get_network_not_found_cache() {
-			global $wpdb;
-
 			$new_network_id = $this->_get_next_network_id();
 			$this->assertNull( get_network( $new_network_id ) );
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 			$this->assertNull( get_network( $new_network_id ) );
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( $num_queries, get_num_queries() );
 		}
 
 		/**
diff --git a/tests/phpunit/tests/multisite/site.php b/tests/phpunit/tests/multisite/site.php
index 86ad14ad52126..2bcfd89f33a3a 100644
--- a/tests/phpunit/tests/multisite/site.php
+++ b/tests/phpunit/tests/multisite/site.php
@@ -398,6 +398,8 @@ public function test_upload_directories_after_multiple_wpmu_delete_blog() {
 			// The file on the main site should still exist. The file on the deleted site should not.
 			$this->assertFileExists( $file1['file'] );
 			$this->assertFileDoesNotExist( $file2['file'] );
+
+			unlink( $file1['file'] );
 		}
 
 		public function test_wpmu_update_blogs_date() {
@@ -412,14 +414,6 @@ public function test_wpmu_update_blogs_date() {
 			$this->assertEqualsWithDelta( $current_time, strtotime( $blog->last_updated ), 2, 'The dates should be equal' );
 		}
 
-		/**
-		 * Provide a counter to determine that hooks are firing when intended.
-		 */
-		public function action_counter_cb() {
-			global $test_action_counter;
-			$test_action_counter++;
-		}
-
 		/**
 		 * Test cached data for a site that does not exist and then again after it exists.
 		 *
@@ -448,274 +442,6 @@ public function test_get_blog_details_when_site_does_not_exist() {
 			$this->assertEquals( $blog, wp_cache_get( $blog_id, 'blog-details' ) );
 		}
 
-		/**
-		 * Updating a field returns the sme value that was passed.
-		 */
-		public function test_update_blog_status() {
-			$result = update_blog_status( 1, 'spam', 0 );
-			$this->assertSame( 0, $result );
-		}
-
-		/**
-		 * Updating an invalid field returns the same value that was passed.
-		 */
-		public function test_update_blog_status_invalid_status() {
-			$result = update_blog_status( 1, 'doesnotexist', 'invalid' );
-			$this->assertSame( 'invalid', $result );
-		}
-
-		public function test_update_blog_status_make_ham_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-			update_blog_details( $blog_id, array( 'spam' => 1 ) );
-
-			add_action( 'make_ham_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'spam', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->spam );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'spam' stays the same.
-			update_blog_status( $blog_id, 'spam', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->spam );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'make_ham_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_content_from_spam_blog_is_not_available() {
-			$spam_blog_id = self::factory()->blog->create();
-			switch_to_blog( $spam_blog_id );
-			$post_data      = array(
-				'post_title'   => 'Hello World!',
-				'post_content' => 'Hello world content',
-			);
-			$post_id        = self::factory()->post->create( $post_data );
-			$post           = get_post( $post_id );
-			$spam_permalink = site_url() . '/?p=' . $post->ID;
-			$spam_embed_url = get_post_embed_url( $post_id );
-
-			restore_current_blog();
-			$this->assertNotEmpty( $spam_permalink );
-			$this->assertSame( $post_data['post_title'], $post->post_title );
-
-			update_blog_status( $spam_blog_id, 'spam', 1 );
-
-			$post_id = self::factory()->post->create(
-				array(
-					'post_content' => "\n $spam_permalink \n",
-				)
-			);
-			$post    = get_post( $post_id );
-			$content = apply_filters( 'the_content', $post->post_content );
-
-			$this->assertStringNotContainsString( $post_data['post_title'], $content );
-			$this->assertStringNotContainsString( "src=\"{$spam_embed_url}#?", $content );
-		}
-
-		public function test_update_blog_status_make_spam_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-
-			add_action( 'make_spam_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'spam', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->spam );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'spam' stays the same.
-			update_blog_status( $blog_id, 'spam', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->spam );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'make_spam_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_archive_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-
-			add_action( 'archive_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'archived', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->archived );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'archived' stays the same.
-			update_blog_status( $blog_id, 'archived', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->archived );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'archive_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_unarchive_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-			update_blog_details( $blog_id, array( 'archived' => 1 ) );
-
-			add_action( 'unarchive_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'archived', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->archived );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'archived' stays the same.
-			update_blog_status( $blog_id, 'archived', 0 );
-			$blog = get_site( $blog_id );
-			$this->assertSame( '0', $blog->archived );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'unarchive_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_make_delete_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-
-			add_action( 'make_delete_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'deleted', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->deleted );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'deleted' stays the same.
-			update_blog_status( $blog_id, 'deleted', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->deleted );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'make_delete_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_make_undelete_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-			update_blog_details( $blog_id, array( 'deleted' => 1 ) );
-
-			add_action( 'make_undelete_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'deleted', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->deleted );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'deleted' stays the same.
-			update_blog_status( $blog_id, 'deleted', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->deleted );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'make_undelete_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_mature_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-
-			add_action( 'mature_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'mature', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->mature );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'mature' stays the same.
-			update_blog_status( $blog_id, 'mature', 1 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '1', $blog->mature );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'mature_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_unmature_blog_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-			update_blog_details( $blog_id, array( 'mature' => 1 ) );
-
-			add_action( 'unmature_blog', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'mature', 0 );
-
-			$blog = get_site( $blog_id );
-			$this->assertSame( '0', $blog->mature );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'mature' stays the same.
-			update_blog_status( $blog_id, 'mature', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->mature );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'unmature_blog', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		public function test_update_blog_status_update_blog_public_action() {
-			global $test_action_counter;
-			$test_action_counter = 0;
-
-			$blog_id = self::factory()->blog->create();
-
-			add_action( 'update_blog_public', array( $this, 'action_counter_cb' ), 10 );
-			update_blog_status( $blog_id, 'public', 0 );
-
-			$blog = get_site( $blog_id );
-			$this->assertSame( '0', $blog->public );
-			$this->assertSame( 1, $test_action_counter );
-
-			// The action should not fire if the status of 'mature' stays the same.
-			update_blog_status( $blog_id, 'public', 0 );
-			$blog = get_site( $blog_id );
-
-			$this->assertSame( '0', $blog->public );
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( 'update_blog_public', array( $this, 'action_counter_cb' ), 10 );
-		}
-
-		/**
-		 * @ticket 27952
-		 */
-		public function test_posts_count() {
-			self::factory()->post->create();
-			$post2 = self::factory()->post->create();
-			$this->assertSame( 2, get_site()->post_count );
-
-			wp_delete_post( $post2 );
-			$this->assertSame( 1, get_site()->post_count );
-		}
-
 		/**
 		 * @ticket 26410
 		 */
@@ -963,10 +689,10 @@ public function test_get_blogaddress_by_id_with_valid_id() {
 		}
 
 		/**
-		 * Tests returning the appropriate response for a invalid id given.
+		 * Tests returning an empty string for a non-existing ID.
 		 */
 		public function test_get_blogaddress_by_id_with_invalid_id() {
-			$blogaddress = get_blogaddress_by_id( 42 );
+			$blogaddress = get_blogaddress_by_id( PHP_INT_MAX );
 			$this->assertSame( '', $blogaddress );
 		}
 
@@ -2399,8 +2125,10 @@ public function test_wpmu_create_blog_cache_cleanup_backward_compatible() {
 
 			$blog_id = wpmu_create_blog( 'testsite1.example.org', '/test', 'test', 1, array( 'public' => 1 ), 2 );
 
-			// Should not hit blog_details cache initialised in $this->populate_options_callback tirggered during
-			// populate_options callback's call of get_blog_details.
+			/*
+			 * Should not hit blog_details cache initialized in $this->populate_options_callback triggered during
+			 * populate_options callback's call of get_blog_details.
+			 */
 			$this->assertSame( 'http://testsite1.example.org/test', get_blog_details( $blog_id )->siteurl );
 			$this->assertSame( 'http://testsite1.example.org/test', get_site( $blog_id )->siteurl );
 
@@ -2442,14 +2170,12 @@ public function test_wpmu_new_blog_action_backward_compatible( $meta, $expected_
 		 * @ticket 42251
 		 */
 		public function test_get_site_not_found_cache() {
-			global $wpdb;
-
 			$new_site_id = $this->_get_next_site_id();
 			$this->assertNull( get_site( $new_site_id ) );
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 			$this->assertNull( get_site( $new_site_id ) );
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( $num_queries, get_num_queries() );
 		}
 
 		/**
diff --git a/tests/phpunit/tests/multisite/siteMeta.php b/tests/phpunit/tests/multisite/siteMeta.php
index 4a1a30fee2e81..ad59c75e34ebc 100644
--- a/tests/phpunit/tests/multisite/siteMeta.php
+++ b/tests/phpunit/tests/multisite/siteMeta.php
@@ -220,8 +220,6 @@ public function test_site_meta_should_be_deleted_when_site_is_deleted() {
 		}
 
 		public function test_update_site_meta_cache() {
-			global $wpdb;
-
 			if ( ! is_site_meta_supported() ) {
 				$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
 			}
@@ -229,14 +227,12 @@ public function test_update_site_meta_cache() {
 			update_site_meta( self::$site_id, 'foo', 'bar' );
 			update_sitemeta_cache( array( self::$site_id ) );
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 			get_site_meta( self::$site_id, 'foo', true );
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( $num_queries, get_num_queries() );
 		}
 
 		public function test_query_update_site_meta_cache_true() {
-			global $wpdb;
-
 			if ( ! is_site_meta_supported() ) {
 				$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
 			}
@@ -250,14 +246,84 @@ public function test_query_update_site_meta_cache_true() {
 				)
 			);
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 			get_site_meta( self::$site_id, 'foo', true );
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( 1, get_num_queries() - $num_queries );
 		}
 
-		public function test_query_update_site_meta_cache_false() {
-			global $wpdb;
+		/**
+		 * @ticket 58185
+		 */
+		public function test_lazy_load_site_meta() {
+			if ( ! is_site_meta_supported() ) {
+				$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
+			}
+
+			$filter = new MockAction();
+			add_filter( 'update_blog_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+			$q = new WP_Site_Query(
+				array(
+					'ID' => self::$site_id,
+				)
+			);
+
+			$this->assertSameSets( array( (string) self::$site_id ), wp_list_pluck( $q->sites, 'blog_id' ), 'Site query should return the first test site' );
+
+			$q = new WP_Site_Query(
+				array(
+					'ID' => self::$site_id2,
+				)
+			);
+
+			$this->assertSameSets( array( (string) self::$site_id2 ), wp_list_pluck( $q->sites, 'blog_id' ), 'Site query should return the second test site' );
+
+			get_site_meta( self::$site_id2 );
+
+			$args     = $filter->get_args();
+			$first    = reset( $args );
+			$site_ids = end( $first );
+			$this->assertSameSets( $site_ids, array( self::$site_id, self::$site_id2 ), 'This should have two site\'s meta' );
+		}
+
+		/**
+		 * @ticket 58185
+		 */
+		public function test_lazy_load_site_meta_fields_id() {
+			if ( ! is_site_meta_supported() ) {
+				$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
+			}
+
+			$filter = new MockAction();
+			add_filter( 'update_blog_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+			$q = new WP_Site_Query(
+				array(
+					'ID'     => self::$site_id,
+					'fields' => 'ids',
+				)
+			);
+
+			$this->assertSameSets( array( self::$site_id ), $q->sites, 'Site query should return the first test site' );
+
+			$q = new WP_Site_Query(
+				array(
+					'ID'     => self::$site_id2,
+					'fields' => 'ids',
+				)
+			);
 
+			$this->assertSameSets( array( self::$site_id2 ), $q->sites, 'Site query should return the second test site' );
+
+			get_site_meta( self::$site_id2 );
+
+			$args     = $filter->get_args();
+			$first    = reset( $args );
+			$site_ids = end( $first );
+			$this->assertSameSets( $site_ids, array( self::$site_id, self::$site_id2 ), 'This should have two sites meta' );
+		}
+
+		public function test_query_update_site_meta_cache_false() {
 			if ( ! is_site_meta_supported() ) {
 				$this->markTestSkipped( 'Test only runs with the blogmeta database table installed.' );
 			}
@@ -271,9 +337,9 @@ public function test_query_update_site_meta_cache_false() {
 				)
 			);
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 			get_site_meta( self::$site_id, 'foo', true );
-			$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+			$this->assertSame( 1, get_num_queries() - $num_queries );
 		}
 
 		/**
diff --git a/tests/phpunit/tests/multisite/updateBlogDetails.php b/tests/phpunit/tests/multisite/updateBlogDetails.php
index 80595ed99b977..d3249a126165d 100644
--- a/tests/phpunit/tests/multisite/updateBlogDetails.php
+++ b/tests/phpunit/tests/multisite/updateBlogDetails.php
@@ -7,6 +7,7 @@
 	 * @group multisite
 	 */
 	class Tests_Multisite_UpdateBlogDetails extends WP_UnitTestCase {
+
 		/**
 		 * If `update_blog_details()` is called with any kind of empty arguments, it
 		 * should return false.
@@ -56,8 +57,7 @@ public function test_update_blog_details() {
 		 * @dataProvider data_flag_hooks
 		 */
 		public function test_update_blog_details_flag_action( $flag, $flag_value, $hook ) {
-			global $test_action_counter;
-			$test_action_counter = 0;
+			$test_action_counter = new MockAction();
 
 			$blog_id = self::factory()->blog->create();
 
@@ -66,7 +66,7 @@ public function test_update_blog_details_flag_action( $flag, $flag_value, $hook
 				update_blog_details( $blog_id, array( $flag => '1' ) );
 			}
 
-			add_action( $hook, array( $this, 'action_counter_cb' ), 10 );
+			add_action( $hook, array( $test_action_counter, 'action' ) );
 
 			update_blog_details( $blog_id, array( $flag => $flag_value ) );
 			$blog = get_site( $blog_id );
@@ -74,15 +74,13 @@ public function test_update_blog_details_flag_action( $flag, $flag_value, $hook
 			$this->assertSame( $flag_value, $blog->{$flag} );
 
 			// The hook attached to this flag should have fired once during update_blog_details().
-			$this->assertSame( 1, $test_action_counter );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
 
 			// Update the site to the exact same flag value for this flag.
 			update_blog_details( $blog_id, array( $flag => $flag_value ) );
 
 			// The hook attached to this flag should not have fired again.
-			$this->assertSame( 1, $test_action_counter );
-
-			remove_action( $hook, array( $this, 'action_counter_cb' ), 10 );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
 		}
 
 		public function data_flag_hooks() {
@@ -98,14 +96,6 @@ public function data_flag_hooks() {
 			);
 		}
 
-		/**
-		 * Provide a counter to determine that hooks are firing when intended.
-		 */
-		public function action_counter_cb() {
-			global $test_action_counter;
-			$test_action_counter++;
-		}
-
 		/**
 		 * When the path for a site is updated with update_blog_details(), the final path
 		 * should have a leading and trailing slash.
diff --git a/tests/phpunit/tests/multisite/updateBlogStatus.php b/tests/phpunit/tests/multisite/updateBlogStatus.php
new file mode 100644
index 0000000000000..707b8fa66aee5
--- /dev/null
+++ b/tests/phpunit/tests/multisite/updateBlogStatus.php
@@ -0,0 +1,241 @@
+<?php
+
+if ( is_multisite() ) :
+
+	/**
+	 * @group ms-site
+	 * @group multisite
+	 */
+	class Tests_Multisite_UpdateBlogStatus extends WP_UnitTestCase {
+
+		/**
+		 * Updating a field returns the sme value that was passed.
+		 */
+		public function test_update_blog_status() {
+			$result = update_blog_status( 1, 'spam', 0 );
+			$this->assertSame( 0, $result );
+		}
+
+		/**
+		 * Updating an invalid field returns the same value that was passed.
+		 */
+		public function test_update_blog_status_invalid_status() {
+			$result = update_blog_status( 1, 'doesnotexist', 'invalid' );
+			$this->assertSame( 'invalid', $result );
+		}
+
+		public function test_update_blog_status_make_ham_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+			update_blog_details( $blog_id, array( 'spam' => 1 ) );
+
+			add_action( 'make_ham_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'spam', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->spam );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'spam' stays the same.
+			update_blog_status( $blog_id, 'spam', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->spam );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_content_from_spam_blog_is_not_available() {
+			$spam_blog_id = self::factory()->blog->create();
+			switch_to_blog( $spam_blog_id );
+			$post_data      = array(
+				'post_title'   => 'Hello World!',
+				'post_content' => 'Hello world content',
+			);
+			$post_id        = self::factory()->post->create( $post_data );
+			$post           = get_post( $post_id );
+			$spam_permalink = site_url() . '/?p=' . $post->ID;
+			$spam_embed_url = get_post_embed_url( $post_id );
+
+			restore_current_blog();
+			$this->assertNotEmpty( $spam_permalink );
+			$this->assertSame( $post_data['post_title'], $post->post_title );
+
+			update_blog_status( $spam_blog_id, 'spam', 1 );
+
+			$post_id = self::factory()->post->create(
+				array(
+					'post_content' => "\n $spam_permalink \n",
+				)
+			);
+			$post    = get_post( $post_id );
+			$content = apply_filters( 'the_content', $post->post_content );
+
+			$this->assertStringNotContainsString( $post_data['post_title'], $content );
+			$this->assertStringNotContainsString( "src=\"{$spam_embed_url}#?", $content );
+		}
+
+		public function test_update_blog_status_make_spam_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+
+			add_action( 'make_spam_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'spam', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->spam );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'spam' stays the same.
+			update_blog_status( $blog_id, 'spam', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->spam );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_archive_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+
+			add_action( 'archive_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'archived', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->archived );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'archived' stays the same.
+			update_blog_status( $blog_id, 'archived', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->archived );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_unarchive_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+			update_blog_details( $blog_id, array( 'archived' => 1 ) );
+
+			add_action( 'unarchive_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'archived', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->archived );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'archived' stays the same.
+			update_blog_status( $blog_id, 'archived', 0 );
+			$blog = get_site( $blog_id );
+			$this->assertSame( '0', $blog->archived );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_make_delete_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+
+			add_action( 'make_delete_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'deleted', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->deleted );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'deleted' stays the same.
+			update_blog_status( $blog_id, 'deleted', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->deleted );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_make_undelete_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+			update_blog_details( $blog_id, array( 'deleted' => 1 ) );
+
+			add_action( 'make_undelete_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'deleted', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->deleted );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'deleted' stays the same.
+			update_blog_status( $blog_id, 'deleted', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->deleted );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_mature_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+
+			add_action( 'mature_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'mature', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->mature );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'mature' stays the same.
+			update_blog_status( $blog_id, 'mature', 1 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '1', $blog->mature );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_unmature_blog_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+			update_blog_details( $blog_id, array( 'mature' => 1 ) );
+
+			add_action( 'unmature_blog', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'mature', 0 );
+
+			$blog = get_site( $blog_id );
+			$this->assertSame( '0', $blog->mature );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'mature' stays the same.
+			update_blog_status( $blog_id, 'mature', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->mature );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+
+		public function test_update_blog_status_update_blog_public_action() {
+			$test_action_counter = new MockAction();
+
+			$blog_id = self::factory()->blog->create();
+
+			add_action( 'update_blog_public', array( $test_action_counter, 'action' ) );
+			update_blog_status( $blog_id, 'public', 0 );
+
+			$blog = get_site( $blog_id );
+			$this->assertSame( '0', $blog->public );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+
+			// The action should not fire if the status of 'mature' stays the same.
+			update_blog_status( $blog_id, 'public', 0 );
+			$blog = get_site( $blog_id );
+
+			$this->assertSame( '0', $blog->public );
+			$this->assertSame( 1, $test_action_counter->get_call_count() );
+		}
+	}
+
+endif;
diff --git a/tests/phpunit/tests/multisite/updatePostsCount.php b/tests/phpunit/tests/multisite/updatePostsCount.php
index 2806aaedd5b41..bf3fcb879f617 100644
--- a/tests/phpunit/tests/multisite/updatePostsCount.php
+++ b/tests/phpunit/tests/multisite/updatePostsCount.php
@@ -2,54 +2,57 @@
 
 if ( is_multisite() ) :
 	/**
-	 * Test update_posts_count() get called via filters of WP_Site in multisite.
+	 * Test that update_posts_count() gets called via default filters on multisite.
 	 *
 	 * @group ms-site
 	 * @group multisite
 	 *
-	 * @covers ::_update_posts_count_on_delete
+	 * @covers ::update_posts_count
 	 */
-	class Tests_update_posts_count_on_delete extends WP_UnitTestCase {
+	class Tests_Multisite_UpdatePostsCount extends WP_UnitTestCase {
 
 		/**
-		 * Test that the posts count is updated correctly when a posts are added and deleted.
+		 * Tests that posts count is updated correctly when posts are added or deleted.
+		 *
+		 * @ticket 27952
 		 * @ticket 53443
+		 *
+		 * @covers ::_update_posts_count_on_transition_post_status
+		 * @covers ::_update_posts_count_on_delete
 		 */
-		public function test_update_posts_count_on_delete() {
-
+		public function test_update_posts_count() {
 			$blog_id = self::factory()->blog->create();
 			switch_to_blog( $blog_id );
 
-			$current_post_count = (int) get_option( 'post_count' );
-
-			$post_id = self::factory()->post->create(
-				array(
-					'post_type'   => 'post',
-					'post_author' => '1',
-					'post_date'   => '2012-10-23 19:34:42',
-					'post_status' => 'publish',
-				)
-			);
-
-			/**
-			 * Check that add_action( 'deleted_post', '_update_posts_count_on_delete' ) is called when a post is created.
-			 * Check that _update_posts_count_on_transition_post_status() is called on that filter which then calls
-			 * update_posts_count to update the count.
-			 */
-			$this->assertEquals( $current_post_count + 1, (int) get_option( 'post_count' ), 'post added' );
+			$original_post_count = (int) get_site()->post_count;
 
-			wp_delete_post( $post_id );
+			$post_id = self::factory()->post->create();
 
-			/**
-			 * Check that add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 )
-			 * is called when a post is deleted.
-			 * Check that _update_posts_count_on_delete() is called on that filter which then calls update_posts_count
-			 * to update the count.
-			 */
-			$this->assertEquals( $current_post_count, (int) get_option( 'post_count' ), 'post deleted' );
+			$post_count_after_creating = get_site()->post_count;
+
+			wp_delete_post( $post_id, true );
+
+			$post_count_after_deleting = get_site()->post_count;
 
 			restore_current_blog();
 
+			/*
+			 * Check that posts count is updated when a post is created:
+			 * add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 );
+			 *
+			 * Check that _update_posts_count_on_transition_post_status() is called on that filter,
+			 * which then calls update_posts_count() to update the count.
+			 */
+			$this->assertSame( $original_post_count + 1, $post_count_after_creating, 'Post count should be incremented by 1.' );
+
+			/*
+			 * Check that posts count is updated when a post is deleted:
+			 * add_action( 'after_delete_post', '_update_posts_count_on_delete', 10, 2 );
+			 *
+			 * Check that _update_posts_count_on_delete() is called on that filter,
+			 * which then calls update_posts_count() to update the count.
+			 */
+			$this->assertSame( $original_post_count, $post_count_after_deleting, 'Post count should match the original count.' );
 		}
 	}
 
diff --git a/tests/phpunit/tests/multisite/wpNetworkQuery.php b/tests/phpunit/tests/multisite/wpNetworkQuery.php
index 29b2b8f5f7571..f59a4c66283be 100644
--- a/tests/phpunit/tests/multisite/wpNetworkQuery.php
+++ b/tests/phpunit/tests/multisite/wpNetworkQuery.php
@@ -428,8 +428,6 @@ public function test_wp_network_query_by_path_order_by_domain_desc() {
 		 * @ticket 41347
 		 */
 		public function test_wp_network_query_cache_with_different_fields_no_count() {
-			global $wpdb;
-
 			$q                 = new WP_Network_Query();
 			$query_1           = $q->query(
 				array(
@@ -438,7 +436,7 @@ public function test_wp_network_query_cache_with_different_fields_no_count() {
 					'order'  => 'ASC',
 				)
 			);
-			$number_of_queries = $wpdb->num_queries;
+			$number_of_queries = get_num_queries();
 
 			$query_2 = $q->query(
 				array(
@@ -448,15 +446,13 @@ public function test_wp_network_query_cache_with_different_fields_no_count() {
 				)
 			);
 
-			$this->assertSame( $number_of_queries, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries, get_num_queries() );
 		}
 
 		/**
 		 * @ticket 41347
 		 */
 		public function test_wp_network_query_cache_with_different_fields_active_count() {
-			global $wpdb;
-
 			$q = new WP_Network_Query();
 
 			$query_1           = $q->query(
@@ -467,7 +463,7 @@ public function test_wp_network_query_cache_with_different_fields_active_count()
 					'count'  => true,
 				)
 			);
-			$number_of_queries = $wpdb->num_queries;
+			$number_of_queries = get_num_queries();
 
 			$query_2 = $q->query(
 				array(
@@ -477,15 +473,13 @@ public function test_wp_network_query_cache_with_different_fields_active_count()
 					'count'  => true,
 				)
 			);
-			$this->assertSame( $number_of_queries, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries, get_num_queries() );
 		}
 
 		/**
 		 * @ticket 41347
 		 */
 		public function test_wp_network_query_cache_with_same_fields_different_count() {
-			global $wpdb;
-
 			$q = new WP_Network_Query();
 
 			$query_1 = $q->query(
@@ -496,7 +490,7 @@ public function test_wp_network_query_cache_with_same_fields_different_count() {
 				)
 			);
 
-			$number_of_queries = $wpdb->num_queries;
+			$number_of_queries = get_num_queries();
 
 			$query_2 = $q->query(
 				array(
@@ -506,7 +500,7 @@ public function test_wp_network_query_cache_with_same_fields_different_count() {
 					'count'  => true,
 				)
 			);
-			$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries + 1, get_num_queries() );
 		}
 
 		/**
@@ -568,11 +562,9 @@ public function test_wp_network_query_cache_with_same_fields_different_cache_fie
 		 * @ticket 47599
 		 */
 		public function test_networks_pre_query_filter_should_bypass_database_query() {
-			global $wpdb;
-
 			add_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_pre_query' ), 10, 2 );
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 
 			$q       = new WP_Network_Query();
 			$results = $q->query( array() );
@@ -580,7 +572,7 @@ public function test_networks_pre_query_filter_should_bypass_database_query() {
 			remove_filter( 'networks_pre_query', array( __CLASS__, 'filter_networks_pre_query' ), 10, 2 );
 
 			// Make sure no queries were executed.
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( $num_queries, get_num_queries() );
 
 			// We manually inserted a non-existing site and overrode the results with it.
 			$this->assertSame( array( 555 ), $results );
diff --git a/tests/phpunit/tests/multisite/wpSiteQuery.php b/tests/phpunit/tests/multisite/wpSiteQuery.php
index 8d1d84c1f0ed1..2b2bed37de1a3 100644
--- a/tests/phpunit/tests/multisite/wpSiteQuery.php
+++ b/tests/phpunit/tests/multisite/wpSiteQuery.php
@@ -779,7 +779,6 @@ public function test_wp_site_query_by_search_with_wildcard_in_text_exclude_domai
 		 * @ticket 41197
 		 */
 		public function test_wp_site_query_cache_with_different_fields_no_count() {
-			global $wpdb;
 			$q                 = new WP_Site_Query();
 			$query_1           = $q->query(
 				array(
@@ -789,7 +788,7 @@ public function test_wp_site_query_cache_with_different_fields_no_count() {
 					'order'      => 'ASC',
 				)
 			);
-			$number_of_queries = $wpdb->num_queries;
+			$number_of_queries = get_num_queries();
 
 			$query_2 = $q->query(
 				array(
@@ -800,14 +799,13 @@ public function test_wp_site_query_cache_with_different_fields_no_count() {
 				)
 			);
 
-			$this->assertSame( $number_of_queries, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries, get_num_queries() );
 		}
 
 		/**
 		 * @ticket 41197
 		 */
 		public function test_wp_site_query_cache_with_different_fields_active_count() {
-			global $wpdb;
 			$q = new WP_Site_Query();
 
 			$query_1           = $q->query(
@@ -819,7 +817,7 @@ public function test_wp_site_query_cache_with_different_fields_active_count() {
 					'count'      => true,
 				)
 			);
-			$number_of_queries = $wpdb->num_queries;
+			$number_of_queries = get_num_queries();
 
 			$query_2 = $q->query(
 				array(
@@ -830,14 +828,13 @@ public function test_wp_site_query_cache_with_different_fields_active_count() {
 					'count'      => true,
 				)
 			);
-			$this->assertSame( $number_of_queries, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries, get_num_queries() );
 		}
 
 		/**
 		 * @ticket 41197
 		 */
 		public function test_wp_site_query_cache_with_same_fields_different_count() {
-			global $wpdb;
 			$q = new WP_Site_Query();
 
 			$query_1 = $q->query(
@@ -860,7 +857,7 @@ public function test_wp_site_query_cache_with_same_fields_different_count() {
 					'count'      => true,
 				)
 			);
-			$this->assertSame( $number_of_queries + 1, $wpdb->num_queries );
+			$this->assertSame( $number_of_queries + 1, get_num_queries() );
 		}
 
 		/**
@@ -1119,11 +1116,9 @@ public function data_wp_site_query_meta_query() {
 		 * @ticket 47599
 		 */
 		public function test_sites_pre_query_filter_should_bypass_database_query() {
-			global $wpdb;
-
 			add_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
 
-			$num_queries = $wpdb->num_queries;
+			$num_queries = get_num_queries();
 
 			$q       = new WP_Site_Query();
 			$results = $q->query( array() );
@@ -1131,7 +1126,7 @@ public function test_sites_pre_query_filter_should_bypass_database_query() {
 			remove_filter( 'sites_pre_query', array( __CLASS__, 'filter_sites_pre_query' ), 10, 2 );
 
 			// Make sure no queries were executed.
-			$this->assertSame( $num_queries, $wpdb->num_queries );
+			$this->assertSame( $num_queries, get_num_queries() );
 
 			// We manually inserted a non-existing site and overrode the results with it.
 			$this->assertSame( array( 555 ), $results );
diff --git a/tests/phpunit/tests/oembed/controller.php b/tests/phpunit/tests/oembed/controller.php
index a5b8d6a483f82..238b1faf1fa49 100644
--- a/tests/phpunit/tests/oembed/controller.php
+++ b/tests/phpunit/tests/oembed/controller.php
@@ -49,7 +49,7 @@ public function set_up() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 
 		add_filter( 'pre_http_request', array( $this, 'mock_embed_request' ), 10, 3 );
@@ -84,13 +84,13 @@ public function tear_down() {
 	/**
 	 * Intercept oEmbed requests and mock responses.
 	 *
-	 * @param mixed  $preempt Whether to preempt an HTTP request's return value. Default false.
-	 * @param mixed  $r       HTTP request arguments.
-	 * @param string $url     The request URL.
+	 * @param false|array|WP_Error $response    A preemptive return value of an HTTP request. Default false.
+	 * @param array                $parsed_args HTTP request arguments.
+	 * @param string               $url         The request URL.
 	 * @return array Response data.
 	 */
-	public function mock_embed_request( $preempt, $r, $url ) {
-		unset( $preempt, $r );
+	public function mock_embed_request( $response, $parsed_args, $url ) {
+		unset( $response, $parsed_args );
 
 		$parsed_url = wp_parse_url( $url );
 		$query      = isset( $parsed_url['query'] ) ? $parsed_url['query'] : '';
diff --git a/tests/phpunit/tests/oembed/filterResult.php b/tests/phpunit/tests/oembed/filterResult.php
index 0267bded3408d..543d336cb9a41 100644
--- a/tests/phpunit/tests/oembed/filterResult.php
+++ b/tests/phpunit/tests/oembed/filterResult.php
@@ -93,7 +93,7 @@ public function test_filter_oembed_result_allowed_html() {
 		$this->assertSame( '<blockquote class="wp-embedded-content"><a href=""></a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"></iframe>', $actual );
 	}
 
-	public function _data_oembed_test_strings() {
+	public function data_wp_filter_pre_oembed_custom_result() {
 		return array(
 			array(
 				'<blockquote></blockquote><iframe title=""></iframe>',
@@ -115,7 +115,7 @@ public function _data_oembed_test_strings() {
 	}
 
 	/**
-	 * @dataProvider _data_oembed_test_strings
+	 * @dataProvider data_wp_filter_pre_oembed_custom_result
 	 */
 	public function test_wp_filter_pre_oembed_custom_result( $html, $expected ) {
 		$data   = (object) array(
diff --git a/tests/phpunit/tests/oembed/template.php b/tests/phpunit/tests/oembed/template.php
index 20643c92a2dac..fca6aadd95d3a 100644
--- a/tests/phpunit/tests/oembed/template.php
+++ b/tests/phpunit/tests/oembed/template.php
@@ -343,15 +343,4 @@ public function test_wp_maybe_enqueue_oembed_host_js_without_wp_head_action() {
 		wp_maybe_enqueue_oembed_host_js( $post_embed );
 		$this->assertFalse( $scripts->query( 'wp-embed', 'enqueued' ) );
 	}
-
-	/**
-	 * Confirms that no ampersands exist in src/wp-includes/js/wp-embed.js.
-	 *
-	 * See also the `verify:wp-embed` Grunt task for verifying the built file.
-	 *
-	 * @ticket 34698
-	 */
-	public function test_js_no_ampersands() {
-		$this->assertStringNotContainsString( '&', file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' ) );
-	}
 }
diff --git a/tests/phpunit/tests/option/getOptions.php b/tests/phpunit/tests/option/getOptions.php
new file mode 100644
index 0000000000000..7435dce1882d1
--- /dev/null
+++ b/tests/phpunit/tests/option/getOptions.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Test get_options().
+ *
+ * @group option
+ *
+ * @covers ::get_options
+ */
+class Tests_Option_GetOptions extends WP_UnitTestCase {
+
+	/**
+	 * Tests that get_options() retrieves specified options.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_get_options() {
+		// Create some options to prime.
+		$options_to_prime = array(
+			'option1',
+			'option2',
+		);
+
+		/*
+		 * Set values for the options,
+		 * clear the cache for the options,
+		 * check options are not in cache initially.
+		 */
+		foreach ( $options_to_prime as $option ) {
+			update_option( $option, "value_$option", false );
+			wp_cache_delete( $option, 'options' );
+			$this->assertFalse( wp_cache_get( $option, 'options' ), "$option was not deleted from the cache." );
+		}
+
+		// Call the get_options function to retrieve the options.
+		$options = get_options( array( 'option1', 'option2' ) );
+
+		// Check that options are now in the cache.
+		foreach ( $options_to_prime as $option ) {
+			$this->assertSame( wp_cache_get( $option, 'options' ), get_option( $option ), "$option was not primed." );
+		}
+
+		// Check that the retrieved options are correct.
+		$this->assertSame( get_option( 'option1' ), $options['option1'], 'Retrieved option1 does not match expected value.' );
+		$this->assertSame( get_option( 'option2' ), $options['option2'], 'Retrieved option2 does not match expected value.' );
+	}
+
+	/**
+	 * Tests get_options() with an empty input array.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_get_options_with_empty_array() {
+		// Call the get_options function with an empty array.
+		$options = get_options( array() );
+
+		// Make sure the result is an empty array.
+		$this->assertIsArray( $options, 'An array should have been returned.' );
+		$this->assertEmpty( $options, 'No options should have been returned.' );
+	}
+
+	/**
+	 * Tests get_options() with options that include some nonexistent options.
+	 */
+	public function test_get_options_with_nonexistent_options() {
+		// Create some options to prime.
+		$options_to_prime = array(
+			'option1',
+		);
+
+		// Make sure options are not in cache or database initially.
+		$this->assertFalse( wp_cache_get( 'option1', 'options' ), 'option1 was not deleted from the cache.' );
+		$this->assertFalse( wp_cache_get( 'nonexistent_option', 'options' ), 'nonexistent_option was not deleted from the cache.' );
+
+		// Call the get_options function with an array that includes a nonexistent option.
+		$options = get_options( array( 'option1', 'nonexistent_option' ) );
+
+		// Check that the retrieved options are correct.
+		$this->assertSame( get_option( 'option1' ), $options['option1'], 'Retrieved option1 does not match expected value.' );
+
+		// Check that options are present in the notoptions cache.
+		$new_notoptions = wp_cache_get( 'notoptions', 'options' );
+		foreach ( $options_to_prime as $option ) {
+			$this->assertTrue( isset( $new_notoptions[ $option ] ), "$option was not added to the notoptions cache." );
+		}
+
+		// Check that the nonexistent option is in the result array.
+		$this->assertArrayHasKey( 'nonexistent_option', $options, 'Result array should not contain nonexistent_option.' );
+
+		$this->assertFalse( $options['nonexistent_option'], 'nonexistent_option is present in option.' );
+	}
+}
diff --git a/tests/phpunit/tests/option/primeOptions.php b/tests/phpunit/tests/option/primeOptions.php
new file mode 100644
index 0000000000000..6798d33f04d1d
--- /dev/null
+++ b/tests/phpunit/tests/option/primeOptions.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Test prime_options().
+ *
+ * @group option
+ *
+ * @covers ::prime_options
+ */
+class Tests_Option_PrimeOptions extends WP_UnitTestCase {
+
+	/**
+	 * Tests that prime_options() primes multiple options.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options() {
+		// Create some options to prime.
+		$options_to_prime = array(
+			'option1',
+			'option2',
+			'option3',
+		);
+
+		/*
+		 * Set values for the options,
+		 * clear the cache for the options,
+		 * check options are not in cache initially.
+		 */
+		foreach ( $options_to_prime as $option ) {
+			update_option( $option, "value_$option", false );
+			wp_cache_delete( $option, 'options' );
+			$this->assertFalse( wp_cache_get( $option, 'options' ), "$option was not deleted from the cache." );
+		}
+
+		// Call the prime_options function to prime the options.
+		prime_options( $options_to_prime );
+
+		// Store the initial database query count.
+		$initial_query_count = get_num_queries();
+
+		// Check that options are only in the 'options' cache group.
+		foreach ( $options_to_prime as $option ) {
+			$this->assertSame(
+				wp_cache_get( $option, 'options' ),
+				get_option( $option ),
+				"$option was not primed to the 'options' cache group."
+			);
+
+			$this->assertFalse(
+				wp_cache_get( $option, 'notoptions' ),
+				get_option( $option ),
+				"$option was primed to the 'notoptions' cache group."
+			);
+		}
+
+		// Ensure no additional database queries were made.
+		$this->assertSame(
+			$initial_query_count,
+			get_num_queries(),
+			'Additional database queries were made.'
+		);
+	}
+
+	/**
+	 * Tests prime_options() with options that do not exist in the database.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options_with_nonexistent_options() {
+		// Create some options to prime.
+		$options_to_prime = array(
+			'option1',
+			'option2',
+		);
+
+		/*
+		 * Set values for the options,
+		 * clear the cache for the options,
+		 * check options are not in cache initially.
+		 */
+		foreach ( $options_to_prime as $option ) {
+			$this->assertFalse( wp_cache_get( $option, 'options' ), "$option was not deleted from the cache." );
+		}
+
+		// Call the prime_options function to prime the options.
+		prime_options( $options_to_prime );
+
+		// Check that options are not in the cache or database.
+		foreach ( $options_to_prime as $option ) {
+			$this->assertFalse( wp_cache_get( $option, 'options' ), "$option was not deleted from the cache." );
+		}
+
+		// Check that options are present in the notoptions cache.
+		$new_notoptions = wp_cache_get( 'notoptions', 'options' );
+		$this->assertIsArray( $new_notoptions, 'The notoptions cache should be an array.' );
+		foreach ( $options_to_prime as $option ) {
+			$this->assertArrayHasKey( $option, $new_notoptions, "$option was not added to the notoptions cache." );
+		}
+	}
+
+	/**
+	 * Tests prime_options() with an empty array.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options_with_empty_array() {
+		$alloptions = wp_load_alloptions();
+		$notoptions = wp_cache_get( 'notoptions', 'options' );
+
+		prime_options( array() );
+
+		$this->assertSame( $alloptions, wp_cache_get( 'alloptions', 'options' ), 'The alloptions cache was modified.' );
+		$this->assertSame( $notoptions, wp_cache_get( 'notoptions', 'options' ), 'The notoptions cache was modified.' );
+	}
+
+	/**
+	 * Tests that prime_options handles an empty "notoptions" cache.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options_handles_empty_notoptions_cache() {
+		wp_cache_delete( 'notoptions', 'options' );
+
+		prime_options( array( 'nonexistent_option' ) );
+
+		$notoptions = wp_cache_get( 'notoptions', 'options' );
+		$this->assertIsArray( $notoptions, 'The notoptions cache should be an array.' );
+		$this->assertArrayHasKey( 'nonexistent_option', $notoptions, 'nonexistent_option was not added to notoptions.' );
+	}
+}
diff --git a/tests/phpunit/tests/option/primeOptionsByGroup.php b/tests/phpunit/tests/option/primeOptionsByGroup.php
new file mode 100644
index 0000000000000..9d6819664c1bc
--- /dev/null
+++ b/tests/phpunit/tests/option/primeOptionsByGroup.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Test prime_options_by_group().
+ *
+ * @group option
+ *
+ * @covers ::prime_options_by_group
+ */
+class Tests_Option_PrimeOptionsByGroup extends WP_UnitTestCase {
+
+	/**
+	 * Tests that prime_options_by_group() only primes options in the specified group.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options_by_group() {
+		global $new_allowed_options;
+
+		// Create some options to prime.
+		$new_allowed_options = array(
+			'group1' => array(
+				'option1',
+				'option2',
+			),
+			'group2' => array(
+				'option3',
+			),
+		);
+
+		$options_to_prime = array(
+			'option1',
+			'option2',
+			'option3',
+		);
+
+		/*
+		 * Set values for the options,
+		 * clear the cache for the options,
+		 * check options are not in cache initially.
+		 */
+		foreach ( $options_to_prime as $option ) {
+			update_option( $option, "value_$option", false );
+			wp_cache_delete( $option, 'options' );
+			$this->assertFalse( wp_cache_get( $option, 'options' ), "$option was not deleted from the cache." );
+		}
+
+		// Call the prime_options_by_group function to prime the options.
+		prime_options_by_group( 'group1' );
+
+		// Check that options are now in the cache.
+		$this->assertSame( get_option( 'option1' ), wp_cache_get( 'option1', 'options' ), 'option1 was not primed.' );
+		$this->assertSame( get_option( 'option2' ), wp_cache_get( 'option2', 'options' ), 'option2 was not primed.' );
+
+		// Make sure option3 is still not in cache.
+		$this->assertFalse( wp_cache_get( 'option3', 'options' ), 'option3 was not deleted from the cache.' );
+	}
+
+	/**
+	 * Tests prime_options_by_group() with a nonexistent option group.
+	 *
+	 * @ticket 58962
+	 */
+	public function test_prime_options_by_group_with_nonexistent_group() {
+		// Make sure options are not in cache or database initially.
+		$this->assertFalse( wp_cache_get( 'option1', 'options' ), 'option1 was not deleted from the cache.' );
+		$this->assertFalse( wp_cache_get( 'option2', 'options' ), 'option2 was not deleted from the cache.' );
+
+		// Call the prime_options_by_group function with a nonexistent group.
+		prime_options_by_group( 'nonexistent_group' );
+
+		// Check that options are still not in the cache or database.
+		$this->assertFalse( wp_cache_get( 'option1', 'options' ), 'option1 was not deleted from the cache.' );
+		$this->assertFalse( wp_cache_get( 'option2', 'options' ), 'option2 was not deleted from the cache.' );
+	}
+}
diff --git a/tests/phpunit/tests/option/sanitizeOption.php b/tests/phpunit/tests/option/sanitizeOption.php
index dec3cf7cedf47..38fdda1a2187f 100644
--- a/tests/phpunit/tests/option/sanitizeOption.php
+++ b/tests/phpunit/tests/option/sanitizeOption.php
@@ -5,6 +5,14 @@
  */
 class Tests_Option_SanitizeOption extends WP_UnitTestCase {
 
+	/**
+	 * @dataProvider data_sanitize_option
+	 *
+	 * @covers ::sanitize_option
+	 */
+	public function test_sanitize_option( $option_name, $sanitized, $original ) {
+		$this->assertSame( $sanitized, sanitize_option( $option_name, $original ) );
+	}
 	/**
 	 * Data provider to test all of the sanitize_option() case
 	 *
@@ -12,7 +20,7 @@ class Tests_Option_SanitizeOption extends WP_UnitTestCase {
 	 *
 	 * @return array
 	 */
-	public function sanitize_option_provider() {
+	public function data_sanitize_option() {
 		return array(
 			array( 'admin_email', 'mail@example.com', 'mail@example.com' ),
 			array( 'admin_email', get_option( 'admin_email' ), 'invalid' ),
@@ -28,6 +36,7 @@ public function sanitize_option_provider() {
 			array( 'blogname', '&lt;i&gt;My Site&lt;/i&gt;', '<i>My Site</i>' ),
 			array( 'blog_charset', 'UTF-8', 'UTF-8' ),
 			array( 'blog_charset', 'charset', '">charset<"' ),
+			array( 'blog_charset', '', null ),
 			array( 'blog_public', 1, null ),
 			array( 'blog_public', 1, '1' ),
 			array( 'blog_public', -2, '-2' ),
@@ -37,6 +46,7 @@ public function sanitize_option_provider() {
 			array( 'ping_sites', "http://www.example.com\nhttp://example.org", "www.example.com \n\texample.org\n\n" ),
 			array( 'gmt_offset', '0', 0 ),
 			array( 'gmt_offset', '1.5', '1.5' ),
+			array( 'gmt_offset', '', null ),
 			array( 'siteurl', 'http://example.org', 'http://example.org' ),
 			array( 'siteurl', 'http://example.org/subdir', 'http://example.org/subdir' ),
 			array( 'siteurl', get_option( 'siteurl' ), '' ),
@@ -86,15 +96,15 @@ public function sanitize_option_provider() {
 	}
 
 	/**
-	 * @dataProvider sanitize_option_provider
+	 * @dataProvider data_sanitize_option_upload_path
 	 *
 	 * @covers ::sanitize_option
 	 */
-	public function test_sanitize_option( $option_name, $sanitized, $original ) {
-		$this->assertSame( $sanitized, sanitize_option( $option_name, $original ) );
+	public function test_sanitize_option_upload_path( $provided, $expected ) {
+		$this->assertSame( $expected, sanitize_option( 'upload_path', $provided ) );
 	}
 
-	public function upload_path_provider() {
+	public function data_sanitize_option_upload_path() {
 		return array(
 			array( '<a href="http://www.example.com">Link</a>', 'Link' ),
 			array( '<scr' . 'ipt>url</scr' . 'ipt>', 'url' ),
@@ -103,15 +113,6 @@ public function upload_path_provider() {
 		);
 	}
 
-	/**
-	 * @dataProvider upload_path_provider
-	 *
-	 * @covers ::sanitize_option
-	 */
-	public function test_sanitize_option_upload_path( $provided, $expected ) {
-		$this->assertSame( $expected, sanitize_option( 'upload_path', $provided ) );
-	}
-
 	/**
 	 * @ticket 36122
 	 *
@@ -133,12 +134,12 @@ public function test_emoji_in_blogname_and_description() {
 	}
 
 	/**
-	 * @dataProvider permalink_structure_provider
+	 * @dataProvider data_sanitize_option_permalink_structure
 	 *
 	 * @covers ::sanitize_option
 	 * @covers ::get_settings_errors
 	 */
-	public function test_sanitize_permalink_structure( $provided, $expected, $valid ) {
+	public function test_sanitize_option_permalink_structure( $provided, $expected, $valid ) {
 		global $wp_settings_errors;
 
 		$old_wp_settings_errors = (array) $wp_settings_errors;
@@ -159,7 +160,7 @@ public function test_sanitize_permalink_structure( $provided, $expected, $valid
 		$this->assertEquals( $expected, $actual );
 	}
 
-	public function permalink_structure_provider() {
+	public function data_sanitize_option_permalink_structure() {
 		return array(
 			array( '', '', true ),
 			array( '%postname', false, false ),
diff --git a/tests/phpunit/tests/option/themeMods.php b/tests/phpunit/tests/option/themeMods.php
index 48512dc100a7d..b062554a2c4a8 100644
--- a/tests/phpunit/tests/option/themeMods.php
+++ b/tests/phpunit/tests/option/themeMods.php
@@ -69,8 +69,8 @@ public function test_theme_mod_remove() {
 	 *
 	 * @covers ::get_theme_mod
 	 */
-	public function test_theme_mod_default_value_with_percent_symbols( $default, $expected ) {
-		$this->assertSame( $expected, get_theme_mod( 'test_name', $default ) );
+	public function test_theme_mod_default_value_with_percent_symbols( $default_value, $expected ) {
+		$this->assertSame( $expected, get_theme_mod( 'test_name', $default_value ) );
 	}
 
 	public function data_theme_mod_default_value_with_percent_symbols() {
diff --git a/tests/phpunit/tests/option/updateOption.php b/tests/phpunit/tests/option/updateOption.php
index 7832a7f8fb4e2..1be8aa0cf8c5a 100644
--- a/tests/phpunit/tests/option/updateOption.php
+++ b/tests/phpunit/tests/option/updateOption.php
@@ -28,7 +28,6 @@ public function test_should_respect_default_option_filter_when_option_does_not_y
 	 * @covers ::get_option
 	 */
 	public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_missing() {
-		global $wpdb;
 		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value' );
 		$this->flush_cache();
@@ -36,9 +35,9 @@ public function test_should_set_autoload_yes_for_nonexistent_option_when_autoloa
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'test_update_option_default' );
-		$after  = $wpdb->num_queries;
+		$after  = get_num_queries();
 
 		$this->assertSame( $before, $after );
 		$this->assertSame( $value, 'value' );
@@ -52,7 +51,6 @@ public function test_should_set_autoload_yes_for_nonexistent_option_when_autoloa
 	 * @covers ::get_option
 	 */
 	public function test_should_set_autoload_yes_for_nonexistent_option_when_autoload_param_is_yes() {
-		global $wpdb;
 		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', 'yes' );
 		$this->flush_cache();
@@ -60,9 +58,9 @@ public function test_should_set_autoload_yes_for_nonexistent_option_when_autoloa
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'test_update_option_default' );
-		$after  = $wpdb->num_queries;
+		$after  = get_num_queries();
 
 		$this->assertSame( $before, $after );
 		$this->assertSame( $value, 'value' );
@@ -76,7 +74,6 @@ public function test_should_set_autoload_yes_for_nonexistent_option_when_autoloa
 	 * @covers ::get_option
 	 */
 	public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_no() {
-		global $wpdb;
 		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', 'no' );
 		$this->flush_cache();
@@ -84,9 +81,9 @@ public function test_should_set_autoload_no_for_nonexistent_option_when_autoload
 		// Populate the alloptions cache, which does not include autoload=no options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'test_update_option_default' );
-		$after  = $wpdb->num_queries;
+		$after  = get_num_queries();
 
 		// Database has been hit.
 		$this->assertSame( $before + 1, $after );
@@ -101,7 +98,6 @@ public function test_should_set_autoload_no_for_nonexistent_option_when_autoload
 	 * @covers ::get_option
 	 */
 	public function test_should_set_autoload_no_for_nonexistent_option_when_autoload_param_is_false() {
-		global $wpdb;
 		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', false );
 		$this->flush_cache();
@@ -109,9 +105,9 @@ public function test_should_set_autoload_no_for_nonexistent_option_when_autoload
 		// Populate the alloptions cache, which does not include autoload=no options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'test_update_option_default' );
-		$after  = $wpdb->num_queries;
+		$after  = get_num_queries();
 
 		// Database has been hit.
 		$this->assertSame( $before + 1, $after );
@@ -126,7 +122,6 @@ public function test_should_set_autoload_no_for_nonexistent_option_when_autoload
 	 * @covers ::get_option
 	 */
 	public function test_autoload_should_be_updated_for_existing_option_when_value_is_changed() {
-		global $wpdb;
 		add_option( 'foo', 'bar', '', 'no' );
 		$updated = update_option( 'foo', 'bar2', true );
 		$this->assertTrue( $updated );
@@ -136,10 +131,10 @@ public function test_autoload_should_be_updated_for_existing_option_when_value_i
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'foo' );
 
-		$this->assertSame( $before, $wpdb->num_queries );
+		$this->assertSame( $before, get_num_queries() );
 		$this->assertSame( $value, 'bar2' );
 	}
 
@@ -151,7 +146,6 @@ public function test_autoload_should_be_updated_for_existing_option_when_value_i
 	 * @covers ::get_option
 	 */
 	public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_unchanged() {
-		global $wpdb;
 		add_option( 'foo', 'bar', '', 'yes' );
 		$updated = update_option( 'foo', 'bar', false );
 		$this->assertFalse( $updated );
@@ -161,11 +155,11 @@ public function test_autoload_should_not_be_updated_for_existing_option_when_val
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'foo' );
 
 		// 'foo' should still be autoload=yes, so we should see no additional querios.
-		$this->assertSame( $before, $wpdb->num_queries );
+		$this->assertSame( $before, get_num_queries() );
 		$this->assertSame( $value, 'bar' );
 	}
 
@@ -177,7 +171,6 @@ public function test_autoload_should_not_be_updated_for_existing_option_when_val
 	 * @covers ::get_option
 	 */
 	public function test_autoload_should_not_be_updated_for_existing_option_when_value_is_changed_but_no_value_of_autoload_is_provided() {
-		global $wpdb;
 		add_option( 'foo', 'bar', '', 'yes' );
 
 		// Don't pass a value for `$autoload`.
@@ -189,11 +182,11 @@ public function test_autoload_should_not_be_updated_for_existing_option_when_val
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		$value  = get_option( 'foo' );
 
 		// 'foo' should still be autoload=yes, so we should see no additional queries.
-		$this->assertSame( $before, $wpdb->num_queries );
+		$this->assertSame( $before, get_num_queries() );
 		$this->assertSame( $value, 'bar2' );
 	}
 
diff --git a/tests/phpunit/tests/option/wpLoadAlloptions.php b/tests/phpunit/tests/option/wpLoadAlloptions.php
index b012e724357cd..329dc64e6e3a7 100644
--- a/tests/phpunit/tests/option/wpLoadAlloptions.php
+++ b/tests/phpunit/tests/option/wpLoadAlloptions.php
@@ -34,10 +34,9 @@ public function test_if_cached_alloptions_is_deleted() {
 	 * @covers ::wp_load_alloptions
 	 */
 	public function test_if_alloptions_are_retrieved_from_cache() {
-		global $wpdb;
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		wp_load_alloptions();
-		$after = $wpdb->num_queries;
+		$after = get_num_queries();
 
 		// Database has not been hit.
 		$this->assertSame( $before, $after );
@@ -49,14 +48,12 @@ public function test_if_alloptions_are_retrieved_from_cache() {
 	 * @covers ::wp_load_alloptions
 	 */
 	public function test_if_alloptions_are_retrieved_from_database() {
-		global $wpdb;
-
 		// Delete the existing cache first.
 		wp_cache_delete( 'alloptions', 'options' );
 
-		$before = $wpdb->num_queries;
+		$before = get_num_queries();
 		wp_load_alloptions();
-		$after = $wpdb->num_queries;
+		$after = get_num_queries();
 
 		// Database has been hit.
 		$this->assertSame( $before + 1, $after );
@@ -120,4 +117,31 @@ public function return_pre_cache_filter( $alloptions ) {
 		$this->alloptions = $alloptions;
 		return $this->alloptions;
 	}
+
+	/**
+	 * Tests that `$alloptions` can be filtered with a custom value, short circuiting `wp_load_alloptions()`.
+	 *
+	 * @ticket 56045
+	 *
+	 * @covers ::wp_load_alloptions
+	 */
+	public function test_filter_pre_wp_load_alloptions_filter_is_called() {
+		$filter = new MockAction();
+
+		add_filter( 'pre_wp_load_alloptions', array( &$filter, 'filter' ) );
+
+		wp_load_alloptions();
+
+		$this->assertSame(
+			1,
+			$filter->get_call_count(),
+			'The filter was not called 1 time.'
+		);
+
+		$this->assertSame(
+			array( 'pre_wp_load_alloptions' ),
+			$filter->get_hook_names(),
+			'The hook name was incorrect.'
+		);
+	}
 }
diff --git a/tests/phpunit/tests/pluggable/signatures.php b/tests/phpunit/tests/pluggable/signatures.php
index a802b03766c04..c63de073d9942 100644
--- a/tests/phpunit/tests/pluggable/signatures.php
+++ b/tests/phpunit/tests/pluggable/signatures.php
@@ -15,21 +15,21 @@ class Tests_Pluggable_Signatures extends WP_UnitTestCase {
 	 *
 	 * @dataProvider get_defined_pluggable_functions
 	 */
-	public function test_pluggable_function_signatures_match( $function ) {
+	public function test_pluggable_function_signatures_match( $function_name ) {
 
 		$signatures = $this->get_pluggable_function_signatures();
 
-		$this->assertTrue( function_exists( $function ) );
-		$this->assertArrayHasKey( $function, $signatures );
+		$this->assertTrue( function_exists( $function_name ) );
+		$this->assertArrayHasKey( $function_name, $signatures );
 
-		$function_ref = new ReflectionFunction( $function );
+		$function_ref = new ReflectionFunction( $function_name );
 		$param_refs   = $function_ref->getParameters();
 
-		$this->assertSame( count( $signatures[ $function ] ), count( $param_refs ) );
+		$this->assertSame( count( $signatures[ $function_name ] ), count( $param_refs ) );
 
 		$i = 0;
 
-		foreach ( $signatures[ $function ] as $name => $value ) {
+		foreach ( $signatures[ $function_name ] as $name => $value ) {
 
 			$param_ref = $param_refs[ $i ];
 			$msg       = 'Parameter: ' . $param_ref->getName();
@@ -76,7 +76,7 @@ public function test_all_pluggable_functions_exist() {
 	 */
 	public function get_defined_pluggable_functions() {
 
-		require_once ABSPATH . '/wp-admin/includes/upgrade.php';
+		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
 		$test_functions = array(
 			'install_network',
@@ -103,7 +103,7 @@ public function get_defined_pluggable_functions() {
 		}
 
 		foreach ( $test_files as $file ) {
-			preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . '/' . $file ), $functions );
+			preg_match_all( '#^\t?function (\w+)#m', file_get_contents( ABSPATH . $file ), $functions );
 
 			foreach ( $functions[1] as $function ) {
 				$data[] = array(
@@ -173,7 +173,7 @@ public function get_pluggable_function_signatures() {
 			'check_ajax_referer'              => array(
 				'action'    => -1,
 				'query_arg' => false,
-				'die'       => true,
+				'stop'      => true,
 			),
 			'wp_redirect'                     => array(
 				'location',
@@ -189,7 +189,7 @@ public function get_pluggable_function_signatures() {
 			),
 			'wp_validate_redirect'            => array(
 				'location',
-				'default' => '',
+				'fallback_url' => '',
 			),
 			'wp_notify_postauthor'            => array(
 				'comment_id',
@@ -231,10 +231,10 @@ public function get_pluggable_function_signatures() {
 			'wp_set_password'                 => array( 'password', 'user_id' ),
 			'get_avatar'                      => array(
 				'id_or_email',
-				'size'    => 96,
-				'default' => '',
-				'alt'     => '',
-				'args'    => null,
+				'size'          => 96,
+				'default_value' => '',
+				'alt'           => '',
+				'args'          => null,
 			),
 			'wp_text_diff'                    => array(
 				'left_string',
diff --git a/tests/phpunit/tests/pluggable/wpMail.php b/tests/phpunit/tests/pluggable/wpMail.php
index bbe27bd88e65b..f7af48bc067e8 100644
--- a/tests/phpunit/tests/pluggable/wpMail.php
+++ b/tests/phpunit/tests/pluggable/wpMail.php
@@ -173,7 +173,7 @@ public function test_wp_mail_return_value() {
 		$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body' ) );
 
 		// Non-fatal errors.
-		$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . '/non-existent-file.html' ) );
+		$this->assertTrue( wp_mail( 'valid@address.com', 'subject', 'body', "Cc: invalid-address\nBcc: @invalid.address", ABSPATH . 'non-existent-file.html' ) );
 
 		// Fatal errors.
 		$this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );
@@ -454,6 +454,62 @@ public function test_phpmailer_exception_thrown() {
 		$this->assertSame( $expected_error_data, $call_args[0]->get_error_data() );
 	}
 
+	/**
+	 * Test that attachment file names are derived from array values when their
+	 * associative array keys are numeric.
+	 *
+	 * @ticket 28407
+	 */
+	public function test_wp_mail_sends_attachments_with_original_name() {
+		wp_mail(
+			'user@example.org',
+			'Subject',
+			'Hello World',
+			'',
+			array(
+				DIR_TESTDATA . '/images/canola.jpg',
+				DIR_TESTDATA . '/images/waffles.jpg',
+			)
+		);
+
+		/** @var PHPMailer $mailer */
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$attachments = $mailer->getAttachments();
+
+		$this->assertTrue( $mailer->attachmentExists(), 'There are no attachments.' );
+		$this->assertSame( $attachments[0][1], $attachments[0][2], 'The first attachment name did not match.' );
+		$this->assertSame( $attachments[1][1], $attachments[1][2], 'The second attachment name did not match.' );
+	}
+
+	/**
+	 * Test that attachment file names are derived from array keys when they
+	 * are non-empty strings.
+	 *
+	 * @ticket 28407
+	 */
+	public function test_wp_mail_sends_attachments_with_custom_name() {
+		wp_mail(
+			'user@example.org',
+			'Subject',
+			'Hello World',
+			'',
+			array(
+				'alonac.jpg'  => DIR_TESTDATA . '/images/canola.jpg',
+				'selffaw.jpg' => DIR_TESTDATA . '/images/waffles.jpg',
+			)
+		);
+
+		/** @var PHPMailer $mailer */
+		$mailer = tests_retrieve_phpmailer_instance();
+
+		$attachments = $mailer->getAttachments();
+
+		$this->assertTrue( $mailer->attachmentExists(), 'There are no attachments.' );
+		$this->assertSame( 'alonac.jpg', $attachments[0][2], 'The first attachment name did not match.' );
+		$this->assertSame( 'selffaw.jpg', $attachments[1][2], 'The second attachment name did not match.' );
+	}
+
 	/**
 	 * @ticket 50720
 	 */
@@ -482,7 +538,7 @@ public function test_wp_mail_can_be_shortcircuited() {
 	 * Tests that AltBody is reset between each wp_mail call.
 	 */
 	public function test_wp_mail_resets_properties() {
-		$wp_mail_set_text_message = function ( $phpmailer ) {
+		$wp_mail_set_text_message = static function ( $phpmailer ) {
 			$phpmailer->AltBody = 'user1';
 		};
 
diff --git a/tests/phpunit/tests/pluggable/wpRand.php b/tests/phpunit/tests/pluggable/wpRand.php
index 9fcfa8bde197e..a6bcf347f85f3 100644
--- a/tests/phpunit/tests/pluggable/wpRand.php
+++ b/tests/phpunit/tests/pluggable/wpRand.php
@@ -20,7 +20,7 @@ public function test_wp_rand_should_return_a_non_negative_integer( $min, $max )
 		$this->assertGreaterThanOrEqual(
 			0,
 			wp_rand( $min, $max ),
-			'The value was not greater than or equal 0'
+			'The value was not greater than or equal to 0'
 		);
 
 		$this->assertLessThan(
diff --git a/tests/phpunit/tests/pomo/mo.php b/tests/phpunit/tests/pomo/mo.php
index 2269e3d8261b2..e4ce6c4b16d29 100644
--- a/tests/phpunit/tests/pomo/mo.php
+++ b/tests/phpunit/tests/pomo/mo.php
@@ -145,7 +145,7 @@ public function test_export_mo_file() {
 
 	public function test_export_should_not_include_empty_translations() {
 		$entries = array();
-		$mo      = new MO;
+		$mo      = new MO();
 		$mo->add_entry(
 			array(
 				'singular'     => 'baba',
diff --git a/tests/phpunit/tests/pomo/noopTranslations.php b/tests/phpunit/tests/pomo/noopTranslations.php
index 3fcfed6b571e1..44f46c1880f43 100644
--- a/tests/phpunit/tests/pomo/noopTranslations.php
+++ b/tests/phpunit/tests/pomo/noopTranslations.php
@@ -28,7 +28,7 @@ class Tests_POMO_NOOPTranslations extends WP_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
-		$this->noop         = new NOOP_Translations;
+		$this->noop         = new NOOP_Translations();
 		$this->entry        = new Translation_Entry( array( 'singular' => 'baba' ) );
 		$this->plural_entry = new Translation_Entry(
 			array(
diff --git a/tests/phpunit/tests/pomo/pluralForms.php b/tests/phpunit/tests/pomo/pluralForms.php
index 0d5cc192a5d0e..0343302c689ef 100644
--- a/tests/phpunit/tests/pomo/pluralForms.php
+++ b/tests/phpunit/tests/pomo/pluralForms.php
@@ -39,15 +39,38 @@ protected static function parenthesize_plural_expression( $expression ) {
 
 	/**
 	 * @ticket 41562
+	 * @dataProvider data_locales
 	 * @group external-http
 	 */
-	public function test_locales_provider() {
-		$locales = self::locales_provider();
+	public function test_regression( $lang, $nplurals, $expression ) {
+		require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
+
+		$parenthesized = self::parenthesize_plural_expression( $expression );
+		$old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
+		$plural_forms  = new Plural_Forms( $expression );
+
+		$generated_old = array();
+		$generated_new = array();
+
+		foreach ( range( 0, 200 ) as $i ) {
+			$generated_old[] = $old_style( $i );
+			$generated_new[] = $plural_forms->get( $i );
+		}
+
+		$this->assertSame( $generated_old, $generated_new );
+	}
+
+	/**
+	 * @ticket 41562
+	 * @group external-http
+	 */
+	public function test_locales_file_not_empty() {
+		$locales = self::data_locales();
 
 		$this->assertNotEmpty( $locales, 'Unable to retrieve GP_Locales file' );
 	}
 
-	public static function locales_provider() {
+	public static function data_locales() {
 		if ( ! class_exists( 'GP_Locales' ) ) {
 			$filename = download_url( 'https://raw.githubusercontent.com/GlotPress/GlotPress-WP/develop/locales/locales.php' );
 			if ( is_wp_error( $filename ) ) {
@@ -70,28 +93,19 @@ public static function locales_provider() {
 
 	/**
 	 * @ticket 41562
-	 * @dataProvider locales_provider
-	 * @group external-http
+	 * @dataProvider data_simple
 	 */
-	public function test_regression( $lang, $nplurals, $expression ) {
-		require_once dirname( dirname( __DIR__ ) ) . '/includes/plural-form-function.php';
-
-		$parenthesized = self::parenthesize_plural_expression( $expression );
-		$old_style     = tests_make_plural_form_function( $nplurals, $parenthesized );
-		$plural_forms  = new Plural_Forms( $expression );
-
-		$generated_old = array();
-		$generated_new = array();
-
-		foreach ( range( 0, 200 ) as $i ) {
-			$generated_old[] = $old_style( $i );
-			$generated_new[] = $plural_forms->get( $i );
+	public function test_simple( $expression, $expected ) {
+		$plural_forms = new Plural_Forms( $expression );
+		$actual       = array();
+		foreach ( array_keys( $expected ) as $num ) {
+			$actual[ $num ] = $plural_forms->get( $num );
 		}
 
-		$this->assertSame( $generated_old, $generated_new );
+		$this->assertSame( $expected, $actual );
 	}
 
-	public static function simple_provider() {
+	public static function data_simple() {
 		return array(
 			array(
 				// Simple equivalence.
@@ -143,17 +157,19 @@ public static function simple_provider() {
 	}
 
 	/**
+	 * Ensures that an exception is thrown when an invalid plural form is encountered.
+	 *
 	 * @ticket 41562
-	 * @dataProvider simple_provider
+	 * @dataProvider data_exceptions
 	 */
-	public function test_simple( $expression, $expected ) {
+	public function test_exceptions( $expression, $expected_message, $call_get ) {
+		$this->expectException( 'Exception' );
+		$this->expectExceptionMessage( $expected_message );
+
 		$plural_forms = new Plural_Forms( $expression );
-		$actual       = array();
-		foreach ( array_keys( $expected ) as $num ) {
-			$actual[ $num ] = $plural_forms->get( $num );
+		if ( $call_get ) {
+			$plural_forms->get( 1 );
 		}
-
-		$this->assertSame( $expected, $actual );
 	}
 
 	public function data_exceptions() {
@@ -196,22 +212,6 @@ public function data_exceptions() {
 		);
 	}
 
-	/**
-	 * Ensures that an exception is thrown when an invalid plural form is encountered.
-	 *
-	 * @ticket 41562
-	 * @dataProvider data_exceptions
-	 */
-	public function test_exceptions( $expression, $expected_message, $call_get ) {
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( $expected_message );
-
-		$plural_forms = new Plural_Forms( $expression );
-		if ( $call_get ) {
-			$plural_forms->get( 1 );
-		}
-	}
-
 	/**
 	 * @ticket 41562
 	 */
diff --git a/tests/phpunit/tests/pomo/po.php b/tests/phpunit/tests/pomo/po.php
index d7652f27e67e2..8c58099b69505 100644
--- a/tests/phpunit/tests/pomo/po.php
+++ b/tests/phpunit/tests/pomo/po.php
@@ -48,7 +48,7 @@ class Tests_POMO_PO extends WP_UnitTestCase {
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
-		require_once ABSPATH . '/wp-includes/pomo/po.php';
+		require_once ABSPATH . 'wp-includes/pomo/po.php';
 	}
 
 	public function test_prepend_each_line() {
diff --git a/tests/phpunit/tests/pomo/translations.php b/tests/phpunit/tests/pomo/translations.php
index 1e5cc2d03746c..0d2a3383b0f77 100644
--- a/tests/phpunit/tests/pomo/translations.php
+++ b/tests/phpunit/tests/pomo/translations.php
@@ -121,7 +121,7 @@ public function test_digit_and_merge() {
 		$domain        = new Translations();
 		$domain->add_entry( $entry_digit_1 );
 		$domain->add_entry( $entry_digit_2 );
-		$dummy_translation = new Translations;
+		$dummy_translation = new Translations();
 		$this->assertSame( '1', $domain->translate( '1' ) );
 		$domain->merge_with( $dummy_translation );
 		$this->assertSame( '1', $domain->translate( '1' ) );
diff --git a/tests/phpunit/tests/post.php b/tests/phpunit/tests/post.php
index 6f07ca859364c..548c5eb2cabf8 100644
--- a/tests/phpunit/tests/post.php
+++ b/tests/phpunit/tests/post.php
@@ -158,7 +158,7 @@ public function test_wp_count_posts() {
 
 		_unregister_post_type( $post_type );
 		$count = wp_count_posts( $post_type, 'readable' );
-		$this->assertEquals( new stdClass, $count );
+		$this->assertEquals( new stdClass(), $count );
 	}
 
 	public function test_wp_count_posts_filtered() {
@@ -236,7 +236,7 @@ public function test_wp_count_posts_status_changes_visible() {
 		register_post_status( 'test' );
 
 		$counts = wp_count_posts();
-		$this->assertObjectHasAttribute( 'test', $counts );
+		$this->assertObjectHasProperty( 'test', $counts );
 		$this->assertSame( 0, $counts->test );
 	}
 
@@ -285,7 +285,7 @@ public function test_utf8mb3_post_saves_with_emoji() {
 			$this->markTestSkipped( 'This test is only useful with the utf8 character set.' );
 		}
 
-		require_once ABSPATH . '/wp-admin/includes/post.php';
+		require_once ABSPATH . 'wp-admin/includes/post.php';
 
 		$post_id = self::factory()->post->create();
 
@@ -467,7 +467,7 @@ public function test_pre_wp_unique_post_slug_filter() {
 		remove_filter( 'pre_wp_unique_post_slug', array( $this, 'filter_pre_wp_unique_post_slug' ), 10, 6 );
 	}
 
-	public function filter_pre_wp_unique_post_slug( $default, $slug, $post_ID, $post_status, $post_type, $post_parent ) {
+	public function filter_pre_wp_unique_post_slug( $override_slug, $slug, $post_id, $post_status, $post_type, $post_parent ) {
 		return 'override-slug-' . $post_type;
 	}
 
@@ -601,7 +601,7 @@ public function data_stick_post_with_unexpected_sticky_posts_option() {
 			'1 int'     => array( 1 ),
 			'null'      => array( null ),
 			'true'      => array( true ),
-			'an object' => array( new stdClass ),
+			'an object' => array( new stdClass() ),
 		);
 	}
 
diff --git a/tests/phpunit/tests/post/getPageByPath.php b/tests/phpunit/tests/post/getPageByPath.php
index 13e6a3cfe2411..5d26b88d2de19 100644
--- a/tests/phpunit/tests/post/getPageByPath.php
+++ b/tests/phpunit/tests/post/getPageByPath.php
@@ -103,6 +103,101 @@ public function test_should_match_nested_page() {
 		$this->assertSame( $p3, $found->ID );
 	}
 
+	/**
+	 * @ticket 56689
+	 *
+	 * @covers ::get_page_by_path
+	 */
+	public function test_should_match_nested_page_query_count() {
+		$p1 = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+				'post_name' => 'foo',
+			)
+		);
+
+		$p2 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_name'   => 'bar',
+				'post_parent' => $p1,
+			)
+		);
+
+		$p3 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_name'   => 'baz',
+				'post_parent' => $p2,
+			)
+		);
+
+		$queries_before = get_num_queries();
+		$found          = get_page_by_path( 'foo/bar/baz' );
+		$queries_after  = get_num_queries();
+		$cached_post    = wp_cache_get( $p1, 'posts' );
+
+		$this->assertSame( 1, $queries_after - $queries_before, 'Only one query should run' );
+		$this->assertSame( $p3, $found->ID, 'Check to see if the result is correct' );
+		$this->assertIsObject( $cached_post, 'The cached post is not an object' );
+	}
+
+	/**
+	 * @ticket 56689
+	 *
+	 * @covers ::get_page_by_path
+	 */
+	public function test_should_match_nested_page_query_count_status() {
+		$p1 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_name'   => 'foo',
+				'post_status' => 'draft',
+			)
+		);
+
+		$p2 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_name'   => 'bar',
+				'post_parent' => $p1,
+			)
+		);
+
+		$p3 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_name'   => 'baz',
+				'post_parent' => $p2,
+			)
+		);
+
+		$queries_before = get_num_queries();
+		$found          = get_page_by_path( 'foo/bar/baz' );
+		$queries_after  = get_num_queries();
+		$cached_post    = wp_cache_get( $p1, 'posts' );
+
+		$this->assertSame( 1, $queries_after - $queries_before, 'Only one query should run' );
+		$this->assertSame( $p3, $found->ID, 'Check to see if the result is correct' );
+		$this->assertIsObject( $cached_post, 'The cached post is not an object' );
+	}
+
+	/**
+	 * @ticket 56689
+	 *
+	 * @covers ::get_page_by_path
+	 */
+	public function test_should_return_null_for_invalid_path() {
+		$queries_before = get_num_queries();
+		$get_1          = get_page_by_path( 'should/return/null/for/an/invalid/path' );
+		$get_2          = get_page_by_path( 'should/return/null/for/an/invalid/path' );
+		$queries_after  = get_num_queries();
+
+		$this->assertNull( $get_1, 'Invalid path should return null.' );
+		$this->assertSame( 1, $queries_after - $queries_before, 'Only one query should run.' );
+		$this->assertSame( $get_1, $get_2, 'The cached result should be the same as the uncached result.' );
+	}
+
 	public function test_should_not_make_partial_match() {
 		$p1 = self::factory()->post->create(
 			array(
@@ -165,8 +260,6 @@ public function test_should_not_match_parts_out_of_order() {
 	 * @ticket 36711
 	 */
 	public function test_should_hit_cache() {
-		global $wpdb;
-
 		$page = self::factory()->post->create(
 			array(
 				'post_type' => 'page',
@@ -178,35 +271,33 @@ public function test_should_hit_cache() {
 		$found = get_page_by_path( 'foo' );
 		$this->assertSame( $page, $found->ID );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_page_by_path( 'foo' );
 		$this->assertSame( $page, $found->ID );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 36711
 	 */
 	public function test_bad_path_should_be_cached() {
-		global $wpdb;
-
 		// Prime cache.
 		$found = get_page_by_path( 'foo' );
 		$this->assertNull( $found );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_page_by_path( 'foo' );
 		$this->assertNull( $found );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 36711
 	 */
 	public function test_bad_path_served_from_cache_should_not_fall_back_on_current_post() {
-		global $wpdb, $post;
+		global $post;
 
 		// Fake the global.
 		$post = self::factory()->post->create_and_get();
@@ -215,11 +306,11 @@ public function test_bad_path_served_from_cache_should_not_fall_back_on_current_
 		$found = get_page_by_path( 'foo' );
 		$this->assertNull( $found );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_page_by_path( 'foo' );
 		$this->assertNull( $found );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		unset( $post );
 	}
@@ -228,8 +319,6 @@ public function test_bad_path_served_from_cache_should_not_fall_back_on_current_
 	 * @ticket 36711
 	 */
 	public function test_cache_should_not_match_post_in_different_post_type_with_same_path() {
-		global $wpdb;
-
 		register_post_type( 'wptests_pt' );
 
 		$p1 = self::factory()->post->create(
@@ -250,20 +339,18 @@ public function test_cache_should_not_match_post_in_different_post_type_with_sam
 		$found = get_page_by_path( 'foo' );
 		$this->assertSame( $p1, $found->ID );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_page_by_path( 'foo', OBJECT, 'wptests_pt' );
 		$this->assertSame( $p2, $found->ID );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 36711
 	 */
 	public function test_cache_should_be_invalidated_when_post_name_is_edited() {
-		global $wpdb;
-
 		$page = self::factory()->post->create(
 			array(
 				'post_type' => 'page',
@@ -282,12 +369,12 @@ public function test_cache_should_be_invalidated_when_post_name_is_edited() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_page_by_path( 'bar' );
 		$this->assertSame( $page, $found->ID );
 		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/post/getPageByTitle.php b/tests/phpunit/tests/post/getPageByTitle.php
index 1c94987d5ff20..a85d8f42c5eeb 100644
--- a/tests/phpunit/tests/post/getPageByTitle.php
+++ b/tests/phpunit/tests/post/getPageByTitle.php
@@ -2,339 +2,20 @@
 
 /**
  * @group post
+ *
  * @covers ::get_page_by_title
  */
 class Tests_Post_GetPageByTitle extends WP_UnitTestCase {
 
 	/**
-	 * Generate shared fixtures.
+	 * Tests that `get_page_by_title()` has been deprecated.
 	 *
-	 * These are not used in the tests but are rather used to populate the
-	 * posts table and ensure that the tests return the correct post object
-	 * by design rather than through chance.
-	 */
-	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-		// Fill the database with some pages.
-		$factory->post->create_many(
-			2,
-			array(
-				'post_type' => 'page',
-			)
-		);
-
-		// Fill the database with some attachments.
-		$factory->post->create_many(
-			2,
-			array(
-				'post_type' => 'attachment',
-			)
-		);
-
-		// Fill the database with some test post types.
-		register_post_type( 'wptests_pt' );
-		$factory->post->create_many(
-			2,
-			array(
-				'post_type' => 'wptests_pt',
-			)
-		);
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_get_page_by_title_priority() {
-		$attachment = self::factory()->post->create_and_get(
-			array(
-				'post_title' => 'some-other-page',
-				'post_type'  => 'attachment',
-			)
-		);
-		$page       = self::factory()->post->create_and_get(
-			array(
-				'post_title' => 'some-page',
-				'post_type'  => 'page',
-			)
-		);
-
-		$this->assertEquals( $page, get_page_by_title( 'some-page' ), 'should return a post of the requested type before returning an attachment.' );
-
-		$this->assertEquals( $attachment, get_page_by_title( 'some-other-page', OBJECT, 'attachment' ), "will still select an attachment when a post of the requested type doesn't exist." );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_should_match_top_level_page() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		$found = get_page_by_title( 'foo' );
-
-		$this->assertSame( $page, $found->ID );
-	}
-
-	/**
-	 * @ticket 36905
-	 * @ticket 56609
-	 */
-	public function test_should_be_case_insensitive_match() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'Foo',
-			)
-		);
-
-		$found = get_page_by_title( 'foo' );
-
-		$this->assertSame( $page, $found->ID );
-	}
-
-	/**
-	 * Test the oldest published post is matched first.
+	 * @ticket 57041
 	 *
-	 * Per the docs: in case of more than one post having the same title,
-	 * it will check the oldest publication date, not the smallest ID.
-	 *
-	 * @ticket 36905
-	 * @ticket 56609
-	 */
-	public function test_should_match_oldest_published_date_when_titles_match() {
-		self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		$old_page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-				'post_date'  => '1984-01-11 05:00:00',
-			)
-		);
-
-		$found = get_page_by_title( 'foo' );
-
-		$this->assertSame( $old_page, $found->ID );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_inherit() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'   => 'page',
-				'post_title'  => 'foo',
-				'post_status' => 'inherit',
-			)
-		);
-
-		$found = get_page_by_title( 'foo' );
-
-		$this->assertSame( $page, $found->ID );
-	}
-
-	/**
-	 * @ticket 36905
+	 * @expectedDeprecated get_page_by_title
 	 */
-	public function test_should_obey_post_type() {
-		register_post_type( 'wptests_pt' );
-
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'wptests_pt',
-				'post_title' => 'foo',
-			)
-		);
-
-		$found = get_page_by_title( 'foo' );
-		$this->assertNull( $found, 'Should return null, as post type does not match' );
-
-		$found = get_page_by_title( 'foo', OBJECT, 'wptests_pt' );
-		$this->assertSame( $page, $found->ID, 'Should return find post, as post type does do match' );
+	public function test_get_page_by_title_should_be_deprecated() {
+		$this->assertNull( get_page_by_title( '#57041 Page' ) );
 	}
 
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_should_hit_cache() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		// Prime cache.
-		$found = get_page_by_title( 'foo' );
-		$this->assertSame( $page, $found->ID, 'Should return find page.' );
-
-		$num_queries = get_num_queries();
-
-		$found = get_page_by_title( 'foo' );
-		$this->assertSame( $page, $found->ID, 'Should return find page on second run.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_bad_title_should_be_cached() {
-		// Prime cache.
-		$found = get_page_by_title( 'foo' );
-		$this->assertNull( $found, 'Should return not find a page.' );
-
-		$num_queries = get_num_queries();
-
-		$found = get_page_by_title( 'foo' );
-		$this->assertNull( $found, 'Should return not find a page on second run.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_bad_title_served_from_cache_should_not_fall_back_on_current_post() {
-		global $post;
-
-		// Fake the global.
-		$post = self::factory()->post->create_and_get();
-
-		// Prime cache.
-		$found = get_page_by_title( 'foo' );
-		$this->assertNull( $found, 'Should return not find a page.' );
-
-		$num_queries = get_num_queries();
-
-		$found = get_page_by_title( 'foo' );
-		$this->assertNull( $found, 'Should return not find a page on second run.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_cache_should_not_match_post_in_different_post_type_with_same_title() {
-		register_post_type( 'wptests_pt' );
-
-		$p1 = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		$p2 = self::factory()->post->create(
-			array(
-				'post_type'  => 'wptests_pt',
-				'post_title' => 'foo',
-			)
-		);
-
-		// Prime cache for the page.
-		$found = get_page_by_title( 'foo' );
-		$this->assertSame( $p1, $found->ID, 'Should find a page.' );
-
-		$num_queries = get_num_queries();
-
-		$found = get_page_by_title( 'foo', OBJECT, 'wptests_pt' );
-		$this->assertSame( $p2, $found->ID, 'Should find a post with post type wptests_pt.' );
-		++$num_queries;
-		$this->assertSame( $num_queries, get_num_queries(), 'Should result in another database query.' );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_cache_should_be_invalidated_when_post_title_is_edited() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		// Prime cache.
-		$found = get_page_by_title( 'foo' );
-		$this->assertSame( $page, $found->ID, 'Should find a page.' );
-
-		wp_update_post(
-			array(
-				'ID'         => $page,
-				'post_title' => 'bar',
-			)
-		);
-
-		$num_queries = get_num_queries();
-
-		$found = get_page_by_title( 'bar' );
-		$this->assertSame( $page, $found->ID, 'Should find a page with the new title.' );
-		++$num_queries;
-		$this->assertSame( $num_queries, get_num_queries(), 'Should result in another database query.' );
-	}
-
-	/**
-	 * @ticket 36905
-	 */
-	public function test_output_param_should_be_obeyed_for_cached_value() {
-		$page = self::factory()->post->create(
-			array(
-				'post_type'  => 'page',
-				'post_title' => 'foo',
-			)
-		);
-
-		// Prime cache.
-		$found = get_page_by_title( 'foo' );
-
-		$num_queries = get_num_queries();
-		$this->assertSame( $page, $found->ID, 'Should find a page.' );
-
-		$object = get_page_by_title( 'foo', OBJECT );
-		$this->assertIsObject( $object, 'Should be an object.' );
-		$this->assertSame( $page, $object->ID, 'Should match post id.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-
-		$array_n = get_page_by_title( 'foo', ARRAY_N );
-		++$num_queries; // Add one database query for loading of post metadata.
-		$this->assertIsArray( $array_n, 'Should be numbric array.' );
-		$this->assertSame( $page, $array_n[0], 'Should match post id.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-
-		$array_a = get_page_by_title( 'foo', ARRAY_A );
-		$this->assertIsArray( $array_a, 'Should be associative array.' );
-		$this->assertSame( $page, $array_a['ID'], 'Should match post id.' );
-		$this->assertSame( $num_queries, get_num_queries(), 'Should not result in another database query.' );
-	}
-
-	/**
-	 * Ensure get_page_by_title() only runs the query once.
-	 *
-	 * @ticket 56721
-	 * @covers ::get_page_by_title
-	 */
-	public function test_should_not_run_query_more_than_once() {
-		$page = self::factory()->post->create_and_get(
-			array(
-				'post_title' => 'some-page',
-				'post_type'  => 'page',
-			)
-		);
-
-		// Use the `pre_get_posts` hook to ensure the query is only run once.
-		$ma = new MockAction();
-		add_action( 'pre_get_posts', array( $ma, 'action' ) );
-
-		get_page_by_title( 'some-page' );
-		$this->assertSame( 1, $ma->get_call_count(), 'Query does not run exactly once.' );
-	}
 }
diff --git a/tests/phpunit/tests/post/getPageTemplateSlug.php b/tests/phpunit/tests/post/getPageTemplateSlug.php
new file mode 100644
index 0000000000000..5a735350f5d7f
--- /dev/null
+++ b/tests/phpunit/tests/post/getPageTemplateSlug.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @group post
+ * @group template
+ *
+ * @covers ::get_page_template_slug
+ */
+class Tests_Post_GetPageTemplateSlug extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 31389
+	 */
+	public function test_get_page_template_slug_by_id() {
+		$page_id = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$this->assertSame( '', get_page_template_slug( $page_id ) );
+
+		update_post_meta( $page_id, '_wp_page_template', 'default' );
+		$this->assertSame( '', get_page_template_slug( $page_id ) );
+
+		update_post_meta( $page_id, '_wp_page_template', 'example.php' );
+		$this->assertSame( 'example.php', get_page_template_slug( $page_id ) );
+	}
+
+	/**
+	 * @ticket 31389
+	 */
+	public function test_get_page_template_slug_from_loop() {
+		$page_id = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		update_post_meta( $page_id, '_wp_page_template', 'example.php' );
+		$this->go_to( get_permalink( $page_id ) );
+
+		$this->assertSame( 'example.php', get_page_template_slug() );
+	}
+
+	/**
+	 * @ticket 31389
+	 * @ticket 18375
+	 */
+	public function test_get_page_template_slug_non_page() {
+		$post_id = self::factory()->post->create();
+
+		$this->assertSame( '', get_page_template_slug( $post_id ) );
+
+		update_post_meta( $post_id, '_wp_page_template', 'default' );
+
+		$this->assertSame( '', get_page_template_slug( $post_id ) );
+
+		update_post_meta( $post_id, '_wp_page_template', 'example.php' );
+		$this->assertSame( 'example.php', get_page_template_slug( $post_id ) );
+	}
+
+	/**
+	 * @ticket 18375
+	 */
+	public function test_get_page_template_slug_non_page_from_loop() {
+		$post_id = self::factory()->post->create();
+
+		update_post_meta( $post_id, '_wp_page_template', 'example.php' );
+
+		$this->go_to( get_permalink( $post_id ) );
+
+		$this->assertSame( 'example.php', get_page_template_slug() );
+	}
+}
diff --git a/tests/phpunit/tests/post/getPages.php b/tests/phpunit/tests/post/getPages.php
index 804f4b431bdff..92de3356fa5c6 100644
--- a/tests/phpunit/tests/post/getPages.php
+++ b/tests/phpunit/tests/post/getPages.php
@@ -2,15 +2,14 @@
 
 /**
  * @group post
+ *
+ * @covers ::get_pages
  */
-
 class Tests_Post_GetPages extends WP_UnitTestCase {
 	/**
 	 * @ticket 23167
 	 */
 	public function test_get_pages_cache() {
-		global $wpdb;
-
 		self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
 		wp_cache_delete( 'last_changed', 'posts' );
 		$this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
@@ -19,7 +18,7 @@ public function test_get_pages_cache() {
 		$this->assertCount( 3, $pages );
 		$time1 = wp_cache_get( 'last_changed', 'posts' );
 		$this->assertNotEmpty( $time1 );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
@@ -28,7 +27,7 @@ public function test_get_pages_cache() {
 		$pages = get_pages();
 		$this->assertCount( 3, $pages );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
@@ -38,18 +37,18 @@ public function test_get_pages_cache() {
 		$pages = get_pages( array( 'number' => 2 ) );
 		$this->assertCount( 2, $pages );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Again. num_queries and last_changed should remain the same.
 		$pages = get_pages( array( 'number' => 2 ) );
 		$this->assertCount( 2, $pages );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
@@ -58,7 +57,7 @@ public function test_get_pages_cache() {
 		$pages = get_pages();
 		$this->assertCount( 3, $pages );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
@@ -66,14 +65,14 @@ public function test_get_pages_cache() {
 		// Force last_changed to increment.
 		clean_post_cache( $pages[0]->ID );
 		$this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'posts' ) );
-
-		$num_queries = $wpdb->num_queries;
+		get_post( $pages[0]->ID );
+		$num_queries = get_num_queries();
 
 		// last_changed bumped so num_queries should increment.
 		$pages = get_pages( array( 'number' => 2 ) );
 		$this->assertCount( 2, $pages );
 		$this->assertSame( $time2, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
@@ -86,23 +85,43 @@ public function test_get_pages_cache() {
 		$new_changed_float = $this->_microtime_to_float( wp_cache_get( 'last_changed', 'posts' ) );
 		$this->assertGreaterThan( $old_changed_float, $new_changed_float );
 
-		$num_queries  = $wpdb->num_queries;
+		$num_queries  = get_num_queries();
 		$last_changed = wp_cache_get( 'last_changed', 'posts' );
 
 		// num_queries should bump after wp_delete_post() bumps last_changed.
 		$pages = get_pages();
 		$this->assertCount( 2, $pages );
 		$this->assertSame( $last_changed, wp_cache_get( 'last_changed', 'posts' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		foreach ( $pages as $page ) {
 			$this->assertInstanceOf( 'WP_Post', $page );
 		}
 	}
 
+	/**
+	 * @ticket 43514
+	 */
+	public function test_get_pages_cache_empty() {
+		wp_cache_delete( 'last_changed', 'posts' );
+		$this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
+
+		$num_queries = get_num_queries();
+
+		$pages = get_pages(); // Database gets queried.
+
+		$this->assertSame( $num_queries + 1, get_num_queries() );
+
+		$num_queries = get_num_queries();
+
+		$pages = get_pages(); // Database should not get queried.
+
+		$this->assertSame( $num_queries, get_num_queries() );
+	}
+
 	/**
 	 * @ticket 40669
 	 */
-	public function test_cache_should_be_invalidated_by_add_post_meta() {
+	public function test_get_pages_cache_should_be_invalidated_by_add_post_meta() {
 		$posts = self::factory()->post->create_many(
 			2,
 			array(
@@ -138,7 +157,7 @@ public function test_cache_should_be_invalidated_by_add_post_meta() {
 	/**
 	 * @ticket 40669
 	 */
-	public function test_cache_should_be_invalidated_by_update_post_meta() {
+	public function test_get_pages_cache_should_be_invalidated_by_update_post_meta() {
 		$posts = self::factory()->post->create_many(
 			2,
 			array(
@@ -175,7 +194,7 @@ public function test_cache_should_be_invalidated_by_update_post_meta() {
 	/**
 	 * @ticket 40669
 	 */
-	public function test_cache_should_be_invalidated_by_delete_post_meta() {
+	public function test_get_pages_cache_should_be_invalidated_by_delete_post_meta() {
 		$posts = self::factory()->post->create_many(
 			2,
 			array(
@@ -212,7 +231,7 @@ public function test_cache_should_be_invalidated_by_delete_post_meta() {
 	/**
 	 * @ticket 40669
 	 */
-	public function test_cache_should_be_invalidated_by_delete_post_meta_by_key() {
+	public function test_get_pages_cache_should_be_invalidated_by_delete_post_meta_by_key() {
 		$posts = self::factory()->post->create_many(
 			2,
 			array(
@@ -306,6 +325,288 @@ public function test_get_pages_include_exclude() {
 		$this->assertSame( $inc, $exc_result );
 	}
 
+	/**
+	 * @ticket 12821
+	 * @covers ::get_pages
+	 */
+	public function test_get_pages_test_filter() {
+		register_post_type( 'wptests_pt', array( 'hierarchical' => true ) );
+
+		$posts              = self::factory()->post->create_many(
+			2,
+			array(
+				'post_type' => 'wptests_pt',
+			)
+		);
+		$query_args_values  = array();
+		$parsed_args_values = array();
+
+		// Filter the query to return the wptests_pt post type.
+		add_filter(
+			'get_pages_query_args',
+			static function( $query_args, $parsed_args ) use ( &$query_args_values, &$parsed_args_values ) {
+				$query_args['post_type'] = 'wptests_pt';
+				$query_args_values       = $query_args;
+				$parsed_args_values      = $parsed_args;
+				return $query_args;
+			},
+			10,
+			2
+		);
+
+		$pages    = get_pages();
+		$page_ids = wp_list_pluck( $pages, 'ID' );
+		$this->assertSameSets( $posts, $page_ids, 'The return post ids should match the post type wptests_pt.' );
+
+		$query_args = array(
+			'orderby'                => array( 'post_title' => 'ASC' ),
+			'order'                  => 'ASC',
+			'post__not_in'           => array(),
+			'meta_key'               => '',
+			'meta_value'             => '',
+			'posts_per_page'         => -1,
+			'offset'                 => 0,
+			'post_type'              => 'wptests_pt',
+			'post_status'            => array( 'publish' ),
+			'update_post_term_cache' => false,
+			'update_post_meta_cache' => false,
+			'ignore_sticky_posts'    => true,
+			'no_found_rows'          => true,
+		);
+
+		$this->assertSameSets( $query_args, $query_args_values, 'Query arguments should match expected values' );
+
+		$parsed_args = array(
+			'child_of'     => 0,
+			'sort_order'   => 'ASC',
+			'sort_column'  => 'post_title',
+			'hierarchical' => 1,
+			'exclude'      => array(),
+			'include'      => array(),
+			'meta_key'     => '',
+			'meta_value'   => '',
+			'authors'      => '',
+			'parent'       => -1,
+			'exclude_tree' => array(),
+			'number'       => '',
+			'offset'       => 0,
+			'post_type'    => 'page',
+			'post_status'  => 'publish',
+		);
+
+		$this->assertSameSets( $parsed_args, $parsed_args_values, 'Parsed arguments should match expected values' );
+	}
+
+	/**
+	 * @ticket 12821
+	 * @covers ::get_pages
+	 * @dataProvider data_get_pages_args
+	 */
+	public function test_get_pages_args_test_filter( $args, $expected_query_args ) {
+		$filter = new MockAction();
+		add_filter( 'get_pages_query_args', array( $filter, 'filter' ), 10, 2 );
+
+		$results = get_pages( $args );
+
+		$this->assertIsArray( $results, 'get_pages should result an array' );
+
+		$filter_args = $filter->get_args();
+
+		$default_args = array(
+			'orderby'                => array( 'post_title' => 'ASC' ),
+			'order'                  => 'ASC',
+			'post__not_in'           => array(),
+			'meta_key'               => '',
+			'meta_value'             => '',
+			'posts_per_page'         => -1,
+			'offset'                 => 0,
+			'post_type'              => 'page',
+			'post_status'            => array( 'publish' ),
+			'update_post_term_cache' => false,
+			'update_post_meta_cache' => false,
+			'ignore_sticky_posts'    => true,
+			'no_found_rows'          => true,
+		);
+
+		$query_args = wp_parse_args( $expected_query_args, $default_args );
+
+		$this->assertSameSets( $query_args, $filter_args[0][0], 'Unexpected $query_args for get_pages_query_args filter' );
+
+		$defaults = array(
+			'child_of'     => 0,
+			'sort_order'   => 'ASC',
+			'sort_column'  => 'post_title',
+			'hierarchical' => 1,
+			'exclude'      => array(),
+			'include'      => array(),
+			'meta_key'     => '',
+			'meta_value'   => '',
+			'authors'      => '',
+			'parent'       => -1,
+			'exclude_tree' => array(),
+			'number'       => '',
+			'offset'       => 0,
+			'post_type'    => 'page',
+			'post_status'  => 'publish',
+		);
+
+		$parsed_args = wp_parse_args( $args, $defaults );
+		$this->assertSameSets( $parsed_args, $filter_args[0][1], 'Unexpected $parsed_args for get_pages_query_args filter' );
+	}
+
+	public function data_get_pages_args() {
+		return array(
+			'default'            => array(
+				'args'                => array(),
+				'expected_query_args' => array(),
+			),
+			'exclude'            => array(
+				'args'                => array( 'exclude' => array( 1, 2, 4 ) ),
+				'expected_query_args' => array( 'post__not_in' => array( 1, 2, 4 ) ),
+			),
+			'post status'        => array(
+				'args'                => array( 'post_status' => 'draft' ),
+				'expected_query_args' => array( 'post_status' => array( 'draft' ) ),
+			),
+			'number'             => array(
+				'args'                => array( 'number' => 99 ),
+				'expected_query_args' => array( 'posts_per_page' => 99 ),
+			),
+			'meta query'         => array(
+				'args'                => array(
+					'meta_key'   => 'foo',
+					'meta_value' => 'bar',
+				),
+				'expected_query_args' => array(
+					'meta_key'   => 'foo',
+					'meta_value' => 'bar',
+				),
+			),
+			'post parent number' => array(
+				'args'                => array( 'parent' => 5 ),
+				'expected_query_args' => array( 'post_parent' => 5 ),
+			),
+			'post parent array'  => array(
+				'args'                => array( 'parent' => array( 5 ) ),
+				'expected_query_args' => array( 'post_parent__in' => array( 5 ) ),
+			),
+			'offset'             => array(
+				'args'                => array( 'offset' => 2 ),
+				'expected_query_args' => array( 'offset' => 2 ),
+			),
+			'authors'            => array(
+				'args'                => array( 'authors' => 2 ),
+				'expected_query_args' => array( 'author__in' => array( 2 ) ),
+			),
+			'sort order'         => array(
+				'args'                => array( 'sort_order' => 'DESC' ),
+				'expected_query_args' => array(
+					'order'   => 'DESC',
+					'orderby' => array( 'post_title' => 'DESC' ),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_include_ignores_meta_key() {
+		$posts = self::factory()->post->create_many(
+			2,
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$pages = get_pages(
+			array(
+				'include'    => $posts,
+				'meta_key'   => 'foo',
+				'meta_value' => 'bar',
+			)
+		);
+
+		$page_ids = wp_list_pluck( $pages, 'ID' );
+		$this->assertSameSets( $posts, $page_ids );
+	}
+
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_include_ignores_exclude() {
+		$includes = self::factory()->post->create_many(
+			2,
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$excludes = self::factory()->post->create_many(
+			2,
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$pages = get_pages(
+			array(
+				'include' => $includes,
+				'exclude' => $excludes,
+			)
+		);
+
+		$page_ids = wp_list_pluck( $pages, 'ID' );
+		$this->assertSameSets( $includes, $page_ids );
+	}
+
+	public function test_get_pages_exclude_tree() {
+		$post_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+		$post_id2 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_parent' => $post_id1,
+			)
+		);
+		$post_id3 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+		$post_id4 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_parent' => $post_id3,
+			)
+		);
+
+		$all = get_pages();
+
+		$this->assertCount( 4, $all );
+
+		$exclude1 = get_pages( "exclude_tree=$post_id1" );
+		$this->assertCount( 2, $exclude1 );
+
+		$exclude2 = get_pages( array( 'exclude_tree' => $post_id1 ) );
+		$this->assertCount( 2, $exclude2 );
+
+		$exclude3 = get_pages( array( 'exclude_tree' => array( $post_id1 ) ) );
+		$this->assertCount( 2, $exclude3 );
+
+		$exclude4 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id2 ) ) );
+		$this->assertCount( 2, $exclude4 );
+
+		$exclude5 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
+		$this->assertCount( 0, $exclude5 );
+
+		$post_id5 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+		$post_id6 = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_parent' => $post_id5,
+			)
+		);
+
+		$exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
+		$this->assertCount( 2, $exclude6 );
+	}
+
 	/**
 	 * @ticket 9470
 	 */
@@ -364,21 +665,10 @@ public function test_get_pages_parent() {
 		$this->assertSameSets( array( $page_id2, $page_id3, $page_id4 ), wp_list_pluck( $pages, 'ID' ) );
 	}
 
-	/**
-	 * @ticket 22389
-	 */
-	public function test_wp_dropdown_pages() {
-		self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
-
-		preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );
-
-		$this->assertCount( 5, $matches[0] );
-	}
-
 	/**
 	 * @ticket 22208
 	 */
-	public function test_get_chidren_fields_ids() {
+	public function test_get_children_fields_ids() {
 		$post_id   = self::factory()->post->create();
 		$child_ids = self::factory()->post->create_many( 5, array( 'post_parent' => $post_id ) );
 
@@ -618,105 +908,277 @@ public function test_get_pages_non_hierarchical_non_empty_child_of() {
 
 	}
 
-	public function test_wp_list_pages_classes() {
-		$type = 'taco';
-		register_post_type(
-			$type,
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_post_type() {
+		register_post_type( 'wptests_pt', array( 'hierarchical' => true ) );
+		$posts = self::factory()->post->create_many( 2, array( 'post_type' => 'wptests_pt' ) );
+		$pages = get_pages(
 			array(
-				'hierarchical' => true,
-				'public'       => true,
+				'post_type' => 'wptests_pt',
 			)
 		);
+		$this->assertSameSets( $posts, wp_list_pluck( $pages, 'ID' ) );
+	}
 
-		$posts   = self::factory()->post->create_many( 2, array( 'post_type' => $type ) );
-		$post_id = reset( $posts );
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_post_status() {
+		register_post_status(
+			'foo',
+			array(
+				'public' => true,
+			)
+		);
 
-		$this->go_to( "/?p=$post_id&post_type=$type" );
+		$posts = self::factory()->post->create_many(
+			2,
+			array(
+				'post_type'   => 'page',
+				'post_status' => 'foo',
+			)
+		);
+		$pages = get_pages(
+			array(
+				'post_status' => 'foo',
+			)
+		);
 
-		$this->assertSame( $post_id, get_queried_object_id() );
+		$this->assertSameSets( $posts, wp_list_pluck( $pages, 'ID' ) );
+	}
 
-		$output = wp_list_pages(
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_offset() {
+		$posts = self::factory()->post->create_many( 4, array( 'post_type' => 'page' ) );
+		$pages = get_pages(
 			array(
-				'echo'      => false,
-				'title_li'  => '',
-				'post_type' => $type,
+				'offset' => 2,
+				'number' => 2,
 			)
 		);
 
-		$this->assertNotEmpty( $output );
-		$this->assertSame( 2, substr_count( $output, 'class="page_item ' ) );
-		$this->assertStringContainsString( 'current_page_item', $output );
-		$this->assertSame( 1, substr_count( $output, 'current_page_item' ) );
-
-		_unregister_post_type( $type );
+		$this->assertSameSets( array( $posts[2], $posts[3] ), wp_list_pluck( $pages, 'ID' ) );
 	}
 
-	public function test_exclude_tree() {
-		$post_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
-		$post_id2 = self::factory()->post->create(
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_author() {
+		$author_1 = self::factory()->user->create(
 			array(
-				'post_type'   => 'page',
-				'post_parent' => $post_id1,
+				'user_login' => 'author1',
+				'role'       => 'author',
 			)
 		);
-		$post_id3 = self::factory()->post->create( array( 'post_type' => 'page' ) );
-		$post_id4 = self::factory()->post->create(
+		$posts    = self::factory()->post->create_many(
+			2,
 			array(
 				'post_type'   => 'page',
-				'post_parent' => $post_id3,
+				'post_author' => $author_1,
+			)
+		);
+		$pages    = get_pages(
+			array(
+				'authors' => $author_1,
 			)
 		);
 
-		$all = get_pages();
-
-		$this->assertCount( 4, $all );
-
-		$exclude1 = get_pages( "exclude_tree=$post_id1" );
-		$this->assertCount( 2, $exclude1 );
+		$this->assertSameSets( $posts, wp_list_pluck( $pages, 'ID' ) );
+	}
 
-		$exclude2 = get_pages( array( 'exclude_tree' => $post_id1 ) );
-		$this->assertCount( 2, $exclude2 );
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_multiple_authors() {
+		$author_1 = self::factory()->user->create(
+			array(
+				'user_login' => 'author1',
+				'role'       => 'author',
+			)
+		);
+		$post_1   = self::factory()->post->create(
+			array(
+				'post_title'  => 'Page 1',
+				'post_type'   => 'page',
+				'post_author' => $author_1,
+				'post_date'   => '2007-01-01 00:00:00',
+			)
+		);
 
-		$exclude3 = get_pages( array( 'exclude_tree' => array( $post_id1 ) ) );
-		$this->assertCount( 2, $exclude3 );
+		$author_2 = self::factory()->user->create(
+			array(
+				'user_login' => 'author2',
+				'role'       => 'author',
+			)
+		);
+		$post_2   = self::factory()->post->create(
+			array(
+				'post_title'  => 'Page 2',
+				'post_type'   => 'page',
+				'post_author' => $author_2,
+				'post_date'   => '2007-01-01 00:00:00',
+			)
+		);
+		$pages    = get_pages(
+			array(
+				'authors' => "{$author_1}, {$author_2}",
+			)
+		);
 
-		$exclude4 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id2 ) ) );
-		$this->assertCount( 2, $exclude4 );
+		$this->assertSameSets( array( $post_1, $post_2 ), wp_list_pluck( $pages, 'ID' ) );
+	}
 
-		$exclude5 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
-		$this->assertCount( 0, $exclude5 );
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_multiple_authors_by_user_login() {
+		$author_1 = self::factory()->user->create(
+			array(
+				'user_login' => 'author1',
+				'role'       => 'author',
+			)
+		);
+		$post_1   = self::factory()->post->create(
+			array(
+				'post_title'  => 'Page 1',
+				'post_type'   => 'page',
+				'post_author' => $author_1,
+				'post_date'   => '2007-01-01 00:00:00',
+			)
+		);
 
-		$post_id5 = self::factory()->post->create( array( 'post_type' => 'page' ) );
-		$post_id6 = self::factory()->post->create(
+		$author_2 = self::factory()->user->create(
+			array(
+				'user_login' => 'author2',
+				'role'       => 'author',
+			)
+		);
+		$post_2   = self::factory()->post->create(
 			array(
+				'post_title'  => 'Page 2',
 				'post_type'   => 'page',
-				'post_parent' => $post_id5,
+				'post_author' => $author_2,
+				'post_date'   => '2007-01-01 00:00:00',
+			)
+		);
+		$pages    = get_pages(
+			array(
+				'authors' => 'author1, author2',
 			)
 		);
 
-		$exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
-		$this->assertCount( 2, $exclude6 );
+		$this->assertSameSets( array( $post_1, $post_2 ), wp_list_pluck( $pages, 'ID' ) );
 	}
 
 	/**
-	 * @ticket 43514
+	 * @ticket 12821
 	 */
-	public function test_get_pages_cache_empty() {
+	public function test_get_pages_orderby() {
 		global $wpdb;
+		// 'rand' is a valid value.
+		get_pages( array( 'sort_column' => 'rand' ) );
+		$this->assertStringContainsString(
+			'ORDER BY RAND()',
+			$wpdb->last_query,
+			'Check that ORDER is random.'
+		);
 
-		wp_cache_delete( 'last_changed', 'posts' );
-		$this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
+		// This isn't allowed.
+		get_pages( array( 'sort_order' => 'rand' ) );
+		$this->assertStringContainsString(
+			'ORDER BY',
+			$wpdb->last_query,
+			'Check that ORDER BY is present.'
+		);
+		$this->assertStringNotContainsString(
+			'RAND()',
+			$wpdb->last_query,
+			'Check that ORDER is not random.'
+		);
+		$this->assertStringContainsString(
+			'DESC',
+			$wpdb->last_query,
+			'Check that DESC is not present.'
+		);
 
-		$num_queries = $wpdb->num_queries;
+		// 'none' is a valid value.
+		get_pages( array( 'sort_column' => 'none' ) );
+		$this->assertStringNotContainsString(
+			'ORDER BY',
+			$wpdb->last_query,
+			'Check that ORDER BY is not present.'
+		);
+		$this->assertStringNotContainsString(
+			'DESC',
+			$wpdb->last_query,
+			'Check that DESC is not present.'
+		);
+		$this->assertStringNotContainsString(
+			'ASC',
+			$wpdb->last_query,
+			'Check that ASC is not present.'
+		);
 
-		$pages = get_pages(); // Database gets queried.
+		// False is a valid value.
+		get_pages( array( 'sort_column' => false ) );
+		$this->assertStringContainsString(
+			'ORDER BY',
+			$wpdb->last_query,
+			'Check that ORDER BY is present if sort_column is false.'
+		);
+
+		// Empty array() is a valid value.
+		get_pages( array( 'sort_column' => array() ) );
+		$this->assertStringContainsString(
+			'ORDER BY',
+			$wpdb->last_query,
+			'Check that ORDER BY is present if sort_column is an empty array.'
+		);
+	}
 
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+	/**
+	 * @ticket 12821
+	 */
+	public function test_get_pages_order() {
+		global $wpdb;
 
-		$num_queries = $wpdb->num_queries;
+		get_pages(
+			array(
+				'sort_column' => 'post_type',
+			)
+		);
+		$this->assertStringContainsString(
+			"ORDER BY $wpdb->posts.post_type ASC",
+			$wpdb->last_query,
+			'Check that ORDER is post type.'
+		);
 
-		$pages = get_pages(); // Database should not get queried.
+		get_pages(
+			array(
+				'sort_column' => 'title',
+				'sort_order'  => 'foo',
+			)
+		);
+		$this->assertStringContainsString(
+			"ORDER BY $wpdb->posts.post_title DESC",
+			$wpdb->last_query,
+			'Check that ORDER is default.'
+		);
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		get_pages(
+			array(
+				'sort_order'  => 'asc',
+				'sort_column' => 'date',
+			)
+		);
+		$this->assertStringContainsString(
+			"ORDER BY $wpdb->posts.post_date ASC",
+			$wpdb->last_query,
+			'Check that ORDER is post date.'
+		);
 	}
 }
diff --git a/tests/phpunit/tests/post/getPostClass.php b/tests/phpunit/tests/post/getPostClass.php
index faedf73c96f4a..64f60a2636c2a 100644
--- a/tests/phpunit/tests/post/getPostClass.php
+++ b/tests/phpunit/tests/post/getPostClass.php
@@ -121,8 +121,6 @@ public function test_with_utf8_term_slugs() {
 	 * @group cache
 	 */
 	public function test_taxonomy_classes_hit_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		wp_set_post_terms( $this->post_id, array( 'foo', 'bar' ), 'wptests_tax' );
 		wp_set_post_terms( $this->post_id, array( 'footag', 'bartag' ), 'post_tag' );
@@ -131,10 +129,10 @@ public function test_taxonomy_classes_hit_cache() {
 		update_object_term_cache( $this->post_id, 'post' );
 		update_meta_cache( 'post', $this->post_id );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_post_class( '', $this->post_id );
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 }
diff --git a/tests/phpunit/tests/post/getPostParent.php b/tests/phpunit/tests/post/getPostParent.php
new file mode 100644
index 0000000000000..e66b458513ea8
--- /dev/null
+++ b/tests/phpunit/tests/post/getPostParent.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @group post
+ * @group template
+ *
+ * @covers ::get_post_parent
+ * @covers ::has_post_parent
+ */
+class Tests_Post_GetPostParent extends WP_UnitTestCase {
+
+	/**
+	 * @ticket 33045
+	 */
+	public function test_get_post_parent() {
+		$post = array(
+			'post_status' => 'publish',
+			'post_type'   => 'page',
+		);
+
+		// Insert two initial posts.
+		$parent_id = self::factory()->post->create( $post );
+		$child_id  = self::factory()->post->create( $post );
+
+		// Test if the function returns null by default.
+		$parent = get_post_parent( $child_id );
+		$this->assertNull( $parent );
+
+		// Update child post with a parent.
+		wp_update_post(
+			array(
+				'ID'          => $child_id,
+				'post_parent' => $parent_id,
+			)
+		);
+
+		// Test if the function returns the parent object.
+		$parent = get_post_parent( $child_id );
+		$this->assertNotNull( $parent );
+		$this->assertSame( $parent_id, $parent->ID );
+	}
+
+	/**
+	 * @ticket 33045
+	 */
+	public function test_has_post_parent() {
+		$post = array(
+			'post_status' => 'publish',
+			'post_type'   => 'page',
+		);
+
+		// Insert two initial posts.
+		$parent_id = self::factory()->post->create( $post );
+		$child_id  = self::factory()->post->create( $post );
+
+		// Test if the function returns false by default.
+		$parent = has_post_parent( $child_id );
+		$this->assertFalse( $parent );
+
+		// Update child post with a parent.
+		wp_update_post(
+			array(
+				'ID'          => $child_id,
+				'post_parent' => $parent_id,
+			)
+		);
+
+		// Test if the function returns true for a child post.
+		$parent = has_post_parent( $child_id );
+		$this->assertTrue( $parent );
+	}
+}
diff --git a/tests/phpunit/tests/post/getPostTypeLabels.php b/tests/phpunit/tests/post/getPostTypeLabels.php
index 9761e419b09fa..2a0e7f0d32ab1 100644
--- a/tests/phpunit/tests/post/getPostTypeLabels.php
+++ b/tests/phpunit/tests/post/getPostTypeLabels.php
@@ -95,9 +95,9 @@ public function test_labels_should_be_added_when_registering_a_post_type() {
 
 		unregister_post_type( 'foo' );
 
-		$this->assertObjectHasAttribute( 'labels', $post_type_object );
-		$this->assertObjectHasAttribute( 'label', $post_type_object );
-		$this->assertObjectHasAttribute( 'not_found_in_trash', $post_type_object->labels );
+		$this->assertObjectHasProperty( 'labels', $post_type_object );
+		$this->assertObjectHasProperty( 'label', $post_type_object );
+		$this->assertObjectHasProperty( 'not_found_in_trash', $post_type_object->labels );
 	}
 
 	public function test_label_should_be_derived_from_labels_when_registering_a_post_type() {
@@ -122,8 +122,8 @@ public function test_should_fall_back_on_defaults_when_filtered_labels_do_not_co
 		add_filter( 'post_type_labels_foo', array( $this, 'filter_post_type_labels' ) );
 		register_post_type( 'foo' );
 
-		$this->assertObjectHasAttribute( 'featured_image', get_post_type_object( 'foo' )->labels );
-		$this->assertObjectHasAttribute( 'set_featured_image', get_post_type_object( 'foo' )->labels );
+		$this->assertObjectHasProperty( 'featured_image', get_post_type_object( 'foo' )->labels );
+		$this->assertObjectHasProperty( 'set_featured_image', get_post_type_object( 'foo' )->labels );
 
 		unregister_post_type( 'foo' );
 		remove_filter( 'post_type_labels_foo', array( $this, 'filter_post_type_labels' ) );
diff --git a/tests/phpunit/tests/post/meta.php b/tests/phpunit/tests/post/meta.php
index 456eda0ba1731..0efca37f6bb93 100644
--- a/tests/phpunit/tests/post/meta.php
+++ b/tests/phpunit/tests/post/meta.php
@@ -169,7 +169,7 @@ public function test_get_post_meta_by_id() {
 		$mid = add_post_meta( self::$post_id, 'get_post_meta_by_key', 'get_post_meta_by_key_value', true );
 		$this->assertIsInt( $mid );
 
-		$mobj             = new stdClass;
+		$mobj             = new stdClass();
 		$mobj->meta_id    = $mid;
 		$mobj->post_id    = self::$post_id;
 		$mobj->meta_key   = 'get_post_meta_by_key';
diff --git a/tests/phpunit/tests/post/nav-menu.php b/tests/phpunit/tests/post/nav-menu.php
index b9bca49318f9f..c0ae716ab8238 100644
--- a/tests/phpunit/tests/post/nav-menu.php
+++ b/tests/phpunit/tests/post/nav-menu.php
@@ -15,6 +15,51 @@ public function set_up() {
 		$this->menu_id = wp_create_nav_menu( 'foo' );
 	}
 
+	/**
+	 * @ticket 11095
+	 * @ticket 33974
+	 */
+	public function test_wp_page_menu_wp_nav_menu_fallback() {
+		$pages = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
+
+		// No menus + wp_nav_menu() falls back to wp_page_menu().
+		$menu = wp_nav_menu( array( 'echo' => false ) );
+
+		// After falling back, the 'before' argument should be set and output as '<ul>'.
+		$this->assertMatchesRegularExpression( '/<div class="menu"><ul>/', $menu );
+
+		// After falling back, the 'after' argument should be set and output as '</ul>'.
+		$this->assertMatchesRegularExpression( '/<\/ul><\/div>/', $menu );
+
+		// After falling back, the markup should include whitespace around <li>'s.
+		$this->assertMatchesRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
+		$this->assertDoesNotMatchRegularExpression( '/><li.*>|<\/li></U', $menu );
+
+		// No menus + wp_nav_menu() falls back to wp_page_menu(), this time without a container.
+		$menu = wp_nav_menu(
+			array(
+				'echo'      => false,
+				'container' => false,
+			)
+		);
+
+		// After falling back, the empty 'container' argument should still return a container element.
+		$this->assertMatchesRegularExpression( '/<div class="menu">/', $menu );
+
+		// No menus + wp_nav_menu() falls back to wp_page_menu(), this time without white-space.
+		$menu = wp_nav_menu(
+			array(
+				'echo'         => false,
+				'item_spacing' => 'discard',
+			)
+		);
+
+		// After falling back, the markup should not include whitespace around <li>'s.
+		$this->assertDoesNotMatchRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
+		$this->assertMatchesRegularExpression( '/><li.*>|<\/li></U', $menu );
+
+	}
+
 	/**
 	 * @ticket 32464
 	 */
@@ -259,6 +304,7 @@ public function test_update_menu_item_cache_primes_terms() {
 		add_filter( 'update_term_metadata_cache', array( $action, 'filter' ), 10, 2 );
 
 		update_menu_item_cache( $query_result );
+		get_term_meta( $term_id );
 
 		$args = $action->get_args();
 		$last = end( $args );
@@ -298,7 +344,7 @@ public function test_wp_get_nav_menu_items_cache_primes_posts() {
 		$start_num_queries = get_num_queries();
 		wp_get_nav_menu_items( $this->menu_id );
 		$queries_made = get_num_queries() - $start_num_queries;
-		$this->assertSame( 7, $queries_made, 'Only does 7 database queries when running wp_get_nav_menu_items.' );
+		$this->assertSame( 6, $queries_made, 'Only does 6 database queries when running wp_get_nav_menu_items.' );
 
 		$args = $action->get_args();
 		$this->assertSameSets( $menu_nav_ids, $args[0][1], '_prime_post_caches() was not executed.' );
@@ -338,12 +384,14 @@ public function test_wp_get_nav_menu_items_cache_primes_terms() {
 
 		$start_num_queries = get_num_queries();
 		wp_get_nav_menu_items( $this->menu_id );
+		get_term_meta( $term_ids[0] );
 		$queries_made = get_num_queries() - $start_num_queries;
-		$this->assertSame( 7, $queries_made, 'Only does 7 database queries when running wp_get_nav_menu_items.' );
+		$this->assertSame( 6, $queries_made, 'Only does 6 database queries when running wp_get_nav_menu_items.' );
 
-		$args = $action_terms->get_args();
-		$last = end( $args );
-		$this->assertSameSets( $term_ids, $last[1], '_prime_term_caches() was not executed.' );
+		$args       = $action_terms->get_args();
+		$first      = reset( $args );
+		$term_ids[] = $this->menu_id;
+		$this->assertSameSets( $term_ids, $first[1], '_prime_term_caches() was not executed.' );
 
 		$args = $action_posts->get_args();
 		$this->assertSameSets( $menu_nav_ids, $args[0][1], '_prime_post_caches() was not executed.' );
@@ -543,6 +591,30 @@ public function test_wp_setup_nav_menu_item_for_trashed_post() {
 		$this->assertTrue( ! _is_valid_nav_menu_item( $menu_item ) );
 	}
 
+	/**
+	 * @ticket 56577
+	 */
+	public function test_wp_setup_nav_menu_item_short_circuit_filter() {
+		$post_id = self::factory()->post->create();
+
+		$menu_item_id = wp_update_nav_menu_item(
+			$this->menu_id,
+			0,
+			array(
+				'menu-item-type'      => 'post_type',
+				'menu-item-object'    => 'post',
+				'menu-item-object-id' => $post_id,
+				'menu-item-status'    => 'publish',
+			)
+		);
+
+		add_filter( 'pre_wp_setup_nav_menu_item', '__return_empty_string' );
+
+		$custom_item = wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+
+		$this->assertSame( '', $custom_item );
+	}
+
 	/**
 	 * @ticket 35206
 	 */
@@ -717,7 +789,6 @@ public function confirm_forth_param_args_object( $ignored_1, $ignored_2, $ignore
 		return $ignored_1;
 	}
 
-
 	/**
 	 * @ticket 35272
 	 */
@@ -965,23 +1036,9 @@ public function test_parent_ancestor_for_post_archive() {
 		$this->assertNotContains( 'current-menu-ancestor', $post_archive_menu_item->classes );
 	}
 
-	/**
-	 * Provides IRI matching data for _wp_menu_item_classes_by_context() test.
-	 */
-	public function get_iri_current_menu_items() {
-		return array(
-			array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ) ),
-			array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ) ),
-			array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ),
-			array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ),
-			array( '/привет/' ),
-			array( '/привет' ),
-		);
-	}
-
 	/**
 	 * @ticket 43401
-	 * @dataProvider get_iri_current_menu_items
+	 * @dataProvider data_iri_current_menu_item
 	 */
 	public function test_iri_current_menu_item( $custom_link, $current = true ) {
 		wp_update_nav_menu_item(
@@ -1008,6 +1065,20 @@ public function test_iri_current_menu_item( $custom_link, $current = true ) {
 		}
 	}
 
+	/**
+	 * Provides IRI matching data for _wp_menu_item_classes_by_context() test.
+	 */
+	public function data_iri_current_menu_item() {
+		return array(
+			array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ) ),
+			array( site_url( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ) ),
+			array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82/' ),
+			array( '/%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82' ),
+			array( '/привет/' ),
+			array( '/привет' ),
+		);
+	}
+
 	/**
 	 * @ticket 44005
 	 * @group privacy
@@ -1169,7 +1240,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-status'    => 'publish',
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertEqualsWithDelta( strtotime( gmdate( 'Y-m-d H:i:s' ) ), strtotime( $post->post_date ), 2, 'The dates should be equal' );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1183,7 +1255,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $post_date_gmt,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertSame( get_date_from_gmt( $post_date_gmt ), $post->post_date );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1197,7 +1270,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $invalid_date,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertSame( '1970-01-01 00:00:00', $post->post_date );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1211,7 +1285,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date' => $post_date,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertSame( $post_date, $post->post_date );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1226,7 +1301,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $post_date_gmt,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertSame( $post_date, $post->post_date );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1241,7 +1317,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $invalid_date,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertSame( $post_date, $post->post_date );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1255,7 +1332,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date' => $invalid_date,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertEqualsWithDelta( strtotime( gmdate( 'Y-m-d H:i:s' ) ), strtotime( $post->post_date ), 2, 'The dates should be equal' );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1270,7 +1348,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $post_date_gmt,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertEqualsWithDelta( strtotime( gmdate( 'Y-m-d H:i:s' ) ), strtotime( $post->post_date ), 2, 'The dates should be equal' );
 
 		$menu_item_id = wp_update_nav_menu_item(
@@ -1285,7 +1364,8 @@ public function test_wp_update_nav_menu_item_with_post_date() {
 				'menu-item-post-date-gmt' => $invalid_date,
 			)
 		);
-		$post         = get_post( $menu_item_id );
+
+		$post = get_post( $menu_item_id );
 		$this->assertEqualsWithDelta( strtotime( gmdate( 'Y-m-d H:i:s' ) ), strtotime( $post->post_date ), 2, 'The dates should be equal' );
 	}
 }
diff --git a/tests/phpunit/tests/post/primePostCaches.php b/tests/phpunit/tests/post/primePostCaches.php
new file mode 100644
index 0000000000000..ab99a2d32260e
--- /dev/null
+++ b/tests/phpunit/tests/post/primePostCaches.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Test `_prime_post_caches()`.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Test class for `_prime_post_caches()`.
+ *
+ * @group post
+ * @group cache
+ *
+ * @covers ::_prime_post_caches
+ */
+class Tests_Post_PrimePostCaches extends WP_UnitTestCase {
+
+	/**
+	 * Post IDs.
+	 *
+	 * @var int[]
+	 */
+	public static $posts;
+
+	/**
+	 * Set up test resources before the class.
+	 *
+	 * @param WP_UnitTest_Factory $factory The unit test factory.
+	 */
+	public static function wpSetupBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$posts = $factory->post->create_many( 3 );
+
+		$category = $factory->term->create(
+			array(
+				'taxonomy' => 'category',
+				'slug'     => 'foo',
+				'name'     => 'Foo',
+			)
+		);
+
+		wp_set_post_terms( self::$posts[0], $category, 'category' );
+		add_post_meta( self::$posts[0], 'meta', 'foo' );
+		add_post_meta( self::$posts[1], 'meta', 'bar' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches() {
+		$post_id = self::$posts[0];
+
+		$this->assertSame( array( $post_id ), _get_non_cached_ids( array( $post_id ), 'posts' ), 'Post is already cached.' );
+
+		// Test posts cache.
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( array( $post_id ) );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * Four expected queries:
+		 * 1: Posts data,
+		 * 2: Post meta data,
+		 * 3: Taxonomy data,
+		 * 4: Term data.
+		 */
+		$this->assertSame( 4, $num_queries, 'Unexpected number of queries.' );
+
+		$this->assertSame( array(), _get_non_cached_ids( array( $post_id ), 'posts' ), 'Post is not cached.' );
+
+		// Test post meta cache.
+		$before_num_queries = get_num_queries();
+		$meta               = get_post_meta( $post_id, 'meta', true );
+		$num_queries        = get_num_queries() - $before_num_queries;
+
+		$this->assertSame( 'foo', $meta, 'Meta has unexpected value.' );
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries.' );
+
+		// Test term cache.
+		$before_num_queries = get_num_queries();
+		$categories         = get_the_category( $post_id );
+		$num_queries        = get_num_queries() - $before_num_queries;
+
+		$this->assertNotEmpty( $categories, 'Categories does return an empty result set.' );
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_with_multiple_posts() {
+		$this->assertSame( self::$posts, _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are already cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( self::$posts );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * Four expected queries:
+		 * 1: Posts data,
+		 * 2: Post meta data,
+		 * 3: Taxonomy data,
+		 * 4: Term data.
+		 */
+		$this->assertSame( 4, $num_queries, 'Unexpected number of queries.' );
+
+		$this->assertSame( array(), _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are not cached.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_only_posts_cache() {
+		$this->assertSame( self::$posts, _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are already cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( self::$posts, false, false );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * One expected query:
+		 * 1: Posts data.
+		 */
+		$this->assertSame( 1, $num_queries, 'Unexpected number of queries.' );
+
+		$this->assertSame( array(), _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are not cached.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_only_posts_and_term_cache() {
+		$this->assertSame( self::$posts, _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are already cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( self::$posts, true, false );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * Three expected queries:
+		 * 1: Posts data.
+		 * 2: Taxonomy data,
+		 * 3: Term data.
+		 */
+		$this->assertSame( 3, $num_queries, 'Unexpected number of queries.' );
+
+		$this->assertSame( array(), _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are not cached.' );
+
+		// Test term cache.
+		$before_num_queries = get_num_queries();
+		$categories         = get_the_category( self::$posts[0] );
+		$num_queries        = get_num_queries() - $before_num_queries;
+
+		$this->assertNotEmpty( $categories, 'Categories does return an empty result set.' );
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_only_posts_and_meta_cache() {
+		$this->assertSame( self::$posts, _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are already cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( self::$posts, false, true );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * Two expected queries:
+		 * 1: Posts data.
+		 * 2: Post meta data.
+		 */
+		$this->assertSame( 2, $num_queries, 'Unexpected number of queries warming cache.' );
+
+		$this->assertSame( array(), _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are not cached.' );
+
+		// Test post meta cache.
+		$before_num_queries = get_num_queries();
+		$meta_1             = get_post_meta( self::$posts[0], 'meta', true );
+		$meta_2             = get_post_meta( self::$posts[1], 'meta', true );
+		$num_queries        = get_num_queries() - $before_num_queries;
+
+		$this->assertSame( 'foo', $meta_1, 'Meta 1 has unexpected value.' );
+		$this->assertSame( 'bar', $meta_2, 'Meta 2 has unexpected value.' );
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries getting post meta.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_accounts_for_posts_without_primed_meta_terms() {
+		$post_id = self::$posts[0];
+
+		$this->assertSame( array( $post_id ), _get_non_cached_ids( array( $post_id ), 'posts' ), 'Post is already cached.' );
+
+		// Warm only the posts cache.
+		$post = get_post( $post_id );
+		$this->assertNotEmpty( $post, 'Post does not exist.' );
+		$this->assertEmpty( _get_non_cached_ids( array( $post_id ), 'posts' ), 'Post is not cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( array( $post_id ) );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		/*
+		 * Three expected queries:
+		 * 1: Post meta data,
+		 * 2: Taxonomy data,
+		 * 3: Term data.
+		 */
+		$this->assertSame( 3, $num_queries, 'Unexpected number of queries.' );
+	}
+
+	/**
+	 * @ticket 57163
+	 */
+	public function test_prime_post_caches_does_not_prime_caches_twice() {
+		$this->assertSame( self::$posts, _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are already cached.' );
+
+		_prime_post_caches( self::$posts );
+
+		$this->assertSame( array(), _get_non_cached_ids( self::$posts, 'posts' ), 'Posts are not cached.' );
+
+		$before_num_queries = get_num_queries();
+		_prime_post_caches( self::$posts );
+		$num_queries = get_num_queries() - $before_num_queries;
+
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries.' );
+	}
+}
diff --git a/tests/phpunit/tests/post/query.php b/tests/phpunit/tests/post/query.php
index 66bcdc26915eb..f5ecd49b0556e 100644
--- a/tests/phpunit/tests/post/query.php
+++ b/tests/phpunit/tests/post/query.php
@@ -555,11 +555,9 @@ public function test_post_name__in() {
 	 * @ticket 36687
 	 */
 	public function test_posts_pre_query_filter_should_bypass_database_query() {
-		global $wpdb;
-
 		add_filter( 'posts_pre_query', array( __CLASS__, 'filter_posts_pre_query' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q           = new WP_Query(
 			array(
 				'fields'        => 'ids',
@@ -569,7 +567,7 @@ public function test_posts_pre_query_filter_should_bypass_database_query() {
 
 		remove_filter( 'posts_pre_query', array( __CLASS__, 'filter_posts_pre_query' ) );
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSame( array( 12345 ), $q->posts );
 	}
 
@@ -712,20 +710,10 @@ public function test_set_found_posts_fields_not_split_the_query() {
 		$this->assertEquals( 2, $q->max_num_pages );
 	}
 
-	public function set_found_posts_provider() {
-		// Count return 0 for null, but 1 for other data you may not expect.
-		return array(
-			array( null, 0 ),
-			array( '', 1 ),
-			array( "To life, to life, l'chaim", 1 ),
-			array( false, 1 ),
-		);
-	}
-
 	/**
 	 * @ticket 42860
 	 *
-	 * @dataProvider set_found_posts_provider
+	 * @dataProvider data_set_found_posts_not_posts_as_an_array
 	 */
 	public function test_set_found_posts_not_posts_as_an_array( $posts, $expected ) {
 		$q = new WP_Query(
@@ -744,6 +732,16 @@ public function test_set_found_posts_not_posts_as_an_array( $posts, $expected )
 		$this->assertSame( $expected, $q->found_posts );
 	}
 
+	public function data_set_found_posts_not_posts_as_an_array() {
+		// Count return 0 for null, but 1 for other data you may not expect.
+		return array(
+			array( null, 0 ),
+			array( '', 1 ),
+			array( "To life, to life, l'chaim", 1 ),
+			array( false, 1 ),
+		);
+	}
+
 	/**
 	 * @ticket 42469
 	 */
diff --git a/tests/phpunit/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php
index c8effbccc2cc3..cc17ccd60d5df 100644
--- a/tests/phpunit/tests/post/revisions.php
+++ b/tests/phpunit/tests/post/revisions.php
@@ -866,4 +866,66 @@ public function test_wp_get_post_revisions_url_returns_null_with_revisions_disab
 
 		add_post_type_support( 'post', 'revisions' );
 	}
+
+	/**
+	 * Tests that wp_save_post_revision() respects the 'wp_save_post_revision_revisions_before_deletion' filter
+	 * when deleting revisions.
+	 *
+	 * This test should protect the original revision, send the rest to be checked against wp_revisions_to_keep(),
+	 * and result in two revisions: The latest revision, and the original.
+	 *
+	 * @ticket 57320
+	 *
+	 * @covers ::wp_save_post_revision
+	 */
+	public function test_wp_save_post_revision_should_respect_revisions_before_deletion_filter() {
+		$post_id = self::factory()->post->create( array( 'post_title' => 'Test 57320' ) );
+
+		add_filter(
+			'wp_revisions_to_keep',
+			static function() {
+				return 1;
+			}
+		);
+
+		add_filter(
+			'wp_save_post_revision_revisions_before_deletion',
+			static function ( $revisions ) {
+				// Ignore the first revision and return the rest for deletion.
+				return array_slice( $revisions, 1 );
+			}
+		);
+
+		for ( $update = 1; $update < 4; ++$update ) {
+			wp_update_post(
+				array(
+					'ID'         => $post_id,
+					'post_title' => 'Test 57320 Update ' . $update,
+				)
+			);
+		}
+
+		$actual = wp_get_post_revisions( $post_id );
+
+		$this->assertCount(
+			2,
+			$actual,
+			'There should be two revisions.'
+		);
+
+		$first  = reset( $actual );
+		$second = next( $actual );
+
+		$this->assertSame(
+			'Test 57320 Update 3',
+			$first->post_title,
+			'The title of the first revision was incorrect.'
+		);
+
+		$this->assertSame(
+			'Test 57320 Update 1',
+			$second->post_title,
+			'The title of the second revision was incorrect.'
+		);
+	}
 }
diff --git a/tests/phpunit/tests/post/template.php b/tests/phpunit/tests/post/template.php
deleted file mode 100644
index c30f31fba261d..0000000000000
--- a/tests/phpunit/tests/post/template.php
+++ /dev/null
@@ -1,516 +0,0 @@
-<?php
-
-/**
- * @group template
- */
-class Tests_Post_Template extends WP_UnitTestCase {
-
-	public function test_wp_link_pages() {
-		$contents = array( 'One', 'Two', 'Three' );
-		$content  = implode( '<!--nextpage-->', $contents );
-		$post_id  = self::factory()->post->create( array( 'post_content' => $content ) );
-
-		$this->go_to( '?p=' . $post_id );
-
-		setup_postdata( get_post( $post_id ) );
-
-		$permalink = sprintf( '<a href="%s" class="post-page-numbers">', get_permalink() );
-		$page2     = _wp_link_page( 2 );
-		$page3     = _wp_link_page( 3 );
-
-		$expected = '<p class="post-nav-links">Pages: <span class="post-page-numbers current" aria-current="page">1</span> ' . $page2 . '2</a> ' . $page3 . '3</a></p>';
-		$output   = wp_link_pages( array( 'echo' => 0 ) );
-
-		$this->assertSame( $expected, $output );
-
-		$before_after = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> {$page2}2</a> {$page3}3</a>";
-		$output       = wp_link_pages(
-			array(
-				'echo'   => 0,
-				'before' => '',
-				'after'  => '',
-			)
-		);
-
-		$this->assertSame( $before_after, $output );
-
-		$separator = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span>{$page2}2</a>{$page3}3</a>";
-		$output    = wp_link_pages(
-			array(
-				'echo'      => 0,
-				'before'    => '',
-				'after'     => '',
-				'separator' => '',
-			)
-		);
-
-		$this->assertSame( $separator, $output );
-
-		$link   = " <span class=\"post-page-numbers current\" aria-current=\"page\"><em>1</em></span>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
-		$output = wp_link_pages(
-			array(
-				'echo'        => 0,
-				'before'      => '',
-				'after'       => '',
-				'separator'   => '',
-				'link_before' => '<em>',
-				'link_after'  => '</em>',
-			)
-		);
-
-		$this->assertSame( $link, $output );
-
-		$next   = "{$page2}<em>Next page</em></a>";
-		$output = wp_link_pages(
-			array(
-				'echo'           => 0,
-				'before'         => '',
-				'after'          => '',
-				'separator'      => '',
-				'link_before'    => '<em>',
-				'link_after'     => '</em>',
-				'next_or_number' => 'next',
-			)
-		);
-
-		$this->assertSame( $next, $output );
-
-		$GLOBALS['page'] = 2;
-		$next_prev       = "{$permalink}<em>Previous page</em></a>{$page3}<em>Next page</em></a>";
-		$output          = wp_link_pages(
-			array(
-				'echo'           => 0,
-				'before'         => '',
-				'after'          => '',
-				'separator'      => '',
-				'link_before'    => '<em>',
-				'link_after'     => '</em>',
-				'next_or_number' => 'next',
-			)
-		);
-
-		$this->assertSame( $next_prev, $output );
-
-		$next_prev_link = "{$permalink}Woo page</a>{$page3}Hoo page</a>";
-		$output         = wp_link_pages(
-			array(
-				'echo'             => 0,
-				'before'           => '',
-				'after'            => '',
-				'separator'        => '',
-				'next_or_number'   => 'next',
-				'nextpagelink'     => 'Hoo page',
-				'previouspagelink' => 'Woo page',
-			)
-		);
-
-		$this->assertSame( $next_prev_link, $output );
-
-		$GLOBALS['page'] = 1;
-		$separator       = "<p class=\"post-nav-links\">Pages: <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> | {$page2}2</a> | {$page3}3</a></p>";
-		$output          = wp_link_pages(
-			array(
-				'echo'      => 0,
-				'separator' => ' | ',
-			)
-		);
-
-		$this->assertSame( $separator, $output );
-
-		$pagelink = " <span class=\"post-page-numbers current\" aria-current=\"page\">Page 1</span> | {$page2}Page 2</a> | {$page3}Page 3</a>";
-		$output   = wp_link_pages(
-			array(
-				'echo'      => 0,
-				'separator' => ' | ',
-				'before'    => '',
-				'after'     => '',
-				'pagelink'  => 'Page %',
-			)
-		);
-
-		$this->assertSame( $pagelink, $output );
-	}
-
-	public function test_wp_dropdown_pages() {
-		$none = wp_dropdown_pages( array( 'echo' => 0 ) );
-		$this->assertEmpty( $none );
-
-		$bump          = '&nbsp;&nbsp;&nbsp;';
-		$page_id       = self::factory()->post->create( array( 'post_type' => 'page' ) );
-		$child_id      = self::factory()->post->create(
-			array(
-				'post_type'   => 'page',
-				'post_parent' => $page_id,
-			)
-		);
-		$grandchild_id = self::factory()->post->create(
-			array(
-				'post_type'   => 'page',
-				'post_parent' => $child_id,
-			)
-		);
-
-		$title1 = get_post( $page_id )->post_title;
-		$title2 = get_post( $child_id )->post_title;
-		$title3 = get_post( $grandchild_id )->post_title;
-
-		$lineage = <<<LINEAGE
-<select name='page_id' id='page_id'>
-	<option class="level-0" value="$page_id">$title1</option>
-	<option class="level-1" value="$child_id">{$bump}$title2</option>
-	<option class="level-2" value="$grandchild_id">{$bump}{$bump}$title3</option>
-</select>
-
-LINEAGE;
-
-		$output = wp_dropdown_pages( array( 'echo' => 0 ) );
-		$this->assertSameIgnoreEOL( $lineage, $output );
-
-		$depth = <<<DEPTH
-<select name='page_id' id='page_id'>
-	<option class="level-0" value="$page_id">$title1</option>
-</select>
-
-DEPTH;
-
-		$output = wp_dropdown_pages(
-			array(
-				'echo'  => 0,
-				'depth' => 1,
-			)
-		);
-		$this->assertSameIgnoreEOL( $depth, $output );
-
-		$option_none = <<<NONE
-<select name='page_id' id='page_id'>
-	<option value="Woo">Hoo</option>
-	<option class="level-0" value="$page_id">$title1</option>
-</select>
-
-NONE;
-
-		$output = wp_dropdown_pages(
-			array(
-				'echo'              => 0,
-				'depth'             => 1,
-				'show_option_none'  => 'Hoo',
-				'option_none_value' => 'Woo',
-			)
-		);
-		$this->assertSameIgnoreEOL( $option_none, $output );
-
-		$option_no_change = <<<NO
-<select name='page_id' id='page_id'>
-	<option value="-1">Burrito</option>
-	<option value="Woo">Hoo</option>
-	<option class="level-0" value="$page_id">$title1</option>
-</select>
-
-NO;
-
-		$output = wp_dropdown_pages(
-			array(
-				'echo'                  => 0,
-				'depth'                 => 1,
-				'show_option_none'      => 'Hoo',
-				'option_none_value'     => 'Woo',
-				'show_option_no_change' => 'Burrito',
-			)
-		);
-		$this->assertSameIgnoreEOL( $option_no_change, $output );
-	}
-
-	/**
-	 * @ticket 12494
-	 */
-	public function test_wp_dropdown_pages_value_field_should_default_to_ID() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo' => 0,
-			)
-		);
-
-		// Should contain page ID by default.
-		$this->assertStringContainsString( 'value="' . $p . '"', $found );
-	}
-
-	/**
-	 * @ticket 12494
-	 */
-	public function test_wp_dropdown_pages_value_field_ID() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo'        => 0,
-				'value_field' => 'ID',
-			)
-		);
-
-		$this->assertStringContainsString( 'value="' . $p . '"', $found );
-	}
-
-	/**
-	 * @ticket 12494
-	 */
-	public function test_wp_dropdown_pages_value_field_post_name() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-				'post_name' => 'foo',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo'        => 0,
-				'value_field' => 'post_name',
-			)
-		);
-
-		$this->assertStringContainsString( 'value="foo"', $found );
-	}
-
-	/**
-	 * @ticket 12494
-	 */
-	public function test_wp_dropdown_pages_value_field_should_fall_back_on_ID_when_an_invalid_value_is_provided() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-				'post_name' => 'foo',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo'        => 0,
-				'value_field' => 'foo',
-			)
-		);
-
-		$this->assertStringContainsString( 'value="' . $p . '"', $found );
-	}
-
-	/**
-	 * @ticket 30082
-	 */
-	public function test_wp_dropdown_pages_should_not_contain_class_attribute_when_no_class_is_passed() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-				'post_name' => 'foo',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo' => 0,
-			)
-		);
-
-		$this->assertDoesNotMatchRegularExpression( '/<select[^>]+class=\'/', $found );
-	}
-
-	/**
-	 * @ticket 30082
-	 */
-	public function test_wp_dropdown_pages_should_obey_class_parameter() {
-		$p = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-				'post_name' => 'foo',
-			)
-		);
-
-		$found = wp_dropdown_pages(
-			array(
-				'echo'  => 0,
-				'class' => 'bar',
-			)
-		);
-
-		$this->assertMatchesRegularExpression( '/<select[^>]+class=\'bar\'/', $found );
-	}
-
-	/**
-	 * @ticket 31389
-	 */
-	public function test_get_page_template_slug_by_id() {
-		$page_id = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-			)
-		);
-
-		$this->assertSame( '', get_page_template_slug( $page_id ) );
-
-		update_post_meta( $page_id, '_wp_page_template', 'default' );
-		$this->assertSame( '', get_page_template_slug( $page_id ) );
-
-		update_post_meta( $page_id, '_wp_page_template', 'example.php' );
-		$this->assertSame( 'example.php', get_page_template_slug( $page_id ) );
-	}
-
-	/**
-	 * @ticket 31389
-	 */
-	public function test_get_page_template_slug_from_loop() {
-		$page_id = self::factory()->post->create(
-			array(
-				'post_type' => 'page',
-			)
-		);
-
-		update_post_meta( $page_id, '_wp_page_template', 'example.php' );
-		$this->go_to( get_permalink( $page_id ) );
-
-		$this->assertSame( 'example.php', get_page_template_slug() );
-	}
-
-	/**
-	 * @ticket 31389
-	 * @ticket 18375
-	 */
-	public function test_get_page_template_slug_non_page() {
-		$post_id = self::factory()->post->create();
-
-		$this->assertSame( '', get_page_template_slug( $post_id ) );
-
-		update_post_meta( $post_id, '_wp_page_template', 'default' );
-
-		$this->assertSame( '', get_page_template_slug( $post_id ) );
-
-		update_post_meta( $post_id, '_wp_page_template', 'example.php' );
-		$this->assertSame( 'example.php', get_page_template_slug( $post_id ) );
-	}
-
-	/**
-	 * @ticket 18375
-	 */
-	public function test_get_page_template_slug_non_page_from_loop() {
-		$post_id = self::factory()->post->create();
-
-		update_post_meta( $post_id, '_wp_page_template', 'example.php' );
-
-		$this->go_to( get_permalink( $post_id ) );
-
-		$this->assertSame( 'example.php', get_page_template_slug() );
-	}
-
-	/**
-	 * @ticket 11095
-	 * @ticket 33974
-	 */
-	public function test_wp_page_menu_wp_nav_menu_fallback() {
-		$pages = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
-
-		// No menus + wp_nav_menu() falls back to wp_page_menu().
-		$menu = wp_nav_menu( array( 'echo' => false ) );
-
-		// After falling back, the 'before' argument should be set and output as '<ul>'.
-		$this->assertMatchesRegularExpression( '/<div class="menu"><ul>/', $menu );
-
-		// After falling back, the 'after' argument should be set and output as '</ul>'.
-		$this->assertMatchesRegularExpression( '/<\/ul><\/div>/', $menu );
-
-		// After falling back, the markup should include whitespace around <li>'s.
-		$this->assertMatchesRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
-		$this->assertDoesNotMatchRegularExpression( '/><li.*>|<\/li></U', $menu );
-
-		// No menus + wp_nav_menu() falls back to wp_page_menu(), this time without a container.
-		$menu = wp_nav_menu(
-			array(
-				'echo'      => false,
-				'container' => false,
-			)
-		);
-
-		// After falling back, the empty 'container' argument should still return a container element.
-		$this->assertMatchesRegularExpression( '/<div class="menu">/', $menu );
-
-		// No menus + wp_nav_menu() falls back to wp_page_menu(), this time without white-space.
-		$menu = wp_nav_menu(
-			array(
-				'echo'         => false,
-				'item_spacing' => 'discard',
-			)
-		);
-
-		// After falling back, the markup should not include whitespace around <li>'s.
-		$this->assertDoesNotMatchRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
-		$this->assertMatchesRegularExpression( '/><li.*>|<\/li></U', $menu );
-
-	}
-
-	/**
-	 * @ticket 33045
-	 */
-	public function test_get_parent_post() {
-		$post = array(
-			'post_status' => 'publish',
-			'post_type'   => 'page',
-		);
-
-		// Insert two initial posts.
-		$parent_id = self::factory()->post->create( $post );
-		$child_id  = self::factory()->post->create( $post );
-
-		// Test if child get_parent_post() post returns Null by default.
-		$parent = get_post_parent( $child_id );
-		$this->assertNull( $parent );
-
-		// Update child post with a parent.
-		wp_update_post(
-			array(
-				'ID'          => $child_id,
-				'post_parent' => $parent_id,
-			)
-		);
-
-		// Test if child get_parent_post() post returns the parent object.
-		$parent = get_post_parent( $child_id );
-		$this->assertNotNull( $parent );
-		$this->assertSame( $parent_id, $parent->ID );
-	}
-
-	/**
-	 * @ticket 33045
-	 */
-	public function test_has_parent_post() {
-		$post = array(
-			'post_status' => 'publish',
-			'post_type'   => 'page',
-		);
-
-		// Insert two initial posts.
-		$parent_id = self::factory()->post->create( $post );
-		$child_id  = self::factory()->post->create( $post );
-
-		// Test if child has_parent_post() post returns False by default.
-		$parent = has_post_parent( $child_id );
-		$this->assertFalse( $parent );
-
-		// Update child post with a parent.
-		wp_update_post(
-			array(
-				'ID'          => $child_id,
-				'post_parent' => $parent_id,
-			)
-		);
-
-		// Test if child has_parent_post() returns True.
-		$parent = has_post_parent( $child_id );
-		$this->assertTrue( $parent );
-	}
-}
diff --git a/tests/phpunit/tests/post/thumbnails.php b/tests/phpunit/tests/post/thumbnails.php
index d170e1bfa5b46..44801059a88ac 100644
--- a/tests/phpunit/tests/post/thumbnails.php
+++ b/tests/phpunit/tests/post/thumbnails.php
@@ -408,6 +408,41 @@ public function test_post_thumbnail_size_filter_complex( $which_post, $expected
 		$this->assertSame( $expected, $result );
 	}
 
+	/**
+	 * @ticket 57490
+	 */
+	public function test_get_the_post_thumbnail_includes_loading_lazy() {
+		set_post_thumbnail( self::$post, self::$attachment_id );
+
+		$html = get_the_post_thumbnail( self::$post );
+		$this->assertStringContainsString( ' loading="lazy"', $html );
+	}
+
+	/**
+	 * @ticket 57490
+	 */
+	public function test_get_the_post_thumbnail_respects_passed_loading_attr() {
+		set_post_thumbnail( self::$post, self::$attachment_id );
+
+		$html = get_the_post_thumbnail( self::$post, 'post-thumbnail', array( 'loading' => 'eager' ) );
+		$this->assertStringContainsString( ' loading="eager"', $html, 'loading=eager was not present in img tag because attributes array with loading=eager was overwritten.' );
+
+		$html = get_the_post_thumbnail( self::$post, 'post-thumbnail', 'loading=eager' );
+		$this->assertStringContainsString( ' loading="eager"', $html, 'loading=eager was not present in img tag because attributes string with loading=eager was overwritten.' );
+	}
+
+	/**
+	 * @ticket 57490
+	 */
+	public function test_get_the_post_thumbnail_respects_wp_lazy_loading_enabled_filter() {
+		set_post_thumbnail( self::$post, self::$attachment_id );
+
+		add_filter( 'wp_lazy_loading_enabled', '__return_false' );
+
+		$html = get_the_post_thumbnail( self::$post );
+		$this->assertStringNotContainsString( ' loading="lazy"', $html );
+	}
+
 	public function data_post_thumbnail_size_filter_complex() {
 		return array(
 			array( 0, 'medium' ),
@@ -415,6 +450,135 @@ public function data_post_thumbnail_size_filter_complex() {
 		);
 	}
 
+	/**
+	 * Tests that `_wp_post_thumbnail_context_filter()` returns 'the_post_thumbnail'.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers::_wp_post_thumbnail_context_filter
+	 */
+	public function test_wp_post_thumbnail_context_filter_should_return_the_post_thumbnail() {
+		$this->assertSame( 'the_post_thumbnail', _wp_post_thumbnail_context_filter( 'wp_get_attachment_image' ) );
+	}
+
+	/**
+	 * Tests that `::_wp_post_thumbnail_context_filter_add` adds a filter to override the context
+	 * used in `wp_get_attachment_image()`.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::_wp_post_thumbnail_context_filter_add
+	 */
+	public function test_wp_post_thumbnail_context_filter_add_should_add_the_filter() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		_wp_post_thumbnail_context_filter_add();
+		wp_get_attachment_image( self::$attachment_id );
+
+		$this->assertSame( 'the_post_thumbnail', $last_context );
+	}
+
+	/**
+	 * Tests that `_wp_post_thumbnail_context_filter_remove()` removes a filter to override the context
+	 * used in `wp_get_attachment_image()`.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::_wp_post_thumbnail_context_filter_remove
+	 */
+	public function test_wp_post_thumbnail_context_filter_remove_should_remove_the_filter() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		_wp_post_thumbnail_context_filter_add();
+		wp_get_attachment_image( self::$attachment_id );
+
+		// Verify that the filter has been added before testing that it has been removed.
+		$this->assertSame(
+			'the_post_thumbnail',
+			$last_context,
+			'The filter was not added.'
+		);
+
+		_wp_post_thumbnail_context_filter_remove();
+
+		// The context should no longer be modified by the filter.
+		wp_get_attachment_image( self::$attachment_id );
+
+		$this->assertSame(
+			'wp_get_attachment_image',
+			$last_context,
+			'The filter was not removed.'
+		);
+	}
+
+	/**
+	 * Tests that `get_the_post_thumbnail()` uses the 'the_post_thumbnail' context.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::get_the_post_thumbnail
+	 */
+	public function test_get_the_post_thumbnail_should_use_the_post_thumbnail_context() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		set_post_thumbnail( self::$post, self::$attachment_id );
+		get_the_post_thumbnail( self::$post );
+
+		$this->assertSame( 'the_post_thumbnail', $last_context );
+	}
+
+	/**
+	 * Tests that `get_the_post_thumbnail()` restores the context afterwards.
+	 *
+	 * @ticket 58212
+	 *
+	 * @covers ::get_the_post_thumbnail
+	 */
+	public function test_get_the_post_thumbnail_should_remove_the_post_thumbnail_context_afterwards() {
+		$last_context = '';
+		$this->track_last_attachment_image_context( $last_context );
+
+		set_post_thumbnail( self::$post, self::$attachment_id );
+		get_the_post_thumbnail( self::$post );
+
+		// Verify that the context was overridden before testing that it has been restored.
+		$this->assertSame(
+			'the_post_thumbnail',
+			$last_context,
+			'The context was not overridden.'
+		);
+
+		// The context should no longer be overridden.
+		wp_get_attachment_image( self::$attachment_id );
+
+		$this->assertSame(
+			'wp_get_attachment_image',
+			$last_context,
+			'The context was not restored.'
+		);
+	}
+
+	/**
+	 * Helper method to keep track of the last context returned by the 'wp_get_attachment_image_context' filter.
+	 *
+	 * The method parameter is passed by reference and therefore will always contain the last context value.
+	 *
+	 * @param mixed $last_context Variable to track last context. Passed by reference.
+	 */
+	private function track_last_attachment_image_context( &$last_context ) {
+		add_filter(
+			'wp_get_attachment_image_context',
+			static function( $context ) use ( &$last_context ) {
+				$last_context = $context;
+				return $context;
+			},
+			11
+		);
+	}
+
 	public function filter_post_thumbnail_size( $size, $post_id ) {
 		if ( is_array( $this->current_size_filter_data ) && isset( $this->current_size_filter_data[ $post_id ] ) ) {
 			return $this->current_size_filter_data[ $post_id ];
diff --git a/tests/phpunit/tests/post/truncatePostSlug.php b/tests/phpunit/tests/post/truncatePostSlug.php
new file mode 100644
index 0000000000000..88ea9481dd936
--- /dev/null
+++ b/tests/phpunit/tests/post/truncatePostSlug.php
@@ -0,0 +1,105 @@
+<?php
+
+/**
+ * @group post
+ *
+ * @covers ::_truncate_post_slug
+ */
+class Tests_Post_TruncatePostSlug extends WP_UnitTestCase {
+
+	/**
+	 * Tests that _truncate_post_slug() correctly truncates slugs.
+	 *
+	 * @ticket 56868
+	 *
+	 * @dataProvider data_truncate_post_slug_should_truncate
+	 *
+	 * @param string $slug     The slug to truncate.
+	 * @param int    $length   Max length of the slug.
+	 * @param string $expected The expected truncated slug.
+	 * @param string $message  Test feedback message.
+	 */
+	public function test_truncate_post_slug_should_truncate( $slug, $length, $expected, $message ) {
+		$this->assertSame( $expected, _truncate_post_slug( $slug, $length ), $message );
+	}
+
+	/**
+	 * Data provider for test_truncate_post_slug_should_truncate().
+	 *
+	 * @return array[]
+	 */
+	public function data_truncate_post_slug_should_truncate() {
+		return array(
+			'a slug that is too long'                      => array(
+				'slug'     => 'truncated slug',
+				'length'   => 9,
+				'expected' => 'truncated',
+				'message'  => '"truncated slug" should have been truncated to "truncated".',
+			),
+			'a slug that is too long and ends with a dash' => array(
+				'slug'     => 'truncated-slug',
+				'length'   => 10,
+				'expected' => 'truncated',
+				'message'  => '"truncated-slug" should have been truncated to "truncated".',
+			),
+
+			// URL-encoded characters.
+			'URL-encoded characters and "length" includes the first URL-encoded character' => array(
+				'slug'     => 'myslug%2F',
+				'length'   => 7,
+				'expected' => 'myslug',
+				'message'  => '"myslug%2F" should have been truncated to "myslug".',
+			),
+			'URL-encoded characters and "length" includes the second URL-encoded character' => array(
+				'slug'     => 'myslug%2F',
+				'length'   => 8,
+				'expected' => 'myslug',
+				'message'  => '"myslug%2F" should have been truncated to "myslug".',
+			),
+			'URL-encoded characters and "length" includes the third URL-encoded character' => array(
+				'slug'     => 'myslug%2F',
+				'length'   => 9,
+				'expected' => 'myslug%2F',
+				'message'  => '"myslug%2F" should have been truncated to "myslug%2F".',
+			),
+
+			// URL-encoded accent characters.
+			'URL-encoded accent characters and "length" includes the first URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 7,
+				'expected' => 'myslug',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
+			),
+			'URL-encoded accent characters and "length" includes the second URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 8,
+				'expected' => 'myslug',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
+			),
+			'URL-encoded accent characters and "length" includes the third URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 9,
+				'expected' => 'myslug',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
+			),
+			'URL-encoded accent characters and "length" includes the fourth URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 10,
+				'expected' => 'myslug',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
+			),
+			'URL-encoded accent characters and "length" includes the fifth URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 11,
+				'expected' => 'myslug',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
+			),
+			'URL-encoded accent characters and "length" includes the fifth URL-encoded character' => array(
+				'slug'     => 'myslug%C4%85',
+				'length'   => 12,
+				'expected' => 'myslug%C4%85',
+				'message'  => '"myslug%C4%85" should have been truncated to "myslug%C4%85".',
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/post/types.php b/tests/phpunit/tests/post/types.php
index 5ea10cbb2c6cf..df1543fa0c9ca 100644
--- a/tests/phpunit/tests/post/types.php
+++ b/tests/phpunit/tests/post/types.php
@@ -256,7 +256,7 @@ public function test_get_post_type_object_with_non_scalar_values() {
 		$this->assertNotNull( get_post_type_object( 'foo' ) );
 		$this->assertNull( get_post_type_object( array() ) );
 		$this->assertNull( get_post_type_object( array( 'foo' ) ) );
-		$this->assertNull( get_post_type_object( new stdClass ) );
+		$this->assertNull( get_post_type_object( new stdClass() ) );
 
 		_unregister_post_type( 'foo' );
 
diff --git a/tests/phpunit/tests/post/updatePostCache.php b/tests/phpunit/tests/post/updatePostCache.php
index cfb279b67c64f..9427ec6fbda58 100644
--- a/tests/phpunit/tests/post/updatePostCache.php
+++ b/tests/phpunit/tests/post/updatePostCache.php
@@ -57,7 +57,7 @@ public function test_query_caches_post_filter() {
 			'The cached post is not an object'
 		);
 
-		$this->assertObjectHasAttribute(
+		$this->assertObjectHasProperty(
 			'filter',
 			$cached_post,
 			'The cached post does not have a "filter" property'
@@ -98,7 +98,7 @@ public function test_get_post_caches_post_filter_is_always_raw() {
 			'The cached post is not an object'
 		);
 
-		$this->assertObjectHasAttribute(
+		$this->assertObjectHasProperty(
 			'filter',
 			$cached_post,
 			'The cached post does not have a "filter" property'
@@ -126,7 +126,7 @@ public function test_get_posts_caches_post_filter_is_always_raw() {
 			'The cached post is not an object'
 		);
 
-		$this->assertObjectHasAttribute(
+		$this->assertObjectHasProperty(
 			'filter',
 			$cached_post,
 			'The cached post does not have a "filter" property'
diff --git a/tests/phpunit/tests/post/wpAfterInsertPost.php b/tests/phpunit/tests/post/wpAfterInsertPost.php
index c81ad21387208..f184c66e01288 100644
--- a/tests/phpunit/tests/post/wpAfterInsertPost.php
+++ b/tests/phpunit/tests/post/wpAfterInsertPost.php
@@ -171,7 +171,7 @@ public function test_update_via_rest_contoller() {
 		$post_id = self::$post_id;
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $post_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( array( 'title' => 'new title' ) );
 		rest_get_server()->dispatch( $request );
 
@@ -188,7 +188,7 @@ public function test_new_post_via_rest_contoller() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', sprintf( '/wp/v2/posts' ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params(
 			array(
 				'title'  => 'new title',
@@ -211,7 +211,7 @@ public function test_update_attachment_via_rest_contoller() {
 		$attachment_id = self::$attachment_id;
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/media/%d', $attachment_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( array( 'title' => 'new attachment title' ) );
 		rest_get_server()->dispatch( $request );
 
diff --git a/tests/phpunit/tests/post/wpDropdownPages.php b/tests/phpunit/tests/post/wpDropdownPages.php
new file mode 100644
index 0000000000000..d838875f1d315
--- /dev/null
+++ b/tests/phpunit/tests/post/wpDropdownPages.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * @group post
+ * @group template
+ *
+ * @covers ::wp_dropdown_pages
+ */
+class Tests_Post_wpDropdownPages extends WP_UnitTestCase {
+
+	public function test_wp_dropdown_pages() {
+		$none = wp_dropdown_pages( array( 'echo' => 0 ) );
+		$this->assertEmpty( $none );
+
+		$bump          = '&nbsp;&nbsp;&nbsp;';
+		$page_id       = self::factory()->post->create( array( 'post_type' => 'page' ) );
+		$child_id      = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_parent' => $page_id,
+			)
+		);
+		$grandchild_id = self::factory()->post->create(
+			array(
+				'post_type'   => 'page',
+				'post_parent' => $child_id,
+			)
+		);
+
+		$title1 = get_post( $page_id )->post_title;
+		$title2 = get_post( $child_id )->post_title;
+		$title3 = get_post( $grandchild_id )->post_title;
+
+		$lineage = <<<LINEAGE
+<select name='page_id' id='page_id'>
+	<option class="level-0" value="$page_id">$title1</option>
+	<option class="level-1" value="$child_id">{$bump}$title2</option>
+	<option class="level-2" value="$grandchild_id">{$bump}{$bump}$title3</option>
+</select>
+
+LINEAGE;
+
+		$output = wp_dropdown_pages( array( 'echo' => 0 ) );
+		$this->assertSameIgnoreEOL( $lineage, $output );
+
+		$depth = <<<DEPTH
+<select name='page_id' id='page_id'>
+	<option class="level-0" value="$page_id">$title1</option>
+</select>
+
+DEPTH;
+
+		$output = wp_dropdown_pages(
+			array(
+				'echo'  => 0,
+				'depth' => 1,
+			)
+		);
+		$this->assertSameIgnoreEOL( $depth, $output );
+
+		$option_none = <<<NONE
+<select name='page_id' id='page_id'>
+	<option value="Woo">Hoo</option>
+	<option class="level-0" value="$page_id">$title1</option>
+</select>
+
+NONE;
+
+		$output = wp_dropdown_pages(
+			array(
+				'echo'              => 0,
+				'depth'             => 1,
+				'show_option_none'  => 'Hoo',
+				'option_none_value' => 'Woo',
+			)
+		);
+		$this->assertSameIgnoreEOL( $option_none, $output );
+
+		$option_no_change = <<<NO
+<select name='page_id' id='page_id'>
+	<option value="-1">Burrito</option>
+	<option value="Woo">Hoo</option>
+	<option class="level-0" value="$page_id">$title1</option>
+</select>
+
+NO;
+
+		$output = wp_dropdown_pages(
+			array(
+				'echo'                  => 0,
+				'depth'                 => 1,
+				'show_option_none'      => 'Hoo',
+				'option_none_value'     => 'Woo',
+				'show_option_no_change' => 'Burrito',
+			)
+		);
+		$this->assertSameIgnoreEOL( $option_no_change, $output );
+	}
+
+	/**
+	 * @ticket 12494
+	 */
+	public function test_wp_dropdown_pages_value_field_should_default_to_ID() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo' => 0,
+			)
+		);
+
+		// Should contain page ID by default.
+		$this->assertStringContainsString( 'value="' . $p . '"', $found );
+	}
+
+	/**
+	 * @ticket 12494
+	 */
+	public function test_wp_dropdown_pages_value_field_ID() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo'        => 0,
+				'value_field' => 'ID',
+			)
+		);
+
+		$this->assertStringContainsString( 'value="' . $p . '"', $found );
+	}
+
+	/**
+	 * @ticket 12494
+	 */
+	public function test_wp_dropdown_pages_value_field_post_name() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+				'post_name' => 'foo',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo'        => 0,
+				'value_field' => 'post_name',
+			)
+		);
+
+		$this->assertStringContainsString( 'value="foo"', $found );
+	}
+
+	/**
+	 * @ticket 12494
+	 */
+	public function test_wp_dropdown_pages_value_field_should_fall_back_on_ID_when_an_invalid_value_is_provided() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+				'post_name' => 'foo',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo'        => 0,
+				'value_field' => 'foo',
+			)
+		);
+
+		$this->assertStringContainsString( 'value="' . $p . '"', $found );
+	}
+
+	/**
+	 * @ticket 30082
+	 */
+	public function test_wp_dropdown_pages_should_not_contain_class_attribute_when_no_class_is_passed() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+				'post_name' => 'foo',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo' => 0,
+			)
+		);
+
+		$this->assertDoesNotMatchRegularExpression( '/<select[^>]+class=\'/', $found );
+	}
+
+	/**
+	 * @ticket 30082
+	 */
+	public function test_wp_dropdown_pages_should_obey_class_parameter() {
+		$p = self::factory()->post->create(
+			array(
+				'post_type' => 'page',
+				'post_name' => 'foo',
+			)
+		);
+
+		$found = wp_dropdown_pages(
+			array(
+				'echo'  => 0,
+				'class' => 'bar',
+			)
+		);
+
+		$this->assertMatchesRegularExpression( '/<select[^>]+class=\'bar\'/', $found );
+	}
+}
diff --git a/tests/phpunit/tests/post/wpGetAttachmentLink.php b/tests/phpunit/tests/post/wpGetAttachmentLink.php
new file mode 100644
index 0000000000000..2d658e002e572
--- /dev/null
+++ b/tests/phpunit/tests/post/wpGetAttachmentLink.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @group post
+ * @group media
+ * @group upload
+ *
+ * @covers ::wp_get_attachment_link
+ */
+class Tests_Post_WpGetAttachmentLink extends WP_UnitTestCase {
+
+	/**
+	 * The ID of an attachment for testing.
+	 *
+	 * @var int $attachment
+	 */
+	private static $attachment;
+
+	/**
+	 * Creates an attachment for testing before any tests run.
+	 */
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		self::$attachment = self::factory()->attachment->create();
+	}
+
+	/**
+	 * Tests that wp_get_attachment_link() applies the
+	 * wp_get_attachment_link_attributes filter.
+	 *
+	 * @ticket 41574
+	 *
+	 * @dataProvider data_should_apply_attributes_filter
+	 *
+	 * @param array  $attributes Attributes to return from the callback.
+	 * @param string $expected   The substring expected to be in the attachment link.
+	 */
+	public function test_should_apply_attributes_filter( $attributes, $expected ) {
+		$expected = str_replace( 'ATTACHMENT_ID', self::$attachment, $expected );
+
+		add_filter(
+			'wp_get_attachment_link_attributes',
+			static function( $attr ) use ( $attributes ) {
+				return array_merge( $attr, $attributes );
+			}
+		);
+
+		$this->assertStringContainsString(
+			$expected,
+			wp_get_attachment_link( self::$attachment )
+		);
+	}
+
+	/**
+	 * Data provider for test_should_apply_attributes_filter().
+	 *
+	 * @return array[]
+	 */
+	public function data_should_apply_attributes_filter() {
+		return array(
+			'no new attributes'                         => array(
+				'attributes' => array(),
+				'expected'   => "<a href='http://example.org/?attachment_id=ATTACHMENT_ID'>",
+			),
+			'one new attribute'                         => array(
+				'attributes' => array(
+					'class' => 'test-attribute-filter',
+				),
+				'expected'   => " class='test-attribute-filter'",
+			),
+			'two new attributes'                        => array(
+				'attributes' => array(
+					'class' => 'test-attribute-filter',
+					'id'    => 'test-attribute-filter-1',
+				),
+				'expected'   => " class='test-attribute-filter' id='test-attribute-filter-1'",
+			),
+			'an existing attribute'                     => array(
+				'attributes' => array(
+					'href' => 'http://test-attribute-filter.org',
+				),
+				'expected'   => " href='http://test-attribute-filter.org'",
+			),
+			'an existing attribute and a new attribute' => array(
+				'attributes' => array(
+					'href'  => 'http://test-attribute-filter.org',
+					'class' => 'test-attribute-filter',
+				),
+				'expected'   => " href='http://test-attribute-filter.org' class='test-attribute-filter'",
+			),
+			'an attribute name with unsafe characters'  => array(
+				'attributes' => array(
+					"> <script>alert('Howdy, admin!')</script> <a href=''></a" => '',
+				),
+				'expected'   => " &gt; &lt;script&gt;alert(&#039;Howdy, admin!&#039;)&lt;/script&gt; &lt;a href=&#039;&#039;&gt;&lt;/a=''",
+			),
+			'an attribute value with unsafe characters' => array(
+				'attributes' => array(
+					'class' => "'> <script>alert('Howdy, admin!')</script> <a href=''></a",
+				),
+				'expected'   => '&#039;&gt; &lt;script&gt;alert(&#039;Howdy, admin!&#039;)&lt;/script&gt; &lt;a href=&#039;&#039;&gt;&lt;/a',
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/tests/post/wpInsertPost.php b/tests/phpunit/tests/post/wpInsertPost.php
index 05a24453e3c0d..167d29dd39adf 100644
--- a/tests/phpunit/tests/post/wpInsertPost.php
+++ b/tests/phpunit/tests/post/wpInsertPost.php
@@ -879,7 +879,7 @@ public function test_wp_insert_post_for_customize_changeset_should_not_drop_post
 	/**
 	 * @ticket 19954
 	 */
-	function test_updating_a_post_should_not_trash_categories() {
+	public function test_updating_a_post_should_not_trash_categories() {
 		// Create a category and attach it to a new post.
 		$term_id = self::factory()->term->create(
 			array(
@@ -1192,7 +1192,7 @@ public function test_insert_invalid_post_date() {
 				'post_status' => 'draft',
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 
 		$post_id = self::factory()->post->create(
 			array(
@@ -1201,7 +1201,7 @@ public function test_insert_invalid_post_date() {
 				'post_status'   => 'draft',
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 
 		// Empty post_date_gmt without floating status
 		$post_id = self::factory()->post->create(
@@ -1210,7 +1210,7 @@ public function test_insert_invalid_post_date() {
 				'post_status' => 'publish',
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 
 		$post_id = self::factory()->post->create(
 			array(
@@ -1219,7 +1219,7 @@ public function test_insert_invalid_post_date() {
 				'post_status'   => 'publish',
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 
 		// Valid post_date_gmt
 		$post_id = self::factory()->post->create(
@@ -1228,7 +1228,7 @@ public function test_insert_invalid_post_date() {
 				'post_date_gmt' => $post_date_gmt,
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 
 		// Invalid post_date_gmt
 		$post_id = self::factory()->post->create(
@@ -1237,7 +1237,7 @@ public function test_insert_invalid_post_date() {
 				'post_date_gmt' => $invalid_date,
 			)
 		);
-		$this->assertSame( 0, $post_id );
+		$this->assertWPError( $post_id );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/post/wpLinkPages.php b/tests/phpunit/tests/post/wpLinkPages.php
new file mode 100644
index 0000000000000..861ffb9fa8cc6
--- /dev/null
+++ b/tests/phpunit/tests/post/wpLinkPages.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * @group post
+ * @group template
+ *
+ * @covers ::wp_link_pages
+ */
+class Tests_Post_wpLinkPages extends WP_UnitTestCase {
+
+	public function test_wp_link_pages() {
+		$contents = array( 'One', 'Two', 'Three' );
+		$content  = implode( '<!--nextpage-->', $contents );
+		$post_id  = self::factory()->post->create( array( 'post_content' => $content ) );
+
+		$this->go_to( '?p=' . $post_id );
+
+		setup_postdata( get_post( $post_id ) );
+
+		$permalink = sprintf( '<a href="%s" class="post-page-numbers">', get_permalink() );
+		$page2     = _wp_link_page( 2 );
+		$page3     = _wp_link_page( 3 );
+
+		$expected = '<p class="post-nav-links">Pages: <span class="post-page-numbers current" aria-current="page">1</span> ' . $page2 . '2</a> ' . $page3 . '3</a></p>';
+		$output   = wp_link_pages( array( 'echo' => 0 ) );
+
+		$this->assertSame( $expected, $output );
+
+		$before_after = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> {$page2}2</a> {$page3}3</a>";
+		$output       = wp_link_pages(
+			array(
+				'echo'   => 0,
+				'before' => '',
+				'after'  => '',
+			)
+		);
+
+		$this->assertSame( $before_after, $output );
+
+		$separator = " <span class=\"post-page-numbers current\" aria-current=\"page\">1</span>{$page2}2</a>{$page3}3</a>";
+		$output    = wp_link_pages(
+			array(
+				'echo'      => 0,
+				'before'    => '',
+				'after'     => '',
+				'separator' => '',
+			)
+		);
+
+		$this->assertSame( $separator, $output );
+
+		$link   = " <span class=\"post-page-numbers current\" aria-current=\"page\"><em>1</em></span>{$page2}<em>2</em></a>{$page3}<em>3</em></a>";
+		$output = wp_link_pages(
+			array(
+				'echo'        => 0,
+				'before'      => '',
+				'after'       => '',
+				'separator'   => '',
+				'link_before' => '<em>',
+				'link_after'  => '</em>',
+			)
+		);
+
+		$this->assertSame( $link, $output );
+
+		$next   = "{$page2}<em>Next page</em></a>";
+		$output = wp_link_pages(
+			array(
+				'echo'           => 0,
+				'before'         => '',
+				'after'          => '',
+				'separator'      => '',
+				'link_before'    => '<em>',
+				'link_after'     => '</em>',
+				'next_or_number' => 'next',
+			)
+		);
+
+		$this->assertSame( $next, $output );
+
+		$GLOBALS['page'] = 2;
+		$next_prev       = "{$permalink}<em>Previous page</em></a>{$page3}<em>Next page</em></a>";
+		$output          = wp_link_pages(
+			array(
+				'echo'           => 0,
+				'before'         => '',
+				'after'          => '',
+				'separator'      => '',
+				'link_before'    => '<em>',
+				'link_after'     => '</em>',
+				'next_or_number' => 'next',
+			)
+		);
+
+		$this->assertSame( $next_prev, $output );
+
+		$next_prev_link = "{$permalink}Woo page</a>{$page3}Hoo page</a>";
+		$output         = wp_link_pages(
+			array(
+				'echo'             => 0,
+				'before'           => '',
+				'after'            => '',
+				'separator'        => '',
+				'next_or_number'   => 'next',
+				'nextpagelink'     => 'Hoo page',
+				'previouspagelink' => 'Woo page',
+			)
+		);
+
+		$this->assertSame( $next_prev_link, $output );
+
+		$GLOBALS['page'] = 1;
+		$separator       = "<p class=\"post-nav-links\">Pages: <span class=\"post-page-numbers current\" aria-current=\"page\">1</span> | {$page2}2</a> | {$page3}3</a></p>";
+		$output          = wp_link_pages(
+			array(
+				'echo'      => 0,
+				'separator' => ' | ',
+			)
+		);
+
+		$this->assertSame( $separator, $output );
+
+		$pagelink = " <span class=\"post-page-numbers current\" aria-current=\"page\">Page 1</span> | {$page2}Page 2</a> | {$page3}Page 3</a>";
+		$output   = wp_link_pages(
+			array(
+				'echo'      => 0,
+				'separator' => ' | ',
+				'before'    => '',
+				'after'     => '',
+				'pagelink'  => 'Page %',
+			)
+		);
+
+		$this->assertSame( $pagelink, $output );
+	}
+}
diff --git a/tests/phpunit/tests/post/wpListPages.php b/tests/phpunit/tests/post/wpListPages.php
index f59585a71cc03..38ba729cee20b 100644
--- a/tests/phpunit/tests/post/wpListPages.php
+++ b/tests/phpunit/tests/post/wpListPages.php
@@ -448,4 +448,60 @@ public function test_wp_list_pages_discarded_whitespace() {
 
 		$this->assertSame( $expected, wp_list_pages( $args ) );
 	}
+
+	/**
+	 * @ticket 17590
+	 */
+	public function test_wp_list_pages_classes_with_hierarchical_cpt() {
+		$args = array(
+			'echo'      => false,
+			'post_type' => 'taco',
+		);
+
+		register_post_type(
+			$args['post_type'],
+			array(
+				'hierarchical' => true,
+				'public'       => true,
+			)
+		);
+
+		$posts   = self::factory()->post->create_many( 2, array( 'post_type' => $args['post_type'] ) );
+		$post_id = reset( $posts );
+
+		$this->go_to( "/?p={$post_id}&post_type={$args['post_type']}" );
+
+		$this->assertSame(
+			$post_id,
+			get_queried_object_id(),
+			'The queried object ID should match the ID of the requested CPT item.'
+		);
+
+		$output = wp_list_pages( $args );
+
+		_unregister_post_type( $args['post_type'] );
+
+		$this->assertNotEmpty(
+			$output,
+			'The output should not be empty.'
+		);
+
+		$this->assertSame(
+			2,
+			substr_count( $output, 'class="page_item ' ),
+			'The number of "page_item" classes should be equal to the total CPT items count.'
+		);
+
+		$this->assertStringContainsString(
+			'current_page_item',
+			$output,
+			'The output should contain the "current_page_item" class.'
+		);
+
+		$this->assertSame(
+			1,
+			substr_count( $output, 'current_page_item' ),
+			'The output should contain exactly one "current_page_item" class.'
+		);
+	}
 }
diff --git a/tests/phpunit/tests/post/wpTrashPost.php b/tests/phpunit/tests/post/wpTrashPost.php
new file mode 100644
index 0000000000000..1b1a5d6aad508
--- /dev/null
+++ b/tests/phpunit/tests/post/wpTrashPost.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @group post
+ *
+ * @covers ::wp_trash_post
+ */
+class Tests_Post_WpTrashPost extends WP_UnitTestCase {
+	/**
+	 * @var WP_Post
+	 */
+	protected $post;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->post = $this->factory()->post->create_and_get(
+			array(
+				'post_status' => 'draft',
+			)
+		);
+	}
+
+	/**
+	 * Tests that wp_trash_post() returns a WP_Post object
+	 * and sets the correct post meta to trash a post.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_trash_post
+	 */
+	public function test_trash_post() {
+		$result = wp_trash_post( $this->post->ID );
+
+		$this->assertInstanceOf( 'WP_Post', $result, 'wp_trash_post returned value should be an instance of WP_Post.' );
+
+		$trashed = get_posts(
+			array(
+				'post_status' => 'trash',
+				'fields'      => 'ids',
+			)
+		);
+
+		$this->assertContains( $this->post->ID, $trashed, 'The post should be trashed.' );
+
+		$trashed_post_metas = get_post_meta( $this->post->ID );
+
+		$this->assertArrayHasKey( '_wp_trash_meta_status', $trashed_post_metas, 'Trashed post should have _wp_trash_meta_status meta set.' );
+		$this->assertCount( 1, $trashed_post_metas['_wp_trash_meta_status'], 'Trashed post should have only one _wp_trash_meta_status meta set.' );
+		$this->assertSame( $this->post->post_status, reset( $trashed_post_metas['_wp_trash_meta_status'] ), 'Trashed post should have _wp_trash_meta_status meta set to previous post status.' );
+		$this->assertArrayHasKey( '_wp_trash_meta_time', $trashed_post_metas, 'Trashed post should have _wp_trash_meta_time meta set.' );
+		$this->assertCount( 1, $trashed_post_metas['_wp_trash_meta_time'], 'Trashed post should have only one _wp_trash_meta_time meta set.' );
+	}
+
+	/**
+	 * Tests that wp_trash_post() applies 'pre_trash_post' filters
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_trash_post
+	 */
+	public function test_pre_trash_post_hook() {
+		add_filter(
+			'pre_trash_post',
+			function ( $trash, $post, $previous_status ) {
+				$this->assertNull( $trash, 'pre_trash_post first parameter should be null.' );
+				$this->assertSame( $this->post->ID, $post->ID, 'pre_trash_post second parameter should be the trashed post ID.' );
+				$this->assertSame( $this->post->post_status, $previous_status, 'pre_trash_post third parameter should be the previous trashed post status.' );
+
+				return $trash;
+			},
+			10,
+			3
+		);
+
+		wp_trash_post( $this->post->ID );
+
+		$this->assertGreaterThan( 0, did_filter( 'pre_trash_post' ), 'pre_trash_post filter was not called.' );
+	}
+
+	/**
+	 * Tests that wp_trash_post() triggers the 'wp_trash_post' action
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_trash_post
+	 */
+	public function test_wp_trash_post_hook() {
+		add_action(
+			'wp_trash_post',
+			function ( $post_id, $previous_status ) {
+				$this->assertSame( $this->post->ID, $post_id, 'wp_trash_post first parameter should be the trashed post ID.' );
+				$this->assertSame( $this->post->post_status, $previous_status, 'wp_trash_post second parameter should be the previous trashed post status.' );
+			},
+			10,
+			2
+		);
+
+		wp_trash_post( $this->post->ID );
+
+		$this->assertGreaterThan( 0, did_action( 'wp_trash_post' ), 'wp_trash_post action was not called.' );
+	}
+
+	/**
+	 * Tests that wp_trash_post() triggers the 'trashed_post' action
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_trash_post
+	 */
+	public function test_trashed_post_hook() {
+		add_action(
+			'trashed_post',
+			function ( $post_id, $previous_status ) {
+				$this->assertSame( $this->post->ID, $post_id, 'trashed_post first parameter should be the trashed post ID.' );
+				$this->assertSame( $this->post->post_status, $previous_status, 'trashed_post second parameter should be the previous trashed post status.' );
+			},
+			10,
+			2
+		);
+
+		wp_trash_post( $this->post->ID );
+
+		$this->assertGreaterThan( 0, did_action( 'trashed_post' ), 'trashed_post action was not called.' );
+	}
+}
diff --git a/tests/phpunit/tests/post/wpUniquePostSlug.php b/tests/phpunit/tests/post/wpUniquePostSlug.php
index 6d279bbbd5ab0..f242159987e3f 100644
--- a/tests/phpunit/tests/post/wpUniquePostSlug.php
+++ b/tests/phpunit/tests/post/wpUniquePostSlug.php
@@ -128,7 +128,7 @@ public function test_wp_unique_post_slug_with_hierarchy_and_attachments() {
 	}
 
 	/**
-	 * @dataProvider allowed_post_statuses
+	 * @dataProvider data_allowed_post_statuses_should_not_be_forced_to_be_unique
 	 */
 	public function test_allowed_post_statuses_should_not_be_forced_to_be_unique( $status ) {
 		$p1 = self::factory()->post->create(
@@ -149,7 +149,7 @@ public function test_allowed_post_statuses_should_not_be_forced_to_be_unique( $s
 		$this->assertSame( 'foo', $actual );
 	}
 
-	public function allowed_post_statuses() {
+	public function data_allowed_post_statuses_should_not_be_forced_to_be_unique() {
 		return array(
 			array( 'draft' ),
 			array( 'pending' ),
diff --git a/tests/phpunit/tests/post/wpUntrashPost.php b/tests/phpunit/tests/post/wpUntrashPost.php
new file mode 100644
index 0000000000000..a4843dd2a2076
--- /dev/null
+++ b/tests/phpunit/tests/post/wpUntrashPost.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @group post
+ *
+ * @covers ::wp_untrash_post
+ */
+class Tests_Post_WpUntrashPost extends WP_UnitTestCase {
+	/**
+	 * @var WP_Post
+	 */
+	protected $trashed_post;
+
+	public function set_up() {
+		parent::set_up();
+
+		$this->trashed_post = wp_trash_post(
+			$this->factory()->post->create(
+				array(
+					'post_status' => 'draft',
+				)
+			)
+		);
+	}
+
+	/**
+	 * Tests that wp_untrash_post() returns a WP_Post object,
+	 * removes post meta for an untrashed post and sets it to a 'Draft'.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_untrash_post
+	 */
+	public function test_untrash_post() {
+		$result = wp_untrash_post( $this->trashed_post->ID );
+
+		$this->assertInstanceOf( 'WP_Post', $result, 'wp_untrash_post returned value should be an instance of WP_Post.' );
+
+		$trashed = get_posts(
+			array(
+				'post_status' => 'trash',
+				'fields'      => 'ids',
+			)
+		);
+
+		$this->assertNotContains( $this->trashed_post->ID, $trashed, 'Untrashed post should not belong to trashed posts anymore.' );
+
+		$untrashed_post_metas = get_post_meta( $this->trashed_post->ID );
+
+		$this->assertArrayNotHasKey( '_wp_trash_meta_status', $untrashed_post_metas, 'Untrashed post should not have _wp_trash_meta_status meta anymore.' );
+		$this->assertArrayNotHasKey( '_wp_trash_meta_time', $untrashed_post_metas, 'Untrashed post should not have _wp_trash_meta_time meta anymore.' );
+
+		$post = get_post( $this->trashed_post->ID );
+
+		$this->assertSame( 'draft', $post->post_status, 'Untrashed post should have its previous status set correctly.' );
+	}
+
+	/**
+	 * Tests that wp_untrash_post() applies 'pre_untrash_post' filters
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_untrash_post
+	 */
+	public function test_pre_untrash_post_hook() {
+		add_filter(
+			'pre_untrash_post',
+			function ( $trash, $post, $previous_status ) {
+				$this->assertNull( $trash, 'pre_untrash_post first parameter should be null.' );
+				$this->assertSame( $this->trashed_post->ID, $post->ID, 'pre_untrash_post second parameter should be the trashed post ID.' );
+				$this->assertSame( $this->trashed_post->post_status, $previous_status, 'pre_untrash_post third parameter should be the previous trashed post status.' );
+
+				return $trash;
+			},
+			10,
+			3
+		);
+
+		wp_untrash_post( $this->trashed_post->ID );
+
+		$this->assertGreaterThan( 0, did_filter( 'pre_untrash_post' ), 'pre_untrash_post filter was not called.' );
+	}
+
+	/**
+	 * Tests that wp_untrash_post() triggers the 'untrash_post' action
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_untrash_post
+	 */
+	public function test_untrash_post_hook() {
+		add_action(
+			'untrash_post',
+			function ( $post_id, $previous_status ) {
+				$this->assertSame( $this->trashed_post->ID, $post_id, 'untrash_post first parameter should be the trashed post ID.' );
+				$this->assertSame( $this->trashed_post->post_status, $previous_status, 'untrash_post second parameter should be the previous trashed post status.' );
+			},
+			10,
+			2
+		);
+
+		wp_untrash_post( $this->trashed_post->ID );
+
+		$this->assertGreaterThan( 0, did_action( 'untrash_post' ), 'untrash_post action was not called.' );
+	}
+
+	/**
+	 * Tests that wp_untrash_post() triggers the 'untrashed_post' action
+	 * and passes the expected values to callbacks.
+	 *
+	 * @ticket 58392
+	 *
+	 * @covers ::wp_untrash_post
+	 */
+	public function test_untrashed_post_hook() {
+		add_action(
+			'untrashed_post',
+			function ( $post_id, $previous_status ) {
+				$this->assertSame( $this->trashed_post->ID, $post_id, 'untrashed_post first parameter should be the trashed post ID.' );
+				$this->assertSame( $this->trashed_post->post_status, $previous_status, 'untrashed_post second parameter should be the previous trashed post status.' );
+			},
+			10,
+			2
+		);
+
+		wp_untrash_post( $this->trashed_post->ID );
+
+		$this->assertGreaterThan( 0, did_action( 'untrashed_post' ), 'untrashed_post action was not called.' );
+	}
+}
diff --git a/tests/phpunit/tests/privacy/wpCreateUserRequest.php b/tests/phpunit/tests/privacy/wpCreateUserRequest.php
index 9c6d9f3516fee..55eb866722b77 100644
--- a/tests/phpunit/tests/privacy/wpCreateUserRequest.php
+++ b/tests/phpunit/tests/privacy/wpCreateUserRequest.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Test the `wp_create_user_request()` function.
+ * Test cases for the `wp_create_user_request()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpCreateUserRequest class.
  *
  * @group privacy
  * @covers ::wp_create_user_request
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpCreateUserRequest extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php b/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
index eb3ae8a2df1ca..0efa6eee4548f 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyCompletedRequest.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Test the `_wp_privacy_completed_request()` function.
+ * Test cases for the `_wp_privacy_completed_request()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Tests_Privacy_wpPrivacyCompletedRequest class.
  *
  * @group privacy
  * @covers ::_wp_privacy_completed_request
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacyCompletedRequest extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php b/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
index 86944682689e2..fb2caab9a493e 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyDeleteOldExportFiles.php
@@ -1,19 +1,13 @@
 <?php
 /**
- * Define a class to test `wp_privacy_delete_old_export_files()`.
+ * Test cases for the `wp_privacy_delete_old_export_files()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Test cases for `wp_privacy_delete_old_export_files()`.
  *
  * @group privacy
  * @covers ::wp_privacy_delete_old_export_files
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacyDeleteOldExportFiles extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
index 784845821e822..840f756344f14 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportFile.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * Define a class to test `wp_privacy_generate_personal_data_export_file()`.
+ * Test cases for the `wp_privacy_generate_personal_data_export_file()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Test cases for `wp_privacy_generate_personal_data_export_file()`.
  *
  * @group privacy
  * @covers ::wp_privacy_generate_personal_data_export_file
  * @requires extension zip
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpPrivacyGeneratePersonalDataExportFile extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
index f85186d0c53a9..5cff95382c28e 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyGeneratePersonalDataExportGroupHtml.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpPrivacyGeneratePersonalDataExportGroupHtml class.
  *
  * @group privacy
  * @covers ::wp_privacy_generate_personal_data_export_group_html
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpPrivacyGeneratePersonalDataExportGroupHtml extends WP_UnitTestCase {
 
diff --git a/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php b/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
index e8d94d4a77b86..3f7f7074e6118 100644
--- a/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
+++ b/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.2.0
- */
-
-/**
- * Tests_Privacy_wpPrivacyProcessPersonalDataExportPage class.
  *
  * @group privacy
  * @covers ::wp_privacy_process_personal_data_export_page
- *
- * @since 5.2.0
  */
 class Tests_Privacy_wpPrivacyProcessPersonalDataExportPage extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php b/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
index ef71a5f85de39..401528a158da4 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 5.1.0
- */
-
-/**
- * Tests_Privacy_wpPrivacySendErasureFulfillmentNotification class.
  *
  * @group privacy
  * @covers ::_wp_privacy_send_erasure_fulfillment_notification
- *
- * @since 5.1.0
  */
 class Tests_Privacy_wpPrivacySendErasureFulfillmentNotification extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php b/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
index 5c9336ad97571..a0f4c96d298b2 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendPersonalDataExportEmail.php
@@ -5,15 +5,9 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Tests_Privacy_wpPrivacySendPersonalDataExportEmail class.
  *
  * @group privacy
  * @covers ::wp_privacy_send_personal_data_export_email
- *
- * @since 4.9.6
  */
 class Tests_Privacy_wpPrivacySendPersonalDataExportEmail extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
index ee083b30c6bad..5374cd5701056 100644
--- a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
+++ b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php
@@ -5,16 +5,10 @@
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.8
- */
-
-/**
- * Tests_Privacy_wpPrivacySendRequestConfirmationNotification class.
  *
  * @group privacy
  * @group user
  * @covers ::_wp_privacy_send_request_confirmation_notification
- *
- * @since 4.9.8
  */
 class Tests_Privacy_wpPrivacySendRequestConfirmationNotification extends WP_UnitTestCase {
 	/**
diff --git a/tests/phpunit/tests/query.php b/tests/phpunit/tests/query.php
index 5ef98e1f726ba..52c6ebfc12ec1 100644
--- a/tests/phpunit/tests/query.php
+++ b/tests/phpunit/tests/query.php
@@ -33,7 +33,7 @@ public function test_nested_loop_reset_postdata() {
 	 * @ticket 16471
 	 */
 	public function test_default_query_var() {
-		$query = new WP_Query;
+		$query = new WP_Query();
 		$this->assertSame( '', $query->get( 'nonexistent' ) );
 		$this->assertFalse( $query->get( 'nonexistent', false ) );
 		$this->assertTrue( $query->get( 'nonexistent', true ) );
@@ -897,4 +897,71 @@ public function test_query_tag_404_does_not_throw_warning() {
 		$this->assertFalse( $q->is_tax() );
 		$this->assertFalse( $q->is_tag( 'non-existent-tag' ) );
 	}
+
+	/**
+	 * Test if $before_loop is true before loop.
+	 *
+	 * @ticket 58211
+	 */
+	public function test_before_loop_value_set_true_before_the_loop() {
+		// Get a new query with 3 posts.
+		$query = $this->get_new_wp_query_with_posts( 3 );
+
+		$this->assertTrue( $query->before_loop );
+	}
+
+	/**
+	 * Test $before_loop value is set to false when the loop starts.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers WP_Query::the_post
+	 */
+	public function test_before_loop_value_set_to_false_in_loop_with_post() {
+		// Get a new query with 2 posts.
+		$query = $this->get_new_wp_query_with_posts( 2 );
+
+		while ( $query->have_posts() ) {
+			// $before_loop should be set false as soon as the_post is called for the first time.
+			$query->the_post();
+
+			$this->assertFalse( $query->before_loop );
+			break;
+		}
+	}
+
+	/**
+	 * Test $before_loop value is set to false when there is no post in the loop.
+	 *
+	 * @ticket 58211
+	 *
+	 * @covers WP_Query::have_posts
+	 */
+	public function test_before_loop_set_false_after_loop_with_no_post() {
+		// New query without any posts in the result.
+		$query = new WP_Query(
+			array(
+				'category_name' => 'non-existent-category',
+			)
+		);
+
+		// There will not be any posts, so the loop will never actually enter.
+		while ( $query->have_posts() ) {
+			$query->the_post();
+		}
+
+		// Still, this should be false as there are no results and entering the loop was attempted.
+		$this->assertFalse( $query->before_loop );
+	}
+
+	/**
+	 * Get a new query with a given number of posts.
+	 *
+	 * @param int $no_of_posts Number of posts to be added in the query.
+	 */
+	public function get_new_wp_query_with_posts( $no_of_posts ) {
+		$post_ids = self::factory()->post->create_many( $no_of_posts );
+		$query    = new WP_Query( array( 'post__in' => $post_ids ) );
+		return $query;
+	}
 }
diff --git a/tests/phpunit/tests/query/cacheResults.php b/tests/phpunit/tests/query/cacheResults.php
index d133dd862c2ba..6ddaffd273ab2 100644
--- a/tests/phpunit/tests/query/cacheResults.php
+++ b/tests/phpunit/tests/query/cacheResults.php
@@ -1210,4 +1210,133 @@ public function data_query_cache_with_empty_result_set() {
 			array( 'id=>parent', 'id=>parent' ),
 		);
 	}
+
+	/**
+	 * Ensure starting the loop warms the author cache.
+	 *
+	 * @since 6.1.1
+	 * @ticket 56948
+	 *
+	 * @covers WP_Query::the_post
+	 *
+	 * @dataProvider data_author_cache_warmed_by_the_loop
+	 *
+	 * @param string $fields Query fields.
+	 */
+	public function test_author_cache_warmed_by_the_loop( $fields ) {
+		// Update post author for the parent post.
+		self::factory()->post->update_object( self::$pages[0], array( 'post_author' => self::$author_id ) );
+
+		self::factory()->post->create(
+			array(
+				'post_author' => self::$author_id,
+				'post_parent' => self::$pages[0],
+				'post_type'   => 'page',
+			)
+		);
+
+		$query_1 = new WP_Query(
+			array(
+				'post_type'              => 'page',
+				'fields'                 => $fields,
+				'author'                 => self::$author_id,
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+			)
+		);
+
+		// Start the loop.
+		$start_loop_queries = get_num_queries();
+		$query_1->the_post();
+		$num_loop_queries = get_num_queries() - $start_loop_queries;
+		/*
+		 * Two expected queries:
+		 * 1: User meta data,
+		 * 2: User data.
+		 */
+		$this->assertSame( 2, $num_loop_queries, 'Unexpected number of queries while initializing the loop.' );
+
+		$start_author_queries = get_num_queries();
+		get_user_by( 'ID', self::$author_id );
+		$num_author_queries = get_num_queries() - $start_author_queries;
+		$this->assertSame( 0, $num_author_queries, 'Author cache is not warmed by the loop.' );
+	}
+
+	/**
+	 * Data provider for test_author_cache_warmed_by_the_loop
+	 *
+	 * @return array[]
+	 */
+	public function data_author_cache_warmed_by_the_loop() {
+		return array(
+			'fields: empty' => array( '' ),
+			'fields: all'   => array( 'all' ),
+			'fields: ids'   => array( 'ids' ),
+			/*
+			 * `id=>parent` is untested pending the resolution of an existing bug.
+			 * See https://core.trac.wordpress.org/ticket/56992
+			 */
+		);
+	}
+
+	/**
+	 * Ensure lazy loading term meta queries all term meta in a single query.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @ticket 57163
+	 * @ticket 22176
+	 */
+	public function test_get_post_meta_lazy_loads_all_term_meta_data() {
+		$query = new WP_Query();
+
+		$t2 = $this->factory()->term->create(
+			array(
+				'taxonomy' => 'category',
+				'slug'     => 'bar',
+				'name'     => 'Bar',
+			)
+		);
+
+		wp_set_post_terms( self::$posts[0], $t2, 'category', true );
+		// Clean data added to cache by factory and setting terms.
+		clean_term_cache( array( self::$t1, $t2 ), 'category' );
+		clean_post_cache( self::$posts[0] );
+
+		$num_queries_start = get_num_queries();
+		$query_posts       = $query->query(
+			array(
+				'lazy_load_term_meta' => true,
+				'no_found_rows'       => true,
+			)
+		);
+		$num_queries       = get_num_queries() - $num_queries_start;
+
+		/*
+		 * Four expected queries:
+		 * 1: Post IDs
+		 * 2: Post data
+		 * 3: Post meta data.
+		 * 4: Post term data.
+		 */
+		$this->assertSame( 4, $num_queries, 'Unexpected number of queries while querying posts.' );
+		$this->assertNotEmpty( $query_posts, 'Query posts is empty.' );
+
+		$num_queries_start = get_num_queries();
+		get_term_meta( self::$t1 );
+		$num_queries = get_num_queries() - $num_queries_start;
+
+		/*
+		 * One expected query:
+		 * 1: Term meta data.
+		 */
+		$this->assertSame( 1, $num_queries, 'Unexpected number of queries during first query of term meta.' );
+
+		$num_queries_start = get_num_queries();
+		get_term_meta( $t2 );
+		$num_queries = get_num_queries() - $num_queries_start;
+
+		// No additional queries expected.
+		$this->assertSame( 0, $num_queries, 'Unexpected number of queries during second query of term meta.' );
+	}
 }
diff --git a/tests/phpunit/tests/query/commentFeed.php b/tests/phpunit/tests/query/commentFeed.php
index 35c4eb0b60f8d..23a37f2b40f4c 100644
--- a/tests/phpunit/tests/query/commentFeed.php
+++ b/tests/phpunit/tests/query/commentFeed.php
@@ -28,7 +28,6 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	 * @ticket 36904
 	 */
 	public function test_archive_comment_feed() {
-		global $wpdb;
 		add_filter( 'split_the_query', '__return_false' );
 		$q1   = new WP_Query();
 		$args = array(
@@ -42,12 +41,12 @@ public function test_archive_comment_feed() {
 			'cache_results'          => false,
 		);
 		$q1->query( $args );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q2          = new WP_Query();
 		$q2->query( $args );
 		$this->assertTrue( $q2->is_comment_feed() );
 		$this->assertFalse( $q2->is_singular() );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 
 	/**
@@ -87,7 +86,6 @@ public function test_archive_comment_feed_invalid_cache() {
 	 * @ticket 36904
 	 */
 	public function test_single_comment_feed() {
-		global $wpdb;
 		$post = get_post( self::$post_ids[0] );
 
 		$q1   = new WP_Query();
@@ -103,12 +101,12 @@ public function test_single_comment_feed() {
 		);
 
 		$q1->query( $args );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q2          = new WP_Query();
 		$q2->query( $args );
 
 		$this->assertTrue( $q2->is_comment_feed() );
 		$this->assertTrue( $q2->is_singular() );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 }
diff --git a/tests/phpunit/tests/query/fieldsClause.php b/tests/phpunit/tests/query/fieldsClause.php
new file mode 100644
index 0000000000000..28c040d79cab3
--- /dev/null
+++ b/tests/phpunit/tests/query/fieldsClause.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * @group query
+ *
+ * @covers WP_Query::get_posts
+ */
+class Tests_Query_FieldsClause extends WP_UnitTestCase {
+
+	/**
+	 * Post IDs.
+	 *
+	 * @var int[]
+	 */
+	private static $post_ids = array();
+
+	/**
+	 * Page IDs.
+	 *
+	 * @var int[]
+	 */
+	private static $page_ids = array();
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		// Register CPT for use with shared fixtures.
+		register_post_type( 'wptests_pt' );
+
+		self::$post_ids = $factory->post->create_many( 5, array( 'post_type' => 'wptests_pt' ) );
+	}
+
+	public function set_up() {
+		parent::set_up();
+		/*
+		 * Re-register the CPT for use within each test.
+		 *
+		 * Custom post types are deregistered by the default tear_down method
+		 * so need to be re-registered for each test as WP_Query calls
+		 * get_post_types().
+		 */
+		register_post_type( 'wptests_pt' );
+	}
+
+	/**
+	 * Tests limiting the WP_Query fields to the ID and parent sub-set.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_limit_fields_to_id_and_parent_subset() {
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'id=>parent',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		$expected = array();
+		foreach ( self::$post_ids as $post_id ) {
+			$expected[] = (object) array(
+				'ID'          => $post_id,
+				'post_parent' => 0,
+			);
+		}
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Tests limiting the WP_Query fields to the IDs only.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_limit_fields_to_ids() {
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'ids',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		$expected = self::$post_ids;
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Tests querying all fields via WP_Query.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_query_all_fields() {
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'all',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		$expected = array_map( 'get_post', self::$post_ids );
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Tests adding fields to WP_Query via filters when requesting the ID and parent sub-set.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_include_filtered_values_in_addition_to_id_and_parent_subset() {
+		add_filter( 'posts_fields', array( $this, 'filter_posts_fields' ) );
+		add_filter( 'posts_clauses', array( $this, 'filter_posts_clauses' ) );
+
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'id=>parent',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		$expected = array();
+		foreach ( self::$post_ids as $post_id ) {
+			$expected[] = (object) array(
+				'ID'                => $post_id,
+				'post_parent'       => 0,
+				'test_post_fields'  => '1',
+				'test_post_clauses' => '2',
+			);
+		}
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Tests adding fields to WP_Query via filters when requesting the ID field.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_include_filtered_values_in_addition_to_id() {
+		add_filter( 'posts_fields', array( $this, 'filter_posts_fields' ) );
+		add_filter( 'posts_clauses', array( $this, 'filter_posts_clauses' ) );
+
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'ids',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		// `fields => ids` does not include the additional fields.
+		$expected = self::$post_ids;
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Tests adding fields to WP_Query via filters when requesting all fields.
+	 *
+	 * @ticket 57012
+	 */
+	public function test_should_include_filtered_values() {
+		add_filter( 'posts_fields', array( $this, 'filter_posts_fields' ) );
+		add_filter( 'posts_clauses', array( $this, 'filter_posts_clauses' ) );
+
+		$query_args = array(
+			'post_type' => 'wptests_pt',
+			'fields'    => 'all',
+		);
+
+		$q = new WP_Query( $query_args );
+
+		$expected = array_map( 'get_post', self::$post_ids );
+		foreach ( $expected as $post ) {
+			$post->test_post_fields  = '1';
+			$post->test_post_clauses = '2';
+		}
+
+		$this->assertEqualSets( $expected, $q->posts, 'Posts property for first query is not of expected form.' );
+		$this->assertSame( 5, $q->found_posts, 'Number of found posts is not five.' );
+		$this->assertEquals( 1, $q->max_num_pages, 'Number of found pages is not one.' );
+
+		// Test the second query's results match.
+		$q2 = new WP_Query( $query_args );
+		$this->assertEqualSets( $expected, $q2->posts, 'Posts property for second query is not in the expected form.' );
+	}
+
+	/**
+	 * Filters the posts fields.
+	 *
+	 * @param string $fields The fields to SELECT.
+	 * @return string The filtered fields.
+	 */
+	public function filter_posts_fields( $fields ) {
+		return "$fields, 1 as test_post_fields";
+	}
+
+	/**
+	 * Filters the posts clauses.
+	 *
+	 * @param array $clauses The WP_Query database clauses.
+	 * @return array The filtered database clauses.
+	 */
+	public function filter_posts_clauses( $clauses ) {
+		$clauses['fields'] .= ', 2 as test_post_clauses';
+		return $clauses;
+	}
+}
diff --git a/tests/phpunit/tests/query/generatePostdata.php b/tests/phpunit/tests/query/generatePostdata.php
index c223e4b59859d..5d39dfb5d4ba5 100644
--- a/tests/phpunit/tests/query/generatePostdata.php
+++ b/tests/phpunit/tests/query/generatePostdata.php
@@ -19,7 +19,7 @@ public function test_setup_by_id() {
 	 * @ticket 42814
 	 */
 	public function test_setup_by_fake_post() {
-		$fake     = new stdClass;
+		$fake     = new stdClass();
 		$fake->ID = 98765;
 		$data     = generate_postdata( $fake->ID );
 
diff --git a/tests/phpunit/tests/query/isTerm.php b/tests/phpunit/tests/query/isTerm.php
index 0527201ce2f18..8eb6d05d6b7bb 100644
--- a/tests/phpunit/tests/query/isTerm.php
+++ b/tests/phpunit/tests/query/isTerm.php
@@ -25,9 +25,6 @@ class Tests_Query_IsTerm extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		$GLOBALS['wp_the_query'] = new WP_Query();
-		$GLOBALS['wp_query']     = $GLOBALS['wp_the_query'];
-
 		$this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
 		create_initial_taxonomies();
diff --git a/tests/phpunit/tests/query/lazyLoadCommentMeta.php b/tests/phpunit/tests/query/lazyLoadCommentMeta.php
new file mode 100644
index 0000000000000..420fd45b23ce3
--- /dev/null
+++ b/tests/phpunit/tests/query/lazyLoadCommentMeta.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @group comments
+ * @group meta
+ */
+class Tests_Lazy_Load_Comment_Meta extends WP_UnitTestCase {
+
+	/**
+	 * @var int
+	 */
+	protected static $post_id;
+
+	/**
+	 * @var array
+	 */
+	protected static $comment_ids = array();
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+
+		self::$post_id     = $factory->post->create();
+		self::$comment_ids = $factory->comment->create_post_comments( self::$post_id, 11 );
+	}
+
+	/**
+	 * @ticket 57901
+	 *
+	 * @covers ::wp_queue_comments_for_comment_meta_lazyload
+	 *
+	 * @expectedDeprecated wp_queue_comments_for_comment_meta_lazyload
+	 */
+	public function test_wp_queue_comments_for_comment_meta_lazyload() {
+		$filter = new MockAction();
+		add_filter( 'update_comment_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		$comments   = array_map( 'get_comment', self::$comment_ids );
+		$comment_id = reset( self::$comment_ids );
+		wp_queue_comments_for_comment_meta_lazyload( $comments );
+		get_comment_meta( $comment_id );
+
+		$args             = $filter->get_args();
+		$first            = reset( $args );
+		$comment_meta_ids = end( $first );
+		$this->assertSameSets( self::$comment_ids, $comment_meta_ids );
+	}
+
+	/**
+	 * @ticket 57901
+	 *
+	 * @covers ::wp_queue_comments_for_comment_meta_lazyload
+	 *
+	 * @expectedDeprecated wp_queue_comments_for_comment_meta_lazyload
+	 */
+	public function test_wp_queue_comments_for_comment_meta_lazyload_new_comment() {
+		$filter = new MockAction();
+		add_filter( 'update_comment_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		$comments   = array_map( 'get_comment', self::$comment_ids );
+		$comment_id = self::factory()->comment->create(
+			array(
+				'comment_post_ID' => self::$post_id,
+			)
+		);
+		wp_queue_comments_for_comment_meta_lazyload( $comments );
+		get_comment_meta( $comment_id );
+
+		$args             = $filter->get_args();
+		$first            = reset( $args );
+		$comment_meta_ids = end( $first );
+		$this->assertContains( $comment_id, $comment_meta_ids );
+	}
+}
diff --git a/tests/phpunit/tests/query/lazyLoadTermMeta.php b/tests/phpunit/tests/query/lazyLoadTermMeta.php
new file mode 100644
index 0000000000000..fc34f84bb313c
--- /dev/null
+++ b/tests/phpunit/tests/query/lazyLoadTermMeta.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @group query
+ * @group taxonomy
+ * @group meta
+ */
+class Test_Lazy_Load_Term_Meta extends WP_UnitTestCase {
+	/**
+	 * @var array
+	 */
+	protected static $post_ids = array();
+	/**
+	 * @var array
+	 */
+	protected static $term_ids = array();
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		$post_type      = 'post';
+		self::$post_ids = $factory->post->create_many(
+			3,
+			array(
+				'post_type'   => $post_type,
+				'post_status' => 'publish',
+			)
+		);
+		$taxonomies     = get_object_taxonomies( $post_type, 'object' );
+		foreach ( self::$post_ids  as $post_id ) {
+			foreach ( $taxonomies as $taxonomy ) {
+				if ( ! $taxonomy->_builtin ) {
+					continue;
+				}
+				$terms          = $factory->term->create_many( 3, array( 'taxonomy' => $taxonomy->name ) );
+				self::$term_ids = array_merge( self::$term_ids, $terms );
+				foreach ( $terms as $term ) {
+					add_term_meta( $term, wp_rand(), 'test' );
+				}
+				wp_set_object_terms( $post_id, $terms, $taxonomy->name );
+			}
+		}
+	}
+
+	/**
+	 * @ticket 57150
+	 * @covers ::wp_queue_posts_for_term_meta_lazyload
+	 */
+	public function test_wp_queue_posts_for_term_meta_lazyload() {
+		$this->reset_lazyload_queue();
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		new WP_Query(
+			array(
+				'post__in'            => self::$post_ids,
+				'lazy_load_term_meta' => true,
+			)
+		);
+
+		get_term_meta( end( self::$term_ids ) );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertSameSets( $term_ids, self::$term_ids );
+	}
+
+	/**
+	 * @ticket 57150
+	 * @covers ::wp_queue_posts_for_term_meta_lazyload
+	 */
+	public function test_wp_queue_posts_for_term_meta_lazyload_update_post_term_cache() {
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		new WP_Query(
+			array(
+				'post__in'               => self::$post_ids,
+				'lazy_load_term_meta'    => true,
+				'update_post_term_cache' => false,
+			)
+		);
+
+		get_term_meta( end( self::$term_ids ) );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertSameSets( $term_ids, self::$term_ids );
+	}
+
+	/**
+	 * @ticket 57150
+	 * @covers ::wp_queue_posts_for_term_meta_lazyload
+	 */
+	public function test_wp_queue_posts_for_term_meta_lazyload_false() {
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		new WP_Query(
+			array(
+				'post__in'            => self::$post_ids,
+				'lazy_load_term_meta' => false,
+			)
+		);
+
+		$term_id = end( self::$term_ids );
+		get_term_meta( $term_id );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertSameSets( $term_ids, array( $term_id ) );
+	}
+
+
+	/**
+	 * @ticket 57901
+	 *
+	 * @covers ::wp_queue_posts_for_term_meta_lazyload
+	 */
+	public function test_wp_queue_posts_for_term_meta_lazyload_insert_term() {
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+		register_taxonomy( 'wptests_tax', 'post' );
+
+		$t1      = wp_insert_term( 'Foo', 'wptests_tax' );
+		$term_id = $t1['term_id'];
+
+		new WP_Query(
+			array(
+				'post__in'            => self::$post_ids,
+				'lazy_load_term_meta' => true,
+			)
+		);
+
+		get_term_meta( $term_id );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertContains( $term_id, $term_ids );
+	}
+
+	/**
+	 * @ticket 57150
+	 * @covers ::wp_queue_posts_for_term_meta_lazyload
+	 */
+	public function test_wp_queue_posts_for_term_meta_lazyload_delete_term() {
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+
+		$remove_term_id = end( self::$term_ids );
+		$term           = get_term( $remove_term_id );
+		wp_delete_term( $remove_term_id, $term->taxonomy );
+
+		new WP_Query(
+			array(
+				'post__in'            => self::$post_ids,
+				'lazy_load_term_meta' => true,
+			)
+		);
+
+		$term_id = end( self::$term_ids );
+		get_term_meta( $term_id );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertContains( $remove_term_id, $term_ids );
+	}
+}
diff --git a/tests/phpunit/tests/query/postStatus.php b/tests/phpunit/tests/query/postStatus.php
index 1ab8aa849d1b8..238551b524f44 100644
--- a/tests/phpunit/tests/query/postStatus.php
+++ b/tests/phpunit/tests/query/postStatus.php
@@ -87,7 +87,7 @@ public function set_up() {
 	 * Register custom post types and statuses used in multiple tests.
 	 *
 	 * CPTs and CPSs are reset between each test run so need to be registered
-	 * in both the wpSetUpBeforeClass() and setUp() methods.
+	 * in both the wpSetUpBeforeClass() and set_up() methods.
 	 */
 	public static function register_custom_post_objects() {
 		register_post_type(
diff --git a/tests/phpunit/tests/query/searchColumns.php b/tests/phpunit/tests/query/searchColumns.php
new file mode 100644
index 0000000000000..463bef810738f
--- /dev/null
+++ b/tests/phpunit/tests/query/searchColumns.php
@@ -0,0 +1,414 @@
+<?php
+/**
+ * Testing the search columns support in `WP_Query`.
+ *
+ * @package WordPress\UnitTests
+ * @since 6.2.0
+ */
+
+/**
+ * Test cases for the search columns feature.
+ *
+ * @group query
+ * @group search
+ *
+ * @covers WP_Query::parse_search
+ *
+ * @since 6.2.0
+ */
+class Tests_Query_SearchColumns extends WP_UnitTestCase {
+	/**
+	 * The post ID of the first fixture post.
+	 *
+	 * @since 6.2.0
+	 * @var int $pid1
+	 */
+	protected static $pid1;
+
+	/**
+	 * The post ID of the second fixture post.
+	 *
+	 * @since 6.2.0
+	 * @var int $pid2
+	 */
+	protected static $pid2;
+
+	/**
+	 * The post ID of the third fixture post.
+	 *
+	 * @since 6.2.0
+	 * @var int $pid3
+	 */
+	protected static $pid3;
+
+	/**
+	 * Create posts fixtures.
+	 *
+	 * @param WP_UnitTest_Factory $factory The factory instance.
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$pid1 = $factory->post->create(
+			array(
+				'post_status'  => 'publish',
+				'post_title'   => 'foo title',
+				'post_excerpt' => 'foo excerpt',
+				'post_content' => 'foo content',
+			)
+		);
+		self::$pid2 = $factory->post->create(
+			array(
+				'post_status'  => 'publish',
+				'post_title'   => 'bar title',
+				'post_excerpt' => 'foo bar excerpt',
+				'post_content' => 'foo bar content',
+			)
+		);
+
+		self::$pid3 = $factory->post->create(
+			array(
+				'post_status'  => 'publish',
+				'post_title'   => 'baz title',
+				'post_excerpt' => 'baz bar excerpt',
+				'post_content' => 'baz bar foo content',
+			)
+		);
+	}
+
+	/**
+	 * Tests that search uses default search columns when search columns are empty.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_use_default_search_columns_when_empty_search_columns() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array(),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
+		$this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
+		$this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+	}
+
+	/**
+	 * Tests that search supports the `post_title` search column.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_title_search_column() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_title' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_excerpt` search column.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_excerpt_search_column() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_excerpt' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_content` search column.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_content_search_column() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_title` and `post_excerpt` search columns together.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_title_and_post_excerpt_search_columns() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_title', 'post_excerpt' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_title` and `post_content` search columns together.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_title_and_post_content_search_columns() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_title', 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_excerpt` and `post_content` search columns together.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_excerpt_and_post_content_search_columns() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_excerpt', 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports the `post_title`, `post_excerpt` and `post_content` search columns together.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_post_title_and_post_excerpt_and_post_content_search_columns() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_title', 'post_excerpt', 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search uses default search columns when using a non-existing search column.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_use_default_search_columns_when_using_non_existing_search_column() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_non_existing_column' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
+		$this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
+		$this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+	}
+
+	/**
+	 * Tests that search ignores a non-existing search column when used together with a supported one.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_ignore_non_existing_search_column_when_used_with_supported_one() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo',
+				'search_columns' => array( 'post_title', 'post_non_existing_column' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports search columns when searching multiple terms.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_search_columns_when_searching_multiple_terms() {
+		$q = new WP_Query(
+			array(
+				's'              => 'foo bar',
+				'search_columns' => array( 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports search columns when searching for a sentence.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_search_columns_when_sentence_true() {
+		$q = new WP_Query(
+			array(
+				's'              => 'bar foo',
+				'search_columns' => array( 'post_content' ),
+				'sentence'       => true,
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports search columns when searching for a sentence.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_search_columns_when_sentence_false() {
+		$q = new WP_Query(
+			array(
+				's'              => 'bar foo',
+				'search_columns' => array( 'post_content' ),
+				'sentence'       => false,
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search supports search columns when using term exclusion.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_s_should_support_search_columns_when_searching_with_term_exclusion() {
+		$q = new WP_Query(
+			array(
+				's'              => 'bar -baz',
+				'search_columns' => array( 'post_excerpt', 'post_content' ),
+				'fields'         => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid2 ), $q->posts );
+	}
+
+	/**
+	 * Tests that search columns is filterable with the `post_search_columns` filter.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_search_columns_should_be_filterable() {
+		add_filter( 'post_search_columns', array( $this, 'post_supported_search_column' ), 10, 3 );
+		$q = new WP_Query(
+			array(
+				's'      => 'foo',
+				'fields' => 'ids',
+			)
+		);
+
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
+	}
+
+	/**
+	 * Filter callback that sets a supported search column.
+	 *
+	 * @param  string[] $search_columns Array of column names to be searched.
+	 * @param  string   $search         Text being searched.
+	 * @param  WP_Query $wp_query       The current WP_Query instance.
+	 * @return string[] $search_columns Array of column names to be searched.
+	 */
+	public function post_supported_search_column( $search_columns, $search, $wp_query ) {
+		$search_columns = array( 'post_title' );
+		return $search_columns;
+	}
+
+	/**
+	 * Tests that search columns ignores non-supported search columns from the `post_search_columns` filter.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_search_columns_should_not_be_filterable_with_non_supported_search_columns() {
+		add_filter( 'post_search_columns', array( $this, 'post_non_supported_search_column' ), 10, 3 );
+		$q = new WP_Query(
+			array(
+				's'      => 'foo',
+				'fields' => 'ids',
+			)
+		);
+
+		$this->assertStringNotContainsString( 'post_name', $q->request, "SQL request shouldn't contain post_name string." );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+	}
+
+	/**
+	 * Filter callback that sets an existing but non-supported search column.
+	 *
+	 * @param  string[] $search_columns Array of column names to be searched.
+	 * @param  string   $search         Text being searched.
+	 * @param  WP_Query $wp_query       The current WP_Query instance.
+	 * @return string[] $search_columns Array of column names to be searched.
+	 */
+	public function post_non_supported_search_column( $search_columns, $search, $wp_query ) {
+		$search_columns = array( 'post_name' );
+		return $search_columns;
+	}
+
+	/**
+	 * Tests that search columns ignores non-existing search columns from the `post_search_columns` filter.
+	 *
+	 * @ticket 43867
+	 */
+	public function test_search_columns_should_not_be_filterable_with_non_existing_search_column() {
+		add_filter( 'post_search_columns', array( $this, 'post_non_existing_search_column' ), 10, 3 );
+		$q = new WP_Query(
+			array(
+				's'      => 'foo',
+				'fields' => 'ids',
+			)
+		);
+
+		$this->assertStringNotContainsString( 'post_non_existing_column', $q->request, "SQL request shouldn't contain post_non_existing_column string." );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+	}
+
+	/**
+	 * Filter callback that sets a non-existing search column.
+	 *
+	 * @param  string[] $search_columns Array of column names to be searched.
+	 * @param  string   $search         Text being searched.
+	 * @param  WP_Query $wp_query       The current WP_Query instance.
+	 * @return string[] $search_columns Array of column names to be searched.
+	 */
+	public function post_non_existing_search_column( $search_columns, $search, $wp_query ) {
+		$search_columns = array( 'post_non_existing_column' );
+		return $search_columns;
+	}
+
+}
diff --git a/tests/phpunit/tests/query/setupPostdata.php b/tests/phpunit/tests/query/setupPostdata.php
index cabfba7c5b590..985ae06f7a9ca 100644
--- a/tests/phpunit/tests/query/setupPostdata.php
+++ b/tests/phpunit/tests/query/setupPostdata.php
@@ -33,7 +33,7 @@ public function test_setup_by_id() {
 	 * @ticket 30970
 	 */
 	public function test_setup_by_fake_post() {
-		$fake     = new stdClass;
+		$fake     = new stdClass();
 		$fake->ID = 98765;
 		setup_postdata( $fake->ID );
 
diff --git a/tests/phpunit/tests/query/stickies.php b/tests/phpunit/tests/query/stickies.php
index 0070f4cb3159c..81a991c6d729d 100644
--- a/tests/phpunit/tests/query/stickies.php
+++ b/tests/phpunit/tests/query/stickies.php
@@ -136,7 +136,7 @@ public function test_stickies_should_limit_query() {
 		$post_ids     = self::factory()->post->create_many( $sticky_count, array( 'post_date' => $post_date ) );
 		add_filter(
 			'pre_option_sticky_posts',
-			function () use ( $post_ids ) {
+			static function () use ( $post_ids ) {
 				return $post_ids;
 			}
 		);
diff --git a/tests/phpunit/tests/query/taxQuery.php b/tests/phpunit/tests/query/taxQuery.php
index e67ca6f36e6b6..f517e4bb84134 100644
--- a/tests/phpunit/tests/query/taxQuery.php
+++ b/tests/phpunit/tests/query/taxQuery.php
@@ -1628,8 +1628,6 @@ public function test_tax_terms_should_not_be_double_escaped() {
 	 * @covers WP_Tax_Query::transform_query
 	 */
 	public function test_tax_terms_should_limit_query() {
-		$filter = new MockAction();
-		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
 		register_taxonomy( 'wptests_tax', 'post' );
 		$name = 'foobar';
 		$t    = self::factory()->term->create(
@@ -1642,6 +1640,9 @@ public function test_tax_terms_should_limit_query() {
 		$p = self::factory()->post->create();
 		wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
 
+		$filter = new MockAction();
+		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+
 		$q = new WP_Query(
 			array(
 				'fields'    => 'ids',
@@ -1656,7 +1657,7 @@ public function test_tax_terms_should_limit_query() {
 		);
 
 		$filter_args = $filter->get_args();
-		$query       = $filter_args[1][1]->request;
+		$query       = $filter_args[0][1]->request;
 
 		$this->assertSameSets( array( $p ), $q->posts );
 		$this->assertStringContainsString( 'LIMIT 1', $query );
@@ -1668,8 +1669,6 @@ public function test_tax_terms_should_limit_query() {
 	 * @covers WP_Tax_Query::transform_query
 	 */
 	public function test_tax_terms_should_limit_query_to_one() {
-		$filter = new MockAction();
-		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
 		register_taxonomy( 'wptests_tax', 'post' );
 		$name = 'foobar';
 		$t    = self::factory()->term->create(
@@ -1682,6 +1681,9 @@ public function test_tax_terms_should_limit_query_to_one() {
 		$p = self::factory()->post->create();
 		wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
 
+		$filter = new MockAction();
+		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+
 		$q = new WP_Query(
 			array(
 				'fields'    => 'ids',
@@ -1696,7 +1698,7 @@ public function test_tax_terms_should_limit_query_to_one() {
 		);
 
 		$filter_args = $filter->get_args();
-		$query       = $filter_args[1][1]->request;
+		$query       = $filter_args[0][1]->request;
 
 		$this->assertSameSets( array( $p ), $q->posts );
 		$this->assertStringContainsString( 'LIMIT 1', $query );
@@ -1708,8 +1710,6 @@ public function test_tax_terms_should_limit_query_to_one() {
 	 * @covers WP_Tax_Query::transform_query
 	 */
 	public function test_hierarchical_taxonomies_do_not_limit_query() {
-		$filter = new MockAction();
-		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
 		register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
 		$name = 'foobar';
 		$t    = self::factory()->term->create(
@@ -1722,6 +1722,9 @@ public function test_hierarchical_taxonomies_do_not_limit_query() {
 		$p = self::factory()->post->create();
 		wp_set_object_terms( $p, array( $t ), 'wptests_tax' );
 
+		$filter = new MockAction();
+		add_filter( 'terms_pre_query', array( $filter, 'filter' ), 10, 2 );
+
 		$q = new WP_Query(
 			array(
 				'fields'    => 'ids',
diff --git a/tests/phpunit/tests/query/vars.php b/tests/phpunit/tests/query/vars.php
index 7f336908a233a..4b4b96561b6ac 100644
--- a/tests/phpunit/tests/query/vars.php
+++ b/tests/phpunit/tests/query/vars.php
@@ -14,7 +14,7 @@ class Tests_Query_Vars extends WP_UnitTestCase {
 	public function testPublicQueryVarsAreAsExpected() {
 		global $wp;
 
-		// Re-initialise any dynamically-added public query vars:
+		// Re-initialize any dynamically-added public query vars:
 		do_action( 'init' );
 
 		$this->assertSame(
diff --git a/tests/phpunit/tests/rest-api.php b/tests/phpunit/tests/rest-api.php
index 854e9b833822d..20b23fc0fb28c 100644
--- a/tests/phpunit/tests/rest-api.php
+++ b/tests/phpunit/tests/rest-api.php
@@ -27,6 +27,10 @@ public function tear_down() {
 		parent::tear_down();
 	}
 
+	public function filter_wp_rest_server_class( $class_name ) {
+		return 'Spy_REST_Server';
+	}
+
 	/**
 	 * Checks that the main classes are loaded.
 	 */
@@ -822,7 +826,14 @@ public function test_always_prepend_path_with_slash_in_rest_url_filter() {
 		unset( $filter );
 	}
 
-	public function jsonp_callback_provider() {
+	/**
+	 * @dataProvider data_jsonp_callback_check
+	 */
+	public function test_jsonp_callback_check( $callback, $expected ) {
+		$this->assertSame( $expected, wp_check_jsonp_callback( $callback ) );
+	}
+
+	public function data_jsonp_callback_check() {
 		return array(
 			// Standard names.
 			array( 'Springfield', true ),
@@ -841,13 +852,13 @@ public function jsonp_callback_provider() {
 	}
 
 	/**
-	 * @dataProvider jsonp_callback_provider
+	 * @dataProvider data_rest_parse_date
 	 */
-	public function test_jsonp_callback_check( $callback, $valid ) {
-		$this->assertSame( $valid, wp_check_jsonp_callback( $callback ) );
+	public function test_rest_parse_date( $date, $expected ) {
+		$this->assertEquals( $expected, rest_parse_date( $date ) );
 	}
 
-	public function rest_date_provider() {
+	public function data_rest_parse_date() {
 		return array(
 			// Valid dates with timezones.
 			array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) + 5 * HOUR_IN_SECONDS ),
@@ -873,13 +884,13 @@ public function rest_date_provider() {
 	}
 
 	/**
-	 * @dataProvider rest_date_provider
+	 * @dataProvider data_rest_parse_date_force_utc
 	 */
-	public function test_rest_parse_date( $string, $value ) {
-		$this->assertEquals( $value, rest_parse_date( $string ) );
+	public function test_rest_parse_date_force_utc( $date, $expected ) {
+		$this->assertSame( $expected, rest_parse_date( $date, true ) );
 	}
 
-	public function rest_date_force_utc_provider() {
+	public function data_rest_parse_date_force_utc() {
 		return array(
 			// Valid dates with timezones.
 			array( '2017-01-16T11:30:00-05:00', gmmktime( 11, 30, 0, 1, 16, 2017 ) ),
@@ -904,17 +915,6 @@ public function rest_date_force_utc_provider() {
 		);
 	}
 
-	/**
-	 * @dataProvider rest_date_force_utc_provider
-	 */
-	public function test_rest_parse_date_force_utc( $string, $value ) {
-		$this->assertSame( $value, rest_parse_date( $string, true ) );
-	}
-
-	public function filter_wp_rest_server_class( $class_name ) {
-		return 'Spy_REST_Server';
-	}
-
 	public function test_register_rest_route_without_server() {
 		$GLOBALS['wp_rest_server'] = null;
 		add_filter( 'wp_rest_server_class', array( $this, 'filter_wp_rest_server_class' ) );
@@ -1783,7 +1783,7 @@ public function test_rest_ensure_response_accepts_wp_error_and_returns_wp_error(
 	}
 
 	/**
-	 * @dataProvider rest_ensure_response_data_provider
+	 * @dataProvider data_rest_ensure_response_returns_instance_of_wp_rest_response
 	 *
 	 * @param mixed $response      The response passed to rest_ensure_response().
 	 * @param mixed $expected_data The expected data a response should include.
@@ -1799,7 +1799,7 @@ public function test_rest_ensure_response_returns_instance_of_wp_rest_response(
 	 *
 	 * @return array
 	 */
-	public function rest_ensure_response_data_provider() {
+	public function data_rest_ensure_response_returns_instance_of_wp_rest_response() {
 		return array(
 			array( null, null ),
 			array( array( 'chocolate' => 'cookies' ), array( 'chocolate' => 'cookies' ) ),
diff --git a/tests/phpunit/tests/rest-api/application-passwords.php b/tests/phpunit/tests/rest-api/application-passwords.php
index b3edab0d72d79..a630719ee8921 100644
--- a/tests/phpunit/tests/rest-api/application-passwords.php
+++ b/tests/phpunit/tests/rest-api/application-passwords.php
@@ -4,9 +4,7 @@
  *
  * @package    WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group  restapi
  * @group  app_password
  */
diff --git a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
index 1162c1f733d15..0515c31512d3c 100644
--- a/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
@@ -4,9 +4,7 @@
  *
  * @package    WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Application_Passwords_Controller extends WP_Test_REST_Controller_Testcase {
diff --git a/tests/phpunit/tests/rest-api/rest-attachments-controller.php b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
index 27519610e86f3..55cf74f3d72af 100644
--- a/tests/phpunit/tests/rest-api/rest-attachments-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
@@ -137,7 +135,16 @@ public function test_register_routes() {
 		$this->assertCount( 3, $routes['/wp/v2/media/(?P<id>[\d]+)'] );
 	}
 
-	public static function disposition_provider() {
+	/**
+	 * @dataProvider data_parse_disposition
+	 */
+	public function test_parse_disposition( $header, $expected ) {
+		$header_list = array( $header );
+		$parsed      = WP_REST_Attachments_Controller::get_filename_from_disposition( $header_list );
+		$this->assertSame( $expected, $parsed );
+	}
+
+	public static function data_parse_disposition() {
 		return array(
 			// Types.
 			array( 'attachment; filename="foo.jpg"', 'foo.jpg' ),
@@ -169,15 +176,6 @@ public static function disposition_provider() {
 		);
 	}
 
-	/**
-	 * @dataProvider disposition_provider
-	 */
-	public function test_parse_disposition( $header, $expected ) {
-		$header_list = array( $header );
-		$parsed      = WP_REST_Attachments_Controller::get_filename_from_disposition( $header_list );
-		$this->assertSame( $expected, $parsed );
-	}
-
 	public function test_context_param() {
 		// Collection.
 		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/media' );
@@ -230,6 +228,7 @@ public function test_registered_query_params() {
 				'parent_exclude',
 				'per_page',
 				'search',
+				'search_columns',
 				'slug',
 				'status',
 			),
@@ -1258,7 +1257,17 @@ public function verify_attachment_roundtrip( $input = array(), $expected_output
 		$this->assertSame( $expected_output['caption']['raw'], $post->post_excerpt );
 	}
 
-	public static function attachment_roundtrip_provider() {
+	/**
+	 * @dataProvider data_attachment_roundtrip_as_author
+	 * @requires function imagejpeg
+	 */
+	public function test_attachment_roundtrip_as_author( $raw, $expected ) {
+		wp_set_current_user( self::$author_id );
+		$this->assertFalse( current_user_can( 'unfiltered_html' ) );
+		$this->verify_attachment_roundtrip( $raw, $expected );
+	}
+
+	public static function data_attachment_roundtrip_as_author() {
 		return array(
 			array(
 				// Raw values.
@@ -1355,16 +1364,6 @@ public static function attachment_roundtrip_provider() {
 		);
 	}
 
-	/**
-	 * @dataProvider attachment_roundtrip_provider
-	 * @requires function imagejpeg
-	 */
-	public function test_post_roundtrip_as_author( $raw, $expected ) {
-		wp_set_current_user( self::$author_id );
-		$this->assertFalse( current_user_can( 'unfiltered_html' ) );
-		$this->verify_attachment_roundtrip( $raw, $expected );
-	}
-
 	/**
 	 * @requires function imagejpeg
 	 */
@@ -1678,6 +1677,16 @@ public function test_additional_field_update_errors() {
 		$wp_rest_additional_fields = array();
 	}
 
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return 123;
+	}
+
+	public function additional_field_update_callback( $value, $attachment ) {
+		if ( 'returnError' === $value ) {
+			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+		}
+	}
+
 	public function test_search_item_by_filename() {
 		$id1 = self::factory()->attachment->create_object(
 			self::$test_file,
@@ -1706,16 +1715,6 @@ public function test_search_item_by_filename() {
 		$this->assertSame( 'image/png', $data[0]['mime_type'] );
 	}
 
-	public function additional_field_get_callback( $object, $request ) {
-		return 123;
-	}
-
-	public function additional_field_update_callback( $value, $attachment ) {
-		if ( 'returnError' === $value ) {
-			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
-		}
-	}
-
 	public function test_links_exist() {
 
 		wp_set_current_user( self::$editor_id );
diff --git a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
index 2a7eacb8b90b5..e987a5f699983 100644
--- a/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-autosaves-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi-autosave
  * @group restapi
  */
@@ -311,7 +309,7 @@ public function test_create_item() {
 		wp_set_current_user( self::$editor_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$params = $this->set_post_data(
 			array(
@@ -327,7 +325,7 @@ public function test_create_item() {
 	public function test_update_item() {
 		wp_set_current_user( self::$editor_id );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$params = $this->set_post_data(
 			array(
@@ -346,7 +344,7 @@ public function test_update_item_nopriv() {
 		wp_set_current_user( self::$contributor_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$params = $this->set_post_data(
 			array(
@@ -365,7 +363,7 @@ public function test_rest_autosave_published_post() {
 		wp_set_current_user( self::$editor_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 
 		$current_post = get_post( self::$post_id );
 
@@ -412,7 +410,7 @@ public function test_rest_autosave_draft_post_same_author() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $autosave_data ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -451,7 +449,7 @@ public function test_rest_autosave_draft_post_different_author() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $autosave_data ) );
 
 		$response     = rest_get_server()->dispatch( $request );
@@ -514,12 +512,12 @@ public function test_get_additional_field_registration() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
-		return get_post_meta( $object['id'], 'my_custom_int', true );
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return get_post_meta( $response_data['id'], $field_name, true );
 	}
 
-	public function additional_field_update_callback( $value, $post ) {
-		update_post_meta( $post->ID, 'my_custom_int', $value );
+	public function additional_field_update_callback( $value, $post, $field_name ) {
+		update_post_meta( $post->ID, $field_name, $value );
 	}
 
 	protected function check_get_autosave_response( $response, $autosave ) {
@@ -572,7 +570,7 @@ public function test_get_item_sets_up_postdata() {
 	public function test_update_item_draft_page_with_parent() {
 		wp_set_current_user( self::$editor_id );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$child_draft_page_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$params = $this->set_post_data(
 			array(
@@ -593,7 +591,7 @@ public function test_schema_validation_is_applied() {
 		wp_set_current_user( self::$editor_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/pages/' . self::$draft_page_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 
 		$params = $this->set_post_data(
 			array(
@@ -648,7 +646,7 @@ public function test_rest_autosave_draft_post_locked_to_different_author() {
 
 		// Initiate an autosave via the REST API as Gutenberg does.
 		$request = new WP_REST_Request( 'POST', '/wp/v2/posts/' . self::$post_id . '/autosaves' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $autosave_data ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -674,4 +672,45 @@ public function test_rest_autosave_draft_post_locked_to_different_author() {
 
 		wp_delete_post( $post_id );
 	}
+
+	/**
+	 * @ticket 49532
+	 *
+	 * @covers WP_REST_Autosaves_Controller::create_post_autosave
+	 */
+	public function test_rest_autosave_do_not_create_autosave_when_post_is_unchanged() {
+		// Create a post by the editor.
+		$post_data = array(
+			'post_content' => 'Test post content',
+			'post_title'   => 'Test post title',
+			'post_excerpt' => 'Test post excerpt',
+			'post_author'  => self::$editor_id,
+			'post_status'  => 'publish',
+		);
+		$post_id   = wp_insert_post( $post_data );
+		wp_set_current_user( self::$editor_id );
+
+		// Make a small change create the initial autosave.
+		$autosave_data = array(
+			'post_content' => 'Test post content changed',
+		);
+		$request       = new WP_REST_Request( 'POST', '/wp/v2/posts/' . $post_id . '/autosaves' );
+		$request->add_header( 'Content-Type', 'application/json' );
+		$request->set_body( wp_json_encode( $autosave_data ) );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 200, $response->get_status() );
+
+		// Store the first autosave ID.
+		$autosave = $response->get_data();
+
+		// Try creating an autosave using the REST endpoint with unchanged content.
+		$request->set_body( wp_json_encode( $autosave_data ) );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( $autosave['id'], $data['id'], 'Original autosave was not returned' );
+	}
 }
diff --git a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
index af014d93fd0c5..c3cac6011e491 100644
--- a/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-directory-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_REST_Block_Directory_Controller_Test extends WP_Test_REST_Controller_Testcase {
@@ -274,13 +272,13 @@ static function () use ( $plugin ) {
 	private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' ) {
 		add_filter(
 			'pre_http_request',
-			static function ( $return, $args, $url ) use ( $blocked_host ) {
+			static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
 				if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
 					return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );
 
 				}
 
-				return $return;
+				return $response;
 			},
 			10,
 			3
diff --git a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
index 71d02d4832687..3c79da56510d3 100644
--- a/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_REST_Block_Renderer_Controller tests.
+ * Unit tests covering WP_REST_Block_Renderer_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.0.0
- */
-
-/**
- * Tests for WP_REST_Block_Renderer_Controller.
- *
- * @since 5.0.0
  *
  * @covers WP_REST_Block_Renderer_Controller
  *
@@ -501,7 +495,7 @@ public function test_get_item_post_request() {
 		$attributes       = array( 'some_string' => $string_attribute );
 		$request          = new WP_REST_Request( 'POST', self::$rest_api_route . self::$block_name );
 		$request->set_param( 'context', 'edit' );
-		$request->set_header( 'content-type', 'application/json' );
+		$request->set_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( compact( 'attributes' ) ) );
 		$response = rest_get_server()->dispatch( $request );
 
diff --git a/tests/phpunit/tests/rest-api/rest-block-type-controller.php b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
index 02312ba6ce3ea..b19321e224bb9 100644
--- a/tests/phpunit/tests/rest-api/rest-block-type-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_REST_Block_Types_Controller tests.
+ * Unit tests covering WP_REST_Block_Types_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.5.0
- */
-
-/**
- * Tests for WP_REST_Block_Types_Controller.
- *
- * @since 5.5.0
  *
  * @covers WP_REST_Block_Types_Controller
  *
@@ -202,6 +196,7 @@ public function test_get_block_invalid_name() {
 
 	/**
 	 * @ticket 47620
+	 * @ticket 57585
 	 */
 	public function test_get_item_invalid() {
 		$block_type = 'fake/invalid';
@@ -222,8 +217,9 @@ public function test_get_item_invalid() {
 			'example'          => 'invalid_example',
 			'parent'           => 'invalid_parent',
 			'ancestor'         => 'invalid_ancestor',
+			'selectors'        => 'invalid_selectors',
 			'supports'         => 'invalid_supports',
-			'styles'           => 'invalid_styles',
+			'styles'           => array(),
 			'render_callback'  => 'invalid_callback',
 			'textdomain'       => true,
 			'variations'       => 'invalid_variations',
@@ -253,6 +249,7 @@ public function test_get_item_invalid() {
 		$this->assertSameSets( array( 'invalid_keywords' ), $data['keywords'] );
 		$this->assertSameSets( array( 'invalid_parent' ), $data['parent'] );
 		$this->assertSameSets( array( 'invalid_ancestor' ), $data['ancestor'] );
+		$this->assertSameSets( array(), $data['selectors'], 'invalid selectors defaults to empty array' );
 		$this->assertSameSets( array(), $data['supports'] );
 		$this->assertSameSets( array(), $data['styles'] );
 		$this->assertNull( $data['example'] );
@@ -271,6 +268,7 @@ public function test_get_item_invalid() {
 
 	/**
 	 * @ticket 47620
+	 * @ticket 57585
 	 */
 	public function test_get_item_defaults() {
 		$block_type = 'fake/false';
@@ -290,6 +288,7 @@ public function test_get_item_defaults() {
 			'keywords'         => false,
 			'parent'           => false,
 			'ancestor'         => false,
+			'selectors'        => false,
 			'supports'         => false,
 			'styles'           => false,
 			'render_callback'  => false,
@@ -322,6 +321,7 @@ public function test_get_item_defaults() {
 		$this->assertSameSets( array(), $data['keywords'] );
 		$this->assertSameSets( array(), $data['parent'] );
 		$this->assertSameSets( array(), $data['ancestor'] );
+		$this->assertSameSets( array(), $data['selectors'], 'selectors defaults to empty array' );
 		$this->assertSameSets( array(), $data['supports'] );
 		$this->assertSameSets( array(), $data['styles'] );
 		$this->assertNull( $data['example'] );
@@ -540,6 +540,7 @@ public function test_get_variation() {
 
 	/**
 	 * @ticket 47620
+	 * @ticket 57585
 	 */
 	public function test_get_item_schema() {
 		wp_set_current_user( self::$admin_id );
@@ -547,7 +548,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 28, $properties );
+		$this->assertCount( 29, $properties );
 		$this->assertArrayHasKey( 'api_version', $properties );
 		$this->assertArrayHasKey( 'title', $properties );
 		$this->assertArrayHasKey( 'icon', $properties );
@@ -557,6 +558,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'textdomain', $properties );
 		$this->assertArrayHasKey( 'name', $properties );
 		$this->assertArrayHasKey( 'attributes', $properties );
+		$this->assertArrayHasKey( 'selectors', $properties, 'schema must contain selectors' );
 		$this->assertArrayHasKey( 'supports', $properties );
 		$this->assertArrayHasKey( 'category', $properties );
 		$this->assertArrayHasKey( 'is_dynamic', $properties );
@@ -624,15 +626,15 @@ public function test_get_item_no_permission() {
 	 * @ticket 47620
 	 */
 	public function test_prepare_item() {
-		$registry = new WP_Block_Type_Registry;
+		$registry = new WP_Block_Type_Registry();
 		$settings = array(
 			'icon'            => 'text',
 			'render_callback' => '__return_null',
 		);
 		$registry->register( 'fake/line', $settings );
 		$block_type = $registry->get_registered( 'fake/line' );
-		$endpoint   = new WP_REST_Block_Types_Controller;
-		$request    = new WP_REST_Request;
+		$endpoint   = new WP_REST_Block_Types_Controller();
+		$request    = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$response = $endpoint->prepare_item_for_response( $block_type, $request );
 		$this->check_block_type_object( $block_type, $response->get_data(), $response->get_links() );
@@ -642,15 +644,15 @@ public function test_prepare_item() {
 	 * @ticket 47620
 	 */
 	public function test_prepare_item_limit_fields() {
-		$registry = new WP_Block_Type_Registry;
+		$registry = new WP_Block_Type_Registry();
 		$settings = array(
 			'icon'            => 'text',
 			'render_callback' => '__return_null',
 		);
 		$registry->register( 'fake/line', $settings );
 		$block_type = $registry->get_registered( 'fake/line' );
-		$request    = new WP_REST_Request;
-		$endpoint   = new WP_REST_Block_Types_Controller;
+		$request    = new WP_REST_Request();
+		$endpoint   = new WP_REST_Block_Types_Controller();
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'name' );
 		$response = $endpoint->prepare_item_for_response( $block_type, $request );
diff --git a/tests/phpunit/tests/rest-api/rest-blocks-controller.php b/tests/phpunit/tests/rest-api/rest-blocks-controller.php
index c3e0a9fb75b1c..1cdd3474dd174 100644
--- a/tests/phpunit/tests/rest-api/rest-blocks-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-blocks-controller.php
@@ -1,18 +1,12 @@
 <?php
 /**
- * WP_REST_Blocks_Controller tests
+ * Unit tests covering WP_REST_Blocks_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.0.0
- */
-
-/**
- * Tests for WP_REST_Blocks_Controller.
- *
- * @since 5.0.0
  *
- * @see WP_Test_REST_Controller_Testcase
+ * @covers WP_REST_Blocks_Controller
  *
  * @group restapi-blocks
  * @group restapi
@@ -226,4 +220,39 @@ public function test_content() {
 			$data['content']
 		);
 	}
+
+	/**
+	 * Check that the `wp_pattern_sync_status` postmeta is moved from meta array to top
+	 * level of response.
+	 *
+	 * @ticket 58677
+	 */
+	public function test_wp_patterns_sync_status_post_meta() {
+		register_post_meta(
+			'wp_block',
+			'wp_pattern_sync_status',
+			array(
+				'single'       => true,
+				'type'         => 'string',
+				'show_in_rest' => array(
+					'schema' => array(
+						'type'       => 'string',
+						'properties' => array(
+							'sync_status' => array(
+								'type' => 'string',
+							),
+						),
+					),
+				),
+			)
+		);
+		wp_set_current_user( self::$user_ids['author'] );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/blocks/' . self::$post_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertArrayHasKey( 'wp_pattern_sync_status', $data );
+		$this->assertArrayNotHasKey( 'wp_pattern_sync_status', $data['meta'] );
+	}
 }
diff --git a/tests/phpunit/tests/rest-api/rest-categories-controller.php b/tests/phpunit/tests/rest-api/rest-categories-controller.php
index 805472487f021..a6ad0cf7005b0 100644
--- a/tests/phpunit/tests/rest-api/rest-categories-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-categories-controller.php
@@ -5,9 +5,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Categories_Controller extends WP_Test_REST_Controller_Testcase {
@@ -1093,7 +1091,7 @@ public function test_prepare_item() {
 	}
 
 	public function test_prepare_item_limit_fields() {
-		$request  = new WP_REST_Request;
+		$request  = new WP_REST_Request();
 		$endpoint = new WP_REST_Terms_Controller( 'category' );
 		$request->set_param( '_fields', 'id,name' );
 		$term     = get_term( 1, 'category' );
@@ -1180,7 +1178,7 @@ public function test_get_additional_field_registration() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object, $request ) {
+	public function additional_field_get_callback( $response_data, $field_name ) {
 		return 123;
 	}
 
diff --git a/tests/phpunit/tests/rest-api/rest-comments-controller.php b/tests/phpunit/tests/rest-api/rest-comments-controller.php
index ef9aec3809059..9b4444f559554 100644
--- a/tests/phpunit/tests/rest-api/rest-comments-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-comments-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Comments_Controller extends WP_Test_REST_Controller_Testcase {
@@ -152,7 +150,7 @@ public static function wpTearDownAfterClass() {
 
 	public function set_up() {
 		parent::set_up();
-		$this->endpoint = new WP_REST_Comments_Controller;
+		$this->endpoint = new WP_REST_Comments_Controller();
 		if ( is_multisite() ) {
 			update_site_option( 'site_admins', array( 'superadmin' ) );
 		}
@@ -953,7 +951,7 @@ public function test_prepare_item() {
 	public function test_prepare_item_limit_fields() {
 		wp_set_current_user( self::$admin_id );
 
-		$endpoint = new WP_REST_Comments_Controller;
+		$endpoint = new WP_REST_Comments_Controller();
 		$request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'id,status' );
@@ -1133,7 +1131,7 @@ public function test_create_item() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1146,7 +1144,7 @@ public function test_create_item() {
 		$this->assertSame( self::$post_id, $data['post'] );
 	}
 
-	public function comment_dates_provider() {
+	public function data_comment_dates() {
 		return array(
 			'set date without timezone'     => array(
 				'params'  => array(
@@ -1192,7 +1190,7 @@ public function comment_dates_provider() {
 	}
 
 	/**
-	 * @dataProvider comment_dates_provider
+	 * @dataProvider data_comment_dates
 	 */
 	public function test_create_comment_date( $params, $results ) {
 		wp_set_current_user( self::$admin_id );
@@ -1239,7 +1237,7 @@ public function test_create_item_using_accepted_content_raw_value() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1264,7 +1262,7 @@ public function test_create_item_error_from_filter() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1287,7 +1285,7 @@ public function test_create_comment_missing_required_author_name() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1307,7 +1305,7 @@ public function test_create_comment_empty_required_author_name() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1327,7 +1325,7 @@ public function test_create_comment_missing_required_author_email() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1347,7 +1345,7 @@ public function test_create_comment_empty_required_author_email() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1365,7 +1363,7 @@ public function test_create_comment_author_email_too_short() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1386,7 +1384,7 @@ public function test_create_item_invalid_no_content() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1413,7 +1411,7 @@ public function test_create_item_invalid_only_spaces_content() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1435,7 +1433,7 @@ public function test_create_item_allows_0_as_content() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1460,7 +1458,7 @@ public function test_create_item_allow_empty_comment_filter() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1481,7 +1479,7 @@ public function test_create_item_invalid_date() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1510,7 +1508,7 @@ public function test_create_item_assign_different_user() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertSame( 201, $response->get_status() );
@@ -1536,7 +1534,7 @@ public function test_create_comment_without_type() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1575,7 +1573,7 @@ public function test_create_comment_with_invalid_type() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1598,7 +1596,7 @@ public function test_create_comment_invalid_email() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1625,7 +1623,7 @@ public function test_create_item_current_user() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1654,7 +1652,7 @@ public function test_create_comment_other_user() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1679,7 +1677,7 @@ public function test_create_comment_other_user_without_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1699,7 +1697,7 @@ public function test_create_comment_invalid_post() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1720,7 +1718,7 @@ public function test_create_comment_status_without_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1744,7 +1742,7 @@ public function test_create_comment_with_status_IP_and_user_agent() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1768,8 +1766,8 @@ public function test_create_comment_user_agent_header() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
-		$request->add_header( 'user_agent', 'Mozilla/4.0 (compatible; MSIE 5.5; AOL 4.0; Windows 95)' );
+		$request->add_header( 'Content-Type', 'application/json' );
+		$request->add_header( 'User_Agent', 'Mozilla/4.0 (compatible; MSIE 5.5; AOL 4.0; Windows 95)' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1794,7 +1792,7 @@ public function test_create_comment_author_ip() {
 			'status'       => 'approved',
 		);
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response    = rest_get_server()->dispatch( $request );
 		$data        = $response->get_data();
@@ -1815,7 +1813,7 @@ public function test_create_comment_invalid_author_IP() {
 			'status'       => 'approved',
 		);
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1835,7 +1833,7 @@ public function test_create_comment_author_ip_no_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_comment_invalid_author_ip', $response, 403 );
@@ -1855,7 +1853,7 @@ public function test_create_comment_author_ip_defaults_to_remote_addr() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response    = rest_get_server()->dispatch( $request );
 		$data        = $response->get_data();
@@ -1875,7 +1873,7 @@ public function test_create_comment_no_post_id() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1895,7 +1893,7 @@ public function test_create_comment_no_post_id_no_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1915,7 +1913,7 @@ public function test_create_comment_invalid_post_id() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1935,7 +1933,7 @@ public function test_create_comment_draft_post() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1955,7 +1953,7 @@ public function test_create_comment_trash_post() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1976,7 +1974,7 @@ public function test_create_comment_private_post_invalid_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1996,7 +1994,7 @@ public function test_create_comment_password_post_invalid_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2023,7 +2021,7 @@ public function test_create_item_duplicate() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2044,7 +2042,7 @@ public function test_create_comment_closed() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2075,7 +2073,7 @@ public function test_create_item_invalid_author() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2093,7 +2091,7 @@ public function test_create_item_pull_author_info() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2117,7 +2115,7 @@ public function test_create_comment_two_times() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2132,7 +2130,7 @@ public function test_create_comment_two_times() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2156,7 +2154,7 @@ public function test_allow_anonymous_comments_null() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2183,7 +2181,7 @@ public function test_create_comment_author_name_too_long() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2207,7 +2205,7 @@ public function test_create_comment_author_email_too_long() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2231,7 +2229,7 @@ public function test_create_comment_author_url_too_long() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2255,7 +2253,7 @@ public function test_create_comment_content_too_long() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2275,7 +2273,7 @@ public function test_create_comment_without_password() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2296,7 +2294,7 @@ public function test_create_comment_with_password() {
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/comments' );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertSame( 201, $response->get_status() );
@@ -2319,7 +2317,7 @@ public function test_update_item() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2340,7 +2338,7 @@ public function test_update_item() {
 	}
 
 	/**
-	 * @dataProvider comment_dates_provider
+	 * @dataProvider data_comment_dates
 	 */
 	public function test_update_comment_date( $params, $results ) {
 		wp_set_current_user( self::$editor_id );
@@ -2424,7 +2422,7 @@ public function test_update_comment_status() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2452,7 +2450,7 @@ public function test_update_comment_field_does_not_use_default_values() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2474,7 +2472,7 @@ public function test_update_comment_date_gmt() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2498,7 +2496,7 @@ public function test_update_comment_author_email_only() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2518,7 +2516,7 @@ public function test_update_comment_empty_author_name() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2537,7 +2535,7 @@ public function test_update_comment_author_name_only() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2557,7 +2555,7 @@ public function test_update_comment_empty_author_email() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2575,7 +2573,7 @@ public function test_update_comment_author_email_too_short() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2592,7 +2590,7 @@ public function test_update_comment_invalid_type() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2609,7 +2607,7 @@ public function test_update_comment_with_raw_property() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2630,7 +2628,7 @@ public function test_update_item_invalid_date() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2646,7 +2644,7 @@ public function test_update_item_invalid_date_gmt() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2661,7 +2659,7 @@ public function test_update_comment_invalid_id() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/comments/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2686,7 +2684,7 @@ public function test_update_comment_invalid_permission() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$hold_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2705,7 +2703,7 @@ public function test_update_comment_when_can_moderate_comments() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2735,7 +2733,7 @@ public function test_update_comment_private_post_invalid_permission() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $private_comment_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2794,7 +2792,7 @@ public function test_update_comment_author_name_too_long() {
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2814,7 +2812,7 @@ public function test_update_comment_author_email_too_long() {
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2834,7 +2832,7 @@ public function test_update_comment_author_url_too_long() {
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2853,7 +2851,7 @@ public function test_update_comment_content_too_long() {
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2874,7 +2872,7 @@ public function test_update_comment_is_wp_error() {
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', self::$approved_id ) );
 
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -3298,15 +3296,15 @@ public function test_additional_field_update_errors() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
-		return get_comment_meta( $object['id'], 'my_custom_int', true );
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return get_comment_meta( $response_data['id'], $field_name, true );
 	}
 
-	public function additional_field_update_callback( $value, $comment ) {
+	public function additional_field_update_callback( $value, $comment, $field_name ) {
 		if ( 'returnError' === $value ) {
 			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
 		}
-		update_comment_meta( $comment->comment_ID, 'my_custom_int', $value );
+		update_comment_meta( $comment->comment_ID, $field_name, $value );
 	}
 
 	protected function check_comment_data( $data, $context, $links ) {
diff --git a/tests/phpunit/tests/rest-api/rest-controller.php b/tests/phpunit/tests/rest-api/rest-controller.php
index 77b1596d3dafb..f7da75327a489 100644
--- a/tests/phpunit/tests/rest-api/rest-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Controller extends WP_Test_REST_TestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
index b7a5617a11d9c..07050a0515e17 100644
--- a/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-controller.php
@@ -4,10 +4,9 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @covers WP_REST_Global_Styles_Controller
+ *
  * @group restapi-global-styles
  * @group restapi
  */
@@ -484,6 +483,27 @@ public function test_get_theme_items() {
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$expected = array(
+			array(
+				'version'  => 2,
+				'title'    => 'variation-b',
+				'settings' => array(
+					'blocks' => array(
+						'core/post-title' => array(
+							'color' => array(
+								'palette' => array(
+									'theme' => array(
+										array(
+											'slug'  => 'light',
+											'name'  => 'Light',
+											'color' => '#f1f1f1',
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+			),
 			array(
 				'version'  => 2,
 				'title'    => 'Block theme variation',
@@ -511,6 +531,68 @@ public function test_get_theme_items() {
 				),
 			),
 		);
-		$this->assertSameSetsWithIndex( $data, $expected );
+
+		wp_recursive_ksort( $data );
+		wp_recursive_ksort( $expected );
+
+		$this->assertSameSets( $data, $expected );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller::get_available_actions
+	 */
+	public function test_assign_edit_css_action_admin() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_param( 'context', 'edit' );
+		$response = rest_do_request( $request );
+		$links    = $response->get_links();
+
+		// Admins can only edit css on single site.
+		if ( is_multisite() ) {
+			$this->assertArrayNotHasKey( 'https://api.w.org/action-edit-css', $links );
+		} else {
+			$this->assertArrayHasKey( 'https://api.w.org/action-edit-css', $links );
+		}
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller::update_item
+	 * @ticket 57536
+	 */
+	public function test_update_item_valid_styles_css() {
+		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_body_params(
+			array(
+				'styles' => array( 'css' => 'body { color: red; }' ),
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertSame( 'body { color: red; }', $data['styles']['css'] );
+	}
+
+	/**
+	 * @covers WP_REST_Global_Styles_Controller::update_item
+	 * @ticket 57536
+	 */
+	public function test_update_item_invalid_styles_css() {
+		wp_set_current_user( self::$admin_id );
+		if ( is_multisite() ) {
+			grant_super_admin( self::$admin_id );
+		}
+		$request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+		$request->set_body_params(
+			array(
+				'styles' => array( 'css' => '<p>test</p> body { color: red; }' ),
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_custom_css_illegal_markup', $response, 400 );
 	}
 }
diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
new file mode 100644
index 0000000000000..9e580d5f3c978
--- /dev/null
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
@@ -0,0 +1,831 @@
+<?php
+/**
+ * Unit tests covering WP_REST_Global_Styles_Revisions_Controller functionality.
+ *
+ * @package WordPress
+ * @subpackage REST API
+ *
+ * @covers WP_REST_Global_Styles_Revisions_Controller
+ *
+ * @group restapi-global-styles
+ * @group restapi
+ */
+class WP_REST_Global_Styles_Revisions_Controller_Test extends WP_Test_REST_Controller_Testcase {
+	/**
+	 * @var int
+	 */
+	protected static $admin_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $second_admin_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $author_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $global_styles_id;
+
+	/**
+	 * @var int
+	 */
+	private $total_revisions;
+
+	/**
+	 * @var array
+	 */
+	private $revision_1;
+
+	/**
+	 * @var int
+	 */
+	private $revision_1_id;
+
+	/**
+	 * @var array
+	 */
+	private $revision_2;
+
+	/**
+	 * @var int
+	 */
+	private $revision_2_id;
+
+	/**
+	 * @var array
+	 */
+	private $revision_3;
+
+	/**
+	 * @var int
+	 */
+	private $revision_3_id;
+
+	/**
+	 * Create fake data before our tests run.
+	 *
+	 * @param WP_UnitTest_Factory $factory Helper that lets us create fake data.
+	 */
+	public static function wpSetupBeforeClass( $factory ) {
+		self::$admin_id        = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		self::$second_admin_id = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		self::$author_id       = $factory->user->create(
+			array(
+				'role' => 'author',
+			)
+		);
+
+		wp_set_current_user( self::$admin_id );
+		// This creates the global styles for the current theme.
+		self::$global_styles_id = $factory->post->create(
+			array(
+				'post_content' => '{"version": ' . WP_Theme_JSON::LATEST_SCHEMA . ', "isGlobalStylesUserThemeJSON": true }',
+				'post_status'  => 'publish',
+				'post_title'   => __( 'Custom Styles', 'default' ),
+				'post_type'    => 'wp_global_styles',
+				'post_name'    => 'wp-global-styles-tt1-blocks-revisions',
+				'tax_input'    => array(
+					'wp_theme' => 'tt1-blocks',
+				),
+			)
+		);
+
+		// Update post to create a new revisions.
+		$new_styles_post = array(
+			'ID'           => self::$global_styles_id,
+			'post_content' => wp_json_encode(
+				array(
+					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
+					'isGlobalStylesUserThemeJSON' => true,
+					'styles'                      => array(
+						'color' => array(
+							'background' => 'hotpink',
+						),
+					),
+					'settings'                    => array(
+						'color' => array(
+							'palette' => array(
+								'custom' => array(
+									array(
+										'name'  => 'Ghost',
+										'slug'  => 'ghost',
+										'color' => 'ghost',
+									),
+								),
+							),
+						),
+					),
+				)
+			),
+		);
+
+		wp_update_post( $new_styles_post, true, false );
+
+		$new_styles_post = array(
+			'ID'           => self::$global_styles_id,
+			'post_content' => wp_json_encode(
+				array(
+					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
+					'isGlobalStylesUserThemeJSON' => true,
+					'styles'                      => array(
+						'color' => array(
+							'background' => 'lemonchiffon',
+						),
+					),
+					'settings'                    => array(
+						'color' => array(
+							'palette' => array(
+								'custom' => array(
+									array(
+										'name'  => 'Gwanda',
+										'slug'  => 'gwanda',
+										'color' => 'gwanda',
+									),
+								),
+							),
+						),
+					),
+				)
+			),
+		);
+
+		wp_update_post( $new_styles_post, true, false );
+
+		$new_styles_post = array(
+			'ID'           => self::$global_styles_id,
+			'post_content' => wp_json_encode(
+				array(
+					'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
+					'isGlobalStylesUserThemeJSON' => true,
+					'styles'                      => array(
+						'color' => array(
+							'background' => 'chocolate',
+						),
+					),
+					'settings'                    => array(
+						'color' => array(
+							'palette' => array(
+								'custom' => array(
+									array(
+										'name'  => 'Stacy',
+										'slug'  => 'stacy',
+										'color' => 'stacy',
+									),
+								),
+							),
+						),
+					),
+				)
+			),
+		);
+
+		wp_update_post( $new_styles_post, true, false );
+		wp_set_current_user( 0 );
+	}
+
+	/**
+	 * Removes users after our tests run.
+	 */
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$second_admin_id );
+		self::delete_user( self::$author_id );
+	}
+
+	/**
+	 * Sets up before tests.
+	 */
+	public function set_up() {
+		parent::set_up();
+		switch_theme( 'tt1-blocks' );
+		$revisions             = wp_get_post_revisions( self::$global_styles_id );
+		$this->total_revisions = count( $revisions );
+
+		$this->revision_1    = array_pop( $revisions );
+		$this->revision_1_id = $this->revision_1->ID;
+
+		$this->revision_2    = array_pop( $revisions );
+		$this->revision_2_id = $this->revision_2->ID;
+
+		$this->revision_3    = array_pop( $revisions );
+		$this->revision_3_id = $this->revision_3->ID;
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::register_routes
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayHasKey(
+			'/wp/v2/global-styles/(?P<parent>[\d]+)/revisions',
+			$routes,
+			'Global style revisions based on the given parentID route does not exist.'
+		);
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_missing_parent() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/revisions' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, 404 );
+	}
+
+	/**
+	 * Utility function to check the items in WP_REST_Global_Styles_Controller::get_items
+	 * against the expected values.
+	 *
+	 * @ticket 58524
+	 */
+	protected function check_get_revision_response( $response_revision_item, $revision_expected_item ) {
+		$this->assertSame( (int) $revision_expected_item->post_author, $response_revision_item['author'], 'Check that the revision item `author` exists.' );
+		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_date ), $response_revision_item['date'], 'Check that the revision item `date` exists.' );
+		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_date_gmt ), $response_revision_item['date_gmt'], 'Check that the revision item `date_gmt` exists.' );
+		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_modified ), $response_revision_item['modified'], 'Check that the revision item `modified` exists.' );
+		$this->assertSame( mysql_to_rfc3339( $revision_expected_item->post_modified_gmt ), $response_revision_item['modified_gmt'], 'Check that the revision item `modified_gmt` exists.' );
+		$this->assertSame( $revision_expected_item->post_parent, $response_revision_item['parent'], 'Check that an id for the parent exists.' );
+
+		// Global styles.
+		$config = ( new WP_Theme_JSON( json_decode( $revision_expected_item->post_content, true ), 'custom' ) )->get_raw_data();
+		$this->assertEquals(
+			$config['settings'],
+			$response_revision_item['settings'],
+			'Check that the revision settings exist in the response.'
+		);
+		$this->assertEquals(
+			$config['styles'],
+			$response_revision_item['styles'],
+			'Check that the revision styles match the updated styles.'
+		);
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items() {
+		wp_set_current_user( self::$admin_id );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status(), 'Response status is 200.' );
+		$this->assertCount( $this->total_revisions, $data, 'Check that correct number of revisions exists.' );
+
+		// Reverse chronology.
+		$this->assertSame( $this->revision_3_id, $data[0]['id'] );
+		$this->check_get_revision_response( $data[0], $this->revision_3 );
+
+		$this->assertSame( $this->revision_2_id, $data[1]['id'] );
+		$this->check_get_revision_response( $data[1], $this->revision_2 );
+
+		$this->assertSame( $this->revision_1_id, $data[2]['id'] );
+		$this->check_get_revision_response( $data[2], $this->revision_1 );
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_eligible_roles() {
+		wp_set_current_user( self::$second_admin_id );
+		$config              = array(
+			'version'                     => WP_Theme_JSON::LATEST_SCHEMA,
+			'isGlobalStylesUserThemeJSON' => true,
+			'styles'                      => array(
+				'color' => array(
+					'background' => 'whitesmoke',
+				),
+			),
+			'settings'                    => array(),
+		);
+		$updated_styles_post = array(
+			'ID'           => self::$global_styles_id,
+			'post_content' => wp_json_encode( $config ),
+		);
+
+		wp_update_post( $updated_styles_post, true, false );
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertCount( $this->total_revisions + 1, $data, 'Check that extra revision exist' );
+		$this->assertEquals( self::$second_admin_id, $data[0]['author'], 'Check that second author id returns expected value.' );
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items with context arg.
+	 */
+	public function test_get_item_embed_context() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'context', 'embed' );
+		$response = rest_get_server()->dispatch( $request );
+		$fields   = array(
+			'author',
+			'date',
+			'id',
+			'parent',
+		);
+		$data     = $response->get_data();
+		$this->assertSameSets( $fields, array_keys( $data[0] ) );
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_item_schema
+	 */
+	public function test_get_item_schema() {
+		$request    = new WP_REST_Request( 'OPTIONS', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$response   = rest_get_server()->dispatch( $request );
+		$data       = $response->get_data();
+		$properties = $data['schema']['properties'];
+
+		$this->assertCount( 9, $properties, 'Schema properties array has exactly 9 elements.' );
+		$this->assertArrayHasKey( 'id', $properties, 'Schema properties array has "id" key.' );
+		$this->assertArrayHasKey( 'styles', $properties, 'Schema properties array has "styles" key.' );
+		$this->assertArrayHasKey( 'settings', $properties, 'Schema properties array has "settings" key.' );
+		$this->assertArrayHasKey( 'parent', $properties, 'Schema properties array has "parent" key.' );
+		$this->assertArrayHasKey( 'author', $properties, 'Schema properties array has "author" key.' );
+		$this->assertArrayHasKey( 'date', $properties, 'Schema properties array has "date" key.' );
+		$this->assertArrayHasKey( 'date_gmt', $properties, 'Schema properties array has "date_gmt" key.' );
+		$this->assertArrayHasKey( 'modified', $properties, 'Schema properties array has "modified" key.' );
+		$this->assertArrayHasKey( 'modified_gmt', $properties, 'Schema properties array has "modified_gmt" key.' );
+	}
+
+	/**
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_item_permissions_check
+	 */
+	public function test_get_item_permissions_check() {
+		wp_set_current_user( self::$author_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_cannot_view', $response, 403 );
+	}
+
+	/**
+	 * Tests the pagination header of the first page.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_pagination_header_of_the_first_page
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_pagination_header_of_the_first_page() {
+		wp_set_current_user( self::$admin_id );
+
+		$rest_route  = '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions';
+		$per_page    = 2;
+		$total_pages = (int) ceil( $this->total_revisions / $per_page );
+		$page        = 1;  // First page.
+
+		$request = new WP_REST_Request( 'GET', $rest_route );
+		$request->set_query_params(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$headers  = $response->get_headers();
+		$this->assertSame( $this->total_revisions, $headers['X-WP-Total'] );
+		$this->assertSame( $total_pages, $headers['X-WP-TotalPages'] );
+		$next_link = add_query_arg(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page + 1,
+			),
+			rest_url( $rest_route )
+		);
+		$this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
+		$this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
+	}
+
+	/**
+	 * Tests the pagination header of the last page.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_pagination_header_of_the_last_page
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_pagination_header_of_the_last_page() {
+		wp_set_current_user( self::$admin_id );
+
+		$rest_route  = '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions';
+		$per_page    = 2;
+		$total_pages = (int) ceil( $this->total_revisions / $per_page );
+		$page        = 2;  // Last page.
+
+		$request = new WP_REST_Request( 'GET', $rest_route );
+		$request->set_query_params(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$headers  = $response->get_headers();
+		$this->assertSame( $this->total_revisions, $headers['X-WP-Total'] );
+		$this->assertSame( $total_pages, $headers['X-WP-TotalPages'] );
+		$prev_link = add_query_arg(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page - 1,
+			),
+			rest_url( $rest_route )
+		);
+		$this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
+	}
+
+	/**
+	 * Tests that invalid 'per_page' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_invalid_per_page_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_invalid_per_page_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = -1; // Invalid number.
+		$expected_error  = 'rest_invalid_param';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'per_page', $per_page );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that out of bounds 'page' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_out_of_bounds_page_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_out_of_bounds_page_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$total_pages     = (int) ceil( $this->total_revisions / $per_page );
+		$page            = $total_pages + 1; // Out of bound page.
+		$expected_error  = 'rest_revision_invalid_page_number';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that impossibly high 'page' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_invalid_max_pages_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_invalid_max_pages_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$page            = REST_TESTS_IMPOSSIBLY_HIGH_NUMBER; // Invalid number.
+		$expected_error  = 'rest_revision_invalid_page_number';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that the default query should fetch all revisions.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_default_query_should_fetch_all_revisons
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_default_query_should_fetch_all_revisons() {
+		wp_set_current_user( self::$admin_id );
+
+		$expected_count = $this->total_revisions;
+
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertCount( $expected_count, $response->get_data() );
+	}
+
+	/**
+	 * Tests that 'offset' query shouldn't work without 'per_page' (fallback -1).
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_offset_should_not_work_without_per_page
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_offset_should_not_work_without_per_page() {
+		wp_set_current_user( self::$admin_id );
+
+		$offset         = 1;
+		$expected_count = $this->total_revisions;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_param( 'offset', $offset );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertCount( $expected_count, $response->get_data() );
+	}
+
+	/**
+	 * Tests that 'offset' query should work with 'per_page'.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_offset_should_work_with_per_page
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_offset_should_work_with_per_page() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page       = 2;
+		$offset         = 1;
+		$expected_count = 2;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertCount( $expected_count, $response->get_data() );
+	}
+
+	/**
+	 * Tests that 'offset' query should take priority over 'page'.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_offset_should_take_priority_over_page
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_offset_should_take_priority_over_page() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page       = 2;
+		$offset         = 1;
+		$page           = 1;
+		$expected_count = 2;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertCount( $expected_count, $response->get_data() );
+	}
+
+	/**
+	 * Tests that 'offset' query, as the total revisions count, should return empty data.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_total_revisions_offset_should_return_empty_data
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_total_revisions_offset_should_return_empty_data() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$offset          = $this->total_revisions;
+		$expected_error  = 'rest_revision_invalid_offset_number';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that out of bound 'offset' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_out_of_bound_offset_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_out_of_bound_offset_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$offset          = $this->total_revisions + 1;
+		$expected_error  = 'rest_revision_invalid_offset_number';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that impossible high number for 'offset' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_impossible_high_number_offset_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_impossible_high_number_offset_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$offset          = REST_TESTS_IMPOSSIBLY_HIGH_NUMBER;
+		$expected_error  = 'rest_revision_invalid_offset_number';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that invalid 'offset' query should error.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_invalid_offset_should_error
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_invalid_offset_should_error() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page        = 2;
+		$offset          = 'moreplease';
+		$expected_error  = 'rest_invalid_param';
+		$expected_status = 400;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => $offset,
+				'per_page' => $per_page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( $expected_error, $response, $expected_status );
+	}
+
+	/**
+	 * Tests that out of bounds 'page' query should not error when offset is provided,
+	 * because it takes precedence.
+	 *
+	 * Duplicate of WP_Test_REST_Revisions_Controller::test_get_items_out_of_bounds_page_should_not_error_if_offset
+	 *
+	 * @ticket 58524
+	 *
+	 * @covers WP_REST_Global_Styles_Controller::get_items
+	 */
+	public function test_get_items_out_of_bounds_page_should_not_error_if_offset() {
+		wp_set_current_user( self::$admin_id );
+
+		$per_page       = 2;
+		$total_pages    = (int) ceil( $this->total_revisions / $per_page );
+		$page           = $total_pages + 1; // Out of bound page.
+		$expected_count = 2;
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions' );
+		$request->set_query_params(
+			array(
+				'offset'   => 1,
+				'per_page' => $per_page,
+				'page'     => $page,
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertCount( $expected_count, $response->get_data() );
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_context_param() {
+		// Controller does not implement test_context_param().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_get_item() {
+		// Controller does not implement get_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_create_item() {
+		// Controller does not implement create_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_delete_item() {
+		// Controller does not implement delete_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_prepare_item() {
+		// Controller does not implement prepare_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_update_item() {
+		// Controller does not implement update_item().
+	}
+}
diff --git a/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php b/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php
new file mode 100644
index 0000000000000..b2374f3ff6b3e
--- /dev/null
+++ b/tests/phpunit/tests/rest-api/rest-navigation-fallback-controller.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * Unit tests covering WP_REST_Navigation_Fallback_Controller functionality.
+ *
+ * Note: that these tests are designed to provide high level coverage only. The majority of the tests
+ * are made directly against the WP_Navigation_Fallback class as this:
+ *
+ * - is where the bulk of the logic is.
+ * - is also consumed by the Navigation block's server side rendering.
+ *
+ * @package WordPress
+ * @subpackage REST API
+ *
+ * @covers WP_REST_Navigation_Fallback_Controller
+ */
+
+/**
+ * @group restapi
+ * @group navigation
+ */
+class WP_REST_Navigation_Fallback_Controller_Test extends WP_Test_REST_Controller_Testcase {
+
+	protected static $admin_user;
+	protected static $editor_user;
+
+	public static function wpSetUpBeforeClass( $factory ) {
+		self::$admin_user = $factory->user->create( array( 'role' => 'administrator' ) );
+
+		self::$editor_user = $factory->user->create( array( 'role' => 'editor' ) );
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		wp_set_current_user( self::$admin_user );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller::register_routes
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+
+		$this->assertArrayHasKey( '/wp-block-editor/v1/navigation-fallback', $routes, 'Fallback route should be registered.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_should_not_return_menus_for_users_without_permissions() {
+
+		wp_set_current_user( self::$editor_user );
+
+		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 403, $response->get_status(), 'Response should indicate user does not have permission.' );
+
+		$this->assertEquals( 'rest_cannot_create', $data['code'], 'Response should indicate user cannot create.' );
+
+		$this->assertEquals( 'Sorry, you are not allowed to create Navigation Menus as this user.', $data['message'], 'Response should indicate failed request status.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_get_item() {
+
+		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status(), 'Status should indicate successful request.' );
+
+		$this->assertIsArray( $data, 'Response should be of correct type.' );
+
+		$this->assertArrayHasKey( 'id', $data, 'Response should contain expected fields.' );
+
+		$this->assertEquals( 'wp_navigation', get_post_type( $data['id'] ), '"id" field should represent a post of type "wp_navigation"' );
+
+		// Check that only a single Navigation fallback was created.
+		$navs_in_db = $this->get_navigations_in_database();
+
+		$this->assertCount( 1, $navs_in_db, 'Only a single Navigation menu should be present in the database.' );
+
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_get_item_schema() {
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp-block-editor/v1/navigation-fallback' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertEquals( 200, $response->get_status(), 'Status should indicate successful request.' );
+
+		$this->assertArrayHasKey( 'schema', $data, '"schema" key should exist in response.' );
+
+		$schema = $data['schema'];
+
+		$this->assertEquals( 'object', $schema['type'], 'The schema type should match the expected type.' );
+
+		$this->assertArrayHasKey( 'id', $schema['properties'], 'Schema should have an "id" property.' );
+		$this->assertEquals( 'integer', $schema['properties']['id']['type'], 'Schema "id" property should be an integer.' );
+		$this->assertTrue( $schema['properties']['id']['readonly'], 'Schema "id" property should be readonly.' );
+	}
+
+	/**
+	 * @ticket 58557
+	 * @covers WP_REST_Navigation_Fallback_Controller
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_adds_links() {
+		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$navigation_post_id = $data['id'];
+
+		$links = $response->get_links();
+
+		$this->assertNotEmpty( $links, 'Response should contain links.' );
+
+		$this->assertArrayHasKey( 'self', $links, 'Response should contain a "self" link.' );
+
+		$this->assertStringContainsString( 'wp/v2/navigation/' . $navigation_post_id, $links['self'][0]['href'], 'Self link should reference the correct Navigation Menu post resource url.' );
+
+		$this->assertTrue( $links['self'][0]['attributes']['embeddable'], 'Self link should be embeddable.' );
+	}
+
+	/**
+	 * Tests that the correct filters are applied to the context parameter.
+	 *
+	 * By default, the REST response for the Posts Controller will not return all fields
+	 * when the context is set to 'embed'. Assert that correct additional fields are added
+	 * to the embedded Navigation Post, when the navigation fallback endpoint
+	 * is called with the `_embed` param.
+	 *
+	 * @ticket 58557
+	 *
+	 * @covers ::wp_add_fields_to_navigation_fallback_embedded_links
+	 *
+	 * @since 6.3.0 Added Navigation Fallbacks endpoint.
+	 */
+	public function test_embedded_navigation_post_contains_required_fields() {
+		// First we'll use the navigation fallback to get a link to the navigation endpoint.
+		$request  = new WP_REST_Request( 'GET', '/wp-block-editor/v1/navigation-fallback' );
+		$response = rest_get_server()->dispatch( $request );
+		$links    = $response->get_links();
+
+		// Extract the navigation endpoint URL from the response.
+		$embedded_navigation_href = $links['self'][0]['href'];
+		preg_match( '/\?rest_route=(.*)/', $embedded_navigation_href, $matches );
+		$navigation_endpoint = $matches[1];
+
+		// Fetch the "linked" navigation post from the endpoint, with the context parameter set to 'embed' to simulate fetching embedded links.
+		$request = new WP_REST_Request( 'GET', $navigation_endpoint );
+		$request->set_param( 'context', 'embed' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		// Verify that the additional status field is present.
+		$this->assertArrayHasKey( 'status', $data, 'Response title should contain a "status" field.' );
+
+		// Verify that the additional content fields are present.
+		$this->assertArrayHasKey( 'content', $data, 'Response should contain a "content" field.' );
+		$this->assertArrayHasKey( 'raw', $data['content'], 'Response content should contain a "raw" field.' );
+		$this->assertArrayHasKey( 'rendered', $data['content'], 'Response content should contain a "rendered" field.' );
+		$this->assertArrayHasKey( 'block_version', $data['content'], 'Response should contain a "block_version" field.' );
+
+		// Verify that the additional title.raw field is present.
+		$this->assertArrayHasKey( 'raw', $data['title'], 'Response title should contain a "raw" key.' );
+	}
+
+	private function get_navigations_in_database() {
+		$navs_in_db = new WP_Query(
+			array(
+				'post_type'      => 'wp_navigation',
+				'post_status'    => 'publish',
+				'posts_per_page' => -1,
+				'orderby'        => 'date',
+				'order'          => 'DESC',
+			)
+		);
+
+		return $navs_in_db->posts ? $navs_in_db->posts : array();
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_prepare_item() {
+		// Covered by the core test.
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_context_param() {
+		// Covered by the core test.
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_get_items() {
+		// Covered by the core test.
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_create_item() {
+		// Controller does not implement create_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_update_item() {
+		// Controller does not implement update_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_delete_item() {
+		// Controller does not implement delete_item().
+	}
+}
diff --git a/tests/phpunit/tests/rest-api/rest-pages-controller.php b/tests/phpunit/tests/rest-api/rest-pages-controller.php
index a6a9cfa3f46d5..9900c5a003afe 100644
--- a/tests/phpunit/tests/rest-api/rest-pages-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-pages-controller.php
@@ -5,9 +5,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
@@ -86,6 +84,7 @@ public function test_registered_query_params() {
 				'parent_exclude',
 				'per_page',
 				'search',
+				'search_columns',
 				'slug',
 				'status',
 			),
diff --git a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
index 22a9e08ad1b45..77b99af76b19d 100644
--- a/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  * @group pattern-directory
  */
@@ -30,6 +28,15 @@ class WP_REST_Pattern_Directory_Controller_Test extends WP_Test_REST_Controller_
 	 */
 	private static $controller;
 
+	/**
+	 * List of URLs captured.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @var string[]
+	 */
+	protected static $http_request_urls;
+
 	/**
 	 * Set up class test fixtures.
 	 *
@@ -44,9 +51,30 @@ public static function wpSetUpBeforeClass( $factory ) {
 			)
 		);
 
+		self::$http_request_urls = array();
+
 		static::$controller = new WP_REST_Pattern_Directory_Controller();
 	}
 
+	/**
+	 * Tear down after class.
+	 *
+	 * @since 6.2.0
+	 */
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$contributor_id );
+	}
+
+	/**
+	 * Clear the captured request URLs after each test.
+	 *
+	 * @since 6.2.0
+	 */
+	public function tear_down() {
+		self::$http_request_urls = array();
+		parent::tear_down();
+	}
+
 	/**
 	 * Asserts that the pattern matches the expected response schema.
 	 *
@@ -310,6 +338,176 @@ static function( $response ) {
 		$this->assertSame( 'modified the cache', $patterns[0] );
 	}
 
+	/**
+	 * Tests if the provided query args are passed through to the wp.org API.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @ticket 57501
+	 *
+	 * @covers WP_REST_Pattern_Directory_Controller::get_items
+	 *
+	 * @dataProvider data_get_items_query_args
+	 *
+	 * @param string $param    Query parameter name (ex, page).
+	 * @param mixed  $value    Query value to test.
+	 * @param bool   $is_error Whether this value should error or not.
+	 * @param mixed  $expected Expected value (or expected error code).
+	 */
+	public function test_get_items_query_args( $param, $value, $is_error, $expected ) {
+		wp_set_current_user( self::$contributor_id );
+		add_filter( 'pre_http_request', array( $this, 'mock_request_to_apiwporg_url' ), 10, 3 );
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/pattern-directory/patterns' );
+		if ( $value ) {
+			$request->set_query_params( array( $param => $value ) );
+		}
+
+		$response = rest_do_request( $request );
+		$data     = $response->get_data();
+		if ( $is_error ) {
+			$this->assertSame( $expected, $data['code'], 'Response error code does not match' );
+			$this->assertStringContainsString( $param, $data['message'], 'Response error message does not match' );
+		} else {
+			$this->assertCount( 1, self::$http_request_urls, 'The number of HTTP Request URLs is not 1' );
+			$this->assertStringContainsString( $param . '=' . $expected, self::$http_request_urls[0], 'The param and/or value do not match' );
+		}
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * return array[]
+	 */
+	public function data_get_items_query_args() {
+		return array(
+			'per_page default'   => array(
+				'param'    => 'per_page',
+				'value'    => false,
+				'is_error' => false,
+				'expected' => 100,
+			),
+			'per_page custom-1'  => array(
+				'param'    => 'per_page',
+				'value'    => 5,
+				'is_error' => false,
+				'expected' => 5,
+			),
+			'per_page custom-2'  => array(
+				'param'    => 'per_page',
+				'value'    => 50,
+				'is_error' => false,
+				'expected' => 50,
+			),
+			'per_page invalid-1' => array(
+				'param'    => 'per_page',
+				'value'    => 200,
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+			'per_page invalid-2' => array(
+				'param'    => 'per_page',
+				'value'    => 'abc',
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+
+			'page default'       => array(
+				'param'    => 'page',
+				'value'    => false,
+				'is_error' => false,
+				'expected' => 1,
+			),
+			'page custom'        => array(
+				'param'    => 'page',
+				'value'    => 5,
+				'is_error' => false,
+				'expected' => 5,
+			),
+			'page invalid'       => array(
+				'param'    => 'page',
+				'value'    => 'abc',
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+
+			'offset custom'      => array(
+				'param'    => 'offset',
+				'value'    => 5,
+				'is_error' => false,
+				'expected' => 5,
+			),
+			'offset invalid-1'   => array(
+				'param'    => 'offset',
+				'value'    => 'abc',
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+
+			'order default'      => array(
+				'param'    => 'order',
+				'value'    => false,
+				'is_error' => false,
+				'expected' => 'desc',
+			),
+			'order custom'       => array(
+				'param'    => 'order',
+				'value'    => 'asc',
+				'is_error' => false,
+				'expected' => 'asc',
+			),
+			'order invalid-1'    => array(
+				'param'    => 'order',
+				'value'    => 10,
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+			'order invalid-2'    => array(
+				'param'    => 'order',
+				'value'    => 'fake',
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+
+			'orderby default'    => array(
+				'param'    => 'orderby',
+				'value'    => false,
+				'is_error' => false,
+				'expected' => 'date',
+			),
+			'orderby custom-1'   => array(
+				'param'    => 'orderby',
+				'value'    => 'title',
+				'is_error' => false,
+				'expected' => 'title',
+			),
+			'orderby custom-2'   => array(
+				'param'    => 'orderby',
+				'value'    => 'date',
+				'is_error' => false,
+				'expected' => 'date',
+			),
+			'orderby custom-3'   => array(
+				'param'    => 'orderby',
+				'value'    => 'favorite_count',
+				'is_error' => false,
+				'expected' => 'favorite_count',
+			),
+			'orderby invalid-1'  => array(
+				'param'    => 'orderby',
+				'value'    => 10,
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+			'orderby invalid-2'  => array(
+				'param'    => 'orderby',
+				'value'    => 'fake',
+				'is_error' => true,
+				'expected' => 'rest_invalid_param',
+			),
+		);
+	}
+
 	/**
 	 * @doesNotPerformAssertions
 	 */
@@ -522,10 +720,10 @@ public function data_get_query_parameters() {
 	private static function mock_successful_response( $action, $expects_results ) {
 		add_filter(
 			'pre_http_request',
-			static function ( $preempt, $args, $url ) use ( $action, $expects_results ) {
+			static function ( $response, $parsed_args, $url ) use ( $action, $expects_results ) {
 
 				if ( 'api.wordpress.org' !== wp_parse_url( $url, PHP_URL_HOST ) ) {
-					return $preempt;
+					return $response;
 				}
 
 				$response = array(
@@ -556,7 +754,7 @@ static function ( $preempt, $args, $url ) use ( $action, $expects_results ) {
 	private static function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' ) {
 		add_filter(
 			'pre_http_request',
-			static function ( $return, $args, $url ) use ( $blocked_host ) {
+			static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
 
 				if ( wp_parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
 					return new WP_Error(
@@ -567,10 +765,39 @@ static function ( $return, $args, $url ) use ( $blocked_host ) {
 
 				}
 
-				return $return;
+				return $response;
 			},
 			10,
 			3
 		);
 	}
+
+	/**
+	 * Mock the request to wp.org URL to capture the URLs.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @return array faux/mocked response.
+	 */
+	public function mock_request_to_apiwporg_url( $response, $args, $url ) {
+		if ( 'api.wordpress.org' !== wp_parse_url( $url, PHP_URL_HOST ) ) {
+			return $response;
+		}
+
+		self::$http_request_urls[] = $url;
+
+		// Return a response to prevent external API request.
+		$response = array(
+			'headers'  => array(),
+			'response' => array(
+				'code'    => 200,
+				'message' => 'OK',
+			),
+			'body'     => '[]',
+			'cookies'  => array(),
+			'filename' => null,
+		);
+
+		return $response;
+	}
 }
diff --git a/tests/phpunit/tests/rest-api/rest-plugins-controller.php b/tests/phpunit/tests/rest-api/rest-plugins-controller.php
index 3143c6a761e63..1375c81061b8e 100644
--- a/tests/phpunit/tests/rest-api/rest-plugins-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-plugins-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_REST_Plugins_Controller_Test extends WP_Test_REST_Controller_Testcase {
@@ -1139,13 +1137,13 @@ private function create_test_plugin( $network_only = false ) {
 	private function prevent_requests_to_host( $blocked_host = 'api.wordpress.org' ) {
 		add_filter(
 			'pre_http_request',
-			static function ( $return, $args, $url ) use ( $blocked_host ) {
+			static function ( $response, $parsed_args, $url ) use ( $blocked_host ) {
 				if ( @parse_url( $url, PHP_URL_HOST ) === $blocked_host ) {
 					return new WP_Error( 'plugins_api_failed', "An expected error occurred connecting to $blocked_host because of a unit test", "cURL error 7: Failed to connect to $blocked_host port 80: Connection refused" );
 
 				}
 
-				return $return;
+				return $response;
 			},
 			10,
 			3
diff --git a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
index cc804a80fc276..2142e805820a6 100644
--- a/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
+++ b/tests/phpunit/tests/rest-api/rest-post-meta-fields.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Post_Meta_Fields extends WP_Test_REST_TestCase {
@@ -247,7 +245,7 @@ public function set_up() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
@@ -380,7 +378,7 @@ public function test_get_value_types() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 
 		add_post_meta( self::$post_id, 'test_string', 42 );
@@ -2055,7 +2053,7 @@ public function test_invalid_meta_value_are_set_to_null_in_response() {
 	/**
 	 * @ticket 43392
 	 * @ticket 48363
-	 * @dataProvider _dp_meta_values_are_not_set_to_null_in_response_if_type_safely_serializable
+	 * @dataProvider data_meta_values_are_not_set_to_null_in_response_if_type_safely_serializable
 	 */
 	public function test_meta_values_are_not_set_to_null_in_response_if_type_safely_serializable( $type, $stored, $expected ) {
 		register_post_meta(
@@ -2076,7 +2074,7 @@ public function test_meta_values_are_not_set_to_null_in_response_if_type_safely_
 		$this->assertSame( $expected, $response->get_data()['meta']['safe'] );
 	}
 
-	public function _dp_meta_values_are_not_set_to_null_in_response_if_type_safely_serializable() {
+	public function data_meta_values_are_not_set_to_null_in_response_if_type_safely_serializable() {
 		return array(
 			array( 'boolean', 'true', true ),
 			array( 'boolean', 'false', false ),
@@ -2301,6 +2299,42 @@ public function test_update_meta_with_unchanged_object_values() {
 		$this->assertSame( array( 'project' => 'WordCamp' ), $data['meta']['object'] );
 	}
 
+	/**
+	 * @ticket 57745
+	 */
+	public function test_update_meta_with_unchanged_values_and_custom_authentication() {
+		register_post_meta(
+			'post',
+			'authenticated',
+			array(
+				'single'        => true,
+				'type'          => 'boolean',
+				'default'       => false,
+				'show_in_rest'  => true,
+				'auth_callback' => '__return_false',
+			)
+		);
+
+		add_post_meta( self::$post_id, 'authenticated', false );
+
+		$this->grant_write_permission();
+
+		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );
+		$request->set_body_params(
+			array(
+				'meta' => array(
+					'authenticated' => false,
+				),
+			)
+		);
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertSame( 200, $response->get_status() );
+
+		$data = $response->get_data();
+		$this->assertSame( false, $data['meta']['authenticated'] );
+	}
+
 	/**
 	 * @ticket 43392
 	 */
diff --git a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
index 901e8bb35783e..366e59645947e 100644
--- a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Post_Statuses_Controller extends WP_Test_REST_Controller_Testcase {
@@ -125,8 +123,8 @@ public function test_delete_item() {
 
 	public function test_prepare_item() {
 		$obj      = get_post_status_object( 'publish' );
-		$endpoint = new WP_REST_Post_Statuses_Controller;
-		$request  = new WP_REST_Request;
+		$endpoint = new WP_REST_Post_Statuses_Controller();
+		$request  = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$data = $endpoint->prepare_item_for_response( $obj, $request );
 		$this->check_post_status_obj( $obj, $data->get_data(), $data->get_links() );
@@ -134,8 +132,8 @@ public function test_prepare_item() {
 
 	public function test_prepare_item_limit_fields() {
 		$obj      = get_post_status_object( 'publish' );
-		$request  = new WP_REST_Request;
-		$endpoint = new WP_REST_Post_Statuses_Controller;
+		$request  = new WP_REST_Request();
+		$endpoint = new WP_REST_Post_Statuses_Controller();
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'id,name' );
 		$response = $endpoint->prepare_item_for_response( $obj, $request );
@@ -200,7 +198,7 @@ public function test_get_additional_field_registration() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
+	public function additional_field_get_callback( $response_data ) {
 		return 123;
 	}
 
diff --git a/tests/phpunit/tests/rest-api/rest-post-types-controller.php b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
index 58e1698426488..1c2a0b53b4ef1 100644
--- a/tests/phpunit/tests/rest-api/rest-post-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-post-types-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Post_Types_Controller extends WP_Test_REST_Controller_Testcase {
@@ -133,8 +131,8 @@ public function test_delete_item() {
 
 	public function test_prepare_item() {
 		$obj      = get_post_type_object( 'post' );
-		$endpoint = new WP_REST_Post_Types_Controller;
-		$request  = new WP_REST_Request;
+		$endpoint = new WP_REST_Post_Types_Controller();
+		$request  = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$response = $endpoint->prepare_item_for_response( $obj, $request );
 		$this->check_post_type_obj( 'edit', $obj, $response->get_data(), $response->get_links() );
@@ -142,8 +140,8 @@ public function test_prepare_item() {
 
 	public function test_prepare_item_limit_fields() {
 		$obj      = get_post_type_object( 'post' );
-		$request  = new WP_REST_Request;
-		$endpoint = new WP_REST_Post_Types_Controller;
+		$request  = new WP_REST_Request();
+		$endpoint = new WP_REST_Post_Types_Controller();
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'id,name' );
 		$response = $endpoint->prepare_item_for_response( $obj, $request );
@@ -220,7 +218,7 @@ public function test_get_additional_field_registration() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
+	public function additional_field_get_callback( $response_data ) {
 		return 123;
 	}
 
diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php
index b2a5512fbab63..353325fc81a27 100644
--- a/tests/phpunit/tests/rest-api/rest-posts-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Posts_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
@@ -204,6 +202,7 @@ public function test_registered_query_params() {
 				'page',
 				'per_page',
 				'search',
+				'search_columns',
 				'slug',
 				'status',
 				'sticky',
@@ -1527,8 +1526,41 @@ public function test_get_items_not_sticky_with_exclude_no_sticky_posts() {
 		$this->assertPostsWhere( " AND {posts}.ID NOT IN ($id3) AND {posts}.post_type = 'post' AND (({posts}.post_status = 'publish'))" );
 	}
 
+	/**
+	 * Tests that Rest Post controller supports search columns.
+	 *
+	 * @ticket 43867
+	 * @covers WP_REST_Posts_Controller::get_items
+	 */
+	public function test_get_items_with_custom_search_columns() {
+		$id1 = self::factory()->post->create(
+			array(
+				'post_title'   => 'Title contain foo and bar',
+				'post_content' => 'Content contain bar',
+				'post_excerpt' => 'Excerpt contain baz',
+			)
+		);
+		$id2 = self::factory()->post->create(
+			array(
+				'post_title'   => 'Title contain baz',
+				'post_content' => 'Content contain foo and bar',
+				'post_excerpt' => 'Excerpt contain foo, bar and baz',
+			)
+		);
+
+		$request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
+		$request->set_param( 'search', 'foo bar' );
+		$request->set_param( 'search_columns', array( 'post_title' ) );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertSame( 200, $response->get_status(), 'Response should have a status code 200.' );
+		$data = $response->get_data();
+		$this->assertCount( 1, $data, 'Response should contain one result.' );
+		$this->assertSame( $id1, $data[0]['id'], 'Result should match expected value.' );
+	}
+
 	/**
 	 * @ticket 55592
+	 *
 	 * @covers WP_REST_Posts_Controller::get_items
 	 * @covers ::update_post_thumbnail_cache
 	 */
@@ -1566,6 +1598,7 @@ public function test_get_items_primes_thumbnail_cache_for_featured_media() {
 
 	/**
 	 * @ticket 55593
+	 *
 	 * @covers WP_REST_Posts_Controller::get_items
 	 * @covers ::update_post_parent_caches
 	 */
@@ -2324,7 +2357,7 @@ public function test_create_item() {
 		$this->check_create_post_response( $response );
 	}
 
-	public function post_dates_provider() {
+	public function data_post_dates() {
 		$all_statuses = array(
 			'draft',
 			'publish',
@@ -2395,7 +2428,7 @@ public function post_dates_provider() {
 	}
 
 	/**
-	 * @dataProvider post_dates_provider
+	 * @dataProvider data_post_dates
 	 */
 	public function test_create_post_date( $status, $params, $results ) {
 		wp_set_current_user( self::$editor_id );
@@ -3444,7 +3477,7 @@ public function test_update_post_ignore_readonly() {
 	}
 
 	/**
-	 * @dataProvider post_dates_provider
+	 * @dataProvider data_post_dates
 	 */
 	public function test_update_post_date( $status, $params, $results ) {
 		wp_set_current_user( self::$editor_id );
@@ -3999,7 +4032,17 @@ public function verify_post_roundtrip( $input = array(), $expected_output = arra
 		$this->assertSame( $expected_output['excerpt']['raw'], $post->post_excerpt );
 	}
 
-	public static function post_roundtrip_provider() {
+	/**
+	 * @dataProvider data_post_roundtrip_as_author
+	 */
+	public function test_post_roundtrip_as_author( $raw, $expected ) {
+		wp_set_current_user( self::$author_id );
+
+		$this->assertFalse( current_user_can( 'unfiltered_html' ) );
+		$this->verify_post_roundtrip( $raw, $expected );
+	}
+
+	public static function data_post_roundtrip_as_author() {
 		return array(
 			array(
 				// Raw values.
@@ -4096,16 +4139,6 @@ public static function post_roundtrip_provider() {
 		);
 	}
 
-	/**
-	 * @dataProvider post_roundtrip_provider
-	 */
-	public function test_post_roundtrip_as_author( $raw, $expected ) {
-		wp_set_current_user( self::$author_id );
-
-		$this->assertFalse( current_user_can( 'unfiltered_html' ) );
-		$this->verify_post_roundtrip( $raw, $expected );
-	}
-
 	public function test_post_roundtrip_as_editor_unfiltered_html() {
 		wp_set_current_user( self::$editor_id );
 
@@ -4584,15 +4617,15 @@ public function test_additional_field_update_errors() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
-		return get_post_meta( $object['id'], 'my_custom_int', true );
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return get_post_meta( $response_data['id'], $field_name, true );
 	}
 
-	public function additional_field_update_callback( $value, $post ) {
+	public function additional_field_update_callback( $value, $post, $field_name ) {
 		if ( 'returnError' === $value ) {
 			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
 		}
-		update_post_meta( $post->ID, 'my_custom_int', $value );
+		update_post_meta( $post->ID, $field_name, $value );
 	}
 
 	public function test_publish_action_ldo_registered() {
diff --git a/tests/phpunit/tests/rest-api/rest-request-validation.php b/tests/phpunit/tests/rest-api/rest-request-validation.php
index aab01f2902e5a..4444fb6065120 100644
--- a/tests/phpunit/tests/rest-api/rest-request-validation.php
+++ b/tests/phpunit/tests/rest-api/rest-request-validation.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Request_Validation extends WP_Test_REST_TestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-request.php b/tests/phpunit/tests/rest-api/rest-request.php
index 509c754f6576a..aac7145287109 100644
--- a/tests/phpunit/tests/rest-api/rest-request.php
+++ b/tests/phpunit/tests/rest-api/rest-request.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class Tests_REST_Request extends WP_UnitTestCase {
@@ -59,19 +57,8 @@ public function test_header_multiple() {
 		$this->assertSame( array( $value1, $value2 ), $this->request->get_header_as_array( 'Accept' ) );
 	}
 
-	public static function header_provider() {
-		return array(
-			array( 'Test', 'test' ),
-			array( 'TEST', 'test' ),
-			array( 'Test-Header', 'test_header' ),
-			array( 'test-header', 'test_header' ),
-			array( 'Test_Header', 'test_header' ),
-			array( 'test_header', 'test_header' ),
-		);
-	}
-
 	/**
-	 * @dataProvider header_provider
+	 * @dataProvider data_header_canonicalization
 	 * @param string $original Original header key.
 	 * @param string $expected Expected canonicalized version.
 	 */
@@ -79,19 +66,19 @@ public function test_header_canonicalization( $original, $expected ) {
 		$this->assertSame( $expected, $this->request->canonicalize_header_name( $original ) );
 	}
 
-	public static function content_type_provider() {
+	public static function data_header_canonicalization() {
 		return array(
-			// Check basic parsing.
-			array( 'application/x-wp-example', 'application/x-wp-example', 'application', 'x-wp-example', '' ),
-			array( 'application/x-wp-example; charset=utf-8', 'application/x-wp-example', 'application', 'x-wp-example', 'charset=utf-8' ),
-
-			// Check case insensitivity.
-			array( 'APPLICATION/x-WP-Example', 'application/x-wp-example', 'application', 'x-wp-example', '' ),
+			array( 'Test', 'test' ),
+			array( 'TEST', 'test' ),
+			array( 'Test-Header', 'test_header' ),
+			array( 'test-header', 'test_header' ),
+			array( 'Test_Header', 'test_header' ),
+			array( 'test_header', 'test_header' ),
 		);
 	}
 
 	/**
-	 * @dataProvider content_type_provider
+	 * @dataProvider data_content_type_parsing
 	 *
 	 * @param string $header     Header value.
 	 * @param string $value      Full type value.
@@ -112,6 +99,17 @@ public function test_content_type_parsing( $header, $value, $type, $subtype, $pa
 		$this->assertSame( $parameters, $parsed['parameters'] );
 	}
 
+	public static function data_content_type_parsing() {
+		return array(
+			// Check basic parsing.
+			array( 'application/x-wp-example', 'application/x-wp-example', 'application', 'x-wp-example', '' ),
+			array( 'application/x-wp-example; charset=utf-8', 'application/x-wp-example', 'application', 'x-wp-example', 'charset=utf-8' ),
+
+			// Check case insensitivity.
+			array( 'APPLICATION/x-WP-Example', 'application/x-wp-example', 'application', 'x-wp-example', '' ),
+		);
+	}
+
 	protected function request_with_parameters() {
 		$this->request->set_url_params(
 			array(
@@ -188,22 +186,11 @@ public function test_parameter_order_post() {
 		$this->assertEmpty( $this->request->get_param( 'has_json_params' ) );
 	}
 
-	public static function alternate_json_content_type_provider() {
-		return array(
-			array( 'application/ld+json', 'json', true ),
-			array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'json', true ),
-			array( 'application/activity+json', 'json', true ),
-			array( 'application/json+oembed', 'json', true ),
-			array( 'application/nojson', 'body', false ),
-			array( 'application/no.json', 'body', false ),
-		);
-	}
-
 	/**
 	 * @ticket 49404
-	 * @dataProvider alternate_json_content_type_provider
+	 * @dataProvider data_alternate_json_content_type
 	 *
-	 * @param string $content_type The content-type header.
+	 * @param string $content_type The Content-Type header.
 	 * @param string $source       The source value.
 	 * @param bool   $accept_json  The accept_json value.
 	 */
@@ -219,22 +206,22 @@ public function test_alternate_json_content_type( $content_type, $source, $accep
 		$this->assertEquals( $accept_json, $this->request->get_param( 'has_json_params' ) );
 	}
 
-	public static function is_json_content_type_provider() {
+	public static function data_alternate_json_content_type() {
 		return array(
-			array( 'application/ld+json', true ),
-			array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', true ),
-			array( 'application/activity+json', true ),
-			array( 'application/json+oembed', true ),
-			array( 'application/nojson', false ),
-			array( 'application/no.json', false ),
+			array( 'application/ld+json', 'json', true ),
+			array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', 'json', true ),
+			array( 'application/activity+json', 'json', true ),
+			array( 'application/json+oembed', 'json', true ),
+			array( 'application/nojson', 'body', false ),
+			array( 'application/no.json', 'body', false ),
 		);
 	}
 
 	/**
 	 * @ticket 49404
-	 * @dataProvider is_json_content_type_provider
+	 * @dataProvider data_is_json_content_type
 	 *
-	 * @param string $content_type The content-type header.
+	 * @param string $content_type The Content-Type header.
 	 * @param bool   $is_json      The is_json value.
 	 */
 	public function test_is_json_content_type( $content_type, $is_json ) {
@@ -242,10 +229,21 @@ public function test_is_json_content_type( $content_type, $is_json ) {
 
 		$this->request->set_header( 'Content-Type', $content_type );
 
-		// Check for JSON content-type.
+		// Check for JSON Content-Type.
 		$this->assertSame( $is_json, $this->request->is_json_content_type() );
 	}
 
+	public static function data_is_json_content_type() {
+		return array(
+			array( 'application/ld+json', true ),
+			array( 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', true ),
+			array( 'application/activity+json', true ),
+			array( 'application/json+oembed', true ),
+			array( 'application/nojson', false ),
+			array( 'application/no.json', false ),
+		);
+	}
+
 	/**
 	 * @ticket 49404
 	 */
@@ -312,20 +310,12 @@ public function test_parameter_order_json_invalid() {
 		$this->assertEmpty( $this->request->get_param( 'has_json_params' ) );
 	}
 
-	public function non_post_http_methods_with_request_body_provider() {
-		return array(
-			array( 'PUT' ),
-			array( 'PATCH' ),
-			array( 'DELETE' ),
-		);
-	}
-
 	/**
 	 * Tests that methods supporting request bodies have access to the
 	 * request's body.  For POST this is straightforward via `$_POST`; for
 	 * other methods `WP_REST_Request` needs to parse the body for us.
 	 *
-	 * @dataProvider non_post_http_methods_with_request_body_provider
+	 * @dataProvider data_non_post_body_parameters
 	 */
 	public function test_non_post_body_parameters( $request_method ) {
 		$data = array(
@@ -347,6 +337,14 @@ public function test_non_post_body_parameters( $request_method ) {
 		}
 	}
 
+	public function data_non_post_body_parameters() {
+		return array(
+			array( 'PUT' ),
+			array( 'PATCH' ),
+			array( 'DELETE' ),
+		);
+	}
+
 	public function test_parameters_for_json_put() {
 		$data = array(
 			'foo'  => 'bar',
@@ -361,7 +359,7 @@ public function test_parameters_for_json_put() {
 		);
 
 		$this->request->set_method( 'PUT' );
-		$this->request->add_header( 'content-type', 'application/json' );
+		$this->request->add_header( 'Content-Type', 'application/json' );
 		$this->request->set_body( wp_json_encode( $data ) );
 
 		foreach ( $data as $key => $expected_value ) {
@@ -383,7 +381,7 @@ public function test_parameters_for_json_post() {
 		);
 
 		$this->request->set_method( 'POST' );
-		$this->request->add_header( 'content-type', 'application/json' );
+		$this->request->add_header( 'Content-Type', 'application/json' );
 		$this->request->set_body( wp_json_encode( $data ) );
 
 		foreach ( $data as $key => $expected_value ) {
@@ -864,7 +862,7 @@ public function test_set_param() {
 
 	public function test_set_param_follows_parameter_order() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body(
 			wp_json_encode(
@@ -892,7 +890,7 @@ public function test_set_param_follows_parameter_order() {
 	 */
 	public function test_set_param_updates_param_in_json_and_query() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body(
 			wp_json_encode(
@@ -919,7 +917,7 @@ public function test_set_param_updates_param_in_json_and_query() {
 	 */
 	public function test_set_param_updates_param_if_already_exists_in_query() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body(
 			wp_json_encode(
@@ -953,7 +951,7 @@ public function test_set_param_updates_param_if_already_exists_in_query() {
 	 */
 	public function test_set_param_to_null_updates_param_in_json_and_query() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body(
 			wp_json_encode(
@@ -980,7 +978,7 @@ public function test_set_param_to_null_updates_param_in_json_and_query() {
 	 */
 	public function test_set_param_from_null_updates_param_in_json_and_query_with_null() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body(
 			wp_json_encode(
@@ -1007,7 +1005,7 @@ public function test_set_param_from_null_updates_param_in_json_and_query_with_nu
 	 */
 	public function test_set_param_with_invalid_json() {
 		$request = new WP_REST_Request();
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_method( 'POST' );
 		$request->set_body( '' );
 		$request->set_param( 'param', 'value' );
diff --git a/tests/phpunit/tests/rest-api/rest-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
index c84624ca806bd..e0b713c882bc7 100644
--- a/tests/phpunit/tests/rest-api/rest-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-revisions-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Revisions_Controller extends WP_Test_REST_Controller_Testcase {
@@ -402,12 +400,12 @@ public function test_get_additional_field_registration() {
 		$wp_rest_additional_fields = array();
 	}
 
-	public function additional_field_get_callback( $object ) {
-		return get_post_meta( $object['id'], 'my_custom_int', true );
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return get_post_meta( $response_data['id'], $field_name, true );
 	}
 
-	public function additional_field_update_callback( $value, $post ) {
-		update_post_meta( $post->ID, 'my_custom_int', $value );
+	public function additional_field_update_callback( $value, $post, $field_name ) {
+		update_post_meta( $post->ID, $field_name, $value );
 	}
 
 	protected function check_get_revision_response( $response, $revision ) {
diff --git a/tests/phpunit/tests/rest-api/rest-schema-sanitization.php b/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
index 7b3c076c6ec98..7cf88f243c7ed 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-sanitization.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Schema_Sanitization extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index afc1ebc125830..5a26184fa000c 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -6,9 +6,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  * @group restapi-jsclient
  */
@@ -20,7 +18,7 @@ public function set_up() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 
 		add_filter( 'pre_http_request', array( $this, 'mock_embed_request' ), 10, 3 );
@@ -34,8 +32,8 @@ public function tear_down() {
 		parent::tear_down();
 	}
 
-	public function mock_embed_request( $preempt, $r, $url ) {
-		unset( $preempt, $r );
+	public function mock_embed_request( $response, $parsed_args, $url ) {
+		unset( $response, $parsed_args );
 
 		// Mock request to YouTube Embed.
 		if ( false !== strpos( $url, self::YOUTUBE_VIDEO_ID ) ) {
@@ -136,6 +134,7 @@ public function test_expected_routes_in_schema() {
 			'/wp/v2/comments',
 			'/wp/v2/comments/(?P<id>[\\d]+)',
 			'/wp/v2/global-styles/(?P<id>[\/\w-]+)',
+			'/wp/v2/global-styles/(?P<parent>[\d]+)/revisions',
 			'/wp/v2/global-styles/themes/(?P<stylesheet>[\/\s%\w\.\(\)\[\]\@_\-]+)/variations',
 			'/wp/v2/global-styles/themes/(?P<stylesheet>[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)',
 			'/wp/v2/search',
@@ -146,14 +145,14 @@ public function test_expected_routes_in_schema() {
 			'/wp/v2/settings',
 			'/wp/v2/template-parts',
 			'/wp/v2/template-parts/(?P<id>[\d]+)/autosaves',
-			'/wp/v2/template-parts/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)',
+			'/wp/v2/template-parts/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w%-]+)',
 			'/wp/v2/template-parts/(?P<parent>[\d]+)/autosaves/(?P<id>[\d]+)',
 			'/wp/v2/template-parts/(?P<parent>[\d]+)/revisions',
 			'/wp/v2/template-parts/(?P<parent>[\d]+)/revisions/(?P<id>[\d]+)',
 			'/wp/v2/template-parts/lookup',
 			'/wp/v2/templates',
 			'/wp/v2/templates/(?P<id>[\d]+)/autosaves',
-			'/wp/v2/templates/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)',
+			'/wp/v2/templates/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w%-]+)',
 			'/wp/v2/templates/(?P<parent>[\d]+)/autosaves/(?P<id>[\d]+)',
 			'/wp/v2/templates/(?P<parent>[\d]+)/revisions',
 			'/wp/v2/templates/(?P<parent>[\d]+)/revisions/(?P<id>[\d]+)',
diff --git a/tests/phpunit/tests/rest-api/rest-schema-validation.php b/tests/phpunit/tests/rest-api/rest-schema-validation.php
index 58c5452de9c76..67f01356d93da 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-validation.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-validation.php
@@ -4,9 +4,7 @@
  *
  * @package    WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Schema_Validation extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-search-controller.php b/tests/phpunit/tests/rest-api/rest-search-controller.php
index 2b2e87adebbeb..2e39d385d9965 100644
--- a/tests/phpunit/tests/rest-api/rest-search-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-search-controller.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * WP_REST_Search_Controller tests
+ * Unit tests covering WP_REST_Search_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
- */
-
-/**
- * Tests for WP_REST_Search_Controller.
  *
  * @group restapi
  */
diff --git a/tests/phpunit/tests/rest-api/rest-server.php b/tests/phpunit/tests/rest-api/rest-server.php
index 06beab745a2d9..b752b83872af2 100644
--- a/tests/phpunit/tests/rest-api/rest-server.php
+++ b/tests/phpunit/tests/rest-api/rest-server.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class Tests_REST_Server extends WP_Test_REST_TestCase {
@@ -51,6 +49,10 @@ public function tear_down() {
 		parent::tear_down();
 	}
 
+	public function filter_wp_rest_server_class() {
+		return 'Spy_REST_Server';
+	}
+
 	public function test_envelope() {
 		$data    = array(
 			'amount of arbitrary data' => 'alot',
@@ -593,8 +595,8 @@ public function test_rest_error() {
 
 	public function test_json_error_with_status() {
 		$stub = $this->getMockBuilder( 'Spy_REST_Server' )
-					->setMethods( array( 'set_status' ) )
-					->getMock();
+			->setMethods( array( 'set_status' ) )
+			->getMock();
 
 		$stub->expects( $this->once() )
 			->method( 'set_status' )
@@ -922,11 +924,35 @@ public function test_link_embedding_without_links() {
 		$data   = array(
 			'untouched' => 'data',
 		);
-		$result = rest_get_server()->embed_links( $data );
+		$result = rest_get_server()->embed_links( $data, true );
 
-		$this->assertArrayNotHasKey( '_links', $data );
-		$this->assertArrayNotHasKey( '_embedded', $data );
-		$this->assertSame( 'data', $data['untouched'] );
+		$this->assertArrayNotHasKey( '_links', $result );
+		$this->assertArrayNotHasKey( '_embedded', $result );
+		$this->assertSame( 'data', $result['untouched'] );
+	}
+
+	/**
+	 * Ensure embed_links handles WP_Error objects returned by dispatch
+	 *
+	 * @ticket 56566
+	 */
+	public function test_link_embedding_returning_wp_error() {
+		$return_wp_error = static function() {
+			return new WP_Error( 'some-error', 'This is not valid!' );
+		};
+		add_filter( 'rest_pre_dispatch', $return_wp_error );
+
+		$mock = new MockAction();
+		add_filter( 'rest_post_dispatch', array( $mock, 'filter' ) );
+
+		$response = new WP_REST_Response();
+		$response->add_link( 'author', rest_url( 'test' ), array( 'embeddable' => true ) );
+
+		$data = rest_get_server()->response_to_data( $response, true );
+
+		$this->assertArrayHasKey( '_links', $data );
+		$this->assertCount( 1, $mock->get_events() );
+		$this->assertSame( 'some-error', $data['_embedded']['author'][0]['code'] );
 	}
 
 	public function embedded_response_callback( $request ) {
@@ -982,7 +1008,7 @@ public function test_removing_links_for_href() {
 	}
 
 	/**
-	 * @dataProvider _dp_response_to_data_embedding
+	 * @dataProvider data_response_to_data_embedding
 	 */
 	public function test_response_to_data_embedding( $expected, $embed ) {
 		$response = new WP_REST_Response();
@@ -1000,7 +1026,7 @@ public function test_response_to_data_embedding( $expected, $embed ) {
 		}
 	}
 
-	public function _dp_response_to_data_embedding() {
+	public function data_response_to_data_embedding() {
 		return array(
 			array(
 				array( 'author', 'wp:term', 'https://wordpress.org' ),
@@ -1235,7 +1261,7 @@ public function test_rest_enable_filter_is_deprecated() {
 
 		$result = json_decode( rest_get_server()->sent_body );
 
-		$this->assertObjectNotHasAttribute( 'code', $result );
+		$this->assertObjectNotHasProperty( 'code', $result );
 	}
 
 	public function test_link_header_on_requests() {
@@ -1439,10 +1465,6 @@ public function test_serve_request_headers_are_unslashed() {
 		$this->assertSame( 'data\\with\\slashes', rest_get_server()->last_request->get_header( 'x_my_header' ) );
 	}
 
-	public function filter_wp_rest_server_class() {
-		return 'Spy_REST_Server';
-	}
-
 	/**
 	 * Refreshed nonce should not be present in header when an invalid nonce is passed for logged in user.
 	 *
@@ -2166,7 +2188,7 @@ public function test_json_encode_error_results_in_500_status_code() {
 			array(
 				array(
 					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => function() {
+					'callback'            => static function() {
 						return new \WP_REST_Response( INF );
 					},
 					'permission_callback' => '__return_true',
@@ -2178,6 +2200,36 @@ public function test_json_encode_error_results_in_500_status_code() {
 		$this->assertSame( 500, rest_get_server()->status );
 	}
 
+	/**
+	 * @ticket 57752
+	 */
+	public function test_rest_exposed_cors_headers_filter_receives_request_object() {
+		$mock_hook = new MockAction();
+		add_filter( 'rest_exposed_cors_headers', array( $mock_hook, 'filter' ), 10, 2 );
+
+		rest_get_server()->serve_request( '/test-exposed-cors-headers' );
+
+		$this->assertCount( 1, $mock_hook->get_events() );
+		$this->assertCount( 2, $mock_hook->get_events()[0]['args'] );
+		$this->assertInstanceOf( 'WP_REST_Request', $mock_hook->get_events()[0]['args'][1] );
+		$this->assertSame( '/test-exposed-cors-headers', $mock_hook->get_events()[0]['args'][1]->get_route() );
+	}
+
+	/**
+	 * @ticket 57752
+	 */
+	public function test_rest_allowed_cors_headers_filter_receives_request_object() {
+		$mock_hook = new MockAction();
+		add_filter( 'rest_allowed_cors_headers', array( $mock_hook, 'filter' ), 10, 2 );
+
+		rest_get_server()->serve_request( '/test-allowed-cors-headers' );
+
+		$this->assertCount( 1, $mock_hook->get_events() );
+		$this->assertCount( 2, $mock_hook->get_events()[0]['args'] );
+		$this->assertInstanceOf( 'WP_REST_Request', $mock_hook->get_events()[0]['args'][1] );
+		$this->assertSame( '/test-allowed-cors-headers', $mock_hook->get_events()[0]['args'][1]->get_route() );
+	}
+
 	public function _validate_as_integer_123( $value, $request, $key ) {
 		if ( ! is_int( $value ) ) {
 			return new WP_Error( 'some-error', 'This is not valid!' );
diff --git a/tests/phpunit/tests/rest-api/rest-settings-controller.php b/tests/phpunit/tests/rest-api/rest-settings-controller.php
index 60a5f28c8df47..d9181e1af8c16 100644
--- a/tests/phpunit/tests/rest-api/rest-settings-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-settings-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Settings_Controller extends WP_Test_REST_Controller_Testcase {
@@ -773,7 +771,7 @@ public function test_register_setting_with_custom_additional_properties_value()
 			),
 		);
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/settings' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $data ) );
 
 		$response = rest_do_request( $request );
diff --git a/tests/phpunit/tests/rest-api/rest-sidebars-controller.php b/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
index e15a7f910a257..8210d916f3bdb 100644
--- a/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-sidebars-controller.php
@@ -5,15 +5,12 @@
  * @package WordPress
  * @subpackage REST_API
  * @since 5.8.0
- */
-
-/**
- * Tests for REST API for Widgets.
+ *
+ * @covers WP_REST_Sidebars_Controller
  *
  * @see WP_Test_REST_Controller_Testcase
  * @group restapi
  * @group widgets
- * @covers WP_REST_Sidebars_Controller
  */
 class WP_Test_REST_Sidebars_Controller extends WP_Test_REST_Controller_Testcase {
 
@@ -860,6 +857,73 @@ public function test_get_items_inactive_widgets() {
 		);
 	}
 
+	/**
+	 * @ticket 57531
+	 * @covers WP_Test_REST_Sidebars_Controller::prepare_item_for_response
+	 */
+	public function test_prepare_item_for_response_to_set_inactive_on_theme_switch() {
+		$request = new WP_REST_Request( 'GET', '/wp/v2/sidebars/sidebar-1' );
+
+		// Set up the test.
+		wp_widgets_init();
+		$this->setup_widget(
+			'widget_rss',
+			1,
+			array(
+				'title' => 'RSS test',
+			)
+		);
+		$this->setup_widget(
+			'widget_text',
+			1,
+			array(
+				'text' => 'Custom text test',
+			)
+		);
+		$this->setup_sidebar(
+			'sidebar-1',
+			array(
+				'name' => 'Sidebar 1',
+			),
+			array( 'text-1', 'rss-1' )
+		);
+
+		// Validate the state before a theme switch.
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$data     = $this->remove_links( $data );
+
+		$this->assertSame( 'active', $data['status'] );
+		$this->assertFalse(
+			get_theme_mod( 'wp_classic_sidebars' ),
+			'wp_classic_sidebars theme mod should not exist before switching to block theme'
+		);
+
+		switch_theme( 'block-theme' );
+		wp_widgets_init();
+
+		// Validate the state after a theme switch.
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$data     = $this->remove_links( $data );
+
+		$this->assertSame(
+			'inactive',
+			$data['status'],
+			'Sidebar status should have changed to inactive'
+		);
+		$this->assertSame(
+			array( 'text-1', 'rss-1' ),
+			$data['widgets'],
+			'The text and rss widgets should still in sidebar-1'
+		);
+		$this->assertArrayHasKey(
+			'sidebar-1',
+			get_theme_mod( 'wp_classic_sidebars' ),
+			'sidebar-1 should be in "wp_classic_sidebars" theme mod'
+		);
+	}
+
 	/**
 	 * @ticket 41683
 	 */
@@ -949,7 +1013,7 @@ protected function remove_links( $data ) {
 			if ( isset( $item['_links'] ) ) {
 				unset( $data[ $count ]['_links'] );
 			}
-			$count ++;
+			$count++;
 		}
 
 		return $data;
diff --git a/tests/phpunit/tests/rest-api/rest-site-health-controller.php b/tests/phpunit/tests/rest-api/rest-site-health-controller.php
index 899308d7451cd..b4929914a6aba 100644
--- a/tests/phpunit/tests/rest-api/rest-site-health-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-site-health-controller.php
@@ -4,12 +4,10 @@
  *
  * Also generates the fixture data used by the wp-api.js QUnit tests.
  *
- * @package    WordPress
+ * @package WordPress
  * @subpackage REST API
- * @since      5.6.0
- */
-
-/**
+ * @since 5.6.0
+ *
  * @group restapi
  */
 class WP_Test_REST_Site_Health_Controller extends WP_Test_REST_TestCase {
diff --git a/tests/phpunit/tests/rest-api/rest-tags-controller.php b/tests/phpunit/tests/rest-api/rest-tags-controller.php
index a4b566f7b2604..d50bcedaaa3e3 100644
--- a/tests/phpunit/tests/rest-api/rest-tags-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-tags-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Tags_Controller extends WP_Test_REST_Controller_Testcase {
@@ -1211,7 +1209,7 @@ public function test_prepare_item() {
 	}
 
 	public function test_prepare_item_limit_fields() {
-		$request  = new WP_REST_Request;
+		$request  = new WP_REST_Request();
 		$endpoint = new WP_REST_Terms_Controller( 'post_tag' );
 		$request->set_param( '_fields', 'id,name' );
 		$term     = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
@@ -1324,12 +1322,20 @@ public function test_additional_field_update_errors() {
 		$wp_rest_additional_fields = array();
 	}
 
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return 123;
+	}
+
+	public function additional_field_update_callback( $value, $tag ) {
+		if ( 'returnError' === $value ) {
+			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+		}
+	}
+
 	/**
 	 * @ticket 38504
 	 */
 	public function test_object_term_queries_are_cached() {
-		global $wpdb;
-
 		$tags = self::factory()->tag->create_many( 2 );
 		$p    = self::factory()->post->create();
 		wp_set_object_terms( $p, $tags[0], 'post_tag' );
@@ -1341,7 +1347,7 @@ public function test_object_term_queries_are_cached() {
 
 		unset( $request, $response );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
 		$request->set_param( 'post', $p );
@@ -1349,7 +1355,7 @@ public function test_object_term_queries_are_cached() {
 		$found_2  = wp_list_pluck( $response->data, 'id' );
 
 		$this->assertSameSets( $found_1, $found_2 );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -1396,16 +1402,6 @@ public function test_editable_response_uses_edit_context() {
 		$this->assertArrayNotHasKey( $view_field, $data );
 	}
 
-	public function additional_field_get_callback( $object, $request ) {
-		return 123;
-	}
-
-	public function additional_field_update_callback( $value, $tag ) {
-		if ( 'returnError' === $value ) {
-			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
-		}
-	}
-
 	protected function check_get_taxonomy_terms_response( $response ) {
 		$this->assertSame( 200, $response->get_status() );
 		$data = $response->get_data();
diff --git a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
index 78593e6bd86d5..6da465be25462 100644
--- a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Taxonomies_Controller extends WP_Test_REST_Controller_Testcase {
@@ -174,8 +172,8 @@ public function test_delete_item() {
 
 	public function test_prepare_item() {
 		$tax      = get_taxonomy( 'category' );
-		$endpoint = new WP_REST_Taxonomies_Controller;
-		$request  = new WP_REST_Request;
+		$endpoint = new WP_REST_Taxonomies_Controller();
+		$request  = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$response = $endpoint->prepare_item_for_response( $tax, $request );
 		$this->check_taxonomy_object( 'edit', $tax, $response->get_data(), $response->get_links() );
@@ -183,8 +181,8 @@ public function test_prepare_item() {
 
 	public function test_prepare_item_limit_fields() {
 		$tax      = get_taxonomy( 'category' );
-		$request  = new WP_REST_Request;
-		$endpoint = new WP_REST_Taxonomies_Controller;
+		$request  = new WP_REST_Request();
+		$endpoint = new WP_REST_Taxonomies_Controller();
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'id,name' );
 		$response = $endpoint->prepare_item_for_response( $tax, $request );
diff --git a/tests/phpunit/tests/rest-api/rest-term-meta-fields.php b/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
index 5a61623387055..8d4ba295f87a5 100644
--- a/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
+++ b/tests/phpunit/tests/rest-api/rest-term-meta-fields.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Term_Meta_Fields extends WP_Test_REST_TestCase {
@@ -194,7 +192,7 @@ public function set_up() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 	}
 
@@ -327,7 +325,7 @@ public function test_get_value_types() {
 
 		/** @var WP_REST_Server $wp_rest_server */
 		global $wp_rest_server;
-		$wp_rest_server = new Spy_REST_Server;
+		$wp_rest_server = new Spy_REST_Server();
 		do_action( 'rest_api_init', $wp_rest_server );
 
 		add_term_meta( self::$category_id, 'test_string', 42 );
diff --git a/tests/phpunit/tests/rest-api/rest-test-controller.php b/tests/phpunit/tests/rest-api/rest-test-controller.php
index f75de9e45899e..042f37cf8bf48 100644
--- a/tests/phpunit/tests/rest-api/rest-test-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-test-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_REST_Test_Controller extends WP_REST_Controller {
diff --git a/tests/phpunit/tests/rest-api/rest-themes-controller.php b/tests/phpunit/tests/rest-api/rest-themes-controller.php
index eb2b379c6622a..24b564debb6bc 100644
--- a/tests/phpunit/tests/rest-api/rest-themes-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-themes-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi-themes
  * @group restapi
  */
@@ -174,6 +172,7 @@ public function test_get_items() {
 			'author',
 			'author_uri',
 			'description',
+			'is_block_theme',
 			'name',
 			'requires_php',
 			'requires_wp',
@@ -187,6 +186,8 @@ public function test_get_items() {
 			'theme_uri',
 			'version',
 		);
+		$this->assertIsArray( $data );
+		$this->assertNotEmpty( $data );
 		$this->assertSameSets( $fields, array_keys( $data[0] ) );
 	}
 
@@ -210,6 +211,7 @@ public function test_get_items_inactive() {
 			'author',
 			'author_uri',
 			'description',
+			'is_block_theme',
 			'name',
 			'requires_php',
 			'requires_wp',
@@ -222,6 +224,8 @@ public function test_get_items_inactive() {
 			'theme_uri',
 			'version',
 		);
+		$this->assertIsArray( $data );
+		$this->assertNotEmpty( $data );
 		$this->assertSameSets( $fields, array_keys( $data[0] ) );
 
 		$this->assertContains( 'twentytwenty', wp_list_pluck( $data, 'stylesheet' ) );
@@ -345,7 +349,7 @@ public function test_get_item_schema() {
 		$response   = self::perform_active_theme_request( 'OPTIONS' );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 15, $properties );
+		$this->assertCount( 16, $properties );
 
 		$this->assertArrayHasKey( 'author', $properties );
 		$this->assertArrayHasKey( 'raw', $properties['author']['properties'] );
@@ -359,6 +363,8 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'raw', $properties['description']['properties'] );
 		$this->assertArrayHasKey( 'rendered', $properties['description']['properties'] );
 
+		$this->assertArrayHasKey( 'is_block_theme', $properties );
+
 		$this->assertArrayHasKey( 'name', $properties );
 		$this->assertArrayHasKey( 'raw', $properties['name']['properties'] );
 		$this->assertArrayHasKey( 'rendered', $properties['name']['properties'] );
@@ -473,6 +479,27 @@ public function test_theme_requires_wp() {
 		$this->assertSame( '5.3', $result[0]['requires_wp'] );
 	}
 
+	/**
+	 * @ticket 58123
+	 * @covers WP_REST_Themes_Controller::prepare_item_for_response
+	 */
+	public function test_theme_is_block_theme() {
+		// Test classic theme, activated in test setup.
+		$response = self::perform_active_theme_request();
+		$result   = $response->get_data();
+
+		$this->assertArrayHasKey( 'is_block_theme', $result[0] );
+		$this->assertFalse( $result[0]['is_block_theme'] );
+
+		// Test block theme.
+		switch_theme( 'block-theme' );
+		$response = self::perform_active_theme_request();
+		$result   = $response->get_data();
+
+		$this->assertArrayHasKey( 'is_block_theme', $result[0] );
+		$this->assertTrue( $result[0]['is_block_theme'] );
+	}
+
 	/**
 	 * @ticket 49906
 	 */
@@ -1236,6 +1263,7 @@ public function test_get_item() {
 			'author',
 			'author_uri',
 			'description',
+			'is_block_theme',
 			'name',
 			'requires_php',
 			'requires_wp',
@@ -1386,7 +1414,7 @@ public function test_can_support_further_routes() {
 			'wp/v2',
 			sprintf( '/themes/(?P<stylesheet>%s)//test', WP_REST_Themes_Controller::PATTERN ),
 			array(
-				'callback'            => function ( WP_REST_Request $request ) {
+				'callback'            => static function ( WP_REST_Request $request ) {
 					return $request['stylesheet'];
 				},
 				'permission_callback' => '__return_true',
diff --git a/tests/phpunit/tests/rest-api/rest-users-controller.php b/tests/phpunit/tests/rest-api/rest-users-controller.php
index 849b0e5464496..8373f8d200fa6 100644
--- a/tests/phpunit/tests/rest-api/rest-users-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-users-controller.php
@@ -4,9 +4,7 @@
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
+ *
  * @group restapi
  */
 class WP_Test_REST_Users_Controller extends WP_Test_REST_Controller_Testcase {
@@ -974,7 +972,7 @@ public function test_get_item() {
 	public function test_prepare_item() {
 		wp_set_current_user( self::$user );
 
-		$request = new WP_REST_Request;
+		$request = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$user = get_user_by( 'id', get_current_user_id() );
 		$data = $this->endpoint->prepare_item_for_response( $user, $request );
@@ -984,7 +982,7 @@ public function test_prepare_item() {
 	public function test_prepare_item_limit_fields() {
 		wp_set_current_user( self::$user );
 
-		$request = new WP_REST_Request;
+		$request = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$request->set_param( '_fields', 'id,name' );
 		$user     = get_user_by( 'id', get_current_user_id() );
@@ -1230,7 +1228,7 @@ public function test_create_item() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1263,7 +1261,7 @@ public function test_create_item_invalid_username() {
 		}
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
@@ -1308,7 +1306,7 @@ public function test_create_item_illegal_username() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1338,7 +1336,7 @@ public function test_create_new_network_user_on_site_does_not_add_user_to_sub_si
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
@@ -1369,7 +1367,7 @@ public function test_create_new_network_user_with_add_user_to_blog_failure() {
 		add_filter( 'can_add_user_to_blog', '__return_false' );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'user_cannot_be_added', $response );
@@ -1392,7 +1390,7 @@ public function test_create_new_network_user_on_sub_site_adds_user_to_site() {
 		switch_to_blog( self::$site );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
@@ -1422,7 +1420,7 @@ public function test_create_existing_network_user_on_sub_site_has_error() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
@@ -1431,7 +1429,7 @@ public function test_create_existing_network_user_on_sub_site_has_error() {
 		switch_to_blog( self::$site );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$switched_response = rest_get_server()->dispatch( $request );
 
@@ -1470,7 +1468,7 @@ public function test_json_create_user() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1487,7 +1485,7 @@ public function test_create_user_without_permission() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1507,7 +1505,7 @@ public function test_create_user_invalid_id() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1526,7 +1524,7 @@ public function test_create_user_invalid_email() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1546,7 +1544,7 @@ public function test_create_user_invalid_role() {
 		);
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/users' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1579,7 +1577,7 @@ public function test_update_item() {
 		$_POST['locale']     = 'de_DE';
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $_POST );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -1826,7 +1824,7 @@ public function test_json_update_user() {
 		$pw_before = $userdata->user_pass;
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
-		$request->add_header( 'content-type', 'application/json' );
+		$request->add_header( 'Content-Type', 'application/json' );
 		$request->set_body( wp_json_encode( $params ) );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -2008,14 +2006,14 @@ public function test_update_user_without_permission() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$user ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
 		$this->assertErrorResponse( 'rest_cannot_edit', $response, 403 );
 
 		$request = new WP_REST_Request( 'PUT', '/wp/v2/users/me' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2035,7 +2033,7 @@ public function test_update_user_invalid_id() {
 		);
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', self::$editor ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
 
@@ -2825,6 +2823,17 @@ public function test_additional_field_update_errors() {
 		$wp_rest_additional_fields = array();
 	}
 
+	public function additional_field_get_callback( $response_data, $field_name ) {
+		return get_user_meta( $response_data['id'], $field_name, true );
+	}
+
+	public function additional_field_update_callback( $value, $user, $field_name ) {
+		if ( 'returnError' === $value ) {
+			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
+		}
+		update_user_meta( $user->ID, $field_name, $value );
+	}
+
 	/**
 	 * @ticket 39701
 	 * @group ms-required
@@ -2881,7 +2890,7 @@ public function test_update_item_from_different_site_as_site_administrator() {
 		wp_set_current_user( self::$user );
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( array( 'first_name' => 'New Name' ) );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -2903,7 +2912,7 @@ public function test_update_item_from_different_site_as_network_administrator()
 		wp_set_current_user( self::$superadmin );
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/users/%d', $user_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( array( 'first_name' => 'New Name' ) );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertErrorResponse( 'rest_user_invalid_id', $response, 404 );
@@ -3072,17 +3081,6 @@ public function data_get_default_data() {
 		);
 	}
 
-	public function additional_field_get_callback( $object ) {
-		return get_user_meta( $object['id'], 'my_custom_int', true );
-	}
-
-	public function additional_field_update_callback( $value, $user ) {
-		if ( 'returnError' === $value ) {
-			return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
-		}
-		update_user_meta( $user->ID, 'my_custom_int', $value );
-	}
-
 	protected function check_user_data( $user, $data, $context, $links ) {
 		$this->assertSame( $user->ID, $data['id'] );
 		$this->assertSame( $user->display_name, $data['name'] );
diff --git a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
index 5c6f22bfee426..e9b46d444f371 100644
--- a/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widget-types-controller.php
@@ -5,16 +5,12 @@
  * @package WordPress
  * @subpackage REST_API
  * @since 5.8.0
- */
-
-/**
- * Tests for WP_REST_Widget_Types_Controller.
  *
- * @since 5.8.0
+ * @covers WP_REST_Widget_Types_Controller
  *
  * @see WP_TEST_REST_Controller_Testcase
  * @group restapi
- * @covers WP_REST_Widget_Types_Controller
+ * @group widgets
  */
 class WP_Test_REST_Widget_Types_Controller extends WP_Test_REST_Controller_Testcase {
 
@@ -118,7 +114,7 @@ public function test_get_items() {
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 		$this->assertGreaterThan( 1, count( $data ) );
-		$endpoint = new WP_REST_Widget_Types_Controller;
+		$endpoint = new WP_REST_Widget_Types_Controller();
 		foreach ( $data as $item ) {
 			$widget_type = $endpoint->get_widget( $item['name'] );
 			$this->check_widget_type_object( $widget_type, $item, $item['_links'] );
@@ -180,7 +176,7 @@ public function test_get_item() {
 		wp_set_current_user( self::$admin_id );
 		$request     = new WP_REST_Request( 'GET', '/wp/v2/widget-types/' . $widget_name );
 		$response    = rest_get_server()->dispatch( $request );
-		$endpoint    = new WP_REST_Widget_Types_Controller;
+		$endpoint    = new WP_REST_Widget_Types_Controller();
 		$widget_type = $endpoint->get_widget( $widget_name );
 		$this->check_widget_type_object( $widget_type, $response->get_data(), $response->get_links() );
 	}
@@ -198,7 +194,7 @@ static function() {}
 		wp_set_current_user( self::$admin_id );
 		$request     = new WP_REST_Request( 'GET', '/wp/v2/widget-types/' . $widget_id );
 		$response    = rest_get_server()->dispatch( $request );
-		$endpoint    = new WP_REST_Widget_Types_Controller;
+		$endpoint    = new WP_REST_Widget_Types_Controller();
 		$widget_type = $endpoint->get_widget( $widget_id );
 		$this->check_widget_type_object( $widget_type, $response->get_data(), $response->get_links() );
 	}
@@ -298,9 +294,9 @@ public function test_get_item_no_permission() {
 	 * @ticket 41683
 	 */
 	public function test_prepare_item() {
-		$endpoint    = new WP_REST_Widget_Types_Controller;
+		$endpoint    = new WP_REST_Widget_Types_Controller();
 		$widget_type = $endpoint->get_widget( 'calendar' );
-		$request     = new WP_REST_Request;
+		$request     = new WP_REST_Request();
 		$request->set_param( 'context', 'edit' );
 		$response = $endpoint->prepare_item_for_response( $widget_type, $request );
 		$this->check_widget_type_object( $widget_type, $response->get_data(), $response->get_links() );
@@ -366,7 +362,7 @@ public function test_encode_form_data_with_no_input() {
 			array(
 				'encoded' => base64_encode( serialize( array() ) ),
 				'hash'    => wp_hash( serialize( array() ) ),
-				'raw'     => new stdClass,
+				'raw'     => new stdClass(),
 			),
 			$data['instance']
 		);
@@ -402,7 +398,7 @@ public function test_encode_form_data_with_number() {
 			array(
 				'encoded' => base64_encode( serialize( array() ) ),
 				'hash'    => wp_hash( serialize( array() ) ),
-				'raw'     => new stdClass,
+				'raw'     => new stdClass(),
 			),
 			$data['instance']
 		);
diff --git a/tests/phpunit/tests/rest-api/rest-widgets-controller.php b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
index 28ac8bc6e3213..22516737c338d 100644
--- a/tests/phpunit/tests/rest-api/rest-widgets-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-widgets-controller.php
@@ -1,20 +1,16 @@
 <?php
 /**
- * Unit tests covering WP_REST_Widgets_Controller_Test functionality.
+ * Unit tests covering WP_REST_Widgets_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.8.0
- */
-
-/**
- * Tests for REST API for Widgets.
  *
- * @since 5.8.0
+ * @covers WP_REST_Widgets_Controller
  *
  * @see WP_Test_REST_Controller_Testcase
  * @group restapi
- * @covers WP_REST_Widgets_Controller
+ * @group widgets
  */
 class WP_Test_REST_Widgets_Controller extends WP_Test_REST_Controller_Testcase {
 	/**
@@ -412,12 +408,12 @@ public function test_get_items() {
 
 	public function mocked_rss_response() {
 		$single_value_headers = array(
-			'content-type' => 'application/rss+xml; charset=UTF-8',
+			'Content-Type' => 'application/rss+xml; charset=UTF-8',
 			'link'         => '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
 		);
 
 		return array(
-			'headers'  => new Requests_Utility_CaseInsensitiveDictionary( $single_value_headers ),
+			'headers'  => new WpOrg\Requests\Utility\CaseInsensitiveDictionary( $single_value_headers ),
 			'body'     => file_get_contents( DIR_TESTDATA . '/feed/wordpress-org-news.xml' ),
 			'response' => array(
 				'code'    => 200,
@@ -1555,7 +1551,7 @@ protected function remove_links( $data ) {
 			if ( is_array( $item ) && isset( $item['_links'] ) ) {
 				unset( $data[ $count ]['_links'] );
 			}
-			$count ++;
+			$count++;
 		}
 
 		return $data;
diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
index bd9dd9a0dddea..77481112a0f87 100644
--- a/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php
@@ -2,14 +2,8 @@
 /**
  * Unit tests covering WP_Block_Pattern_Categories_Registry functionality.
  *
- * @package    WordPress
+ * @package WordPress
  * @subpackage REST_API
- * @since      6.0.0
- */
-
-/**
- * Tests for REST API for Block Pattern Categories Registry.
- *
  * @since 6.0.0
  *
  * @ticket 55505
@@ -74,8 +68,20 @@ public static function wpSetupBeforeClass( $factory ) {
 		self::$registry_instance_property->setValue( $test_registry );
 
 		// Register some categories in the test registry.
-		$test_registry->register( 'test', array( 'label' => 'Test' ) );
-		$test_registry->register( 'query', array( 'label' => 'Query' ) );
+		$test_registry->register(
+			'test',
+			array(
+				'label'       => 'Test',
+				'description' => 'Test description',
+			)
+		);
+		$test_registry->register(
+			'query',
+			array(
+				'label'       => 'Query',
+				'description' => 'Query',
+			)
+		);
 	}
 
 	public static function wpTearDownAfterClass() {
@@ -103,10 +109,10 @@ public function test_get_items() {
 		wp_set_current_user( self::$admin_id );
 
 		$expected_names  = array( 'test', 'query' );
-		$expected_fields = array( 'name', 'label' );
+		$expected_fields = array( 'name', 'label', 'description' );
 
 		$request            = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );
-		$request['_fields'] = 'name,label';
+		$request['_fields'] = 'name,label,description';
 		$response           = rest_get_server()->dispatch( $request );
 		$data               = $response->get_data();
 
diff --git a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
index f49c658ae5daf..5482e32cbede2 100644
--- a/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php
@@ -2,14 +2,8 @@
 /**
  * Unit tests covering WP_REST_Block_Patterns_Controller functionality.
  *
- * @package    WordPress
+ * @package WordPress
  * @subpackage REST_API
- * @since      6.0.0
- */
-
-/**
- * Tests for REST API for Block Patterns.
- *
  * @since 6.0.0
  *
  * @ticket 55505
@@ -78,18 +72,32 @@ public static function wpSetUpBeforeClass( $factory ) {
 			'test/one',
 			array(
 				'title'         => 'Pattern One',
-				'categories'    => array( 'test' ),
-				'viewportWidth' => 1440,
 				'content'       => '<!-- wp:heading {"level":1} --><h1>One</h1><!-- /wp:heading -->',
+				'viewportWidth' => 1440,
+				'categories'    => array( 'test' ),
+				'templateTypes' => array( 'page' ),
+				'source'        => 'theme',
 			)
 		);
 
 		$test_registry->register(
 			'test/two',
 			array(
-				'title'      => 'Pattern Two',
-				'categories' => array( 'test' ),
-				'content'    => '<!-- wp:paragraph --><p>Two</p><!-- /wp:paragraph -->',
+				'title'         => 'Pattern Two',
+				'content'       => '<!-- wp:paragraph --><p>Two</p><!-- /wp:paragraph -->',
+				'categories'    => array( 'test' ),
+				'templateTypes' => array( 'single' ),
+				'source'        => 'core',
+			)
+		);
+
+		$test_registry->register(
+			'test/three',
+			array(
+				'title'      => 'Pattern Three',
+				'content'    => '<!-- wp:paragraph --><p>Three</p><!-- /wp:paragraph -->',
+				'categories' => array( 'test', 'buttons', 'query' ),
+				'source'     => 'pattern-directory/featured',
 			)
 		);
 	}
@@ -119,7 +127,7 @@ public function test_get_items() {
 		wp_set_current_user( self::$admin_id );
 
 		$request            = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );
-		$request['_fields'] = 'name,content';
+		$request['_fields'] = 'name,content,source,template_types';
 		$response           = rest_get_server()->dispatch( $request );
 		$data               = $response->get_data();
 
@@ -127,16 +135,20 @@ public function test_get_items() {
 		$this->assertGreaterThanOrEqual( 2, count( $data ), 'WP_REST_Block_Patterns_Controller::get_items() should return at least 2 items' );
 		$this->assertSame(
 			array(
-				'name'    => 'test/one',
-				'content' => '<!-- wp:heading {"level":1} --><h1>One</h1><!-- /wp:heading -->',
+				'name'           => 'test/one',
+				'content'        => '<!-- wp:heading {"level":1} --><h1>One</h1><!-- /wp:heading -->',
+				'template_types' => array( 'page' ),
+				'source'         => 'theme',
 			),
 			$data[0],
 			'WP_REST_Block_Patterns_Controller::get_items() should return test/one'
 		);
 		$this->assertSame(
 			array(
-				'name'    => 'test/two',
-				'content' => '<!-- wp:paragraph --><p>Two</p><!-- /wp:paragraph -->',
+				'name'           => 'test/two',
+				'content'        => '<!-- wp:paragraph --><p>Two</p><!-- /wp:paragraph -->',
+				'template_types' => array( 'single' ),
+				'source'         => 'core',
 			),
 			$data[1],
 			'WP_REST_Block_Patterns_Controller::get_items() should return test/two'
@@ -171,6 +183,51 @@ public function test_get_items_forbidden() {
 		$this->assertSame( 403, $response->get_status() );
 	}
 
+	/**
+	 * Tests the proper migration of old core pattern categories to new ones.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @ticket 57532
+	 *
+	 * @covers WP_REST_Block_Patterns_Controller::get_items
+	 */
+	public function test_get_items_migrate_pattern_categories() {
+		wp_set_current_user( self::$admin_id );
+
+		$request            = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );
+		$request['_fields'] = 'name,categories';
+		$response           = rest_get_server()->dispatch( $request );
+		$data               = $response->get_data();
+
+		$this->assertIsArray( $data, 'WP_REST_Block_Patterns_Controller::get_items() should return an array' );
+		$this->assertGreaterThanOrEqual( 3, count( $data ), 'WP_REST_Block_Patterns_Controller::get_items() should return at least 3 items' );
+		$this->assertSame(
+			array(
+				'name'       => 'test/one',
+				'categories' => array( 'test' ),
+			),
+			$data[0],
+			'WP_REST_Block_Patterns_Controller::get_items() should return test/one'
+		);
+		$this->assertSame(
+			array(
+				'name'       => 'test/two',
+				'categories' => array( 'test' ),
+			),
+			$data[1],
+			'WP_REST_Block_Patterns_Controller::get_items() should return test/two'
+		);
+		$this->assertSame(
+			array(
+				'name'       => 'test/three',
+				'categories' => array( 'test', 'call-to-action', 'posts' ),
+			),
+			$data[2],
+			'WP_REST_Block_Patterns_Controller::get_items() should return test/three'
+		);
+	}
+
 	/**
 	 * @doesNotPerformAssertions
 	 */
diff --git a/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
index c32ea170b8485..5ed45fe2ca54a 100644
--- a/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
+++ b/tests/phpunit/tests/rest-api/wpRestEditSiteExportController.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_REST_Edit_Site_Export_Controller tests.
+ * Unit tests covering WP_REST_Edit_Site_Export_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
- * Tests for WP_REST_Edit_Site_Export_Controller.
- *
- * @since 5.9.0
  *
  * @covers WP_REST_Edit_Site_Export_Controller
  *
diff --git a/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
index 9ef5b87d9934f..4687700cc798f 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenuItemsController.php
@@ -1,14 +1,10 @@
 <?php
 /**
- * WP_REST_Menu_Items_Controller tests
+ * Unit tests covering WP_REST_Menu_Items_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
- * Tests for REST API for Menu items.
  *
  * @group restapi
  *
@@ -147,6 +143,7 @@ public function test_registered_query_params() {
 		$this->assertArrayHasKey( 'page', $properties );
 		$this->assertArrayHasKey( 'per_page', $properties );
 		$this->assertArrayHasKey( 'search', $properties );
+		$this->assertArrayHasKey( 'search_columns', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
 		$this->assertArrayHasKey( 'status', $properties );
 	}
@@ -318,7 +315,7 @@ public function test_create_item() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data();
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
@@ -334,7 +331,7 @@ public function test_create_item_invalid_invalid() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menus' => array( 123, 456 ),
@@ -354,7 +351,7 @@ public function test_create_item_invalid_term() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type'  => 'taxonomy',
@@ -375,9 +372,9 @@ public function test_create_item_change_position() {
 		$new_menu_id = wp_create_nav_menu( rand_str() );
 		$expected    = array();
 		$actual      = array();
-		for ( $i = 1; $i < 5; $i ++ ) {
+		for ( $i = 1; $i < 5; $i++ ) {
 			$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-			$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+			$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 			$params = $this->set_menu_item_data(
 				array(
 					'menu_order' => $i,
@@ -404,7 +401,7 @@ public function test_menu_order_must_be_set() {
 		$new_menu_id = wp_create_nav_menu( rand_str() );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menu_order' => 0,
@@ -416,7 +413,7 @@ public function test_menu_order_must_be_set() {
 		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menu_order' => 1,
@@ -436,7 +433,7 @@ public function test_create_item_invalid_position_2() {
 		wp_set_current_user( self::$admin_id );
 		$new_menu_id = wp_create_nav_menu( rand_str() );
 		$request     = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menu_order' => 'ddddd',
@@ -456,7 +453,7 @@ public function test_create_item_invalid_position_3() {
 		wp_set_current_user( self::$admin_id );
 		$new_menu_id = wp_create_nav_menu( rand_str() );
 		$request     = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menu_order' => -9,
@@ -476,7 +473,7 @@ public function test_create_item_invalid_parent() {
 		wp_set_current_user( self::$admin_id );
 		wp_create_nav_menu( rand_str() );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'parent' => -9,
@@ -494,7 +491,7 @@ public function test_create_item_invalid_parent() {
 	public function test_create_item_invalid_menu() {
 		wp_set_current_user( self::$admin_id );
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'menus' => -9,
@@ -513,7 +510,7 @@ public function test_create_item_invalid_post() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type'  => 'post_type',
@@ -533,7 +530,7 @@ public function test_create_item_invalid_post_type() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type'             => 'post_type_archive',
@@ -553,7 +550,7 @@ public function test_create_item_invalid_custom_link() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type'  => 'custom',
@@ -573,7 +570,7 @@ public function test_create_item_missing_custom_link_url() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type' => 'custom',
@@ -593,7 +590,7 @@ public function test_create_item_invalid_custom_link_url() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'type' => 'custom',
@@ -615,7 +612,7 @@ public function test_update_item() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'xfn' => array( 'test1', 'test2', 'test3' ),
@@ -648,7 +645,7 @@ public function test_update_item_clean_xfn() {
 		$good_data = array( 'test1', 'test2', 'test3', 'test4' );
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data(
 			array(
 				'xfn' => $bad_data,
@@ -680,7 +677,7 @@ public function test_update_item_invalid() {
 		$post_id = self::factory()->post->create();
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $post_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$params = $this->set_menu_item_data();
 		$request->set_body_params( $params );
 		$response = rest_get_server()->dispatch( $request );
@@ -921,7 +918,7 @@ protected function check_menu_item_data( $post, $data, $context, $links ) {
 			foreach ( $taxonomies as $taxonomy ) {
 				$this->assertSame( $taxonomy->name, $links['https://api.w.org/term'][ $num ]['attributes']['taxonomy'] );
 				$this->assertSame( add_query_arg( 'post', $data['id'], rest_url( 'wp/v2/' . $taxonomy->rest_base ) ), $links['https://api.w.org/term'][ $num ]['href'] );
-				$num ++;
+				$num++;
 			}
 
 			if ( 'post_type' === $data['type'] ) {
@@ -1021,7 +1018,7 @@ public function test_create_item_properly_handles_slashed_data() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/menu-items' );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$parameters = $this->set_menu_item_data(
 			array(
 				'title' => 'Some \\\'title',
@@ -1043,7 +1040,7 @@ public function test_update_item_properly_handles_slashed_data() {
 		wp_set_current_user( self::$admin_id );
 
 		$request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/menu-items/%d', $this->menu_item_id ) );
-		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+		$request->add_header( 'Content-Type', 'application/x-www-form-urlencoded' );
 		$title  = 'Some \\\'title';
 		$params = $this->set_menu_item_data(
 			array(
diff --git a/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
index c24714ea93858..a2f7df075db39 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenuLocationsController.php
@@ -1,14 +1,10 @@
 <?php
 /**
- * WP_REST_Menu_Locations_Controller tests.
+ * Unit tests covering WP_REST_Menu_Locations_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
- * Tests for REST API for Menu locations.
  *
  * @group restapi
  *
diff --git a/tests/phpunit/tests/rest-api/wpRestMenusController.php b/tests/phpunit/tests/rest-api/wpRestMenusController.php
index 3db23f2d450a6..09de72bb8733f 100644
--- a/tests/phpunit/tests/rest-api/wpRestMenusController.php
+++ b/tests/phpunit/tests/rest-api/wpRestMenusController.php
@@ -1,14 +1,10 @@
 <?php
 /**
- * WP_REST_Menus_Controller tests
+ * Unit tests covering WP_REST_Menus_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
- * Tests for REST API for Menus.
  *
  * @group restapi
  *
diff --git a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
index fa790b66d183a..266ca89a332ad 100644
--- a/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
+++ b/tests/phpunit/tests/rest-api/wpRestTemplatesController.php
@@ -1,13 +1,9 @@
 <?php
 /**
- * Unit tests covering the templates endpoint..
+ * Unit tests covering WP_REST_Templates_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST API
- */
-
-/**
- * Tests for REST API for templates.
  *
  * @covers WP_REST_Templates_Controller
  *
@@ -66,7 +62,7 @@ public function test_register_routes() {
 			'Templates route does not exist'
 		);
 		$this->assertArrayHasKey(
-			'/wp/v2/templates/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w-]+)',
+			'/wp/v2/templates/(?P<id>([^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)[\/\w%-]+)',
 			$routes,
 			'Single template based on the given ID route does not exist'
 		);
@@ -122,6 +118,7 @@ public function test_get_items() {
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => 0,
+				'modified'       => mysql_to_rfc3339( self::$post->post_modified ),
 			),
 			$this->find_and_normalize_template_by_id( $data, 'default//my_template' )
 		);
@@ -166,6 +163,7 @@ public function test_get_item() {
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => 0,
+				'modified'       => mysql_to_rfc3339( self::$post->post_modified ),
 			),
 			$data
 		);
@@ -173,7 +171,7 @@ public function test_get_item() {
 
 	/**
 	 * @ticket 54507
-	 * @dataProvider get_template_endpoint_urls
+	 * @dataProvider data_get_item_works_with_a_single_slash
 	 */
 	public function test_get_item_works_with_a_single_slash( $endpoint_url ) {
 		wp_set_current_user( self::$admin_id );
@@ -202,12 +200,13 @@ public function test_get_item_works_with_a_single_slash( $endpoint_url ) {
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => 0,
+				'modified'       => mysql_to_rfc3339( self::$post->post_modified ),
 			),
 			$data
 		);
 	}
 
-	public function get_template_endpoint_urls() {
+	public function data_get_item_works_with_a_single_slash() {
 		return array(
 			array( '/wp/v2/templates/default/my_template' ),
 			array( '/wp/v2/templates/default//my_template' ),
@@ -261,6 +260,7 @@ public function test_get_item_with_valid_theme_dirname( $theme_dir, $template, a
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => self::$admin_id,
+				'modified'       => mysql_to_rfc3339( $post->post_modified ),
 			),
 			$data
 		);
@@ -294,6 +294,46 @@ public function data_get_item_with_valid_theme_dirname() {
 					'post_excerpt' => 'Description of page home template.',
 				),
 			),
+			'template parts: parent theme with non latin characters' => array(
+				'theme_dir' => 'themedir1/block-theme-non-latin',
+				'template'  => 'small-header-%cf%84%ce%b5%cf%83%cf%84',
+				'args'      => array(
+					'post_name'    => 'small-header-τεστ',
+					'post_title'   => 'Small Header τεστ Template',
+					'post_content' => file_get_contents( $theme_root_dir . '/block-theme-non-latin/parts/small-header-test.html' ),
+					'post_excerpt' => 'Description of small header τεστ template.',
+				),
+			),
+			'template: parent theme with non latin name'  => array(
+				'theme_dir' => 'themedir1/block-theme-non-latin',
+				'template'  => 'page-%cf%84%ce%b5%cf%83%cf%84',
+				'args'      => array(
+					'post_name'    => 'page-τεστ',
+					'post_title'   => 'τεστ Page Template',
+					'post_content' => file_get_contents( $theme_root_dir . 'block-theme-non-latin/templates/page-test.html' ),
+					'post_excerpt' => 'Description of page τεστ template.',
+				),
+			),
+			'template parts: parent theme with chinese characters' => array(
+				'theme_dir' => 'themedir1/block-theme-non-latin',
+				'template'  => 'small-header-%e6%b5%8b%e8%af%95',
+				'args'      => array(
+					'post_name'    => 'small-header-测试',
+					'post_title'   => 'Small Header 测试 Template',
+					'post_content' => file_get_contents( $theme_root_dir . '/block-theme-non-latin/parts/small-header-test.html' ),
+					'post_excerpt' => 'Description of small header 测试 template.',
+				),
+			),
+			'template: parent theme with non latin name using chinese characters' => array(
+				'theme_dir' => 'themedir1/block-theme-non-latin',
+				'template'  => 'page-%e6%b5%8b%e8%af%95',
+				'args'      => array(
+					'post_name'    => 'page-测试',
+					'post_title'   => '测试 Page Template',
+					'post_content' => file_get_contents( $theme_root_dir . 'block-theme-non-latin/templates/page-test.html' ),
+					'post_excerpt' => 'Description of page 测试 template.',
+				),
+			),
 			'template: parent theme deprecated path'      => array(
 				'theme_dir' => 'themedir1/block-theme-deprecated-path',
 				'template'  => 'page-home',
@@ -339,7 +379,7 @@ public function data_get_item_with_valid_theme_dirname() {
 
 	/**
 	 * @ticket 54507
-	 * @dataProvider get_template_ids_to_sanitize
+	 * @dataProvider data_sanitize_template_id
 	 */
 	public function test_sanitize_template_id( $input_id, $sanitized_id ) {
 		$endpoint = new WP_REST_Templates_Controller( 'wp_template' );
@@ -349,7 +389,7 @@ public function test_sanitize_template_id( $input_id, $sanitized_id ) {
 		);
 	}
 
-	public function get_template_ids_to_sanitize() {
+	public function data_sanitize_template_id() {
 		return array(
 			array( 'tt1-blocks/index', 'tt1-blocks//index' ),
 			array( 'tt1-blocks//index', 'tt1-blocks//index' ),
@@ -377,6 +417,7 @@ public function test_create_item() {
 		);
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
+		$modified = get_post( $data['wp_id'] )->post_modified;
 		unset( $data['_links'] );
 		unset( $data['wp_id'] );
 
@@ -400,6 +441,7 @@ public function test_create_item() {
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => self::$admin_id,
+				'modified'       => mysql_to_rfc3339( $modified ),
 			),
 			$data
 		);
@@ -423,6 +465,7 @@ public function test_create_item_with_numeric_slug() {
 		);
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
+		$modified = get_post( $data['wp_id'] )->post_modified;
 		unset( $data['_links'] );
 		unset( $data['wp_id'] );
 
@@ -446,6 +489,7 @@ public function test_create_item_with_numeric_slug() {
 				'has_theme_file' => false,
 				'is_custom'      => false,
 				'author'         => self::$admin_id,
+				'modified'       => mysql_to_rfc3339( $modified ),
 			),
 			$data
 		);
@@ -473,6 +517,7 @@ public function test_create_item_raw() {
 		);
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
+		$modified = get_post( $data['wp_id'] )->post_modified;
 		unset( $data['_links'] );
 		unset( $data['wp_id'] );
 
@@ -496,6 +541,7 @@ public function test_create_item_raw() {
 				'has_theme_file' => false,
 				'is_custom'      => true,
 				'author'         => self::$admin_id,
+				'modified'       => mysql_to_rfc3339( $modified ),
 			),
 			$data
 		);
@@ -654,7 +700,7 @@ public function test_get_item_schema() {
 		$response   = rest_get_server()->dispatch( $request );
 		$data       = $response->get_data();
 		$properties = $data['schema']['properties'];
-		$this->assertCount( 14, $properties );
+		$this->assertCount( 15, $properties );
 		$this->assertArrayHasKey( 'id', $properties );
 		$this->assertArrayHasKey( 'description', $properties );
 		$this->assertArrayHasKey( 'slug', $properties );
@@ -670,6 +716,7 @@ public function test_get_item_schema() {
 		$this->assertArrayHasKey( 'has_theme_file', $properties );
 		$this->assertArrayHasKey( 'is_custom', $properties );
 		$this->assertArrayHasKey( 'author', $properties );
+		$this->assertArrayHasKey( 'modified', $properties );
 	}
 
 	protected function find_and_normalize_template_by_id( $templates, $id ) {
@@ -700,8 +747,10 @@ public function test_create_item_with_is_wp_suggestion( array $body_params, arra
 
 		$request = new WP_REST_Request( 'POST', '/wp/v2/templates' );
 		$request->set_body_params( $body_params );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
+		$response             = rest_get_server()->dispatch( $request );
+		$data                 = $response->get_data();
+		$modified             = get_post( $data['wp_id'] )->post_modified;
+		$expected['modified'] = mysql_to_rfc3339( $modified );
 		unset( $data['_links'] );
 		unset( $data['wp_id'] );
 
@@ -788,5 +837,52 @@ public function test_get_template_fallback() {
 		$request->set_param( 'template_prefix', 'page' );
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertSame( 'page', $response->get_data()['slug'], 'Should fallback to `page.html`.' );
+		// Should fallback to `index.html`.
+		$request->set_param( 'slug', 'author' );
+		$request->set_param( 'ignore_empty', true );
+		$request->set_param( 'template_prefix', 'tag' );
+		$request->set_param( 'is_custom', false );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertSame( 'index', $response->get_data()['slug'], 'Should fallback to `index.html` when  ignore_empty is `true`.' );
+	}
+
+	/**
+	 * @ticket 57851
+	 *
+	 * @covers WP_REST_Templates_Controller::prepare_item_for_database
+	 */
+	public function test_prepare_item_for_database() {
+		$endpoint = new WP_REST_Templates_Controller( 'wp_template_part' );
+
+		$prepare_item_for_database = new ReflectionMethod( $endpoint, 'prepare_item_for_database' );
+		$prepare_item_for_database->setAccessible( true );
+
+		$body_params = array(
+			'title'   => 'Untitled Template Part',
+			'slug'    => 'untitled-template-part',
+			'content' => '',
+		);
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/template-parts' );
+		$request->set_body_params( $body_params );
+
+		$prepared = $prepare_item_for_database->invoke( $endpoint, $request );
+
+		$this->assertInstanceOf( 'stdClass', $prepared, 'The item could not be prepared for the database.' );
+
+		$this->assertObjectHasProperty( 'post_type', $prepared, 'The "post_type" was not included in the prepared template part.' );
+		$this->assertObjectHasProperty( 'post_status', $prepared, 'The "post_status" was not included in the prepared template part.' );
+		$this->assertObjectHasProperty( 'tax_input', $prepared, 'The "tax_input" was not included in the prepared template part.' );
+		$this->assertArrayHasKey( 'wp_theme', $prepared->tax_input, 'The "wp_theme" tax was not included in the prepared template part.' );
+		$this->assertArrayHasKey( 'wp_template_part_area', $prepared->tax_input, 'The "wp_template_part_area" tax was not included in the prepared template part.' );
+		$this->assertObjectHasProperty( 'post_content', $prepared, 'The "post_content" was not included in the prepared template part.' );
+		$this->assertObjectHasProperty( 'post_title', $prepared, 'The "post_title" was not included in the prepared template part.' );
+
+		$this->assertSame( 'wp_template_part', $prepared->post_type, 'The "post_type" in the prepared template part should be "wp_template_part".' );
+		$this->assertSame( 'publish', $prepared->post_status, 'The post status in the prepared template part should be "publish".' );
+		$this->assertSame( WP_TEMPLATE_PART_AREA_UNCATEGORIZED, $prepared->tax_input['wp_template_part_area'], 'The area in the prepared template part should be uncategorized.' );
+		$this->assertSame( 'Untitled Template Part', $prepared->post_title, 'The title was not correct in the prepared template part.' );
+
+		$this->assertEmpty( $prepared->post_content, 'The content was not correct in the prepared template part.' );
 	}
 }
diff --git a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
index 6e2dc1f1f61e8..24cc517365859 100644
--- a/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
+++ b/tests/phpunit/tests/rest-api/wpRestUrlDetailsController.php
@@ -1,16 +1,10 @@
 <?php
 /**
- * WP_REST_URL_Details_Controller tests.
+ * Unit tests covering WP_REST_URL_Details_Controller functionality.
  *
  * @package WordPress
  * @subpackage REST_API
  * @since 5.9.0
- */
-
-/**
- * Tests for WP_REST_URL_Details_Controller.
- *
- * @since 5.9.0
  *
  * @covers WP_REST_URL_Details_Controller
  *
@@ -1096,20 +1090,20 @@ public function test_prepare_item() {
 	 *
 	 * @return array faux/mocked response.
 	 */
-	public function mock_success_request_to_remote_url( $response, $args ) {
-		return $this->mock_request_to_remote_url( 'success', $args );
+	public function mock_success_request_to_remote_url( $response, $parsed_args ) {
+		return $this->mock_request_to_remote_url( 'success', $parsed_args );
 	}
 
-	public function mock_failed_request_to_remote_url( $response, $args ) {
-		return $this->mock_request_to_remote_url( 'failure', $args );
+	public function mock_failed_request_to_remote_url( $response, $parsed_args ) {
+		return $this->mock_request_to_remote_url( 'failure', $parsed_args );
 	}
 
-	public function mock_request_to_remote_url_with_empty_body_response( $response, $args ) {
-		return $this->mock_request_to_remote_url( 'empty_body', $args );
+	public function mock_request_to_remote_url_with_empty_body_response( $response, $parsed_args ) {
+		return $this->mock_request_to_remote_url( 'empty_body', $parsed_args );
 	}
 
-	private function mock_request_to_remote_url( $result_type, $args ) {
-		$this->request_args = $args;
+	private function mock_request_to_remote_url( $result_type, $parsed_args ) {
+		$this->request_args = $parsed_args;
 
 		$types = array(
 			'success',
diff --git a/tests/phpunit/tests/rewrite/rewriteTags.php b/tests/phpunit/tests/rewrite/rewriteTags.php
index 8eeef7f7d93c9..31c28df15e283 100644
--- a/tests/phpunit/tests/rewrite/rewriteTags.php
+++ b/tests/phpunit/tests/rewrite/rewriteTags.php
@@ -20,19 +20,8 @@ public function set_up() {
 		$this->queryreplace   = $wp_rewrite->queryreplace;
 	}
 
-	public function _invalid_rewrite_tags() {
-		return array(
-			array( 'foo', 'bar' ),
-			array( '%', 'bar' ),
-			array( '%a', 'bar' ),
-			array( 'a%', 'bar' ),
-			array( '%%', 'bar' ),
-			array( '', 'bar' ),
-		);
-	}
-
 	/**
-	 * @dataProvider _invalid_rewrite_tags
+	 * @dataProvider data_add_rewrite_tag_invalid
 	 *
 	 * @param string $tag   Rewrite tag.
 	 * @param string $regex Regex.
@@ -46,6 +35,17 @@ public function test_add_rewrite_tag_invalid( $tag, $regex ) {
 		$this->assertSameSets( $this->queryreplace, $wp_rewrite->queryreplace );
 	}
 
+	public function data_add_rewrite_tag_invalid() {
+		return array(
+			array( 'foo', 'bar' ),
+			array( '%', 'bar' ),
+			array( '%a', 'bar' ),
+			array( 'a%', 'bar' ),
+			array( '%%', 'bar' ),
+			array( '', 'bar' ),
+		);
+	}
+
 	public function test_add_rewrite_tag_empty_query() {
 		global $wp_rewrite;
 
diff --git a/tests/phpunit/tests/robots.php b/tests/phpunit/tests/robots.php
index 60da725e75e66..87b0e6fb905e0 100644
--- a/tests/phpunit/tests/robots.php
+++ b/tests/phpunit/tests/robots.php
@@ -1,12 +1,8 @@
 <?php
 /**
- * Robots functions tests.
+ * Tests for robots template functions and filters.
  *
  * @package WordPress
- */
-
-/**
- * Tests for robots template functions and filters.
  *
  * @group robots
  */
diff --git a/tests/phpunit/tests/shortcode.php b/tests/phpunit/tests/shortcode.php
index 7ee36d7cbca14..1c19cfb42d046 100644
--- a/tests/phpunit/tests/shortcode.php
+++ b/tests/phpunit/tests/shortcode.php
@@ -404,7 +404,19 @@ public function test_shortcode_unautop() {
 		$this->assertSame( $test_string, shortcode_unautop( wpautop( $test_string ) ) );
 	}
 
-	public function data_test_strip_shortcodes() {
+	/**
+	 * @ticket 10326
+	 *
+	 * @dataProvider data_strip_shortcodes
+	 *
+	 * @param string $expected  Expected output.
+	 * @param string $content   Content to run strip_shortcodes() on.
+	 */
+	public function test_strip_shortcodes( $expected, $content ) {
+		$this->assertSame( $expected, strip_shortcodes( $content ) );
+	}
+
+	public function data_strip_shortcodes() {
 		return array(
 			array( 'before', 'before[gallery]' ),
 			array( 'after', '[gallery]after' ),
@@ -419,18 +431,6 @@ public function data_test_strip_shortcodes() {
 		);
 	}
 
-	/**
-	 * @ticket 10326
-	 *
-	 * @dataProvider data_test_strip_shortcodes
-	 *
-	 * @param string $expected  Expected output.
-	 * @param string $content   Content to run strip_shortcodes() on.
-	 */
-	public function test_strip_shortcodes( $expected, $content ) {
-		$this->assertSame( $expected, strip_shortcodes( $content ) );
-	}
-
 	/**
 	 * @ticket 37767
 	 */
@@ -826,7 +826,7 @@ public function test_pre_do_shortcode_tag() {
 
 		// Pass arguments.
 		$arr = array(
-			'return' => 'p11',
+			'output' => 'p11',
 			'key'    => $str,
 			'atts'   => array(
 				'a' => 'b',
@@ -864,9 +864,9 @@ public function filter_pre_do_shortcode_tag_p11() {
 		return 'p11';
 	}
 
-	public function filter_pre_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
+	public function filter_pre_do_shortcode_tag_attr( $output, $key, $atts, $m ) {
 		$arr = array(
-			'return' => $return,
+			'output' => $output,
 			'key'    => $key,
 			'atts'   => $atts,
 			'm'      => $m,
@@ -896,7 +896,7 @@ public function test_do_shortcode_tag_filter() {
 
 		// Pass arguments.
 		$arr = array(
-			'return' => 'foobar',
+			'output' => 'foobar',
 			'key'    => $str,
 			'atts'   => array(
 				'a' => 'b',
@@ -926,17 +926,17 @@ public function shortcode_do_shortcode_tag( $atts = array(), $content = '' ) {
 		return 'foo';
 	}
 
-	public function filter_do_shortcode_tag_replace( $return ) {
-		return str_replace( 'oo', 'ee', $return );
+	public function filter_do_shortcode_tag_replace( $output ) {
+		return str_replace( 'oo', 'ee', $output );
 	}
 
-	public function filter_do_shortcode_tag_generate( $return ) {
+	public function filter_do_shortcode_tag_generate( $output ) {
 		return 'foobar';
 	}
 
-	public function filter_do_shortcode_tag_attr( $return, $key, $atts, $m ) {
+	public function filter_do_shortcode_tag_attr( $output, $key, $atts, $m ) {
 		$arr = array(
-			'return' => $return,
+			'output' => $output,
 			'key'    => $key,
 			'atts'   => $atts,
 			'm'      => $m,
diff --git a/tests/phpunit/tests/sitemaps/functions.php b/tests/phpunit/tests/sitemaps/functions.php
index f67335733bffb..0620d465d4795 100644
--- a/tests/phpunit/tests/sitemaps/functions.php
+++ b/tests/phpunit/tests/sitemaps/functions.php
@@ -63,7 +63,7 @@ public function test_wp_get_sitemap_providers() {
 	/**
 	 * Test get_sitemap_url() with plain permalinks.
 	 *
-	 * @dataProvider plain_permalinks_provider
+	 * @dataProvider data_get_sitemap_url_plain_permalinks
 	 */
 	public function test_get_sitemap_url_plain_permalinks( $name, $subtype_name, $page, $expected ) {
 		$actual = get_sitemap_url( $name, $subtype_name, $page );
@@ -74,7 +74,7 @@ public function test_get_sitemap_url_plain_permalinks( $name, $subtype_name, $pa
 	/**
 	 * Test get_sitemap_url() with pretty permalinks.
 	 *
-	 * @dataProvider pretty_permalinks_provider
+	 * @dataProvider data_get_sitemap_url_pretty_permalinks
 	 */
 	public function test_get_sitemap_url_pretty_permalinks( $name, $subtype_name, $page, $expected ) {
 		$this->set_permalink_structure( '/%postname%/' );
@@ -96,7 +96,7 @@ public function test_get_sitemap_url_pretty_permalinks( $name, $subtype_name, $p
 	 *     @type string|false $4 Sitemap URL.
 	 * }
 	 */
-	public function plain_permalinks_provider() {
+	public function data_get_sitemap_url_plain_permalinks() {
 		return array(
 			array( 'posts', 'post', 1, home_url( '/?sitemap=posts&sitemap-subtype=post&paged=1' ) ),
 			array( 'posts', 'post', 0, home_url( '/?sitemap=posts&sitemap-subtype=post&paged=1' ) ),
@@ -128,7 +128,7 @@ public function plain_permalinks_provider() {
 	 *     @type string|false $4 Sitemap URL.
 	 * }
 	 */
-	public function pretty_permalinks_provider() {
+	public function data_get_sitemap_url_pretty_permalinks() {
 		return array(
 			array( 'posts', 'post', 1, home_url( '/wp-sitemap-posts-post-1.xml' ) ),
 			array( 'posts', 'post', 0, home_url( '/wp-sitemap-posts-post-1.xml' ) ),
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index 7095140a436ce..3d6a47aa9485d 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -25,6 +25,8 @@ public function tear_down() {
 	 * Tests generating block styles and classnames based on various manifestations of the $block_styles argument.
 	 *
 	 * @ticket 56467
+	 * @ticket 58549
+	 * @ticket 58590
 	 *
 	 * @covers ::wp_style_engine_get_styles
 	 *
@@ -166,6 +168,34 @@ public function data_wp_style_engine_get_styles() {
 				),
 			),
 
+			'inline_valid_dimensions_style'                => array(
+				'block_styles'    => array(
+					'dimensions' => array(
+						'minHeight' => '50vh',
+					),
+				),
+				'options'         => null,
+				'expected_output' => array(
+					'css'          => 'min-height:50vh;',
+					'declarations' => array(
+						'min-height' => '50vh',
+					),
+				),
+			),
+
+			'inline_valid_shadow_style'                    => array(
+				'block_styles'    => array(
+					'shadow' => 'inset 5em 1em gold',
+				),
+				'options'         => null,
+				'expected_output' => array(
+					'css'          => 'box-shadow:inset 5em 1em gold;',
+					'declarations' => array(
+						'box-shadow' => 'inset 5em 1em gold',
+					),
+				),
+			),
+
 			'inline_valid_typography_style'                => array(
 				'block_styles'    => array(
 					'typography' => array(
@@ -174,6 +204,7 @@ public function data_wp_style_engine_get_styles() {
 						'fontStyle'      => 'italic',
 						'fontWeight'     => '800',
 						'lineHeight'     => '1.3',
+						'textColumns'    => '2',
 						'textDecoration' => 'underline',
 						'textTransform'  => 'uppercase',
 						'letterSpacing'  => '2',
@@ -181,13 +212,14 @@ public function data_wp_style_engine_get_styles() {
 				),
 				'options'         => null,
 				'expected_output' => array(
-					'css'          => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
+					'css'          => 'font-size:clamp(2em, 2vw, 4em);font-family:Roboto,Oxygen-Sans,Ubuntu,sans-serif;font-style:italic;font-weight:800;line-height:1.3;column-count:2;text-decoration:underline;text-transform:uppercase;letter-spacing:2;',
 					'declarations' => array(
 						'font-size'       => 'clamp(2em, 2vw, 4em)',
 						'font-family'     => 'Roboto,Oxygen-Sans,Ubuntu,sans-serif',
 						'font-style'      => 'italic',
 						'font-weight'     => '800',
 						'line-height'     => '1.3',
+						'column-count'    => '2',
 						'text-decoration' => 'underline',
 						'text-transform'  => 'uppercase',
 						'letter-spacing'  => '2',
diff --git a/tests/phpunit/tests/taxonomy.php b/tests/phpunit/tests/taxonomy.php
index 9b31b573a2a73..ce04e22a1b09a 100644
--- a/tests/phpunit/tests/taxonomy.php
+++ b/tests/phpunit/tests/taxonomy.php
@@ -284,7 +284,7 @@ public function test_registering_taxonomies_to_object_types() {
 		// Create a post type to test with.
 		$post_type = 'test_cpt';
 		$this->assertFalse( get_post_type( $post_type ) );
-		$this->assertObjectHasAttribute( 'name', register_post_type( $post_type ) );
+		$this->assertObjectHasProperty( 'name', register_post_type( $post_type ) );
 
 		// Core taxonomy, core post type.
 		$this->assertTrue( unregister_taxonomy_for_object_type( 'category', 'post' ) );
diff --git a/tests/phpunit/tests/term/cache.php b/tests/phpunit/tests/term/cache.php
index 3a12bc1b04073..8efd55da00d0c 100644
--- a/tests/phpunit/tests/term/cache.php
+++ b/tests/phpunit/tests/term/cache.php
@@ -101,8 +101,6 @@ public function test_hierachy_invalidation() {
 	}
 
 	public function test_get_term_should_update_term_cache_when_passed_an_object() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$term = self::factory()->term->create(
 			array(
@@ -116,7 +114,7 @@ public function test_get_term_should_update_term_cache_when_passed_an_object() {
 		// Affirm that the cache is empty.
 		$this->assertEmpty( wp_cache_get( $term, 'terms' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// get_term() will only be update the cache if the 'filter' prop is unset.
 		unset( $term_object->filter );
@@ -124,13 +122,11 @@ public function test_get_term_should_update_term_cache_when_passed_an_object() {
 		$term_object_2 = get_term( $term_object, 'wptests_tax' );
 
 		// No new queries should have fired.
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertSame( $term_object, $term_object_2 );
 	}
 
 	public function test_get_term_should_update_term_cache_when_passed_a_valid_term_identifier() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$term = self::factory()->term->create(
 			array(
@@ -143,23 +139,21 @@ public function test_get_term_should_update_term_cache_when_passed_a_valid_term_
 		// Affirm that the cache is empty.
 		$this->assertEmpty( wp_cache_get( $term, 'terms' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Prime cache.
 		$term_object = get_term( $term, 'wptests_tax' );
 		$this->assertNotEmpty( wp_cache_get( $term, 'terms' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
 		$term_object_2 = get_term( $term, 'wptests_tax' );
 
 		// No new queries should have fired.
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		$this->assertEquals( $term_object, $term_object_2 );
 	}
 
 	public function test_get_term_by_should_update_term_cache_when_passed_a_valid_term_identifier() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$term = self::factory()->term->create(
 			array(
@@ -172,17 +166,17 @@ public function test_get_term_by_should_update_term_cache_when_passed_a_valid_te
 		// Affirm that the cache is empty.
 		$this->assertEmpty( wp_cache_get( $term, 'terms' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Prime cache.
 		$term_object = get_term_by( 'id', $term, 'wptests_tax' );
 		$this->assertNotEmpty( wp_cache_get( $term, 'terms' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
 		$term_object_2 = get_term( $term, 'wptests_tax' );
 
 		// No new queries should have fired.
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		$this->assertEquals( $term_object, $term_object_2 );
 	}
 
@@ -190,8 +184,6 @@ public function test_get_term_by_should_update_term_cache_when_passed_a_valid_te
 	 * @ticket 30749
 	 */
 	public function test_get_terms_should_update_cache_for_located_terms() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 
 		$terms = self::factory()->term->create_many(
@@ -208,13 +200,13 @@ public function test_get_terms_should_update_cache_for_located_terms() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $term_id ) {
 			get_term( $term_id, 'wptests_tax' );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		_unregister_taxonomy( 'wptests_tax' );
 	}
@@ -242,8 +234,6 @@ public function test_term_objects_should_not_be_modified_by_update_term_cache()
 	 * @ticket 21760
 	 */
 	public function test_get_term_by_slug_cache() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'slug'     => 'burrito',
@@ -253,28 +243,26 @@ public function test_get_term_by_slug_cache() {
 		);
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$term        = get_term_by( 'slug', 'burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
 		$this->assertSame( 'Taco', $term->name );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// This should now hit cache.
 		$term = get_term_by( 'slug', 'burrito', 'post_tag' );
 		$this->assertSame( 'Taco', $term->name );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 21760
 	 */
 	public function test_get_term_by_slug_cache_update() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'slug'     => 'burrito',
@@ -284,35 +272,33 @@ public function test_get_term_by_slug_cache_update() {
 		);
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$term        = get_term_by( 'slug', 'burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
 		$this->assertSame( 'Taco', $term->name );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// This should now hit cache.
 		$term = get_term_by( 'slug', 'burrito', 'post_tag' );
 		$this->assertSame( 'Taco', $term->name );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Update the tag which invalidates the cache.
 		wp_update_term( $term_id, 'post_tag', array( 'name' => 'No Taco' ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// This should not hit cache.
 		$term        = get_term_by( 'slug', 'burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
 		$this->assertSame( 'No Taco', $term->name );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 21760
 	 */
 	public function test_get_term_by_name_cache() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'name'     => 'Burrito',
@@ -322,26 +308,24 @@ public function test_get_term_by_name_cache() {
 		);
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		get_term_by( 'name', 'Burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// This should now hit cache.
 		$term = get_term_by( 'name', 'Burrito', 'post_tag' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 21760
 	 */
 	public function test_get_term_by_name_cache_update() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'name'     => 'Burrito',
@@ -351,32 +335,30 @@ public function test_get_term_by_name_cache_update() {
 		);
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		get_term_by( 'name', 'Burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// This should now hit cache.
 		get_term_by( 'name', 'Burrito', 'post_tag' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Update the tag which invalidates the cache.
 		wp_update_term( $term_id, 'post_tag', array( 'slug' => 'taco' ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// This should not hit cache.
 		get_term_by( 'name', 'burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 21760
 	 */
 	public function test_invalidating_term_caches_should_fail_when_invalidation_is_suspended() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'name'     => 'Burrito',
@@ -385,7 +367,7 @@ public function test_invalidating_term_caches_should_fail_when_invalidation_is_s
 		);
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries  = $wpdb->num_queries;
+		$num_queries  = get_num_queries();
 		$last_changed = wp_cache_get( 'last_changed', 'terms' );
 
 		$term1       = get_term_by( 'name', 'Burrito', 'post_tag' );
@@ -393,18 +375,18 @@ public function test_invalidating_term_caches_should_fail_when_invalidation_is_s
 
 		// Verify the term is cached.
 		$term2 = get_term_by( 'name', 'Burrito', 'post_tag' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertEquals( $term1, $term2 );
 
 		$suspend = wp_suspend_cache_invalidation();
 
 		// Update the tag.
 		wp_update_term( $term_id, 'post_tag', array( 'name' => 'Taco' ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Verify that the cached term still matches the initial cached term.
 		$term3 = get_term_by( 'name', 'Burrito', 'post_tag' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertEquals( $term1, $term3 );
 
 		// Verify that last changed has not been updated as part of an invalidation routine.
@@ -418,8 +400,6 @@ public function test_invalidating_term_caches_should_fail_when_invalidation_is_s
 	 * @ticket 21760
 	 */
 	public function test_get_term_by_does_not_prime_term_meta_cache() {
-		global $wpdb;
-
 		$term_id = self::factory()->term->create(
 			array(
 				'name'     => 'Burrito',
@@ -429,18 +409,18 @@ public function test_get_term_by_does_not_prime_term_meta_cache() {
 		add_term_meta( $term_id, 'foo', 'bar' );
 
 		clean_term_cache( $term_id, 'post_tag' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$term        = get_term_by( 'name', 'Burrito', 'post_tag' );
 		$num_queries = $num_queries + 2;
 		$this->assertInstanceOf( 'WP_Term', $term );
 		$this->assertSame( $term_id, $term->term_id );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$term_meta = get_term_meta( $term_id, 'foo', true );
 		$num_queries++;
 		$this->assertSame( $term_meta, 'bar' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/getTagLink.php b/tests/phpunit/tests/term/getTagLink.php
index cd55353b25198..bca2f7b91d15c 100644
--- a/tests/phpunit/tests/term/getTagLink.php
+++ b/tests/phpunit/tests/term/getTagLink.php
@@ -5,16 +5,56 @@
  * @covers ::get_tag_link
  */
 class Tests_Term_GetTagLink extends WP_UnitTestCase {
-	public function test_success() {
-		$t = self::factory()->term->create(
+	/**
+	 * Tag ID.
+	 *
+	 * @var int
+	 */
+	public static $tag_id;
+
+	/**
+	 * Test taxonomy term ID.
+	 *
+	 * @var int
+	 */
+	public static $term_id;
+
+	/**
+	 * Set up shared fixtures.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$tag_id = $factory->term->create(
 			array(
 				'taxonomy' => 'post_tag',
-				'slug'     => 'term-slug',
+				'slug'     => 'test-tag',
 			)
 		);
 
-		$found    = get_tag_link( $t );
-		$expected = home_url( '?tag=term-slug' );
+		register_taxonomy( 'wptests_tax', 'post' );
+		self::$term_id = self::factory()->term->create(
+			array(
+				'taxonomy' => 'wptests_tax',
+				'slug'     => 'test-term',
+			)
+		);
+	}
+
+	/**
+	 * Set up the test fixture.
+	 */
+	public function set_up() {
+		parent::set_up();
+		// Required as taxonomies are reset between tests.
+		register_taxonomy( 'wptests_tax', 'post' );
+	}
+
+	public function test_success() {
+		$tag_id = self::$tag_id;
+
+		$found    = get_tag_link( $tag_id );
+		$expected = home_url( '?tag=test-tag' );
 
 		$this->assertSame( $expected, $found );
 	}
@@ -23,18 +63,11 @@ public function test_success() {
 	 * @ticket 42771
 	 */
 	public function test_should_return_link_for_term_from_another_taxonomy_on_primed_cache() {
-		register_taxonomy( 'wptests_tax', 'post' );
+		$term_id = self::$term_id;
 
-		$t = self::factory()->term->create(
-			array(
-				'taxonomy' => 'wptests_tax',
-				'slug'     => 'test-term',
-			)
-		);
-
-		$term = get_term( $t );
+		$term = get_term( $term_id );
 
-		$found    = get_tag_link( $t );
+		$found    = get_tag_link( $term_id );
 		$expected = home_url( '?wptests_tax=test-term' );
 
 		$this->assertSame( $expected, $found );
@@ -44,18 +77,11 @@ public function test_should_return_link_for_term_from_another_taxonomy_on_primed
 	 * @ticket 42771
 	 */
 	public function test_should_return_link_for_term_from_another_taxonomy_on_empty_cache() {
-		register_taxonomy( 'wptests_tax', 'post' );
-
-		$t = self::factory()->term->create(
-			array(
-				'taxonomy' => 'wptests_tax',
-				'slug'     => 'test-term',
-			)
-		);
+		$term_id = self::$term_id;
 
-		clean_term_cache( $t );
+		clean_term_cache( $term_id );
 
-		$found    = get_tag_link( $t );
+		$found    = get_tag_link( $term_id );
 		$expected = home_url( '?wptests_tax=test-term' );
 
 		$this->assertSame( $expected, $found );
diff --git a/tests/phpunit/tests/term/getTerm.php b/tests/phpunit/tests/term/getTerm.php
index ec618e190d649..36567a7830884 100644
--- a/tests/phpunit/tests/term/getTerm.php
+++ b/tests/phpunit/tests/term/getTerm.php
@@ -2,11 +2,44 @@
 
 /**
  * @group taxonomy
+ *
+ * @covers ::get_term
  */
 class Tests_Term_GetTerm extends WP_UnitTestCase {
+	/**
+	 * Shared terms.
+	 *
+	 * @var array[]
+	 */
+	public static $shared_terms = array();
+
+	/**
+	 * Test taxonomy term object.
+	 *
+	 * @var WP_Term
+	 */
+	public static $term;
+
+	/**
+	 * Set up shared fixtures.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		register_taxonomy( 'wptests_tax', 'post' );
+		self::$shared_terms = self::generate_shared_terms();
+
+		self::$term = $factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
+	}
+
+	/**
+	 * Set up the test fixtures.
+	 */
 	public function set_up() {
 		parent::set_up();
+		// Required as taxonomies are reset between tests.
 		register_taxonomy( 'wptests_tax', 'post' );
+		register_taxonomy( 'wptests_tax_2', 'post' );
 	}
 
 	/**
@@ -14,35 +47,35 @@ public function set_up() {
 	 *
 	 * @return array Array of term_id/old_term_id/term_taxonomy_id triplets.
 	 */
-	protected function generate_shared_terms() {
+	protected static function generate_shared_terms() {
 		global $wpdb;
 
 		register_taxonomy( 'wptests_tax_2', 'post' );
 
-		$t1 = wp_insert_term( 'Foo', 'wptests_tax' );
-		$t2 = wp_insert_term( 'Foo', 'wptests_tax_2' );
+		$term_1 = wp_insert_term( 'Foo', 'wptests_tax' );
+		$term_2 = wp_insert_term( 'Foo', 'wptests_tax_2' );
 
 		// Manually modify because shared terms shouldn't naturally occur.
 		$wpdb->update(
 			$wpdb->term_taxonomy,
-			array( 'term_id' => $t1['term_id'] ),
-			array( 'term_taxonomy_id' => $t2['term_taxonomy_id'] ),
+			array( 'term_id' => $term_1['term_id'] ),
+			array( 'term_taxonomy_id' => $term_2['term_taxonomy_id'] ),
 			array( '%d' ),
 			array( '%d' )
 		);
 
-		clean_term_cache( $t1['term_id'] );
+		clean_term_cache( $term_1['term_id'] );
 
 		return array(
 			array(
-				'term_id'          => $t1['term_id'],
-				'old_term_id'      => $t1['term_id'],
-				'term_taxonomy_id' => $t1['term_taxonomy_id'],
+				'term_id'          => $term_1['term_id'],
+				'old_term_id'      => $term_1['term_id'],
+				'term_taxonomy_id' => $term_1['term_taxonomy_id'],
 			),
 			array(
-				'term_id'          => $t1['term_id'],
-				'old_term_id'      => $t2['term_id'],
-				'term_taxonomy_id' => $t2['term_taxonomy_id'],
+				'term_id'          => $term_1['term_id'],
+				'old_term_id'      => $term_2['term_id'],
+				'term_taxonomy_id' => $term_2['term_taxonomy_id'],
 			),
 		);
 	}
@@ -60,17 +93,15 @@ public function test_should_return_error_for_invalid_taxonomy() {
 	}
 
 	public function test_passing_term_object_should_skip_database_query_when_filter_property_is_empty() {
-		global $wpdb;
-
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
+		$term = self::$term;
 		clean_term_cache( $term->term_id, 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		unset( $term->filter );
 		$term_a = get_term( $term, 'wptests_tax' );
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	public function test_passing_term_string_that_casts_to_int_0_should_return_null() {
@@ -82,36 +113,34 @@ public function test_should_return_null_for_invalid_term_id() {
 	}
 
 	public function test_cache_should_be_populated_by_successful_fetch() {
-		global $wpdb;
-
-		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-		clean_term_cache( $t, 'wptests_tax' );
+		$term_id = self::$term->term_id;
+		clean_term_cache( $term_id, 'wptests_tax' );
 
 		// Prime cache.
-		$term_a      = get_term( $t, 'wptests_tax' );
-		$num_queries = $wpdb->num_queries;
+		$term_a      = get_term( $term_id, 'wptests_tax' );
+		$num_queries = get_num_queries();
 
 		// Second call shouldn't require a database query.
-		$term_b = get_term( $t, 'wptests_tax' );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$term_b = get_term( $term_id, 'wptests_tax' );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertEquals( $term_a, $term_b );
 	}
 
 	public function test_output_object() {
-		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-		$this->assertIsObject( get_term( $t, 'wptests_tax', OBJECT ) );
+		$term_id = self::$term->term_id;
+		$this->assertIsObject( get_term( $term_id, 'wptests_tax', OBJECT ) );
 	}
 
 	public function test_output_array_a() {
-		$t    = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-		$term = get_term( $t, 'wptests_tax', ARRAY_A );
+		$term_id = self::$term->term_id;
+		$term    = get_term( $term_id, 'wptests_tax', ARRAY_A );
 		$this->assertIsArray( $term );
 		$this->assertArrayHasKey( 'term_id', $term );
 	}
 
 	public function test_output_array_n() {
-		$t    = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-		$term = get_term( $t, 'wptests_tax', ARRAY_N );
+		$term_id = self::$term->term_id;
+		$term    = get_term( $term_id, 'wptests_tax', ARRAY_N );
 		$this->assertIsArray( $term );
 		$this->assertArrayNotHasKey( 'term_id', $term );
 		foreach ( $term as $k => $v ) {
@@ -120,8 +149,8 @@ public function test_output_array_n() {
 	}
 
 	public function test_output_should_fall_back_to_object_for_invalid_input() {
-		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-		$this->assertIsObject( get_term( $t, 'wptests_tax', 'foo' ) );
+		$term_id = self::$term->term_id;
+		$this->assertIsObject( get_term( $term_id, 'wptests_tax', 'foo' ) );
 	}
 
 	/**
@@ -131,10 +160,10 @@ public function test_output_should_fall_back_to_object_for_invalid_input() {
 	public function test_numeric_properties_should_be_cast_to_ints() {
 		global $wpdb;
 
-		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+		$term_id = self::$term->term_id;
 
 		// Get raw data from the database.
-		$term_data = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms t JOIN $wpdb->term_taxonomy tt ON ( t.term_id = tt.term_id ) WHERE t.term_id = %d", $t ) );
+		$term_data = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms t JOIN $wpdb->term_taxonomy tt ON ( t.term_id = tt.term_id ) WHERE t.term_id = %d", $term_id ) );
 
 		$contexts = array( 'raw', 'edit', 'db', 'display', 'rss', 'attribute', 'js' );
 
@@ -154,7 +183,7 @@ public function test_numeric_properties_should_be_cast_to_ints() {
 	 * @ticket 34332
 	 */
 	public function test_should_return_null_when_provided_taxonomy_does_not_match_actual_term_taxonomy() {
-		$term_id = self::factory()->term->create( array( 'taxonomy' => 'post_tag' ) );
+		$term_id = self::$term->term_id;
 		$this->assertNull( get_term( $term_id, 'category' ) );
 	}
 
@@ -162,7 +191,7 @@ public function test_should_return_null_when_provided_taxonomy_does_not_match_ac
 	 * @ticket 34533
 	 */
 	public function test_should_return_wp_error_when_term_is_shared_and_no_taxonomy_is_specified() {
-		$terms = $this->generate_shared_terms();
+		$terms = self::$shared_terms;
 
 		$found = get_term( $terms[0]['term_id'] );
 
@@ -173,7 +202,7 @@ public function test_should_return_wp_error_when_term_is_shared_and_no_taxonomy_
 	 * @ticket 34533
 	 */
 	public function test_should_return_term_when_term_is_shared_and_correct_taxonomy_is_specified() {
-		$terms = $this->generate_shared_terms();
+		$terms = self::$shared_terms;
 
 		$found = get_term( $terms[0]['term_id'], 'wptests_tax' );
 
@@ -185,7 +214,7 @@ public function test_should_return_term_when_term_is_shared_and_correct_taxonomy
 	 * @ticket 34533
 	 */
 	public function test_should_return_null_when_term_is_shared_and_incorrect_taxonomy_is_specified() {
-		$terms = $this->generate_shared_terms();
+		$terms = self::$shared_terms;
 
 		$found = get_term( $terms[0]['term_id'], 'post_tag' );
 
@@ -196,19 +225,17 @@ public function test_should_return_null_when_term_is_shared_and_incorrect_taxono
 	 * @ticket 34533
 	 */
 	public function test_shared_term_in_cache_should_be_ignored_when_specifying_a_different_taxonomy() {
-		global $wpdb;
-
-		$terms = $this->generate_shared_terms();
+		$terms = self::$shared_terms;
 
 		// Prime cache for 'wptests_tax'.
 		get_term( $terms[0]['term_id'], 'wptests_tax' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Database should be hit again.
 		$found = get_term( $terms[1]['term_id'], 'wptests_tax_2' );
 		$num_queries++;
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 		$this->assertInstanceOf( 'WP_Term', $found );
 		$this->assertSame( 'wptests_tax_2', $found->taxonomy );
 	}
@@ -217,11 +244,11 @@ public function test_shared_term_in_cache_should_be_ignored_when_specifying_a_di
 	 * @ticket 34533
 	 */
 	public function test_should_return_error_when_only_matching_term_is_in_an_invalid_taxonomy() {
-		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+		$term_id = self::$term->term_id;
 
 		_unregister_taxonomy( 'wptests_tax' );
 
-		$found = get_term( $t );
+		$found = get_term( $term_id );
 		$this->assertWPError( $found );
 		$this->assertSame( 'invalid_taxonomy', $found->get_error_code() );
 	}
@@ -230,7 +257,7 @@ public function test_should_return_error_when_only_matching_term_is_in_an_invali
 	 * @ticket 34533
 	 */
 	public function test_term_should_be_returned_when_id_is_shared_only_with_invalid_taxonomies() {
-		$terms = $this->generate_shared_terms();
+		$terms = self::$shared_terms;
 
 		_unregister_taxonomy( 'wptests_tax' );
 
diff --git a/tests/phpunit/tests/term/getTermBy.php b/tests/phpunit/tests/term/getTermBy.php
index 6422e44f0a515..32974d13c54e2 100644
--- a/tests/phpunit/tests/term/getTermBy.php
+++ b/tests/phpunit/tests/term/getTermBy.php
@@ -111,8 +111,6 @@ public function test_taxonomy_should_be_ignored_if_matching_by_term_taxonomy_id(
 	 * @ticket 14162
 	 */
 	public function test_should_prime_term_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$t = self::factory()->term->create(
 			array(
@@ -123,18 +121,18 @@ public function test_should_prime_term_cache() {
 
 		clean_term_cache( $t, 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$found       = get_term_by( 'slug', 'foo', 'wptests_tax' );
 		$num_queries = $num_queries + 2;
 
 		$this->assertInstanceOf( 'WP_Term', $found );
 		$this->assertSame( $t, $found->term_id );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// Calls to `get_term()` should now hit cache.
 		$found2 = get_term( $t );
 		$this->assertSame( $t, $found->term_id );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/getTermField.php b/tests/phpunit/tests/term/getTermField.php
index c69044564c91e..fdcfbdc0285f1 100644
--- a/tests/phpunit/tests/term/getTermField.php
+++ b/tests/phpunit/tests/term/getTermField.php
@@ -2,53 +2,72 @@
 
 /**
  * @group taxonomy
+ *
+ * @covers ::get_term_field
  */
 class Tests_Term_getTermField extends WP_UnitTestCase {
 
-	public $taxonomy = 'wptests_tax';
+	public static $taxonomy = 'wptests_tax';
+
+	public static $term;
+
+	/**
+	 * Set up shared fixtures.
+	 *
+	 * @param WP_UnitTest_Factory $factory
+	 */
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		register_taxonomy( self::$taxonomy, 'post' );
+		self::$term = $factory->term->create_and_get(
+			array(
+				'taxonomy'    => self::$taxonomy,
+				'description' => wpautop( 'Test term description' ),
+			)
+		);
+	}
 
 	public function set_up() {
 		parent::set_up();
-
-		register_taxonomy( $this->taxonomy, 'post' );
+		// Required as taxonomies are reset between tests.
+		register_taxonomy( self::$taxonomy, 'post' );
 	}
 
 	/**
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_should_not_return_error_for_empty_taxonomy() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$found = get_term_field( 'taxonomy', $term->term_id, '' );
 		$this->assertNotWPError( $found );
-		$this->assertSame( $this->taxonomy, $found );
+		$this->assertSame( self::$taxonomy, $found );
 	}
 
 	/**
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_supplying_a_taxonomy() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$found = get_term_field( 'taxonomy', $term->term_id, $term->taxonomy );
-		$this->assertSame( $this->taxonomy, $found );
+		$this->assertSame( self::$taxonomy, $found );
 	}
 
 	/**
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_supplying_no_taxonomy() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$found = get_term_field( 'taxonomy', $term->term_id );
-		$this->assertSame( $this->taxonomy, $found );
+		$this->assertSame( self::$taxonomy, $found );
 	}
 
 	/**
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_should_accept_a_WP_Term_id_or_object() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$this->assertInstanceOf( 'WP_Term', $term );
 		$this->assertSame( $term->term_id, get_term_field( 'term_id', $term ) );
@@ -60,7 +79,7 @@ public function test_get_term_field_should_accept_a_WP_Term_id_or_object() {
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_invalid_taxonomy_should_return_WP_Error() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$found = get_term_field( 'taxonomy', $term, 'foo-taxonomy' );
 		$this->assertWPError( $found );
@@ -71,7 +90,7 @@ public function test_get_term_field_invalid_taxonomy_should_return_WP_Error() {
 	 * @ticket 34245
 	 */
 	public function test_get_term_field_invalid_term_should_return_WP_Error() {
-		$found = get_term_field( 'taxonomy', 0, $this->taxonomy );
+		$found = get_term_field( 'taxonomy', 0, self::$taxonomy );
 
 		$this->assertWPError( $found );
 		$this->assertSame( 'invalid_term', $found->get_error_code() );
@@ -83,7 +102,7 @@ public function test_get_term_field_invalid_term_should_return_WP_Error() {
 	}
 
 	public function test_get_term_field_term_id() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
 		$this->assertSame( $term->term_id, get_term_field( 'term_id', $term ) );
 		$this->assertSame( $term->term_id, get_term_field( 'term_id', $term->data ) );
@@ -96,7 +115,7 @@ public function test_get_term_field_name() {
 		$term = self::factory()->term->create_and_get(
 			array(
 				'name'     => $name,
-				'taxonomy' => $this->taxonomy,
+				'taxonomy' => self::$taxonomy,
 			)
 		);
 
@@ -110,7 +129,7 @@ public function test_get_term_field_slug_when_slug_is_set() {
 
 		$term = self::factory()->term->create_and_get(
 			array(
-				'taxonomy' => $this->taxonomy,
+				'taxonomy' => self::$taxonomy,
 				'slug'     => $slug,
 			)
 		);
@@ -125,7 +144,7 @@ public function test_get_term_field_slug_when_slug_falls_back_from_name() {
 
 		$term = self::factory()->term->create_and_get(
 			array(
-				'taxonomy' => $this->taxonomy,
+				'taxonomy' => self::$taxonomy,
 				'name'     => $name,
 			)
 		);
@@ -138,7 +157,7 @@ public function test_get_term_field_slug_when_slug_falls_back_from_name() {
 	public function test_get_term_field_slug_when_slug_and_name_are_not_set() {
 		$term = self::factory()->term->create_and_get(
 			array(
-				'taxonomy' => $this->taxonomy,
+				'taxonomy' => self::$taxonomy,
 			)
 		);
 
@@ -148,33 +167,28 @@ public function test_get_term_field_slug_when_slug_and_name_are_not_set() {
 	}
 
 	public function test_get_term_field_taxonomy() {
-		$term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$term = self::$term;
 
-		$this->assertSame( $this->taxonomy, get_term_field( 'taxonomy', $term ) );
-		$this->assertSame( $this->taxonomy, get_term_field( 'taxonomy', $term->data ) );
-		$this->assertSame( $this->taxonomy, get_term_field( 'taxonomy', $term->term_id ) );
+		$this->assertSame( self::$taxonomy, get_term_field( 'taxonomy', $term ) );
+		$this->assertSame( self::$taxonomy, get_term_field( 'taxonomy', $term->data ) );
+		$this->assertSame( self::$taxonomy, get_term_field( 'taxonomy', $term->term_id ) );
 	}
 
 	public function test_get_term_field_description() {
-		$desc = wpautop( 'baz' );
+		$description = wpautop( 'Test term description' );
 
-		$term = self::factory()->term->create_and_get(
-			array(
-				'taxonomy'    => $this->taxonomy,
-				'description' => $desc,
-			)
-		);
+		$term = self::$term;
 
-		$this->assertSame( $desc, get_term_field( 'description', $term ) );
-		$this->assertSame( $desc, get_term_field( 'description', $term->data ) );
-		$this->assertSame( $desc, get_term_field( 'description', $term->term_id ) );
+		$this->assertSame( $description, get_term_field( 'description', $term ) );
+		$this->assertSame( $description, get_term_field( 'description', $term->data ) );
+		$this->assertSame( $description, get_term_field( 'description', $term->term_id ) );
 	}
 
 	public function test_get_term_field_parent() {
-		$parent = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+		$parent = self::$term;
 		$term   = self::factory()->term->create_and_get(
 			array(
-				'taxonomy' => $this->taxonomy,
+				'taxonomy' => self::$taxonomy,
 				'parent'   => $parent->term_id,
 			)
 		);
diff --git a/tests/phpunit/tests/term/getTerms.php b/tests/phpunit/tests/term/getTerms.php
index 5c0d67f72e9a8..4d05d77192d83 100644
--- a/tests/phpunit/tests/term/getTerms.php
+++ b/tests/phpunit/tests/term/getTerms.php
@@ -134,26 +134,24 @@ public function test_excluding_taxonomy_arg_should_return_terms_from_all_taxonom
 	 * @ticket 23326
 	 */
 	public function test_get_terms_cache() {
-		global $wpdb;
-
 		$this->set_up_three_posts_and_tags();
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// last_changed and num_queries should bump.
 		$terms = get_terms( 'post_tag', array( 'update_term_meta_cache' => false ) );
 		$this->assertCount( 3, $terms );
 		$time1 = wp_cache_get( 'last_changed', 'terms' );
 		$this->assertNotEmpty( $time1 );
-		$this->assertSame( $num_queries + 2, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 2, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Again. last_changed and num_queries should remain the same.
 		$terms = get_terms( 'post_tag', array( 'update_term_meta_cache' => false ) );
 		$this->assertCount( 3, $terms );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -167,21 +165,21 @@ public function test_get_terms_cache_should_be_missed_when_passing_number() {
 		// Prime cache.
 		$terms       = get_terms( 'post_tag' );
 		$time1       = wp_cache_get( 'last_changed', 'terms' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// num_queries should bump, last_changed should remain the same.
 		$terms = get_terms( 'post_tag', array( 'number' => 2 ) );
 		$this->assertCount( 2, $terms );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Again. last_changed and num_queries should remain the same.
 		$terms = get_terms( 'post_tag', array( 'number' => 2 ) );
 		$this->assertCount( 2, $terms );
 		$this->assertSame( $time1, wp_cache_get( 'last_changed', 'terms' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -195,12 +193,12 @@ public function test_wp_delete_term_should_invalidate_cache() {
 		// Prime cache.
 		$terms       = get_terms( 'post_tag' );
 		$time1       = wp_cache_get( 'last_changed', 'terms' );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Force last_changed to bump.
 		wp_delete_term( $terms[0]->term_id, 'post_tag' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$time2       = wp_cache_get( 'last_changed', 'terms' );
 		$this->assertNotEquals( $time1, $time2 );
 
@@ -208,15 +206,15 @@ public function test_wp_delete_term_should_invalidate_cache() {
 		$terms = get_terms( 'post_tag' );
 		$this->assertCount( 2, $terms );
 		$this->assertSame( $time2, wp_cache_get( 'last_changed', 'terms' ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		// Again. last_changed and num_queries should remain the same.
 		$terms = get_terms( 'post_tag' );
 		$this->assertCount( 2, $terms );
 		$this->assertSame( $time2, wp_cache_get( 'last_changed', 'terms' ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// @todo Repeat with term insert and update.
 	}
@@ -848,13 +846,11 @@ public function test_get_terms_child_of_fields_id_slug() {
 	 * @ticket 31118
 	 */
 	public function test_child_of_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
 
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_terms(
 			'wptests_tax',
@@ -865,7 +861,7 @@ public function test_child_of_should_skip_query_when_specified_parent_is_not_fou
 		);
 
 		$this->assertEmpty( $found );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -2473,13 +2469,11 @@ public function test_parent_should_override_child_of() {
 	 * @ticket 31118
 	 */
 	public function test_parent_should_skip_query_when_specified_parent_is_not_found_in_hierarchy_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
 
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_terms(
 			'wptests_tax',
@@ -2490,7 +2484,7 @@ public function test_parent_should_skip_query_when_specified_parent_is_not_found
 		);
 
 		$this->assertEmpty( $found );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -2756,7 +2750,7 @@ public function test_pad_counts_should_work_when_first_taxonomy_is_nonhierarchic
 	/**
 	 * @ticket 10142
 	 */
-	public function test_termmeta_cache_should_be_primed_by_default() {
+	public function test_termmeta_cache_should_be_lazy_loaded_by_default() {
 		global $wpdb;
 
 		register_taxonomy( 'wptests_tax', 'post' );
@@ -2773,13 +2767,13 @@ public function test_termmeta_cache_should_be_primed_by_default() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 
 	/**
@@ -2803,13 +2797,13 @@ public function test_termmeta_cache_should_not_be_primed_when_update_term_meta_c
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries + 3, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 3, get_num_queries() );
 	}
 
 	/**
@@ -2908,7 +2902,7 @@ public function test_should_return_wp_term_objects_when_pulling_from_the_cache()
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$found = get_terms(
 			'wptests_tax',
@@ -2918,7 +2912,7 @@ public function test_should_return_wp_term_objects_when_pulling_from_the_cache()
 			)
 		);
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$this->assertNotEmpty( $found );
 
@@ -2931,8 +2925,6 @@ public function test_should_return_wp_term_objects_when_pulling_from_the_cache()
 	 * @ticket 14162
 	 */
 	public function test_should_prime_individual_term_cache_when_fields_is_all() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
@@ -2944,9 +2936,9 @@ public function test_should_prime_individual_term_cache_when_fields_is_all() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$term0       = get_term( $terms[0] );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 	}
 
diff --git a/tests/phpunit/tests/term/getTheTerms.php b/tests/phpunit/tests/term/getTheTerms.php
index 2bd99863ceaac..67362327c89dd 100644
--- a/tests/phpunit/tests/term/getTheTerms.php
+++ b/tests/phpunit/tests/term/getTheTerms.php
@@ -195,10 +195,9 @@ public function test_count_should_not_be_improperly_cached() {
 
 	/**
 	 * @ticket 36814
+	 * @ticket 57701
 	 */
-	public function test_uncached_terms_should_be_primed_with_a_single_query() {
-		global $wpdb;
-
+	public function test_uncached_terms_should_not_be_primed_with_a_single_query_by_default() {
 		register_taxonomy( 'wptests_tax', 'post' );
 
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
@@ -210,14 +209,13 @@ public function test_uncached_terms_should_be_primed_with_a_single_query() {
 		// Clean cache for two of the terms.
 		clean_term_cache( array( $terms[0], $terms[1] ), 'wptests_tax', false );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$found       = get_the_terms( self::$post_ids[0], 'wptests_tax' );
 
 		$this->assertSameSets( $terms, wp_list_pluck( $found, 'term_id' ) );
 
-		$num_queries++;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
-
+		// Two extra queries are expected as the cache is not primed and hence terms need to be queried.
+		$this->assertSame( 1, get_num_queries() - $num_queries );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/isObjectInTerm.php b/tests/phpunit/tests/term/isObjectInTerm.php
index 457b0e528c827..fbaf7e17767c8 100644
--- a/tests/phpunit/tests/term/isObjectInTerm.php
+++ b/tests/phpunit/tests/term/isObjectInTerm.php
@@ -119,62 +119,58 @@ public function test_should_not_return_true_if_term_name_begins_with_existing_te
 		register_taxonomy( 'wptests_tax', 'post' );
 		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
-		$post_ID = self::factory()->post->create();
-		wp_set_object_terms( $post_ID, $t, 'wptests_tax' );
+		$post_id = self::factory()->post->create();
+		wp_set_object_terms( $post_id, $t, 'wptests_tax' );
 
 		$int_tax_name = $t . '_term_name';
 
-		$this->assertFalse( is_object_in_term( $post_ID, 'wptests_tax', $int_tax_name ) );
+		$this->assertFalse( is_object_in_term( $post_id, 'wptests_tax', $int_tax_name ) );
 
 		// Verify it works properly when the post is actually in the term.
-		wp_set_object_terms( $post_ID, array( $int_tax_name ), 'wptests_tax' );
-		$this->assertTrue( is_object_in_term( $post_ID, 'wptests_tax', $int_tax_name ) );
+		wp_set_object_terms( $post_id, array( $int_tax_name ), 'wptests_tax' );
+		$this->assertTrue( is_object_in_term( $post_id, 'wptests_tax', $int_tax_name ) );
 	}
 
 	/**
 	 * @ticket 32044
 	 */
 	public function test_should_populate_and_hit_relationships_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
 		$o = 12345;
 		wp_set_object_terms( $o, $terms[0], 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( is_object_in_term( $o, 'wptests_tax', $terms[0] ) );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$this->assertFalse( is_object_in_term( $o, 'wptests_tax', $terms[1] ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 32044
 	 */
 	public function test_should_not_be_fooled_by_a_stale_relationship_cache() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
 		$o = 12345;
 		wp_set_object_terms( $o, $terms[0], 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( is_object_in_term( $o, 'wptests_tax', $terms[0] ) );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		wp_set_object_terms( $o, $terms[1], 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertTrue( is_object_in_term( $o, 'wptests_tax', $terms[1] ) );
 		$num_queries = $num_queries + 2;
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/meta.php b/tests/phpunit/tests/term/meta.php
index 976889fd8bb04..d46f35ae1dbd7 100644
--- a/tests/phpunit/tests/term/meta.php
+++ b/tests/phpunit/tests/term/meta.php
@@ -114,11 +114,6 @@ public function test_update_should_return_true_when_updating_existing_value_for_
 	}
 
 	public function test_term_meta_should_be_lazy_loaded_for_all_terms_in_wp_query_loop() {
-		global $wpdb;
-
-		// Clear any previous term IDs from the queue.
-		wp_metadata_lazyloader()->reset_queue( 'term' );
-
 		$p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
 		register_taxonomy( 'wptests_tax', 'post' );
@@ -142,20 +137,20 @@ public function test_term_meta_should_be_lazy_loaded_for_all_terms_in_wp_query_l
 				the_post();
 
 				// First request will hit the database.
-				$num_queries = $wpdb->num_queries;
+				$num_queries = get_num_queries();
 				$this->assertSame( 'bar', get_term_meta( $terms[0], 'foo', true ) );
 				$num_queries++;
-				$this->assertSame( $num_queries, $wpdb->num_queries );
+				$this->assertSame( $num_queries, get_num_queries() );
 
 				// Second and third requests should be in cache.
 				$this->assertSame( 'bar', get_term_meta( $terms[1], 'foo', true ) );
 				$this->assertSame( 'bar', get_term_meta( $terms[2], 'foo', true ) );
-				$this->assertSame( $num_queries, $wpdb->num_queries );
+				$this->assertSame( $num_queries, get_num_queries() );
 
 				// Querying a term not primed should result in a hit.
 				$num_queries++;
 				$this->assertSame( 'bar', get_term_meta( $orphan_term, 'foo', true ) );
-				$this->assertSame( $num_queries, $wpdb->num_queries );
+				$this->assertSame( $num_queries, get_num_queries() );
 			}
 		}
 	}
@@ -189,8 +184,6 @@ public function test_lazy_load_term_meta_should_fall_back_on_update_post_term_ca
 	 * @ticket 36593
 	 */
 	public function test_lazy_load_term_meta_false() {
-		global $wpdb;
-
 		$p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
 		register_taxonomy( 'wptests_tax', 'post' );
@@ -199,7 +192,7 @@ public function test_lazy_load_term_meta_false() {
 		foreach ( $terms as $t ) {
 			add_term_meta( $t, 'foo', 'bar' );
 		}
-
+		$this->reset_lazyload_queue();
 		$q = new WP_Query(
 			array(
 				'cache_results'          => true,
@@ -213,14 +206,14 @@ public function test_lazy_load_term_meta_false() {
 				$q->the_post();
 
 				// Requests will hit the database.
-				$num_queries = $wpdb->num_queries;
+				$num_queries = get_num_queries();
 				$this->assertSame( 'bar', get_term_meta( $terms[0], 'foo', true ) );
 				$num_queries++;
-				$this->assertSame( $num_queries, $wpdb->num_queries );
+				$this->assertSame( $num_queries, get_num_queries() );
 
 				$this->assertSame( 'bar', get_term_meta( $terms[1], 'foo', true ) );
 				$num_queries++;
-				$this->assertSame( $num_queries, $wpdb->num_queries );
+				$this->assertSame( $num_queries, get_num_queries() );
 			}
 		}
 	}
diff --git a/tests/phpunit/tests/term/query.php b/tests/phpunit/tests/term/query.php
index ca0e21b09c05d..0e118a3c169a4 100644
--- a/tests/phpunit/tests/term/query.php
+++ b/tests/phpunit/tests/term/query.php
@@ -46,6 +46,46 @@ public function test_taxonomy_should_accept_single_taxonomy_as_string() {
 		$this->assertSameSets( array( $term_2 ), $q->terms );
 	}
 
+	/**
+	 * @ticket 57645
+	 */
+	public function test_lazy_load_term_meta() {
+		$filter = new MockAction();
+		add_filter( 'update_term_metadata_cache', array( $filter, 'filter' ), 10, 2 );
+		register_taxonomy( 'wptests_tax_1', 'post' );
+		register_taxonomy( 'wptests_tax_2', 'post' );
+
+		$term_1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_1' ) );
+		$term_2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax_2' ) );
+
+		$q = new WP_Term_Query(
+			array(
+				'taxonomy'   => 'wptests_tax_1',
+				'fields'     => 'ids',
+				'hide_empty' => false,
+			)
+		);
+
+		$this->assertSameSets( array( $term_1 ), $q->terms );
+
+		$q = new WP_Term_Query(
+			array(
+				'taxonomy'   => 'wptests_tax_2',
+				'fields'     => 'ids',
+				'hide_empty' => false,
+			)
+		);
+
+		$this->assertSameSets( array( $term_2 ), $q->terms );
+
+		get_term_meta( $term_1 );
+
+		$args     = $filter->get_args();
+		$first    = reset( $args );
+		$term_ids = end( $first );
+		$this->assertSameSets( $term_ids, array( $term_1, $term_2 ) );
+	}
+
 	public function test_taxonomy_should_accept_taxonomy_array() {
 		register_taxonomy( 'wptests_tax_1', 'post' );
 		register_taxonomy( 'wptests_tax_2', 'post' );
@@ -362,7 +402,7 @@ public function test_all_with_object_id_should_return_term_objects() {
 		$this->assertNotEmpty( $terms );
 		foreach ( $terms as $term ) {
 			$this->assertInstanceOf( 'WP_Term', $term );
-			$this->assertObjectHasAttribute( 'object_id', $term );
+			$this->assertObjectHasProperty( 'object_id', $term );
 		}
 
 		// Run again to check the cached response.
@@ -370,7 +410,7 @@ public function test_all_with_object_id_should_return_term_objects() {
 		$this->assertNotEmpty( $terms );
 		foreach ( $terms as $term ) {
 			$this->assertInstanceOf( 'WP_Term', $term );
-			$this->assertObjectHasAttribute( 'object_id', $term );
+			$this->assertObjectHasProperty( 'object_id', $term );
 		}
 	}
 
@@ -416,8 +456,6 @@ public function test_object_ids_cache_should_be_invalidated_by_term_relationship
 	 * @group cache
 	 */
 	public function test_count_query_should_be_cached() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax_1', 'post' );
 
 		$terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax_1' ) );
@@ -432,7 +470,7 @@ public function test_count_query_should_be_cached() {
 		$count = $query->get_terms();
 		$this->assertEquals( 2, $count );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$query = new WP_Term_Query(
 			array(
@@ -443,7 +481,7 @@ public function test_count_query_should_be_cached() {
 		);
 		$count = $query->get_terms();
 		$this->assertEquals( 2, $count );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -763,11 +801,9 @@ public function filter_term_to_wp_error( $term ) {
 	 * @ticket 41246
 	 */
 	public function test_terms_pre_query_filter_should_bypass_database_query() {
-		global $wpdb;
-
 		add_filter( 'terms_pre_query', array( __CLASS__, 'filter_terms_pre_query' ), 10, 2 );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		$q       = new WP_Term_Query();
 		$results = $q->query(
@@ -779,7 +815,7 @@ public function test_terms_pre_query_filter_should_bypass_database_query() {
 		remove_filter( 'terms_pre_query', array( __CLASS__, 'filter_terms_pre_query' ), 10, 2 );
 
 		// Make sure no queries were executed.
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// We manually inserted a non-existing term and overrode the results with it.
 		$this->assertSame( array( 555 ), $q->terms );
@@ -867,4 +903,124 @@ public function test_hide_empty_should_include_empty_parents_of_nonempty_childre
 
 		$this->assertContains( $t1, $q->terms );
 	}
+
+	/**
+	 * Ensure cache keys are generated without WPDB placeholders.
+	 *
+	 * @ticket 57298
+	 *
+	 * @covers       WP_Term_Query::generate_cache_key
+	 * @dataProvider data_query_cache
+	 */
+	public function test_generate_cache_key_placeholder( $args ) {
+		global $wpdb;
+		$query1 = new WP_Term_Query();
+		$query1->query( $args );
+
+		$query_vars = $query1->query_vars;
+		$request    = $query1->request;
+
+		$reflection = new ReflectionMethod( $query1, 'generate_cache_key' );
+		$reflection->setAccessible( true );
+
+		$cache_key_1 = $reflection->invoke( $query1, $query_vars, $request );
+
+		$request_without_placeholder = $wpdb->remove_placeholder_escape( $request );
+
+		$cache_key_2 = $reflection->invoke( $query1, $query_vars, $request_without_placeholder );
+
+		$this->assertSame( $cache_key_1, $cache_key_2, 'Cache key differs when using wpdb placeholder.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[] Test parameters.
+	 */
+	public function data_query_cache() {
+		return array(
+			'empty query'                => array(
+				'args' => array(),
+			),
+			'search query'               => array(
+				'args' => array(
+					'search' => 'title',
+				),
+			),
+			'search name query'          => array(
+				'args' => array(
+					'name__like' => 'title',
+				),
+			),
+			'search description query'   => array(
+				'args' => array(
+					'description__like' => 'title',
+				),
+			),
+			'meta query'                 => array(
+				'args' => array(
+					'meta_query' => array(
+						array(
+							'key' => 'color',
+						),
+					),
+				),
+			),
+			'meta query search'          => array(
+				'args' => array(
+					'meta_query' => array(
+						array(
+							'key'     => 'color',
+							'value'   => '00',
+							'compare' => 'LIKE',
+						),
+					),
+				),
+			),
+			'nested meta query search'   => array(
+				'args' => array(
+					'meta_query' => array(
+						'relation' => 'AND',
+						array(
+							'key'     => 'color',
+							'value'   => '00',
+							'compare' => 'LIKE',
+						),
+						array(
+							'relation' => 'OR',
+							array(
+								'key'     => 'color',
+								'value'   => '00',
+								'compare' => 'LIKE',
+							),
+							array(
+								'relation' => 'AND',
+								array(
+									'key'     => 'wp_test_suite',
+									'value'   => '56802',
+									'compare' => 'LIKE',
+								),
+								array(
+									'key'     => 'wp_test_suite_too',
+									'value'   => '56802',
+									'compare' => 'LIKE',
+								),
+							),
+						),
+					),
+				),
+			),
+			'meta query not like search' => array(
+				'args' => array(
+					'meta_query' => array(
+						array(
+							'key'     => 'color',
+							'value'   => 'ff',
+							'compare' => 'NOT LIKE',
+						),
+					),
+				),
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/term/termExists.php b/tests/phpunit/tests/term/termExists.php
index c50cf7086df58..caf88cc4de3a6 100644
--- a/tests/phpunit/tests/term/termExists.php
+++ b/tests/phpunit/tests/term/termExists.php
@@ -320,7 +320,6 @@ public function test_term_lookup_by_slug_and_update() {
 	 * @covers ::term_exists()
 	 */
 	public function test_term_exists_caching() {
-		global $wpdb;
 		register_taxonomy( 'wptests_tax', 'post' );
 
 		$slug = __FUNCTION__;
@@ -331,14 +330,14 @@ public function test_term_exists_caching() {
 			)
 		);
 		$this->assertEquals( $t, term_exists( $slug ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertEquals( $t, term_exists( $slug ) );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		$this->assertTrue( wp_delete_term( $t, 'wptests_tax' ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertNull( term_exists( $slug ) );
-		$this->assertSame( $num_queries + 2, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 2, get_num_queries() );
 
 		// Clean up.
 		_unregister_taxonomy( 'wptests_tax' );
@@ -349,7 +348,6 @@ public function test_term_exists_caching() {
 	 * @covers ::term_exists()
 	 */
 	public function test_term_exists_caching_suspend_cache_invalidation() {
-		global $wpdb;
 		register_taxonomy( 'wptests_tax', 'post' );
 
 		wp_suspend_cache_invalidation( true );
@@ -362,9 +360,9 @@ public function test_term_exists_caching_suspend_cache_invalidation() {
 		);
 
 		$this->assertEquals( $t, term_exists( $slug ) );
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$this->assertEquals( $t, term_exists( $slug ) );
-		$this->assertSame( $num_queries + 1, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 		wp_suspend_cache_invalidation( false );
 
 		// Clean up.
diff --git a/tests/phpunit/tests/term/wpGenerateTagCloud.php b/tests/phpunit/tests/term/wpGenerateTagCloud.php
index d1b02bb04d432..62de4a0c2610f 100644
--- a/tests/phpunit/tests/term/wpGenerateTagCloud.php
+++ b/tests/phpunit/tests/term/wpGenerateTagCloud.php
@@ -8,7 +8,7 @@ class Tests_WP_Generate_Tag_Cloud extends WP_UnitTestCase {
 	/**
 	 * Testing when passed $tags array is empty
 	 *
-	 * @dataProvider empty_tags_data_provider
+	 * @dataProvider data_empty_tags
 	 *
 	 * @param $expected Expected output from `wp_generate_tag_cloud()`.
 	 * @param $args     Options for `wp_generate_tag_cloud()`.
@@ -21,7 +21,7 @@ public function test_empty_tags_passed( $expected, $args ) {
 	/**
 	 * Testing when no tags are found
 	 *
-	 * @dataProvider empty_tags_data_provider
+	 * @dataProvider data_empty_tags
 	 *
 	 * @param $expected Expected output from `wp_generate_tag_cloud()`.
 	 * @param $args     Options for `wp_generate_tag_cloud()`.
@@ -41,7 +41,7 @@ public function test_empty_tags_list_returned( $expected, $args ) {
 	 *
 	 * @return array
 	 */
-	public function empty_tags_data_provider() {
+	public function data_empty_tags() {
 		return array(
 			// When 'format' => 'array', we should be getting an empty array back.
 			array(
diff --git a/tests/phpunit/tests/term/wpGetObjectTerms.php b/tests/phpunit/tests/term/wpGetObjectTerms.php
index f246fccf715f0..948ba1e1c3d76 100644
--- a/tests/phpunit/tests/term/wpGetObjectTerms.php
+++ b/tests/phpunit/tests/term/wpGetObjectTerms.php
@@ -614,10 +614,9 @@ public function test_parent_0() {
 
 	/**
 	 * @ticket 10142
+	 * @ticket 57701
 	 */
-	public function test_termmeta_cache_should_be_primed_by_default() {
-		global $wpdb;
-
+	public function test_termmeta_cache_should_not_be_lazy_loaded_by_default() {
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 		add_term_meta( $terms[0], 'foo', 'bar' );
@@ -629,21 +628,20 @@ public function test_termmeta_cache_should_be_primed_by_default() {
 
 		$found = wp_get_object_terms( $p, 'wptests_tax' );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		// Here we had extra queries as the term meta cache was not primed by default.
+		$this->assertSame( 3, get_num_queries() - $num_queries );
 	}
 
 	/**
 	 * @ticket 10142
 	 */
 	public function test_termmeta_cache_should_not_be_primed_when_update_term_meta_cache_is_false() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 		add_term_meta( $terms[0], 'foo', 'bar' );
@@ -661,21 +659,19 @@ public function test_termmeta_cache_should_not_be_primed_when_update_term_meta_c
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries + 3, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 3, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 36932
 	 */
 	public function test_termmeta_cache_should_be_primed_when_fields_is_all_with_object_id() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 		add_term_meta( $terms[0], 'foo', 'bar' );
@@ -694,21 +690,19 @@ public function test_termmeta_cache_should_be_primed_when_fields_is_all_with_obj
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 
 	/**
 	 * @ticket 36932
 	 */
 	public function test_termmeta_cache_should_be_primed_when_fields_is_ids() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 		add_term_meta( $terms[0], 'foo', 'bar' );
@@ -727,13 +721,13 @@ public function test_termmeta_cache_should_be_primed_when_fields_is_ids() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 
 		foreach ( $terms as $t ) {
 			$this->assertSame( 'bar', get_term_meta( $t, 'foo', true ) );
 		}
 
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries + 1, get_num_queries() );
 	}
 
 	/**
@@ -816,8 +810,6 @@ public function test_should_return_wp_term_objects_for_fields_all_with_object_id
 	 * @ticket 14162
 	 */
 	public function test_should_prime_cache_for_found_terms() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax', 'post' );
 		$p = self::factory()->post->create();
 		$t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
@@ -831,9 +823,9 @@ public function test_should_prime_cache_for_found_terms() {
 			)
 		);
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$term        = get_term( $t );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
@@ -858,15 +850,13 @@ public function test_object_id_should_not_be_cached_with_term_object() {
 		}
 
 		$term = get_term( $t );
-		$this->assertObjectNotHasAttribute( 'object_id', $term );
+		$this->assertObjectNotHasProperty( 'object_id', $term );
 	}
 
 	/**
 	 * @ticket 14162
 	 */
 	public function test_term_cache_should_be_primed_for_all_taxonomies() {
-		global $wpdb;
-
 		register_taxonomy( 'wptests_tax1', 'post' );
 		register_taxonomy( 'wptests_tax2', 'post' );
 		$p  = self::factory()->post->create();
@@ -888,10 +878,10 @@ public function test_term_cache_should_be_primed_for_all_taxonomies() {
 
 		$this->assertSameSets( array( $t1, $t2 ), wp_list_pluck( $found, 'term_id' ) );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$term1       = get_term( $t1 );
 		$term2       = get_term( $t2 );
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/wpSetObjectTerms.php b/tests/phpunit/tests/term/wpSetObjectTerms.php
index 8032a50e79407..1d9837177bf9d 100644
--- a/tests/phpunit/tests/term/wpSetObjectTerms.php
+++ b/tests/phpunit/tests/term/wpSetObjectTerms.php
@@ -2,13 +2,17 @@
 
 /**
  * @group taxonomy
+ *
+ * @covers ::wp_set_object_terms
  */
 class Tests_Term_WpSetObjectTerms extends WP_UnitTestCase {
-	protected $taxonomy        = 'category';
+	protected static $taxonomy = 'category';
 	protected static $post_ids = array();
+	protected static $term_ids = array();
 
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 		self::$post_ids = $factory->post->create_many( 5 );
+		self::$term_ids = $factory->term->create_many( 5, array( 'taxonomy' => self::$taxonomy ) );
 	}
 
 	/**
@@ -105,26 +109,26 @@ public function test_set_object_terms_by_id() {
 		$terms = array();
 		for ( $i = 0; $i < 3; $i++ ) {
 			$term   = "term_{$i}";
-			$result = wp_insert_term( $term, $this->taxonomy );
+			$result = wp_insert_term( $term, self::$taxonomy );
 			$this->assertIsArray( $result );
 			$term_id[ $term ] = $result['term_id'];
 		}
 
 		foreach ( $ids as $id ) {
-			$tt = wp_set_object_terms( $id, array_values( $term_id ), $this->taxonomy );
+			$tt = wp_set_object_terms( $id, array_values( $term_id ), self::$taxonomy );
 			// Should return three term taxonomy IDs.
 			$this->assertCount( 3, $tt );
 		}
 
 		// Each term should be associated with every post.
 		foreach ( $term_id as $term => $id ) {
-			$actual = get_objects_in_term( $id, $this->taxonomy );
+			$actual = get_objects_in_term( $id, self::$taxonomy );
 			$this->assertSame( $ids, array_map( 'intval', $actual ) );
 		}
 
 		// Each term should have a count of 5.
 		foreach ( array_keys( $term_id ) as $term ) {
-			$t = get_term_by( 'name', $term, $this->taxonomy );
+			$t = get_term_by( 'name', $term, self::$taxonomy );
 			$this->assertSame( 5, $t->count );
 		}
 	}
@@ -139,25 +143,25 @@ public function test_set_object_terms_by_name() {
 		);
 
 		foreach ( $ids as $id ) {
-			$tt = wp_set_object_terms( $id, $terms, $this->taxonomy );
+			$tt = wp_set_object_terms( $id, $terms, self::$taxonomy );
 			// Should return three term taxonomy IDs.
 			$this->assertCount( 3, $tt );
 			// Remember which term has which term_id.
 			for ( $i = 0; $i < 3; $i++ ) {
-				$term                    = get_term_by( 'name', $terms[ $i ], $this->taxonomy );
+				$term                    = get_term_by( 'name', $terms[ $i ], self::$taxonomy );
 				$term_id[ $terms[ $i ] ] = (int) $term->term_id;
 			}
 		}
 
 		// Each term should be associated with every post.
 		foreach ( $term_id as $term => $id ) {
-			$actual = get_objects_in_term( $id, $this->taxonomy );
+			$actual = get_objects_in_term( $id, self::$taxonomy );
 			$this->assertSame( $ids, array_map( 'intval', $actual ) );
 		}
 
 		// Each term should have a count of 5.
 		foreach ( $terms as $term ) {
-			$t = get_term_by( 'name', $term, $this->taxonomy );
+			$t = get_term_by( 'name', $term, self::$taxonomy );
 			$this->assertSame( 5, $t->count );
 		}
 	}
@@ -253,7 +257,7 @@ public function test_change_object_terms_by_id() {
 		$terms_1 = array();
 		for ( $i = 0; $i < 3; $i++ ) {
 			$term   = "term_{$i}";
-			$result = wp_insert_term( $term, $this->taxonomy );
+			$result = wp_insert_term( $term, self::$taxonomy );
 			$this->assertIsArray( $result );
 			$terms_1[ $i ] = $result['term_id'];
 		}
@@ -263,17 +267,17 @@ public function test_change_object_terms_by_id() {
 		$terms_2[0] = $terms_1[1];
 
 		$term       = 'term';
-		$result     = wp_insert_term( $term, $this->taxonomy );
+		$result     = wp_insert_term( $term, self::$taxonomy );
 		$terms_2[1] = $result['term_id'];
 
 		// Set the initial terms.
-		$tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
+		$tt_1 = wp_set_object_terms( $post_id, $terms_1, self::$taxonomy );
 		$this->assertCount( 3, $tt_1 );
 
 		// Make sure they're correct.
 		$terms = wp_get_object_terms(
 			$post_id,
-			$this->taxonomy,
+			self::$taxonomy,
 			array(
 				'fields'  => 'ids',
 				'orderby' => 'term_id',
@@ -282,13 +286,13 @@ public function test_change_object_terms_by_id() {
 		$this->assertSame( $terms_1, $terms );
 
 		// Change the terms.
-		$tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
+		$tt_2 = wp_set_object_terms( $post_id, $terms_2, self::$taxonomy );
 		$this->assertCount( 2, $tt_2 );
 
 		// Make sure they're correct.
 		$terms = wp_get_object_terms(
 			$post_id,
-			$this->taxonomy,
+			self::$taxonomy,
 			array(
 				'fields'  => 'ids',
 				'orderby' => 'term_id',
@@ -311,13 +315,13 @@ public function test_change_object_terms_by_name() {
 		$terms_2 = array( 'bar', 'bing' );
 
 		// Set the initial terms.
-		$tt_1 = wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
+		$tt_1 = wp_set_object_terms( $post_id, $terms_1, self::$taxonomy );
 		$this->assertCount( 3, $tt_1 );
 
 		// Make sure they're correct.
 		$terms = wp_get_object_terms(
 			$post_id,
-			$this->taxonomy,
+			self::$taxonomy,
 			array(
 				'fields'  => 'names',
 				'orderby' => 'term_id',
@@ -326,13 +330,13 @@ public function test_change_object_terms_by_name() {
 		$this->assertSame( $terms_1, $terms );
 
 		// Change the terms.
-		$tt_2 = wp_set_object_terms( $post_id, $terms_2, $this->taxonomy );
+		$tt_2 = wp_set_object_terms( $post_id, $terms_2, self::$taxonomy );
 		$this->assertCount( 2, $tt_2 );
 
 		// Make sure they're correct.
 		$terms = wp_get_object_terms(
 			$post_id,
-			$this->taxonomy,
+			self::$taxonomy,
 			array(
 				'fields'  => 'names',
 				'orderby' => 'term_id',
@@ -430,4 +434,48 @@ public function test_non_existent_integers_should_be_ignored() {
 
 		$this->assertSame( array(), $tt_ids );
 	}
+
+	/**
+	 * Tests that empty values clear an object of all terms.
+	 *
+	 * @ticket 57923
+	 *
+	 * @dataProvider data_empty_value_should_clear_terms
+	 *
+	 * @param mixed $empty_value An empty value.
+	 */
+	public function test_empty_value_should_clear_terms( $empty_value ) {
+		$post_id = self::$post_ids[0];
+
+		// Assign some terms.
+		wp_set_object_terms( $post_id, self::$term_ids, self::$taxonomy );
+
+		// Make sure the terms are set.
+		$terms = wp_get_object_terms( $post_id, self::$taxonomy, array( 'fields' => 'names' ) );
+		$this->assertNotEmpty( $terms, 'Terms should initially be applied to post object.' );
+
+		// Remove terms by passing an empty value.
+		wp_set_object_terms( $post_id, $empty_value, self::$taxonomy );
+
+		// Make sure the terms have been removed.
+		$terms = wp_get_object_terms( $post_id, self::$taxonomy, array( 'fields' => 'names' ) );
+		$this->assertEmpty( $terms, 'An empty() value should clear terms from the post object.' );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_empty_value_should_clear_terms() {
+		return array(
+			'(bool) false' => array( false ),
+			'null'         => array( null ),
+			'(int) 0'      => array( 0 ),
+			'(float) 0.0'  => array( 0.0 ),
+			'empty string' => array( '' ),
+			'(string) 0'   => array( '0' ),
+			'empty array'  => array( array() ),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/theme/customHeader.php b/tests/phpunit/tests/theme/customHeader.php
index 21350deedaad1..f78f6fc2af326 100644
--- a/tests/phpunit/tests/theme/customHeader.php
+++ b/tests/phpunit/tests/theme/customHeader.php
@@ -88,7 +88,7 @@ public function test_get_header_image_from_theme_mod() {
 	 *
 	 * @ticket 56180
 	 *
-	 * @covers get_header_image
+	 * @covers ::get_header_image
 	 *
 	 * @dataProvider data_filter_header_image
 	 *
@@ -174,6 +174,82 @@ public function test_get_header_image_tag_with_registered_default_image_and_cust
 		$this->assertStringContainsString( sprintf( 'src="%s"', $custom ), $html );
 	}
 
+	/**
+	 * Tests default values of performance attributes for "get_header_image_tag".
+	 *
+	 * @ticket 58680
+	 */
+	public function test_get_header_image_tag_with_default_performance_attributes() {
+		$this->add_theme_support(
+			array(
+				'default-image' => 'http://localhost/default-header.jpg',
+				'width'         => 60,
+				'height'        => 60,
+			)
+		);
+
+		add_filter(
+			'wp_min_priority_img_pixels',
+			static function() {
+				return 2500; // 50*50=2500
+			}
+		);
+
+		wp_high_priority_element_flag( true );
+
+		$html = get_header_image_tag();
+		$this->assertStringNotContainsString( ' loading="lazy"', $html );
+		$this->assertStringContainsString( ' fetchpriority="high"', $html );
+		$this->assertStringContainsString( ' decoding="async"', $html );
+	}
+
+	/**
+	 * Tests custom values of performance attributes for "get_header_image_tag".
+	 *
+	 * @ticket 58680
+	 */
+	public function test_get_header_image_tag_with_custom_performance_attributes() {
+		$this->add_theme_support(
+			array(
+				'default-image' => 'http://localhost/default-header.jpg',
+				'width'         => 500,
+				'height'        => 500,
+			)
+		);
+
+		$html = get_header_image_tag(
+			array(
+				'fetchpriority' => '',
+				'decoding'      => '',
+			)
+		);
+		$this->assertStringNotContainsString( ' fetchpriority="high"', $html );
+		$this->assertStringNotContainsString( ' decoding="async"', $html );
+	}
+
+	/**
+	 * Tests custom lazy loading for "get_header_image_tag".
+	 *
+	 * @ticket 58680
+	 */
+	public function test_get_header_image_tag_with_custom_lazy_loading() {
+		$this->add_theme_support(
+			array(
+				'default-image' => 'http://localhost/default-header.jpg',
+				'width'         => 500,
+				'height'        => 500,
+			)
+		);
+
+		$html = get_header_image_tag(
+			array(
+				'loading' => 'lazy',
+			)
+		);
+		$this->assertStringNotContainsString( ' fetchpriority="high"', $html );
+		$this->assertStringContainsString( ' loading="lazy"', $html );
+	}
+
 	public function test_get_custom_header_markup_without_registered_default_image() {
 		$this->add_theme_support();
 
diff --git a/tests/phpunit/tests/theme/themeDir.php b/tests/phpunit/tests/theme/themeDir.php
index 29fbbd392f05a..ea721e5a4494c 100644
--- a/tests/phpunit/tests/theme/themeDir.php
+++ b/tests/phpunit/tests/theme/themeDir.php
@@ -163,6 +163,7 @@ public function test_theme_list() {
 		$theme_names = array_keys( $themes );
 		$expected    = array(
 			'WordPress Default',
+			'Default Child Theme with no theme.json',
 			'Sandbox',
 			'Stylesheet Only',
 			'My Theme',
@@ -177,7 +178,10 @@ public function test_theme_list() {
 			'REST Theme',
 			'Block Theme',
 			'Block Theme Child Theme',
+			'Block Theme Child with no theme.json',
 			'Block Theme Child Theme With Fluid Typography',
+			'Block Theme Child Theme With Fluid Typography Config',
+			'Block Theme Non Latin',
 			'Block Theme [0.4.0]',
 			'Block Theme [1.0.0] in subdirectory',
 			'Block Theme Deprecated Path',
diff --git a/tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php b/tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php
index 6d55f24ec9988..02ae7e0253e2b 100644
--- a/tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php
+++ b/tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php
@@ -139,6 +139,88 @@ public function test_blocks_inline_styles_get_rendered() {
 		);
 	}
 
+	/**
+	 * @ticket 57868
+	 */
+	public function test_third_party_blocks_inline_styles_for_elements_get_rendered_when_per_block() {
+		$this->set_up_third_party_block();
+		add_filter( 'should_load_separate_core_block_assets', '__return_true' );
+
+		wp_register_style( 'global-styles', false, array(), true, true );
+		wp_enqueue_style( 'global-styles' );
+		wp_add_global_styles_for_blocks();
+
+		$actual = get_echo( 'wp_print_styles' );
+
+		$this->assertStringContainsString(
+			'.wp-block-my-third-party-block cite{color: white;}',
+			$actual
+		);
+	}
+
+	/**
+	 * @ticket 57868
+	 */
+	public function test_third_party_blocks_inline_styles_for_elements_get_rendered() {
+		wp_register_style( 'global-styles', false, array(), true, true );
+		wp_enqueue_style( 'global-styles' );
+		wp_add_global_styles_for_blocks();
+
+		$actual = get_echo( 'wp_print_styles' );
+
+		$this->assertStringContainsString(
+			'.wp-block-my-third-party-block cite{color: white;}',
+			$actual
+		);
+	}
+
+	/**
+	 * @ticket 57868
+	 *
+	 * @dataProvider data_wp_get_block_name_from_theme_json_path
+	 *
+	 * @param array  $path     An array of keys describing the path to a property in theme.json.
+	 * @param string $expected The expected block name.
+	 */
+	public function test_wp_get_block_name_from_theme_json_path( $path, $expected ) {
+		$block_name = wp_get_block_name_from_theme_json_path( $path );
+		$this->assertSame( $expected, $block_name );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_wp_get_block_name_from_theme_json_path() {
+		return array(
+			'core block styles'             => array(
+				array( 'styles', 'blocks', 'core/navigation' ),
+				'core/navigation',
+			),
+			'core block element styles'     => array(
+				array( 'styles', 'blocks', 'core/navigation', 'elements', 'link' ),
+				'core/navigation',
+			),
+			'custom block styles'           => array(
+				array( 'styles', 'blocks', 'my/third-party-block' ),
+				'my/third-party-block',
+			),
+			'custom block element styles'   => array(
+				array( 'styles', 'blocks', 'my/third-party-block', 'elements', 'cite' ),
+				'my/third-party-block',
+			),
+			'custom block wrong format'     => array(
+				array( 'styles', 'my/third-party-block' ),
+				'',
+			),
+			'invalid path but works for BC' => array(
+				array( 'something', 'core/image' ),
+				'core/image',
+			),
+		);
+	}
+
 	private function set_up_third_party_block() {
 		switch_theme( 'block-theme' );
 
diff --git a/tests/phpunit/tests/theme/wpEnqueueStoredStyles.php b/tests/phpunit/tests/theme/wpEnqueueStoredStyles.php
new file mode 100644
index 0000000000000..37e1a920a741e
--- /dev/null
+++ b/tests/phpunit/tests/theme/wpEnqueueStoredStyles.php
@@ -0,0 +1,72 @@
+<?php
+
+require_once __DIR__ . '/base.php';
+
+/**
+ * Tests wp_enqueue_stored_styles().
+ *
+ * @group themes
+ *
+ * @covers ::wp_enqueue_stored_styles
+ */
+class Tests_Themes_WpEnqueueStoredStyles extends WP_Theme_UnitTestCase {
+
+	/**
+	 * Tests that stored CSS is enqueued.
+	 *
+	 * @ticket 56467
+	 */
+	public function test_should_enqueue_stored_styles() {
+		$core_styles_to_enqueue = array(
+			array(
+				'selector'     => '.saruman',
+				'declarations' => array(
+					'color'        => 'white',
+					'height'       => '100px',
+					'border-style' => 'solid',
+				),
+			),
+		);
+
+		// Enqueues a block supports (core styles).
+		wp_style_engine_get_stylesheet_from_css_rules(
+			$core_styles_to_enqueue,
+			array(
+				'context' => 'block-supports',
+			)
+		);
+
+		$my_styles_to_enqueue = array(
+			array(
+				'selector'     => '.gandalf',
+				'declarations' => array(
+					'color'        => 'grey',
+					'height'       => '90px',
+					'border-style' => 'dotted',
+				),
+			),
+		);
+
+		// Enqueues some other styles.
+		wp_style_engine_get_stylesheet_from_css_rules(
+			$my_styles_to_enqueue,
+			array(
+				'context' => 'my-styles',
+			)
+		);
+
+		wp_enqueue_stored_styles( array( 'prettify' => false ) );
+
+		$this->assertSame(
+			array( '.saruman{color:white;height:100px;border-style:solid;}' ),
+			wp_styles()->registered['core-block-supports']->extra['after'],
+			'Registered styles with handle of "core-block-supports" do not match expected value from Style Engine store.'
+		);
+
+		$this->assertSame(
+			array( '.gandalf{color:grey;height:90px;border-style:dotted;}' ),
+			wp_styles()->registered['wp-style-engine-my-styles']->extra['after'],
+			'Registered styles with handle of "wp-style-engine-my-styles" do not match expected value from the Style Engine store.'
+		);
+	}
+}
diff --git a/tests/phpunit/tests/theme/wpGetBlockCssSelector.php b/tests/phpunit/tests/theme/wpGetBlockCssSelector.php
new file mode 100644
index 0000000000000..43376dbe57e15
--- /dev/null
+++ b/tests/phpunit/tests/theme/wpGetBlockCssSelector.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * Tests wp_get_block_css_selector().
+ *
+ * @since 6.3.0
+ *
+ * @group themes
+ *
+ * @covers ::wp_get_block_css_selector
+ */
+
+class Tests_Theme_WpGetBlockCssSelector extends WP_Theme_UnitTestCase {
+	private $test_block_name;
+
+	public function set_up() {
+		parent::set_up();
+		$this->test_block_name = null;
+	}
+
+	public function tear_down() {
+		unregister_block_type( $this->test_block_name );
+		$this->test_block_name = null;
+		parent::tear_down();
+	}
+
+	private function register_test_block( $name, $selectors = null, $supports = null ) {
+		$this->test_block_name = $name;
+
+		return register_block_type(
+			$this->test_block_name,
+			array(
+				'api_version' => 2,
+				'attributes'  => array(),
+				'selectors'   => $selectors,
+				'supports'    => $supports,
+			)
+		);
+	}
+
+	/**
+	* @ticket 58586
+	*/
+	public function test_get_root_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/block-with-selectors',
+			array( 'root' => '.wp-custom-block-class' )
+		);
+
+		$selector = wp_get_block_css_selector( $block_type );
+		$this->assertEquals( '.wp-custom-block-class', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_get_root_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/block-without-selectors',
+			null,
+			array( '__experimentalSelector' => '.experimental-selector' )
+		);
+
+		$selector = wp_get_block_css_selector( $block_type );
+		$this->assertEquals( '.experimental-selector', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_default_root_selector_generation_for_core_block() {
+		$block_type = self::register_test_block(
+			'core/without-selectors-or-supports',
+			null,
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type );
+		$this->assertEquals( '.wp-block-without-selectors-or-supports', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_default_root_selector_generation() {
+		$block_type = self::register_test_block(
+			'test/without-selectors-or-supports',
+			null,
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type );
+		$this->assertEquals( '.wp-block-test-without-selectors-or-supports', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_get_feature_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/feature-selector',
+			array( 'typography' => array( 'root' => '.typography' ) ),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( '.typography', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_get_feature_selector_via_selectors_api_shorthand_property() {
+		$block_type = self::register_test_block(
+			'test/shorthand-feature-selector',
+			array( 'typography' => '.typography' ),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( '.typography', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_no_feature_level_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/null-feature-selector',
+			array( 'root' => '.fallback-root-selector' ),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( null, $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_fallback_feature_level_selector_via_selectors_api_to_generated_class() {
+		$block_type = self::register_test_block(
+			'test/fallback-feature-selector',
+			array(),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
+		$this->assertEquals( '.wp-block-test-fallback-feature-selector', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_fallback_feature_level_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/fallback-feature-selector',
+			array( 'root' => '.fallback-root-selector' ),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
+		$this->assertEquals( '.fallback-root-selector', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_get_feature_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/experimental-feature-selector',
+			null,
+			array(
+				'typography' => array(
+					'__experimentalSelector' => '.experimental-typography',
+				),
+			)
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( '.wp-block-test-experimental-feature-selector .experimental-typography', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_fallback_feature_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/fallback-feature-selector',
+			null,
+			array()
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography', true );
+		$this->assertEquals( '.wp-block-test-fallback-feature-selector', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_no_feature_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/null-experimental-feature-selector',
+			null,
+			array()
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( null, $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_get_subfeature_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/subfeature-selector',
+			array(
+				'typography' => array(
+					'textDecoration' => '.root .typography .text-decoration',
+				),
+			),
+			null
+		);
+
+		$selector = wp_get_block_css_selector(
+			$block_type,
+			array( 'typography', 'textDecoration' )
+		);
+
+		$this->assertEquals( '.root .typography .text-decoration', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_fallback_subfeature_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/subfeature-selector',
+			array(
+				'typography' => array( 'root' => '.root .typography' ),
+			),
+			null
+		);
+
+		$selector = wp_get_block_css_selector(
+			$block_type,
+			array( 'typography', 'textDecoration' ),
+			true
+		);
+
+		$this->assertEquals( '.root .typography', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_no_subfeature_level_selector_via_selectors_api() {
+		$block_type = self::register_test_block(
+			'test/null-subfeature-selector',
+			array(),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, array( 'typography', 'fontSize' ) );
+		$this->assertEquals( null, $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_fallback_subfeature_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/fallback-subfeature-selector',
+			null,
+			array()
+		);
+
+		$selector = wp_get_block_css_selector(
+			$block_type,
+			array( 'typography', 'fontSize' ),
+			true
+		);
+		$this->assertEquals( '.wp-block-test-fallback-subfeature-selector', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_no_subfeature_selector_via_experimental_property() {
+		$block_type = self::register_test_block(
+			'test/null-experimental-subfeature-selector',
+			null,
+			array()
+		);
+
+		$selector = wp_get_block_css_selector(
+			$block_type,
+			array( 'typography', 'fontSize' )
+		);
+		$this->assertEquals( null, $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_empty_target_returns_null() {
+		$block_type = self::register_test_block(
+			'test/null-experimental-subfeature-selector',
+			null,
+			array()
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, array() );
+		$this->assertEquals( null, $selector );
+
+		$selector = wp_get_block_css_selector( $block_type, '' );
+		$this->assertEquals( null, $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_string_targets_for_features() {
+		$block_type = self::register_test_block(
+			'test/target-types-for-features',
+			array( 'typography' => '.found' ),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography' );
+		$this->assertEquals( '.found', $selector );
+
+		$selector = wp_get_block_css_selector( $block_type, array( 'typography' ) );
+		$this->assertEquals( '.found', $selector );
+	}
+
+	/**
+	 * @ticket 58586
+	 */
+	public function test_string_targets_for_subfeatures() {
+		$block_type = self::register_test_block(
+			'test/target-types-for-features',
+			array(
+				'typography' => array( 'fontSize' => '.found' ),
+			),
+			null
+		);
+
+		$selector = wp_get_block_css_selector( $block_type, 'typography.fontSize' );
+		$this->assertEquals( '.found', $selector );
+
+		$selector = wp_get_block_css_selector( $block_type, array( 'typography', 'fontSize' ) );
+		$this->assertEquals( '.found', $selector );
+	}
+}
+
diff --git a/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php b/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php
index 710f77d0caf0d..40d87940b4f35 100644
--- a/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php
+++ b/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php
@@ -1,273 +1,287 @@
 <?php
 
+require_once __DIR__ . '/base.php';
+
 /**
  * Tests wp_get_global_stylesheet().
  *
  * @group themes
+ *
+ * @covers ::wp_get_global_stylesheet
  */
-class Tests_Theme_wpGetGlobalStylesheet extends WP_UnitTestCase {
+class Tests_Theme_WpGetGlobalStylesheet extends WP_Theme_UnitTestCase {
 
 	/**
-	 * Theme root directory.
+	 * Flag to indicate whether to remove 'editor-font-sizes' theme support at tear_down().
 	 *
-	 * @var string
+	 * @var bool
 	 */
-	private $theme_root;
+	private $remove_theme_support_at_teardown = false;
 
 	/**
-	 * Original theme directory.
+	 * Flag to indicate whether to switch back to the default theme at tear down.
 	 *
-	 * @var string
+	 * @var bool
 	 */
-	private $orig_theme_dir;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
-		$this->theme_root     = realpath( DIR_TESTDATA . '/themedir1' );
-
-		// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
-		$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
-
-		// Set up the new root.
-		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-		add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-		add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-		// Clear caches.
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
-	}
+	private $switch_to_default_theme_at_teardown = false;
 
 	public function tear_down() {
-		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-
-		// Clear up the filters to modify the theme root.
-		remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-		remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-		remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
+		// Reset the theme support.
+		if ( $this->remove_theme_support_at_teardown ) {
+			$this->remove_theme_support_at_teardown = false;
+			remove_theme_support( 'editor-font-sizes' );
+		}
 
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
+		if ( $this->switch_to_default_theme_at_teardown ) {
+			$this->switch_to_default_theme_at_teardown = false;
+			switch_theme( WP_DEFAULT_THEME );
+		}
 
 		parent::tear_down();
 	}
 
 	/**
-	 * Cleans up global scope.
+	 * @ticket 54782
 	 *
-	 * @global WP_Styles $wp_styles
+	 * @dataProvider data_should_conditionally_include_font_sizes
+	 *
+	 * @param array  $expected            Expected CSS for each font size.
+	 * @param string $theme               The theme to switch to / use.
+	 * @param array  $types               Optional. Types of styles to load. Default empty array.
+	 * @param bool   $classic_has_presets Optional. Whether to apply presets for classic theme tests. Default false.
 	 */
-	public function clean_up_global_scope() {
-		global $wp_styles;
-		parent::clean_up_global_scope();
-		$wp_styles = null;
-	}
+	public function test_should_conditionally_include_font_sizes( array $expected, $theme, array $types = array(), $classic_has_presets = false ) {
+		$this->maybe_switch_theme( $theme );
+		$this->add_custom_font_sizes( $classic_has_presets );
 
-	public function filter_set_theme_root() {
-		return $this->theme_root;
-	}
-
-	public function test_block_theme_using_variables() {
-		switch_theme( 'block-theme' );
+		$styles = wp_get_global_stylesheet( $types );
 
-		$styles = wp_get_global_stylesheet( array( 'variables' ) );
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
+		$this->assertStringContainsString( $expected['small'], $styles, 'The small font size should be included.' );
+		$this->assertStringContainsString( $expected['medium'], $styles, 'The medium font size should be included.' );
+		$this->assertStringContainsString( $expected['large'], $styles, 'The large font size should be included.' );
+		$this->assertStringContainsString( $expected['x-large'], $styles, 'The x-large font size should be included.' );
 
-		switch_theme( WP_DEFAULT_THEME );
+		if ( 'default' !== $theme ) {
+			$this->assertStringContainsString( $expected['custom'], $styles, 'The custom font size should be included.' );
+		}
 	}
 
-	public function test_block_theme_using_presets() {
-		switch_theme( 'block-theme' );
-
-		$styles = wp_get_global_stylesheet( array( 'presets' ) );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is not present' );
-
-		switch_theme( WP_DEFAULT_THEME );
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_conditionally_include_font_sizes() {
+		return array(
+			'block theme using defaults'                   => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+					'custom'  => '--wp--preset--font-size--custom: 100px;',
+				),
+				'theme'    => 'block-theme',
+			),
+			'block theme using variables'                  => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+					'custom'  => '--wp--preset--font-size--custom: 100px;',
+				),
+				'theme'    => 'block-theme',
+				'types'    => array( 'variables' ),
+			),
+			'classic theme without presets using defaults' => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+				),
+				'theme'    => 'default',
+			),
+			'classic theme without presets using variables' => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+				),
+				'theme'    => 'default',
+				'types'    => array( 'variables' ),
+			),
+			'classic theme with presets using defaults'    => array(
+				'expected'            => array(
+					'small'   => '--wp--preset--font-size--small: 18px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 26.25px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+				),
+				'theme'               => 'default',
+				'types'               => array(),
+				'classic_has_presets' => true,
+			),
+			'classic theme with presets using variables'   => array(
+				'expected'            => array(
+					'small'   => '--wp--preset--font-size--small: 18px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 26.25px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+				),
+				'theme'               => 'default',
+				'types'               => array( 'variables' ),
+				'classic_has_presets' => true,
+			),
+		);
 	}
 
-	public function test_block_theme_using_defaults() {
-		switch_theme( 'block-theme' );
-
-		$styles = wp_get_global_stylesheet();
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--custom: 100px;', $styles, 'custom font size is 100px' );
-
-		switch_theme( WP_DEFAULT_THEME );
-	}
+	/**
+	 * @ticket 54782
+	 *
+	 * @dataProvider data_should_not_conditionally_include_font_sizes
+	 *
+	 * @param array  $expected            Expected CSS for each font size.
+	 * @param string $theme               The theme to switch to / use.
+	 * @param array  $types               Optional. Types of styles to load. Default empty array.
+	 * @param bool   $classic_has_presets Optional. Whether to apply presets for classic theme tests. Default false.
+	 */
+	public function test_should_not_conditionally_include_font_sizes( array $expected, $theme, array $types = array(), $classic_has_presets = false ) {
+		$this->maybe_switch_theme( $theme );
+		$this->add_custom_font_sizes( $classic_has_presets );
 
-	public function test_variables_in_classic_theme_with_no_presets_using_variables() {
-		$styles = wp_get_global_stylesheet( array( 'variables' ) );
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
-	}
+		$styles = wp_get_global_stylesheet( $types );
 
-	public function test_variables_in_classic_theme_with_no_presets_using_presets() {
-		$styles = wp_get_global_stylesheet( array( 'presets' ) );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
-	}
+		$this->assertStringNotContainsString( $expected['small'], $styles, 'The small font size should not be included.' );
+		$this->assertStringNotContainsString( $expected['medium'], $styles, 'The medium font size should not be included.' );
+		$this->assertStringNotContainsString( $expected['large'], $styles, 'The large font size should not be included.' );
+		$this->assertStringNotContainsString( $expected['x-large'], $styles, 'The x-large font size should not be included.' );
 
-	public function test_variables_in_classic_theme_with_no_presets_using_defaults() {
-		$styles = wp_get_global_stylesheet();
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 13px', $styles, 'small font size is 13px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 36px', $styles, 'large font size is 36px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
+		if ( 'default' !== $theme ) {
+			$this->assertStringNotContainsString( $expected['custom'], $styles, 'The custom font size should not be included.' );
+		}
 	}
 
-	public function test_variables_in_classic_theme_with_presets_using_variables() {
-		add_theme_support(
-			'editor-font-sizes',
-			array(
-				array(
-					'name' => 'Small',
-					'size' => 18,
-					'slug' => 'small',
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_not_conditionally_include_font_sizes() {
+		return array(
+			'block theme using presets'                   => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
+					'custom'  => '--wp--preset--font-size--custom: 100px;',
+				),
+				'theme'    => 'block-theme',
+				'types'    => array( 'presets' ),
+			),
+			'classic theme without presets using presets' => array(
+				'expected' => array(
+					'small'   => '--wp--preset--font-size--small: 13px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 36px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
 				),
-				array(
-					'name' => 'Large',
-					'size' => 26.25,
-					'slug' => 'large',
+				'theme'    => 'default',
+				'types'    => array( 'presets' ),
+			),
+			'classic theme with presets using presets'    => array(
+				'expected'            => array(
+					'small'   => '--wp--preset--font-size--small: 18px',
+					'medium'  => '--wp--preset--font-size--medium: 20px',
+					'large'   => '--wp--preset--font-size--large: 26.25px',
+					'x-large' => '--wp--preset--font-size--x-large: 42px',
 				),
-			)
+				'theme'               => 'default',
+				'types'               => array( 'presets' ),
+				'classic_has_presets' => true,
+			),
 		);
-
-		$styles = wp_get_global_stylesheet( array( 'variables' ) );
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is 42px' );
-
-		remove_theme_support( 'editor-font-sizes' );
 	}
 
-	public function test_variables_in_classic_theme_with_presets_using_presets() {
-		add_theme_support(
-			'editor-font-sizes',
-			array(
-				array(
-					'name' => 'Small',
-					'size' => 18,
-					'slug' => 'small',
-				),
-				array(
-					'name' => 'Large',
-					'size' => 26.25,
-					'slug' => 'large',
-				),
-			)
-		);
+	/**
+	 * @ticket 56970
+	 */
+	public function test_switching_themes_should_recalculate_stylesheet() {
+		$expected = '--wp--preset--font-size--custom: 100px;';
 
-		$styles = wp_get_global_stylesheet( array( 'presets' ) );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is not present' );
-		$this->assertStringNotContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'x-large font size is not present' );
+		$stylesheet_for_default_theme = wp_get_global_stylesheet();
+		$this->assertStringNotContainsString( $expected, $stylesheet_for_default_theme, 'Custom font size (100px) should not present for default theme' );
 
-		remove_theme_support( 'editor-font-sizes' );
+		$this->maybe_switch_theme( 'block-theme' );
+		$stylesheet_for_block_theme = wp_get_global_stylesheet();
+		$this->assertStringContainsString( $expected, $stylesheet_for_block_theme, 'Custom font size (100px) should be present for block theme' );
 	}
 
-	public function test_variables_in_classic_theme_with_presets_using_defaults() {
-		add_theme_support(
-			'editor-font-sizes',
-			array(
-				array(
-					'name' => 'Small',
-					'size' => 18,
-					'slug' => 'small',
-				),
-				array(
-					'name' => 'Large',
-					'size' => 26.25,
-					'slug' => 'large',
-				),
-			)
-		);
+	/**
+	 * Tests that the function relies on the development mode for whether to use caching.
+	 *
+	 * @ticket 57487
+	 */
+	public function test_caching_is_used_when_developing_theme() {
+		global $_wp_tests_development_mode;
 
-		$styles = wp_get_global_stylesheet();
-		$this->assertStringContainsString( '--wp--preset--font-size--small: 18px', $styles, 'small font size is 18px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--medium: 20px', $styles, 'medium font size is 20px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--large: 26.25px', $styles, 'large font size is 26.25px' );
-		$this->assertStringContainsString( '--wp--preset--font-size--x-large: 42px', $styles, 'small font size is 42px' );
+		$this->maybe_switch_theme( 'block-theme' );
 
-		remove_theme_support( 'editor-font-sizes' );
+		// Store CSS in cache.
+		$css = '.my-class { display: block; }';
+		wp_cache_set( 'wp_get_global_stylesheet', $css, 'theme_json' );
+
+		// By default, caching should be used, so the above value will be returned.
+		$_wp_tests_development_mode = '';
+		$this->assertSame( $css, wp_get_global_stylesheet(), 'Caching was not used despite development mode disabled' );
+
+		// When the development mode is set to 'theme', caching should not be used.
+		$_wp_tests_development_mode = 'theme';
+		$this->assertNotSame( $css, wp_get_global_stylesheet(), 'Caching was used despite theme development mode' );
 	}
 
 	/**
-	 * Tests that stored CSS is enqueued.
-	 *
-	 * @ticket 56467
+	 * Adds the 'editor-font-sizes' theme support with custom font sizes.
 	 *
-	 * @covers ::wp_enqueue_stored_styles
+	 * @param bool $add_theme_support Whether to add the theme support.
+	 * @param int  $small             Optional. Small font size in pixels. Default 18.
+	 * @param int  $large             Optional. Large font size in pixels. Default 26.25.
 	 */
-	public function test_should_enqueue_stored_styles() {
-		$core_styles_to_enqueue = array(
-			array(
-				'selector'     => '.saruman',
-				'declarations' => array(
-					'color'        => 'white',
-					'height'       => '100px',
-					'border-style' => 'solid',
-				),
-			),
-		);
+	private function add_custom_font_sizes( $add_theme_support, $small = 18, $large = 26.25 ) {
+		if ( ! $add_theme_support ) {
+			return;
+		}
 
-		// Enqueues a block supports (core styles).
-		wp_style_engine_get_stylesheet_from_css_rules(
-			$core_styles_to_enqueue,
+		$args = array(
 			array(
-				'context' => 'block-supports',
-			)
-		);
-
-		$my_styles_to_enqueue = array(
-			array(
-				'selector'     => '.gandalf',
-				'declarations' => array(
-					'color'        => 'grey',
-					'height'       => '90px',
-					'border-style' => 'dotted',
-				),
+				'name' => 'Small',
+				'size' => $small,
+				'slug' => 'small',
 			),
-		);
-
-		// Enqueues some other styles.
-		wp_style_engine_get_stylesheet_from_css_rules(
-			$my_styles_to_enqueue,
 			array(
-				'context' => 'my-styles',
-			)
+				'name' => 'Large',
+				'size' => $large,
+				'slug' => 'large',
+			),
 		);
+		add_theme_support( 'editor-font-sizes', $args );
+		$this->remove_theme_support_at_teardown = true;
+	}
 
-		wp_enqueue_stored_styles( array( 'prettify' => false ) );
-
-		$this->assertSame(
-			array( '.saruman{color:white;height:100px;border-style:solid;}' ),
-			wp_styles()->registered['core-block-supports']->extra['after'],
-			'Registered styles with handle of "core-block-supports" do not match expected value from Style Engine store.'
-		);
+	/**
+	 * Switches the theme when not the 'default' theme.
+	 *
+	 * @param string $theme Theme name to switch to.
+	 */
+	private function maybe_switch_theme( $theme ) {
+		if ( 'default' === $theme ) {
+			return;
+		}
 
-		$this->assertSame(
-			array( '.gandalf{color:grey;height:90px;border-style:dotted;}' ),
-			wp_styles()->registered['wp-style-engine-my-styles']->extra['after'],
-			'Registered styles with handle of "wp-style-engine-my-styles" do not match expected value from the Style Engine store.'
-		);
+		switch_theme( $theme );
+		$this->switch_to_default_theme_at_teardown = true;
 	}
 }
diff --git a/tests/phpunit/tests/theme/wpTheme.php b/tests/phpunit/tests/theme/wpTheme.php
index 0ded32d77b138..bd04148721761 100644
--- a/tests/phpunit/tests/theme/wpTheme.php
+++ b/tests/phpunit/tests/theme/wpTheme.php
@@ -1,5 +1,5 @@
 <?php
-/**
+
 /**
  * Test WP_Theme class.
  *
@@ -112,6 +112,20 @@ public function test_new_WP_Theme_subdir_bad_root() {
 		$this->assertSame( 'subdir/theme2', $theme->get_template() );
 	}
 
+	/**
+	 * Tests that WP_Theme::__construct() handles a numeric theme directory as a string.
+	 *
+	 * @ticket 54645
+	 *
+	 * @covers WP_Theme::__construct
+	 */
+	public function test_new_WP_Theme_numeric_theme_directory() {
+		$theme = new WP_Theme( 1234, $this->theme_root );
+
+		$this->assertSame( '1234', $theme->get_stylesheet(), 'The stylesheet property should be a string.' );
+		$this->assertSame( '1234', $theme->get_template(), 'The template property should be a string.' );
+	}
+
 	/**
 	 * @ticket 21749
 	 */
@@ -275,6 +289,63 @@ public function test_is_block_theme( $theme_dir, $expected ) {
 		$this->assertSame( $expected, $theme->is_block_theme() );
 	}
 
+	/**
+	 * @ticket 57114
+	 *
+	 * @covers WP_Theme::is_block_theme
+	 *
+	 * @dataProvider data_is_block_theme
+	 */
+	public function test_is_block_theme_property( $theme_dir, $expected ) {
+		$theme = new WP_Theme( $theme_dir, $this->theme_root );
+		$theme->is_block_theme();
+		$reflection          = new ReflectionClass( $theme );
+		$reflection_property = $reflection->getProperty( 'block_theme' );
+		$reflection_property->setAccessible( true );
+
+		$this->assertSame( $expected, $reflection_property->getValue( $theme ) );
+	}
+
+	/**
+	 * @ticket 57114
+	 *
+	 * @covers WP_Theme::is_block_theme
+	 * @covers WP_Theme::cache_get
+	 */
+	public function test_is_block_theme_check_cache() {
+		$filter = new MockAction();
+		add_filter( 'theme_file_path', array( $filter, 'filter' ) );
+
+		$theme1 = new WP_Theme( 'block-theme', $this->theme_root );
+		// First run.
+		$this->assertTrue( $theme1->is_block_theme(), 'is_block_theme should return true on first run' );
+
+		$theme2 = new WP_Theme( 'block-theme', $this->theme_root );
+		// Second run.
+		$this->assertTrue( $theme2->is_block_theme(), 'is_block_theme should return true on second run' );
+		$this->assertCount( 0, $filter->get_events(), 'Should only be 0, as second run should be cached' );
+	}
+
+	/**
+	 * @ticket 57114
+	 *
+	 * @covers WP_Theme::is_block_theme
+	 * @covers WP_Theme::cache_delete
+	 */
+	public function test_is_block_theme_delete_cache() {
+		$filter = new MockAction();
+		add_filter( 'theme_file_path', array( $filter, 'filter' ) );
+
+		$theme = new WP_Theme( 'block-theme', $this->theme_root );
+		// First run.
+		$this->assertTrue( $theme->is_block_theme(), 'is_block_theme should return true on first run' );
+		// Clear cache.
+		$theme->cache_delete();
+		// Second run.
+		$this->assertTrue( $theme->is_block_theme(), 'is_block_theme should return true on second run' );
+		$this->assertCount( 2, $filter->get_events(), 'Should only be 4, as second run should not be cached' );
+	}
+
 	/**
 	 * Test get_files for an existing theme.
 	 *
diff --git a/tests/phpunit/tests/theme/wpThemeHasThemeJson.php b/tests/phpunit/tests/theme/wpThemeHasThemeJson.php
new file mode 100644
index 0000000000000..636886c03bbcc
--- /dev/null
+++ b/tests/phpunit/tests/theme/wpThemeHasThemeJson.php
@@ -0,0 +1,72 @@
+<?php
+
+require_once __DIR__ . '/base.php';
+
+/**
+ * Tests wp_theme_has_theme_json().
+ *
+ * @group theme_json
+ *
+ * @covers ::wp_theme_has_theme_json
+ */
+class Tests_Theme_WpThemeHasThemeJson extends WP_Theme_UnitTestCase {
+
+	/**
+	 * @ticket 56975
+	 *
+	 * @dataProvider data_theme_has_theme_json_reports_correctly
+	 *
+	 * @param string $theme    The slug of the theme to switch to.
+	 * @param bool   $expected The expected result.
+	 */
+	public function test_theme_has_theme_json_reports_correctly( $theme, $expected ) {
+		switch_theme( $theme );
+		$this->assertSame( $expected, wp_theme_has_theme_json() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_theme_has_theme_json_reports_correctly() {
+		return array(
+			'a theme with theme.json'       => array(
+				'theme'    => 'block-theme',
+				'expected' => true,
+			),
+			'a theme without theme.json'    => array(
+				'theme'    => 'default',
+				'expected' => false,
+			),
+			'a child theme with theme.json' => array(
+				'theme'    => 'block-theme-child',
+				'expected' => true,
+			),
+			'a child theme without theme.json and parent theme with theme.json' => array(
+				'theme'    => 'block-theme-child-no-theme-json',
+				'expected' => true,
+			),
+			'a child theme without theme.json and parent theme without theme.json' => array(
+				'theme'    => 'default-child-no-theme-json',
+				'expected' => false,
+			),
+		);
+	}
+
+	/**
+	 * @ticket 52991
+	 */
+	public function test_switching_themes_recalculates_support() {
+		// The "default" theme doesn't have theme.json support.
+		switch_theme( 'default' );
+		$default = wp_theme_has_theme_json();
+
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
+		$block_theme = wp_theme_has_theme_json();
+
+		$this->assertFalse( $default, 'The "default" theme should not report theme.json support.' );
+		$this->assertTrue( $block_theme, 'The block theme should report theme.json support.' );
+	}
+}
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 56b1bec0e138c..3388272a0b8e6 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -9,10 +9,41 @@
  * @since 5.8.0
  *
  * @group themes
+ *
+ * @covers WP_Theme_JSON
  */
-
 class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
 
+	/**
+	 * Administrator ID.
+	 *
+	 * @var int
+	 */
+	private static $administrator_id;
+
+	/**
+	 * User ID.
+	 *
+	 * @var int
+	 */
+	private static $user_id;
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		static::$administrator_id = self::factory()->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+
+		if ( is_multisite() ) {
+			grant_super_admin( self::$administrator_id );
+		}
+
+		static::$user_id = self::factory()->user->create();
+	}
+
 	/**
 	 * @ticket 52991
 	 * @ticket 54336
@@ -200,7 +231,7 @@ public function test_get_settings_presets_are_keyed_by_origin() {
 		$this->assertEqualSetsWithIndex( $expected_no_origin, $actual_no_origin );
 	}
 
-	function test_get_settings_appearance_true_opts_in() {
+	public function test_get_settings_appearance_true_opts_in() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
@@ -238,7 +269,16 @@ function test_get_settings_appearance_true_opts_in() {
 				'color'  => true,
 			),
 			'color'      => array(
-				'link' => true,
+				'link'    => true,
+				'heading' => true,
+				'button'  => true,
+				'caption' => true,
+			),
+			'dimensions' => array(
+				'minHeight' => true,
+			),
+			'position'   => array(
+				'sticky' => true,
 			),
 			'spacing'    => array(
 				'blockGap' => false,
@@ -262,7 +302,16 @@ function test_get_settings_appearance_true_opts_in() {
 						'color'  => true,
 					),
 					'color'      => array(
-						'link' => true,
+						'link'    => true,
+						'heading' => true,
+						'button'  => true,
+						'caption' => true,
+					),
+					'dimensions' => array(
+						'minHeight' => true,
+					),
+					'position'   => array(
+						'sticky' => true,
 					),
 					'spacing'    => array(
 						'blockGap' => false,
@@ -279,7 +328,7 @@ function test_get_settings_appearance_true_opts_in() {
 		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
-	function test_get_settings_appearance_false_does_not_opt_in() {
+	public function test_get_settings_appearance_false_does_not_opt_in() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
@@ -329,6 +378,7 @@ function test_get_settings_appearance_false_does_not_opt_in() {
 
 	/**
 	 * @ticket 54336
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_support_for_shorthand_and_longhand_values() {
 		$theme_json = new WP_Theme_JSON(
@@ -366,13 +416,14 @@ public function test_get_stylesheet_support_for_shorthand_and_longhand_values()
 			)
 		);
 
-		$styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-block-group{border-radius: 10px;margin: 1em;padding: 24px;}.wp-block-image{margin-bottom: 30px;padding-top: 15px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
+		$styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-group{border-radius: 10px;margin: 1em;padding: 24px;}.wp-block-image{margin-bottom: 30px;padding-top: 15px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
 		$this->assertSame( $styles, $theme_json->get_stylesheet() );
 		$this->assertSame( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}
 
 	/**
 	 * @ticket 54336
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_skips_disabled_protected_properties() {
 		$theme_json = new WP_Theme_JSON(
@@ -398,13 +449,15 @@ public function test_get_stylesheet_skips_disabled_protected_properties() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}:where(.wp-block-columns.is-layout-flex){gap: 2em;}:where(.wp-block-columns.is-layout-grid){gap: 2em;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 		$this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}
 
 	/**
 	 * @ticket 54336
+	 * @ticket 58548
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_renders_enabled_protected_properties() {
 		$theme_json = new WP_Theme_JSON(
@@ -423,7 +476,7 @@ public function test_get_stylesheet_renders_enabled_protected_properties() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1em; }body { --wp--style--block-gap: 1em; }';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1em; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1em;}:where(body .is-layout-grid) {gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 		$this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) );
 	}
@@ -432,6 +485,8 @@ public function test_get_stylesheet_renders_enabled_protected_properties() {
 	 * @ticket 53175
 	 * @ticket 54336
 	 * @ticket 56611
+	 * @ticket 58549
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet() {
 		$theme_json = new WP_Theme_JSON(
@@ -504,7 +559,7 @@ public function test_get_stylesheet() {
 						),
 					),
 					'blocks'   => array(
-						'core/group'     => array(
+						'core/group'        => array(
 							'color'    => array(
 								'gradient' => 'var:preset|gradient|custom-gradient',
 							),
@@ -522,7 +577,7 @@ public function test_get_stylesheet() {
 								'padding' => '24px',
 							),
 						),
-						'core/heading'   => array(
+						'core/heading'      => array(
 							'color'    => array(
 								'text' => '#123456',
 							),
@@ -538,7 +593,7 @@ public function test_get_stylesheet() {
 								),
 							),
 						),
-						'core/post-date' => array(
+						'core/post-date'    => array(
 							'color'    => array(
 								'text' => '#123456',
 							),
@@ -551,7 +606,12 @@ public function test_get_stylesheet() {
 								),
 							),
 						),
-						'core/image'     => array(
+						'core/post-excerpt' => array(
+							'typography' => array(
+								'textColumns' => 2,
+							),
+						),
+						'core/image'        => array(
 							'border'  => array(
 								'radius' => array(
 									'topLeft'     => '10px',
@@ -576,8 +636,8 @@ public function test_get_stylesheet() {
 			)
 		);
 
-		$variables = "body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--duotone--custom-duotone: url('#wp-duotone-custom-duotone');--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}";
-		$styles    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}h1,h2,h3,h4,h5,h6{color: #123456;}h1 a:where(:not(.wp-element-button)),h2 a:where(:not(.wp-element-button)),h3 a:where(:not(.wp-element-button)),h4 a:where(:not(.wp-element-button)),h5 a:where(:not(.wp-element-button)),h6 a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}.wp-block-image img, .wp-block-image .wp-block-image__crop-area{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}';
+		$variables = 'body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}';
+		$styles    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}';
 		$presets   = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-family{font-family: var(--wp--preset--font-family--small) !important;}.has-big-font-family{font-family: var(--wp--preset--font-family--big) !important;}';
 		$all       = $variables . $styles . $presets;
 		$this->assertSame( $all, $theme_json->get_stylesheet() );
@@ -612,7 +672,7 @@ public function test_get_stylesheet_preset_classes_work_with_compounded_selector
 		);
 
 		$this->assertSame(
-			'h1.has-white-color,h2.has-white-color,h3.has-white-color,h4.has-white-color,h5.has-white-color,h6.has-white-color{color: var(--wp--preset--color--white) !important;}h1.has-white-background-color,h2.has-white-background-color,h3.has-white-background-color,h4.has-white-background-color,h5.has-white-background-color,h6.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}h1.has-white-border-color,h2.has-white-border-color,h3.has-white-border-color,h4.has-white-border-color,h5.has-white-border-color,h6.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}',
+			'.wp-block-heading.has-white-color{color: var(--wp--preset--color--white) !important;}.wp-block-heading.has-white-background-color{background-color: var(--wp--preset--color--white) !important;}.wp-block-heading.has-white-border-color{border-color: var(--wp--preset--color--white) !important;}',
 			$theme_json->get_stylesheet( array( 'presets' ) )
 		);
 	}
@@ -620,6 +680,7 @@ public function test_get_stylesheet_preset_classes_work_with_compounded_selector
 	/**
 	 * @ticket 53175
 	 * @ticket 54336
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_preset_rules_come_after_block_rules() {
 		$theme_json = new WP_Theme_JSON(
@@ -651,7 +712,7 @@ public function test_get_stylesheet_preset_rules_come_after_block_rules() {
 			)
 		);
 
-		$styles    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-block-group{color: red;}';
+		$styles    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-group{color: red;}';
 		$presets   = '.wp-block-group.has-grey-color{color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.wp-block-group.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}';
 		$variables = '.wp-block-group{--wp--preset--color--grey: grey;}';
 		$all       = $variables . $styles . $presets;
@@ -710,6 +771,7 @@ public function test_get_stylesheet_generates_proper_classes_and_css_vars_from_s
 	/**
 	 * @ticket 53175
 	 * @ticket 54336
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_preset_values_are_marked_as_important() {
 		$theme_json = new WP_Theme_JSON(
@@ -744,13 +806,14 @@ public function test_get_stylesheet_preset_values_are_marked_as_important() {
 		);
 
 		$this->assertSame(
-			'body{--wp--preset--color--grey: grey;}body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }p{background-color: blue;color: red;font-size: 12px;line-height: 1.3;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}',
+			'body{--wp--preset--color--grey: grey;}body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}p{background-color: blue;color: red;font-size: 12px;line-height: 1.3;}.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}',
 			$theme_json->get_stylesheet()
 		);
 	}
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_handles_whitelisted_element_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON(
@@ -785,7 +848,7 @@ public function test_get_stylesheet_handles_whitelisted_element_pseudo_selectors
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
 
@@ -797,6 +860,7 @@ public function test_get_stylesheet_handles_whitelisted_element_pseudo_selectors
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_handles_only_pseudo_selector_rules_for_given_property() {
 		$theme_json = new WP_Theme_JSON(
@@ -827,7 +891,7 @@ public function test_get_stylesheet_handles_only_pseudo_selector_rules_for_given
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = 'a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
 
@@ -839,6 +903,7 @@ public function test_get_stylesheet_handles_only_pseudo_selector_rules_for_given
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_ignores_pseudo_selectors_on_non_whitelisted_elements() {
 		$theme_json = new WP_Theme_JSON(
@@ -869,7 +934,7 @@ public function test_get_stylesheet_ignores_pseudo_selectors_on_non_whitelisted_
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = 'h4{background-color: red;color: green;}';
 
@@ -881,6 +946,7 @@ public function test_get_stylesheet_ignores_pseudo_selectors_on_non_whitelisted_
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_ignores_non_whitelisted_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON(
@@ -911,7 +977,7 @@ public function test_get_stylesheet_ignores_non_whitelisted_pseudo_selectors() {
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;}';
 
@@ -924,6 +990,7 @@ public function test_get_stylesheet_ignores_non_whitelisted_pseudo_selectors() {
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_handles_priority_of_elements_vs_block_elements_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON(
@@ -962,7 +1029,7 @@ public function test_get_stylesheet_handles_priority_of_elements_vs_block_elemen
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = '.wp-block-group a:where(:not(.wp-element-button)){background-color: red;color: green;}.wp-block-group a:where(:not(.wp-element-button)):hover{background-color: green;color: red;font-size: 10em;text-transform: uppercase;}.wp-block-group a:where(:not(.wp-element-button)):focus{background-color: black;color: yellow;}';
 
@@ -974,6 +1041,7 @@ public function test_get_stylesheet_handles_priority_of_elements_vs_block_elemen
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_stylesheet_handles_whitelisted_block_level_element_pseudo_selectors() {
 		$theme_json = new WP_Theme_JSON(
@@ -1012,7 +1080,7 @@ public function test_get_stylesheet_handles_whitelisted_block_level_element_pseu
 			)
 		);
 
-		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 
 		$element_styles = 'a:where(:not(.wp-element-button)){background-color: red;color: green;}a:where(:not(.wp-element-button)):hover{background-color: green;color: red;}.wp-block-group a:where(:not(.wp-element-button)):hover{background-color: black;color: yellow;}';
 
@@ -1928,30 +1996,30 @@ public function test_remove_insecure_properties_removes_unsafe_styles() {
 			'version' => WP_Theme_JSON::LATEST_SCHEMA,
 			'styles'  => array(
 				'color'    => array(
-					'text' => 'var:preset|color|dark-red',
+					'text' => 'var(--wp--preset--color--dark-red)',
 				),
 				'elements' => array(
 					'link' => array(
 						'color' => array(
-							'text'       => 'var:preset|color|dark-pink',
-							'background' => 'var:preset|color|dark-red',
+							'text'       => 'var(--wp--preset--color--dark-pink)',
+							'background' => 'var(--wp--preset--color--dark-red)',
 						),
 					),
 				),
 				'blocks'   => array(
 					'core/image' => array(
 						'filter' => array(
-							'duotone' => 'var:preset|duotone|blue-red',
+							'duotone' => 'var(--wp--preset--duotone--blue-red)',
 						),
 					),
 					'core/group' => array(
 						'color'    => array(
-							'text' => 'var:preset|color|dark-gray',
+							'text' => 'var(--wp--preset--color--dark-gray)',
 						),
 						'elements' => array(
 							'link' => array(
 								'color' => array(
-									'text' => 'var:preset|color|dark-pink',
+									'text' => 'var(--wp--preset--color--dark-pink)',
 								),
 							),
 						),
@@ -2383,6 +2451,67 @@ public function test_remove_insecure_properties_applies_safe_styles() {
 		$this->assertEqualSetsWithIndex( $expected, $actual );
 	}
 
+	/**
+	 * @ticket 57321
+	 *
+	 * @covers WP_Theme_JSON::remove_insecure_properties
+	 */
+	public function test_remove_insecure_properties_should_allow_indirect_properties() {
+		$actual = WP_Theme_JSON::remove_insecure_properties(
+			array(
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'   => array(
+					'spacing' => array(
+						'blockGap' => '3em',
+					),
+					'blocks'  => array(
+						'core/social-links' => array(
+							'spacing' => array(
+								'blockGap' => array(
+									'left' => '2em',
+									'top'  => '1em',
+								),
+							),
+						),
+					),
+				),
+				'settings' => array(
+					'layout' => array(
+						'contentSize' => '800px',
+						'wideSize'    => '1000px',
+					),
+				),
+			)
+		);
+
+		$expected = array(
+			'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+			'styles'   => array(
+				'spacing' => array(
+					'blockGap' => '3em',
+				),
+				'blocks'  => array(
+					'core/social-links' => array(
+						'spacing' => array(
+							'blockGap' => array(
+								'left' => '2em',
+								'top'  => '1em',
+							),
+						),
+					),
+				),
+			),
+			'settings' => array(
+				'layout' => array(
+					'contentSize' => '800px',
+					'wideSize'    => '1000px',
+				),
+			),
+		);
+
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
 	/**
 	 * @ticket 56467
 	 */
@@ -2644,7 +2773,7 @@ public function test_get_editor_settings_blank() {
 	 */
 	public function test_get_editor_settings_custom_units_can_be_disabled() {
 		add_theme_support( 'custom-units', array() );
-		$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+		$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
 		remove_theme_support( 'custom-units' );
 
 		$expected = array(
@@ -2661,7 +2790,7 @@ public function test_get_editor_settings_custom_units_can_be_disabled() {
 	 */
 	public function test_get_editor_settings_custom_units_can_be_enabled() {
 		add_theme_support( 'custom-units' );
-		$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+		$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
 		remove_theme_support( 'custom-units' );
 
 		$expected = array(
@@ -2678,7 +2807,7 @@ public function test_get_editor_settings_custom_units_can_be_enabled() {
 	 */
 	public function test_get_editor_settings_custom_units_can_be_filtered() {
 		add_theme_support( 'custom-units', 'rem', 'em' );
-		$actual = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+		$actual = WP_Theme_JSON::get_from_editor_settings( get_classic_theme_supports_block_editor_settings() );
 		remove_theme_support( 'custom-units' );
 
 		$expected = array(
@@ -2734,7 +2863,7 @@ public function test_sanitization() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_export_data() {
+	public function test_export_data() {
 		$theme = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -2812,7 +2941,7 @@ function test_export_data() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_export_data_deals_with_empty_user_data() {
+	public function test_export_data_deals_with_empty_user_data() {
 		$theme = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -2862,7 +2991,7 @@ function test_export_data_deals_with_empty_user_data() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_export_data_deals_with_empty_theme_data() {
+	public function test_export_data_deals_with_empty_theme_data() {
 		$user = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -2913,7 +3042,7 @@ function test_export_data_deals_with_empty_theme_data() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_export_data_deals_with_empty_data() {
+	public function test_export_data_deals_with_empty_data() {
 		$theme_v2    = new WP_Theme_JSON(
 			array(
 				'version' => 2,
@@ -2938,7 +3067,7 @@ function test_export_data_deals_with_empty_data() {
 	/**
 	 * @ticket 55505
 	 */
-	function test_export_data_sets_appearance_tools() {
+	public function test_export_data_sets_appearance_tools() {
 		$theme = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -2972,7 +3101,7 @@ function test_export_data_sets_appearance_tools() {
 	/**
 	 * @ticket 56611
 	 */
-	function test_export_data_sets_use_root_padding_aware_alignments() {
+	public function test_export_data_sets_use_root_padding_aware_alignments() {
 		$theme = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -3025,10 +3154,11 @@ public function test_get_element_class_name_invalid() {
 	}
 
 	/**
-	 * Testing that dynamic properties in theme.json return the value they refrence,
+	 * Testing that dynamic properties in theme.json return the value they reference,
 	 * e.g. array( 'ref' => 'styles.color.background' ) => "#ffffff".
 	 *
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
 	public function test_get_property_value_valid() {
 		$theme_json = new WP_Theme_JSON(
@@ -3051,7 +3181,7 @@ public function test_get_property_value_valid() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{background-color: #ffffff;color: #000000;}.wp-element-button, .wp-block-button__link{background-color: #000000;color: #ffffff;}';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{background-color: #ffffff;color: #000000;}.wp-element-button, .wp-block-button__link{background-color: #000000;color: #ffffff;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 	}
 
@@ -3108,6 +3238,7 @@ public function data_get_property_value_should_return_string_for_invalid_paths_o
 	 * should be left untouched.
 	 *
 	 * @ticket 56467
+	 * @ticket 58550
 	 * @expectedIncorrectUsage get_property_value
 	 */
 	public function test_get_property_value_loop() {
@@ -3131,7 +3262,7 @@ public function test_get_property_value_loop() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{background-color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{background-color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 	}
 
@@ -3140,6 +3271,7 @@ public function test_get_property_value_loop() {
 	 * should be left unprocessed.
 	 *
 	 * @ticket 56467
+	 * @ticket 58550
 	 * @expectedIncorrectUsage get_property_value
 	 */
 	public function test_get_property_value_recursion() {
@@ -3163,7 +3295,7 @@ public function test_get_property_value_recursion() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{background-color: #ffffff;color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{background-color: #ffffff;color: #ffffff;}.wp-element-button, .wp-block-button__link{color: #ffffff;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 	}
 
@@ -3172,6 +3304,7 @@ public function test_get_property_value_recursion() {
 	 * should be left unprocessed.
 	 *
 	 * @ticket 56467
+	 * @ticket 58550
 	 * @expectedIncorrectUsage get_property_value
 	 */
 	public function test_get_property_value_self() {
@@ -3187,25 +3320,20 @@ public function test_get_property_value_self() {
 			)
 		);
 
-		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{background-color: #ffffff;}';
+		$expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{background-color: #ffffff;}';
 		$this->assertSame( $expected, $theme_json->get_stylesheet() );
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58548
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_generates_layout_styles( $layout_definitions ) {
+	public function test_get_stylesheet_generates_layout_styles() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => true,
 					),
@@ -3221,26 +3349,21 @@ public function test_get_stylesheet_generates_layout_styles( $layout_definitions
 
 		// Results also include root site blocks styles.
 		$this->assertSame(
-			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1em; }body { --wp--style--block-gap: 1em; }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: 1em;margin-block-end: 0;}body .is-layout-flex{gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}',
+			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1em; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1em;}:where(body .is-layout-grid) {gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
 			$theme_json->get_stylesheet( array( 'styles' ) )
 		);
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58548
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_generates_layout_styles_with_spacing_presets( $layout_definitions ) {
+	public function test_get_stylesheet_generates_layout_styles_with_spacing_presets() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => true,
 					),
@@ -3256,26 +3379,20 @@ public function test_get_stylesheet_generates_layout_styles_with_spacing_presets
 
 		// Results also include root site blocks styles.
 		$this->assertSame(
-			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: var(--wp--preset--spacing--60); }body { --wp--style--block-gap: var(--wp--preset--spacing--60); }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}body .is-layout-flex{gap: var(--wp--preset--spacing--60);}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}',
+			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: var(--wp--preset--spacing--60); margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: var(--wp--preset--spacing--60); }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:where(body .is-layout-flex) {gap: var(--wp--preset--spacing--60);}:where(body .is-layout-grid) {gap: var(--wp--preset--spacing--60);}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
 			$theme_json->get_stylesheet( array( 'styles' ) )
 		);
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_generates_fallback_gap_layout_styles( $layout_definitions ) {
+	public function test_get_stylesheet_generates_fallback_gap_layout_styles() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => null,
 					),
@@ -3292,26 +3409,20 @@ public function test_get_stylesheet_generates_fallback_gap_layout_styles( $layou
 
 		// Results also include root site blocks styles.
 		$this->assertSame(
-			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}',
+			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}',
 			$stylesheet
 		);
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_generates_base_fallback_gap_layout_styles( $layout_definitions ) {
+	public function test_get_stylesheet_generates_base_fallback_gap_layout_styles() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => null,
 					),
@@ -3323,27 +3434,21 @@ public function test_get_stylesheet_generates_base_fallback_gap_layout_styles( $
 
 		// Note the `base-layout-styles` includes a fallback gap for the Columns block for backwards compatibility.
 		$this->assertSame(
-			':where(.is-layout-flex){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}:where(.wp-block-columns.is-layout-flex){gap: 2em;}',
+			':where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}:where(.wp-block-columns.is-layout-flex){gap: 2em;}:where(.wp-block-columns.is-layout-grid){gap: 2em;}:where(.wp-block-post-template.is-layout-flex){gap: 1.25em;}:where(.wp-block-post-template.is-layout-grid){gap: 1.25em;}',
 			$stylesheet
 		);
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_skips_layout_styles( $layout_definitions ) {
+	public function test_get_stylesheet_skips_layout_styles() {
 		add_theme_support( 'disable-layout-styles' );
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => null,
 					),
@@ -3362,20 +3467,14 @@ public function test_get_stylesheet_skips_layout_styles( $layout_definitions ) {
 	}
 
 	/**
-	 * @dataProvider data_get_layout_definitions
-	 *
 	 * @ticket 56467
-	 *
-	 * @param array $layout_definitions Layout definitions as stored in core theme.json.
+	 * @ticket 58550
 	 */
-	public function test_get_stylesheet_generates_valid_block_gap_values_and_skips_null_or_false_values( $layout_definitions ) {
+	public function test_get_stylesheet_generates_valid_block_gap_values_and_skips_null_or_false_values() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
 				'settings' => array(
-					'layout'  => array(
-						'definitions' => $layout_definitions,
-					),
 					'spacing' => array(
 						'blockGap' => true,
 					),
@@ -3412,100 +3511,16 @@ public function test_get_stylesheet_generates_valid_block_gap_values_and_skips_n
 		);
 
 		$this->assertSame(
-			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1rem; }body { --wp--style--block-gap: 1rem; }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: 1rem;margin-block-end: 0;}body .is-layout-flex{gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}.wp-block-post-content{color: gray;}.wp-block-social-links.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flex{gap: 0;}.wp-block-buttons.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flex{gap: 0;}',
+			'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1rem; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1rem; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1rem;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1rem;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1rem;}:where(body .is-layout-grid) {gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-post-content{color: gray;}.wp-block-social-links-is-layout-flow > :first-child:first-child{margin-block-start: 0;}.wp-block-social-links-is-layout-flow > :last-child:last-child{margin-block-end: 0;}.wp-block-social-links-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-constrained > :first-child:first-child{margin-block-start: 0;}.wp-block-social-links-is-layout-constrained > :last-child:last-child{margin-block-end: 0;}.wp-block-social-links-is-layout-constrained > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-flex{gap: 0;}.wp-block-social-links-is-layout-grid{gap: 0;}.wp-block-buttons-is-layout-flow > :first-child:first-child{margin-block-start: 0;}.wp-block-buttons-is-layout-flow > :last-child:last-child{margin-block-end: 0;}.wp-block-buttons-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-constrained > :first-child:first-child{margin-block-start: 0;}.wp-block-buttons-is-layout-constrained > :last-child:last-child{margin-block-end: 0;}.wp-block-buttons-is-layout-constrained > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-flex{gap: 0;}.wp-block-buttons-is-layout-grid{gap: 0;}',
 			$theme_json->get_stylesheet()
 		);
 	}
 
-	/**
-	 * Data provider for layout tests.
-	 *
-	 * @ticket 56467
-	 *
-	 * @return array
-	 */
-	public function data_get_layout_definitions() {
-		return array(
-			'layout definitions' => array(
-				array(
-					'default' => array(
-						'name'          => 'default',
-						'slug'          => 'flow',
-						'className'     => 'is-layout-flow',
-						'baseStyles'    => array(
-							array(
-								'selector' => ' > .alignleft',
-								'rules'    => array(
-									'float'               => 'left',
-									'margin-inline-start' => '0',
-									'margin-inline-end'   => '2em',
-								),
-							),
-							array(
-								'selector' => ' > .alignright',
-								'rules'    => array(
-									'float'               => 'right',
-									'margin-inline-start' => '2em',
-									'margin-inline-end'   => '0',
-								),
-							),
-							array(
-								'selector' => ' > .aligncenter',
-								'rules'    => array(
-									'margin-left'  => 'auto !important',
-									'margin-right' => 'auto !important',
-								),
-							),
-						),
-						'spacingStyles' => array(
-							array(
-								'selector' => ' > *',
-								'rules'    => array(
-									'margin-block-start' => '0',
-									'margin-block-end'   => '0',
-								),
-							),
-							array(
-								'selector' => ' > * + *',
-								'rules'    => array(
-									'margin-block-start' => null,
-									'margin-block-end'   => '0',
-								),
-							),
-						),
-					),
-					'flex'    => array(
-						'name'          => 'flex',
-						'slug'          => 'flex',
-						'className'     => 'is-layout-flex',
-						'displayMode'   => 'flex',
-						'baseStyles'    => array(
-							array(
-								'selector' => '',
-								'rules'    => array(
-									'flex-wrap'   => 'wrap',
-									'align-items' => 'center',
-								),
-							),
-						),
-						'spacingStyles' => array(
-							array(
-								'selector' => '',
-								'rules'    => array(
-									'gap' => null,
-								),
-							),
-						),
-					),
-				),
-			),
-		);
-	}
-
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
-	function test_get_styles_for_block_with_padding_aware_alignments() {
+	public function test_get_styles_for_block_with_padding_aware_alignments() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -3530,7 +3545,7 @@ function test_get_styles_for_block_with_padding_aware_alignments() {
 			'selector' => 'body',
 		);
 
-		$expected    = 'body { margin: 0; }.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding) { padding-right: 0; padding-left: 0; }.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }.has-global-padding :where(.has-global-padding) > .alignfull { margin-right: 0; margin-left: 0; }.has-global-padding > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{--wp--style--root--padding-top: 10px;--wp--style--root--padding-right: 12px;--wp--style--root--padding-bottom: 10px;--wp--style--root--padding-left: 12px;}';
+		$expected    = 'body { margin: 0; }.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding) { padding-right: 0; padding-left: 0; }.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }.has-global-padding :where(.has-global-padding) > .alignfull { margin-right: 0; margin-left: 0; }.has-global-padding > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{--wp--style--root--padding-top: 10px;--wp--style--root--padding-right: 12px;--wp--style--root--padding-bottom: 10px;--wp--style--root--padding-left: 12px;}';
 		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
 		$style_rules = $theme_json->get_styles_for_block( $metadata );
 		$this->assertSame( $expected, $root_rules . $style_rules );
@@ -3538,8 +3553,9 @@ function test_get_styles_for_block_with_padding_aware_alignments() {
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
-	function test_get_styles_for_block_without_padding_aware_alignments() {
+	public function test_get_styles_for_block_without_padding_aware_alignments() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version' => 2,
@@ -3561,7 +3577,7 @@ function test_get_styles_for_block_without_padding_aware_alignments() {
 			'selector' => 'body',
 		);
 
-		$expected    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }body{padding-top: 10px;padding-right: 12px;padding-bottom: 10px;padding-left: 12px;}';
+		$expected    = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{padding-top: 10px;padding-right: 12px;padding-bottom: 10px;padding-left: 12px;}';
 		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
 		$style_rules = $theme_json->get_styles_for_block( $metadata );
 		$this->assertSame( $expected, $root_rules . $style_rules );
@@ -3569,8 +3585,9 @@ function test_get_styles_for_block_without_padding_aware_alignments() {
 
 	/**
 	 * @ticket 56467
+	 * @ticket 58550
 	 */
-	function test_get_styles_for_block_with_content_width() {
+	public function test_get_styles_for_block_with_content_width() {
 		$theme_json = new WP_Theme_JSON(
 			array(
 				'version'  => 2,
@@ -3588,136 +3605,396 @@ function test_get_styles_for_block_with_content_width() {
 			'selector' => 'body',
 		);
 
-		$expected    = 'body { margin: 0;--wp--style--global--content-size: 800px;--wp--style--global--wide-size: 1000px; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }';
+		$expected    = 'body { margin: 0;--wp--style--global--content-size: 800px;--wp--style--global--wide-size: 1000px; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
 		$root_rules  = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
 		$style_rules = $theme_json->get_styles_for_block( $metadata );
 		$this->assertSame( $expected, $root_rules . $style_rules );
 	}
 
-	/**
-	 * @ticket 56611
+	/*
+	 * @ticket 58462
 	 */
-	function test_get_styles_with_appearance_tools() {
+	public function test_sanitize_for_unregistered_style_variations() {
 		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => 2,
-				'settings' => array(
-					'appearanceTools' => true,
+				'version' => 2,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'unregisteredVariation' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+								'plain'                 => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
+					),
 				),
 			)
 		);
 
-		$metadata = array(
-			'path'     => array( 'settings' ),
-			'selector' => 'body',
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$expected             = array(
+			'version' => 2,
+			'styles'  => array(
+				'blocks' => array(
+					'core/quote' => array(
+						'variations' => array(
+							'plain' => array(
+								'color' => array(
+									'background' => 'hotpink',
+								),
+							),
+						),
+					),
+				),
+			),
 		);
-
-		$expected   = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: ; }body { --wp--style--block-gap: ; }';
-		$root_rules = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
-		$this->assertSame( $expected, $root_rules );
+		$this->assertSameSetsWithIndex( $expected, $sanitized_theme_json, 'Sanitized theme.json styles does not match' );
 	}
 
 	/**
-	 * Tests generating the spacing presets array based on the spacing scale provided.
+	 * @ticket 57583
 	 *
-	 * @ticket 56467
-	 *
-	 * @dataProvider data_generate_spacing_scale_fixtures
+	 * @dataProvider data_sanitize_for_block_with_style_variations
 	 *
-	 * @param array $spacing_scale   Example spacing scale definitions from the data provider.
-	 * @param array $expected_output Expected output from data provider.
+	 * @param array $theme_json_variations Theme.json variations to test.
+	 * @param array $expected_sanitized    Expected results after sanitizing.
 	 */
-	function test_should_set_spacing_sizes( $spacing_scale, $expected_output ) {
+	public function test_sanitize_for_block_with_style_variations( $theme_json_variations, $expected_sanitized ) {
 		$theme_json = new WP_Theme_JSON(
 			array(
-				'version'  => 2,
-				'settings' => array(
-					'spacing' => array(
-						'spacingScale' => $spacing_scale,
+				'version' => 2,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
 					),
 				),
 			)
 		);
 
-		$theme_json->set_spacing_sizes();
-		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
+		// Validate structure is sanitized.
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
+		$this->assertArrayHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json does not have an "styles" key' );
+		$this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json['styles'], 'Sanitized theme.json styles does not match' );
 	}
 
 	/**
-	 * Data provider for spacing scale tests.
-	 *
-	 * @ticket 56467
+	 * Data provider.
 	 *
 	 * @return array
 	 */
-	function data_generate_spacing_scale_fixtures() {
+	public function data_sanitize_for_block_with_style_variations() {
 		return array(
-			'only one value when single step in spacing scale' => array(
-				'spacing_scale'   => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 1,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '50',
-						'size' => '4rem',
+			'1 variation with 1 valid property'     => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color' => array(
+								'background' => 'hotpink',
+							),
+						),
 					),
 				),
-			),
-			'one step above medium when two steps in spacing scale' => array(
-				'spacing_scale'   => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 2,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '50',
-						'size' => '4rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '60',
-						'size' => '5.5rem',
+				'expected_sanitized'    => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'plain' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
 					),
 				),
 			),
-			'one step above medium and one below when three steps in spacing scale' => array(
-				'spacing_scale'   => array(
-					'operator'   => '+',
-					'increment'  => 1.5,
-					'steps'      => 3,
-					'mediumStep' => 4,
-					'unit'       => 'rem',
-				),
-				'expected_output' => array(
-					array(
-						'name' => '1',
-						'slug' => '40',
-						'size' => '2.5rem',
-					),
-					array(
-						'name' => '2',
-						'slug' => '50',
-						'size' => '4rem',
+			'1 variation with 2 invalid properties' => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color'            => array(
+								'background' => 'hotpink',
+							),
+							'invalidProperty1' => 'value1',
+							'invalidProperty2' => 'value2',
+						),
 					),
-					array(
-						'name' => '3',
-						'slug' => '60',
-						'size' => '5.5rem',
+				),
+				'expected_sanitized'    => array(
+					'blocks' => array(
+						'core/quote' => array(
+							'variations' => array(
+								'plain' => array(
+									'color' => array(
+										'background' => 'hotpink',
+									),
+								),
+							),
+						),
 					),
 				),
 			),
-			'extra step added above medium when an even number of steps > 2 specified' => array(
-				'spacing_scale'   => array(
-					'operator'   => '+',
+		);
+	}
+
+	/**
+	 * @ticket 57583
+	 *
+	 * @dataProvider data_sanitize_with_invalid_style_variation
+	 *
+	 * @param array $theme_json_variations The theme.json variations to test.
+	 */
+	public function test_sanitize_with_invalid_style_variation( $theme_json_variations ) {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => 2,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
+					),
+				),
+			)
+		);
+
+		// Validate structure is sanitized.
+		$sanitized_theme_json = $theme_json->get_raw_data();
+		$this->assertIsArray( $sanitized_theme_json, 'Sanitized theme.json is not an array data type' );
+		$this->assertArrayNotHasKey( 'styles', $sanitized_theme_json, 'Sanitized theme.json should not have a "styles" key' );
+
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_sanitize_with_invalid_style_variation() {
+		return array(
+			'empty string variation' => array(
+				array(
+					'variations' => '',
+				),
+			),
+			'boolean variation'      => array(
+				array(
+					'variations' => false,
+				),
+			),
+		);
+	}
+
+	/**
+	 * @ticket 57583
+	 *
+	 * @dataProvider data_get_styles_for_block_with_style_variations
+	 *
+	 * @param array  $theme_json_variations Theme.json variations to test.
+	 * @param string $metadata_variations   Style variations to test.
+	 * @param string $expected              Expected results for styling.
+	 */
+	public function test_get_styles_for_block_with_style_variations( $theme_json_variations, $metadata_variations, $expected ) {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => 2,
+				'styles'  => array(
+					'blocks' => array(
+						'core/quote' => $theme_json_variations,
+					),
+				),
+			)
+		);
+
+		// Validate styles are generated properly.
+		$metadata      = array(
+			'path'       => array( 'styles', 'blocks', 'core/quote' ),
+			'selector'   => '.wp-block-quote',
+			'variations' => $metadata_variations,
+		);
+		$actual_styles = $theme_json->get_styles_for_block( $metadata );
+		$this->assertSame( $expected, $actual_styles );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_get_styles_for_block_with_style_variations() {
+		$plain = array(
+			'metadata' => array(
+				'path'     => array( 'styles', 'blocks', 'core/quote', 'variations', 'plain' ),
+				'selector' => '.is-style-plain.is-style-plain.wp-block-quote',
+			),
+			'styles'   => '.is-style-plain.is-style-plain.wp-block-quote{background-color: hotpink;}',
+		);
+
+		return array(
+			'1 variation with 1 invalid property'   => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color' => array(
+								'background' => 'hotpink',
+							),
+						),
+					),
+				),
+				'metadata_variation'    => array( $plain['metadata'] ),
+				'expected'              => $plain['styles'],
+			),
+			'1 variation with 2 invalid properties' => array(
+				'theme_json_variations' => array(
+					'variations' => array(
+						'plain' => array(
+							'color'            => array(
+								'background' => 'hotpink',
+							),
+							'invalidProperty1' => 'value1',
+							'invalidProperty2' => 'value2',
+						),
+					),
+				),
+				'metadata_variation'    => array( $plain['metadata'] ),
+				'expected'              => $plain['styles'],
+			),
+		);
+	}
+
+	/**
+	 * @ticket 56611
+	 * @ticket 58548
+	 * @ticket 58550
+	 */
+	public function test_get_styles_with_appearance_tools() {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version'  => 2,
+				'settings' => array(
+					'appearanceTools' => true,
+				),
+			)
+		);
+
+		$metadata = array(
+			'path'     => array( 'settings' ),
+			'selector' => 'body',
+		);
+
+		$expected   = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: ; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: ; }:where(body .is-layout-flow)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-flow)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-flow)  > *{margin-block-start: 1;margin-block-end: 0;}:where(body .is-layout-constrained)  > :first-child:first-child{margin-block-start: 0;}:where(body .is-layout-constrained)  > :last-child:last-child{margin-block-end: 0;}:where(body .is-layout-constrained)  > *{margin-block-start: 1;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1;}:where(body .is-layout-grid) {gap: 1;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
+		$root_rules = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata );
+		$this->assertSame( $expected, $root_rules );
+	}
+
+	/**
+	 * Tests generating the spacing presets array based on the spacing scale provided.
+	 *
+	 * @ticket 56467
+	 *
+	 * @dataProvider data_generate_spacing_scale_fixtures
+	 *
+	 * @param array $spacing_scale   Example spacing scale definitions from the data provider.
+	 * @param array $expected_output Expected output from data provider.
+	 */
+	public function test_should_set_spacing_sizes( $spacing_scale, $expected_output ) {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version'  => 2,
+				'settings' => array(
+					'spacing' => array(
+						'spacingScale' => $spacing_scale,
+					),
+				),
+			)
+		);
+
+		$theme_json->set_spacing_sizes();
+		$this->assertSame( $expected_output, _wp_array_get( $theme_json->get_raw_data(), array( 'settings', 'spacing', 'spacingSizes', 'default' ) ) );
+	}
+
+	/**
+	 * Data provider for spacing scale tests.
+	 *
+	 * @ticket 56467
+	 *
+	 * @return array
+	 */
+	public function data_generate_spacing_scale_fixtures() {
+		return array(
+			'only one value when single step in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 1,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => '1',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+				),
+			),
+			'one step above medium when two steps in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 2,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => '1',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+					array(
+						'name' => '2',
+						'slug' => '60',
+						'size' => '5.5rem',
+					),
+				),
+			),
+			'one step above medium and one below when three steps in spacing scale' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
+					'increment'  => 1.5,
+					'steps'      => 3,
+					'mediumStep' => 4,
+					'unit'       => 'rem',
+				),
+				'expected_output' => array(
+					array(
+						'name' => '1',
+						'slug' => '40',
+						'size' => '2.5rem',
+					),
+					array(
+						'name' => '2',
+						'slug' => '50',
+						'size' => '4rem',
+					),
+					array(
+						'name' => '3',
+						'slug' => '60',
+						'size' => '5.5rem',
+					),
+				),
+			),
+			'extra step added above medium when an even number of steps > 2 specified' => array(
+				'spacing_scale'   => array(
+					'operator'   => '+',
 					'increment'  => 1.5,
 					'steps'      => 4,
 					'mediumStep' => 4,
@@ -3944,7 +4221,7 @@ public function test_set_spacing_sizes_should_detect_invalid_spacing_scale( $spa
 	 *
 	 * @return array
 	 */
-	function data_set_spacing_sizes_when_invalid() {
+	public function data_set_spacing_sizes_when_invalid() {
 		return array(
 			'missing operator value'  => array(
 				'spacing_scale'   => array(
@@ -3997,4 +4274,569 @@ function data_set_spacing_sizes_when_invalid() {
 			),
 		);
 	}
+
+	/**
+	 * Tests the core separator block outbut based on various provided settings.
+	 *
+	 * @ticket 56903
+	 * @ticket 58550
+	 *
+	 * @dataProvider data_update_separator_declarations
+	 *
+	 * @param array $separator_block_settings Example separator block settings from the data provider.
+	 * @param array $expected_output          Expected output from data provider.
+	 */
+	public function test_update_separator_declarations( $separator_block_settings, $expected_output ) {
+		// If only background is defined, test that includes border-color to the style so it is applied on the front end.
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(
+					'blocks' => array(
+						'core/separator' => $separator_block_settings,
+					),
+				),
+			),
+			'default'
+		);
+
+		$stylesheet = $theme_json->get_stylesheet( array( 'styles' ) );
+
+		$this->assertSame( $expected_output, $stylesheet );
+	}
+
+	/**
+	 * Data provider for separator declaration tests.
+	 *
+	 * @return array
+	 */
+	public function data_update_separator_declarations() {
+		return array(
+			// If only background is defined, test that includes border-color to the style so it is applied on the front end.
+			'only background'                      => array(
+				array(
+					'color' => array(
+						'background' => 'blue',
+					),
+				),
+				'expected_output' => 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-separator{background-color: blue;color: blue;}',
+			),
+			// If background and text are defined, do not include border-color, as text color is enough.
+			'background and text, no border-color' => array(
+				array(
+					'color' => array(
+						'background' => 'blue',
+						'text'       => 'red',
+					),
+				),
+				'expected_output' => 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-separator{background-color: blue;color: red;}',
+			),
+			// If only text is defined, do not include border-color, as by itself is enough.
+			'only text'                            => array(
+				array(
+					'color' => array(
+						'text' => 'red',
+					),
+				),
+				'expected_output' => 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-separator{color: red;}',
+			),
+			// If background, text, and border-color are defined, include everything, CSS specificity will decide which to apply.
+			'background, text, and border-color'   => array(
+				array(
+					'color'  => array(
+						'background' => 'blue',
+						'text'       => 'red',
+					),
+					'border' => array(
+						'color' => 'pink',
+					),
+				),
+				'expected_output' => 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-separator{background-color: blue;border-color: pink;color: red;}',
+			),
+			// If background and border color are defined, include everything, CSS specificity will decide which to apply.
+			'background, and border-color'         => array(
+				array(
+					'color'  => array(
+						'background' => 'blue',
+					),
+					'border' => array(
+						'color' => 'pink',
+					),
+				),
+				'expected_output' => 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}.wp-block-separator{background-color: blue;border-color: pink;}',
+			),
+		);
+	}
+
+	/**
+	 * @ticket 57354
+	 * @ticket 58550
+	 */
+	public function test_get_stylesheet_returns_outline_styles() {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(
+					'elements' => array(
+						'button' => array(
+							'outline' => array(
+								'offset' => '3px',
+								'width'  => '3px',
+								'style'  => 'dashed',
+								'color'  => 'red',
+							),
+							':hover'  => array(
+								'outline' => array(
+									'offset' => '3px',
+									'width'  => '3px',
+									'style'  => 'solid',
+									'color'  => 'blue',
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$base_styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
+
+		$element_styles = '.wp-element-button, .wp-block-button__link{outline-color: red;outline-offset: 3px;outline-style: dashed;outline-width: 3px;}.wp-element-button:hover, .wp-block-button__link:hover{outline-color: blue;outline-offset: 3px;outline-style: solid;outline-width: 3px;}';
+
+		$expected = $base_styles . $element_styles;
+		$this->assertSame( $expected, $theme_json->get_stylesheet() );
+	}
+
+	/**
+	 * @ticket 57559
+	 */
+	public function test_shadow_preset_styles() {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+				'settings' => array(
+					'shadow' => array(
+						'presets' => array(
+							array(
+								'slug'   => 'natural',
+								'shadow' => '5px 5px 5px 0 black',
+							),
+							array(
+								'slug'   => 'sharp',
+								'shadow' => '5px 5px black',
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$expected_styles = 'body{--wp--preset--shadow--natural: 5px 5px 5px 0 black;--wp--preset--shadow--sharp: 5px 5px black;}';
+		$this->assertSame( $expected_styles, $theme_json->get_stylesheet(), 'Styles returned from "::get_stylesheet()" does not match expectations' );
+		$this->assertSame( $expected_styles, $theme_json->get_stylesheet( array( 'variables' ) ), 'Styles returned from "::get_stylesheet()" when requiring "variables" type does not match expectations' );
+	}
+
+	/**
+	 * @ticket 57559
+	 * @ticket 58550
+	 */
+	public function test_get_shadow_styles_for_blocks() {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+				'settings' => array(
+					'shadow' => array(
+						'presets' => array(
+							array(
+								'slug'   => 'natural',
+								'shadow' => '5px 5px 0 0 black',
+							),
+						),
+					),
+				),
+				'styles'   => array(
+					'blocks'   => array(
+						'core/paragraph' => array(
+							'shadow' => 'var(--wp--preset--shadow--natural)',
+						),
+					),
+					'elements' => array(
+						'button' => array(
+							'shadow' => 'var:preset|shadow|natural',
+						),
+						'link'   => array(
+							'shadow' => array( 'ref' => 'styles.elements.button.shadow' ),
+						),
+					),
+				),
+			)
+		);
+
+		$global_styles   = 'body{--wp--preset--shadow--natural: 5px 5px 0 0 black;}body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}';
+		$element_styles  = 'a:where(:not(.wp-element-button)){box-shadow: var(--wp--preset--shadow--natural);}.wp-element-button, .wp-block-button__link{box-shadow: var(--wp--preset--shadow--natural);}p{box-shadow: var(--wp--preset--shadow--natural);}';
+		$expected_styles = $global_styles . $element_styles;
+
+		$this->assertSame( $expected_styles, $theme_json->get_stylesheet() );
+	}
+
+	/**
+	 * @ticket 57536
+	 */
+	public function test_get_custom_css_handles_global_custom_css() {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(
+					'css' => 'body { color:purple; }',
+				),
+			)
+		);
+		$custom_css = 'body { color:purple; }';
+		$this->assertSame( $custom_css, $theme_json->get_custom_css() );
+	}
+
+	/**
+	 * Tests that custom CSS is kept for users with correct capabilities and removed for others.
+	 *
+	 * @ticket 57536
+	 *
+	 * @dataProvider data_custom_css_for_user_caps
+	 *
+	 * @param string $user_property The property name for current user.
+	 * @param array  $expected      Expected results.
+	 */
+	public function test_custom_css_for_user_caps( $user_property, array $expected ) {
+		wp_set_current_user( static::${$user_property} );
+
+		$actual = WP_Theme_JSON::remove_insecure_properties(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(
+					'css'    => 'body { color:purple; }',
+					'blocks' => array(
+						'core/separator' => array(
+							'color' => array(
+								'background' => 'blue',
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$this->assertSameSetsWithIndex( $expected, $actual );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_custom_css_for_user_caps() {
+		return array(
+			'allows custom css for users with caps'     => array(
+				'user_property' => 'administrator_id',
+				'expected'      => array(
+					'version' => WP_Theme_JSON::LATEST_SCHEMA,
+					'styles'  => array(
+						'css'    => 'body { color:purple; }',
+						'blocks' => array(
+							'core/separator' => array(
+								'color' => array(
+									'background' => 'blue',
+								),
+							),
+						),
+					),
+				),
+			),
+			'removes custom css for users without caps' => array(
+				'user_property' => 'user_id',
+				'expected'      => array(
+					'version' => WP_Theme_JSON::LATEST_SCHEMA,
+					'styles'  => array(
+						'blocks' => array(
+							'core/separator' => array(
+								'color' => array(
+									'background' => 'blue',
+								),
+							),
+						),
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_process_blocks_custom_css
+	 *
+	 * @param array  $input    An array containing the selector and css to test.
+	 * @param string $expected Expected results.
+	 */
+	public function test_process_blocks_custom_css( $input, $expected ) {
+		$theme_json = new WP_Theme_JSON(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(),
+			)
+		);
+		$reflection = new ReflectionMethod( $theme_json, 'process_blocks_custom_css' );
+		$reflection->setAccessible( true );
+
+		$this->assertSame( $expected, $reflection->invoke( $theme_json, $input['css'], $input['selector'] ) );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_process_blocks_custom_css() {
+		return array(
+			// Simple CSS without any child selectors.
+			'no child selectors'                => array(
+				'input'    => array(
+					'selector' => '.foo',
+					'css'      => 'color: red; margin: auto;',
+				),
+				'expected' => '.foo{color: red; margin: auto;}',
+			),
+			// CSS with child selectors.
+			'with children'                     => array(
+				'input'    => array(
+					'selector' => '.foo',
+					'css'      => 'color: red; margin: auto; & .bar{color: blue;}',
+				),
+				'expected' => '.foo{color: red; margin: auto;}.foo .bar{color: blue;}',
+			),
+			// CSS with child selectors and pseudo elements.
+			'with children and pseudo elements' => array(
+				'input'    => array(
+					'selector' => '.foo',
+					'css'      => 'color: red; margin: auto; & .bar{color: blue;} &::before{color: green;}',
+				),
+				'expected' => '.foo{color: red; margin: auto;}.foo .bar{color: blue;}.foo::before{color: green;}',
+			),
+		);
+	}
+
+	public function test_internal_syntax_is_converted_to_css_variables() {
+		$result = new WP_Theme_JSON(
+			array(
+				'version' => WP_Theme_JSON::LATEST_SCHEMA,
+				'styles'  => array(
+					'color'    => array(
+						'background' => 'var:preset|color|primary',
+						'text'       => 'var(--wp--preset--color--secondary)',
+					),
+					'elements' => array(
+						'link' => array(
+							'color' => array(
+								'background' => 'var:preset|color|pri',
+								'text'       => 'var(--wp--preset--color--sec)',
+							),
+						),
+					),
+					'blocks'   => array(
+						'core/post-terms' => array(
+							'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--small)' ),
+							'color'      => array( 'background' => 'var:preset|color|secondary' ),
+						),
+						'core/navigation' => array(
+							'elements' => array(
+								'link' => array(
+									'color' => array(
+										'background' => 'var:preset|color|p',
+										'text'       => 'var(--wp--preset--color--s)',
+									),
+								),
+							),
+						),
+						'core/quote'      => array(
+							'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--d)' ),
+							'color'      => array( 'background' => 'var:preset|color|d' ),
+							'variations' => array(
+								'plain' => array(
+									'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--s)' ),
+									'color'      => array( 'background' => 'var:preset|color|s' ),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+		$styles = $result->get_raw_data()['styles'];
+
+		$this->assertEquals( 'var(--wp--preset--color--primary)', $styles['color']['background'], 'Top level: Assert the originally correct values are still correct.' );
+		$this->assertEquals( 'var(--wp--preset--color--secondary)', $styles['color']['text'], 'Top level: Assert the originally correct values are still correct.' );
+
+		$this->assertEquals( 'var(--wp--preset--color--pri)', $styles['elements']['link']['color']['background'], 'Element top level: Assert the originally correct values are still correct.' );
+		$this->assertEquals( 'var(--wp--preset--color--sec)', $styles['elements']['link']['color']['text'], 'Element top level: Assert the originally correct values are still correct.' );
+
+		$this->assertEquals( 'var(--wp--preset--font-size--small)', $styles['blocks']['core/post-terms']['typography']['fontSize'], 'Top block level: Assert the originally correct values are still correct.' );
+		$this->assertEquals( 'var(--wp--preset--color--secondary)', $styles['blocks']['core/post-terms']['color']['background'], 'Top block level: Assert the internal variables are convert to CSS custom variables.' );
+
+		$this->assertEquals( 'var(--wp--preset--color--p)', $styles['blocks']['core/navigation']['elements']['link']['color']['background'], 'Elements block level: Assert the originally correct values are still correct.' );
+		$this->assertEquals( 'var(--wp--preset--color--s)', $styles['blocks']['core/navigation']['elements']['link']['color']['text'], 'Elements block level: Assert the originally correct values are still correct.' );
+
+		$this->assertEquals( 'var(--wp--preset--font-size--s)', $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Style variations: Assert the originally correct values are still correct.' );
+		$this->assertEquals( 'var(--wp--preset--color--s)', $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Style variations: Assert the internal variables are convert to CSS custom variables.' );
+
+	}
+
+	public function test_resolve_variables() {
+		$primary_color   = '#9DFF20';
+		$secondary_color = '#9DFF21';
+		$contrast_color  = '#000';
+		$raw_color_value = '#efefef';
+		$large_font      = '18px';
+		$small_font      = '12px';
+		$theme_json      = new WP_Theme_JSON(
+			array(
+				'version'  => WP_Theme_JSON::LATEST_SCHEMA,
+				'settings' => array(
+					'color'      => array(
+						'palette' => array(
+							'theme' => array(
+								array(
+									'color' => $primary_color,
+									'name'  => 'Primary',
+									'slug'  => 'primary',
+								),
+								array(
+									'color' => $secondary_color,
+									'name'  => 'Secondary',
+									'slug'  => 'secondary',
+								),
+								array(
+									'color' => $contrast_color,
+									'name'  => 'Contrast',
+									'slug'  => 'contrast',
+								),
+							),
+						),
+					),
+					'typography' => array(
+						'fontSizes' => array(
+							array(
+								'size' => $small_font,
+								'name' => 'Font size small',
+								'slug' => 'small',
+							),
+							array(
+								'size' => $large_font,
+								'name' => 'Font size large',
+								'slug' => 'large',
+							),
+						),
+					),
+				),
+				'styles'   => array(
+					'color'    => array(
+						'background' => 'var(--wp--preset--color--primary)',
+						'text'       => $raw_color_value,
+					),
+					'elements' => array(
+						'button' => array(
+							'color'      => array(
+								'text' => 'var(--wp--preset--color--contrast)',
+							),
+							'typography' => array(
+								'fontSize' => 'var(--wp--preset--font-size--small)',
+							),
+						),
+					),
+					'blocks'   => array(
+						'core/post-terms'      => array(
+							'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--small)' ),
+							'color'      => array( 'background' => $raw_color_value ),
+						),
+						'core/more'            => array(
+							'typography' => array( 'fontSize' => 'var(--undefined--font-size--small)' ),
+							'color'      => array( 'background' => 'linear-gradient(90deg, var(--wp--preset--color--primary) 0%, var(--wp--preset--color--secondary) 35%, var(--wp--undefined--color--secondary) 100%)' ),
+						),
+						'core/comment-content' => array(
+							'typography' => array( 'fontSize' => 'calc(var(--wp--preset--font-size--small, 12px) + 20px)' ),
+							'color'      => array(
+								'text'       => 'var(--wp--preset--color--primary, red)',
+								'background' => 'var(--wp--preset--color--primary, var(--wp--preset--font-size--secondary))',
+								'link'       => 'var(--undefined--color--primary, var(--wp--preset--font-size--secondary))',
+							),
+						),
+						'core/comments'        => array(
+							'color' => array(
+								'text'       => 'var(--undefined--color--primary, var(--wp--preset--font-size--small))',
+								'background' => 'var(--wp--preset--color--primary, var(--undefined--color--primary))',
+							),
+						),
+						'core/navigation'      => array(
+							'elements' => array(
+								'link' => array(
+									'color'      => array(
+										'background' => 'var(--wp--preset--color--primary)',
+										'text'       => 'var(--wp--preset--color--secondary)',
+									),
+									'typography' => array(
+										'fontSize' => 'var(--wp--preset--font-size--large)',
+									),
+								),
+							),
+						),
+						'core/quote'           => array(
+							'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--large)' ),
+							'color'      => array( 'background' => 'var(--wp--preset--color--primary)' ),
+							'variations' => array(
+								'plain' => array(
+									'typography' => array( 'fontSize' => 'var(--wp--preset--font-size--small)' ),
+									'color'      => array( 'background' => 'var(--wp--preset--color--secondary)' ),
+								),
+							),
+						),
+					),
+				),
+			)
+		);
+
+		$styles = $theme_json::resolve_variables( $theme_json )->get_raw_data()['styles'];
+
+		$this->assertEquals( $primary_color, $styles['color']['background'], 'Top level: Assert values are converted' );
+		$this->assertEquals( $raw_color_value, $styles['color']['text'], 'Top level: Assert raw values stay intact' );
+
+		$this->assertEquals( $contrast_color, $styles['elements']['button']['color']['text'], 'Elements: color' );
+		$this->assertEquals( $small_font, $styles['elements']['button']['typography']['fontSize'], 'Elements: font-size' );
+
+		$this->assertEquals( $large_font, $styles['blocks']['core/quote']['typography']['fontSize'], 'Blocks: font-size' );
+		$this->assertEquals( $primary_color, $styles['blocks']['core/quote']['color']['background'], 'Blocks: color' );
+		$this->assertEquals( $raw_color_value, $styles['blocks']['core/post-terms']['color']['background'], 'Blocks: Raw color value stays intact' );
+		$this->assertEquals( $small_font, $styles['blocks']['core/post-terms']['typography']['fontSize'], 'Block core/post-terms: font-size' );
+		$this->assertEquals(
+			"linear-gradient(90deg, $primary_color 0%, $secondary_color 35%, var(--wp--undefined--color--secondary) 100%)",
+			$styles['blocks']['core/more']['color']['background'],
+			'Blocks: multiple colors and undefined color'
+		);
+		$this->assertEquals( 'var(--undefined--font-size--small)', $styles['blocks']['core/more']['typography']['fontSize'], 'Blocks: undefined font-size ' );
+		$this->assertEquals( "calc($small_font + 20px)", $styles['blocks']['core/comment-content']['typography']['fontSize'], 'Blocks: font-size in random place' );
+		$this->assertEquals( $primary_color, $styles['blocks']['core/comment-content']['color']['text'], 'Blocks: text color with fallback' );
+		$this->assertEquals( $primary_color, $styles['blocks']['core/comment-content']['color']['background'], 'Blocks: background color with var as fallback' );
+		$this->assertEquals( $primary_color, $styles['blocks']['core/navigation']['elements']['link']['color']['background'], 'Block element: background color' );
+		$this->assertEquals( $secondary_color, $styles['blocks']['core/navigation']['elements']['link']['color']['text'], 'Block element: text color' );
+		$this->assertEquals( $large_font, $styles['blocks']['core/navigation']['elements']['link']['typography']['fontSize'], 'Block element: font-size' );
+
+		$this->assertEquals(
+			"var(--undefined--color--primary, $small_font)",
+			$styles['blocks']['core/comments']['color']['text'],
+			'Blocks: text color with undefined var and fallback'
+		);
+		$this->assertEquals(
+			$primary_color,
+			$styles['blocks']['core/comments']['color']['background'],
+			'Blocks: background color with variable and undefined fallback'
+		);
+
+		$this->assertEquals( $small_font, $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Block variations: font-size' );
+		$this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' );
+	}
+
 }
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index 524fade2d8f85..7e928aa0c7123 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -33,13 +33,6 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
 	 */
 	private $orig_theme_dir;
 
-	/**
-	 * Queries.
-	 *
-	 * @var array
-	 */
-	private $queries = array();
-
 	/**
 	 * WP_Theme_JSON_Resolver::$blocks_cache property.
 	 *
@@ -105,7 +98,7 @@ public function set_up() {
 		add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
 		add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
 		add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-		$this->queries = array();
+
 		// Clear caches.
 		wp_clean_themes_cache();
 		unset( $GLOBALS['wp_themes'] );
@@ -117,7 +110,7 @@ public function tear_down() {
 		unset( $GLOBALS['wp_themes'] );
 
 		// Reset data between tests.
-		WP_Theme_JSON_Resolver::clean_cached_data();
+		wp_clean_theme_json_cache();
 		parent::tear_down();
 	}
 
@@ -129,13 +122,6 @@ public function filter_set_locale_to_polish() {
 		return 'pl_PL';
 	}
 
-	function filter_db_query( $query ) {
-		if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) {
-			$this->queries[] = $query;
-		}
-		return $query;
-	}
-
 	/**
 	 * @ticket 52991
 	 * @ticket 54336
@@ -249,7 +235,7 @@ public function test_translations_are_applied() {
 		);
 		$this->assertSame(
 			'Wariant motywu blokowego',
-			$style_variations[0]['title']
+			$style_variations[1]['title']
 		);
 	}
 
@@ -390,7 +376,7 @@ public function data_has_same_registered_blocks_when_all_blocks_are_cached() {
 	 * @ticket 56467
 	 */
 	public function test_get_core_data( $should_fire_filter, $core_is_cached, $blocks_are_cached ) {
-		WP_Theme_JSON_Resolver::clean_cached_data();
+		wp_clean_theme_json_cache();
 
 		// If should cache core, then fire the method to cache it before running the tests.
 		if ( $core_is_cached ) {
@@ -445,26 +431,10 @@ public function data_get_core_data() {
 		);
 	}
 
-	/**
-	 * @ticket 52991
-	 */
-	public function test_switching_themes_recalculates_data() {
-		// The "default" theme doesn't have theme.json support.
-		switch_theme( 'default' );
-		$default = WP_Theme_JSON_Resolver::theme_has_support();
-
-		// Switch to a theme that does have support.
-		switch_theme( 'block-theme' );
-		$has_theme_json_support = WP_Theme_JSON_Resolver::theme_has_support();
-
-		$this->assertFalse( $default );
-		$this->assertTrue( $has_theme_json_support );
-	}
-
 	/**
 	 * @ticket 54336
 	 */
-	function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
+	public function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
 		switch_theme( 'default' );
 		$color_palette = array(
 			array(
@@ -491,28 +461,16 @@ function test_add_theme_supports_are_loaded_for_themes_without_theme_json() {
 		remove_theme_support( 'custom-line-height' );
 		remove_theme_support( 'editor-color-palette' );
 
-		$this->assertFalse( WP_Theme_JSON_Resolver::theme_has_support() );
+		$this->assertFalse( wp_theme_has_theme_json() );
 		$this->assertTrue( $settings['typography']['lineHeight'] );
 		$this->assertSame( $color_palette, $settings['color']['palette']['theme'] );
 	}
 
-	/**
-	 * Recursively applies ksort to an array.
-	 */
-	private static function recursive_ksort( &$array ) {
-		foreach ( $array as &$value ) {
-			if ( is_array( $value ) ) {
-				self::recursive_ksort( $value );
-			}
-		}
-		ksort( $array );
-	}
-
 	/**
 	 * @ticket 54336
 	 * @ticket 56611
 	 */
-	function test_merges_child_theme_json_into_parent_theme_json() {
+	public function test_merges_child_theme_json_into_parent_theme_json() {
 		switch_theme( 'block-theme-child' );
 
 		$actual_settings   = WP_Theme_JSON_Resolver::get_theme_data()->get_settings();
@@ -606,8 +564,8 @@ function test_merges_child_theme_json_into_parent_theme_json() {
 				),
 			),
 		);
-		self::recursive_ksort( $actual_settings );
-		self::recursive_ksort( $expected_settings );
+		wp_recursive_ksort( $actual_settings );
+		wp_recursive_ksort( $expected_settings );
 
 		// Should merge settings.
 		$this->assertSame(
@@ -633,18 +591,27 @@ function test_merges_child_theme_json_into_parent_theme_json() {
 	/**
 	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
 	 */
-	function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries() {
+	public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		wp_set_current_user( self::$administrator_id );
 		$theme = wp_get_theme();
 		WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-		add_filter( 'query', array( $this, 'filter_db_query' ) );
-		$query_count = count( $this->queries );
+		$global_styles_query_count = 0;
+		add_filter(
+			'query',
+			static function( $query ) use ( &$global_styles_query_count ) {
+				if ( preg_match( '#post_type = \'wp_global_styles\'#', $query ) ) {
+					$global_styles_query_count++;
+				}
+				return $query;
+			}
+		);
 		for ( $i = 0; $i < 3; $i++ ) {
 			WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver::clean_cached_data();
+			wp_clean_theme_json_cache();
 		}
-		$query_count = count( $this->queries ) - $query_count;
-		$this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
+		$this->assertSame( 0, $global_styles_query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
 
 		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
 		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
@@ -652,40 +619,64 @@ function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries(
 		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
 		$this->assertNotEmpty( $user_cpt, 'User CPT is expected not to be empty.' );
 
-		$query_count = count( $this->queries );
-		for ( $i = 0; $i < 3; $i ++ ) {
+		$global_styles_query_count = 0;
+		for ( $i = 0; $i < 3; $i++ ) {
 			$new_user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver::clean_cached_data();
+			wp_clean_theme_json_cache();
 			$this->assertSameSets( $user_cpt, $new_user_cpt, "User CPTs do not match on run {$i}." );
 		}
-		$query_count = count( $this->queries ) - $query_count;
-		$this->assertSame( 1, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type after creation.' );
+		$this->assertSame( 1, $global_styles_query_count, 'Unexpected SQL queries detected for the wp_global_style post type after creation.' );
 	}
 
 	/**
 	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
 	 */
-	function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries_for_logged_out_users() {
+	public function test_get_user_data_from_wp_global_styles_does_not_use_uncached_queries_for_logged_out_users() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		$theme = wp_get_theme();
 		WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-		add_filter( 'query', array( $this, 'filter_db_query' ) );
-		$query_count = count( $this->queries );
+		$query_count = get_num_queries();
 		for ( $i = 0; $i < 3; $i++ ) {
 			WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
-			WP_Theme_JSON_Resolver::clean_cached_data();
+			wp_clean_theme_json_cache();
 		}
-		$query_count = count( $this->queries ) - $query_count;
+		$query_count = get_num_queries() - $query_count;
 		$this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type prior to creation.' );
 
 		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
 		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
 	}
 
+	/**
+	 * @ticket 56945
+	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
+	 */
+	public function test_get_user_data_from_wp_global_styles_does_not_run_for_theme_without_support() {
+		// The 'default' theme does not support theme.json.
+		switch_theme( 'default' );
+		wp_set_current_user( self::$administrator_id );
+		$theme = wp_get_theme();
+
+		$start_queries = get_num_queries();
+
+		// When theme.json is not supported, the method should not run a query and always return an empty result.
+		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
+		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
+		$this->assertSame( 0, get_num_queries() - $start_queries, 'Unexpected SQL query detected for theme without theme.json support.' );
+
+		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
+		$this->assertEmpty( $user_cpt, 'User CPT is expected to be empty.' );
+		$this->assertSame( 0, get_num_queries() - $start_queries, 'Unexpected SQL query detected for theme without theme.json support.' );
+	}
+
 	/**
 	 * @ticket 55392
 	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
 	 */
-	function test_get_user_data_from_wp_global_styles_does_exist() {
+	public function test_get_user_data_from_wp_global_styles_does_exist() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		$theme = wp_get_theme();
 		$post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true );
 		$this->assertIsArray( $post1 );
@@ -700,7 +691,9 @@ function test_get_user_data_from_wp_global_styles_does_exist() {
 	 * @ticket 55392
 	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
 	 */
-	function test_get_user_data_from_wp_global_styles_create_post() {
+	public function test_get_user_data_from_wp_global_styles_create_post() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		$theme = wp_get_theme( 'testing' );
 		$post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
 		$this->assertIsArray( $post1 );
@@ -717,7 +710,9 @@ function test_get_user_data_from_wp_global_styles_create_post() {
 	 * @ticket 55392
 	 * @covers WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles
 	 */
-	function test_get_user_data_from_wp_global_styles_filter_state() {
+	public function test_get_user_data_from_wp_global_styles_filter_state() {
+		// Switch to a theme that does have support.
+		switch_theme( 'block-theme' );
 		$theme = wp_get_theme( 'foo' );
 		$post1 = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme, true, array( 'publish' ) );
 		$this->assertIsArray( $post1 );
@@ -731,10 +726,11 @@ function test_get_user_data_from_wp_global_styles_filter_state() {
 	 * @ticket 56835
 	 * @covers WP_Theme_JSON_Resolver::get_theme_data
 	 */
-	function test_get_theme_data_theme_supports_overrides_theme_json() {
+	public function test_get_theme_data_theme_supports_overrides_theme_json() {
 		// Test that get_theme_data() returns a WP_Theme_JSON object.
 		$theme_json_resolver = new WP_Theme_JSON_Resolver();
-		$theme_data          = $theme_json_resolver->get_theme_data();
+		$theme_json_resolver->get_merged_data();
+		$theme_data = $theme_json_resolver->get_theme_data();
 		$this->assertInstanceOf( 'WP_Theme_JSON', $theme_data, 'Theme data should be an instance of WP_Theme_JSON.' );
 
 		// Test that wp_theme_json_data_theme filter has been called.
@@ -749,4 +745,277 @@ function test_get_theme_data_theme_supports_overrides_theme_json() {
 		$line_height      = $current_settings['typography']['lineHeight'];
 		$this->assertTrue( $line_height, 'lineHeight setting after add_theme_support() should be true.' );
 	}
+
+	/**
+	 * @ticket 56945
+	 * @covers WP_Theme_JSON_Resolver::get_theme_data
+	 */
+	public function test_get_theme_data_does_not_parse_theme_json_if_not_present() {
+		// The 'default' theme does not support theme.json.
+		switch_theme( 'default' );
+
+		$theme_json_resolver = new WP_Theme_JSON_Resolver();
+
+		// Force-unset $i18n_schema property to "unload" translation schema.
+		$property = new ReflectionProperty( $theme_json_resolver, 'i18n_schema' );
+		$property->setAccessible( true );
+		$property->setValue( null );
+
+		// A completely empty theme.json data set still has the 'version' key when parsed.
+		$empty_theme_json = array( 'version' => WP_Theme_JSON::LATEST_SCHEMA );
+
+		// Call using 'with_supports' set to false, so that the method only considers theme.json.
+		$theme_data = $theme_json_resolver->get_theme_data( array(), array( 'with_supports' => false ) );
+		$this->assertInstanceOf( 'WP_Theme_JSON', $theme_data, 'Theme data should be an instance of WP_Theme_JSON.' );
+		$this->assertSame( $empty_theme_json, $theme_data->get_raw_data(), 'Theme data should be empty without theme support.' );
+		$this->assertNull( $property->getValue(), 'Theme i18n schema should not have been loaded without theme support.' );
+	}
+
+	/**
+	 * Tests that get_merged_data returns the data merged up to the proper origin.
+	 *
+	 * @ticket 57545
+	 *
+	 * @covers WP_Theme_JSON_Resolver::get_merged_data
+	 *
+	 * @dataProvider data_get_merged_data_returns_origin
+	 *
+	 * @param string $origin             What origin to get data from.
+	 * @param bool   $core_palette       Whether the core palette is present.
+	 * @param string $core_palette_text  Message.
+	 * @param string $block_styles       Whether the block styles are present.
+	 * @param string $block_styles_text  Message.
+	 * @param bool   $theme_palette      Whether the theme palette is present.
+	 * @param string $theme_palette_text Message.
+	 * @param bool   $user_palette        Whether the user palette is present.
+	 * @param string $user_palette_text   Message.
+	 */
+	public function test_get_merged_data_returns_origin( $origin, $core_palette, $core_palette_text, $block_styles, $block_styles_text, $theme_palette, $theme_palette_text, $user_palette, $user_palette_text ) {
+		// Make sure there is data from the blocks origin.
+		register_block_type(
+			'my/block-with-styles',
+			array(
+				'api_version' => 2,
+				'attributes'  => array(
+					'borderColor' => array(
+						'type' => 'string',
+					),
+					'style'       => array(
+						'type' => 'object',
+					),
+				),
+				'supports'    => array(
+					'__experimentalStyle' => array(
+						'typography' => array(
+							'fontSize' => '42rem',
+						),
+					),
+				),
+			)
+		);
+
+		// Make sure there is data from the theme origin.
+		switch_theme( 'block-theme' );
+
+		// Make sure there is data from the user origin.
+		wp_set_current_user( self::$administrator_id );
+		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
+		$config   = json_decode( $user_cpt['post_content'], true );
+		$config['settings']['color']['palette']['custom'] = array(
+			array(
+				'color' => 'hotpink',
+				'name'  => 'My color',
+				'slug'  => 'my-color',
+			),
+		);
+		$user_cpt['post_content']                         = wp_json_encode( $config );
+		wp_update_post( $user_cpt, true, false );
+
+		$theme_json = WP_Theme_JSON_Resolver::get_merged_data( $origin );
+		$settings   = $theme_json->get_settings();
+		$styles     = $theme_json->get_styles_block_nodes();
+		$styles     = array_filter(
+			$styles,
+			static function( $element ) {
+				return isset( $element['name'] ) && 'my/block-with-styles' === $element['name'];
+			}
+		);
+		unregister_block_type( 'my/block-with-styles' );
+
+		$this->assertSame( $core_palette, isset( $settings['color']['palette']['default'] ), $core_palette_text );
+		$this->assertSame( $block_styles, count( $styles ) === 1, $block_styles_text );
+		$this->assertSame( $theme_palette, isset( $settings['color']['palette']['theme'] ), $theme_palette_text );
+		$this->assertSame( $user_palette, isset( $settings['color']['palette']['custom'] ), $user_palette_text );
+
+	}
+
+	/**
+	 * Tests that get_merged_data returns the data merged up to the proper origin
+	 * and that the core values have the proper data.
+	 *
+	 * @ticket 57824
+	 *
+	 * @covers WP_Theme_JSON_Resolver::get_merged_data
+	 *
+	 */
+	public function test_get_merged_data_returns_origin_proper() {
+		// Make sure the theme has a theme.json
+		// though it doesn't have any data for styles.spacing.padding.
+		switch_theme( 'block-theme' );
+
+		// Make sure the user defined some data for styles.spacing.padding.
+		wp_set_current_user( self::$administrator_id );
+		$user_cpt                               = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
+		$config                                 = json_decode( $user_cpt['post_content'], true );
+		$config['styles']['spacing']['padding'] = array(
+			'top'    => '23px',
+			'left'   => '23px',
+			'bottom' => '23px',
+			'right'  => '23px',
+		);
+		$user_cpt['post_content']               = wp_json_encode( $config );
+		wp_update_post( $user_cpt, true, false );
+
+		// Query data from the user origin and then for the theme origin.
+		$theme_json_user  = WP_Theme_JSON_Resolver::get_merged_data( 'custom' );
+		$padding_user     = $theme_json_user->get_raw_data()['styles']['spacing']['padding'];
+		$theme_json_theme = WP_Theme_JSON_Resolver::get_merged_data( 'theme' );
+		$padding_theme    = $theme_json_theme->get_raw_data()['styles']['spacing']['padding'];
+
+		$this->assertSame( '23px', $padding_user['top'] );
+		$this->assertSame( '23px', $padding_user['right'] );
+		$this->assertSame( '23px', $padding_user['bottom'] );
+		$this->assertSame( '23px', $padding_user['left'] );
+		$this->assertSame( '0px', $padding_theme['top'] );
+		$this->assertSame( '0px', $padding_theme['right'] );
+		$this->assertSame( '0px', $padding_theme['bottom'] );
+		$this->assertSame( '0px', $padding_theme['left'] );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_get_merged_data_returns_origin() {
+		return array(
+			'origin_default' => array(
+				'origin'             => 'default',
+				'core_palette'       => true,
+				'core_palette_text'  => 'Core palette must be present',
+				'block_styles'       => false,
+				'block_styles_text'  => 'Block styles should not be present',
+				'theme_palette'      => false,
+				'theme_palette_text' => 'Theme palette should not be present',
+				'user_palette'       => false,
+				'user_palette_text'  => 'User palette should not be present',
+			),
+			'origin_blocks'  => array(
+				'origin'             => 'blocks',
+				'core_palette'       => true,
+				'core_palette_text'  => 'Core palette must be present',
+				'block_styles'       => true,
+				'block_styles_text'  => 'Block styles must be present',
+				'theme_palette'      => false,
+				'theme_palette_text' => 'Theme palette should not be present',
+				'user_palette'       => false,
+				'user_palette_text'  => 'User palette should not be present',
+			),
+			'origin_theme'   => array(
+				'origin'             => 'theme',
+				'core_palette'       => true,
+				'core_palette_text'  => 'Core palette must be present',
+				'block_styles'       => true,
+				'block_styles_text'  => 'Block styles must be present',
+				'theme_palette'      => true,
+				'theme_palette_text' => 'Theme palette must be present',
+				'user_palette'       => false,
+				'user_palette_text'  => 'User palette should not be present',
+			),
+			'origin_custom'  => array(
+				'origin'             => 'custom',
+				'core_palette'       => true,
+				'core_palette_text'  => 'Core palette must be present',
+				'block_styles'       => true,
+				'block_styles_text'  => 'Block styles must be present',
+				'theme_palette'      => true,
+				'theme_palette_text' => 'Theme palette must be present',
+				'user_palette'       => true,
+				'user_palette_text'  => 'User palette must be present',
+			),
+		);
+	}
+
+	/**
+	 * Tests that get_style_variations returns all variations, including parent theme variations if the theme is a child,
+	 * and that the child variation overwrites the parent variation of the same name.
+	 *
+	 * @ticket 57545
+	 *
+	 * @covers WP_Theme_JSON_Resolver::get_style_variations
+	 */
+	public function test_get_style_variations_returns_all_variations() {
+		// Switch to a child theme.
+		switch_theme( 'block-theme-child' );
+		wp_set_current_user( self::$administrator_id );
+
+		$actual_settings   = WP_Theme_JSON_Resolver::get_style_variations();
+		$expected_settings = array(
+			array(
+				'version'  => 2,
+				'title'    => 'variation-b',
+				'settings' => array(
+					'blocks' => array(
+						'core/post-title' => array(
+							'color' => array(
+								'palette' => array(
+									'theme' => array(
+										array(
+											'slug'  => 'dark',
+											'name'  => 'Dark',
+											'color' => '#010101',
+										),
+									),
+								),
+							),
+						),
+					),
+				),
+			),
+			array(
+				'version'  => 2,
+				'title'    => 'Block theme variation',
+				'settings' => array(
+					'color' => array(
+						'palette' => array(
+							'theme' => array(
+								array(
+									'slug'  => 'foreground',
+									'name'  => 'Foreground',
+									'color' => '#3F67C6',
+								),
+							),
+						),
+					),
+				),
+				'styles'   => array(
+					'blocks' => array(
+						'core/post-title' => array(
+							'typography' => array(
+								'fontWeight' => '700',
+							),
+						),
+					),
+				),
+			),
+		);
+
+		wp_recursive_ksort( $actual_settings );
+		wp_recursive_ksort( $expected_settings );
+
+		$this->assertSame(
+			$expected_settings,
+			$actual_settings
+		);
+	}
 }
diff --git a/tests/phpunit/tests/theme/wpThemeJsonSchema.php b/tests/phpunit/tests/theme/wpThemeJsonSchema.php
index 25cfcf7c97f0b..e93ef0673a3c8 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonSchema.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonSchema.php
@@ -19,7 +19,7 @@ class Tests_Theme_wpThemeJsonSchema extends WP_UnitTestCase {
 	/**
 	 * @ticket 54336
 	 */
-	function test_migrate_v1_to_v2() {
+	public function test_migrate_v1_to_v2() {
 		$theme_json_v1 = array(
 			'version'  => 1,
 			'settings' => array(
diff --git a/tests/phpunit/tests/url/getPrivacyPolicyUrl.php b/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
index ad0c9c1f005ea..0aab744a2c49f 100644
--- a/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
+++ b/tests/phpunit/tests/url/getPrivacyPolicyUrl.php
@@ -1,20 +1,14 @@
 <?php
 /**
- * Define a class to test `get_privacy_policy_url()`.
+ * Test cases for the `get_privacy_policy_url()` function.
  *
  * @package WordPress
  * @subpackage UnitTests
  * @since 4.9.6
- */
-
-/**
- * Test cases for `get_privacy_policy_url()`.
  *
  * @group url
  * @group privacy
  *
- * @since 4.9.6
- *
  * @covers ::get_privacy_policy_url
  */
 class Tests_Url_GetPrivacyPolicyUrl extends WP_UnitTestCase {
diff --git a/tests/phpunit/tests/user/author.php b/tests/phpunit/tests/user/author.php
deleted file mode 100644
index 311bbcd6f2f44..0000000000000
--- a/tests/phpunit/tests/user/author.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/**
- * Test functions in wp-includes/author-template.php
- *
- * @group author
- * @group user
- */
-class Tests_User_Author_Template extends WP_UnitTestCase {
-	protected static $author_id = 0;
-	protected static $post_id   = 0;
-
-	private $permalink_structure;
-
-	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
-		self::$author_id = $factory->user->create(
-			array(
-				'role'         => 'author',
-				'user_login'   => 'test_author',
-				'display_name' => 'Test Author',
-				'description'  => 'test_author',
-				'user_url'     => 'http://example.com',
-			)
-		);
-
-		self::$post_id = $factory->post->create(
-			array(
-				'post_author'  => self::$author_id,
-				'post_status'  => 'publish',
-				'post_content' => 'content',
-				'post_title'   => 'title',
-				'post_type'    => 'post',
-			)
-		);
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		setup_postdata( get_post( self::$post_id ) );
-	}
-
-	public function test_get_the_author() {
-		$author_name = get_the_author();
-		$user        = new WP_User( self::$author_id );
-
-		$this->assertSame( $user->display_name, $author_name );
-		$this->assertSame( 'Test Author', $author_name );
-	}
-
-	public function test_get_the_author_meta() {
-		$this->assertSame( 'test_author', get_the_author_meta( 'login' ) );
-		$this->assertSame( 'test_author', get_the_author_meta( 'user_login' ) );
-		$this->assertSame( 'Test Author', get_the_author_meta( 'display_name' ) );
-
-		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
-		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
-		add_user_meta( self::$author_id, 'user_description', 'user description' );
-		$this->assertSame( 'user description', get_user_meta( self::$author_id, 'user_description', true ) );
-		// user_description in meta is ignored. The content of description is returned instead.
-		// See #20285.
-		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
-		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
-		update_user_meta( self::$author_id, 'user_description', '' );
-		$this->assertSame( '', get_user_meta( self::$author_id, 'user_description', true ) );
-		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
-		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
-
-		$this->assertSame( '', get_the_author_meta( 'does_not_exist' ) );
-	}
-
-	public function test_get_the_author_meta_no_authordata() {
-		unset( $GLOBALS['authordata'] );
-		$this->assertSame( '', get_the_author_meta( 'id' ) );
-		$this->assertSame( '', get_the_author_meta( 'user_login' ) );
-		$this->assertSame( '', get_the_author_meta( 'does_not_exist' ) );
-	}
-
-	public function test_get_the_author_posts() {
-		// Test with no global post, result should be 0 because no author is found.
-		$this->assertSame( 0, get_the_author_posts() );
-		$GLOBALS['post'] = self::$post_id;
-		$this->assertEquals( 1, get_the_author_posts() );
-	}
-
-	/**
-	 * @ticket 30904
-	 */
-	public function test_get_the_author_posts_with_custom_post_type() {
-		register_post_type( 'wptests_pt' );
-
-		$cpt_ids         = self::factory()->post->create_many(
-			2,
-			array(
-				'post_author' => self::$author_id,
-				'post_type'   => 'wptests_pt',
-			)
-		);
-		$GLOBALS['post'] = $cpt_ids[0];
-
-		$this->assertEquals( 2, get_the_author_posts() );
-
-		_unregister_post_type( 'wptests_pt' );
-	}
-
-	/**
-	 * @ticket 30355
-	 */
-	public function test_get_the_author_posts_link_no_permalinks() {
-		$author = get_userdata( self::$author_id );
-
-		$GLOBALS['authordata'] = $author->data;
-
-		$link = get_the_author_posts_link();
-
-		$url = sprintf( 'http://%1$s/?author=%2$s', WP_TESTS_DOMAIN, $author->ID );
-
-		$this->assertStringContainsString( $url, $link );
-		$this->assertStringContainsString( 'Posts by Test Author', $link );
-		$this->assertStringContainsString( '>Test Author</a>', $link );
-
-		unset( $GLOBALS['authordata'] );
-	}
-
-	/**
-	 * @ticket 30355
-	 */
-	public function test_get_the_author_posts_link_with_permalinks() {
-		$this->set_permalink_structure( '/%postname%/' );
-
-		$author = get_userdata( self::$author_id );
-
-		$GLOBALS['authordata'] = $author;
-
-		$link = get_the_author_posts_link();
-
-		$url = sprintf( 'http://%1$s/author/%2$s/', WP_TESTS_DOMAIN, $author->user_nicename );
-
-		$this->set_permalink_structure( '' );
-
-		$this->assertStringContainsString( $url, $link );
-		$this->assertStringContainsString( 'Posts by Test Author', $link );
-		$this->assertStringContainsString( '>Test Author</a>', $link );
-
-		unset( $GLOBALS['authordata'] );
-	}
-
-	/**
-	 * @ticket 51859
-	 *
-	 * @covers ::get_the_author_link
-	 */
-	public function test_get_the_author_link() {
-		$author_url          = get_the_author_meta( 'url' );
-		$author_display_name = get_the_author();
-
-		$link = get_the_author_link();
-
-		$this->assertStringContainsString( $author_url, $link, 'The link does not contain the author URL' );
-		$this->assertStringContainsString( $author_display_name, $link, 'The link does not contain the author display name' );
-	}
-
-	/**
-	 * @ticket 51859
-	 *
-	 * @covers ::get_the_author_link
-	 */
-	public function test_filtered_get_the_author_link() {
-		$filter = new MockAction();
-
-		add_filter( 'the_author_link', array( &$filter, 'filter' ) );
-
-		get_the_author_link();
-
-		$this->assertSame( 1, $filter->get_call_count() );
-		$this->assertSame( array( 'the_author_link' ), $filter->get_hook_names() );
-	}
-}
diff --git a/tests/phpunit/tests/user/capabilities.php b/tests/phpunit/tests/user/capabilities.php
index c7e836f6e583e..beecfd3b85a03 100644
--- a/tests/phpunit/tests/user/capabilities.php
+++ b/tests/phpunit/tests/user/capabilities.php
@@ -1314,13 +1314,9 @@ public function test_post_meta_caps() {
 		}
 	}
 
-	public function authorless_post_statuses() {
-		return array( array( 'draft' ), array( 'private' ), array( 'publish' ) );
-	}
-
 	/**
 	 * @ticket 27020
-	 * @dataProvider authorless_post_statuses
+	 * @dataProvider data_authorless_post
 	 */
 	public function test_authorless_post( $status ) {
 		// Make a post without an author.
@@ -1349,6 +1345,10 @@ public function test_authorless_post( $status ) {
 		$this->assertSame( 'publish' === $status, $contributor->has_cap( 'read_post', $post ) );
 	}
 
+	public function data_authorless_post() {
+		return array( array( 'draft' ), array( 'private' ), array( 'publish' ) );
+	}
+
 	/**
 	 * @ticket 16714
 	 */
@@ -1707,7 +1707,7 @@ public function test_borked_current_user_can_for_blog() {
 	}
 
 	public function nullify_current_user() {
-		// Prevents fatal errors in ::tearDown()'s and other uses of restore_current_blog().
+		// Prevents fatal errors in ::tear_down()'s and other uses of restore_current_blog().
 		$function_stack = wp_debug_backtrace_summary( null, 0, false );
 		if ( in_array( 'restore_current_blog', $function_stack, true ) ) {
 			return;
diff --git a/tests/phpunit/tests/user/getTheAuthor.php b/tests/phpunit/tests/user/getTheAuthor.php
new file mode 100644
index 0000000000000..ebddcb3d5abe6
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheAuthor.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_author
+ */
+class Tests_User_GetTheAuthor extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		setup_postdata( get_post( self::$post_id ) );
+	}
+
+	public function test_get_the_author() {
+		$author_name = get_the_author();
+		$user        = new WP_User( self::$author_id );
+
+		$this->assertSame( $user->display_name, $author_name );
+		$this->assertSame( 'Test Author', $author_name );
+	}
+
+	/**
+	 * @ticket 58157
+	 */
+	public function test_get_the_author_should_return_empty_string_if_authordata_is_not_set() {
+		unset( $GLOBALS['authordata'] );
+
+		$this->assertSame( '', get_the_author() );
+	}
+}
diff --git a/tests/phpunit/tests/user/getTheAuthorLink.php b/tests/phpunit/tests/user/getTheAuthorLink.php
new file mode 100644
index 0000000000000..ce44774f1ce51
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheAuthorLink.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_author_link
+ */
+class Tests_User_GetTheAuthorLink extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		setup_postdata( get_post( self::$post_id ) );
+	}
+
+	/**
+	 * @ticket 51859
+	 *
+	 * @covers ::get_the_author_link
+	 */
+	public function test_get_the_author_link() {
+		$author_url          = get_the_author_meta( 'url' );
+		$author_display_name = get_the_author();
+
+		$link = get_the_author_link();
+
+		$this->assertStringContainsString( $author_url, $link, 'The link does not contain the author URL' );
+		$this->assertStringContainsString( $author_display_name, $link, 'The link does not contain the author display name' );
+	}
+
+	/**
+	 * @ticket 51859
+	 *
+	 * @covers ::get_the_author_link
+	 */
+	public function test_filtered_get_the_author_link() {
+		$filter = new MockAction();
+
+		add_filter( 'the_author_link', array( &$filter, 'filter' ) );
+
+		get_the_author_link();
+
+		$this->assertSame( 1, $filter->get_call_count() );
+		$this->assertSame( array( 'the_author_link' ), $filter->get_hook_names() );
+	}
+}
diff --git a/tests/phpunit/tests/user/getTheAuthorMeta.php b/tests/phpunit/tests/user/getTheAuthorMeta.php
new file mode 100644
index 0000000000000..d9d225812bb30
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheAuthorMeta.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_author_meta
+ */
+class Tests_User_GetTheAuthorMeta extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		setup_postdata( get_post( self::$post_id ) );
+	}
+
+	public function test_get_the_author_meta() {
+		$this->assertSame( 'test_author', get_the_author_meta( 'login' ) );
+		$this->assertSame( 'test_author', get_the_author_meta( 'user_login' ) );
+		$this->assertSame( 'Test Author', get_the_author_meta( 'display_name' ) );
+
+		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
+		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
+
+		add_user_meta( self::$author_id, 'user_description', 'user description' );
+		$this->assertSame( 'user description', get_user_meta( self::$author_id, 'user_description', true ) );
+		// user_description in meta is ignored. The content of description is returned instead.
+		// See #20285.
+		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
+		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
+
+		update_user_meta( self::$author_id, 'user_description', '' );
+		$this->assertSame( '', get_user_meta( self::$author_id, 'user_description', true ) );
+		$this->assertSame( 'test_author', get_the_author_meta( 'user_description' ) );
+		$this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
+
+		$this->assertSame( '', get_the_author_meta( 'does_not_exist' ) );
+	}
+
+	/**
+	 * @ticket 20529
+	 * @ticket 58157
+	 */
+	public function test_get_the_author_meta_should_return_empty_string_if_authordata_is_not_set() {
+		unset( $GLOBALS['authordata'] );
+
+		$this->assertSame( '', get_the_author_meta( 'id' ) );
+		$this->assertSame( '', get_the_author_meta( 'user_login' ) );
+		$this->assertSame( '', get_the_author_meta( 'does_not_exist' ) );
+	}
+}
diff --git a/tests/phpunit/tests/user/getTheAuthorPosts.php b/tests/phpunit/tests/user/getTheAuthorPosts.php
new file mode 100644
index 0000000000000..5cd87bc79ba95
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheAuthorPosts.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_author_posts
+ */
+class Tests_User_GetTheAuthorPosts extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		setup_postdata( get_post( self::$post_id ) );
+	}
+
+	public function test_get_the_author_posts() {
+		// Test with no global post, result should be 0 because no author is found.
+		$this->assertSame( 0, get_the_author_posts() );
+		$GLOBALS['post'] = self::$post_id;
+		$this->assertEquals( 1, get_the_author_posts() );
+	}
+
+	/**
+	 * @ticket 30904
+	 */
+	public function test_get_the_author_posts_with_custom_post_type() {
+		register_post_type( 'wptests_pt' );
+
+		$cpt_ids         = self::factory()->post->create_many(
+			2,
+			array(
+				'post_author' => self::$author_id,
+				'post_type'   => 'wptests_pt',
+			)
+		);
+		$GLOBALS['post'] = $cpt_ids[0];
+
+		$this->assertEquals( 2, get_the_author_posts() );
+
+		_unregister_post_type( 'wptests_pt' );
+	}
+}
diff --git a/tests/phpunit/tests/user/getTheAuthorPostsLink.php b/tests/phpunit/tests/user/getTheAuthorPostsLink.php
new file mode 100644
index 0000000000000..3fd96774df57e
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheAuthorPostsLink.php
@@ -0,0 +1,91 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_author_posts_link
+ */
+class Tests_User_GetTheAuthorPostsLink extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		setup_postdata( get_post( self::$post_id ) );
+	}
+
+	/**
+	 * @ticket 30355
+	 */
+	public function test_get_the_author_posts_link_no_permalinks() {
+		$author = get_userdata( self::$author_id );
+
+		$GLOBALS['authordata'] = $author->data;
+
+		$link = get_the_author_posts_link();
+
+		$url = sprintf( 'http://%1$s/?author=%2$s', WP_TESTS_DOMAIN, $author->ID );
+
+		$this->assertStringContainsString( $url, $link );
+		$this->assertStringContainsString( 'Posts by Test Author', $link );
+		$this->assertStringContainsString( '>Test Author</a>', $link );
+
+		unset( $GLOBALS['authordata'] );
+	}
+
+	/**
+	 * @ticket 30355
+	 */
+	public function test_get_the_author_posts_link_with_permalinks() {
+		$this->set_permalink_structure( '/%postname%/' );
+
+		$author = get_userdata( self::$author_id );
+
+		$GLOBALS['authordata'] = $author;
+
+		$link = get_the_author_posts_link();
+
+		$url = sprintf( 'http://%1$s/author/%2$s/', WP_TESTS_DOMAIN, $author->user_nicename );
+
+		$this->set_permalink_structure( '' );
+
+		$this->assertStringContainsString( $url, $link );
+		$this->assertStringContainsString( 'Posts by Test Author', $link );
+		$this->assertStringContainsString( '>Test Author</a>', $link );
+
+		unset( $GLOBALS['authordata'] );
+	}
+
+	/**
+	 * @ticket 58157
+	 */
+	public function test_get_the_author_posts_link_should_return_empty_string_if_authordata_is_not_set() {
+		unset( $GLOBALS['authordata'] );
+
+		$this->assertSame( '', get_the_author_posts_link() );
+	}
+}
diff --git a/tests/phpunit/tests/user/getTheModifiedAuthor.php b/tests/phpunit/tests/user/getTheModifiedAuthor.php
new file mode 100644
index 0000000000000..4a797bcbc6b48
--- /dev/null
+++ b/tests/phpunit/tests/user/getTheModifiedAuthor.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @group author
+ * @group user
+ *
+ * @covers ::get_the_modified_author
+ */
+class Tests_User_GetTheModifiedAuthor extends WP_UnitTestCase {
+	protected static $author_id = 0;
+	protected static $post_id   = 0;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_id = $factory->user->create(
+			array(
+				'role'         => 'author',
+				'user_login'   => 'test_author',
+				'display_name' => 'Test Author',
+				'description'  => 'test_author',
+				'user_url'     => 'http://example.com',
+			)
+		);
+
+		self::$post_id = $factory->post->create(
+			array(
+				'post_author'  => self::$author_id,
+				'post_status'  => 'publish',
+				'post_content' => 'content',
+				'post_title'   => 'title',
+				'post_type'    => 'post',
+			)
+		);
+
+		add_post_meta( self::$post_id, '_edit_last', self::$author_id );
+	}
+
+	public function set_up() {
+		parent::set_up();
+
+		$GLOBALS['post'] = self::$post_id;
+	}
+
+	public function test_get_the_modified_author() {
+		$author_name = get_the_modified_author();
+		$user        = new WP_User( self::$author_id );
+
+		$this->assertSame( $user->display_name, $author_name );
+		$this->assertSame( 'Test Author', $author_name );
+	}
+
+	/**
+	 * @ticket 58157
+	 */
+	public function test_get_the_modified_author_should_return_empty_string_if_user_id_does_not_exist() {
+		update_post_meta( self::$post_id, '_edit_last', -1 );
+
+		$this->assertSame( '', get_the_modified_author() );
+	}
+}
diff --git a/tests/phpunit/tests/user/multisite.php b/tests/phpunit/tests/user/multisite.php
index 23079f4799ea0..e3173db43e0c5 100644
--- a/tests/phpunit/tests/user/multisite.php
+++ b/tests/phpunit/tests/user/multisite.php
@@ -59,15 +59,15 @@ public function test_get_blogs_of_user() {
 			// Each site retrieved should match the expected structure.
 			foreach ( $blogs_of_user as $blog_id => $blog ) {
 				$this->assertSame( $blog_id, $blog->userblog_id );
-				$this->assertObjectHasAttribute( 'userblog_id', $blog );
-				$this->assertObjectHasAttribute( 'blogname', $blog );
-				$this->assertObjectHasAttribute( 'domain', $blog );
-				$this->assertObjectHasAttribute( 'path', $blog );
-				$this->assertObjectHasAttribute( 'site_id', $blog );
-				$this->assertObjectHasAttribute( 'siteurl', $blog );
-				$this->assertObjectHasAttribute( 'archived', $blog );
-				$this->assertObjectHasAttribute( 'spam', $blog );
-				$this->assertObjectHasAttribute( 'deleted', $blog );
+				$this->assertObjectHasProperty( 'userblog_id', $blog );
+				$this->assertObjectHasProperty( 'blogname', $blog );
+				$this->assertObjectHasProperty( 'domain', $blog );
+				$this->assertObjectHasProperty( 'path', $blog );
+				$this->assertObjectHasProperty( 'site_id', $blog );
+				$this->assertObjectHasProperty( 'siteurl', $blog );
+				$this->assertObjectHasProperty( 'archived', $blog );
+				$this->assertObjectHasProperty( 'spam', $blog );
+				$this->assertObjectHasProperty( 'deleted', $blog );
 			}
 
 			// Mark each remaining site as spam, archived, and deleted.
diff --git a/tests/phpunit/tests/user/passwordHash.php b/tests/phpunit/tests/user/passwordHash.php
new file mode 100644
index 0000000000000..1179ba25b2680
--- /dev/null
+++ b/tests/phpunit/tests/user/passwordHash.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Tests for the PasswordHash external library.
+ *
+ * @covers PasswordHash
+ */
+class Tests_User_PasswordHash extends WP_UnitTestCase {
+
+	public static function set_up_before_class() {
+		parent::set_up_before_class();
+
+		require_once ABSPATH . WPINC . '/class-phpass.php';
+	}
+
+	/**
+	 * Tests that PasswordHash::gensalt_blowfish() does not throw a deprecation notice on PHP 8.1.
+	 *
+	 * The notice that we should not see:
+	 * `Deprecated: Implicit conversion from float to int loses precision`.
+	 *
+	 * @ticket 56340
+	 *
+	 * @covers PasswordHash::gensalt_blowfish
+	 *
+	 * @requires PHP 8.1
+	 * @doesNotPerformAssertions
+	 */
+	public function test_gensalt_blowfish_should_not_throw_deprecation_notice_on_php81() {
+		$hasher = new PasswordHash( 8, true );
+		$hasher->gensalt_blowfish( 'a password string' );
+	}
+
+}
diff --git a/tests/phpunit/tests/user/query.php b/tests/phpunit/tests/user/query.php
index 788ac770527bf..6be692af979f6 100644
--- a/tests/phpunit/tests/user/query.php
+++ b/tests/phpunit/tests/user/query.php
@@ -186,7 +186,7 @@ public function test_get_total_is_int() {
 	}
 
 	/**
-	 * @dataProvider orderby_should_convert_non_prefixed_keys_data
+	 * @dataProvider data_orderby_should_convert_non_prefixed_keys
 	 */
 	public function test_orderby_should_convert_non_prefixed_keys( $short_key, $full_key ) {
 		$q = new WP_User_Query(
@@ -198,7 +198,7 @@ public function test_orderby_should_convert_non_prefixed_keys( $short_key, $full
 		$this->assertStringContainsString( "ORDER BY $full_key", $q->query_orderby );
 	}
 
-	public function orderby_should_convert_non_prefixed_keys_data() {
+	public function data_orderby_should_convert_non_prefixed_keys() {
 		return array(
 			array( 'nicename', 'user_nicename' ),
 			array( 'email', 'user_email' ),
@@ -1720,11 +1720,9 @@ public function test_search_by_display_name_only_ignore_others() {
 	 * @ticket 44169
 	 */
 	public function test_users_pre_query_filter_should_bypass_database_query() {
-		global $wpdb;
-
 		add_filter( 'users_pre_query', array( __CLASS__, 'filter_users_pre_query' ), 10, 2 );
 
-		$num_queries = $wpdb->num_queries;
+		$num_queries = get_num_queries();
 		$q           = new WP_User_Query(
 			array(
 				'fields' => 'ID',
@@ -1734,7 +1732,7 @@ public function test_users_pre_query_filter_should_bypass_database_query() {
 		remove_filter( 'users_pre_query', array( __CLASS__, 'filter_users_pre_query' ), 10, 2 );
 
 		// Make sure no queries were executed.
-		$this->assertSame( $num_queries, $wpdb->num_queries );
+		$this->assertSame( $num_queries, get_num_queries() );
 
 		// We manually inserted a non-existing user and overrode the results with it.
 		$this->assertSame( array( 555 ), $q->results );
@@ -2011,7 +2009,7 @@ public function test_returning_field_subset_as_string( $field, $expected ) {
 	 *
 	 * @return array
 	 */
-	function data_returning_field_subset_as_string() {
+	public function data_returning_field_subset_as_string() {
 		$data = array(
 			'id'            => array(
 				'fields'   => 'id',
@@ -2093,7 +2091,7 @@ public function test_returning_field_subset_as_array( $field, $expected ) {
 	 *
 	 * @return array
 	 */
-	function data_returning_field_subset_as_array() {
+	public function data_returning_field_subset_as_array() {
 		$data = array(
 			'id'                 => array(
 				'fields'   => array( 'id' ),
@@ -2229,4 +2227,152 @@ public function test_returning_field_user_registered() {
 		$results = $q->get_results();
 		$this->assertNotFalse( DateTime::createFromFormat( 'Y-m-d H:i:s', $results[0] ) );
 	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__get()
+	 *
+	 * @param string $property_name Property name to get.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_get_compat_fields( $property_name, $expected ) {
+		$user_query = new WP_User_Query();
+
+		$this->assertSame( $expected, $user_query->$property_name );
+	}
+
+	/**
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__get()
+	 */
+	public function test_should_throw_deprecation_when_getting_dynamic_property() {
+		$user_query = new WP_User_Query();
+
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undefined_property` is not declared. Getting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertNull( $user_query->undefined_property, 'Getting a dynamic property should return null from WP_User_Query::__get()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__set()
+	 *
+	 * @param string $property_name Property name to set.
+	 */
+	public function test_should_set_compat_fields( $property_name ) {
+		$user_query = new WP_User_Query();
+		$value      = uniqid();
+
+		$user_query->$property_name = $value;
+		$this->assertSame( $value, $user_query->$property_name );
+	}
+
+	/**
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__set()
+	 */
+	public function test_should_throw_deprecation_when_setting_dynamic_property() {
+		$user_query = new WP_User_Query();
+
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undefined_property` is not declared. Setting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$user_query->undefined_property = 'some value';
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__isset()
+	 *
+	 * @param string $property_name Property name to check.
+	 * @param mixed $expected       Expected value.
+	 */
+	public function test_should_isset_compat_fields( $property_name, $expected ) {
+		$user_query = new WP_User_Query();
+
+		$actual = isset( $user_query->$property_name );
+		if ( is_null( $expected ) ) {
+			$this->assertFalse( $actual );
+		} else {
+			$this->assertTrue( $actual );
+		}
+	}
+
+	/**
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__isset()
+	 */
+	public function test_should_throw_deprecation_when_isset_of_dynamic_property() {
+		$user_query = new WP_User_Query();
+
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'The property `undefined_property` is not declared. Checking `isset()` on a dynamic property ' .
+			'is deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		$this->assertFalse( isset( $user_query->undefined_property ), 'Checking a dynamic property should return false from WP_User_Query::__isset()' );
+	}
+
+	/**
+	 * @dataProvider data_compat_fields
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__unset()
+	 *
+	 * @param string $property_name Property name to unset.
+	 */
+	public function test_should_unset_compat_fields( $property_name ) {
+		$user_query = new WP_User_Query();
+
+		unset( $user_query->$property_name );
+		$this->assertFalse( isset( $user_query->$property_name ) );
+	}
+
+	/**
+	 * @ticket 58897
+	 *
+	 * @covers WP_User_Query::__unset()
+	 */
+	public function test_should_throw_deprecation_when_unset_of_dynamic_property() {
+		$user_query = new WP_User_Query();
+
+		$this->expectDeprecation();
+		$this->expectDeprecationMessage(
+			'A property `undefined_property` is not declared. Unsetting a dynamic property is ' .
+			'deprecated since version 6.4.0! Instead, declare the property on the class.'
+		);
+		unset( $user_query->undefined_property );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array
+	 */
+	public function data_compat_fields() {
+		return array(
+			'results'     => array(
+				'property_name' => 'results',
+				'expected'      => null,
+			),
+			'total_users' => array(
+				'property_name' => 'total_users',
+				'expected'      => 0,
+			),
+		);
+	}
 }
diff --git a/tests/phpunit/tests/user/queryCache.php b/tests/phpunit/tests/user/queryCache.php
new file mode 100644
index 0000000000000..d8d26286a716a
--- /dev/null
+++ b/tests/phpunit/tests/user/queryCache.php
@@ -0,0 +1,803 @@
+<?php
+/**
+ * Test WP_User Query, in wp-includes/user.php
+ *
+ * @group user
+ *
+ * @coversDefaultClass WP_User_Query
+ */
+class Tests_User_Query_Cache extends WP_UnitTestCase {
+	/**
+	 * @var int[]
+	 */
+	protected static $author_ids;
+
+	/**
+	 * @var int[]
+	 */
+	protected static $sub_ids;
+
+	/**
+	 * @var int[]
+	 */
+	protected static $editor_ids;
+
+	/**
+	 * @var int[]
+	 */
+	protected static $contrib_id;
+
+	/**
+	 * @var int[]
+	 */
+	protected static $admin_ids;
+
+	/**
+	 * @var int[]
+	 */
+	protected $user_id;
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$author_ids = $factory->user->create_many(
+			4,
+			array(
+				'role' => 'author',
+			)
+		);
+
+		self::$sub_ids = $factory->user->create_many(
+			2,
+			array(
+				'role' => 'subscriber',
+			)
+		);
+
+		self::$editor_ids = $factory->user->create_many(
+			3,
+			array(
+				'role' => 'editor',
+			)
+		);
+
+		self::$contrib_id = $factory->user->create(
+			array(
+				'role' => 'contributor',
+			)
+		);
+
+		self::$admin_ids = $factory->user->create_many(
+			2,
+			array(
+				'role' => 'administrator',
+			)
+		);
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_different_count() {
+		$args = array(
+			'count_total' => true,
+		);
+
+		$query1       = new WP_User_Query( $args );
+		$users1       = wp_list_pluck( $query1->get_results(), 'ID' );
+		$users_total1 = $query1->get_total();
+
+		$queries_before = get_num_queries();
+
+		$args = array(
+			'count_total' => false,
+		);
+
+		$query2        = new WP_User_Query( $args );
+		$users2        = wp_list_pluck( $query2->get_results(), 'ID' );
+		$users_total2  = $query2->get_total();
+		$queries_after = get_num_queries();
+
+		$this->assertNotSame( $queries_before, $queries_after, 'Assert that the number of queries is not equal' );
+		$this->assertNotSame( $users_total1, $users_total2, 'Assert that totals do not match' );
+		$this->assertSameSets( $users1, $users2, 'Results of the query are expected to match.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_results() {
+		$args = array(
+			'cache_results' => true,
+		);
+
+		$query1 = new WP_User_Query( $args );
+		$users1 = wp_list_pluck( $query1->get_results(), 'ID' );
+
+		$queries_before = get_num_queries();
+
+		$args = array(
+			'cache_results' => false,
+		);
+
+		$query2        = new WP_User_Query( $args );
+		$users2        = wp_list_pluck( $query2->get_results(), 'ID' );
+		$queries_after = get_num_queries();
+
+		$this->assertNotSame( $queries_before, $queries_after, 'Assert that queries are run' );
+		$this->assertSameSets( $users1, $users2, 'Results of the query are expected to match.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 * @expectedDeprecated WP_User_Query
+	 */
+	public function test_query_cache_who() {
+		$args = array(
+			'who'    => 'authors',
+			'fields' => array( 'ID' ),
+		);
+
+		$query1       = new WP_User_Query( $args );
+		$users1       = $query1->get_results();
+		$users_total1 = $query1->get_total();
+
+		$queries_before = get_num_queries();
+		$query2         = new WP_User_Query( $args );
+		$users2         = $query2->get_results();
+		$users_total2   = $query2->get_total();
+		$queries_after  = get_num_queries();
+
+		$this->assertSame( $queries_before, $queries_after, 'No queries are expected run.' );
+		$this->assertSame( $users_total1, $users_total2, 'Number of users returned us expected to match.' );
+		$this->assertSameSets( $users1, $users2, 'Results of the query are expected to match.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 * @dataProvider data_query_cache
+	 * @param array $args Optional. See WP_User_Query::prepare_query()
+	 */
+	public function test_query_cache( array $args ) {
+		$query1       = new WP_User_Query( $args );
+		$users1       = $query1->get_results();
+		$users_total1 = $query1->get_total();
+
+		$queries_before = get_num_queries();
+		$query2         = new WP_User_Query( $args );
+		$users2         = $query2->get_results();
+		$users_total2   = $query2->get_total();
+		$queries_after  = get_num_queries();
+
+		$this->assertSame( 0, $queries_after - $queries_before, 'Assert that no queries are run' );
+		$this->assertSame( $users_total1, $users_total2, 'Assert that totals do match' );
+		$this->assertSameSets( $users1, $users2, 'Asset that results of query match' );
+	}
+
+	/**
+	 * Data provider
+	 *
+	 * @return array
+	 */
+	public function data_query_cache() {
+		$data = array(
+			'id'                    => array(
+				'args' => array( 'fields' => array( 'id' ) ),
+
+			),
+			'ID'                    => array(
+				'args' => array( 'fields' => array( 'ID' ) ),
+			),
+			'user_login'            => array(
+				'args' => array( 'fields' => array( 'user_login' ) ),
+			),
+			'user_nicename'         => array(
+				'args' => array( 'fields' => array( 'user_nicename' ) ),
+			),
+			'user_email'            => array(
+				'args' => array( 'fields' => array( 'user_email' ) ),
+			),
+			'user_url'              => array(
+				'args' => array( 'fields' => array( 'user_url' ) ),
+			),
+			'user_status'           => array(
+				'args' => array( 'fields' => array( 'user_status' ) ),
+			),
+			'display_name'          => array(
+				'args' => array( 'fields' => array( 'display_name' ) ),
+			),
+			'invalid_field'         => array(
+				'args' => array( 'fields' => array( 'invalid_field' ) ),
+			),
+			'valid array inc id'    => array(
+				'args' => array( 'fields' => array( 'display_name', 'user_email', 'id' ) ),
+			),
+			'valid array inc ID'    => array(
+				'args' => array( 'fields' => array( 'display_name', 'user_email', 'ID' ) ),
+			),
+			'partly valid array'    => array(
+				'args' => array( 'fields' => array( 'display_name', 'invalid_field' ) ),
+			),
+			'orderby'               => array(
+				'args' => array(
+					'fields'  => array( 'ID' ),
+					'orderby' => array( 'login', 'nicename' ),
+				),
+			),
+			'meta query'            => array(
+				'args' => array(
+					'fields'     => array( 'ID' ),
+					'meta_query' => array(
+						'foo_key' => array(
+							'key'     => 'foo',
+							'compare' => 'EXISTS',
+						),
+					),
+					'orderby'    => 'foo_key',
+					'order'      => 'DESC',
+				),
+			),
+			'meta query LIKE'       => array(
+				'args' => array(
+					'fields'     => array( 'ID' ),
+					'meta_query' => array(
+						array(
+							'key'     => 'foo',
+							'value'   => '00',
+							'compare' => 'LIKE',
+						),
+					),
+					'orderby'    => 'foo_key',
+					'order'      => 'DESC',
+				),
+			),
+			'published posts'       => array(
+				'args' => array(
+					'has_published_posts' => true,
+					'fields'              => array( 'ID' ),
+				),
+			),
+			'published posts order' => array(
+				'args' => array(
+					'orderby' => 'post_count',
+					'fields'  => array( 'ID' ),
+				),
+			),
+			'published count_total' => array(
+				'args' => array(
+
+					'count_total' => false,
+					'fields'      => array( 'ID' ),
+				),
+			),
+			'capability'            => array(
+				'args' => array(
+					'capability' => 'install_plugins',
+					'fields'     => array( 'ID' ),
+				),
+			),
+			'include'               => array(
+				'args' => array(
+					'includes' => self::$author_ids,
+					'fields'   => array( 'ID' ),
+				),
+			),
+			'exclude'               => array(
+				'args' => array(
+					'exclude' => self::$author_ids,
+					'fields'  => array( 'ID' ),
+				),
+			),
+			'search'                => array(
+				'args' => array(
+					'search' => 'User',
+					'fields' => array( 'ID' ),
+				),
+			),
+		);
+
+		if ( is_multisite() ) {
+			$data['spam']    = array(
+				'args' => array( 'fields' => array( 'spam' ) ),
+			);
+			$data['deleted'] = array(
+				'args' => array( 'fields' => array( 'deleted' ) ),
+			);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_remove_user_role() {
+		$user_id = self::factory()->user->create( array( 'role' => 'author' ) );
+
+		$q1 = new WP_User_Query(
+			array(
+				'role' => 'author',
+			)
+		);
+
+		$found = wp_list_pluck( $q1->get_results(), 'ID' );
+
+		$this->assertContains( $user_id, $found, 'Expected to find author in returned values.' );
+
+		$user = get_user_by( 'id', $user_id );
+		$user->remove_role( 'author' );
+
+		$q2 = new WP_User_Query(
+			array(
+				'role' => 'author',
+			)
+		);
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertNotContains( $user_id, $found, 'Expected not to find author in returned values.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_set_user_role() {
+		$user_id = self::factory()->user->create( array( 'role' => 'author' ) );
+
+		$q1 = new WP_User_Query(
+			array(
+				'role' => 'author',
+			)
+		);
+
+		$found = wp_list_pluck( $q1->get_results(), 'ID' );
+
+		$this->assertContains( $user_id, $found, 'Expected to find author in returned values.' );
+
+		$user = get_user_by( 'id', $user_id );
+		$user->set_role( 'editor' );
+
+		$q2 = new WP_User_Query(
+			array(
+				'role' => 'author',
+			)
+		);
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertNotContains( $user_id, $found, 'Expected not to find author in returned values.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_delete_user() {
+		$user_id = self::factory()->user->create();
+
+		$q1 = new WP_User_Query(
+			array(
+				'include' => array( $user_id ),
+			)
+		);
+
+		$found    = wp_list_pluck( $q1->get_results(), 'ID' );
+		$expected = array( $user_id );
+
+		$this->assertSameSets( $expected, $found, 'Find author in returned values' );
+
+		wp_delete_user( $user_id );
+
+		$q2 = new WP_User_Query(
+			array(
+				'include' => array( $user_id ),
+			)
+		);
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertNotContains( $user_id, $found, 'Expected not to find author in returned values.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_do_not_cache() {
+		$user_id = self::factory()->user->create();
+
+		$args = array(
+			'fields'  => array(
+				'user_login',
+				'user_nicename',
+				'user_email',
+				'user_url',
+				'user_status',
+				'display_name',
+			),
+			'include' => array( $user_id ),
+		);
+
+		$q1       = new WP_User_Query( $args );
+		$found1   = $q1->get_results();
+		$callback = static function( $user ) {
+			return (array) $user;
+		};
+
+		$found1 = array_map( $callback, $found1 );
+
+		$queries_before = get_num_queries();
+		$q2             = new WP_User_Query( $args );
+		$found2         = $q2->get_results();
+		$found2         = array_map( $callback, $found2 );
+		$queries_after  = get_num_queries();
+
+		$this->assertSame( $queries_after - $queries_before, 2, 'Ensure that query is not cached' );
+		$this->assertSameSets( $found1, $found2, 'Expected results to match.', 'Ensure that to results match' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_update_user() {
+		$user_id = end( self::$admin_ids );
+
+		wp_update_user(
+			array(
+				'ID'            => $user_id,
+				'user_nicename' => 'paul',
+			)
+		);
+
+		$args = array(
+			'nicename__in' => array( 'paul' ),
+		);
+
+		$q1 = new WP_User_Query( $args );
+
+		$found    = wp_list_pluck( $q1->get_results(), 'ID' );
+		$expected = array( $user_id );
+
+		$this->assertSameSets( $expected, $found, 'Find author in returned values' );
+
+		wp_update_user(
+			array(
+				'ID'            => $user_id,
+				'user_nicename' => 'linda',
+			)
+		);
+
+		$q2 = new WP_User_Query( $args );
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertNotContains( $user_id, $found, 'Expected not to find author in returned values.' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_query_cache_create_user() {
+		$user_id = end( self::$admin_ids );
+
+		$args = array( 'blog_id' => get_current_blog_id() );
+
+		$q1 = new WP_User_Query( $args );
+
+		$found = wp_list_pluck( $q1->get_results(), 'ID' );
+
+		$this->assertContains( $user_id, $found, 'Expected to find author in returned values.' );
+
+		$user_id_2 = self::factory()->user->create();
+
+		$q2 = new WP_User_Query( $args );
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertContains( $user_id_2, $found, 'Find author in returned values' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_has_published_posts_delete_post() {
+		register_post_type( 'wptests_pt_public', array( 'public' => true ) );
+
+		$post_id = self::factory()->post->create(
+			array(
+				'post_author' => self::$author_ids[2],
+				'post_status' => 'publish',
+				'post_type'   => 'wptests_pt_public',
+			)
+		);
+
+		$q1 = new WP_User_Query(
+			array(
+				'has_published_posts' => true,
+			)
+		);
+
+		$found    = wp_list_pluck( $q1->get_results(), 'ID' );
+		$expected = array( self::$author_ids[2] );
+
+		$this->assertSameSets( $expected, $found, 'Find author in returned values' );
+
+		wp_delete_post( $post_id, true );
+
+		$q2 = new WP_User_Query(
+			array(
+				'has_published_posts' => true,
+			)
+		);
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertSameSets( array(), $found, 'Not to find author in returned values' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_has_published_posts_delete_post_order() {
+		register_post_type( 'wptests_pt_public', array( 'public' => true ) );
+
+		$user_id = self::factory()->user->create();
+
+		$post_id = self::factory()->post->create(
+			array(
+				'post_author' => $user_id,
+				'post_status' => 'publish',
+				'post_type'   => 'wptests_pt_public',
+			)
+		);
+
+		$q1 = new WP_User_Query(
+			array(
+				'orderby' => 'post_count',
+			)
+		);
+
+		$found1 = wp_list_pluck( $q1->get_results(), 'ID' );
+		$this->assertContains( $user_id, $found1, 'Find author in returned values in first run of WP_User_Query' );
+
+		wp_delete_post( $post_id, true );
+
+		$q2 = new WP_User_Query(
+			array(
+				'orderby' => 'post_count',
+			)
+		);
+
+		$found2 = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertContains( $user_id, $found1, 'Find author in returned values in second run of WP_User_Query' );
+		$this->assertSameSets( $found1, $found2, 'Not same order' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @covers ::query
+	 */
+	public function test_meta_query_cache_invalidation() {
+		add_user_meta( self::$author_ids[0], 'foo', 'bar' );
+		add_user_meta( self::$author_ids[1], 'foo', 'bar' );
+
+		$q1 = new WP_User_Query(
+			array(
+				'meta_query' => array(
+					array(
+						'key'   => 'foo',
+						'value' => 'bar',
+					),
+				),
+			)
+		);
+
+		$found    = wp_list_pluck( $q1->get_results(), 'ID' );
+		$expected = array( self::$author_ids[0], self::$author_ids[1] );
+
+		$this->assertSameSets( $expected, $found, 'Asset that results contain authors' );
+
+		delete_user_meta( self::$author_ids[1], 'foo' );
+
+		$q2 = new WP_User_Query(
+			array(
+				'meta_query' => array(
+					array(
+						'key'   => 'foo',
+						'value' => 'bar',
+					),
+				),
+			)
+		);
+
+		$found    = wp_list_pluck( $q2->get_results(), 'ID' );
+		$expected = array( self::$author_ids[0] );
+
+		$this->assertSameSets( $expected, $found, 'Asset that results do not contain author without meta' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @group ms-required
+	 * @covers ::query
+	 */
+	public function test_get_single_capability_multisite_blog_id() {
+		$blog_id = self::factory()->blog->create();
+
+		add_user_to_blog( $blog_id, self::$author_ids[0], 'subscriber' );
+		add_user_to_blog( $blog_id, self::$author_ids[1], 'author' );
+		add_user_to_blog( $blog_id, self::$author_ids[2], 'editor' );
+
+		$q1 = new WP_User_Query(
+			array(
+				'capability' => 'publish_posts',
+				'blog_id'    => $blog_id,
+			)
+		);
+
+		$found = wp_list_pluck( $q1->get_results(), 'ID' );
+
+		$this->assertNotContains( self::$author_ids[0], $found, 'Asset that results do not contain author 0 without capability on site on first run' );
+		$this->assertContains( self::$author_ids[1], $found, 'Asset that results do contain author with capability on site on first run' );
+		$this->assertContains( self::$author_ids[2], $found, 'Asset that results do contain author with capability on site on first run' );
+
+		remove_user_from_blog( self::$author_ids[2], $blog_id );
+
+		$q2 = new WP_User_Query(
+			array(
+				'capability' => 'publish_posts',
+				'blog_id'    => $blog_id,
+			)
+		);
+
+		$found = wp_list_pluck( $q2->get_results(), 'ID' );
+		$this->assertNotContains( self::$author_ids[0], $found, 'Asset that results do not contain author 0 without capability on site on second run' );
+		$this->assertContains( self::$author_ids[1], $found, 'Asset that results do contain author with capability on site on second run' );
+		$this->assertNotContains( self::$author_ids[2], $found, 'Asset that results do not contain author 1 without capability on site on second run' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @group ms-required
+	 * @covers ::query
+	 */
+	public function test_query_should_respect_blog_id() {
+		$blogs = self::factory()->blog->create_many( 2 );
+
+		add_user_to_blog( $blogs[0], self::$author_ids[0], 'author' );
+		add_user_to_blog( $blogs[0], self::$author_ids[1], 'author' );
+		add_user_to_blog( $blogs[1], self::$author_ids[0], 'author' );
+		add_user_to_blog( $blogs[1], self::$author_ids[1], 'author' );
+		add_user_to_blog( $blogs[1], self::$author_ids[2], 'author' );
+
+		$q = new WP_User_Query(
+			array(
+				'fields'  => 'ids',
+				'blog_id' => $blogs[0],
+			)
+		);
+
+		$expected = array( (string) self::$author_ids[0], (string) self::$author_ids[1] );
+
+		$this->assertSameSets( $expected, $q->get_results(), 'Asset that expected users return' );
+
+		$q = new WP_User_Query(
+			array(
+				'fields'  => 'ids',
+				'blog_id' => $blogs[1],
+			)
+		);
+
+		$expected = array( (string) self::$author_ids[0], (string) self::$author_ids[1], (string) self::$author_ids[2] );
+
+		$this->assertSameSets( $expected, $q->get_results(), 'Asset that expected users return from different blog' );
+	}
+
+	/**
+	 * @ticket 40613
+	 * @group ms-required
+	 * @covers ::query
+	 */
+	public function test_has_published_posts_should_respect_blog_id() {
+		$blogs = self::factory()->blog->create_many( 2 );
+
+		add_user_to_blog( $blogs[0], self::$author_ids[0], 'author' );
+		add_user_to_blog( $blogs[0], self::$author_ids[1], 'author' );
+		add_user_to_blog( $blogs[1], self::$author_ids[0], 'author' );
+		add_user_to_blog( $blogs[1], self::$author_ids[1], 'author' );
+
+		switch_to_blog( $blogs[0] );
+		self::factory()->post->create(
+			array(
+				'post_author' => self::$author_ids[0],
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+		restore_current_blog();
+
+		switch_to_blog( $blogs[1] );
+		$post_id = self::factory()->post->create(
+			array(
+				'post_author' => self::$author_ids[1],
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+		restore_current_blog();
+
+		$q = new WP_User_Query(
+			array(
+				'has_published_posts' => array( 'post' ),
+				'blog_id'             => $blogs[1],
+			)
+		);
+
+		$found    = wp_list_pluck( $q->get_results(), 'ID' );
+		$expected = array( self::$author_ids[1] );
+
+		$this->assertSameSets( $expected, $found, 'Asset that expected users returned with posts on this site' );
+		switch_to_blog( $blogs[1] );
+		wp_delete_post( $post_id, true );
+		restore_current_blog();
+
+		$q = new WP_User_Query(
+			array(
+				'has_published_posts' => array( 'post' ),
+				'blog_id'             => $blogs[1],
+			)
+		);
+
+		$found = wp_list_pluck( $q->get_results(), 'ID' );
+
+		$this->assertSameSets( array(), $found, 'Asset that no users returned with posts on this site as posts have been deleted' );
+	}
+
+	/**
+	 * Ensure cache keys are generated without WPDB placeholders.
+	 *
+	 * @ticket 40613
+	 *
+	 * @covers ::generate_cache_key
+	 */
+	public function test_generate_cache_key_placeholder() {
+		global $wpdb;
+		$query1 = new WP_User_Query( array( 'capability' => 'edit_posts' ) );
+
+		$query_vars                  = $query1->query_vars;
+		$request_with_placeholder    = $query1->request;
+		$request_without_placeholder = $wpdb->remove_placeholder_escape( $query1->request );
+
+		$reflection = new ReflectionMethod( $query1, 'generate_cache_key' );
+		$reflection->setAccessible( true );
+
+		$cache_key_1 = $reflection->invoke( $query1, $query_vars, $request_with_placeholder );
+		$cache_key_2 = $reflection->invoke( $query1, $query_vars, $request_without_placeholder );
+
+		$this->assertSame( $cache_key_1, $cache_key_2, 'Cache key differs when using wpdb placeholder.' );
+	}
+
+	/**
+	 * Verifies that generate_cache_key() does not throw a fatal error for switch_to_blog()
+	 * with 'orderby' => 'post_count' and the deprecated 'who' => 'authors' parameter.
+	 *
+	 * @ticket 59011
+	 * @covers ::generate_cache_key
+	 *
+	 * @expectedDeprecated WP_User_Query
+	 */
+	public function test_generate_cache_key_with_orderby_post_count_and_deprecated_who_parameter() {
+		$query = new WP_User_Query(
+			array(
+				'fields'  => 'ID',
+				'orderby' => 'post_count',
+				'order'   => 'DESC',
+				'who'     => 'authors',
+			)
+		);
+
+		$this->assertNotEmpty( $query->get_results() );
+	}
+}
diff --git a/tests/phpunit/tests/user/retrievePassword.php b/tests/phpunit/tests/user/retrievePassword.php
index 96a14c408f502..861a2d9e96c01 100644
--- a/tests/phpunit/tests/user/retrievePassword.php
+++ b/tests/phpunit/tests/user/retrievePassword.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress
  * @since 6.0.0
- */
-
-/**
- * Test retrieve_password(), in wp-includes/user.php.
- *
- * @since 6.0.0
  *
  * @group user
  * @covers ::retrieve_password
diff --git a/tests/phpunit/tests/user/wpListAuthors.php b/tests/phpunit/tests/user/wpListAuthors.php
index ebf557157ae0e..90a22e39d9edf 100644
--- a/tests/phpunit/tests/user/wpListAuthors.php
+++ b/tests/phpunit/tests/user/wpListAuthors.php
@@ -146,6 +146,31 @@ public function test_wp_list_authors_optioncount() {
 		);
 	}
 
+	/**
+	 * Ensures the 'optioncount' parameter does not throw an error when there are authors without posts.
+	 *
+	 * @ticket 57011
+	 */
+	public function test_wp_list_authors_optioncount_should_not_error_for_empty_authors() {
+		/*
+		 * The main purpose of this test is to ensure that the error below is not thrown:
+		 *
+		 * Error: Object of class stdClass could not be converted to string
+		 *
+		 * In place of direct testing we ensure `wp_list_authors()` returns a list of authors
+		 * at least one of which is empty.
+		 */
+		$actual = wp_list_authors(
+			array(
+				'optioncount'   => true,
+				'hide_empty'    => false,
+				'exclude_admin' => false,
+				'echo'          => false,
+			)
+		);
+		$this->assertStringContainsString( '(0)', $actual );
+	}
+
 	public function test_wp_list_authors_exclude_admin() {
 		self::factory()->post->create(
 			array(
diff --git a/tests/phpunit/tests/user/wpSendUserRequest.php b/tests/phpunit/tests/user/wpSendUserRequest.php
index f36304bad431b..11e3130f225a5 100644
--- a/tests/phpunit/tests/user/wpSendUserRequest.php
+++ b/tests/phpunit/tests/user/wpSendUserRequest.php
@@ -4,12 +4,6 @@
  *
  * @package WordPress
  * @since 4.9.9
- */
-
-/**
- * Tests_User_WpSendUserRequest class.
- *
- * @since 4.9.9
  *
  * @group privacy
  * @group user
diff --git a/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php b/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php
index 5c609923d7b39..7202417ddee93 100644
--- a/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php
+++ b/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php
@@ -76,13 +76,14 @@ public function tear_down() {
 	/**
 	 * @ticket 55567
 	 * @ticket 46370
+	 * @ticket 57430
 	 */
 	public function test_font_face_generated_from_themejson() {
 		$this->setup_theme_and_test( 'webfonts-theme' );
 
 		$expected = <<<EOF
 <style id='wp-webfonts-inline-css' type='text/css'>
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-display:fallback;src:local("Source Serif Pro"), url('THEME_ROOT_URL/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');font-stretch:normal;}@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-display:fallback;src:local("Source Serif Pro"), url('THEME_ROOT_URL/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');font-stretch:normal;}
+@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-display:fallback;src:url('THEME_ROOT_URL/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');font-stretch:normal;}@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-display:fallback;src:url('THEME_ROOT_URL/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');font-stretch:normal;}
 </style>
 EOF;
 		$expected = str_replace( 'THEME_ROOT_URL', get_stylesheet_directory_uri(), $expected );
@@ -129,7 +130,8 @@ public function data_font_face_not_generated() {
 	private function setup_theme_and_test( $theme_name ) {
 		switch_theme( $theme_name );
 		do_action( 'after_setup_theme' );
-		WP_Theme_JSON_Resolver::clean_cached_data();
+		wp_clean_theme_json_cache();
+		do_action( 'plugins_loaded' );
 		do_action( 'wp_loaded' );
 		do_action( 'wp_enqueue_scripts' );
 	}
diff --git a/tests/phpunit/tests/widgets.php b/tests/phpunit/tests/widgets.php
index 2407a2de1bc3d..8f64669c2951b 100644
--- a/tests/phpunit/tests/widgets.php
+++ b/tests/phpunit/tests/widgets.php
@@ -593,7 +593,7 @@ public function test_wp_widget__register() {
 	/**
 	 * @ticket 52728
 	 */
-	function test_widget_display_callback_handles_arrayobject() {
+	public function test_widget_display_callback_handles_arrayobject() {
 		$widget = new WP_Widget_Text();
 
 		register_widget( $widget );
@@ -813,7 +813,7 @@ public function test_wp_widget_control() {
 		);
 
 		wp_widgets_init();
-		require_once ABSPATH . '/wp-admin/includes/widgets.php';
+		require_once ABSPATH . 'wp-admin/includes/widgets.php';
 		$widget_id    = 'search-2';
 		$widget       = $wp_registered_widgets[ $widget_id ];
 		$params       = array(
diff --git a/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php b/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php
new file mode 100644
index 0000000000000..f8f8c519ae639
--- /dev/null
+++ b/tests/phpunit/tests/widgets/wpBlockThemeRegisterClassicSidebar.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Tests for _wp_block_theme_register_classic_sidebars().
+ *
+ * @group widgets
+ * @covers ::_wp_block_theme_register_classic_sidebars
+ */
+class Tests_Widgets_WpBlockThemeRegisterClassicSidebars extends WP_UnitTestCase {
+	/**
+	 * Original global $wp_registered_sidebars.
+	 *
+	 * @var array
+	 */
+	private static $wp_registered_sidebars;
+
+	public static function set_up_before_class() {
+		global $wp_registered_sidebars;
+		parent::set_up_before_class();
+
+		// Store the original global before running tests.
+		static::$wp_registered_sidebars = $wp_registered_sidebars;
+	}
+
+	public function tear_down() {
+		// Restore the global after each test.
+		global $wp_registered_sidebars;
+		$wp_registered_sidebars = static::$wp_registered_sidebars;
+
+		parent::tear_down();
+	}
+
+	public function test_a_sidebar_should_be_registered() {
+		global $wp_registered_sidebars;
+
+		$sidebar_id = array_key_first( $wp_registered_sidebars );
+		$this->assertNotEmpty( $sidebar_id );
+	}
+
+	/**
+	 * @ticket 57531
+	 */
+	public function test_should_reregister_previous_theme_sidebar() {
+		global $wp_registered_sidebars;
+
+		$sidebar_id = array_key_first( $wp_registered_sidebars );
+
+		switch_theme( 'block-theme' );
+		unregister_sidebar( $sidebar_id );
+
+		// Test before.
+		$this->assertArrayNotHasKey(
+			$sidebar_id,
+			$wp_registered_sidebars,
+			'Sidebar should not be in registered sidebars after unregister'
+		);
+
+		_wp_block_theme_register_classic_sidebars();
+
+		// Test after.
+		$this->assertArrayHasKey(
+			$sidebar_id,
+			$wp_registered_sidebars,
+			'Sidebar should be in registered sidebars after invoking _wp_block_theme_register_classic_sidebars()'
+		);
+	}
+
+	/**
+	 * @ticket 57531
+	 */
+	public function test_should_bail_out_when_theme_mod_is_empty() {
+		global $wp_registered_sidebars;
+
+		// Test state before invoking.
+		$this->assertFalse(
+			get_theme_mod( 'wp_classic_sidebars' ),
+			'Theme mod should not be set before invoking _wp_block_theme_register_classic_sidebars()'
+		);
+
+		$before = $wp_registered_sidebars;
+		_wp_block_theme_register_classic_sidebars();
+
+		// Test state after invoking.
+		$this->assertSameSetsWithIndex(
+			$before,
+			$wp_registered_sidebars,
+			'No change should happen after invoking _wp_block_theme_register_classic_sidebars()'
+		);
+	}
+}
diff --git a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
index 8b48b2cb9c0c2..c7dc3c3c7da58 100644
--- a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
+++ b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php
@@ -67,7 +67,6 @@ public function test__register() {
 		$this->assertSame( 10, has_action( 'admin_print_scripts-widgets.php', array( $widget, 'enqueue_admin_scripts' ) ) );
 		$this->assertSame( 10, has_action( 'admin_footer-widgets.php', array( 'WP_Widget_Custom_HTML', 'render_control_template_scripts' ) ) );
 		$this->assertSame( 10, has_action( 'admin_head-widgets.php', array( 'WP_Widget_Custom_HTML', 'add_help_text' ) ) );
-		$this->assertContains( 'wp.customHtmlWidgets.idBases.push( "custom_html" );', wp_scripts()->registered['custom-html-widgets']->extra['after'] );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/widgets/wpWidgetMedia.php b/tests/phpunit/tests/widgets/wpWidgetMedia.php
index b52b5fd413922..d138c41583173 100644
--- a/tests/phpunit/tests/widgets/wpWidgetMedia.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMedia.php
@@ -383,10 +383,10 @@ public function test_widget() {
 	 *
 	 * @param array           $instance Instance data.
 	 * @param array           $args     Widget args.
-	 * @param WP_Widget_Media $object   Widget object.
+	 * @param WP_Widget_Media $widget   Widget object.
 	 * @return array Instance.
 	 */
-	public function filter_widget_mocked_instance( $instance, $args, $object ) {
+	public function filter_widget_mocked_instance( $instance, $args, $widget ) {
 		$this->widget_instance_filter_args = func_get_args();
 		return $instance;
 	}
diff --git a/tests/phpunit/tests/widgets/wpWidgetMediaImage.php b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php
index 57ffc9a6aa81e..3f96cf34ebb82 100644
--- a/tests/phpunit/tests/widgets/wpWidgetMediaImage.php
+++ b/tests/phpunit/tests/widgets/wpWidgetMediaImage.php
@@ -494,6 +494,8 @@ public function test_render_media() {
 
 		// Custom image class.
 		$this->assertStringContainsString( 'src="http://example.org/url/to/image.jpg"', $output );
+		$this->assertStringContainsString( 'decoding="async"', $output );
+		$this->assertStringContainsString( 'loading="lazy"', $output );
 
 		// Link settings.
 		ob_start();
diff --git a/tests/phpunit/tests/widgets/wpWidgetRss.php b/tests/phpunit/tests/widgets/wpWidgetRss.php
index 495869f47564f..7135e4b702f35 100644
--- a/tests/phpunit/tests/widgets/wpWidgetRss.php
+++ b/tests/phpunit/tests/widgets/wpWidgetRss.php
@@ -101,12 +101,12 @@ public function data_url_happy_path() {
 
 	public function mocked_rss_response() {
 		$single_value_headers = array(
-			'content-type' => 'application/rss+xml; charset=UTF-8',
+			'Content-Type' => 'application/rss+xml; charset=UTF-8',
 			'link'         => '<https://wordpress.org/news/wp-json/>; rel="https://api.w.org/"',
 		);
 
 		return array(
-			'headers'  => new Requests_Utility_CaseInsensitiveDictionary( $single_value_headers ),
+			'headers'  => new WpOrg\Requests\Utility\CaseInsensitiveDictionary( $single_value_headers ),
 			'body'     => file_get_contents( DIR_TESTDATA . '/feed/wordpress-org-news.xml' ),
 			'response' => array(
 				'code'    => 200,
diff --git a/tests/phpunit/tests/widgets/wpWidgetText.php b/tests/phpunit/tests/widgets/wpWidgetText.php
index b35fa02e0eca3..cccdcbe957c74 100644
--- a/tests/phpunit/tests/widgets/wpWidgetText.php
+++ b/tests/phpunit/tests/widgets/wpWidgetText.php
@@ -67,7 +67,6 @@ public function test__register() {
 
 		$this->assertSame( 10, has_action( 'admin_print_scripts-widgets.php', array( $widget, 'enqueue_admin_scripts' ) ) );
 		$this->assertSame( 10, has_action( 'admin_footer-widgets.php', array( 'WP_Widget_Text', 'render_control_template_scripts' ) ) );
-		$this->assertContains( 'wp.textWidgets.idBases.push( "text" );', wp_scripts()->registered['text-widgets']->extra['after'] );
 		$this->assertFalse( has_action( 'wp_enqueue_scripts', array( $widget, 'enqueue_preview_scripts' ) ) );
 	}
 
diff --git a/tests/phpunit/tests/xmlrpc/message.php b/tests/phpunit/tests/xmlrpc/message.php
new file mode 100644
index 0000000000000..ac68552902389
--- /dev/null
+++ b/tests/phpunit/tests/xmlrpc/message.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Unit tests covering IXR_Message functionality.
+ *
+ * @package    WordPress
+ * @subpackage IXR
+ */
+
+/**
+ * Test wp-includes/IXR/class-IXR-message.php
+ *
+ * @group xmlrpc
+ */
+class Tests_XMLRPC_Message extends WP_UnitTestCase {
+
+	/**
+	 * Tests that `IXR_Message::tag_open()` does not create a dynamic `currentTag` property,
+	 * and uses the declared `_currentTag` property instead.
+	 *
+	 * The notice that we should not see:
+	 * `Deprecated: Creation of dynamic property IXR_Message::$currentTag is deprecated`.
+	 *
+	 * @ticket 56033
+	 *
+	 * @covers IXR_Message::tag_open
+	 */
+	public function test_tag_open_does_not_create_dynamic_property() {
+		$message = new IXR_Message( '<methodResponse><params><param><value>1</value></param></params></methodResponse>' );
+		$this->assertTrue( $message->parse() );
+		$this->assertSame( 'methodResponse', $message->messageType ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$this->assertSame( array( '1' ), $message->params );
+	}
+
+}
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 896322ed48dfc..27aa52edcc352 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -395,6 +395,20 @@ mockedApiResponse.Schema = {
                             ],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -1752,6 +1766,20 @@ mockedApiResponse.Schema = {
                             "default": [],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -2833,6 +2861,20 @@ mockedApiResponse.Schema = {
                             "default": [],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -3543,6 +3585,20 @@ mockedApiResponse.Schema = {
                             ],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -4339,6 +4395,20 @@ mockedApiResponse.Schema = {
                             ],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -4469,6 +4539,12 @@ mockedApiResponse.Schema = {
                             },
                             "required": false
                         },
+                        "meta": {
+                            "description": "Meta fields.",
+                            "type": "object",
+                            "properties": [],
+                            "required": false
+                        },
                         "template": {
                             "description": "The theme file to use to display the post.",
                             "type": "string",
@@ -4625,6 +4701,12 @@ mockedApiResponse.Schema = {
                             },
                             "required": false
                         },
+                        "meta": {
+                            "description": "Meta fields.",
+                            "type": "object",
+                            "properties": [],
+                            "required": false
+                        },
                         "template": {
                             "description": "The theme file to use to display the post.",
                             "type": "string",
@@ -4941,6 +5023,12 @@ mockedApiResponse.Schema = {
                             },
                             "required": false
                         },
+                        "meta": {
+                            "description": "Meta fields.",
+                            "type": "object",
+                            "properties": [],
+                            "required": false
+                        },
                         "template": {
                             "description": "The theme file to use to display the post.",
                             "type": "string",
@@ -5035,7 +5123,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": true
                         },
                         "theme": {
@@ -5177,7 +5265,7 @@ mockedApiResponse.Schema = {
                 ]
             }
         },
-        "/wp/v2/templates/(?P<id>([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w-]+)": {
+        "/wp/v2/templates/(?P<id>([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w%-]+)": {
             "namespace": "wp/v2",
             "methods": [
                 "GET",
@@ -5226,7 +5314,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": false
                         },
                         "theme": {
@@ -5540,7 +5628,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": false
                         },
                         "theme": {
@@ -5719,7 +5807,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": true
                         },
                         "theme": {
@@ -5866,7 +5954,7 @@ mockedApiResponse.Schema = {
                 ]
             }
         },
-        "/wp/v2/template-parts/(?P<id>([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w-]+)": {
+        "/wp/v2/template-parts/(?P<id>([^\\/:<>\\*\\?\"\\|]+(?:\\/[^\\/:<>\\*\\?\"\\|]+)?)[\\/\\w%-]+)": {
             "namespace": "wp/v2",
             "methods": [
                 "GET",
@@ -5915,7 +6003,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": false
                         },
                         "theme": {
@@ -6234,7 +6322,7 @@ mockedApiResponse.Schema = {
                             "description": "Unique slug identifying the template.",
                             "type": "string",
                             "minLength": 1,
-                            "pattern": "[a-zA-Z0-9_\\-]+",
+                            "pattern": "[a-zA-Z0-9_\\%-]+",
                             "required": false
                         },
                         "theme": {
@@ -6490,6 +6578,20 @@ mockedApiResponse.Schema = {
                             ],
                             "required": false
                         },
+                        "search_columns": {
+                            "default": [],
+                            "description": "Array of column names to be searched.",
+                            "type": "array",
+                            "items": {
+                                "enum": [
+                                    "post_title",
+                                    "post_content",
+                                    "post_excerpt"
+                                ],
+                                "type": "string"
+                            },
+                            "required": false
+                        },
                         "slug": {
                             "description": "Limit result set to posts with one or more specific slugs.",
                             "type": "array",
@@ -6580,7 +6682,8 @@ mockedApiResponse.Schema = {
                                     "description": "Title for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -6604,7 +6707,8 @@ mockedApiResponse.Schema = {
                                     "description": "Content for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -6612,7 +6716,8 @@ mockedApiResponse.Schema = {
                                     "type": "string",
                                     "context": [
                                         "view",
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -6620,7 +6725,8 @@ mockedApiResponse.Schema = {
                                     "description": "Version of the content block format used by the post.",
                                     "type": "integer",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -6757,7 +6863,8 @@ mockedApiResponse.Schema = {
                                     "description": "Title for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -6781,7 +6888,8 @@ mockedApiResponse.Schema = {
                                     "description": "Content for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -6789,7 +6897,8 @@ mockedApiResponse.Schema = {
                                     "type": "string",
                                     "context": [
                                         "view",
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -6797,7 +6906,8 @@ mockedApiResponse.Schema = {
                                     "description": "Version of the content block format used by the post.",
                                     "type": "integer",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -7090,7 +7200,8 @@ mockedApiResponse.Schema = {
                                     "description": "Title for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -7114,7 +7225,8 @@ mockedApiResponse.Schema = {
                                     "description": "Content for the post, as it exists in the database.",
                                     "type": "string",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ]
                                 },
                                 "rendered": {
@@ -7122,7 +7234,8 @@ mockedApiResponse.Schema = {
                                     "type": "string",
                                     "context": [
                                         "view",
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -7130,7 +7243,8 @@ mockedApiResponse.Schema = {
                                     "description": "Version of the content block format used by the post.",
                                     "type": "integer",
                                     "context": [
-                                        "edit"
+                                        "edit",
+                                        "embed"
                                     ],
                                     "readonly": true
                                 },
@@ -9516,6 +9630,56 @@ mockedApiResponse.Schema = {
                 }
             ]
         },
+        "/wp/v2/global-styles/(?P<parent>[\\d]+)/revisions": {
+            "namespace": "wp/v2",
+            "methods": [
+                "GET"
+            ],
+            "endpoints": [
+                {
+                    "methods": [
+                        "GET"
+                    ],
+                    "args": {
+                        "parent": {
+                            "description": "The ID for the parent of the revision.",
+                            "type": "integer",
+                            "required": false
+                        },
+                        "context": {
+                            "description": "Scope under which the request is made; determines fields present in response.",
+                            "type": "string",
+                            "enum": [
+                                "view",
+                                "embed",
+                                "edit"
+                            ],
+                            "default": "view",
+                            "required": false
+                        },
+                        "page": {
+                            "description": "Current page of the collection.",
+                            "type": "integer",
+                            "default": 1,
+                            "minimum": 1,
+                            "required": false
+                        },
+                        "per_page": {
+                            "description": "Maximum number of items to be returned in result set.",
+                            "type": "integer",
+                            "minimum": 1,
+                            "maximum": 100,
+                            "required": false
+                        },
+                        "offset": {
+                            "description": "Offset the result set by a specific number of items.",
+                            "type": "integer",
+                            "required": false
+                        }
+                    }
+                }
+            ]
+        },
         "/wp/v2/global-styles/themes/(?P<stylesheet>[\\/\\s%\\w\\.\\(\\)\\[\\]\\@_\\-]+)/variations": {
             "namespace": "wp/v2",
             "methods": [
@@ -10475,6 +10639,21 @@ mockedApiResponse.Schema = {
                             "default": "view",
                             "required": false
                         },
+                        "page": {
+                            "description": "Current page of the collection.",
+                            "type": "integer",
+                            "default": 1,
+                            "minimum": 1,
+                            "required": false
+                        },
+                        "per_page": {
+                            "description": "Maximum number of items to be returned in result set.",
+                            "type": "integer",
+                            "default": 100,
+                            "minimum": 1,
+                            "maximum": 100,
+                            "required": false
+                        },
                         "search": {
                             "description": "Limit results to those matching a string.",
                             "type": "string",
@@ -10497,6 +10676,40 @@ mockedApiResponse.Schema = {
                             "description": "Limit results to those matching a pattern (slug).",
                             "type": "array",
                             "required": false
+                        },
+                        "offset": {
+                            "description": "Offset the result set by a specific number of items.",
+                            "type": "integer",
+                            "required": false
+                        },
+                        "order": {
+                            "description": "Order sort attribute ascending or descending.",
+                            "type": "string",
+                            "default": "desc",
+                            "enum": [
+                                "asc",
+                                "desc"
+                            ],
+                            "required": false
+                        },
+                        "orderby": {
+                            "description": "Sort collection by post attribute.",
+                            "type": "string",
+                            "default": "date",
+                            "enum": [
+                                "author",
+                                "date",
+                                "id",
+                                "include",
+                                "modified",
+                                "parent",
+                                "relevance",
+                                "slug",
+                                "include_slugs",
+                                "title",
+                                "favorite_count"
+                            ],
+                            "required": false
                         }
                     }
                 }
@@ -10870,6 +11083,27 @@ mockedApiResponse.Schema = {
                     }
                 ]
             }
+        },
+        "/wp-block-editor/v1/navigation-fallback": {
+            "namespace": "wp-block-editor/v1",
+            "methods": [
+                "GET"
+            ],
+            "endpoints": [
+                {
+                    "methods": [
+                        "GET"
+                    ],
+                    "args": []
+                }
+            ],
+            "_links": {
+                "self": [
+                    {
+                        "href": "http://example.org/index.php?rest_route=/wp-block-editor/v1/navigation-fallback"
+                    }
+                ]
+            }
         }
     },
     "site_logo": 0,
@@ -11789,7 +12023,7 @@ mockedApiResponse.TypesCollection = {
         "description": "",
         "hierarchical": false,
         "has_archive": false,
-        "name": "Reusable blocks",
+        "name": "Patterns",
         "slug": "wp_block",
         "icon": null,
         "taxonomies": [],
diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js
index c17bbce887329..e8a448c8c9d8c 100644
--- a/tools/local-env/scripts/install.js
+++ b/tools/local-env/scripts/install.js
@@ -16,6 +16,7 @@ wp_cli( `config set WP_DEBUG_LOG ${process.env.LOCAL_WP_DEBUG_LOG} --raw --type=
 wp_cli( `config set WP_DEBUG_DISPLAY ${process.env.LOCAL_WP_DEBUG_DISPLAY} --raw --type=constant` );
 wp_cli( `config set SCRIPT_DEBUG ${process.env.LOCAL_SCRIPT_DEBUG} --raw --type=constant` );
 wp_cli( `config set WP_ENVIRONMENT_TYPE ${process.env.LOCAL_WP_ENVIRONMENT_TYPE} --type=constant` );
+wp_cli( `config set WP_DEVELOPMENT_MODE ${process.env.LOCAL_WP_DEVELOPMENT_MODE} --type=constant` );
 
 // Move wp-config.php to the base directory, so it doesn't get mixed up in the src or build directories.
 renameSync( 'src/wp-config.php', 'wp-config.php' );
diff --git a/tools/local-env/scripts/start.js b/tools/local-env/scripts/start.js
index 35edf7f96fe5e..df27a67a6218f 100644
--- a/tools/local-env/scripts/start.js
+++ b/tools/local-env/scripts/start.js
@@ -4,6 +4,17 @@ const { execSync } = require( 'child_process' );
 
 dotenvExpand.expand( dotenv.config() );
 
+// Check if the Docker service is running.
+try {
+	execSync( 'docker info' );
+} catch ( e ) {
+	if ( e.message.startsWith( 'Command failed: docker info' ) ) {
+		throw new Error( 'Could not retrieve Docker system info. Is the Docker service running?' );
+	}
+
+	throw e;
+}
+
 // Start the local-env containers.
 const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
 	? 'wordpress-develop memcached'
diff --git a/tools/release/sync-gutenberg-packages.js b/tools/release/sync-gutenberg-packages.js
index a57134ff2922b..f5c8fbcdf7222 100644
--- a/tools/release/sync-gutenberg-packages.js
+++ b/tools/release/sync-gutenberg-packages.js
@@ -120,8 +120,8 @@ function getMismatchedNonWordPressDependencies() {
 	;
 
 	// Ensure that all the conflicts can be resolved with the same version
-	const unresolvableConflicts = Object.entries( groupBy( versionConflicts, ( [name] ) => name ) )
-		.map( ( [name, group] ) => [name, group.map( ( [, { required }] ) => required )] )
+	const unresolvableConflicts = Object.entries( groupBy( versionConflicts, ( {name} ) => name ) )
+		.map( ( [name, group] ) => [name, uniq( group.map( ( { required } ) => required ) )] )
 		.filter( ( [, group] ) => group.length > 1 );
 	if ( unresolvableConflicts.length > 0 ) {
 		console.error( "Can't resolve some conflicts automatically." );
diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js
index ca238e21143b1..df2a78abe81a9 100644
--- a/tools/webpack/blocks.js
+++ b/tools/webpack/blocks.js
@@ -68,6 +68,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 			'file/view': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/file/view` ),
 			'navigation/view': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view` ),
 			'navigation/view-modal': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/navigation/view-modal` ),
+			'search/view': normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-module/search/view` ),
 		},
 		output: {
 			devtoolNamespace: 'wp',
diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js
index bc2daa640a682..90c4f8deff407 100644
--- a/tools/webpack/packages.js
+++ b/tools/webpack/packages.js
@@ -65,12 +65,13 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 		'lodash.js': 'lodash/lodash.js',
 		'wp-polyfill.js': '@wordpress/babel-preset-default/build/polyfill.js',
 		'wp-polyfill-fetch.js': 'whatwg-fetch/dist/fetch.umd.js',
-		'wp-polyfill-element-closest.js': 'element-closest/element-closest.js',
+		'wp-polyfill-element-closest.js': 'element-closest/browser.js',
 		'wp-polyfill-node-contains.js': 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
 		'wp-polyfill-url.js': 'core-js-url-browser/url.js',
 		'wp-polyfill-dom-rect.js': 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
 		'wp-polyfill-formdata.js': 'formdata-polyfill/FormData.js',
 		'wp-polyfill-object-fit.js': 'objectFitPolyfill/src/objectFitPolyfill.js',
+		'wp-polyfill-inert.js': 'wicg-inert/dist/inert.js',
 		'moment.js': 'moment/moment.js',
 		'react.js': 'react/umd/react.development.js',
 		'react-dom.js': 'react-dom/umd/react-dom.development.js',
@@ -80,9 +81,11 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 	const minifiedVendors = {
 		'lodash.min.js': 'lodash/lodash.min.js',
 		'wp-polyfill.min.js': '@wordpress/babel-preset-default/build/polyfill.min.js',
+		'wp-polyfill-element-closest.min.js': 'element-closest/browser.js',
 		'wp-polyfill-formdata.min.js': 'formdata-polyfill/formdata.min.js',
 		'wp-polyfill-url.min.js': 'core-js-url-browser/url.min.js',
 		'wp-polyfill-object-fit.min.js': 'objectFitPolyfill/dist/objectFitPolyfill.min.js',
+		'wp-polyfill-inert.min.js': 'wicg-inert/dist/inert.min.js',
 		'moment.min.js': 'moment/min/moment.min.js',
 		'react.min.js': 'react/umd/react.production.min.js',
 		'react-dom.min.js': 'react-dom/umd/react-dom.production.min.js',
@@ -91,13 +94,14 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 	const minifyVendors = {
 		'regenerator-runtime.min.js': 'regenerator-runtime/runtime.js',
 		'wp-polyfill-fetch.min.js': 'whatwg-fetch/dist/fetch.umd.js',
-		'wp-polyfill-element-closest.min.js': 'element-closest/element-closest.js',
 		'wp-polyfill-node-contains.min.js': 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
 		'wp-polyfill-dom-rect.min.js': 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
 	};
 
 	const phpFiles = {
-		'block-serialization-default-parser/parser.php': 'wp-includes/class-wp-block-parser.php',
+		'block-serialization-default-parser/class-wp-block-parser.php': 'wp-includes/class-wp-block-parser.php',
+		'block-serialization-default-parser/class-wp-block-parser-frame.php': 'wp-includes/class-wp-block-parser-frame.php',
+		'block-serialization-default-parser/class-wp-block-parser-block.php': 'wp-includes/class-wp-block-parser-block.php',
 	};
 
 	const developmentCopies = mapVendorCopies( vendors, buildTarget );
@@ -150,6 +154,8 @@ module.exports = function( env = { environment: 'production', watch: false, buil
 			new DefinePlugin( {
 				// Inject the `IS_GUTENBERG_PLUGIN` global, used for feature flagging.
 				'process.env.IS_GUTENBERG_PLUGIN': false,
+				// Inject the `IS_WORDPRESS_CORE` global, used for feature flagging.
+				'process.env.IS_WORDPRESS_CORE': true,
 				'process.env.FORCE_REDUCED_MOTION': JSON.stringify(
 					process.env.FORCE_REDUCED_MOTION
 				),
diff --git a/tools/webpack/shared.js b/tools/webpack/shared.js
index bbd11ecd1258a..f6930d5e6ef7f 100644
--- a/tools/webpack/shared.js
+++ b/tools/webpack/shared.js
@@ -57,16 +57,21 @@ const baseConfig = ( env ) => {
 };
 
 const stylesTransform = ( mode ) => ( content ) => {
-	if ( mode === 'production' ) {
-		return postcss( [
-			require( 'cssnano' )( {
-				preset: 'default',
-			} ),
-		] )
-			.process( content, { from: 'src/app.css', to: 'dest/app.css' } )
-			.then( ( result ) => result.css );
-	}
-	return content;
+	return postcss( [
+		require( 'cssnano' )( {
+			preset: mode === 'production' ? 'default' : [
+				'default',
+				{
+					discardComments: {
+						removeAll: ! content.includes( 'Copyright' ) && ! content.includes( 'License' ),
+					},
+					normalizeWhitespace: false,
+				},
+			],
+		} ),
+	] )
+		.process( content, { from: 'src/app.css', to: 'dest/app.css' } )
+		.then( ( result ) => result.css );
 };
 
 const normalizeJoin = ( ...paths ) => join( ...paths ).replace( /\\/g, '/' );
diff --git a/wp-config-sample.php b/wp-config-sample.php
index c095f50f6c680..feb1137f39b8b 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -13,7 +13,7 @@
  * * Database table prefix
  * * ABSPATH
  *
- * @link https://wordpress.org/support/article/editing-wp-config-php/
+ * @link https://wordpress.org/documentation/article/editing-wp-config-php/
  *
  * @package WordPress
  */
@@ -77,7 +77,7 @@
  * For information on other constants that can be used for debugging,
  * visit the documentation.
  *
- * @link https://wordpress.org/support/article/debugging-in-wordpress/
+ * @link https://wordpress.org/documentation/article/debugging-in-wordpress/
  */
 define( 'WP_DEBUG', false );